Replace MODRUBY_REV by MODRUBY_LIBREV in PLIST. Use

MODRUBY_EXAMPLEDIR for the examples.  Bump because
MODRUBY_EXAMPLEDIR is a different location than the
old directory used.

OK landry@
This commit is contained in:
jeremy 2010-11-09 18:44:14 +00:00
parent 7a8a9ba0d8
commit 03d678bbd4
4 changed files with 730 additions and 727 deletions

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.12 2010/10/27 13:40:29 landry Exp $
# $OpenBSD: Makefile,v 1.13 2010/11/09 18:44:14 jeremy Exp $
SHARED_ONLY= Yes
@ -7,6 +7,7 @@ COMMENT= Ruby library for retrieving facts from operating systems
VERSION= 1.5.8
DISTNAME= facter-${VERSION}
PKGNAME= ruby-${DISTNAME}
REVISION= 0
CATEGORIES= sysutils
HOMEPAGE= http://reductivelabs.com/projects/facter/
@ -28,10 +29,10 @@ REGRESS_DEPENDS= ::devel/ruby-mocha
BUILD_DEPENDS += ${MODRUBY_BUILD_DEPENDS}
do-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/ruby-facter
${INSTALL_DATA_DIR} ${MODRUBY_EXAMPLEDIR}/facter
@cd ${WRKSRC} && ${ALL_FAKE_FLAGS} ${RUBY} install.rb
${INSTALL_DATA} ${WRKSRC}/etc/facter.conf \
${PREFIX}/share/examples/ruby-facter
${MODRUBY_EXAMPLEDIR}/facter
MODRUBY_REGRESS= rake rspec
do-regress:

View File

@ -1,69 +1,70 @@
@comment $OpenBSD: PLIST,v 1.4 2010/10/24 10:45:48 robert Exp $
@comment $OpenBSD: PLIST,v 1.5 2010/11/09 18:44:14 jeremy Exp $
bin/facter
lib/ruby/site_ruby/${MODRUBY_REV}/facter/
lib/ruby/site_ruby/${MODRUBY_REV}/facter.rb
lib/ruby/site_ruby/${MODRUBY_REV}/facter/Cfkey.rb
lib/ruby/site_ruby/${MODRUBY_REV}/facter/architecture.rb
lib/ruby/site_ruby/${MODRUBY_REV}/facter/domain.rb
lib/ruby/site_ruby/${MODRUBY_REV}/facter/ec2.rb
lib/ruby/site_ruby/${MODRUBY_REV}/facter/facterversion.rb
lib/ruby/site_ruby/${MODRUBY_REV}/facter/fqdn.rb
lib/ruby/site_ruby/${MODRUBY_REV}/facter/hardwareisa.rb
lib/ruby/site_ruby/${MODRUBY_REV}/facter/hardwaremodel.rb
lib/ruby/site_ruby/${MODRUBY_REV}/facter/hostname.rb
lib/ruby/site_ruby/${MODRUBY_REV}/facter/id.rb
lib/ruby/site_ruby/${MODRUBY_REV}/facter/interfaces.rb
lib/ruby/site_ruby/${MODRUBY_REV}/facter/ipaddress.rb
lib/ruby/site_ruby/${MODRUBY_REV}/facter/iphostnumber.rb
lib/ruby/site_ruby/${MODRUBY_REV}/facter/kernel.rb
lib/ruby/site_ruby/${MODRUBY_REV}/facter/kernelmajversion.rb
lib/ruby/site_ruby/${MODRUBY_REV}/facter/kernelrelease.rb
lib/ruby/site_ruby/${MODRUBY_REV}/facter/kernelversion.rb
lib/ruby/site_ruby/${MODRUBY_REV}/facter/lsb.rb
lib/ruby/site_ruby/${MODRUBY_REV}/facter/lsbmajdistrelease.rb
lib/ruby/site_ruby/${MODRUBY_REV}/facter/macaddress.rb
lib/ruby/site_ruby/${MODRUBY_REV}/facter/macosx.rb
lib/ruby/site_ruby/${MODRUBY_REV}/facter/manufacturer.rb
lib/ruby/site_ruby/${MODRUBY_REV}/facter/memory.rb
lib/ruby/site_ruby/${MODRUBY_REV}/facter/netmask.rb
lib/ruby/site_ruby/${MODRUBY_REV}/facter/network.rb
lib/ruby/site_ruby/${MODRUBY_REV}/facter/operatingsystem.rb
lib/ruby/site_ruby/${MODRUBY_REV}/facter/operatingsystemrelease.rb
lib/ruby/site_ruby/${MODRUBY_REV}/facter/path.rb
lib/ruby/site_ruby/${MODRUBY_REV}/facter/physicalprocessorcount.rb
lib/ruby/site_ruby/${MODRUBY_REV}/facter/processor.rb
lib/ruby/site_ruby/${MODRUBY_REV}/facter/ps.rb
lib/ruby/site_ruby/${MODRUBY_REV}/facter/puppetversion.rb
lib/ruby/site_ruby/${MODRUBY_REV}/facter/rubysitedir.rb
lib/ruby/site_ruby/${MODRUBY_REV}/facter/rubyversion.rb
lib/ruby/site_ruby/${MODRUBY_REV}/facter/selinux.rb
lib/ruby/site_ruby/${MODRUBY_REV}/facter/ssh.rb
lib/ruby/site_ruby/${MODRUBY_REV}/facter/timezone.rb
lib/ruby/site_ruby/${MODRUBY_REV}/facter/uniqueid.rb
lib/ruby/site_ruby/${MODRUBY_REV}/facter/uptime.rb
lib/ruby/site_ruby/${MODRUBY_REV}/facter/uptime_days.rb
lib/ruby/site_ruby/${MODRUBY_REV}/facter/uptime_hours.rb
lib/ruby/site_ruby/${MODRUBY_REV}/facter/uptime_seconds.rb
lib/ruby/site_ruby/${MODRUBY_REV}/facter/util/
lib/ruby/site_ruby/${MODRUBY_REV}/facter/util/collection.rb
lib/ruby/site_ruby/${MODRUBY_REV}/facter/util/confine.rb
lib/ruby/site_ruby/${MODRUBY_REV}/facter/util/fact.rb
lib/ruby/site_ruby/${MODRUBY_REV}/facter/util/ip.rb
lib/ruby/site_ruby/${MODRUBY_REV}/facter/util/loader.rb
lib/ruby/site_ruby/${MODRUBY_REV}/facter/util/macosx.rb
lib/ruby/site_ruby/${MODRUBY_REV}/facter/util/manufacturer.rb
lib/ruby/site_ruby/${MODRUBY_REV}/facter/util/memory.rb
lib/ruby/site_ruby/${MODRUBY_REV}/facter/util/netmask.rb
lib/ruby/site_ruby/${MODRUBY_REV}/facter/util/plist/
lib/ruby/site_ruby/${MODRUBY_REV}/facter/util/plist.rb
lib/ruby/site_ruby/${MODRUBY_REV}/facter/util/plist/generator.rb
lib/ruby/site_ruby/${MODRUBY_REV}/facter/util/plist/parser.rb
lib/ruby/site_ruby/${MODRUBY_REV}/facter/util/resolution.rb
lib/ruby/site_ruby/${MODRUBY_REV}/facter/util/uptime.rb
lib/ruby/site_ruby/${MODRUBY_REV}/facter/util/values.rb
lib/ruby/site_ruby/${MODRUBY_REV}/facter/util/virtual.rb
lib/ruby/site_ruby/${MODRUBY_REV}/facter/util/vlans.rb
lib/ruby/site_ruby/${MODRUBY_REV}/facter/virtual.rb
lib/ruby/site_ruby/${MODRUBY_REV}/facter/vlans.rb
share/examples/ruby-facter/
share/examples/ruby-facter/facter.conf
lib/ruby/site_ruby/${MODRUBY_LIBREV}/facter/
lib/ruby/site_ruby/${MODRUBY_LIBREV}/facter.rb
lib/ruby/site_ruby/${MODRUBY_LIBREV}/facter/Cfkey.rb
lib/ruby/site_ruby/${MODRUBY_LIBREV}/facter/architecture.rb
lib/ruby/site_ruby/${MODRUBY_LIBREV}/facter/domain.rb
lib/ruby/site_ruby/${MODRUBY_LIBREV}/facter/ec2.rb
lib/ruby/site_ruby/${MODRUBY_LIBREV}/facter/facterversion.rb
lib/ruby/site_ruby/${MODRUBY_LIBREV}/facter/fqdn.rb
lib/ruby/site_ruby/${MODRUBY_LIBREV}/facter/hardwareisa.rb
lib/ruby/site_ruby/${MODRUBY_LIBREV}/facter/hardwaremodel.rb
lib/ruby/site_ruby/${MODRUBY_LIBREV}/facter/hostname.rb
lib/ruby/site_ruby/${MODRUBY_LIBREV}/facter/id.rb
lib/ruby/site_ruby/${MODRUBY_LIBREV}/facter/interfaces.rb
lib/ruby/site_ruby/${MODRUBY_LIBREV}/facter/ipaddress.rb
lib/ruby/site_ruby/${MODRUBY_LIBREV}/facter/iphostnumber.rb
lib/ruby/site_ruby/${MODRUBY_LIBREV}/facter/kernel.rb
lib/ruby/site_ruby/${MODRUBY_LIBREV}/facter/kernelmajversion.rb
lib/ruby/site_ruby/${MODRUBY_LIBREV}/facter/kernelrelease.rb
lib/ruby/site_ruby/${MODRUBY_LIBREV}/facter/kernelversion.rb
lib/ruby/site_ruby/${MODRUBY_LIBREV}/facter/lsb.rb
lib/ruby/site_ruby/${MODRUBY_LIBREV}/facter/lsbmajdistrelease.rb
lib/ruby/site_ruby/${MODRUBY_LIBREV}/facter/macaddress.rb
lib/ruby/site_ruby/${MODRUBY_LIBREV}/facter/macosx.rb
lib/ruby/site_ruby/${MODRUBY_LIBREV}/facter/manufacturer.rb
lib/ruby/site_ruby/${MODRUBY_LIBREV}/facter/memory.rb
lib/ruby/site_ruby/${MODRUBY_LIBREV}/facter/netmask.rb
lib/ruby/site_ruby/${MODRUBY_LIBREV}/facter/network.rb
lib/ruby/site_ruby/${MODRUBY_LIBREV}/facter/operatingsystem.rb
lib/ruby/site_ruby/${MODRUBY_LIBREV}/facter/operatingsystemrelease.rb
lib/ruby/site_ruby/${MODRUBY_LIBREV}/facter/path.rb
lib/ruby/site_ruby/${MODRUBY_LIBREV}/facter/physicalprocessorcount.rb
lib/ruby/site_ruby/${MODRUBY_LIBREV}/facter/processor.rb
lib/ruby/site_ruby/${MODRUBY_LIBREV}/facter/ps.rb
lib/ruby/site_ruby/${MODRUBY_LIBREV}/facter/puppetversion.rb
lib/ruby/site_ruby/${MODRUBY_LIBREV}/facter/rubysitedir.rb
lib/ruby/site_ruby/${MODRUBY_LIBREV}/facter/rubyversion.rb
lib/ruby/site_ruby/${MODRUBY_LIBREV}/facter/selinux.rb
lib/ruby/site_ruby/${MODRUBY_LIBREV}/facter/ssh.rb
lib/ruby/site_ruby/${MODRUBY_LIBREV}/facter/timezone.rb
lib/ruby/site_ruby/${MODRUBY_LIBREV}/facter/uniqueid.rb
lib/ruby/site_ruby/${MODRUBY_LIBREV}/facter/uptime.rb
lib/ruby/site_ruby/${MODRUBY_LIBREV}/facter/uptime_days.rb
lib/ruby/site_ruby/${MODRUBY_LIBREV}/facter/uptime_hours.rb
lib/ruby/site_ruby/${MODRUBY_LIBREV}/facter/uptime_seconds.rb
lib/ruby/site_ruby/${MODRUBY_LIBREV}/facter/util/
lib/ruby/site_ruby/${MODRUBY_LIBREV}/facter/util/collection.rb
lib/ruby/site_ruby/${MODRUBY_LIBREV}/facter/util/confine.rb
lib/ruby/site_ruby/${MODRUBY_LIBREV}/facter/util/fact.rb
lib/ruby/site_ruby/${MODRUBY_LIBREV}/facter/util/ip.rb
lib/ruby/site_ruby/${MODRUBY_LIBREV}/facter/util/loader.rb
lib/ruby/site_ruby/${MODRUBY_LIBREV}/facter/util/macosx.rb
lib/ruby/site_ruby/${MODRUBY_LIBREV}/facter/util/manufacturer.rb
lib/ruby/site_ruby/${MODRUBY_LIBREV}/facter/util/memory.rb
lib/ruby/site_ruby/${MODRUBY_LIBREV}/facter/util/netmask.rb
lib/ruby/site_ruby/${MODRUBY_LIBREV}/facter/util/plist/
lib/ruby/site_ruby/${MODRUBY_LIBREV}/facter/util/plist.rb
lib/ruby/site_ruby/${MODRUBY_LIBREV}/facter/util/plist/generator.rb
lib/ruby/site_ruby/${MODRUBY_LIBREV}/facter/util/plist/parser.rb
lib/ruby/site_ruby/${MODRUBY_LIBREV}/facter/util/resolution.rb
lib/ruby/site_ruby/${MODRUBY_LIBREV}/facter/util/uptime.rb
lib/ruby/site_ruby/${MODRUBY_LIBREV}/facter/util/values.rb
lib/ruby/site_ruby/${MODRUBY_LIBREV}/facter/util/virtual.rb
lib/ruby/site_ruby/${MODRUBY_LIBREV}/facter/util/vlans.rb
lib/ruby/site_ruby/${MODRUBY_LIBREV}/facter/virtual.rb
lib/ruby/site_ruby/${MODRUBY_LIBREV}/facter/vlans.rb
${MODRUBY_RELEXAMPLEDIR}/
${MODRUBY_RELEXAMPLEDIR}/facter/
${MODRUBY_RELEXAMPLEDIR}/facter/facter.conf

View File

@ -1,10 +1,11 @@
# $OpenBSD: Makefile,v 1.22 2010/11/04 07:20:57 robert Exp $
# $OpenBSD: Makefile,v 1.23 2010/11/09 18:45:34 jeremy Exp $
COMMENT= centralised configuration management for networks
VERSION= 2.6.3rc2
DISTNAME= puppet-${VERSION}
PKGNAME= ruby-${DISTNAME}
REVISION= 0
CATEGORIES= sysutils net
HOMEPAGE= http://reductivelabs.com/projects/puppet/
@ -29,10 +30,10 @@ NO_REGRESS= Yes
NO_BUILD= Yes
do-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/ruby-puppet
${INSTALL_DATA_DIR} ${MODRUBY_EXAMPLEDIR}/puppet
@cd ${WRKSRC} && ${ALL_FAKE_FLAGS} ${RUBY} install.rb
for f in `ls -1 ${WRKSRC}/examples/etc/puppet/*.conf`; do \
${INSTALL_DATA} $$f ${PREFIX}/share/examples/ruby-puppet; \
${INSTALL_DATA} $$f ${MODRUBY_EXAMPLEDIR}/puppet; \
done
.include <bsd.port.mk>

File diff suppressed because it is too large Load Diff