5 files changed, 31 insertions, 25 deletions

diff --git a/misc/proxyper/Makefile b/misc/proxyper/Makefile
index f91bc7a3f8eb..1aaccf83a773 100644
--- a/misc/proxyper/Makefile
+++ b/misc/proxyper/Makefile
@@ -5,15 +5,14 @@
 # $FreeBSD$
 #
 
-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 @@ IGNORE=		"This port requires FreeBSD 3.X or greater."
 
 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>
diff --git a/misc/proxyper/distinfo b/misc/proxyper/distinfo
index aac357578ffb..54185e538ab6 100644
--- a/misc/proxyper/distinfo
+++ b/misc/proxyper/distinfo
@@ -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
diff --git a/misc/proxyper/files/proxyper.sh b/misc/proxyper/files/proxyper.sh
index 816115539be3..8c3ab614c17a 100644
--- a/misc/proxyper/files/proxyper.sh
+++ b/misc/proxyper/files/proxyper.sh
@@ -8,7 +8,7 @@ start)
 	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
diff --git a/misc/proxyper/pkg-descr b/misc/proxyper/pkg-descr
index 8c8a1f38b446..0648fd8da3da 100644
--- a/misc/proxyper/pkg-descr
+++ b/misc/proxyper/pkg-descr
@@ -7,4 +7,4 @@ time trying to connect to one of the main proxies, since the personal
 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
diff --git a/misc/proxyper/pkg-plist b/misc/proxyper/pkg-plist
index ad9596fac74c..adb5917a76cd 100644
--- a/misc/proxyper/pkg-plist
+++ b/misc/proxyper/pkg-plist
@@ -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