Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 5 Jun 2014 11:11:50 +0000 (UTC)
From:      Pawel Pekala <pawel@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r356627 - head/mail/pop3proxy
Message-ID:  <201406051111.s55BBoM0002954@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201406051111.s55BBoM0002954>