From owner-freebsd-ports-bugs@FreeBSD.ORG Sun Oct 14 13:40:00 2012 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id CBABEF0C for ; Sun, 14 Oct 2012 13:40:00 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [8.8.178.135]) by mx1.freebsd.org (Postfix) with ESMTP id A272B8FC0A for ; Sun, 14 Oct 2012 13:40:00 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.5/8.14.5) with ESMTP id q9EDe0pq087399 for ; Sun, 14 Oct 2012 13:40:00 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.5/8.14.5/Submit) id q9EDe0FC087398; Sun, 14 Oct 2012 13:40:00 GMT (envelope-from gnats) Resent-Date: Sun, 14 Oct 2012 13:40:00 GMT Resent-Message-Id: <201210141340.q9EDe0FC087398@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Steve Wills Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 95701B4F; Sun, 14 Oct 2012 13:32:28 +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 527178FC08; Sun, 14 Oct 2012 13:32:28 +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 q9EDWJ7C081047 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NOT); Sun, 14 Oct 2012 09:32:25 -0400 (EDT) (envelope-from steve@meatwad.mouf.net) Received: (from steve@localhost) by meatwad.mouf.net (8.14.5/8.14.5/Submit) id q9EDW78D024551; Sun, 14 Oct 2012 09:32:07 -0400 (EDT) (envelope-from steve) Message-Id: <201210141332.q9EDW78D024551@meatwad.mouf.net> Date: Sun, 14 Oct 2012 09:32:07 -0400 (EDT) From: Steve Wills To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Subject: ports/172693: [PATCH] sysutils/puppet: multiple fixes X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 14 Oct 2012 13:40:01 -0000 >Number: 172693 >Category: ports >Synopsis: [PATCH] sysutils/puppet: 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 13:40:00 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: - Fix Duplicate LATEST_LINK - Fix CONFLICTS line - Convert to OptionsNG - 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 305875) +++ Makefile (working copy) @@ -1,7 +1,4 @@ -# New ports collection makefile for: rubygem-puppet -# Date created: 2007-03-03 -# Whom: Tomoyuki Sakurai -# +# Created by: Tomoyuki Sakurai # $FreeBSD$ # @@ -17,7 +14,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 +37,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 -.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 +91,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: