Update tilp2 and its libraries:

- tilp2 1.17
- libticables2 1.3.4, libticalcs2 1.1.8, libticonv 1.1.4, libtifiles2 1.1.6
- Add NLS option, remove libtool dependency, clean up Makefile and pkg-descr
- Bump PORTREVISION and trim Makefile header for emulators/tilem and
  emulators/tiemu3.

4 files changed, 33 insertions, 25 deletions

diff --git a/comms/libticalcs2/Makefile b/comms/libticalcs2/Makefile
index 7b8f5651c33a..f42148ef158f 100644
--- a/comms/libticalcs2/Makefile
+++ b/comms/libticalcs2/Makefile
@@ -1,39 +1,40 @@
-# New ports collection makefile for:	libticalcs2
-# Date created:		11 October 2006
-# Whom:			Tijl Coosemans <tijl@ulyssis.org>
-#
 # $FreeBSD$
-#
 
 PORTNAME=	libticalcs2
-PORTVERSION=	1.1.7
+PORTVERSION=	1.1.8
 CATEGORIES=	comms
-MASTER_SITES=	SF/tilp/tilp2-linux/tilp2-1.16
+MASTER_SITES=	SF/tilp/tilp2-linux/tilp2-1.17
 
 MAINTAINER=	tijl@coosemans.org
 COMMENT=	TI calculator library
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	ticables2.5:${PORTSDIR}/comms/libticables2 \
-		ticonv.6:${PORTSDIR}/converters/libticonv \
-		tifiles2.8:${PORTSDIR}/devel/libtifiles2
+LIB_DEPENDS=	ticables2:${PORTSDIR}/comms/libticables2	\
+		ticonv:${PORTSDIR}/converters/libticonv		\
+		tifiles2:${PORTSDIR}/devel/libtifiles2
 
-USE_AUTOTOOLS=	libtool
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_GNOME=	glib20 gnomehack pkgconfig
+USE_GNOME=	glib20
 USE_LDCONFIG=	yes
+USE_PKGCONFIG=	build
+USES=		pathfix
 
-.if !defined(WITHOUT_NLS)
-USE_GETTEXT=	yes
-PLIST_SUB=	NLS=""
-.else
-CONFIGURE_ARGS=	--disable-nls
-PLIST_SUB=	NLS="@comment "
-.endif
+OPTIONS_DEFINE=	NLS
 
+GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MNLS}
+USE_GETTEXT=	yes
+PLIST_SUB+=	NLS=""
+.else
+CONFIGURE_ARGS+=--disable-nls
+PLIST_SUB+=	NLS="@comment "
+.endif
+
 .include <bsd.port.mk>
diff --git a/comms/libticalcs2/distinfo b/comms/libticalcs2/distinfo
index 1c3686bbcba4..8f193fb08aa5 100644
--- a/comms/libticalcs2/distinfo
+++ b/comms/libticalcs2/distinfo
@@ -1,2 +1,2 @@
-SHA256 (libticalcs2-1.1.7.tar.bz2) = e16c79033c0eafa4ccda7fc56d018565bba1dfb70dd0b4c5f681bafe32a52ab0
-SIZE (libticalcs2-1.1.7.tar.bz2) = 525111
+SHA256 (libticalcs2-1.1.8.tar.bz2) = a8286f8a2552bcad96beab99ce254e67b3dc1a03eb9d82f8de4bdf7b8efc3496
+SIZE (libticalcs2-1.1.8.tar.bz2) = 524151
diff --git a/comms/libticalcs2/pkg-descr b/comms/libticalcs2/pkg-descr
index a503771efb59..ae7e37fe714b 100644
--- a/comms/libticalcs2/pkg-descr
+++ b/comms/libticalcs2/pkg-descr
@@ -1,4 +1,3 @@
-The ticalcs library is a library to communicate with various TI
-calculators.
+A library to communicate with TI calculators.
 
 WWW: http://tilp.info/
diff --git a/comms/libticalcs2/pkg-plist b/comms/libticalcs2/pkg-plist
index 6c6943e7653c..58e68b9c36ee 100644
--- a/comms/libticalcs2/pkg-plist
+++ b/comms/libticalcs2/pkg-plist
@@ -1,14 +1,22 @@
+include/tilp2/cmd73.h
+include/tilp2/dbus_pkt.h
+include/tilp2/dusb_cmd.h
+include/tilp2/dusb_rpkt.h
+include/tilp2/dusb_vpkt.h
 include/tilp2/export3.h
 include/tilp2/keys73.h
+include/tilp2/keys83.h
 include/tilp2/keys83p.h
+include/tilp2/keys86.h
 include/tilp2/keys89.h
 include/tilp2/keys92p.h
+include/tilp2/nsp_cmd.h
+include/tilp2/nsp_vpkt.h
 include/tilp2/stdints3.h
 include/tilp2/ticalcs.h
-lib/libticalcs2.a
 lib/libticalcs2.la
 lib/libticalcs2.so
-lib/libticalcs2.so.10
+lib/libticalcs2.so.11
 libdata/pkgconfig/ticalcs2.pc
 %%NLS%%share/locale/fr/LC_MESSAGES/libticalcs2.mo
 @dirrmtry include/tilp2