From owner-svn-ports-head@FreeBSD.ORG Thu Dec 4 15:09:50 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 21CDABF8; Thu, 4 Dec 2014 15:09: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 0E1EA149; Thu, 4 Dec 2014 15:09:50 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sB4F9ncC067854; Thu, 4 Dec 2014 15:09:49 GMT (envelope-from sunpoet@FreeBSD.org) Received: (from sunpoet@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sB4F9nvD067852; Thu, 4 Dec 2014 15:09:49 GMT (envelope-from sunpoet@FreeBSD.org) Message-Id: <201412041509.sB4F9nvD067852@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: sunpoet set sender to sunpoet@FreeBSD.org using -f From: Sunpoet Po-Chuan Hsieh Date: Thu, 4 Dec 2014 15:09:49 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r373941 - in head/mail/tumgreyspf: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 04 Dec 2014 15:09:50 -0000 Author: sunpoet Date: Thu Dec 4 15:09:49 2014 New Revision: 373941 URL: https://svnweb.freebsd.org/changeset/ports/373941 QAT: https://qat.redports.org/buildarchive/r373941/ Log: - Modernize using new keywords (@dir and @sample) - Cleanup PLIST - Bump PORTREVISION for package change Deleted: head/mail/tumgreyspf/files/pkg-deinstall.in head/mail/tumgreyspf/files/pkg-install.in Modified: head/mail/tumgreyspf/Makefile head/mail/tumgreyspf/pkg-plist Modified: head/mail/tumgreyspf/Makefile ============================================================================== --- head/mail/tumgreyspf/Makefile Thu Dec 4 15:09:44 2014 (r373940) +++ head/mail/tumgreyspf/Makefile Thu Dec 4 15:09:49 2014 (r373941) @@ -3,6 +3,7 @@ PORTNAME= tumgreyspf PORTVERSION= 1.38 +PORTREVISION= 1 CATEGORIES= mail MASTER_SITES= ftp://ftp.tummy.com/pub/tummy/tumgreyspf/ \ ftp://ftp.tummy.com/pub/tummy/tumgreyspf/old-releases/ \ @@ -20,15 +21,14 @@ OPTIONS_DEFINE= DOCS NO_BUILD= yes USES= python shebangfix -PKGDEINSTALL= ${WRKDIR}/pkg-deinstall -PKGINSTALL= ${WRKDIR}/pkg-install PKGMESSAGE= ${WRKSRC}/pkg-message -PORTDOCS= * -SUB_FILES= pkg-deinstall pkg-install pkg-message -SUB_LIST= PYTHON_CMD=${PYTHON_CMD} \ - TUMGREYSPF_DIR=${TUMGREYSPF_DIR} \ +PLIST_SUB= TUMGREYSPF_DIR=${TUMGREYSPF_DIR} \ TUMGREYSPF_USER=${TUMGREYSPF_USER} \ TUMGREYSPF_GROUP=${TUMGREYSPF_GROUP} +PORTDOCS= * +SUB_FILES= pkg-message +SUB_LIST= PYTHON_CMD=${PYTHON_CMD} \ + TUMGREYSPF_USER=${TUMGREYSPF_USER} SHEBANG_FILES= * python_OLD_CMD= ${SETENV} python @@ -63,18 +63,13 @@ do-install: cd ${WRKSRC}/ && ${INSTALL_SCRIPT} tumgreyspf tumgreyspf-clean tumgreyspf-configtest tumgreyspf-stat ${STAGEDIR}${PREFIX}/bin/ cd ${WRKSRC}/ && ${INSTALL_SCRIPT} gentest ${STAGEDIR}${PREFIX}/bin/tumgreyspf-gentest cd ${WRKSRC}/ && ${INSTALL_SCRIPT} tumgreyspfsupp.py ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/ - cd ${WRKSRC}/ && ${INSTALL_DATA} tumgreyspf.conf ${STAGEDIR}${PREFIX}/etc/tumgreyspf.conf.default -.if !exists(${PREFIX}/etc/tumgreyspf.conf) - ${INSTALL_DATA} ${WRKSRC}/tumgreyspf.conf ${STAGEDIR}${PREFIX}/etc/ -.endif - -post-install: + cd ${WRKSRC}/ && ${INSTALL_DATA} tumgreyspf.conf ${STAGEDIR}${PREFIX}/etc/tumgreyspf.conf.sample ${MKDIR} ${STAGEDIR}${DATADIR}/ - ${INSTALL_DATA} ${WRKSRC}/__default__.dist ${STAGEDIR}${DATADIR}/ + ${INSTALL_DATA} ${WRKSRC}/__default__.dist ${STAGEDIR}${DATADIR}/__default__.sample ${MKDIR} ${STAGEDIR}${DOCSDIR}/ ${INSTALL_DATA} ${WRKSRC}/README* ${STAGEDIR}${DOCSDIR}/ -.if !defined(PACKAGE_BUILDING) - @${SETENV} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL -.endif + ${MKDIR} -m 755 -p ${STAGEDIR}${TUMGREYSPF_DIR} + ${MKDIR} -m 755 ${STAGEDIR}${TUMGREYSPF_DIR}/config + ${MKDIR} -m 700 ${STAGEDIR}${TUMGREYSPF_DIR}/data .include Modified: head/mail/tumgreyspf/pkg-plist ============================================================================== --- head/mail/tumgreyspf/pkg-plist Thu Dec 4 15:09:44 2014 (r373940) +++ head/mail/tumgreyspf/pkg-plist Thu Dec 4 15:09:49 2014 (r373941) @@ -1,10 +1,11 @@ -@unexec if cmp -s %D/etc/tumgreyspf.conf.default %D/etc/tumgreyspf.conf; then rm -f %D/etc/tumgreyspf.conf; fi -etc/tumgreyspf.conf.default bin/tumgreyspf bin/tumgreyspf-clean bin/tumgreyspf-configtest bin/tumgreyspf-gentest bin/tumgreyspf-stat +@sample etc/tumgreyspf.conf.sample %%PYTHON_SITELIBDIR%%/tumgreyspfsupp.py -%%DATADIR%%/__default__.dist -@dirrm %%DATADIR%% +@sample %%DATADIR%%/__default__.sample +@dir(%%TUMGREYSPF_USER%%,%%TUMGREYSPF_GROUP%%,700) %%TUMGREYSPF_DIR%%/data +@dir(,,755) %%TUMGREYSPF_DIR%%/config +@dir(%%TUMGREYSPF_USER%%,%%TUMGREYSPF_GROUP%%,755) %%TUMGREYSPF_DIR%%