Date: Tue, 01 Jun 2004 22:21:20 +0100 From: Tim Bishop <tim@bishnet.net> To: FreeBSD-gnats-submit@FreeBSD.org Cc: tim@bishnet.net Subject: ports/67462: [PATCH] misc/proxyper: update to 341 Message-ID: <E1BVGhE-000EC5-Dk@pendennis.ukc.ac.uk> Resent-Message-ID: <200406012130.i51LUOUx005260@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 67462 >Category: ports >Synopsis: [PATCH] misc/proxyper: update to 341 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Tue Jun 01 14:30:23 PDT 2004 >Closed-Date: >Last-Modified: >Originator: Tim Bishop >Release: FreeBSD 5.2.1-RELEASE-p5 i386 >Organization: >Environment: System: FreeBSD pendennis.ukc.ac.uk 5.2.1-RELEASE-p5 FreeBSD 5.2.1-RELEASE-p5 #0: Fri Apr 30 17:57:19 BST 2004 >Description: - Update to 341 - Take maintainership - Install configuration from a .sample file if it doesn't exist - Cleanup configuration only if it hasn't changed at deinstall - Install rc script as a .sample file instead of a .sh - Various other tweaks Generated with FreeBSD Port Tools 0.50 >How-To-Repeat: >Fix: --- proxyper-341.patch begins here --- Index: Makefile =================================================================== RCS file: /u1/freebsd/cvs/ports/misc/proxyper/Makefile,v retrieving revision 1.17 diff -u -r1.17 Makefile --- Makefile 11 Feb 2004 03:03:05 -0000 1.17 +++ Makefile 1 Jun 2004 14:42:06 -0000 @@ -5,15 +5,14 @@ # $FreeBSD: ports/misc/proxyper/Makefile,v 1.17 2004/02/11 03:03:05 linimon Exp $ # -PORTNAME= proxyper-freebsd3-elf-x86 -PORTVERSION= 333 -PORTREVISION= 1 +PORTNAME= proxyper +PORTVERSION= 341 CATEGORIES= misc MASTER_SITES= ftp://ftp.distributed.net/pub/dcti/proxyper/ \ http://http.distributed.net/pub/dcti/proxyper/ DISTNAME= proxyper${PORTVERSION}-freebsd-x86 -MAINTAINER= ports@FreeBSD.org +MAINTAINER= tim@bishnet.net COMMENT= The official distributed.net v2 personal proxy USE_REINPLACE= yes @@ -28,28 +27,36 @@ NO_BUILD= yes -BINDIR= ${PREFIX}/distributed.net/proxy/ -LIBDIR= ${PREFIX}/etc/rc.d/ +BINDIR= ${PREFIX}/distributed.net/proxy -PROXYUID= nobody -PROXYGID= daemon +PROXYUSER= nobody +PROXYGROUP= daemon -SHAREOWN= ${PROXYUID} -SHAREGRP= ${PROXYGID} +SHAREOWN= ${PROXYUSER} +SHAREGRP= ${PROXYGROUP} SHAREMODE= 644 +post-extract: + @${SED} -e 's#CHANGETHIS#${BINDIR}#' ${FILESDIR}/proxyper.sh \ + > ${WRKDIR}/proxyper.sh + do-install: if [ ! -d ${BINDIR} ]; then \ ${MKDIR} ${BINDIR}; \ fi + ${CHOWN} ${PROXYUSER}:${PROXYGROUP} ${BINDIR} + ${CHMOD} 755 ${BINDIR} + ${INSTALL_PROGRAM} ${WRKSRC}/proxyper ${BINDIR} - ${INSTALL_SCRIPT} ${FILESDIR}/proxyper.sh ${BINDIR} - ${REINPLACE_CMD} s+CHANGETHIS+${BINDIR}+ ${BINDIR}proxyper.sh - ${INSTALL_DATA} ${WRKSRC}/proxyper.ini ${BINDIR} + ${INSTALL_MAN} ${WRKSRC}/ChangeLog.txt ${BINDIR} ${INSTALL_MAN} ${WRKSRC}/manual.html ${BINDIR} - ${CHOWN} ${PROXYUID}:${PROXYGID} ${BINDIR} - ${CHMOD} 755 ${BINDIR} - ${LN} -sf ${BINDIR}proxyper.sh ${LIBDIR}proxyper.sh + + ${INSTALL_SCRIPT} ${WRKDIR}/proxyper.sh ${PREFIX}/etc/rc.d/proxyper.sh.sample + + ${INSTALL_DATA} ${WRKSRC}/proxyper.ini ${BINDIR}/proxyper.ini.sample +.if !exists(${BINDIR}/proxyper.ini) + ${INSTALL_DATA} ${WRKSRC}/proxyper.ini ${BINDIR}/proxyper.ini +.endif .include <bsd.port.post.mk> Index: distinfo =================================================================== RCS file: /u1/freebsd/cvs/ports/misc/proxyper/distinfo,v retrieving revision 1.5 diff -u -r1.5 distinfo --- distinfo 17 Mar 2004 18:29:30 -0000 1.5 +++ distinfo 31 May 2004 22:49:21 -0000 @@ -1,2 +1,2 @@ -MD5 (proxyper333-freebsd-x86.tar.gz) = 60d723c700d8980de5649ed7af498fb2 -SIZE (proxyper333-freebsd-x86.tar.gz) = 192163 +MD5 (proxyper341-freebsd-x86.tar.gz) = 15d0fee0c1d250d712fbe63e8d8dece9 +SIZE (proxyper341-freebsd-x86.tar.gz) = 205344 Index: pkg-descr =================================================================== RCS file: /u1/freebsd/cvs/ports/misc/proxyper/pkg-descr,v retrieving revision 1.1.1.1 diff -u -r1.1.1.1 pkg-descr --- pkg-descr 14 Nov 1999 03:33:21 -0000 1.1.1.1 +++ pkg-descr 31 May 2004 22:49:21 -0000 @@ -7,4 +7,4 @@ proxy will already have more key blocks waiting for your clients when they're ready. -WWW: http://www.distributed.net/proxies/ +WWW: http://www.distributed.net/download/proxies.php Index: pkg-plist =================================================================== RCS file: /u1/freebsd/cvs/ports/misc/proxyper/pkg-plist,v retrieving revision 1.7 diff -u -r1.7 pkg-plist --- pkg-plist 17 Apr 2004 04:17:21 -0000 1.7 +++ pkg-plist 31 May 2004 22:49:21 -0000 @@ -1,10 +1,9 @@ distributed.net/proxy/ChangeLog.txt distributed.net/proxy/manual.html distributed.net/proxy/proxyper -distributed.net/proxy/proxyper.ini -distributed.net/proxy/proxyper.sh -distributed.net/proxy/proxyper.sh.bak -@exec ln -sf %D/distributed.net/proxy/proxyper.sh %D/etc/rc.d/proxyper.sh -@unexec rm %D/etc/rc.d/proxyper.sh +@unexec if cmp -s %D/distributed.net/proxy/proxyper.ini %D/distributed.net/proxy/proxyper.ini.sample; then rm -f %D/distributed.net/proxy/proxyper.ini; fi +distributed.net/proxy/proxyper.ini.sample +@exec [ -f %B/proxyper.ini ] || cp %B/%f %B/proxyper.ini +etc/rc.d/proxyper.sh.sample @dirrm distributed.net/proxy @dirrm distributed.net Index: files/proxyper.sh =================================================================== RCS file: /u1/freebsd/cvs/ports/misc/proxyper/files/proxyper.sh,v retrieving revision 1.2 diff -u -r1.2 proxyper.sh --- files/proxyper.sh 5 Jul 2000 12:36:39 -0000 1.2 +++ files/proxyper.sh 31 May 2004 22:49:21 -0000 @@ -8,7 +8,7 @@ su -m nobody -c "$dir/proxyper" 2>/dev/null >/dev/null & ;; stop) - killall proxyper && echo -n " proxyper" + kill `cat $dir/rc5desproxy.pid` && echo -n " proxyper" ;; *) echo "Usage: `basename $0` {start|stop}" >&2 --- proxyper-341.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?E1BVGhE-000EC5-Dk>