diff options
| -rw-r--r-- | sysutils/Makefile | 2 | ||||
| -rw-r--r-- | sysutils/facter/Makefile | 34 | ||||
| -rw-r--r-- | sysutils/facter/distinfo | 2 | ||||
| -rw-r--r-- | sysutils/puppet/Makefile | 4 | ||||
| -rw-r--r-- | sysutils/puppet26/Makefile | 3 | ||||
| -rw-r--r-- | sysutils/puppet27/Makefile | 3 | ||||
| -rw-r--r-- | sysutils/rubygem-facter/Makefile | 26 | ||||
| -rw-r--r-- | sysutils/rubygem-facter/distinfo | 2 | ||||
| -rw-r--r-- | sysutils/rubygem-facter/pkg-descr (renamed from sysutils/facter/pkg-descr) | 2 | ||||
| -rw-r--r-- | sysutils/rubygem-facter/pkg-plist (renamed from sysutils/facter/pkg-plist) | 0 |
10 files changed, 36 insertions, 42 deletions
diff --git a/sysutils/Makefile b/sysutils/Makefile index b9a2cdfafc0b..b2d01244ad13 100644 --- a/sysutils/Makefile +++ b/sysutils/Makefile @@ -223,7 +223,6 @@ SUBDIR += exfat-utils SUBDIR += extipl SUBDIR += ezjail - SUBDIR += facter SUBDIR += fanout SUBDIR += farbot SUBDIR += fastest_cvsup @@ -817,6 +816,7 @@ SUBDIR += rubygem-chef-expander SUBDIR += rubygem-chef-server SUBDIR += rubygem-chef-solr + SUBDIR += rubygem-facter SUBDIR += rubygem-fluentd SUBDIR += rubygem-fssm SUBDIR += rubygem-god diff --git a/sysutils/facter/Makefile b/sysutils/facter/Makefile deleted file mode 100644 index d163a863d333..000000000000 --- a/sysutils/facter/Makefile +++ /dev/null @@ -1,34 +0,0 @@ -# New ports collection makefile for: facter -# Date created: 2007-03-03 -# Whom: Tomoyuki Sakurai <cherry@trombik.org> -# -# $FreeBSD$ -# - -PORTNAME= facter -PORTVERSION= 1.6.16 -CATEGORIES= sysutils ruby -MASTER_SITES= http://downloads.puppetlabs.com/facter/ - -MAINTAINER= rouslan@rshell.net -COMMENT= A cross-platform Ruby library for retrieving facts from OS - -NO_BUILD= yes - -USE_RUBY= yes - -MAN8= facter.8 -MANCOMPRESSED= yes - -.include <bsd.port.pre.mk> - -# Restrict dmidecode dependency to i386 and amd64 systems -.if ${ARCH} == "amd64" || ${ARCH} == "i386" -RUN_DEPENDS= dmidecode:${PORTSDIR}/sysutils/dmidecode -.endif - -do-install: - cd ${WRKSRC} && \ - ${SETENV} PREFIX=${PREFIX} ${RUBY} ${WRKSRC}/install.rb - -.include <bsd.port.post.mk> diff --git a/sysutils/facter/distinfo b/sysutils/facter/distinfo deleted file mode 100644 index 6fc508ca01d6..000000000000 --- a/sysutils/facter/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -SHA256 (facter-1.6.16.tar.gz) = fcac57ea59e004e131a2c66be030109465c89c1b30d91c26d1b5cdcf10379125 -SIZE (facter-1.6.16.tar.gz) = 137694 diff --git a/sysutils/puppet/Makefile b/sysutils/puppet/Makefile index 29b228ff01a1..b9e7c452b2b9 100644 --- a/sysutils/puppet/Makefile +++ b/sysutils/puppet/Makefile @@ -3,14 +3,14 @@ PORTNAME= puppet PORTVERSION= 3.1.1 -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= sysutils MASTER_SITES= http://downloads.puppetlabs.com/puppet/ MAINTAINER= swills@FreeBSD.org COMMENT= A configuration management framework written in Ruby -RUN_DEPENDS= facter>=0:${PORTSDIR}/sysutils/facter \ +RUN_DEPENDS= rubygem-facter>=0:${PORTSDIR}/sysutils/rubygem-facter \ rubygem-ruby-augeas>=0:${PORTSDIR}/textproc/rubygem-augeas \ rubygem-hiera>=0:${PORTSDIR}/sysutils/rubygem-hiera diff --git a/sysutils/puppet26/Makefile b/sysutils/puppet26/Makefile index c4475386f32a..74577ae0b97f 100644 --- a/sysutils/puppet26/Makefile +++ b/sysutils/puppet26/Makefile @@ -3,13 +3,14 @@ PORTNAME= puppet PORTVERSION= 2.6.18 +PORTREVISION= 1 CATEGORIES= sysutils MASTER_SITES= http://downloads.puppetlabs.com/puppet/ MAINTAINER= anders@FreeBSD.org COMMENT= A configuration management framework written in Ruby -RUN_DEPENDS= ${RUBY_SITELIBDIR}/facter.rb:${PORTSDIR}/sysutils/facter \ +RUN_DEPENDS= rubygem-facter>=0:${PORTSDIR}/sysutils/rubygem-facter \ rubygem-ruby-augeas>=0:${PORTSDIR}/textproc/rubygem-augeas \ ${RUBY_ARCHLIBDIR}/iconv.so:${PORTSDIR}/converters/ruby-iconv diff --git a/sysutils/puppet27/Makefile b/sysutils/puppet27/Makefile index 1b61c61a489f..dfc5ff6a661a 100644 --- a/sysutils/puppet27/Makefile +++ b/sysutils/puppet27/Makefile @@ -3,13 +3,14 @@ PORTNAME= puppet PORTVERSION= 2.7.21 +PORTREVISION= 1 CATEGORIES= sysutils MASTER_SITES= http://downloads.puppetlabs.com/puppet/ MAINTAINER= swills@FreeBSD.org COMMENT= A configuration management framework written in Ruby -RUN_DEPENDS= facter>=0:${PORTSDIR}/sysutils/facter \ +RUN_DEPENDS= rubygem-facter>=0:${PORTSDIR}/sysutils/rubygem-facter \ rubygem-ruby-augeas>=0:${PORTSDIR}/textproc/rubygem-augeas LATEST_LINK= puppet27 diff --git a/sysutils/rubygem-facter/Makefile b/sysutils/rubygem-facter/Makefile new file mode 100644 index 000000000000..1e0f78b92b70 --- /dev/null +++ b/sysutils/rubygem-facter/Makefile @@ -0,0 +1,26 @@ +# Created by: Tomoyuki Sakurai <cherry@trombik.org> +# $FreeBSD$ + +PORTNAME= facter +PORTVERSION= 1.6.18 +CATEGORIES= sysutils rubygems +MASTER_SITES= RG \ + http://downloads.puppetlabs.com/facter/ + +MAINTAINER= rouslan@rshell.net +COMMENT= A cross-platform Ruby library for retrieving facts from OS + +USE_RUBY= yes +USE_RUBYGEMS= yes +RUBYGEM_AUTOPLIST= yes + +PLIST_FILES= bin/facter + +.include <bsd.port.pre.mk> + +# Restrict dmidecode dependency to i386 and amd64 systems +.if ${ARCH} == "amd64" || ${ARCH} == "i386" +RUN_DEPENDS= dmidecode:${PORTSDIR}/sysutils/dmidecode +.endif + +.include <bsd.port.post.mk> diff --git a/sysutils/rubygem-facter/distinfo b/sysutils/rubygem-facter/distinfo new file mode 100644 index 000000000000..66936c99dd76 --- /dev/null +++ b/sysutils/rubygem-facter/distinfo @@ -0,0 +1,2 @@ +SHA256 (rubygem/facter-1.6.18.gem) = 5760265cbbd684b0c7e3b350b9b983d12a743b2b4818859feb623b4b1bcc5b55 +SIZE (rubygem/facter-1.6.18.gem) = 145920 diff --git a/sysutils/facter/pkg-descr b/sysutils/rubygem-facter/pkg-descr index 24d1822b0799..70997b0daabb 100644 --- a/sysutils/facter/pkg-descr +++ b/sysutils/rubygem-facter/pkg-descr @@ -4,4 +4,4 @@ working only on certain operating systems or environments. Facter is especially useful for retrieving things like operating system names, IP addresses, MAC addresses, and SSH keys. -WWW: http://www.reductivelabs.com/projects/facter/ +WWW: https://puppetlabs.com/puppet/related-projects/facter/ diff --git a/sysutils/facter/pkg-plist b/sysutils/rubygem-facter/pkg-plist index f2d14f8d35ac..f2d14f8d35ac 100644 --- a/sysutils/facter/pkg-plist +++ b/sysutils/rubygem-facter/pkg-plist |