Page MenuHomeFreeBSD
Files F146555358

D12498.id33665.diff
No OneTemporary
Actions

D12498.id33665.diff
View Options

Index: head/sysutils/facter/Makefile
===================================================================
--- head/sysutils/facter/Makefile
+++ head/sysutils/facter/Makefile
@@ -2,7 +2,7 @@
PORTNAME= facter
PORTVERSION= 3.9.0
-PORTREVISION?= 2
+PORTREVISION?= 3
CATEGORIES?= sysutils
MASTER_SITES= http://downloads.puppetlabs.com/facter/
@@ -12,10 +12,8 @@
LICENSE= APACHE20
LICENSE_FILE= ${WRKSRC}/LICENSE
-USES= cmake
+USES= cmake compiler:c++11-lib ssl
-.if !defined(PKGNAMEPREFIX)
-
BROKEN_DragonFly= DragonFly is not supported upstream
BROKEN_powerpc64= fails to compile: collection.cc: 'stoi' was not declared in this scope
@@ -26,13 +24,24 @@
libleatherman_locale.so:devel/leatherman \
libyaml-cpp.so:devel/yaml-cpp
-PLIST_SUB+= PORTVERSION="${PORTVERSION}"
+PLIST_SUB= PORTVERSION="${PORTVERSION}"
USE_LDCONFIG= yes
USE_RUBY= yes
-USES+= compiler:c++11-lib ssl
CMAKE_ARGS+= -DMAN_PATH=${MANPREFIX}/man
+OPTIONS_DEFINE= FACTER_JAVA
+FACTER_JAVA_DESC= Build with Java bindings for puppetserver
+FACTER_JAVA_USE= java=yes
+FACTER_JAVA_VARS= JAVA_BUILD=yes
+FACTER_JAVA_CMAKE_ON= -DJAVA_HOME=${JAVA_HOME}
+
+OPTIONS_DEFAULT= FACTER_JAVA
+
+OPTIONS_SUB= yes
+
+.include <bsd.port.options.mk>
+
post-patch:
${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' \
${WRKSRC}/lib/src/facts/posix/collection.cc \
@@ -42,28 +51,9 @@
cd ${WRKSRC}/lib && bundle install --path vendor
cd ${WRKSRC} && ${MAKE_CMD} test
-.elif ${PKGNAMEPREFIX} == java-
-
-LIB_DEPENDS= libfacter.so:sysutils/facter
-
-ALL_TARGET= facter-jruby
-USE_JAVA= yes
-JAVA_BUILD= yes
-CMAKE_ARGS+= -DJAVA_HOME=${JAVA_HOME}
-
-# Ignore sysutils/facter's pkg-plist by providing a non-existent file
-PLIST= ${WRKDIR}/no-plist
-PLIST_FILES= ${PREFIX}/lib/ruby/vendor_ruby/facter.jar
-
-do-install:
- ${MKDIR} ${STAGEDIR}${PREFIX}/lib/ruby/vendor_ruby
- cd ${WRKSRC} && ${INSTALL_DATA} lib/facter.jar ${STAGEDIR}${PREFIX}/lib/ruby/vendor_ruby
-
-.endif
-
.include <bsd.port.pre.mk>
-.if !defined(PKGNAMEPREFIX) && ${OPSYS} == FreeBSD && ${COMPILER_FEATURES:Mlibstdc++}
+.if ${OPSYS} == FreeBSD && ${COMPILER_FEATURES:Mlibstdc++}
BROKEN= Build with system libstdc++ is unsupported
.endif
Index: head/sysutils/facter/pkg-plist
===================================================================
--- head/sysutils/facter/pkg-plist
+++ head/sysutils/facter/pkg-plist
@@ -21,3 +21,4 @@
lib/libfacter.so.%%PORTVERSION%%
lib/ruby/vendor_ruby/facter.rb
man/man8/facter.8.gz
+%%FACTER_JAVA%%lib/ruby/vendor_ruby/facter.jar

File Metadata

Mime Type
text/plain
Expires
Wed, Mar 4, 3:11 PM (8 h, 20 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
29247535
Default Alt Text
D12498.id33665.diff (2 KB)

Event Timeline