Date: Sun, 14 Oct 2012 10:55:13 -0400 (EDT) From: Steve Wills <swills@FreeBSD.org> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/172695: [PATCH] sysutils/puppet26: multiple fixes Message-ID: <201210141455.q9EEtDOF063270@meatwad.mouf.net> Resent-Message-ID: <201210141500.q9EF02pM092695@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 172695
>Category: ports
>Synopsis: [PATCH] sysutils/puppet26: multiple fixes
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Sun Oct 14 15:00:02 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator: Steve Wills
>Release: FreeBSD 10.0-CURRENT amd64
>Organization:
>Environment:
System: FreeBSD meatwad.mouf.net 10.0-CURRENT FreeBSD 10.0-CURRENT #5 r241434M: Wed Oct 10 19:53:32 EDT
>Description:
- Convert to OptionsNG
- Add LATEST_LINK to avoid duplicate
- Set CONFLICTS to avoid conflicting with itself
- Trim headers while here
Port maintainer (anders@FreeBSD.org) is cc'd.
Generated with FreeBSD Port Tools 0.99_6 (mode: change, diff: SVN)
>How-To-Repeat:
>Fix:
--- puppet-2.6.17.patch begins here ---
Index: Makefile
===================================================================
--- Makefile (revision 305881)
+++ Makefile (working copy)
@@ -1,9 +1,5 @@
-# New ports collection makefile for: rubygem-puppet
-# Date created: 2007-03-03
-# Whom: Tomoyuki Sakurai <cherry@trombik.mine.nu>
-#
+# Created by: Tomoyuki Sakurai <cherry@trombik.mine.nu>
# $FreeBSD$
-#
PORTNAME= puppet
PORTVERSION= 2.6.17
@@ -17,7 +13,8 @@
rubygem-ruby-augeas>=0:${PORTSDIR}/textproc/rubygem-augeas \
${RUBY_ARCHLIBDIR}/iconv.so:${PORTSDIR}/converters/ruby-iconv
-CONFLICTS= puppet-[0-9]*
+LATEST_LINK= puppet26
+CONFLICTS= puppet-2.7* puppet-3*
NO_BUILD= yes
USE_RUBY= yes
@@ -39,16 +36,18 @@
MAN8= filebucket.8 pi.8 puppet.8 puppetca.8 puppetd.8 \
puppetdoc.8 puppetmasterd.8 puppetrun.8 ralsh.8 puppetqd.8
-OPTIONS= MONGREL "Run puppet server as a mongrel service" Off \
- PACKAGE_ORIGIN "Use port origin as package name" On
+OPTIONS_DEFINE= MONGREL PACKAGE_ORIGIN
+OPTIONS_DEFAULT= PACKAGE_ORIGIN
+MONGREL_DESC= Run puppet server as a mongrel service
+PACKAGE_ORIGIN_DESC= Use port origin as package name
.include <bsd.port.options.mk>
-.if defined(WITH_MONGREL)
+.if ${PORT_OPTIONS:MMONGREL}
RUN_DEPENDS+= rubygem-mongrel>=0:${PORTSDIR}/www/rubygem-mongrel
.endif
-.if defined(WITH_PACKAGE_ORIGIN)
+.if ${PORT_OPTIONS:MPACKAGE_ORIGIN}
EXTRA_PATCHES+= ${FILESDIR}/optpatch-package_origin
RUN_DEPENDS+= ${RUBY_SITEARCHLIBDIR}/bz2.so:${PORTSDIR}/archivers/ruby-bz2
.endif
@@ -91,11 +90,11 @@
@${FIND} ${RUBY_SITELIBDIR}/${PORTNAME} -type d | ${SORT} -r | \
${SED} 's,^${PREFIX}/,@dirrm ,' >> ${TMPPLIST}
@${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
${INSTALL} -d ${DOCSDIR}
cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}
.endif
-.if !defined(NOPORTEXAMPLES)
+.if ${PORT_OPTIONS:MEXAMPLES}
cd ${WRKSRC}/examples/ && ${COPYTREE_SHARE} . ${EXAMPLESDIR}
.endif
@${CAT} ${PKGMESSAGE}
--- puppet-2.6.17.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201210141455.q9EEtDOF063270>