From owner-freebsd-ports-bugs@FreeBSD.ORG Wed Jul 19 23:20:17 2006 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 91EB916A4E1 for ; Wed, 19 Jul 2006 23:20:17 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id B0A0943D46 for ; Wed, 19 Jul 2006 23:20:16 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.4/8.13.4) with ESMTP id k6JNKGlX014045 for ; Wed, 19 Jul 2006 23:20:16 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id k6JNKGtA014044; Wed, 19 Jul 2006 23:20:16 GMT (envelope-from gnats) Resent-Date: Wed, 19 Jul 2006 23:20:16 GMT Resent-Message-Id: <200607192320.k6JNKGtA014044@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Edwin Groothuis Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8452216A4DA for ; Wed, 19 Jul 2006 23:12:24 +0000 (UTC) (envelope-from edwin@mavetju.org) Received: from mail2out.barnet.com.au (mail2out.barnet.com.au [202.83.176.14]) by mx1.FreeBSD.org (Postfix) with ESMTP id E8BC843D45 for ; Wed, 19 Jul 2006 23:12:23 +0000 (GMT) (envelope-from edwin@mavetju.org) Received: by mail2out.barnet.com.au (Postfix, from userid 27) id 27E82707456; Thu, 20 Jul 2006 09:12:22 +1000 (EST) Received: from mail2-auth.barnet.com.au (mail2.barnet.com.au [202.83.176.13]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by mail2.barnet.com.au (Postfix) with ESMTP id C11CD70744C for ; Thu, 20 Jul 2006 09:12:21 +1000 (EST) Received: from k7.mavetju (unknown [10.251.1.18]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by mail2-auth.barnet.com.au (Postfix) with ESMTP id F2E02707445 for ; Thu, 20 Jul 2006 09:12:20 +1000 (EST) Received: by k7.mavetju (Postfix, from userid 1001) id 5D922F7; Thu, 20 Jul 2006 09:12:20 +1000 (EST) Message-Id: <20060719231220.5D922F7@k7.mavetju> Date: Thu, 20 Jul 2006 09:12:20 +1000 (EST) From: Edwin Groothuis To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/100584: sysutils/portsnap - cleanup X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Edwin Groothuis List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 19 Jul 2006 23:20:17 -0000 >Number: 100584 >Category: ports >Synopsis: sysutils/portsnap - cleanup >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Wed Jul 19 23:20:16 GMT 2006 >Closed-Date: >Last-Modified: >Originator: Edwin Groothuis >Release: FreeBSD 6.1-RELEASE i386 >Organization: - >Environment: System: FreeBSD k7.mavetju 6.1-RELEASE FreeBSD 6.1-RELEASE #0: Sun May 7 04:42:56 UTC 2006 root@opus.cse.buffalo.edu:/usr/obj/usr/src/sys/SMP i386 >Description: - move pkg-message to files/pkg-message.in and use SUB_FILES - move post-extract to post-patch and use REINPLACE_CMD - replace ${PREFIX} in man-page with %%PREFIX%% and then REINPLACE_CMD over it. - Make replacement in former post-extract actually work due to changed layout of the file. >How-To-Repeat: >Fix: Index: Makefile =================================================================== RCS file: /home/pcvs/ports/sysutils/portsnap/Makefile,v retrieving revision 1.15 diff -u -r1.15 Makefile --- Makefile 26 May 2006 23:36:12 -0000 1.15 +++ Makefile 19 Jul 2006 23:10:17 -0000 @@ -31,15 +31,12 @@ libexec/phttpget \ libexec/make_index portsnap/.package.this.directory PLIST_DIRS= portsnap - +SUB_FILES= pkg-message PKGMESSAGE= ${WRKDIR}/pkg-message -post-extract: - ${SED} -e "s#PREFIX=/usr/local#PREFIX=${PREFIX}#g" \ - ${WRKSRC}/portsnap > ${WRKSRC}/portsnap.new - ${MV} ${WRKSRC}/portsnap.new ${WRKSRC}/portsnap - @${SED} -e "s=%%PREFIX%%=${PREFIX}=g" ${PKGDIR}/pkg-message \ - > ${PKGMESSAGE} +post-patch: + ${REINPLACE_CMD} -e "s,%%PREFIX%%,${PREFIX},g" \ + ${WRKSRC}/portsnap ${WRKSRC}/portsnap.8 do-install: ${INSTALL_SCRIPT} ${WRKSRC}/portsnap ${PREFIX}/sbin Index: pkg-message =================================================================== RCS file: pkg-message diff -N pkg-message --- pkg-message 20 Mar 2005 09:38:26 -0000 1.3 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,20 +0,0 @@ - -Before you can use portsnap, you will have to create an update configuration -file specifying the server from which to fetch snapshots and the sha256 hash -of the openssl public key which is trusted to sign the snapshots. - -A sample configuration file has been installed in - - %%PREFIX%%/etc/portsnap.conf.sample - -which will fetch snapshots built and signed by the author. If you want to -use these updates, copy that file to - - %%PREFIX%%/etc/portsnap.conf - -otherwise, create that file as appropriate. - -NOTE TO USERS UPGRADING FROM PORTSNAP 0.3.1 OR EARLIER: The structure -of the portsnap configuration file has changed; you will have to replace -your existing portsnap.conf with a new version. - Index: files/patch-portsnap =================================================================== RCS file: files/patch-portsnap diff -N files/patch-portsnap --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/patch-portsnap 19 Jul 2006 23:10:17 -0000 @@ -0,0 +1,11 @@ +--- portsnap.orig Thu Jul 20 09:00:57 2006 ++++ portsnap Thu Jul 20 09:01:14 2006 +@@ -81,7 +81,7 @@ + NDEBUG="" + DDSTATS="" + INDEXONLY="" +- PREFIX="/usr/local" ++ PREFIX="%%PREFIX%%" + SERVERNAME="" + REFUSE="" + LOCALDESC="" Index: files/patch-portsnap.8 =================================================================== RCS file: files/patch-portsnap.8 diff -N files/patch-portsnap.8 --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/patch-portsnap.8 19 Jul 2006 23:10:17 -0000 @@ -0,0 +1,41 @@ +--- portsnap.8.orig Sat May 27 09:21:29 2006 ++++ portsnap.8 Thu Jul 20 09:06:29 2006 +@@ -57,13 +57,13 @@ + Store working files (e.g. downloaded updates) in + .Ar workdir . + (default: +-.Pa $PREFIX/portsnap , ++.Pa %%PREFIX%%/portsnap , + or as given in the configuration file.) + .It Fl f Ar conffile + Read the configuration from from + .Ar conffile . + (default: +-.Pa $PREFIX/etc/portsnap.conf ) ++.Pa %%PREFIX%%/etc/portsnap.conf ) + .It Fl I + For the + .Cm update +@@ -157,7 +157,7 @@ + .It + If your clock is set to local time, adding the line + .Pp +-.Dl 0 3 * * * root /usr/local/sbin/portsnap cron ++.Dl 0 3 * * * root /foo/sbin/portsnap cron + .Pp + to /etc/crontab is a good way to make sure you always have + an up-to-date snapshot of the ports tree available which +@@ -218,10 +218,10 @@ + may be published, but only in aggregate and after anonymizing the + individual systems. + .Sh FILES +-.Bl -tag -width "$PREFIX/etc/portsnap.conf" +-.It $PREFIX/etc/portsnap.conf ++.Bl -tag -width "%%PREFIX%%/etc/portsnap.conf" ++.It %%PREFIX%%/etc/portsnap.conf + Default location of the portsnap configuration file. +-.It $PREFIX/portsnap ++.It %%PREFIX%%/portsnap + Default location where compressed snapshots are stored. + .It /usr/ports + Default location where the ports tree is extracted. Index: files/pkg-message.in =================================================================== RCS file: files/pkg-message.in diff -N files/pkg-message.in --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/pkg-message.in 19 Jul 2006 23:10:17 -0000 @@ -0,0 +1,20 @@ + +Before you can use portsnap, you will have to create an update configuration +file specifying the server from which to fetch snapshots and the sha256 hash +of the openssl public key which is trusted to sign the snapshots. + +A sample configuration file has been installed in + + %%PREFIX%%/etc/portsnap.conf.sample + +which will fetch snapshots built and signed by the author. If you want to +use these updates, copy that file to + + %%PREFIX%%/etc/portsnap.conf + +otherwise, create that file as appropriate. + +NOTE TO USERS UPGRADING FROM PORTSNAP 0.3.1 OR EARLIER: The structure +of the portsnap configuration file has changed; you will have to replace +your existing portsnap.conf with a new version. + >Release-Note: >Audit-Trail: >Unformatted: