From 32984354f31f2a0af2e781673718091eeeebee0b Mon Sep 17 00:00:00 2001
From: tijl <tijl@FreeBSD.org>
Date: Mon, 22 Apr 2013 19:36:24 +0000
Subject: 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.

---
 devel/libtifiles2/Makefile  | 37 +++++++++++++++++++++----------------
 devel/libtifiles2/distinfo  |  4 ++--
 devel/libtifiles2/pkg-descr |  3 +--
 devel/libtifiles2/pkg-plist |  3 +--
 4 files changed, 25 insertions(+), 22 deletions(-)

(limited to 'devel')

diff --git a/devel/libtifiles2/Makefile b/devel/libtifiles2/Makefile
index d03457c55e72..210b53b90f79 100644
--- a/devel/libtifiles2/Makefile
+++ b/devel/libtifiles2/Makefile
@@ -1,37 +1,42 @@
-# New ports collection makefile for:	libtifiles2
-# Date created:		11 October 2006
-# Whom:			Tijl Coosemans <tijl@ulyssis.org>
-#
 # $FreeBSD$
-#
 
 PORTNAME=	libtifiles2
-PORTVERSION=	1.1.5
+PORTVERSION=	1.1.6
 CATEGORIES=	devel
-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 file types library
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	ticonv.6:${PORTSDIR}/converters/libticonv
+LIB_DEPENDS=	ticonv:${PORTSDIR}/converters/libticonv
 
-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)
+OPTIONS_DEFINE=	NLS
+
+GNU_CONFIGURE=	yes
+CONFIGURE_ENV=	ARCHIVE_CFLAGS=" " ARCHIVE_LIBS="-larchive"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
+
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MNLS}
 USE_GETTEXT=	yes
-PLIST_SUB=	NLS=""
+PLIST_SUB+=	NLS=""
 .else
-CONFIGURE_ARGS=	--disable-nls
-PLIST_SUB=	NLS="@comment "
+CONFIGURE_ARGS+=--disable-nls
+PLIST_SUB+=	NLS="@comment "
 .endif
 
-CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
+post-patch:
+	@${REINPLACE_CMD} 's,libarchive,,' ${WRKSRC}/tifiles2.pc.in
 
 .include <bsd.port.mk>
diff --git a/devel/libtifiles2/distinfo b/devel/libtifiles2/distinfo
index 9b33c6e08eeb..7e8af1877981 100644
--- a/devel/libtifiles2/distinfo
+++ b/devel/libtifiles2/distinfo
@@ -1,2 +1,2 @@
-SHA256 (libtifiles2-1.1.5.tar.bz2) = 4e701c98863c778c3f6fa465e426af23df88c9feee6fc9a9ca224a629a91e274
-SIZE (libtifiles2-1.1.5.tar.bz2) = 460500
+SHA256 (libtifiles2-1.1.6.tar.bz2) = ec4d6acd1d135ee04256d04a5e1512c1ccaf82ad01e48f5e24d5c4da31ce898f
+SIZE (libtifiles2-1.1.6.tar.bz2) = 390447
diff --git a/devel/libtifiles2/pkg-descr b/devel/libtifiles2/pkg-descr
index 9f559c1db45f..27b1d6efe006 100644
--- a/devel/libtifiles2/pkg-descr
+++ b/devel/libtifiles2/pkg-descr
@@ -1,4 +1,3 @@
-The tifiles library is a library to handle the various TI calculator
-file formats.
+A library to handle TI calculator file formats.
 
 WWW: http://tilp.info/
diff --git a/devel/libtifiles2/pkg-plist b/devel/libtifiles2/pkg-plist
index c128b2075e54..08120b9a48d7 100644
--- a/devel/libtifiles2/pkg-plist
+++ b/devel/libtifiles2/pkg-plist
@@ -17,10 +17,9 @@ include/tilp2/types92p.h
 include/tilp2/typesnsp.h
 include/tilp2/typesv2.h
 include/tilp2/typesxx.h
-lib/libtifiles2.a
 lib/libtifiles2.la
 lib/libtifiles2.so
-lib/libtifiles2.so.8
+lib/libtifiles2.so.9
 libdata/pkgconfig/tifiles2.pc
 %%NLS%%share/locale/fr/LC_MESSAGES/libtifiles2.mo
 @dirrmtry include/tilp2
-- 
cgit