From owner-svn-ports-all@freebsd.org Tue Oct 3 20:54:30 2017 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 5BD02E245C5; Tue, 3 Oct 2017 20:54:30 +0000 (UTC) (envelope-from zleslie@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 2CEE0635AD; Tue, 3 Oct 2017 20:54:30 +0000 (UTC) (envelope-from zleslie@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v93KsTrr035542; Tue, 3 Oct 2017 20:54:29 GMT (envelope-from zleslie@FreeBSD.org) Received: (from zleslie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v93KsT4j035540; Tue, 3 Oct 2017 20:54:29 GMT (envelope-from zleslie@FreeBSD.org) Message-Id: <201710032054.v93KsT4j035540@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: zleslie set sender to zleslie@FreeBSD.org using -f From: Zach Leslie Date: Tue, 3 Oct 2017 20:54:29 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r451170 - head/sysutils/facter X-SVN-Group: ports-head X-SVN-Commit-Author: zleslie X-SVN-Commit-Paths: head/sysutils/facter X-SVN-Commit-Revision: 451170 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 03 Oct 2017 20:54:30 -0000 Author: zleslie Date: Tue Oct 3 20:54:29 2017 New Revision: 451170 URL: https://svnweb.freebsd.org/changeset/ports/451170 Log: sysutils/facter: Drop slave port, add Java option default Here we drop support for the slave port, since it never quite worked as desired, nor was it ever submitted, and removes the conditionals to support it. Also, we add a new default option FACTER_JAVA to build support for Java and install facter.jar to be used by sysutils/puppetserver5. Approved by: swills(mentor) Differential Revision: D12498 Modified: head/sysutils/facter/Makefile head/sysutils/facter/pkg-plist Modified: head/sysutils/facter/Makefile ============================================================================== --- head/sysutils/facter/Makefile Tue Oct 3 20:38:27 2017 (r451169) +++ head/sysutils/facter/Makefile Tue Oct 3 20:54:29 2017 (r451170) @@ -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 @@ COMMENT= Cross-platform library for retrieving facts f 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 @@ LIB_DEPENDS= libboost_system.so:devel/boost-libs \ 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 + post-patch: ${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' \ ${WRKSRC}/lib/src/facts/posix/collection.cc \ @@ -42,28 +51,9 @@ test: build 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 -.if !defined(PKGNAMEPREFIX) && ${OPSYS} == FreeBSD && ${COMPILER_FEATURES:Mlibstdc++} +.if ${OPSYS} == FreeBSD && ${COMPILER_FEATURES:Mlibstdc++} BROKEN= Build with system libstdc++ is unsupported .endif Modified: head/sysutils/facter/pkg-plist ============================================================================== --- head/sysutils/facter/pkg-plist Tue Oct 3 20:38:27 2017 (r451169) +++ head/sysutils/facter/pkg-plist Tue Oct 3 20:54:29 2017 (r451170) @@ -21,3 +21,4 @@ lib/libfacter.so lib/libfacter.so.%%PORTVERSION%% lib/ruby/vendor_ruby/facter.rb man/man8/facter.8.gz +%%FACTER_JAVA%%lib/ruby/vendor_ruby/facter.jar