Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 31 Oct 2016 15:18:59 +0000 (UTC)
From:      Pietro Cerutti <gahr@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r425007 - head/net-im/openfire
Message-ID:  <201610311518.u9VFIxvW045665@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: gahr
Date: Mon Oct 31 15:18:59 2016
New Revision: 425007
URL: https://svnweb.freebsd.org/changeset/ports/425007

Log:
  net-im/openfire: update to 4.0.3, switch to OPTIONS helpers
  
  https://download.igniterealtime.org/openfire/docs/4.0.3/changelog.html
  
  PR:		213929
  Submitted by:	Danilo G. Baio <dbaio@bsd.com.br>

Modified:
  head/net-im/openfire/Makefile
  head/net-im/openfire/distinfo

Modified: head/net-im/openfire/Makefile
==============================================================================
--- head/net-im/openfire/Makefile	Mon Oct 31 14:51:33 2016	(r425006)
+++ head/net-im/openfire/Makefile	Mon Oct 31 15:18:59 2016	(r425007)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	openfire
-PORTVERSION=	4.0.2
+PORTVERSION=	4.0.3
 PORTEPOCH=	1
 CATEGORIES=	net-im java
 MASTER_SITES=	http://download.igniterealtime.org/openfire/
@@ -13,10 +13,11 @@ COMMENT=	Enterprise instant messaging se
 
 LICENSE=	APACHE20
 
-RUN_DEPENDS=	${JAVAJARDIR}/slf4j-api.jar:devel/slf4j
+RUN_DEPENDS=	${JAVALIBDIR}/slf4j-api.jar:devel/slf4j
 
 OPTIONS_DEFINE=	DOCS PLUGINS
 OPTIONS_DEFAULT=PLUGINS
+OPTIONS_SUB=	yes
 PLUGINS_DESC=	Install bundled plugins
 
 USES=		cpe dos2unix zip
@@ -44,14 +45,7 @@ GROUPS=		${USERS}
 PLIST_SUB+=	VARLOG=${VARLOG} \
 		VARDB=${VARDB}
 
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MPLUGINS}
-ALL_TARGET+=	plugins
-PLIST_SUB+=	PLUGINS=""
-.else
-PLIST_SUB+=	PLUGINS="@comment "
-.endif
+PLUGINS_ALL_TARGET=	plugins
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${DATADIR}/lib
@@ -69,19 +63,6 @@ do-install:
 	(cd ${INSTALL_WRKSRC}/plugins/admin && ${FIND} . \
 	| ${CPIO} -pvdmu -R ${SHAREOWN}:${SHAREGRP} ${STAGEDIR}${DATADIR}/plugins/admin)
 
-.if ${PORT_OPTIONS:MPLUGINS}
-	(cd ${INSTALL_WRKSRC}/plugins && ${FIND} . \
-	| ${CPIO} -pvdmu -R ${SHAREOWN}:${SHAREGRP} ${STAGEDIR}${DATADIR}/plugins)
-.endif
-
-.if ${PORT_OPTIONS:MDOCS}
-	${MKDIR} ${STAGEDIR}${DOCSDIR}
-	(cd ${WRKSRC} && ${INSTALL_DATA} LICENSE.html README.html changelog.html \
-	    ${STAGEDIR}${DOCSDIR})
-
-	(cd ${WRKSRC}/documentation/docs && ${FIND} . \! -path ./javadoc\* \
-	| ${CPIO} -pdmu -R ${SHAREOWN}:${SHAREGRP} ${STAGEDIR}${DOCSDIR} > /dev/null 2>&1 )
-.endif
 	${LN} -sf ${ETCDIR} ${STAGEDIR}${DATADIR}/conf
 	${LN} -sf ${ETCDIR} ${STAGEDIR}${DATADIR}/resources/security
 	${LN} -sf ${VARDB} ${STAGEDIR}${DATADIR}/embedded-db
@@ -95,4 +76,18 @@ do-install:
 	${INSTALL_DATA} ${INSTALL_WRKSRC}/conf/security.xml \
 		${STAGEDIR}${ETCDIR}/security.xml.sample
 
+do-install-PLUGINS-on:
+	(cd ${INSTALL_WRKSRC}/plugins && ${FIND} . \
+	| ${CPIO} -pvdmu -R ${SHAREOWN}:${SHAREGRP} ${STAGEDIR}${DATADIR}/plugins)
+
+do-install-DOCS-on:
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
+	(cd ${WRKSRC} && ${INSTALL_DATA} LICENSE.html README.html changelog.html \
+	    ${STAGEDIR}${DOCSDIR})
+	(cd ${WRKSRC}/documentation/docs && ${FIND} . \! -path ./javadoc\* \
+	| ${CPIO} -pdmu -R ${SHAREOWN}:${SHAREGRP} ${STAGEDIR}${DOCSDIR} > /dev/null 2>&1 )
+
+post-install:
+	${STRIP_CMD} ${STAGEDIR}${DATADIR}/resources/nativeAuth/linux-i386/libshaj.so
+
 .include <bsd.port.mk>

Modified: head/net-im/openfire/distinfo
==============================================================================
--- head/net-im/openfire/distinfo	Mon Oct 31 14:51:33 2016	(r425006)
+++ head/net-im/openfire/distinfo	Mon Oct 31 15:18:59 2016	(r425007)
@@ -1,2 +1,3 @@
-SHA256 (openfire_src_4_0_2.zip) = ed0fff35a0ebb9a5839fd3806038b9d5d9720f2c9491538a7429c704d85215da
-SIZE (openfire_src_4_0_2.zip) = 103209103
+TIMESTAMP = 1477829402
+SHA256 (openfire_src_4_0_3.zip) = 349d90076453cdf17f2151cdf6df0eaf6d2c1f0fdc5f61f79e8d0b1afb492153
+SIZE (openfire_src_4_0_3.zip) = 103406252



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201610311518.u9VFIxvW045665>