diff options
Diffstat (limited to 'misc')
| -rw-r--r-- | misc/xtide/MESSAGE | 8 | ||||
| -rw-r--r-- | misc/xtide/Makefile | 12 | ||||
| -rw-r--r-- | misc/xtide/PLIST | 5 | ||||
| -rw-r--r-- | misc/xtide/distinfo | 6 | ||||
| -rw-r--r-- | misc/xtide/patches/patch-ab | 6 | ||||
| -rw-r--r-- | misc/xtide/patches/patch-ac | 4 |
6 files changed, 20 insertions, 21 deletions
diff --git a/misc/xtide/MESSAGE b/misc/xtide/MESSAGE deleted file mode 100644 index 4a6e0a715e3..00000000000 --- a/misc/xtide/MESSAGE +++ /dev/null @@ -1,8 +0,0 @@ -=========================================================================== -$NetBSD: MESSAGE,v 1.2 2001/11/11 06:17:29 hubertf Exp $ - -You should copy the example xtide configuration file from -${PREFIX}/share/examples/xtide.conf to ${PREFIX}/etc/xtide.conf, and -edit it to conform to your spacifications. - -=========================================================================== diff --git a/misc/xtide/Makefile b/misc/xtide/Makefile index c43009bf3ae..9909c4a2546 100644 --- a/misc/xtide/Makefile +++ b/misc/xtide/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.4 2002/10/21 12:40:53 wiz Exp $ +# $NetBSD: Makefile,v 1.5 2003/07/22 21:14:46 jmmv Exp $ DISTNAME= xtide-2.4 PKGNAME= ${DISTNAME} -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= misc x11 MASTER_SITES= ftp://ftp.flaterco.com/xtide/ DISTFILES= ${XTIDE_SRC} harmonics.txt.gz offsets.xml.gz @@ -15,9 +15,14 @@ EXTRACT_ONLY= ${XTIDE_SRC} XTIDE_SRC= ${DISTNAME}${EXTRACT_SUFX} USE_BUILDLINK2= yes +USE_PKGINSTALL= yes GNU_CONFIGURE= yes USE_X11= yes +CONFIGURE_ARGS+=--sysconfdir="${PKG_SYSCONFDIR}" +EGDIR= ${PREFIX}/share/examples/xtide +CONF_FILES= ${EGDIR}/xtide.conf ${PKG_SYSCONFDIR}/xtide.conf + post-patch: @cd ${WRKSRC}/DOCUMENTATION; \ for f in *; do \ @@ -27,9 +32,10 @@ post-patch: post-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/xtide + ${INSTALL_DATA_DIR} ${EGDIR} ${GZCAT} ${DISTDIR}/harmonics.txt.gz > ${WRKDIR}/harmonics.txt ${GZCAT} ${DISTDIR}/offsets.xml.gz > ${WRKDIR}/offsets.xml - ${CP} ${FILESDIR}/xtide.conf ${PREFIX}/share/examples/xtide.conf + ${CP} ${FILESDIR}/xtide.conf ${EGDIR}/xtide.conf ${CP} ${WRKDIR}/harmonics.txt ${PREFIX}/share/xtide ${CP} ${WRKDIR}/offsets.xml ${PREFIX}/share/xtide diff --git a/misc/xtide/PLIST b/misc/xtide/PLIST index 86bd741336f..2b17b173a15 100644 --- a/misc/xtide/PLIST +++ b/misc/xtide/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.1 2001/11/01 01:30:02 zuntum Exp $ +@comment $NetBSD: PLIST,v 1.2 2003/07/22 21:14:46 jmmv Exp $ bin/xtide bin/tide sbin/xttpd @@ -7,5 +7,6 @@ man/man1/tide.1 man/man8/xttpd.8 share/xtide/harmonics.txt share/xtide/offsets.xml -share/examples/xtide.conf +share/examples/xtide/xtide.conf @dirrm share/xtide +@dirrm share/examples/xtide diff --git a/misc/xtide/distinfo b/misc/xtide/distinfo index 1c49df9fe0e..f8854bb07c5 100644 --- a/misc/xtide/distinfo +++ b/misc/xtide/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.3 2002/07/02 12:59:46 wiz Exp $ +$NetBSD: distinfo,v 1.4 2003/07/22 21:14:46 jmmv Exp $ SHA1 (xtide-2.4.tar.gz) = bbd97d1b11ea75bfb09df1c9ddd3e0bc5d3f3a35 Size (xtide-2.4.tar.gz) = 429295 bytes @@ -7,5 +7,5 @@ Size (harmonics.txt.gz) = 990208 bytes SHA1 (offsets.xml.gz) = 2cc596373b631e7a0146bac2b66a7754334ab5b7 Size (offsets.xml.gz) = 150845 bytes SHA1 (patch-aa) = 48b0c37ba2f664f14508c2096184e75784958205 -SHA1 (patch-ab) = eb7a432bb0f2aef65b1c1f885df942b37ad4c7c3 -SHA1 (patch-ac) = 6bfd233418ceeab1211248166a697ed824af1848 +SHA1 (patch-ab) = 889c68bce0bd78cfc1b5f7410364e8c39182cfec +SHA1 (patch-ac) = 142aac6372e02639a185ba1e99fa994df4e0d899 diff --git a/misc/xtide/patches/patch-ab b/misc/xtide/patches/patch-ab index 36fe8e4b565..44dac314406 100644 --- a/misc/xtide/patches/patch-ab +++ b/misc/xtide/patches/patch-ab @@ -1,4 +1,4 @@ -$NetBSD: patch-ab,v 1.1.1.1 2001/05/31 15:48:05 agc Exp $ +$NetBSD: patch-ab,v 1.2 2003/07/22 21:14:47 jmmv Exp $ --- TideContext.cc.orig Fri Mar 23 21:52:40 2001 +++ TideContext.cc Thu May 31 13:48:53 2001 @@ -7,13 +7,13 @@ $NetBSD: patch-ab,v 1.1.1.1 2001/05/31 15:48:05 agc Exp $ settings = in_settings; - // Get HFILE_PATH from environment or /etc/xtide.conf and create -+ // Get HFILE_PATH from environment or ${PREFIX}/etc/xtide.conf and create ++ // Get HFILE_PATH from environment or ${PKG_SYSCONFDIR}/xtide.conf and create // persistent HarmonicsPath Dstr hfile_path (getenv ("HFILE_PATH")); if (hfile_path.isNull()) { FILE *configfile; - if ((configfile = fopen ("/etc/xtide.conf", "r"))) { -+ if ((configfile = fopen (PREFIX "/etc/xtide.conf", "r"))) { ++ if ((configfile = fopen (PKG_SYSCONFDIR "/xtide.conf", "r"))) { hfile_path.getline (configfile); fclose (configfile); } diff --git a/misc/xtide/patches/patch-ac b/misc/xtide/patches/patch-ac index 1fb6a49b460..c263814dc93 100644 --- a/misc/xtide/patches/patch-ac +++ b/misc/xtide/patches/patch-ac @@ -1,4 +1,4 @@ -$NetBSD: patch-ac,v 1.2 2001/08/25 01:22:18 hubertf Exp $ +$NetBSD: patch-ac,v 1.3 2003/07/22 21:14:47 jmmv Exp $ --- Makefile.in.orig Sun Nov 7 17:39:32 1999 +++ Makefile.in @@ -8,7 +8,7 @@ $NetBSD: patch-ac,v 1.2 2001/08/25 01:22:18 hubertf Exp $ CXX = @CXX@ -CXXFLAGS = @extracxxflags@ @DEFS@ -O2 -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 -+CXXFLAGS = @extracxxflags@ @DEFS@ -O2 -I@includedir@ -I$(XROOT)/include -I/usr/local/include -I/usr/contrib/include -DPREFIX='"${prefix}"' -c ++CXXFLAGS = @extracxxflags@ @DEFS@ -O2 -I@includedir@ -I$(XROOT)/include -I/usr/local/include -I/usr/contrib/include -DPREFIX='"${prefix}"' -DPKG_SYSCONFDIR='"@sysconfdir@"' -c +LDFLAGS = @extraldflags@ -L@libdir@ -Wl,-R@libdir@ -L$(XROOT)/lib -Wl,-R$(XROOT)/lib -s -o # Extra switches and libs determined by configure.in |