8 files changed, 29 insertions, 25 deletions

diff --git a/comms/libticables2/Makefile b/comms/libticables2/Makefile
index f88b8d4f3f52..fe3ed98c342e 100644
--- a/comms/libticables2/Makefile
+++ b/comms/libticables2/Makefile
@@ -7,8 +7,9 @@
 
 PORTNAME=	libticables2
 PORTVERSION=	1.3.2
+PORTREVISION=	1
 CATEGORIES=	comms
-MASTER_SITES=	http://tijl.fastmail.fm/mirror/
+MASTER_SITES=	SF/tilp/tilp2-linux/tilp2-1.15
 
 MAINTAINER=	tijl@coosemans.org
 COMMENT=	TI calculator link cables library
@@ -27,8 +28,9 @@ CONFIGURE_ARGS=	--disable-nls
 PLIST_SUB=	NLS="@comment "
 .endif
 
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include"\
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
+CONFIGURE_ENV=	LDFLAGS="${LDFLAGS}"
 
 .include <bsd.port.pre.mk>
 
diff --git a/comms/libticables2/distinfo b/comms/libticables2/distinfo
index e3f91c0bf46e..e3d898c330eb 100644
--- a/comms/libticables2/distinfo
+++ b/comms/libticables2/distinfo
@@ -1,2 +1,2 @@
-SHA256 (libticables2-1.3.2.tar.bz2) = 5a8a43f1ca8fb7662c5a13035a6daa78699eb413e2300f09aaa6e286d9cab5cd
-SIZE (libticables2-1.3.2.tar.bz2) = 421098
+SHA256 (libticables2-1.3.2.tar.bz2) = 1c1f860f31b87c50d0068c7729dec927e6f12f4da11f56b7dd1a2a011ee9486d
+SIZE (libticables2-1.3.2.tar.bz2) = 737609
diff --git a/comms/libticalcs2/Makefile b/comms/libticalcs2/Makefile
index 45367e82c14d..806bc72f123b 100644
--- a/comms/libticalcs2/Makefile
+++ b/comms/libticalcs2/Makefile
@@ -6,17 +6,16 @@
 #
 
 PORTNAME=	libticalcs2
-PORTVERSION=	1.1.5
+PORTVERSION=	1.1.6
 CATEGORIES=	comms
-MASTER_SITES=	http://lpg.ticalc.org/prj_tilp/download/ \
-		http://tijl.fastmail.fm/mirror/
+MASTER_SITES=	SF/tilp/tilp2-linux/tilp2-1.15
 
 MAINTAINER=	tijl@coosemans.org
 COMMENT=	TI calculator library
 
 LIB_DEPENDS=	ticables2.4:${PORTSDIR}/comms/libticables2 \
-		ticonv.4:${PORTSDIR}/converters/libticonv \
-		tifiles2.6:${PORTSDIR}/devel/libtifiles2
+		ticonv.5:${PORTSDIR}/converters/libticonv \
+		tifiles2.7:${PORTSDIR}/devel/libtifiles2
 
 USE_AUTOTOOLS=	libtool
 USE_BZIP2=	yes
@@ -32,7 +31,8 @@ CONFIGURE_ARGS=	--disable-nls
 PLIST_SUB=	NLS="@comment "
 .endif
 
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include"\
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
+CONFIGURE_ENV=	LDFLAGS="${LDFLAGS}"
 
 .include <bsd.port.mk>
diff --git a/comms/libticalcs2/distinfo b/comms/libticalcs2/distinfo
index 731716647577..8ffe93435d87 100644
--- a/comms/libticalcs2/distinfo
+++ b/comms/libticalcs2/distinfo
@@ -1,2 +1,2 @@
-SHA256 (libticalcs2-1.1.5.tar.bz2) = 46e338554a77754485f19746fa508df7823bff9a410449ca66c02af9bd5e0320
-SIZE (libticalcs2-1.1.5.tar.bz2) = 471954
+SHA256 (libticalcs2-1.1.6.tar.bz2) = d9cabe94729d99d71b1e4f93ecfcfed57fe19eddd7cb72678e92e78109eaa3a4
+SIZE (libticalcs2-1.1.6.tar.bz2) = 498160
diff --git a/comms/libticalcs2/pkg-plist b/comms/libticalcs2/pkg-plist
index 195bf8d1fa12..0d12787c3209 100644
--- a/comms/libticalcs2/pkg-plist
+++ b/comms/libticalcs2/pkg-plist
@@ -8,7 +8,7 @@ include/tilp2/ticalcs.h
 lib/libticalcs2.a
 lib/libticalcs2.la
 lib/libticalcs2.so
-lib/libticalcs2.so.8
+lib/libticalcs2.so.9
 libdata/pkgconfig/ticalcs2.pc
 %%NLS%%share/locale/fr/LC_MESSAGES/libticalcs2.mo
 @dirrmtry include/tilp2
diff --git a/comms/tilp2/Makefile b/comms/tilp2/Makefile
index eb3e1cf4ff03..f84a44565494 100644
--- a/comms/tilp2/Makefile
+++ b/comms/tilp2/Makefile
@@ -6,19 +6,18 @@
 #
 
 PORTNAME=	tilp2
-PORTVERSION=	1.14
+PORTVERSION=	1.15
 CATEGORIES=	comms
-MASTER_SITES=	http://lpg.ticalc.org/prj_tilp/download/ \
-		http://tijl.fastmail.fm/mirror/
+MASTER_SITES=	SF/tilp/tilp2-linux/${DISTNAME}
 
 MAINTAINER=	tijl@coosemans.org
 COMMENT=	TI Linking Program
 
 BUILD_DEPENDS=	pkg-config:${PORTSDIR}/devel/pkg-config
 LIB_DEPENDS=	ticables2.4:${PORTSDIR}/comms/libticables2 \
-		tifiles2.6:${PORTSDIR}/devel/libtifiles2 \
-		ticalcs2.8:${PORTSDIR}/comms/libticalcs2 \
-		ticonv.4:${PORTSDIR}/converters/libticonv
+		tifiles2.7:${PORTSDIR}/devel/libtifiles2 \
+		ticalcs2.9:${PORTSDIR}/comms/libticalcs2 \
+		ticonv.5:${PORTSDIR}/converters/libticonv
 
 USE_AUTOTOOLS=	libtool
 USE_BZIP2=	yes
@@ -33,9 +32,10 @@ CONFIGURE_ARGS=	--disable-nls
 PLIST_SUB=	NLS="@comment "
 .endif
 
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS+=	--without-kde
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CONFIGURE_ENV=	LDFLAGS="${LDFLAGS}"
 
 MAN1=	tilp.1
 
diff --git a/comms/tilp2/distinfo b/comms/tilp2/distinfo
index 24ab1eb9a85f..78f01077d5aa 100644
--- a/comms/tilp2/distinfo
+++ b/comms/tilp2/distinfo
@@ -1,2 +1,2 @@
-SHA256 (tilp2-1.14.tar.bz2) = 2dd1d3689623f5fdfc19fdab0d34ede46a34ce342bca679c45692becf9b77520
-SIZE (tilp2-1.14.tar.bz2) = 5300295
+SHA256 (tilp2-1.15.tar.bz2) = 97953608c218593dcda5bab6ef2d3650927a33fa87b652e26fe9dfe9de1665c3
+SIZE (tilp2-1.15.tar.bz2) = 905102
diff --git a/comms/tilp2/pkg-plist b/comms/tilp2/pkg-plist
index 3bdff19c093f..4a1fdc389b12 100644
--- a/comms/tilp2/pkg-plist
+++ b/comms/tilp2/pkg-plist
@@ -3,6 +3,7 @@ bin/tilp
 %%DATADIR%%/COPYING
 %%DATADIR%%/Manpage.txt
 %%DATADIR%%/RELEASE
+%%DATADIR%%/builder/tilp.ui
 %%DATADIR%%/glade/action-2.glade
 %%DATADIR%%/glade/clist_rbm-2.glade
 %%DATADIR%%/glade/clock-2.glade
@@ -119,4 +120,5 @@ bin/tilp
 @dirrm %%DATADIR%%/icons
 @dirrm %%DATADIR%%/help
 @dirrm %%DATADIR%%/glade
+@dirrm %%DATADIR%%/builder
 @dirrm %%DATADIR%%