svn commit: r350522 - head/mail/qpopper

[Rene Ladan]

Author: rene
Date: Mon Apr  7 16:28:41 2014
New Revision: 350522
URL: http://svnweb.freebsd.org/changeset/ports/350522
QAT: https://qat.redports.org/buildarchive/r350522/

Log:
  Fix typo in pkg-plist and sanitize creation/removal of (sample)
  configuration files.
  
  Prodded by:	swills
  Approved by:	(followup of r350186 and r350187)

Deleted:
  head/mail/qpopper/pkg-install
Modified:
  head/mail/qpopper/Makefile
  head/mail/qpopper/pkg-plist

Modified: head/mail/qpopper/Makefile
==============================================================================
--- head/mail/qpopper/Makefile	Mon Apr  7 16:27:14 2014	(r350521)
+++ head/mail/qpopper/Makefile	Mon Apr  7 16:28:41 2014	(r350522)
@@ -127,8 +127,6 @@ USE_OPENSSL=	yes
 CONFIGURE_ARGS+=	--with-openssl=${OPENSSLBASE}
 .endif
 
-.include <bsd.port.pre.mk>
-
 post-patch:
 	@${RM} -f ${WRKSRC}/popper/md5.h
 	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/man/*
@@ -185,4 +183,4 @@ post-install:
 	@${ECHO_MSG}	""
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Modified: head/mail/qpopper/pkg-plist
==============================================================================
--- head/mail/qpopper/pkg-plist	Mon Apr  7 16:27:14 2014	(r350521)
+++ head/mail/qpopper/pkg-plist	Mon Apr  7 16:28:41 2014	(r350522)
@@ -1,14 +1,15 @@
 @owner %%USERS%%
 @mode u+s
+%%QPOPAUTH%%bin/qapopauth
 %%QPOPAUTH%%bin/qpopauth
- at group %%GROUP%%
+ at group %%GROUPS%%
 @mode 0444
+ at unexec if cmp -s %D/%%ETCDIR%%/popusers %D/%%ETCDIR%%/popusers.sample ; then rm -f %D/%%ETCDIR%%/popusers ; fi
 %%ETCDIR%%/popusers.sample
+ at exec if [ ! -f %D/%%ETCDIR%%/popusers ] ; then cp -p %D/%F %B/popusers ; fi
 @mode
 @group wheel
 @owner root
-%%QPOPAUTH%%@unexec rm -f %D/bin/qapopauth
-%%QPOPAUTH%%@exec ln -sf %D/bin/qpopauth %D/bin/qapopauth
 libexec/qpopper
 man/man8/qpopper.8.gz
 %%QPOPAUTH%%man/man8/qpopauth.8.gz