Attachment 68413 Details for Bug 100584 – file.diff

[patch] file.diff

file.diff (text/plain), 4.77 KB, created by edwin on 2006-07-20 00:20:16 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: edwin

Created: 2006-07-20 00:20:16 UTC

Size: 4.77 KB

patch

obsolete

>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.
>+

Actions: View | Diff

Attachments on bug 100584: 68413