Date: Mon, 23 Sep 2013 10:08:11 +0200 From: Pietro Cerutti <gahr@gahr.ch> To: David Wolfskill <david@catwhisker.org> Cc: freebsd-ports@freebsd.org Subject: Re: Help understanding ports tinderbox failure report? Message-ID: <20130923080810.GC25610@gahrfit.gahr.ch> In-Reply-To: <20130923005528.GA1616@albert.catwhisker.org> References: <20130923005528.GA1616@albert.catwhisker.org>
next in thread | previous in thread | raw e-mail | index | archive | help
--oj4kGyHlBMXGt3Le
Content-Type: multipart/mixed; boundary="pAwQNkOnpTn9IO2O"
Content-Disposition: inline
--pAwQNkOnpTn9IO2O
Content-Type: text/plain; charset=utf-8
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable
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+=3D 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?
--=20
Pietro Cerutti
gahr@gahr.ch
PGP Public Key:
http://gahr.ch/pgp
--pAwQNkOnpTn9IO2O
Content-Type: text/x-diff; charset=utf-8
Content-Disposition: attachment; filename="gpsman.diff"
Content-Transfer-Encoding: quoted-printable
Index: Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- Makefile (revision 327941)
+++ Makefile (working copy)
@@ -2,7 +2,7 @@
# $FreeBSD$
=20
PORTNAME=3D gpsman
-PORTVERSION=3D 6.4.4
+PORTVERSION=3D 6.4.4.1
CATEGORIES=3D astro tk geography
MASTER_SITES=3D SF/${PORTNAME}/distrib
EXTRACT_SUFX=3D .tgz
@@ -10,7 +10,7 @@
MAINTAINER=3D david@catwhisker.org
COMMENT=3D A Tcl/Tk-based GPS management utility
=20
-USE_TK_RUN=3D 84+
+USES+=3D tk:wrapper
=20
WRKSRC=3D ${WRKDIR}/${PORTNAME}-${PORTVERSION}
SUB_FILES=3D pkg-message
@@ -20,11 +20,8 @@
PORTDATA=3D *
PLIST_FILES=3D bin/gpsman
=20
-# MAN1=3D gpsman.1
-# MANCOMPRESSED=3D yes
+.include <bsd.port.options.mk>
=20
-.include <bsd.port.pre.mk>
-
.if ${OSVERSION} < 800045
GPSMAN_DEFAULT_PORT?=3D /dev/cuad0
.else
@@ -31,13 +28,17 @@
GPSMAN_DEFAULT_PORT?=3D /dev/cuau0
.endif
=20
+.if ${PORT_OPTIONS:MDOCS}
+MAN1=3D 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
=20
-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/h=
tml
@@ -61,4 +62,4 @@
@${CAT} ${PKGMESSAGE}
.endif
=20
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Index: distinfo
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- distinfo (revision 327941)
+++ distinfo (working copy)
@@ -1,2 +1,2 @@
-SHA256 (gpsman-6.4.4.tgz) =3D b7a6f94d24dfd47507240fd0f1e3db94305ca8485c31=
db3a9fbf9637656027fe
-SIZE (gpsman-6.4.4.tgz) =3D 1418214
+SHA256 (gpsman-6.4.4.1.tgz) =3D 214a8dbb3d8e0b0b798fc0cb1a422764d8747cd431=
105d55d54308d5deb9910c
+SIZE (gpsman-6.4.4.1.tgz) =3D 1417223
Index: files/patch-gpsman.tcl
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- 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" -- "$@"
=20
#
# gpsman --- GPS Manager: a manager for GPS receiver data
@@ -16,7 +16,7 @@
=20
# path to directory containing program files
-set SRCDIR gmsrc
-+set SRCDIR %%PREFIX%%/share/gpsman/gmsrc
++set SRCDIR %%DATADIR%%/gmsrc
=20
# all other defaults configuration is now done in file $SRCDIR/config.tcl
=20
Index: pkg-descr
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- pkg-descr (revision 327941)
+++ pkg-descr (working copy)
@@ -5,4 +5,4 @@
logging information in NMEA from any GPS receiver.
=20
Author: Miguel Filgueiras
-WWW: http://gpsman.sourceforge.net/
+WWW: http://gpsman.sourceforge.net/
--pAwQNkOnpTn9IO2O--
--oj4kGyHlBMXGt3Le
Content-Type: application/pgp-signature
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.21 (FreeBSD)
iEYEARECAAYFAlI/9uoACgkQwMJqmJVx947y9gCffzy3w/LKaTnN11N/XgsuLGT3
VK0An3E6VWNc8jrSaLC1LMCM7onr80n3
=jWBQ
-----END PGP SIGNATURE-----
--oj4kGyHlBMXGt3Le--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20130923080810.GC25610>