From steve@mouf.net  Sun Oct 14 14:55:34 2012
Return-Path: <steve@mouf.net>
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id EBFE3C1D;
	Sun, 14 Oct 2012 14:55:34 +0000 (UTC)
	(envelope-from steve@mouf.net)
Received: from mouf.net (mouf.net [IPv6:2607:fc50:0:4400:216:3eff:fe69:33b3])
	by mx1.freebsd.org (Postfix) with ESMTP id A90B68FC16;
	Sun, 14 Oct 2012 14:55:34 +0000 (UTC)
Received: from meatwad.mouf.net ([IPv6:2001:470:8:58f:21f:d0ff:feaf:1a4d])
	by mouf.net (8.14.5/8.14.5) with ESMTP id q9EEtPxd082366
	(version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NOT);
	Sun, 14 Oct 2012 10:55:31 -0400 (EDT)
	(envelope-from steve@meatwad.mouf.net)
Received: (from steve@localhost)
	by meatwad.mouf.net (8.14.5/8.14.5/Submit) id q9EEtDOF063270;
	Sun, 14 Oct 2012 10:55:13 -0400 (EDT)
	(envelope-from steve)
Message-Id: <201210141455.q9EEtDOF063270@meatwad.mouf.net>
Date: Sun, 14 Oct 2012 10:55:13 -0400 (EDT)
From: Steve Wills <swills@freebsd.org>
To: FreeBSD-gnats-submit@freebsd.org
Cc: anders@freebsd.org
Subject: [PATCH] sysutils/puppet26: multiple fixes
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         172695
>Category:       ports
>Synopsis:       [PATCH] sysutils/puppet26: multiple fixes
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    anders
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sun Oct 14 15:00:02 UTC 2012
>Closed-Date:    Mon Oct 15 00:51:57 UTC 2012
>Last-Modified:  Mon Oct 15 00:51:57 UTC 2012
>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:
Responsible-Changed-From-To: freebsd-ports-bugs->anders 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Sun Oct 14 15:00:10 UTC 2012 
Responsible-Changed-Why:  
Over to maintainer (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=172695 
State-Changed-From-To: open->closed 
State-Changed-By: anders 
State-Changed-When: Mon Oct 15 00:51:27 UTC 2012 
State-Changed-Why:  
Committed (with modifications), thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=172695 
>Unformatted:
