On 2013-Sep-22, 17:55, David Wolfskill wrote: > Back in July, I filed PR ports/180642 (as the port maintainer for > astro/gpsman) to update that port from 6.4.4 to 6.4.4.1. [snip] > I've attached a revised patch, to: > * Perform the 6.4.4 -> 6.4.4.1 upgrade. > * Replace the "USE_TK_RUN" (& "USE_TK_WRAPPER") with "USES+= tk:wrapper,run". > * Avoid showing the pkg-message if NOPORTDOCS is defined.
David,
please find attached a revised patch, including:
- the update to 6.4.4.1
- update to the new OPTIONS framework (s|NOPORTDOCS|!${PORTOPTIONS:MDOCS})
- install man pages along with docs
- fix wish and datadir paths in gpsman.tcl
Approved?
--
Pietro Cerutti
g...@gahr.ch
PGP Public Key:
http://gahr.ch/pgp
Index: Makefile
===================================================================
--- Makefile (revision 327941)
+++ Makefile (working copy)
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= gpsman
-PORTVERSION= 6.4.4
+PORTVERSION= 6.4.4.1
CATEGORIES= astro tk geography
MASTER_SITES= SF/${PORTNAME}/distrib
EXTRACT_SUFX= .tgz
@@ -10,7 +10,7 @@
MAINTAINER= da...@catwhisker.org
COMMENT= A Tcl/Tk-based GPS management utility
-USE_TK_RUN= 84+
+USES+= tk:wrapper
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
SUB_FILES= pkg-message
@@ -20,11 +20,8 @@
PORTDATA= *
PLIST_FILES= bin/gpsman
-# MAN1= gpsman.1
-# MANCOMPRESSED= yes
+.include <bsd.port.options.mk>
-.include <bsd.port.pre.mk>
-
.if ${OSVERSION} < 800045
GPSMAN_DEFAULT_PORT?= /dev/cuad0
.else
@@ -31,13 +28,17 @@
GPSMAN_DEFAULT_PORT?= /dev/cuau0
.endif
+.if ${PORT_OPTIONS:MDOCS}
+MAN1= gpsman.1
+.endif
+
post-patch:
- @(cd ${WRKSRC} && ${REINPLACE_CMD} "s|/dev/ttyS0|${GPSMAN_DEFAULT_PORT}|" \
- util/exerciser.tcl manual/html/info/l_realtime.doc.txt gpsman.tcl)
+ @${REINPLACE_CMD} "s|/dev/ttyS0|${GPSMAN_DEFAULT_PORT}|" \
+ ${WRKSRC}/util/exerciser.tcl \
+ ${WRKSRC}/manual/html/info/l_realtime.doc.txt \
+ ${WRKSRC}/gpsman.tcl
+ @${REINPLACE_CMD} -e "s:%%WISH%%:${WISH}:; s:%%DATADIR%%:${DATADIR}:g" ${WRKSRC}/gpsman.tcl
-pre-install:
- @${REINPLACE_CMD} -e "s:%%PREFIX%%:${PREFIX}:g" ${WRKSRC}/gpsman.tcl
-
do-install:
@${MKDIR} ${PREFIX}/share/gpsman/gmsrc/gmicons
@${MKDIR} ${PREFIX}/share/gpsman/util
@@ -47,8 +48,8 @@
${INSTALL_DATA} ${WRKSRC}/util/*.tcl ${PREFIX}/share/gpsman/util
${INSTALL_SCRIPT} ${WRKSRC}/gpsman.tcl ${PREFIX}/share/gpsman
${LN} -fs ${PREFIX}/share/gpsman/gpsman.tcl ${PREFIX}/bin/gpsman
-# ${INSTALL_MAN} ${WRKSRC}/gpsman.1 ${PREFIX}/man/man1
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
+ ${INSTALL_MAN} ${WRKSRC}/man/man1/gpsman.1 ${MAN1PREFIX}/man/man1
@${MKDIR} ${PREFIX}/share/doc/gpsman/html/info
${INSTALL_DATA} ${WRKSRC}/manual/*.pdf ${PREFIX}/share/doc/gpsman
${INSTALL_DATA} ${WRKSRC}/manual/html/*.html ${PREFIX}/share/doc/gpsman/html
@@ -61,4 +62,4 @@
@${CAT} ${PKGMESSAGE}
.endif
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Index: distinfo
===================================================================
--- distinfo (revision 327941)
+++ distinfo (working copy)
@@ -1,2 +1,2 @@
-SHA256 (gpsman-6.4.4.tgz) = b7a6f94d24dfd47507240fd0f1e3db94305ca8485c31db3a9fbf9637656027fe
-SIZE (gpsman-6.4.4.tgz) = 1418214
+SHA256 (gpsman-6.4.4.1.tgz) = 214a8dbb3d8e0b0b798fc0cb1a422764d8747cd431105d55d54308d5deb9910c
+SIZE (gpsman-6.4.4.1.tgz) = 1417223
Index: files/patch-gpsman.tcl
===================================================================
--- files/patch-gpsman.tcl (revision 327941)
+++ files/patch-gpsman.tcl (working copy)
@@ -7,7 +7,7 @@
#!/bin/sh
# This is a Tcl/Tk script to be interpreted by wish (Tk8.3 or better): \
-exec wish "$0" -- "$@"
-+exec wish8.4 "$0" -- "$@"
++exec %%WISH%% "$0" -- "$@"
#
# gpsman --- GPS Manager: a manager for GPS receiver data
@@ -16,7 +16,7 @@
# path to directory containing program files
-set SRCDIR gmsrc
-+set SRCDIR %%PREFIX%%/share/gpsman/gmsrc
++set SRCDIR %%DATADIR%%/gmsrc
# all other defaults configuration is now done in file $SRCDIR/config.tcl
Index: pkg-descr
===================================================================
--- pkg-descr (revision 327941)
+++ pkg-descr (working copy)
@@ -5,4 +5,4 @@
logging information in NMEA from any GPS receiver.
Author: Miguel Filgueiras
-WWW: http://gpsman.sourceforge.net/
+WWW: http://gpsman.sourceforge.net/
pgp2s1akEv8O4.pgp
Description: PGP signature
