diff -urN /usr/ports/astro/xtide/Makefile astro/xtide/Makefile
--- /usr/ports/astro/xtide/Makefile	Sat Apr 12 22:35:17 2003
+++ astro/xtide/Makefile	Thu May  1 23:28:22 2003
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	xtide
-PORTVERSION=	2.4
+PORTVERSION=	2.5
 CATEGORIES=	astro
 MASTER_SITES=	ftp://bel-marduk.unh.edu/xtide/
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} harmonics.txt.gz
@@ -19,24 +19,28 @@
 
 IGNOREFILES=	harmonics.txt.gz
 
-USE_XPM=	yes
 USE_X_PREFIX=	yes
+USE_XPM=	yes
+USE_REINPLACE=	yes
 GNU_CONFIGURE=	yes
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib"
+
 MAN1=	xtide.1 tide.1
-MANCOMPRESSED=	no
 
 post-extract:
 	@${GZCAT} ${DISTDIR}/harmonics.txt.gz > ${WRKSRC}/harmonics
 
 post-patch:
-	@${PERL} -pi -e "s:%%PREFIX%%:${PREFIX}:g" ${WRKSRC}/TideContext.cc
+	@${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 ${PREFIX}/man/man1/xtide.1
-	${INSTALL_MAN} ${WRKSRC}/DOCUMENTATION/tide.1 ${PREFIX}/man/man1/tide.1
-	@${MKDIR} ${PREFIX}/share/xtide
-	${INSTALL_DATA} ${WRKSRC}/harmonics ${PREFIX}/share/xtide
+	${INSTALL_MAN} ${WRKSRC}/DOCUMENTATION/xtide.1 ${MANPREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/DOCUMENTATION/tide.1 ${MANPREFIX}/man/man1
+	@${MKDIR} ${DATADIR}
+	${INSTALL_DATA} ${WRKSRC}/harmonics ${DATADIR}
 
 .include <bsd.port.mk>
diff -urN /usr/ports/astro/xtide/distinfo astro/xtide/distinfo
--- /usr/ports/astro/xtide/distinfo	Sun Sep  2 02:55:08 2001
+++ astro/xtide/distinfo	Thu May  1 23:23:11 2003
@@ -1,2 +1,2 @@
-MD5 (xtide-2.4.tar.gz) = 8ae0e57f68b1df5e6594a609ef8e2271
+MD5 (xtide-2.5.tar.gz) = 8b98e5fb62610ac91d79ab4eb3ec7659
 MD5 (harmonics.txt.gz) = IGNORE
diff -urN /usr/ports/astro/xtide/files/patch-makefile astro/xtide/files/patch-makefile
--- /usr/ports/astro/xtide/files/patch-makefile	Mon Jun 12 04:26:01 2000
+++ astro/xtide/files/patch-makefile	Thu May  1 23:40:04 2003
@@ -1,13 +1,13 @@
---- Makefile.in.old	Tue May 30 16:26:52 2000
-+++ Makefile.in	Tue May 30 16:27:01 2000
-@@ -14,7 +14,7 @@
+--- Makefile.in.orig	Tue Apr 30 00:10:21 2002
++++ Makefile.in	Thu May  1 23:26:55 2003
+@@ -13,8 +13,8 @@
  # Compiler and flags
  # DEFS should include -Dacceptarg3_t=int (replace with the correct data type)
  CXX = @CXX@
 -CXXFLAGS = @extracxxflags@ @DEFS@ -O2 -I@includedir@ -I$(XROOT)/include -I/usr/local/include -I/usr/contrib/include -c
-+CXXFLAGS = @extracxxflags@ @DEFS@ -I@includedir@ -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 -s -o
+-LDFLAGS = @extraldflags@ -L@libdir@ -L$(XROOT)/lib -L/usr/local/lib -L/usr/contrib/lib -o
++CXXFLAGS = @CXXFLAGS@ @extracxxflags@ @DEFS@ -I$(XROOT)/include @CPPFLAGS@ -c
++LDFLAGS = @LDFLAGS@ @extraldflags@ -L$(XROOT)/lib -o
  
  # Extra switches and libs determined by configure.in
-
-
+ extraswitches=@extraswitches@