svn commit: r365655 - head/www/junkbuster

[Emanuel Haupt]

Author: ehaupt
Date: Fri Aug 22 13:38:14 2014
New Revision: 365655
URL: http://svnweb.freebsd.org/changeset/ports/365655
QAT: https://qat.redports.org/buildarchive/r365655/

Log:
  - Support staging
  - Add LICENSE

Modified:
  head/www/junkbuster/Makefile
  head/www/junkbuster/pkg-plist

Modified: head/www/junkbuster/Makefile
==============================================================================
--- head/www/junkbuster/Makefile	Fri Aug 22 13:37:59 2014	(r365654)
+++ head/www/junkbuster/Makefile	Fri Aug 22 13:38:14 2014	(r365655)
@@ -12,16 +12,16 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	ports at FreeBSD.org
 COMMENT=	HTTP proxy server that eliminates ads
 
+LICENSE=	GPLv2
+
 ALL_TARGET=	# yes, an empty target.
 JDIR=		${PREFIX}/etc/junkbuster
-MAN1=		junkbuster.1
 SUB_FILES=	junkbuster pkg-message
 USE_RC_SUBR=	${PORTNAME}
 PKGMESSAGE=	${WRKDIR}/pkg-message
 
 GNUREGEXP=	's:gnu_regex.h:gnu/regex.h:'
 
-NO_STAGE=	yes
 post-patch:
 .for f in junkbstr.ini saclfile.ini sblock.ini scookie.ini sforward.ini strust.ini win32.h
 	@${REINPLACE_CMD} -e "s:`/usr/bin/printf '\r'`::" ${WRKSRC}/${f}
@@ -31,17 +31,14 @@ post-patch:
 .endfor
 
 do-install:
-	@${INSTALL_PROGRAM} ${WRKSRC}/junkbuster ${PREFIX}/sbin/junkbuster
-	@${MKDIR} -m 755 ${JDIR}
-	@${INSTALL_DATA} ${WRKSRC}/junkbstr.ini ${JDIR}/configfile.sample
-	@${INSTALL_DATA} ${WRKSRC}/sblock.ini ${JDIR}/blockfile.sample
-	@${INSTALL_DATA} ${WRKSRC}/saclfile.ini ${JDIR}/aclfile.sample
-	@${INSTALL_DATA} ${WRKSRC}/scookie.ini ${JDIR}/cookiefile.sample
-	@${INSTALL_DATA} ${WRKSRC}/sforward.ini ${JDIR}/forwardfile.sample
-	@${INSTALL_DATA} ${WRKSRC}/strust.ini ${JDIR}/trustfile.sample
-	@${INSTALL_MAN} ${WRKSRC}/junkbuster.1 ${PREFIX}/man/man1/
-
-post-install:
-	@${CAT} ${PKGMESSAGE}
+	${INSTALL_PROGRAM} ${WRKSRC}/junkbuster ${STAGEDIR}${PREFIX}/sbin/junkbuster
+	@${MKDIR} -m 755 ${STAGEDIR}${JDIR}
+	${INSTALL_DATA} ${WRKSRC}/junkbstr.ini ${STAGEDIR}${JDIR}/configfile.sample
+	${INSTALL_DATA} ${WRKSRC}/sblock.ini ${STAGEDIR}${JDIR}/blockfile.sample
+	${INSTALL_DATA} ${WRKSRC}/saclfile.ini ${STAGEDIR}${JDIR}/aclfile.sample
+	${INSTALL_DATA} ${WRKSRC}/scookie.ini ${STAGEDIR}${JDIR}/cookiefile.sample
+	${INSTALL_DATA} ${WRKSRC}/sforward.ini ${STAGEDIR}${JDIR}/forwardfile.sample
+	${INSTALL_DATA} ${WRKSRC}/strust.ini ${STAGEDIR}${JDIR}/trustfile.sample
+	${INSTALL_MAN} ${WRKSRC}/junkbuster.1 ${STAGEDIR}${MANPREFIX}/man/man1
 
 .include <bsd.port.mk>

Modified: head/www/junkbuster/pkg-plist
==============================================================================
--- head/www/junkbuster/pkg-plist	Fri Aug 22 13:37:59 2014	(r365654)
+++ head/www/junkbuster/pkg-plist	Fri Aug 22 13:38:14 2014	(r365655)
@@ -5,4 +5,5 @@ etc/junkbuster/cookiefile.sample
 etc/junkbuster/configfile.sample
 etc/junkbuster/forwardfile.sample
 etc/junkbuster/trustfile.sample
+man/man1/junkbuster.1.gz
 @dirrmtry etc/junkbuster