From owner-freebsd-ports Fri Jun 23 13:30:15 2000 Delivered-To: freebsd-ports@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.ORG [204.216.27.21]) by hub.freebsd.org (Postfix) with ESMTP id 0B6F737C45C for ; Fri, 23 Jun 2000 13:30:01 -0700 (PDT) (envelope-from gnats@FreeBSD.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.9.3/8.9.2) id NAA67666; Fri, 23 Jun 2000 13:30:00 -0700 (PDT) (envelope-from gnats@FreeBSD.org) Received: from hyperhost.net (hyperhost.net [207.159.132.249]) by hub.freebsd.org (Postfix) with ESMTP id C76F837B78D for ; Fri, 23 Jun 2000 13:23:00 -0700 (PDT) (envelope-from root@hyperhost.net) Received: from foobar.foobar.eyep.net (postfix@p6.a8.du.radix.net [207.192.132.134]) by hyperhost.net (8.9.3/8.9.3) with ESMTP id QAA21990 for ; Fri, 23 Jun 2000 16:22:56 -0400 (EDT) Received: by foobar.foobar.eyep.net (Postfix, from userid 0) id 5237A1381DD; Fri, 23 Jun 2000 16:20:10 -0400 (EDT) Message-Id: <20000623202010.5237A1381DD@foobar.foobar.eyep.net> Date: Fri, 23 Jun 2000 16:20:10 -0400 (EDT) From: patseal@hyperhost.net Reply-To: patseal@hyperhost.net To: FreeBSD-gnats-submit@freebsd.org X-Send-Pr-Version: 3.2 Subject: ports/19478: Fixes: astro/xtide Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.org >Number: 19478 >Category: ports >Synopsis: Fixes: astro/xtide >Confidential: no >Severity: serious >Priority: medium >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: sw-bug >Submitter-Id: current-users >Arrival-Date: Fri Jun 23 13:30:00 PDT 2000 >Closed-Date: >Last-Modified: >Originator: Patrick Seal >Release: FreeBSD 4.0-STABLE i386 >Organization: >Environment: >Description: * patch-ab: don't optimize (fix for alphas) * remove patches/patch-makefile * Honor PREFIX for the harmonics file location * Typo fix: HAS_CONFIGURE to GNU_CONFIGURE new file: patch-ab removed file: patch-makefile >How-To-Repeat: >Fix: diff -ruN xtide.orig/Makefile xtide/Makefile --- xtide.orig/Makefile Sun Jun 11 15:26:00 2000 +++ xtide/Makefile Fri Jun 23 16:00:45 2000 @@ -18,12 +18,15 @@ png.3:${PORTSDIR}/graphics/png USE_X_PREFIX= yes -HAS_CONFIGURE= yes +GNU_CONFIGURE= yes MAN1= xtide.1 tide.1 MANCOMPRESSED= no post-extract: @${GZCAT} ${DISTDIR}/harmonics.world.gz > ${WRKSRC}/harmonics + +post-patch: + @${PERL} -pi -e "s:%%PREFIX%%:${PREFIX}:g" ${WRKSRC}/TideContext.cc do-install: ${INSTALL_PROGRAM} ${WRKSRC}/xtide ${PREFIX}/bin diff -ruN xtide.orig/patches/patch-aa xtide/patches/patch-aa --- xtide.orig/patches/patch-aa Fri Jun 23 05:05:10 2000 +++ xtide/patches/patch-aa Fri Jun 23 16:00:37 2000 @@ -13,7 +13,7 @@ } } if (hfile_path.isNull()) -! hfile_path = "/usr/X11R6/share/xtide/harmonics"; +! hfile_path = "%%PREFIX%%/share/xtide/harmonics"; harmonicsPath = new HarmonicsPath (hfile_path); homedir = getenv ("HOME"); diff -ruN xtide.orig/patches/patch-ab xtide/patches/patch-ab --- xtide.orig/patches/patch-ab Wed Dec 31 19:00:00 1969 +++ xtide/patches/patch-ab Fri Jun 23 16:13:18 2000 @@ -0,0 +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 @@ + # 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 + + # Extra switches and libs determined by configure.in + + diff -ruN xtide.orig/patches/patch-makefile xtide/patches/patch-makefile --- xtide.orig/patches/patch-makefile Sun Jun 11 15:26:01 2000 +++ xtide/patches/patch-makefile Wed Dec 31 19:00:00 1969 @@ -1,13 +0,0 @@ ---- Makefile.in.old Tue May 30 16:26:52 2000 -+++ Makefile.in Tue May 30 16:27:01 2000 -@@ -14,7 +14,7 @@ - # 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 - - # Extra switches and libs determined by configure.in - - >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message