File tnt-1.9.2-install.dif of Package tnt
diff -Nur tnt-1.9.2.orig/conf/Makefile.am tnt-1.9.2/conf/Makefile.am
--- tnt-1.9.2.orig/conf/Makefile.am 2000-01-06 02:16:52.000000000 +0100
+++ tnt-1.9.2/conf/Makefile.am 2010-07-14 18:10:51.371643585 +0200
@@ -7,22 +7,23 @@
tnt_work_dir = @tnt_work_dir@
tnt_bin_dir = @tnt_bin_dir@
-install:
- mkdir -p ${tnt_work_dir}/7plus |true
- mkdir -p ${tnt_work_dir}/abin |true
- mkdir -p ${tnt_work_dir}/bcast |true
- mkdir -p ${tnt_work_dir}/bcast/newmail |true
- mkdir -p ${tnt_work_dir}/bcast/save |true
- mkdir -p ${tnt_work_dir}/ctext |true
- mkdir -p ${tnt_work_dir}/down |true
- mkdir -p ${tnt_work_dir}/macro |true
- mkdir -p ${tnt_work_dir}/newmail |true
- mkdir -p ${tnt_work_dir}/remote |true
- mkdir -p ${tnt_work_dir}/tntusers |true
- mkdir -p ${tnt_work_dir}/up |true
- mkdir -p ${tnt_work_dir}/yapp |true
- @if [ ! -d ${tnt_work_dir}/bin ]; then \
- ln -s ${tnt_bin_dir} ${tnt_work_dir}/bin |true; \
+install-data-local:
+ install -d $(DESTDIR)
+ mkdir -p $(DESTDIR)${tnt_work_dir}/7plus |true
+ mkdir -p $(DESTDIR)${tnt_work_dir}/abin |true
+ mkdir -p $(DESTDIR)${tnt_work_dir}/bcast |true
+ mkdir -p $(DESTDIR)${tnt_work_dir}/bcast/newmail |true
+ mkdir -p $(DESTDIR)${tnt_work_dir}/bcast/save |true
+ mkdir -p $(DESTDIR)${tnt_work_dir}/ctext |true
+ mkdir -p $(DESTDIR)${tnt_work_dir}/down |true
+ mkdir -p $(DESTDIR)${tnt_work_dir}/macro |true
+ mkdir -p $(DESTDIR)${tnt_work_dir}/newmail |true
+ mkdir -p $(DESTDIR)${tnt_work_dir}/remote |true
+ mkdir -p $(DESTDIR)${tnt_work_dir}/tntusers |true
+ mkdir -p $(DESTDIR)${tnt_work_dir}/up |true
+ mkdir -p $(DESTDIR)${tnt_work_dir}/yapp |true
+ @if [ ! -d $(DESTDIR)${tnt_work_dir}/bin ]; then \
+ ln -s ${tnt_bin_dir} $(DESTDIR)${tnt_work_dir}/bin |true; \
fi
@echo "*****************************"
@echo "* TNT installed *"
diff -Nur tnt-1.9.2.orig/conf/Makefile.in tnt-1.9.2/conf/Makefile.in
--- tnt-1.9.2.orig/conf/Makefile.in 2002-11-17 00:13:55.000000000 +0100
+++ tnt-1.9.2/conf/Makefile.in 2010-07-14 18:10:51.371643585 +0200
@@ -241,22 +241,21 @@
install:
- mkdir -p ${tnt_work_dir}/7plus |true
- mkdir -p ${tnt_work_dir}/abin |true
- mkdir -p ${tnt_work_dir}/bcast |true
- mkdir -p ${tnt_work_dir}/bcast/newmail |true
- mkdir -p ${tnt_work_dir}/bcast/save |true
- mkdir -p ${tnt_work_dir}/ctext |true
- mkdir -p ${tnt_work_dir}/down |true
- mkdir -p ${tnt_work_dir}/macro |true
- mkdir -p ${tnt_work_dir}/newmail |true
- mkdir -p ${tnt_work_dir}/remote |true
- mkdir -p ${tnt_work_dir}/tntusers |true
- mkdir -p ${tnt_work_dir}/up |true
- mkdir -p ${tnt_work_dir}/yapp |true
- @if [ ! -d ${tnt_work_dir}/bin ]; then \
- ln -s ${tnt_bin_dir} ${tnt_work_dir}/bin |true; \
- fi
+ install -d $(DESTDIR)
+ mkdir -p $(DESTDIR)${tnt_work_dir}/7plus |true
+ mkdir -p $(DESTDIR)${tnt_work_dir}/abin |true
+ mkdir -p $(DESTDIR)${tnt_work_dir}/bcast |true
+ mkdir -p $(DESTDIR)${tnt_work_dir}/bcast/newmail |true
+ mkdir -p $(DESTDIR)${tnt_work_dir}/bcast/save |true
+ mkdir -p $(DESTDIR)${tnt_work_dir}/ctext |true
+ mkdir -p $(DESTDIR)${tnt_work_dir}/down |true
+ mkdir -p $(DESTDIR)${tnt_work_dir}/macro |true
+ mkdir -p $(DESTDIR)${tnt_work_dir}/newmail |true
+ mkdir -p $(DESTDIR)${tnt_work_dir}/remote |true
+ mkdir -p $(DESTDIR)${tnt_work_dir}/tntusers |true
+ mkdir -p $(DESTDIR)${tnt_work_dir}/up |true
+ mkdir -p $(DESTDIR)${tnt_work_dir}/yapp |true
+ ln -s ${tnt_run_dir} $(DESTDIR)${tnt_work_dir}/bin |true
@echo "*****************************"
@echo "* TNT installed *"
@echo "* *"
diff -Nur tnt-1.9.2.orig/configure.in tnt-1.9.2/configure.in
--- tnt-1.9.2.orig/configure.in 2002-11-17 00:03:31.000000000 +0100
+++ tnt-1.9.2/configure.in 2010-07-14 18:10:51.371643585 +0200
@@ -3,6 +3,7 @@
AC_CANONICAL_SYSTEM
AM_CONFIG_HEADER(config.h)
AM_INIT_AUTOMAKE(tnt,1.9.2)
+AC_PROG_LIBTOOL
dnl Available languages
ALL_LINGUAS="de fr"
@@ -21,6 +22,7 @@
AC_CHECK_LIB(intl, gettext)
AM_GNU_GETTEXT
+AM_GNU_GETTEXT_VERSION(0.15)
dnl Initial Default Values
cwax25=0
@@ -116,7 +118,7 @@
tnt_doc_dir=${prefix}/share/tnt/doc
tnt_log_dir=${localstatedir}/log
tnt_proc_dir=${localstatedir}/run
- tnt_bin_dir=${prefix}/libexec/tnt
+ tnt_bin_dir=${prefix}/lib/tnt
tnt_sound_dir=${prefix}/share/tnt/sounds
;;
@@ -383,6 +385,7 @@
fi
AC_CHECK_LIB(ax25, ax25_config_load_ports, AX25_LIB="-lax25", AC_MSG_ERROR(Could not find the libax25 libraries; aborting))
+ AC_CHECK_HEADERS(netax25/axconfig.h)
AC_CHECK_HEADER(netax25/procutils.h,
[
AC_DEFINE([HAVE_NETAX25_PROCUTILS_H],1,[if we have the netax25 procutils])
diff -Nur tnt-1.9.2.orig/doc/Makefile.am tnt-1.9.2/doc/Makefile.am
--- tnt-1.9.2.orig/doc/Makefile.am 2000-01-06 02:16:49.000000000 +0100
+++ tnt-1.9.2/doc/Makefile.am 2010-07-14 18:10:51.371643585 +0200
@@ -8,8 +8,8 @@
ax25krnl.doc iface.doc tnt.doc.de tnt.doc.en tnt.doc.fr \
tntdoc.dvi tntdoc.html
-infodir = @infodir@
-info_DATA = tntdoc.info tntdoc.info-1 tntdoc.info-2 tntdoc.info-3 tntdoc.info-4
+infdir = @infodir@
+inf_DATA = tntdoc.info tntdoc.info-1 tntdoc.info-2 tntdoc.info-3 tntdoc.info-4
-EXTRA_DIST = FILES tntdoc.texi $(setupdoc_DATA) $(info_DATA)
+EXTRA_DIST = FILES tntdoc.texi $(setupdoc_DATA) $(inf_DATA)
diff -Nur tnt-1.9.2.orig/examples/Makefile.am tnt-1.9.2/examples/Makefile.am
--- tnt-1.9.2.orig/examples/Makefile.am 2000-06-18 23:15:06.000000000 +0200
+++ tnt-1.9.2/examples/Makefile.am 2010-07-14 18:10:51.371643585 +0200
@@ -40,7 +40,7 @@
EXTRA_DIST = sounds.tnt.in tnt.ini.in tntc.ini.in $(exmpfiles) $(help_DATA)
-install:
+install-data-local:
$(mkinstalldirs) $(DESTDIR)$(exmpdir)
@for i in $(exmpfiles); \
do \
diff -Nur tnt-1.9.2.orig/examples/tnt.ini.in tnt-1.9.2/examples/tnt.ini.in
--- tnt-1.9.2.orig/examples/tnt.ini.in 2000-01-06 02:16:52.000000000 +0100
+++ tnt-1.9.2/examples/tnt.ini.in 2010-07-14 18:10:51.371643585 +0200
@@ -189,7 +189,7 @@
# Logfile for saving tnt-session status
tnt_sessionlog /var/log/tntsession_status
# file for sound effects (only if compiled with TNT_SOUND!)
-# tnt_soundfile sounds.tnt
+tnt_soundfile sounds.tnt
# socket for digipoint box
# use "0", if you don't want to use dpbox
diff -Nur tnt-1.9.2.orig/po/de.po tnt-1.9.2/po/de.po
--- tnt-1.9.2.orig/po/de.po 2002-11-17 00:13:51.000000000 +0100
+++ tnt-1.9.2/po/de.po 2010-07-14 18:10:51.382894372 +0200
@@ -8,6 +8,7 @@
"Project-Id-Version: TNT 1.9\n"
"POT-Creation-Date: 2002-11-17 00:09+0100\n"
"PO-Revision-Date: 2002-11-17 00:06+0100\n"
+"Language-Team: Matthias Hensler <matthias@wspse.de>\n"
"Last-Translator: Matthias Hensler <matthias@wspse.de>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=iso-8859-1\n"
diff -Nur tnt-1.9.2.orig/po/fr.po tnt-1.9.2/po/fr.po
--- tnt-1.9.2.orig/po/fr.po 2002-11-17 00:13:51.000000000 +0100
+++ tnt-1.9.2/po/fr.po 2010-07-14 18:10:51.382894372 +0200
@@ -9,6 +9,7 @@
"Project-Id-Version: TNT 1.9\n"
"POT-Creation-Date: 2002-11-17 00:09+0100\n"
"PO-Revision-Date: 2000-01-31 22:28+0200\n"
+"Language-Team: Laurent F5SOH <f5soh@bigfoot.com>\n"
"Last-Translator: Laurent F5SOH <f5soh@bigfoot.com>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=iso-8859-1\n"
@@ -990,7 +991,7 @@
#: src/remote.c:3611
#, c-format
msgid "<TNT>:station %s not connected!%s"
-msgstr "<TNT>:la station n'est pas connectee!%s"
+msgstr "<TNT>:la station %s n'est pas connectee!%s"
#: src/remote.c:3620
#, c-format
diff -Nur tnt-1.9.2.orig/po/Makefile.in.in tnt-1.9.2/po/Makefile.in.in
--- tnt-1.9.2.orig/po/Makefile.in.in 2000-01-06 02:16:50.000000000 +0100
+++ tnt-1.9.2/po/Makefile.in.in 2010-07-14 18:10:51.371643585 +0200
@@ -119,8 +119,8 @@
for cat in $$catalogs; do \
cat=`basename $$cat`; \
case "$$cat" in \
- *.gmo) destdir=$(gnulocaledir);; \
- *) destdir=$(localedir);; \
+ *.gmo) destdir=$(DESTDIR)$(gnulocaledir);; \
+ *) destdir=$(DESTDIR)$(localedir);; \
esac; \
lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
dir=$$destdir/$$lang/LC_MESSAGES; \
diff -Nur tnt-1.9.2.orig/src/ax25k.c tnt-1.9.2/src/ax25k.c
--- tnt-1.9.2.orig/src/ax25k.c 2000-02-07 15:03:55.000000000 +0100
+++ tnt-1.9.2/src/ax25k.c 2010-07-14 18:10:51.382894372 +0200
@@ -61,6 +61,11 @@
#define rosecmp rose_cmp
#define ax25validate ax25_validate
+#ifdef HAVE_NETAX25_AXCONFIG_H
+/* For ax25_config_* */
+#include <netax25/axconfig.h>
+#endif
+
#ifdef HAVE_NETAX25_PROCUTILS_H
/* Detlef Conradin */
#include <netax25/procutils.h>
diff -Nur tnt-1.9.2.orig/src/runprgs/Makefile.am tnt-1.9.2/src/runprgs/Makefile.am
--- tnt-1.9.2.orig/src/runprgs/Makefile.am 2000-01-06 02:16:52.000000000 +0100
+++ tnt-1.9.2/src/runprgs/Makefile.am 2010-07-14 18:10:51.382894372 +0200
@@ -2,17 +2,17 @@
tnt_conf_dir = @tnt_conf_dir@
tnt_log_dir = @tnt_log_dir@
-bindir = ${tnt_bin_dir}
+binarydir = ${tnt_bin_dir}
configdir = ${tnt_conf_dir}
logdir = ${tnt_log_dir}
rundir = @includedir@
-bin_PROGRAMS = help info logcall
-bin_DATA = .help .info .logcall
+binary_PROGRAMS = help info logcall
+binary_DATA = .help .info .logcall
run_HEADERS = tntrun.h
help_SOURCES = help.c tntrun.h
info_SOURCES = info.c tntrun.h
logcall_SOURCES = logcall.c tntrun.h
INCLUDES = -I../../intl
-EXTRA_DIST = READMEBIN tntrun.h.in $(bin_DATA)
+EXTRA_DIST = READMEBIN tntrun.h.in $(binary_DATA)
diff -Nur tnt-1.9.2.orig/src/tnt.h tnt-1.9.2/src/tnt.h
--- tnt-1.9.2.orig/src/tnt.h 2000-08-04 19:08:23.000000000 +0200
+++ tnt-1.9.2/src/tnt.h 2010-07-14 18:10:51.382894372 +0200
@@ -27,6 +27,7 @@
#endif /* TNT_LINUX */
#include <sys/time.h>
+#include <time.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
@@ -59,13 +60,40 @@
#include <termios.h>
#include <utime.h>
#include <dirent.h>
+#include <sys/wait.h>
#include "window.h"
#ifdef USE_HIBAUD
-#include <linux/fs.h>
-#include <linux/tty.h>
-#include <linux/serial.h>
+/* from linux/serial.h -- do not include linux/* or asm/* headers,
+ they won't work with glibc2
+*/
+#define ASYNC_SPD_HI 0x0010
+#define ASYNC_SPD_VHI 0x0020
+#define ASYNC_SPD_MASK 0x1030
+
+
+struct serial_struct {
+ int type;
+ int line;
+ unsigned int port;
+ int irq;
+ int flags;
+ int xmit_fifo_size;
+ int custom_divisor;
+ int baud_base;
+ unsigned short close_delay;
+ char io_type;
+ char reserved_char[1];
+ int hub6;
+ unsigned short closing_wait; /* time to wait before closing */
+ unsigned short closing_wait2; /* no longer used... */
+ unsigned char *iomem_base;
+ unsigned short iomem_reg_shift;
+ unsigned int port_high;
+ int reserved[1];
+};
+
#endif
#if defined(HAVE_WAIT_H)
