3 files changed, 28 insertions, 24 deletions

diff --git a/astro/xtide/Makefile b/astro/xtide/Makefile
index 078d5fd9ae30..a91f533baf22 100644
--- a/astro/xtide/Makefile
+++ b/astro/xtide/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	xtide
-PORTVERSION=	2.6.4
+PORTVERSION=	2.8.2
 CATEGORIES=	astro
 MASTER_SITES=	ftp://bel-marduk.unh.edu/xtide/
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX} harmonics-2004-02-08.tcd.gz
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX} harmonics-dwf-2005-06-05-v2.tcd.gz
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	ports@FreeBSD.org
@@ -20,28 +20,34 @@ LIB_DEPENDS=	png.5:${PORTSDIR}/graphics/png
 USE_X_PREFIX=	yes
 USE_XPM=	yes
 USE_REINPLACE=	yes
+USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CONFIGURE_ENV=	extracxxflags="${CPPFLAGS}" extraldflags="${LDFLAGS}"
 
 MAN1=		tide.1 xtide.1
-PLIST_FILES=	bin/tide bin/xtide %%DATADIR%%/harmonics.tcd
+MAN8=		xttpd.8
+PLIST_FILES=	bin/tide bin/xtide bin/xttpd %%DATADIR%%/harmonics.tcd
 PLIST_DIRS=	%%DATADIR%%
 
+CPPFLAGS=	`pkg-config --cflags-only-I libpng12` -I${LOCALBASE}/include
+LDFLAGS=	`pkg-config --libs-only-L libpng12` -L${LOCALBASE}/lib
+
 post-extract:
-	@${GZCAT} ${DISTDIR}/harmonics-2004-02-08.tcd.gz \
+	@${GZCAT} ${DISTDIR}/harmonics-dwf-2005-06-05-v2.tcd.gz \
 		> ${WRKSRC}/harmonics.tcd
 
 post-patch:
-	@${REINPLACE_CMD} -e "s:%%PREFIX%%:${PREFIX}:g" ${WRKSRC}/TideContext.cc
-	@${REINPLACE_CMD} -e "s:#include <malloc\.h>::g" ${WRKSRC}/libtcd/tcd.h
+	@${REINPLACE_CMD} -e 's|/usr/X11R6|${X11BASE}|g' ${WRKSRC}/configure
+	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/TideContext.cc
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/xtide ${PREFIX}/bin
 	${INSTALL_PROGRAM} ${WRKSRC}/tide ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/DOCUMENTATION/xtide.1 ${MANPREFIX}/man/man1
+	${INSTALL_PROGRAM} ${WRKSRC}/xtide ${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/xttpd ${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/DOCUMENTATION/tide.1 ${MANPREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/DOCUMENTATION/xtide.1 ${MANPREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/DOCUMENTATION/xttpd.8 ${MAN8PREFIX}/man/man8
 	@${MKDIR} ${DATADIR}
 	${INSTALL_DATA} ${WRKSRC}/harmonics.tcd ${DATADIR}
 
diff --git a/astro/xtide/distinfo b/astro/xtide/distinfo
index 3a0d3716b6a4..f4e6a5058a34 100644
--- a/astro/xtide/distinfo
+++ b/astro/xtide/distinfo
@@ -1,4 +1,4 @@
-MD5 (xtide-2.6.4.tar.gz) = 6b0d5f99586a6356dbfa498629d8f793
-SIZE (xtide-2.6.4.tar.gz) = 519254
-MD5 (harmonics-2004-02-08.tcd.gz) = 0217f409a98c88a70220ac8d9c091ac7
-SIZE (harmonics-2004-02-08.tcd.gz) = 839579
+MD5 (xtide-2.8.2.tar.gz) = 3218480ad7e147549b56cfa9fa103b50
+SIZE (xtide-2.8.2.tar.gz) = 528525
+MD5 (harmonics-dwf-2005-06-05-v2.tcd.gz) = 2c7e2c5ee2ae5c8b95b926ec8c3ecf56
+SIZE (harmonics-dwf-2005-06-05-v2.tcd.gz) = 392135
diff --git a/astro/xtide/files/patch-makefile b/astro/xtide/files/patch-makefile
index 28bab2a39a50..b131a0708b36 100644
--- a/astro/xtide/files/patch-makefile
+++ b/astro/xtide/files/patch-makefile
@@ -1,15 +1,13 @@
---- Makefile.in.orig	Thu Nov 21 02:43:25 2002
-+++ Makefile.in	Sun Mar 28 02:13:53 2004
-@@ -14,9 +14,9 @@
+--- Makefile.in.orig	Mon Dec 20 23:15:05 2004
++++ Makefile.in	Sat Jul 16 23:47:26 2005
+@@ -11,8 +11,8 @@
  # DEFS should include -Dacceptarg3_t=int (replace with the correct data type)
- CC = @CC@
  CXX = @CXX@
--CFLAGS = @extracflags@ @DEFS@ -O2 -I@includedir@ -Ilibtcd -c
--CXXFLAGS = @extracxxflags@ @DEFS@ -O2 -I@includedir@ -Ilibtcd -I$(XROOT)/include -I/usr/local/include -I/usr/contrib/include -c
--LDFLAGS = @extraldflags@ -L@libdir@ -L$(XROOT)/lib -L/usr/local/lib -L/usr/contrib/lib -o
-+CFLAGS = @CFLAGS@ @extracflags@ @DEFS@ -I@includedir@ -Ilibtcd @CPPFLAGS@ -c
-+CXXFLAGS = @CXXFLAGS@ @extracxxflags@ @DEFS@ -I@includedir@ -Ilibtcd -I$(XROOT)/include @CPPFLAGS@ -c
-+LDFLAGS = @LDFLAGS@ @extraldflags@ -L@libdir@ -L$(XROOT)/lib -o
+ CC = @CC@
+-CXXFLAGS = @extracxxflags@ @DEFS@ -I@includedir@ -Ilibtcd -I@xroot@/include @normalcxxflags@ -c
+-LDFLAGS = @extraldflags@ -L@libdir@ -L@xlibdir@ @normalldflags@ -o
++CXXFLAGS = @CXXFLAGS@ @DEFS@ -I@includedir@ -Ilibtcd -I@xroot@/include @extracxxflags@ -c
++LDFLAGS = @LDFLAGS@ -L@libdir@ -L@xlibdir@ @extraldflags@ -o
  
  # Extra switches and libs determined by configure.in
  extraswitches=@extraswitches@