- Update libtcd and harmonics file

- Give the ability to build without X

PR:		ports/145925
Submitted by:	Tuc <freebsd-ports@t-b-o-h.net>

2 files changed, 32 insertions, 21 deletions

diff --git a/astro/xtide/Makefile b/astro/xtide/Makefile
index 4fe52743f179..86945b81e4d5 100644
--- a/astro/xtide/Makefile
+++ b/astro/xtide/Makefile
@@ -7,14 +7,14 @@
 
 PORTNAME=	xtide
 PORTVERSION=	2.10
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	astro geography
 MASTER_SITES=	ftp://ftp.flaterco.com/xtide/
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
-		libtcd-2.2.3.tar.bz2 \
-		harmonics-dwf-20071228-free.tcd.bz2
+		libtcd-2.2.4.tar.bz2 \
+		harmonics-dwf-20091227-free.tar.bz2
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX} \
-		libtcd-2.2.3.tar.bz2
+		libtcd-2.2.4.tar.bz2
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Harmonic tide clock and tide predictor
@@ -22,28 +22,37 @@ COMMENT=	Harmonic tide clock and tide predictor
 LIB_DEPENDS=	png.6:${PORTSDIR}/graphics/png
 
 USE_BZIP2=	yes
-USE_XORG=	xpm xaw
-USE_GNOME=	gnometarget
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
+MAN1=		tide.1
+PLIST_FILES=	bin/tide bin/xttpd %%DATADIR%%/harmonics.tcd
 
-MAN1=		tide.1 xtide.1
 MAN8=		xttpd.8
-PLIST_FILES=	bin/tide bin/xtide bin/xttpd %%DATADIR%%/harmonics.tcd
 PLIST_DIRS=	%%DATADIR%%
 
-CPPFLAGS=	-I../libtcd-2.2.3 -I${LOCALBASE}/include/libpng
-LDFLAGS=	-L../libtcd-2.2.3/.libs -L${LOCALBASE}/lib
+.if defined(WITHOUT_X11)
+PKGNAMESUFFIX=  -nox11
+ALL_TARGET= 	tide xttpd
+.else
+USE_XORG=	xpm xaw
+USE_GNOME=	gnometarget
+MAN1+=		xtide.1
+PLIST_FILES+=	bin/xtide
+.endif
+
+CPPFLAGS=	-I../libtcd-2.2.4 -I${LOCALBASE}/include/libpng
+LDFLAGS=	-L../libtcd-2.2.4/.libs -L${LOCALBASE}/lib
 
 .include <bsd.port.pre.mk>
 
 post-extract:
-	@${BZCAT} ${DISTDIR}/harmonics-dwf-20071228-free.tcd.bz2 \
-		> ${WRKSRC}/harmonics.tcd
+	@cd $(DISTDIR);${TAR} xzf ${DISTDIR}/harmonics-dwf-20091227-free.tar.bz2
+	@$(MV) $(DISTDIR)/harmonics-dwf-20091227-free.tcd \
+		 ${WRKSRC}/harmonics.tcd
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|== yes|= yes|g' ${WRKDIR}/libtcd-2.2.3/configure
+	@${REINPLACE_CMD} -e 's|== yes|= yes|g' ${WRKDIR}/libtcd-2.2.4/configure
 	@${REINPLACE_CMD} -e 's|/usr/X11R6|${LOCALBASE}|g' \
 		-e 's|png_check_sig|png_sig_cmp|' ${WRKSRC}/configure
 	@${REINPLACE_CMD} -e 's|/usr/X11R6|${LOCALBASE}|g' ${WRKSRC}/configure
@@ -52,7 +61,7 @@ post-patch:
 .endfor
 
 pre-configure:
-	@cd ${WRKDIR}/libtcd-2.2.3 \
+	@cd ${WRKDIR}/libtcd-2.2.4 \
 		&& ${SETENV} ${CONFIGURE_ENV} \
 			CC="${CC}" CFLAGS="${CFLAGS}" \
 			CXX="${CXX}" CXXFLAGS="${CXXFLAGS}" \
@@ -62,10 +71,12 @@ pre-configure:
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/tide ${PREFIX}/bin
+.if !defined(WITHOUT_X11)
 	${INSTALL_PROGRAM} ${WRKSRC}/xtide ${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/xtide.1 ${MANPREFIX}/man/man1
+.endif
 	${INSTALL_PROGRAM} ${WRKSRC}/xttpd ${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/tide.1 ${MANPREFIX}/man/man1
-	${INSTALL_MAN} ${WRKSRC}/xtide.1 ${MANPREFIX}/man/man1
 	${INSTALL_MAN} ${WRKSRC}/xttpd.8 ${MAN8PREFIX}/man/man8
 	@${MKDIR} ${DATADIR}
 	${INSTALL_DATA} ${WRKSRC}/harmonics.tcd ${DATADIR}
diff --git a/astro/xtide/distinfo b/astro/xtide/distinfo
index a8032598f990..3ee244553eb2 100644
--- a/astro/xtide/distinfo
+++ b/astro/xtide/distinfo
@@ -1,9 +1,9 @@
 MD5 (xtide-2.10.tar.bz2) = a14d9db748a86bed37769f38c4320ddd
 SHA256 (xtide-2.10.tar.bz2) = 3b19ae183149c07733580b1ce5e7c2d330efecb4e8817fafed9a74daf4388ab5
 SIZE (xtide-2.10.tar.bz2) = 393882
-MD5 (libtcd-2.2.3.tar.bz2) = 26d06f6f12371fac48b679af37aa94ec
-SHA256 (libtcd-2.2.3.tar.bz2) = be356f4dafb51cd8afedfa5d8a08eb55b06f3b29b158052c88625da11b32c6d8
-SIZE (libtcd-2.2.3.tar.bz2) = 249846
-MD5 (harmonics-dwf-20071228-free.tcd.bz2) = 1f9802af5a1b17491b31b6c827b56bf3
-SHA256 (harmonics-dwf-20071228-free.tcd.bz2) = 55563837650e217b7730e37a2c3b90b2b61fe1ae33d51e5c3249cd533e2dbbd0
-SIZE (harmonics-dwf-20071228-free.tcd.bz2) = 400031
+MD5 (libtcd-2.2.4.tar.bz2) = 7fe3a0604a048b604497bbbf055958f3
+SHA256 (libtcd-2.2.4.tar.bz2) = 601da0d17758127161869ecfb02eff6915f2d2ba797682dcdd29575fc284f820
+SIZE (libtcd-2.2.4.tar.bz2) = 250070
+MD5 (harmonics-dwf-20091227-free.tar.bz2) = 1dad5ae62f85b33b7ca249a08473ca79
+SHA256 (harmonics-dwf-20091227-free.tar.bz2) = 31cc47a7404b69d869d43f3a7f93bfe0dd3721fa081d9a3985a6cec6f20b7790
+SIZE (harmonics-dwf-20091227-free.tar.bz2) = 472946