svn commit: r370379 - head/net/pwhois

[Baptiste Daroussin]

Author: bapt
Date: Tue Oct  7 17:49:05 2014
New Revision: 370379
URL: https://svnweb.freebsd.org/changeset/ports/370379
QAT: https://qat.redports.org/buildarchive/r370379/

Log:
  Cleanup plist
  Allow packaging as a user

Modified:
  head/net/pwhois/Makefile
  head/net/pwhois/pkg-plist

Modified: head/net/pwhois/Makefile
==============================================================================
--- head/net/pwhois/Makefile	Tue Oct  7 17:46:13 2014	(r370378)
+++ head/net/pwhois/Makefile	Tue Oct  7 17:49:05 2014	(r370379)
@@ -5,26 +5,28 @@ PORTNAME=	pwhois
 PORTVERSION=	2.2.0.1
 CATEGORIES=	net
 MASTER_SITES=	http://pwhois.org/get/ \
-    		http://mirrors.rit.edu/zi/
+		http://mirrors.rit.edu/zi/
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	zi at FreeBSD.org
 COMMENT=	Whois-compatible framework for disclosing routing data
 
 RUN_DEPENDS=	p5-DBI>0:${PORTSDIR}/databases/p5-DBI \
-    		p5-Time-Format>0:${PORTSDIR}/devel/p5-Time-Format \
+		p5-Time-Format>0:${PORTSDIR}/devel/p5-Time-Format \
 		p5-Log-Dispatch>0:${PORTSDIR}/devel/p5-Log-Dispatch \
 		p5-Net-DNS>0:${PORTSDIR}/dns/p5-Net-DNS \
 		p5-Net-Telnet>0:${PORTSDIR}/net/p5-Net-Telnet \
 		p5-Net-CIDR>0:${PORTSDIR}/net-mgmt/p5-Net-CIDR \
 		p5-RPSL-Parser>0:${PORTSDIR}/devel/p5-RPSL-Parser \
-    		p5-DBD-mysql>=0:${PORTSDIR}/databases/p5-DBD-mysql
+		p5-DBD-mysql>=0:${PORTSDIR}/databases/p5-DBD-mysql
 
 FETCH_ARGS=	-p
 
 USERS=		${PORTNAME}
 GROUPS=		${PORTNAME}
 
+USES=		shebangfix tar:tgz
+SHEBANG_FILES=	pwhois-updatedb
 USE_MYSQL=	client
 USE_RC_SUBR=	${PORTNAME}d
 SUB_FILES=	pkg-message 512.pwhois-updatedb
@@ -55,7 +57,5 @@ do-install:
 
 post-install:
 	@${MKDIR} ${STAGEDIR}/var/db/pwhois ${STAGEDIR}/var/log/pwhois
-	@${CHOWN} 512:512 ${STAGEDIR}/var/db/pwhois ${STAGEDIR}/var/log/pwhois
-	#@${CHOWN} ${USERS}:${GROUPS} ${STAGEDIR}/var/db/pwhois ${STAGEDIR}/var/log/pwhois
 
 .include <bsd.port.mk>

Modified: head/net/pwhois/pkg-plist
==============================================================================
--- head/net/pwhois/pkg-plist	Tue Oct  7 17:46:13 2014	(r370378)
+++ head/net/pwhois/pkg-plist	Tue Oct  7 17:49:05 2014	(r370379)
@@ -1,20 +1,7 @@
 etc/periodic/daily/512.pwhois-updatedb
 sbin/pwhois-updatedb
 sbin/pwhoisd
- at group pwhois
- at mode 640
- at unexec if cmp -s %D/etc/pwhois/pwhoisd.conf %D/etc/pwhois/pwhoisd.conf.sample ; then rm -f %D/etc/pwhois/pwhoisd.conf ; fi
-%%ETCDIR%%/pwhoisd.conf.sample
- at exec if [ ! -f %D/etc/pwhois/pwhoisd.conf ]; then cp -p %D/%F %B/pwhoisd.conf; fi
- at group wheel
- at mode
+ at sample(,pwhois,640) %%ETCDIR%%/pwhoisd.conf.sample
 %%DATADIR%%/createdb.sql
- at dirrm %%DATADIR%%
- at dirrmtry %%ETCDIR%%
- at dirrmtry etc/periodic/daily
- at dirrmtry etc/periodic
- at cwd /
- at dirrmtry var/db/pwhois
- at dirrmtry var/log/pwhois
- at unexec if [ -d var/db/pwhois ]; then echo "You should remove /var/db/pwhois if you don't need it any more."; fi
- at unexec if [ -d var/log/pwhois ]; then echo "You should remove /var/log/pwhois if you don't need it any more."; fi
+ at dir(pwhois,pwhois,) /var/db/pwhois
+ at dir(pwhois,pwhois,) /var/log/pwhois