svn commit: r406237 - head/sysutils/puppet

[Pawel Pekala]

Author: pawel
Date: Sat Jan 16 16:31:08 2016
New Revision: 406237
URL: https://svnweb.freebsd.org/changeset/ports/406237

Log:
  - Don't use deprecated @dirrm in plist generation
  - Add LICENSE_FILE, NO_ARCH
  - Use options helpers
  - There's no need to include bsd.port.pre.mk
  
  Approved by:	portmgr blanket

Modified:
  head/sysutils/puppet/Makefile

Modified: head/sysutils/puppet/Makefile
==============================================================================
--- head/sysutils/puppet/Makefile	Sat Jan 16 16:19:30 2016	(r406236)
+++ head/sysutils/puppet/Makefile	Sat Jan 16 16:31:08 2016	(r406237)
@@ -11,6 +11,7 @@ MAINTAINER=	ruby at FreeBSD.org
 COMMENT=	Configuration management framework written in Ruby
 
 LICENSE=	APACHE20
+LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	rubygem-facter>=0:${PORTSDIR}/sysutils/rubygem-facter \
 		rubygem-hiera1>=0:${PORTSDIR}/sysutils/rubygem-hiera1
@@ -22,6 +23,7 @@ USES=		cpe
 CPE_VENDOR=	puppetlabs
 CONFLICTS_INSTALL=	puppet37-* puppet4-*
 NO_BUILD=	yes
+NO_ARCH=	yes
 USE_RUBY=	yes
 USE_RC_SUBR=	puppet puppetmaster
 PORTDOCS=	LICENSE README.md
@@ -33,8 +35,6 @@ SUB_LIST=	RUBY=${RUBY}
 
 OPTIONS_DEFINE=		DOCS EXAMPLES
 
-.include <bsd.port.pre.mk>
-
 post-patch:
 	@${REINPLACE_CMD} -e "s|/etc/puppet|${ETCDIR}|" \
 		${WRKSRC}/install.rb \
@@ -71,14 +71,16 @@ post-install:
 		${SED} 's,^${STAGEDIR}${PREFIX}/,,' >> ${TMPPLIST}
 	@${FIND} ${STAGEDIR}${RUBY_SITELIBDIR}/${PORTNAME} -type f | \
 		${SED} 's,^${STAGEDIR}${PREFIX}/,,' >> ${TMPPLIST}
-	@${FIND} ${STAGEDIR}${RUBY_SITELIBDIR}/${PORTNAME} -type d | ${SORT} -r | \
-		${SED} 's,^${STAGEDIR}${PREFIX}/, at dirrm ,' >> ${TMPPLIST}
 	@${MKDIR} ${STAGEDIR}${WWWDIR}
 	${INSTALL_DATA} ${WRKSRC}/ext/rack/config.ru ${STAGEDIR}${WWWDIR}
+
+post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
+
+post-install-EXAMPLES-on:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	cd ${WRKSRC}/examples/ && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/ext/rack/example-passenger-vhost.conf ${STAGEDIR}${EXAMPLESDIR}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>