From ad705e956cfe6a15ce84bc871343fdfca69a208f Mon Sep 17 00:00:00 2001
From: Tim Bishop <tdb@FreeBSD.org>
Date: Fri, 9 May 2014 22:08:26 +0000
Subject: [PATCH] - Stage support - Use http download site in preference to ftp
 - Add amd64 to supported architectures - Remove support for old unsupported
 FreeBSD versions - Use @sample plist keyword

---
 misc/proxyper/Makefile  | 38 ++++++++------------------------------
 misc/proxyper/distinfo  |  2 --
 misc/proxyper/pkg-plist |  8 +++++---
 3 files changed, 13 insertions(+), 35 deletions(-)

diff --git a/misc/proxyper/Makefile b/misc/proxyper/Makefile
index 2e3b5b8d690c..6f1c14c2c5a1 100644
--- a/misc/proxyper/Makefile
+++ b/misc/proxyper/Makefile
@@ -4,13 +4,13 @@
 PORTNAME=	proxyper
 PORTVERSION=	347
 CATEGORIES=	misc
-MASTER_SITES=	ftp://ftp.distributed.net/pub/dcti/proxyper/ \
-		http://http.distributed.net/pub/dcti/proxyper/
+MASTER_SITES=	http://http.distributed.net/pub/dcti/proxyper/ \
+		ftp://ftp.distributed.net/pub/dcti/proxyper/
 
 MAINTAINER=	tdb@FreeBSD.org
 COMMENT=	The official distributed.net v2 personal proxy
 
-ONLY_FOR_ARCHS=	i386
+ONLY_FOR_ARCHS=	i386 amd64
 
 USE_RC_SUBR=	${PORTNAME}
 NO_BUILD=	yes
@@ -18,39 +18,17 @@ NO_BUILD=	yes
 BINDIR=		${PREFIX}/distributed.net/proxy
 SUB_LIST+=	BINDIR=${BINDIR}
 
-PROXYUSER=	nobody
-PROXYGROUP=	daemon
-
-SHAREOWN=	${PROXYUSER}
-SHAREGRP=	${PROXYGROUP}
-SHAREMODE=	644
-
-NO_STAGE=	yes
 .include <bsd.port.pre.mk>
 
 WRKSRC=		${WRKDIR}/proxyper${PORTVERSION}-freebsd-x86
 
-.if ${OSVERSION} >= 700055
 DISTNAME=	proxyper${PORTVERSION}-freebsd7-x86
-.else
-DISTNAME=	proxyper${PORTVERSION}-freebsd6-x86
-.endif
 
 do-install:
-	if [ ! -d ${BINDIR} ]; then \
-		${MKDIR} ${BINDIR}; \
-	fi
-	${CHOWN} ${PROXYUSER}:${PROXYGROUP} ${BINDIR}
-	${CHMOD} 755 ${BINDIR}
-
-	${INSTALL_PROGRAM} ${WRKSRC}/proxyper ${BINDIR}
-
-	${INSTALL_MAN} ${WRKSRC}/ChangeLog.txt ${BINDIR}
-	${INSTALL_MAN} ${WRKSRC}/manual.html ${BINDIR}
-
-	${INSTALL_DATA} ${WRKSRC}/proxyper.ini ${BINDIR}/proxyper.ini.sample
-.if !exists(${BINDIR}/proxyper.ini)
-	${INSTALL_DATA} ${WRKSRC}/proxyper.ini ${BINDIR}/proxyper.ini
-.endif
+	${MKDIR} ${STAGEDIR}${BINDIR}
+	${INSTALL_PROGRAM} ${WRKSRC}/proxyper ${STAGEDIR}${BINDIR}
+	${INSTALL_MAN} ${WRKSRC}/ChangeLog.txt ${STAGEDIR}${BINDIR}
+	${INSTALL_MAN} ${WRKSRC}/manual.html ${STAGEDIR}${BINDIR}
+	${INSTALL} -c -m 644 ${WRKSRC}/proxyper.ini ${STAGEDIR}${BINDIR}/proxyper.ini.sample
 
 .include <bsd.port.post.mk>
diff --git a/misc/proxyper/distinfo b/misc/proxyper/distinfo
index d95da833b66a..a071c3fb0247 100644
--- a/misc/proxyper/distinfo
+++ b/misc/proxyper/distinfo
@@ -1,4 +1,2 @@
-SHA256 (proxyper347-freebsd6-x86.tar.gz) = b240f92ca0294b188d00cc7b80ac8313f1189f51f562d4f8343ae8fb23005676
-SIZE (proxyper347-freebsd6-x86.tar.gz) = 261418
 SHA256 (proxyper347-freebsd7-x86.tar.gz) = 4617925ba8ec9df8d982c50128b2a40394c0192d0b376b89915f4550619e1c7a
 SIZE (proxyper347-freebsd7-x86.tar.gz) = 299870
diff --git a/misc/proxyper/pkg-plist b/misc/proxyper/pkg-plist
index e1154ffcc7ec..dae88f4da942 100644
--- a/misc/proxyper/pkg-plist
+++ b/misc/proxyper/pkg-plist
@@ -1,8 +1,10 @@
 distributed.net/proxy/ChangeLog.txt
 distributed.net/proxy/manual.html
 distributed.net/proxy/proxyper
-@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
+@sample distributed.net/proxy/proxyper.ini.sample
+@owner nobody
+@group daemon
 @dirrm distributed.net/proxy
+@group
+@owner
 @dirrmtry distributed.net