Update TiLP2+libraries and drop maintainership.

TiLP2 1.18, libticables2 1.3.5, libticalcs2 1.1.9, libticonv 1.1.5, and
libtifiles2 1.1.7

5 files changed, 53 insertions, 17 deletions

diff --git a/comms/tilp2/Makefile b/comms/tilp2/Makefile
index a18bc83fcdaa..2033081c7ddf 100644
--- a/comms/tilp2/Makefile
+++ b/comms/tilp2/Makefile
@@ -1,12 +1,11 @@
 # $FreeBSD$
 
 PORTNAME=	tilp2
-PORTVERSION=	1.17
-PORTREVISION=	2
+PORTVERSION=	1.18
 CATEGORIES=	comms
 MASTER_SITES=	SF/tilp/tilp2-linux/${DISTNAME}
 
-MAINTAINER=	tijl@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	TI Linking Program
 
 LICENSE=	GPLv2
@@ -16,25 +15,18 @@ LIB_DEPENDS=	libticables2.so:comms/libticables2	\
 		libticalcs2.so:comms/libticalcs2	\
 		libticonv.so:converters/libticonv
 
-USES=		desktop-file-utils gmake groff pkgconfig shared-mime-info \
-		tar:bzip2
+GNU_CONFIGURE=	yes
+INSTALL_TARGET=	install-strip
+USES=		autoreconf desktop-file-utils gettext gmake groff localbase \
+		libtool pkgconfig shared-mime-info tar:bzip2
 USE_GNOME=	gtk20 intltool
 
 OPTIONS_DEFINE=	NLS
 OPTIONS_SUB=	yes
 
-NLS_USES=	gettext
 NLS_CONFIGURE_ENABLE=	nls
 
-GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--without-kde
-CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
-
 post-patch:
-	@${REINPLACE_CMD} -e 's,^     USE_NLS=yes$$,,' ${WRKSRC}/configure
-	@${REINPLACE_CMD} -e 's|-D.*_DISABLE_DEPRECATED||g' \
-		${WRKSRC}/configure ${WRKSRC}/src/Makefile.in
 	@${REINPLACE_CMD} -e 's,/usr,${LOCALBASE},' ${WRKSRC}/src/bookmark.c
 
 .include <bsd.port.mk>
diff --git a/comms/tilp2/distinfo b/comms/tilp2/distinfo
index 646fa5a4d3a1..b30f84b5310e 100644
--- a/comms/tilp2/distinfo
+++ b/comms/tilp2/distinfo
@@ -1,2 +1,3 @@
-SHA256 (tilp2-1.17.tar.bz2) = 0bc744463450843c0f1e9deebf45af84a282304aff37865077ca7146d54ff6e7
-SIZE (tilp2-1.17.tar.bz2) = 892549
+TIMESTAMP = 1528399033
+SHA256 (tilp2-1.18.tar.bz2) = 7b3ab363eeb52504d6ef5811c5d264f8016060bb7bd427be5a064c2ed7384e47
+SIZE (tilp2-1.18.tar.bz2) = 536744
diff --git a/comms/tilp2/files/patch-configure.ac b/comms/tilp2/files/patch-configure.ac
new file mode 100644
index 000000000000..0db1b09b8833
--- /dev/null
+++ b/comms/tilp2/files/patch-configure.ac
@@ -0,0 +1,18 @@
+--- configure.ac.orig	2016-01-15 20:28:52 UTC
++++ configure.ac
+@@ -131,7 +131,6 @@ if test "x$kde" = "xdefault"; then
+ fi
+ if test "x$kde" = "xyes"; then
+         AC_PROG_CXX
+-        AC_PATH_KDE
+         AC_DEFINE(WITH_KDE, 1, [Use KDE support])
+ fi
+ AM_CONDITIONAL(USE_KDE, test "x$kde" = "xyes")
+@@ -245,7 +244,6 @@ case "$host" in
+ esac
+ 
+ # some extra flags
+-CFLAGS="$CFLAGS -DGTK_DISABLE_DEPRECATED"
+ CXXFLAGS="$CFLAGS -fno-rtti -fno-exceptions"
+ 
+ AC_SUBST(CFLAGS)
diff --git a/comms/tilp2/files/patch-src-Makefile.am b/comms/tilp2/files/patch-src-Makefile.am
new file mode 100644
index 000000000000..808ae29b314e
--- /dev/null
+++ b/comms/tilp2/files/patch-src-Makefile.am
@@ -0,0 +1,21 @@
+--- src/Makefile.am.orig	2016-03-14 19:55:57 UTC
++++ src/Makefile.am
+@@ -9,16 +9,13 @@ bin_PROGRAMS = tilp
+ tilp_CPPFLAGS = -I$(top_srcdir)/intl \
+ 	@TICABLES_CFLAGS@ @TIFILES_CFLAGS@ @TICALCS_CFLAGS@ @TICONV_CFLAGS@ \
+ 	@GLIB_CFLAGS@ @GTK_CFLAGS@ \
+-	@KDE_INCLUDES@ @QT_INCLUDES@ \
+ 	-DSHARE_DIR=\"$(pkgdatadir)\" \
+ 	-DLOCALEDIR=\"$(datadir)/locale\" \
+-	-DSYSCONFDIR=\"$(sysconfdir)\" \
+-	-DGTK_DISABLE_DEPRECATED
++	-DSYSCONFDIR=\"$(sysconfdir)\"
+ tilp_LDFLAGS = -export-dynamic
+ tilp_LDADD = @TICABLES_LIBS@ @TIFILES_LIBS@ @TICALCS_LIBS@ @TICONV_LIBS@ \
+ 	@GLIB_LIBS@ @GTK_LIBS@ \
+-	@LIB_KDECORE@ @LIB_KDEUI@ @LIB_KIO@ @LIB_QT@ @KDE_LDFLAGS@ \
+-	@QT_LDFLAGS@ @X_LDFLAGS@ @LIBZ@
++	@LIBZ@
+ tilp_SOURCES = *.h \
+ 	tilp_calcs.c tilp_cmdline.c tilp_config.c tilp_error.c \
+ 	tilp_files.c tilp_gif.c tilp_main.c \
diff --git a/comms/tilp2/pkg-plist b/comms/tilp2/pkg-plist
index 7c3f7f696da1..f3365ce97c7c 100644
--- a/comms/tilp2/pkg-plist
+++ b/comms/tilp2/pkg-plist
@@ -1,6 +1,8 @@
 bin/tilp
 man/man1/tilp.1.gz
+share/appdata/tilp.appdata.xml
 share/applications/tilp.desktop
+%%NLS%%share/locale/de/LC_MESSAGES/tilp2.mo
 %%NLS%%share/locale/fr/LC_MESSAGES/tilp2.mo
 share/mime/packages/tilp.xml
 %%DATADIR%%/COPYING
@@ -79,6 +81,7 @@ share/mime/packages/tilp.xml
 %%DATADIR%%/icons/Group.ico
 %%DATADIR%%/icons/Group_Backup.ico
 %%DATADIR%%/icons/Group_Var.ico
+%%DATADIR%%/icons/Image.ico
 %%DATADIR%%/icons/List.ico
 %%DATADIR%%/icons/Macro.ico
 %%DATADIR%%/icons/Matrix.ico
@@ -90,13 +93,13 @@ share/mime/packages/tilp.xml
 %%DATADIR%%/icons/Range.ico
 %%DATADIR%%/icons/Real.ico
 %%DATADIR%%/icons/String.ico
+%%DATADIR%%/icons/TIGroup.ico
 %%DATADIR%%/icons/TIicon1.ico
 %%DATADIR%%/icons/TIicon2.ico
 %%DATADIR%%/icons/TIicon3.ico
 %%DATADIR%%/icons/TIicon4.ico
 %%DATADIR%%/icons/Table_Setup.ico
 %%DATADIR%%/icons/Text.ico
-%%DATADIR%%/icons/TiGroup.ico
 %%DATADIR%%/icons/Unknown.ico
 %%DATADIR%%/icons/Vector.ico
 %%DATADIR%%/icons/Window_Setup.ico
@@ -122,4 +125,5 @@ share/mime/packages/tilp.xml
 %%DATADIR%%/pixmaps/tb_restore.png
 %%DATADIR%%/pixmaps/tb_send.png
 %%DATADIR%%/pixmaps/tb_trash.png
+%%DATADIR%%/pixmaps/tilp.png
 %%DATADIR%%/pixmaps/tilp.xpm