Page MenuHomeFreeBSD
Files F146184336

D12498.id33428.diff
No OneTemporary
Actions

D12498.id33428.diff
View Options

Index: Makefile
===================================================================
--- Makefile
+++ Makefile
@@ -2,7 +2,7 @@
PORTNAME= facter
PORTVERSION= 3.8.0
-PORTREVISION?= 0
+PORTREVISION?= 2
CATEGORIES?= sysutils
MASTER_SITES= http://downloads.puppetlabs.com/facter/
@@ -14,8 +14,6 @@
USES= cmake
-.if !defined(PKGNAMEPREFIX)
-
BROKEN_DragonFly= DragonFly is not supported upstream
BROKEN_powerpc64= fails to compile: collection.cc: 'stoi' was not declared in this scope
@@ -33,6 +31,19 @@
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
+
+OPTIONS_DEFAULT=rACTER_JAVA
+
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MFACTER_JAVA}
+JAVA_BUILD= yes
+CMAKE_ARGS+= -DJAVA_HOME=${JAVA_HOME}
+.endif
+
post-patch:
${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' \
${WRKSRC}/lib/src/facts/posix/collection.cc \
@@ -42,23 +53,10 @@
cd ${WRKSRC}/lib && bundle install --path vendor
cd ${WRKSRC} && ninja 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:
+.if ${PORT_OPTIONS:MFACTER_JAVA}
+pre-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>
Index: pkg-plist
===================================================================
--- pkg-plist
+++ pkg-plist
@@ -21,3 +21,4 @@
lib/libfacter.so.%%PORTVERSION%%
lib/ruby/vendor_ruby/facter.rb
man/man8/facter.8.gz
+lib/ruby/vendor_ruby/facter.jar

File Metadata

Mime Type
text/plain
Expires
Sun, Mar 1, 1:30 PM (4 h, 22 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
29115160
Default Alt Text
D12498.id33428.diff (1 KB)

Event Timeline