diff options
| -rw-r--r-- | astro/xtide/Makefile | 16 | ||||
| -rw-r--r-- | astro/xtide/distinfo | 7 | ||||
| -rw-r--r-- | astro/xtide/files/patch-aa | 24 | ||||
| -rw-r--r-- | astro/xtide/files/patch-makefile | 16 | ||||
| -rw-r--r-- | astro/xtide/pkg-plist | 4 |
5 files changed, 40 insertions, 27 deletions
diff --git a/astro/xtide/Makefile b/astro/xtide/Makefile index d5487436d284..078d5fd9ae30 100644 --- a/astro/xtide/Makefile +++ b/astro/xtide/Makefile @@ -6,10 +6,10 @@ # PORTNAME= xtide -PORTVERSION= 2.5 +PORTVERSION= 2.6.4 CATEGORIES= astro MASTER_SITES= ftp://bel-marduk.unh.edu/xtide/ -DISTFILES= ${DISTNAME}${EXTRACT_SUFX} harmonics.txt.gz +DISTFILES= ${DISTNAME}${EXTRACT_SUFX} harmonics-2004-02-08.tcd.gz EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} MAINTAINER= ports@FreeBSD.org @@ -17,8 +17,6 @@ COMMENT= Harmonic tide clock and tide predictor LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png -IGNOREFILES= harmonics.txt.gz - USE_X_PREFIX= yes USE_XPM= yes USE_REINPLACE= yes @@ -27,13 +25,17 @@ CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" -MAN1= xtide.1 tide.1 +MAN1= tide.1 xtide.1 +PLIST_FILES= bin/tide bin/xtide %%DATADIR%%/harmonics.tcd +PLIST_DIRS= %%DATADIR%% post-extract: - @${GZCAT} ${DISTDIR}/harmonics.txt.gz > ${WRKSRC}/harmonics + @${GZCAT} ${DISTDIR}/harmonics-2004-02-08.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 do-install: ${INSTALL_PROGRAM} ${WRKSRC}/xtide ${PREFIX}/bin @@ -41,6 +43,6 @@ do-install: ${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} + ${INSTALL_DATA} ${WRKSRC}/harmonics.tcd ${DATADIR} .include <bsd.port.mk> diff --git a/astro/xtide/distinfo b/astro/xtide/distinfo index 1ade4c1f16a5..3a0d3716b6a4 100644 --- a/astro/xtide/distinfo +++ b/astro/xtide/distinfo @@ -1,3 +1,4 @@ -MD5 (xtide-2.5.tar.gz) = 8b98e5fb62610ac91d79ab4eb3ec7659 -SIZE (xtide-2.5.tar.gz) = 459985 -MD5 (harmonics.txt.gz) = IGNORE +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 diff --git a/astro/xtide/files/patch-aa b/astro/xtide/files/patch-aa index ff2730eac2e4..640b3a6890ff 100644 --- a/astro/xtide/files/patch-aa +++ b/astro/xtide/files/patch-aa @@ -1,19 +1,31 @@ -*** TideContext.cc.orig Sun Dec 5 15:12:17 1999 ---- TideContext.cc Mon Jun 19 22:51:03 2000 +*** TideContext.cc.orig Wed Feb 5 00:53:46 2003 +--- TideContext.cc Sun Mar 28 02:09:06 2004 *************** -*** 53,59 **** +*** 47,59 **** + Dstr hfile_path (getenv ("HFILE_PATH")); + if (hfile_path.isNull()) { + FILE *configfile; +! if ((configfile = fopen ("/etc/xtide.conf", "r"))) { + hfile_path.getline (configfile); + fclose (configfile); } } if (hfile_path.isNull()) -! hfile_path = "harmonics"; +! hfile_path = "harmonics.tcd"; harmonicsPath = new HarmonicsPath (hfile_path); homedir = getenv ("HOME"); ---- 53,59 ---- +--- 47,59 ---- + Dstr hfile_path (getenv ("HFILE_PATH")); + if (hfile_path.isNull()) { + FILE *configfile; +! if ((configfile = fopen ("%%PREFIX%%/etc/xtide.conf", "r"))) { + hfile_path.getline (configfile); + fclose (configfile); } } if (hfile_path.isNull()) -! hfile_path = "%%PREFIX%%/share/xtide/harmonics"; +! hfile_path = "%%PREFIX%%/share/xtide/harmonics.tcd"; harmonicsPath = new HarmonicsPath (hfile_path); homedir = getenv ("HOME"); diff --git a/astro/xtide/files/patch-makefile b/astro/xtide/files/patch-makefile index b1802637ae29..28bab2a39a50 100644 --- a/astro/xtide/files/patch-makefile +++ b/astro/xtide/files/patch-makefile @@ -1,13 +1,15 @@ ---- 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 +--- Makefile.in.orig Thu Nov 21 02:43:25 2002 ++++ Makefile.in Sun Mar 28 02:13:53 2004 +@@ -14,9 +14,9 @@ # DEFS should include -Dacceptarg3_t=int (replace with the correct data type) + CC = @CC@ CXX = @CXX@ --CXXFLAGS = @extracxxflags@ @DEFS@ -O2 -I@includedir@ -I$(XROOT)/include -I/usr/local/include -I/usr/contrib/include -c +-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 -+CXXFLAGS = @CXXFLAGS@ @extracxxflags@ @DEFS@ -I$(XROOT)/include @CPPFLAGS@ -c -+LDFLAGS = @LDFLAGS@ @extraldflags@ -L$(XROOT)/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 # Extra switches and libs determined by configure.in extraswitches=@extraswitches@ diff --git a/astro/xtide/pkg-plist b/astro/xtide/pkg-plist deleted file mode 100644 index 13b49d7ea3d5..000000000000 --- a/astro/xtide/pkg-plist +++ /dev/null @@ -1,4 +0,0 @@ -bin/xtide -bin/tide -share/xtide/harmonics -@dirrm share/xtide |