From owner-svn-ports-all@FreeBSD.ORG  Thu Jun  5 11:11:50 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 C5F3FE59;
 Thu,  5 Jun 2014 11:11:50 +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 B44922C58;
 Thu,  5 Jun 2014 11:11:50 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s55BBoVF002956;
 Thu, 5 Jun 2014 11:11:50 GMT (envelope-from pawel@svn.freebsd.org)
Received: (from pawel@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s55BBoM0002954;
 Thu, 5 Jun 2014 11:11:50 GMT (envelope-from pawel@svn.freebsd.org)
Message-Id: <201406051111.s55BBoM0002954@svn.freebsd.org>
From: Pawel Pekala <pawel@FreeBSD.org>
Date: Thu, 5 Jun 2014 11:11:50 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r356627 - head/mail/pop3proxy
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.18
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: Thu, 05 Jun 2014 11:11:50 -0000

Author: pawel
Date: Thu Jun  5 11:11:50 2014
New Revision: 356627
URL: http://svnweb.freebsd.org/changeset/ports/356627
QAT: https://qat.redports.org/buildarchive/r356627/

Log:
  - Add staging support
  - Use @sample for config file

Modified:
  head/mail/pop3proxy/Makefile
  head/mail/pop3proxy/pkg-plist

Modified: head/mail/pop3proxy/Makefile
==============================================================================
--- head/mail/pop3proxy/Makefile	Thu Jun  5 11:10:08 2014	(r356626)
+++ head/mail/pop3proxy/Makefile	Thu Jun  5 11:11:50 2014	(r356627)
@@ -11,18 +11,14 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	POP3 Proxy Server derived from UP IMAP Proxy
 
-GNU_CONFIGURE=	YES
+GNU_CONFIGURE=	yes
 USE_AUTOTOOLS=	autoconf213
 USE_RC_SUBR=	pop3proxyd
 
-SAMPLE_EXT=	sample
-
-NO_STAGE=	yes
-post-install:
-	if [ ! -f ${PREFIX}/etc/pop3proxyd.conf ]; then \
-		${INSTALL} -c ${WRKSRC}/pop3proxyd.conf ${PREFIX}/etc/pop3proxyd.conf ; \
-	fi
-	${INSTALL} -c ${WRKSRC}/pop3proxyd.conf ${PREFIX}/etc/pop3proxyd.conf.${SAMPLE_EXT} ;
-	@${CAT} ${PKGMESSAGE}
+do-install:
+	(cd ${WRKSRC}/bin && ${INSTALL_PROGRAM} pop3proxystat pop3proxyd \
+		${STAGEDIR}${PREFIX}/sbin)
+	${INSTALL} -c ${WRKSRC}/pop3proxyd.conf \
+		${STAGEDIR}${PREFIX}/etc/pop3proxyd.conf.sample
 
 .include <bsd.port.mk>

Modified: head/mail/pop3proxy/pkg-plist
==============================================================================
--- head/mail/pop3proxy/pkg-plist	Thu Jun  5 11:10:08 2014	(r356626)
+++ head/mail/pop3proxy/pkg-plist	Thu Jun  5 11:11:50 2014	(r356627)
@@ -1,5 +1,3 @@
 sbin/pop3proxystat
 sbin/pop3proxyd
-@unexec if cmp -s %D/etc/pop3proxyd.conf.sample %D/etc/pop3proxyd.conf; then rm -f %D/etc/pop3proxyd.conf; fi
-etc/pop3proxyd.conf.sample
-@exec if [ ! -f %D/etc/pop3proxyd.conf ] ; then cp -p %D/%F %B/pop3proxyd.conf; fi
+@sample etc/pop3proxyd.conf.sample