Update to 2.15.

PR:		206889
Submitted by:	Ports Fury.

3 files changed, 29 insertions, 26 deletions

diff --git a/astro/xtide/Makefile b/astro/xtide/Makefile
index 4b54761d87af..60eb00155cbf 100644
--- a/astro/xtide/Makefile
+++ b/astro/xtide/Makefile
@@ -2,12 +2,12 @@
 # $FreeBSD$
 
 PORTNAME=	xtide
-PORTVERSION=	2.14
+PORTVERSION=	2.15
 CATEGORIES=	astro geography
 MASTER_SITES=	ftp://ftp.flaterco.com/xtide/
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
-		${TCD_DISTNAME}${EXTRACT_SUFX} \
-		${HARM_DISTNAME}${EXTRACT_SUFX}
+		${DISTNAME_TCD}${EXTRACT_SUFX} \
+		${DISTNAME_HARM}${EXTRACT_SUFX}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Harmonic tide clock and tide predictor
@@ -25,28 +25,28 @@ INSTALL_TARGET=	install-strip
 USE_LDCONFIG=	yes
 
 CFLAGS+=	-Wno-deprecated-declarations
-CPPFLAGS+=	-I${TCD_WRKSRC} $$(libpng-config --I_opts)
-LDFLAGS+=	-L${TCD_WRKSRC}/.libs $$(libpng-config --L_opts)
+CPPFLAGS+=	-I${WRKSRC_TCD} $$(libpng-config --I_opts)
+LDFLAGS+=	-L${WRKSRC_TCD}/.libs $$(libpng-config --L_opts)
 
 OPTIONS_DEFINE=		WVS X11
 OPTIONS_DEFAULT=	X11
 OPTIONS_SUB=		yes
 
 WVS_DESC=		Use world vector shoreline data (37MB)
-WVS_DISTFILES=		${WVS_DISTNAME}${EXTRACT_SUFX}
+WVS_DISTFILES=		${DISTNAME_WVS}${EXTRACT_SUFX}
 X11_USE=		xorg=xaw,xpm
 X11_CONFIGURE_WITH=	x
 X11_DESKTOP_ENTRIES=	"XTide" "" "xtide" "xtide" "" ""
 
-TCD_DISTNAME=	libtcd-2.2.6-r2
-TCD_WRKSRC=	${WRKDIR}/${TCD_DISTNAME:C/-r[0-9]+//}
-HARM_DISTNAME=	harmonics-dwf-20141224-free
-HARM_WRKSRC=	${WRKDIR}/${HARM_DISTNAME:C/-free//}
-WVS_DISTNAME=	wvs
+DISTNAME_TCD=	libtcd-2.2.7-r2
+WRKSRC_TCD=	${WRKDIR}/${DISTNAME_TCD:C/-r[0-9]+//}
+DISTNAME_HARM=	harmonics-dwf-20151227-free
+WRKSRC_HARM=	${WRKDIR}/${DISTNAME_HARM:C/-free//}
+DISTNAME_WVS=	wvs
 
 post-patch:
 	@${REINPLACE_CMD} -e \
-		'/if test/s|==|=|g' ${TCD_WRKSRC}/configure
+		'/if test/s|==|=|g' ${WRKSRC_TCD}/configure
 	@${REINPLACE_CMD} -e \
 		's|/usr/X11R6|${LOCALBASE}|g' ${WRKSRC}/configure
 	@${REINPLACE_CMD} -e \
@@ -54,35 +54,38 @@ post-patch:
 		 s| /etc/| ${PREFIX}/etc/|' ${WRKSRC}/libxtide/Global.cc
 
 pre-configure:
-	@(cd ${TCD_WRKSRC} && ${SETENV} ${CONFIGURE_ENV} \
+	@(cd ${WRKSRC_TCD} && ${SETENV} ${CONFIGURE_ENV} \
 		CC="${CC}" CFLAGS="${CFLAGS} -fPIC" \
 		CXX="${CXX}" CXXFLAGS="${CXXFLAGS} -fPIC" \
 		${SH} ./configure ${CONFIGURE_ARGS})
 
 pre-build:
-	@(cd ${TCD_WRKSRC} && ${DO_MAKE_BUILD} ${ALL_TARGET})
+	@(cd ${WRKSRC_TCD} && ${DO_MAKE_BUILD} ${ALL_TARGET})
 
 post-build:
 	@${ECHO_CMD} -n > ${WRKDIR}/xtide.conf.sample
 	@${ECHO_CMD} "${DATADIR}/harmonics.tcd" >> ${WRKDIR}/xtide.conf.sample
 	@${ECHO_CMD} "${DATADIR}/wvs" >> ${WRKDIR}/xtide.conf.sample
-	@${LN} -sf ${HARM_DISTNAME}.tcd ${HARM_WRKSRC}/harmonics.tcd
+	@${LN} -sf ${DISTNAME_HARM}.tcd ${WRKSRC_HARM}/harmonics.tcd
 	@${LN} -sf icon_48x48_orig.png ${WRKSRC}/iconsrc/xtide.png
 
 pre-install:
-	@(cd ${TCD_WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} \
-		${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET})
+	@(cd ${WRKSRC_TCD} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} \
+		 ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET})
+	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libtcd.so.[0-9]*
 
 post-install:
 	(cd ${WRKDIR} && ${INSTALL_DATA} xtide.conf.sample \
 		${STAGEDIR}${PREFIX}/etc)
 	@${MKDIR} ${STAGEDIR}${DATADIR}
-	(cd ${HARM_WRKSRC} && ${INSTALL_DATA} harmonics.tcd \
+	(cd ${WRKSRC_HARM} && ${INSTALL_DATA} harmonics.tcd \
 		${STAGEDIR}${DATADIR})
+
 post-install-WVS-on:
 	@${MKDIR} ${STAGEDIR}${DATADIR}/wvs
 	(cd ${WRKDIR} && ${INSTALL_DATA} wvs*.dat \
 		${STAGEDIR}${DATADIR}/wvs)
+
 post-install-X11-on:
 	(cd ${WRKSRC}/iconsrc && ${INSTALL_DATA} xtide.png \
 		${STAGEDIR}${PREFIX}/share/pixmaps)
diff --git a/astro/xtide/distinfo b/astro/xtide/distinfo
index 49627739585b..32a9649b92f7 100644
--- a/astro/xtide/distinfo
+++ b/astro/xtide/distinfo
@@ -1,8 +1,8 @@
-SHA256 (xtide-2.14.tar.bz2) = b69ebd73e3798be5996a22c63b619537780ec8ed1ec5b92decf15fd4bc61320f
-SIZE (xtide-2.14.tar.bz2) = 695309
-SHA256 (libtcd-2.2.6-r2.tar.bz2) = 4dcc2e2f93a83063f5b77a678bcc585af753d92fe7905ed66ecf7af3c5c389cf
-SIZE (libtcd-2.2.6-r2.tar.bz2) = 304256
-SHA256 (harmonics-dwf-20141224-free.tar.bz2) = f8319a894429145053b44fd0324278511287293698c1e30b8f90b8e2c886bb18
-SIZE (harmonics-dwf-20141224-free.tar.bz2) = 528235
+SHA256 (xtide-2.15.tar.bz2) = e13b259a7fc3bf57274830ca728777d2a03fc2a3323290f4718162ddcd0535d8
+SIZE (xtide-2.15.tar.bz2) = 709805
+SHA256 (libtcd-2.2.7-r2.tar.bz2) = aff1f218b84106c572d094912cd11c828e1ea212db5661cdcc0e2e6253020a94
+SIZE (libtcd-2.2.7-r2.tar.bz2) = 308959
+SHA256 (harmonics-dwf-20151227-free.tar.bz2) = b382acfd94cefd6f6434ff3efdbecfd929abe3639e345979da7826a37ed5a7ac
+SIZE (harmonics-dwf-20151227-free.tar.bz2) = 499871
 SHA256 (wvs.tar.bz2) = 4e996ce2e608d612ba78e35cdf50c2c73b01fce06bd5b561a7fe957ea75d6d75
 SIZE (wvs.tar.bz2) = 37461520
diff --git a/astro/xtide/pkg-plist b/astro/xtide/pkg-plist
index 0fc343cf2d87..b7c9b53b8179 100644
--- a/astro/xtide/pkg-plist
+++ b/astro/xtide/pkg-plist
@@ -61,8 +61,8 @@ lib/libtcd.so
 lib/libtcd.so.1
 lib/libxtide.a
 lib/libxtide.so
-lib/libxtide.so.0
-lib/libxtide.so.0.0.0
+lib/libxtide.so.1
+lib/libxtide.so.1.0.0
 man/man1/tide.1.gz
 %%X11%%man/man1/xtide.1.gz
 man/man8/xttpd.8.gz