From owner-svn-ports-head@FreeBSD.ORG Mon Oct 15 00:55:07 2012 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 1F48D639; Mon, 15 Oct 2012 00:55:07 +0000 (UTC) (envelope-from anders@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id E2EC58FC18; Mon, 15 Oct 2012 00:55:06 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q9F0t6pg078892; Mon, 15 Oct 2012 00:55:06 GMT (envelope-from anders@svn.freebsd.org) Received: (from anders@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q9F0t6Km078890; Mon, 15 Oct 2012 00:55:06 GMT (envelope-from anders@svn.freebsd.org) Message-Id: <201210150055.q9F0t6Km078890@svn.freebsd.org> From: Anders Nordby Date: Mon, 15 Oct 2012 00:55:06 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r305899 - head/sysutils/puppet26 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.14 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: Mon, 15 Oct 2012 00:55:07 -0000 Author: anders Date: Mon Oct 15 00:55:06 2012 New Revision: 305899 URL: http://svn.freebsd.org/changeset/ports/305899 Log: Trim headers. OptionsNG. Add LATEST_LINK, update CONFLICTS. PR: ports/172695 Submitted by: swills Feature safe: yes Modified: head/sysutils/puppet26/Makefile Modified: head/sysutils/puppet26/Makefile ============================================================================== --- head/sysutils/puppet26/Makefile Mon Oct 15 00:42:07 2012 (r305898) +++ head/sysutils/puppet26/Makefile Mon Oct 15 00:55:06 2012 (r305899) @@ -1,9 +1,5 @@ -# New ports collection makefile for: rubygem-puppet -# Date created: 2007-03-03 -# Whom: Tomoyuki Sakurai -# +# Created by: Tomoyuki Sakurai # $FreeBSD$ -# PORTNAME= puppet PORTVERSION= 2.6.17 @@ -17,7 +13,8 @@ RUN_DEPENDS= ${RUBY_SITELIBDIR}/facter.r 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,22 +36,22 @@ MAN5= puppet.conf.5 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 DOCS EXAMPLES +OPTIONS_DEFAULT= PACKAGE_ORIGIN +MONGREL_DESC= Run puppet server as a mongrel service +PACKAGE_ORIGIN_DESC= Use port origin as package name -.include +.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 -.include - post-patch: @${REINPLACE_CMD} -e "s|/etc/puppet|${ETCDIR}|" \ ${WRKSRC}/install.rb \ @@ -91,11 +88,11 @@ post-install: @${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}