ports/150656: Update port: astro/xtide

[KATO Tsuguru]

>Number:         150656
>Category:       ports
>Synopsis:       Update port: astro/xtide
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Fri Sep 17 18:20:07 UTC 2010
>Closed-Date:
>Last-Modified:
>Originator:     KATO Tsuguru
>Release:        FreeBSD 7.3-RELEASE-p2 i386
>Organization:
>Environment:
>Description:
- Update libtcd to version 2.2.5
- Update harmonics file to version 20100529

>How-To-Repeat:
>Fix:

diff -urN /usr/ports/astro/xtide/Makefile astro/xtide/Makefile
--- /usr/ports/astro/xtide/Makefile	2010-09-17 15:51:02.000000000 +0900
+++ astro/xtide/Makefile	2010-09-17 15:52:53.000000000 +0900
@@ -7,13 +7,12 @@
 
 PORTNAME=	xtide
 PORTVERSION=	2.11
+PORTREVISION=	1
 CATEGORIES=	astro geography
 MASTER_SITES=	ftp://ftp.flaterco.com/xtide/
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
-		libtcd-2.2.4.tar.bz2 \
-		harmonics-dwf-20091227-free.tar.bz2
-EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX} \
-		libtcd-2.2.4.tar.bz2
+		${TCD_DISTNAME}${EXTRACT_SUFX} \
+		${HARM_DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	ports at FreeBSD.org
 COMMENT=	Harmonic tide clock and tide predictor
@@ -24,46 +23,45 @@
 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
 MAN8=		xttpd.8
+PLIST_FILES=	bin/tide bin/xttpd %%DATADIR%%/harmonics.tcd
 PLIST_DIRS=	%%DATADIR%%
 
+CPPFLAGS=	-I../${TCD_DISTNAME} -I${LOCALBASE}/include/libpng
+LDFLAGS=	-L../${TCD_DISTNAME}/.libs -L${LOCALBASE}/lib
+
+TCD_DISTNAME=	libtcd-2.2.5
+HARM_DISTNAME=	harmonics-dwf-20100529-free
+
+.include <bsd.port.pre.mk>
+
 .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:
-	@cd ${DISTDIR};${TAR} xzf ${DISTDIR}/harmonics-dwf-20091227-free.tar.bz2
-	@${MV} ${DISTDIR}/harmonics-dwf-20091227-free.tcd \
-		 ${WRKSRC}/harmonics.tcd
+	@${LN} -sf ../${HARM_DISTNAME}.tcd ${WRKSRC}/harmonics.tcd
 
 post-patch:
-	@${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 '/if test/s|==|=|g' ${WRKDIR}/${TCD_DISTNAME}/configure
 	@${REINPLACE_CMD} -e 's|/usr/X11R6|${LOCALBASE}|g' ${WRKSRC}/configure
 	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/Global.cc
 
 pre-configure:
-	@cd ${WRKDIR}/libtcd-2.2.4 \
+	@cd ${WRKDIR}/${TCD_DISTNAME} \
 		&& ${SETENV} ${CONFIGURE_ENV} \
 			CC="${CC}" CFLAGS="${CFLAGS}" \
 			CXX="${CXX}" CXXFLAGS="${CXXFLAGS}" \
 			${SH} ./configure --disable-shared \
 			${CONFIGURE_ARGS} \
+		&& ${MKDIR} ${WRKDIR}/${TCD_DISTNAME}/.libs \
 		&& ${SETENV} ${MAKE_ENV} ${GMAKE}
 
 do-install:
diff -urN /usr/ports/astro/xtide/distinfo astro/xtide/distinfo
--- /usr/ports/astro/xtide/distinfo	2010-09-17 15:51:03.000000000 +0900
+++ astro/xtide/distinfo	2010-09-14 01:22:29.000000000 +0900
@@ -1,9 +1,9 @@
 MD5 (xtide-2.11.tar.bz2) = 1d85890bb13b3345154e0f68831b7ebd
 SHA256 (xtide-2.11.tar.bz2) = a7a3f27b5f49b498c497d1e595c772cfb902892fdf87d386cbbea13f4d7924b3
 SIZE (xtide-2.11.tar.bz2) = 431228
-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
+MD5 (libtcd-2.2.5.tar.bz2) = 734a01597e5e6da05546b38adb27ae88
+SHA256 (libtcd-2.2.5.tar.bz2) = 83d8b5661673eb841417e9aa7b14b3c1d233a6adf836c7d21805ff376165a1d6
+SIZE (libtcd-2.2.5.tar.bz2) = 271494
+MD5 (harmonics-dwf-20100529-free.tar.bz2) = ac4be3f3d47565d95863db6f9670a8c1
+SHA256 (harmonics-dwf-20100529-free.tar.bz2) = f6fe956b15cf05d24ec8e5accddfe90c7c6749046671e0ce167fb063bc2d9960
+SIZE (harmonics-dwf-20100529-free.tar.bz2) = 473148
>Release-Note:
>Audit-Trail:
>Unformatted: