- Update to libticalcs 4.5.9, libtifiles 0.6.5, libticables 3.9.2 and tilp 6.79

PR:		ports/82407
Submitted by:	Tijl Coosemans <tijl@ulyssis.org> (maintainer)

10 files changed, 51 insertions, 84 deletions

diff --git a/comms/tilp/Makefile b/comms/tilp/Makefile
index 1b70f36..ef13cd4 100644
--- a/comms/tilp/Makefile
+++ b/comms/tilp/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	tilp
-PORTVERSION=	6.68
-PORTREVISION=	4
+PORTVERSION=	6.79
 CATEGORIES=	comms
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	tilp
@@ -16,36 +15,24 @@ MAINTAINER=	tijl@ulyssis.org
 COMMENT=	TI Linking Program
 
 BUILD_DEPENDS=	pkg-config:${PORTSDIR}/devel/pkgconfig
-LIB_DEPENDS=	ticalcs-4.5:${PORTSDIR}/devel/libticalcs \
-		ticables.10:${PORTSDIR}/comms/libticables \
-		tifiles.5:${PORTSDIR}/devel/libtifiles
+LIB_DEPENDS=	ticalcs.9:${PORTSDIR}/devel/libticalcs \
+		ticables.12:${PORTSDIR}/comms/libticables \
+		tifiles.6:${PORTSDIR}/devel/libtifiles
 
 USE_GETTEXT=	yes
 USE_GNOME=	gtk20 libglade2
 USE_X_PREFIX=	yes
 GNU_CONFIGURE=	yes
-USE_LIBTOOL_VER=	13
+USE_LIBTOOL_VER=	15
 USE_GMAKE=	yes
 
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include"\
-		LDFLAGS="-L${LOCALBASE}/lib"
+		LDFLAGS="-L${LOCALBASE}/lib -export-dynamic"
 
 MAN1=	tilp.1
 
 .include <bsd.port.pre.mk>
 
-.if defined(WITH_JPEG) || exists(${LOCALBASE}/lib/libjpeg.so.9)
-LIB_DEPENDS+=	jpeg.9:${PORTSDIR}/graphics/jpeg
-.else
-pre-everything::
-	@${ECHO_MSG}
-	@${ECHO_MSG} "======================================================="
-	@${ECHO_MSG} "If you want to compile with JPEG support, hit Ctrl-C"
-	@${ECHO_MSG} "right now and use \"make WITH_JPEG=yes\""
-	@${ECHO_MSG} "======================================================="
-	@${ECHO_MSG}
-.endif #WITH_JPEG
-
 post-install:
 	${MKDIR} ${PREFIX}/lib/tilp
 
diff --git a/comms/tilp/distinfo b/comms/tilp/distinfo
index 056c909..c0c6cb8 100644
--- a/comms/tilp/distinfo
+++ b/comms/tilp/distinfo
@@ -1,2 +1,2 @@
-MD5 (tilp-6.68.tar.gz) = 42ae4134fb486e12a38744a52ab773a6
-SIZE (tilp-6.68.tar.gz) = 1136145
+MD5 (tilp-6.79.tar.gz) = 859811ee87e0615e8370c71f8e3ba4ea
+SIZE (tilp-6.79.tar.gz) = 1195282
diff --git a/comms/tilp/files/patch-Makefile.in b/comms/tilp/files/patch-Makefile.in
index f93ccaf..9209822 100644
--- a/comms/tilp/files/patch-Makefile.in
+++ b/comms/tilp/files/patch-Makefile.in
@@ -1,10 +1,17 @@
---- Makefile.in.orig	Wed Aug 27 22:44:39 2003
-+++ Makefile.in	Wed Aug 27 22:45:35 2003
-@@ -185,7 +185,6 @@
+--- Makefile.in.orig	Thu May 26 17:00:53 2005
++++ Makefile.in	Thu Jun 16 20:21:34 2005
+@@ -190,11 +190,11 @@
+ 
  # subdirectories to scan
  SUBDIRS = \
- 	glade help icons man misc pixmaps src win32 \
--	plugins registry \
- 	po intl
+-	build desktop glade help icons intl \
+-	pixmaps po src registry plugins\
++	build glade help icons intl \
++	pixmaps po src\
+ $(am__append_1)
  
+-dist_pkgdata_DATA = COPYING RELEASE ./registry/tilp.registry
++dist_pkgdata_DATA = COPYING RELEASE
  
+ EXTRA_DIST = README.* TODO po/TRANSLATORS
+ subdir = .
diff --git a/comms/tilp/files/patch-man-Makefile.in b/comms/tilp/files/patch-man-Makefile.in
deleted file mode 100644
index 724f856..0000000
--- a/comms/tilp/files/patch-man-Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- man/Makefile.in.orig	Wed Aug 27 23:02:13 2003
-+++ man/Makefile.in	Wed Aug 27 23:03:09 2003
-@@ -393,7 +393,7 @@
- 	groff -Tascii -man $(man_MANS) > Manpage
- 	gcc cleaner.c -o cleaner
- 	./cleaner Manpage
--	dos2unix Manpage.txt
-+#	dos2unix Manpage.txt
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
- .NOEXPORT:
diff --git a/comms/tilp/files/patch-src-Makefile.in b/comms/tilp/files/patch-src-Makefile.in
deleted file mode 100644
index e7377af..0000000
--- a/comms/tilp/files/patch-src-Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/Makefile.in.orig	Fri Apr  9 14:10:34 2004
-+++ src/Makefile.in	Fri Apr  9 14:10:59 2004
-@@ -218,7 +218,7 @@
- 
- # libtool stuff: set export symbols for resolving
- tilp_LDFLAGS = $(LDFLAGS) $(no_undefined) #-lefence
--tilp_CFLAGS = $(CLFAGS) -DGTK_DISABLE_DEPRECATED
-+tilp_CFLAGS = $(CLFAGS)
- subdir = src
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
diff --git a/comms/tilp/files/patch-src-action.c b/comms/tilp/files/patch-src-action.c
deleted file mode 100644
index 9b89e4f..0000000
--- a/comms/tilp/files/patch-src-action.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/action.c.orig	Mon Apr 21 15:44:39 2003
-+++ src/action.c	Mon Apr 21 15:49:32 2003
-@@ -23,6 +23,7 @@
- 
- #include <gtk/gtk.h>
- #include <glade/glade.h>
-+#include <stdlib.h>
- #include <string.h>
- 
- #include "action.h"
diff --git a/comms/tilp/files/patch-src-tilp_misc.c b/comms/tilp/files/patch-src-tilp_misc.c
deleted file mode 100644
index eddd821..0000000
--- a/comms/tilp/files/patch-src-tilp_misc.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/tilp_misc.c.orig	Mon Apr 21 14:30:31 2003
-+++ src/tilp_misc.c	Mon Apr 21 12:44:08 2003
-@@ -78,7 +78,7 @@
- 	options.web_options = g_strdup("");
- 	strcpy(options.left_font_name, "");
- 	strcpy(options.right_font_name,
--	       "-adobe-courier-medium-r-*-*-*-125-*-*-*-*-*-*");
-+	       "-adobe-courier-medium-r-*-*-*-120-*-*-*-*-*-*");
- 	options.console_mode = !0;
- 	locale = setlocale(LC_ALL, NULL);
- 	strcpy(options.locale, locale);
diff --git a/comms/tilp/files/patch-src-tilp_plugin.c b/comms/tilp/files/patch-src-tilp_plugin.c
index 73c94e2..4279f2e 100644
--- a/comms/tilp/files/patch-src-tilp_plugin.c
+++ b/comms/tilp/files/patch-src-tilp_plugin.c
@@ -1,19 +1,18 @@
---- src/tilp_plugin.c.orig	Wed Apr 23 20:51:57 2003
-+++ src/tilp_plugin.c	Thu Apr 24 13:33:41 2003
-@@ -168,6 +168,7 @@
- 	g_dir_close(dir);
- 	DISPLAY(_("Done !\n"));
+--- src/tilp_plugin.c.orig	Mon Feb 14 18:53:16 2005
++++ src/tilp_plugin.c	Mon Feb 14 18:54:11 2005
+@@ -171,6 +171,7 @@
+ 	printl(0, _("Done !\n"));
  
-+#ifndef __BSD__
  	// Scan registry 
- 	DISPLAY(_("Scanning registry... "));
++#ifndef __BSD__
+ 	printl(0, _("scanning registry... "));
  #ifdef __WIN32__
-@@ -229,7 +230,7 @@
+ 	reg_fn = g_strconcat(inst_paths.base_dir, REG_FILE, NULL);
+@@ -231,6 +232,7 @@
  	}
  	fclose(reg);
- 	DISPLAY(_("Done !\n"));
--
+ 	printl(0, _("Done !\n"));
 +#endif
+ 
  	return 0;
  }
- 
diff --git a/comms/tilp/files/patch-src-tilp_printl.c b/comms/tilp/files/patch-src-tilp_printl.c
new file mode 100644
index 0000000..f73367b
--- /dev/null
+++ b/comms/tilp/files/patch-src-tilp_printl.c
@@ -0,0 +1,18 @@
+--- src/tilp_printl.c.orig	Fri Jun 17 15:14:20 2005
++++ src/tilp_printl.c	Fri Jun 17 15:25:20 2005
+@@ -161,6 +161,7 @@
+ skip_console:
+ #endif
+ 
++/*
+ 	if (flog == NULL) {
+     		flog = tilp_open_log("a");
+ 	}
+@@ -178,6 +179,7 @@
+ 
+ 	// print same stuffs in file
+ 	vfprintf(flog, format, log_ap);
++*/
+ 	va_end(log_ap);
+ 
+ 	// check for printing domain on next loop
diff --git a/comms/tilp/pkg-plist b/comms/tilp/pkg-plist
index 50d15b3..40ee76f 100644
--- a/comms/tilp/pkg-plist
+++ b/comms/tilp/pkg-plist
@@ -19,6 +19,8 @@ share/tilp/glade/extprgms-2.glade
 share/tilp/glade/extprgms-2.gladep
 share/tilp/glade/general-2.glade
 share/tilp/glade/general-2.gladep
+share/tilp/glade/logfile-2.glade
+share/tilp/glade/logfile-2.gladep
 share/tilp/glade/manpage-2.glade
 share/tilp/glade/manpage-2.gladep
 share/tilp/glade/pbars-2.glade
@@ -40,9 +42,6 @@ share/tilp/help/Image15.png
 share/tilp/help/Image17.png
 share/tilp/help/Image18.png
 share/tilp/help/Image20.png
-share/tilp/help/Makefile
-share/tilp/help/Makefile.am
-share/tilp/help/Makefile.in
 share/tilp/help/Manual_en.html
 share/tilp/help/Manual_fr.html
 share/tilp/help/action.png