From owner-svn-ports-all@FreeBSD.ORG  Mon Apr  7 16:28:42 2014
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 94BBAA16;
 Mon,  7 Apr 2014 16:28:42 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 81A7E39A;
 Mon,  7 Apr 2014 16:28:42 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s37GSgn0031495;
 Mon, 7 Apr 2014 16:28:42 GMT (envelope-from rene@svn.freebsd.org)
Received: (from rene@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s37GSgDY031493;
 Mon, 7 Apr 2014 16:28:42 GMT (envelope-from rene@svn.freebsd.org)
Message-Id: <201404071628.s37GSgDY031493@svn.freebsd.org>
From: Rene Ladan <rene@FreeBSD.org>
Date: Mon, 7 Apr 2014 16:28:42 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r350522 - head/mail/qpopper
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 07 Apr 2014 16:28:42 -0000

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
-@group %%GROUP%%
+@group %%GROUPS%%
 @mode 0444
+@unexec if cmp -s %D/%%ETCDIR%%/popusers %D/%%ETCDIR%%/popusers.sample ; then rm -f %D/%%ETCDIR%%/popusers ; fi
 %%ETCDIR%%/popusers.sample
+@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