Date: Thu, 11 May 2006 09:37:03 -0700 From: David Wolfskill <david@catwhisker.org> To: Volker Stolz <vs@FreeBSD.org> Cc: freebsd-ports-bugs@FreeBSD.org Subject: Re: ports/97120: GPSMan 6.2.1 -> 6.3 Message-ID: <20060511163703.GA17968@bunrab.catwhisker.org> In-Reply-To: <200605111312.k4BDCOQ5028708@freefall.freebsd.org> References: <200605111312.k4BDCOQ5028708@freefall.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
On Thu, May 11, 2006 at 01:12:24PM +0000, Volker Stolz wrote: > Synopsis: GPSMan 6.2.1 -> 6.3 > > State-Changed-From-To: feedback->suspended > State-Changed-By: vs > State-Changed-When: Thu May 11 13:11:57 UTC 2006 > State-Changed-Why: > David wants to get back to us as soon as the tarball stabilizes again. > > http://www.freebsd.org/cgi/query-pr.cgi?pr=97120 OK; the author has stabilized the tarbal, and I verified that there were no changes (other than datestamps in comments) between the tarball from which I worked and the current one. I've re-generated the distinfo file, then re-generated the patch, which I have copied below. (Note: I did this via reading the file into the edit buffer, not cut/paste, so tabs should be preserved.) Index: Makefile =================================================================== RCS file: /cvs/freebsd/ports/astro/gpsman/Makefile,v retrieving revision 1.15 diff -u -r1.15 Makefile --- Makefile 3 May 2006 05:14:05 -0000 1.15 +++ Makefile 11 May 2006 02:57:00 -0000 @@ -6,7 +6,7 @@ # PORTNAME= gpsman -PORTVERSION= 6.2.1 +PORTVERSION= 6.3 CATEGORIES= astro tk84 MASTER_SITES= http://www.ncc.up.pt/gpsman/gpsmanhtml/ MASTER_SITE_SUBDIR= science/cartography @@ -23,6 +23,11 @@ # MAN1= gpsman.1 # MANCOMPRESSED= yes +post-patch: + ${REINPLACE_CMD} "s|/dev/ttyS0|${GPSMAN_DEFAULT_PORT}|" ${WRKSRC}/util/exerciser.tcl + ${REINPLACE_CMD} "s|/dev/ttyS0|${GPSMAN_DEFAULT_PORT}|" ${WRKSRC}/manual/html/info/l_realtime.doc.txt + ${REINPLACE_CMD} "s|/dev/ttyS0|${GPSMAN_DEFAULT_PORT}|" ${WRKSRC}/gpsman.tcl + pre-install: @${REINPLACE_CMD} -e "s:%%PREFIX%%:${PREFIX}:g" ${WRKSRC}/gpsman.tcl @@ -55,3 +60,9 @@ .endif .include <bsd.port.mk> + +.if ${OSVERSION} < 600000 +GPSMAN_DEFAULT_PORT?= /dev/cuaa0 +.else +GPSMAN_DEFAULT_PORT?= /dev/cuad0 +.endif Index: distinfo =================================================================== RCS file: /cvs/freebsd/ports/astro/gpsman/distinfo,v retrieving revision 1.11 diff -u -r1.11 distinfo --- distinfo 22 Jan 2006 08:18:33 -0000 1.11 +++ distinfo 11 May 2006 16:25:42 -0000 @@ -1,3 +1,3 @@ -MD5 (gpsman-6.2.1.tgz) = b8a6fdd2e7b5e547a6b6296a86723ce5 -SHA256 (gpsman-6.2.1.tgz) = 19cf09bab8402ff0a6319a2a6e27f8d276c52090b6778bf6fc0bfe0f3320c42c -SIZE (gpsman-6.2.1.tgz) = 1137509 +MD5 (gpsman-6.3.tgz) = 8a1d23bb45929af3d0011a22bf3986fb +SHA256 (gpsman-6.3.tgz) = 3643f422f7ff9f21e2a085438556904fef76df77383ff52787128fdfd1e530db +SIZE (gpsman-6.3.tgz) = 1152069 Index: pkg-plist =================================================================== RCS file: /cvs/freebsd/ports/astro/gpsman/pkg-plist,v retrieving revision 1.8 diff -u -r1.8 pkg-plist --- pkg-plist 13 Dec 2004 07:25:50 -0000 1.8 +++ pkg-plist 11 May 2006 03:17:54 -0000 @@ -396,9 +396,6 @@ %%PORTDOCS%%%%DOCSDIR%%/html/GPSMandoc_61.html %%PORTDOCS%%%%DOCSDIR%%/html/GPSMandoc_62.html %%PORTDOCS%%%%DOCSDIR%%/html/GPSMandoc_63.html -%%PORTDOCS%%%%DOCSDIR%%/html/GPSMandoc_64.html -%%PORTDOCS%%%%DOCSDIR%%/html/GPSMandoc_65.html -%%PORTDOCS%%%%DOCSDIR%%/html/GPSMandoc_66.html %%PORTDOCS%%%%DOCSDIR%%/html/backgr.gif %%PORTDOCS%%%%DOCSDIR%%/html/blank.gif %%PORTDOCS%%%%DOCSDIR%%/html/gpsman-logo-small.gif Index: files/patch-gpsman.tcl =================================================================== RCS file: /cvs/freebsd/ports/astro/gpsman/files/patch-gpsman.tcl,v retrieving revision 1.4 diff -u -r1.4 patch-gpsman.tcl --- files/patch-gpsman.tcl 16 Jun 2004 15:08:50 -0000 1.4 +++ files/patch-gpsman.tcl 11 May 2006 02:50:30 -0000 @@ -1,29 +1,20 @@ diff -ruN gpsman.tcl gpsman.tcl ---- gpsman.tcl Fri Mar 7 07:16:40 2003 -+++ gpsman.tcl Mon Mar 10 17:28:28 2003 +--- gpsman.tcl Tue May 9 02:37:24 2006 ++++ gpsman.tcl Wed May 10 17:56:02 2006 @@ -1,6 +1,6 @@ #!/bin/sh - # This is a Tcl/Tk script to be interpreted by wish (Tk8.4 or better): \ + # This is a Tcl/Tk script to be interpreted by wish (Tk8.3 or better): \ -exec wish "$0" -- "$@" +exec wish8.4 "$0" -- "$@" # # gpsman --- GPS Manager: a manager for GPS receiver data -@@ -159,7 +159,7 @@ - set CMDLINE 1 - } - # otherwise the default is -- set DEFSPORT /dev/ttyS0 -+ set DEFSPORT /dev/cuaa0 - # path to directory containing user data - set USERDIR ~/.gpsman-dir - # name of user preferences file -@@ -182,7 +182,7 @@ +@@ -216,7 +216,7 @@ } # path to directory containing program files -set SRCDIR gmsrc +set SRCDIR %%PREFIX%%/share/gpsman/gmsrc - ## the following values can be set from the options dialog of the interface + # all other defaults configuration is now done in file $SRCDIR/config.tcl Thanks again! Peace, david (current hat: maintainer of astro/gpsman port) -- David H. Wolfskill david@catwhisker.org Spam received via "opt-out" lists is still spam, and should be treated as such. See http://www.catwhisker.org/~david/publickey.gpg for my public key.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20060511163703.GA17968>