Index: head/astro/xtide/Makefile
===================================================================
--- head/astro/xtide/Makefile	(revision 296923)
+++ head/astro/xtide/Makefile	(revision 296924)
@@ -1,112 +1,113 @@
 # New ports collection makefile for:   xtide
 # Date created:        30 August 1997
 # Whom:                Brion Moss <brion@queeg.com>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	xtide
 PORTVERSION=	2.12.1
+PORTREVISION=	1
 CATEGORIES=	astro geography
 MASTER_SITES=	ftp://ftp.flaterco.com/xtide/ \
 		http://www.c-s.li/ports/
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
 		${TCD_DISTNAME}${EXTRACT_SUFX} \
-		${HARM_DISTNAME}${EXTRACT_SUFX}
+		${HARM_DISTNAME}-free${EXTRACT_SUFX}
 
 MAINTAINER=	cs@FreeBSD.org
 COMMENT=	Harmonic tide clock and tide predictor
 
 LICENSE=	GPLv3
 
 LIB_DEPENDS=	png.6:${PORTSDIR}/graphics/png
 
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 
 MAN1=		tide.1
 MAN8=		xttpd.8
 
 CPPFLAGS+=	-I../${TCD_DISTNAME} -I${LOCALBASE}/include/libpng
 LDFLAGS+=	-L../${TCD_DISTNAME}/.libs -L${LOCALBASE}/lib
 MAKE_JOBS_SAFE=	yes
 
 TCD_DISTNAME=	libtcd-2.2.5
-HARM_DISTNAME=	harmonics-dwf-20100529-free
+HARM_DISTNAME=	harmonics-dwf-20120302
 WVS_DISTNAME=	wvs
 
 OPTIONS=	WVS "Use world vector shoreline data (big file!)" Off
 
 .include <bsd.port.options.mk>
 .include <bsd.port.pre.mk>
 
 .if !defined(WITHOUT_WVS)
 DISTFILES+=	${WVS_DISTNAME}${EXTRACT_SUFX}
 PLIST_SUB+=	WVS=""
 .else
 PLIST_SUB+=	WVS="@comment "
 .endif
 
 .if defined(WITHOUT_X11)
 PKGNAMESUFFIX+=	-nox11
 ALL_TARGET+=	tide xttpd
 PLIST_SUB+=	X11="@comment "
 .else
 USE_XORG+=	xpm xaw
 MAN1+=		xtide.1
 PLIST_SUB+=	X11=""
 .endif
 
 post-extract:
-	@${LN} -sf ../${HARM_DISTNAME}.tcd ${WRKSRC}/harmonics.tcd
+	@${LN} -sf ../${HARM_DISTNAME}/${HARM_DISTNAME}-free.tcd ${WRKSRC}/harmonics.tcd
 
 post-patch:
 	@${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}/${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}
 
 post-configure:
 	@${SED} -e 's,%%PREFIX%%,${PREFIX},g' \
 		< ${FILESDIR}/xtide.conf.example > ${WRKDIR}/xtide.conf.example
 
 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}/xttpd.8 ${MAN8PREFIX}/man/man8
 	@${MKDIR} ${DATADIR}
 	${INSTALL_DATA} ${WRKSRC}/harmonics.tcd ${DATADIR}
 	${INSTALL_DATA} ${WRKDIR}/xtide.conf.example ${PREFIX}/etc
 
 post-install:
 .if !exists(${PREFIX}/etc/xtide.conf)
 	${INSTALL_DATA} ${WRKDIR}/xtide.conf.example ${PREFIX}/etc/xtide.conf
 	${CHMOD} 644 ${PREFIX}/etc/xtide.conf
 .endif
 
 .if !defined(WITHOUT_WVS)
 	@${MKDIR} ${DATADIR}/wvs
 	${INSTALL_DATA} ${WRKDIR}/wvs1.dat ${DATADIR}/wvs
 	${INSTALL_DATA} ${WRKDIR}/wvs12.dat ${DATADIR}/wvs
 	${INSTALL_DATA} ${WRKDIR}/wvs250k.dat ${DATADIR}/wvs
 	${INSTALL_DATA} ${WRKDIR}/wvs3.dat ${DATADIR}/wvs
 	${INSTALL_DATA} ${WRKDIR}/wvs43.dat ${DATADIR}/wvs
 	${INSTALL_DATA} ${WRKDIR}/wvsfull.dat ${DATADIR}/wvs
 .endif
 
 .include <bsd.port.post.mk>

Property changes on: head/astro/xtide/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.49
\ No newline at end of property
+1.50
\ No newline at end of property
Index: head/astro/xtide/distinfo
===================================================================
--- head/astro/xtide/distinfo	(revision 296923)
+++ head/astro/xtide/distinfo	(revision 296924)
@@ -1,8 +1,8 @@
 SHA256 (xtide-2.12.1.tar.bz2) = 0666dbb08dc207f85dc85795e133bd191b9ad5f86c87a153474423899a2fa3e2
 SIZE (xtide-2.12.1.tar.bz2) = 441212
 SHA256 (libtcd-2.2.5.tar.bz2) = 83d8b5661673eb841417e9aa7b14b3c1d233a6adf836c7d21805ff376165a1d6
 SIZE (libtcd-2.2.5.tar.bz2) = 271494
-SHA256 (harmonics-dwf-20100529-free.tar.bz2) = f6fe956b15cf05d24ec8e5accddfe90c7c6749046671e0ce167fb063bc2d9960
-SIZE (harmonics-dwf-20100529-free.tar.bz2) = 473148
+SHA256 (harmonics-dwf-20120302-free.tar.bz2) = 3d562d71dfb2b7f9a025ca5444607e1433d14ada112a375631ab8a823c870cb7
+SIZE (harmonics-dwf-20120302-free.tar.bz2) = 503459
 SHA256 (wvs.tar.bz2) = 4e996ce2e608d612ba78e35cdf50c2c73b01fce06bd5b561a7fe957ea75d6d75
 SIZE (wvs.tar.bz2) = 37461520

Property changes on: head/astro/xtide/distinfo
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.34
\ No newline at end of property
+1.35
\ No newline at end of property