[Midnightbsd-cvs] mports [18959] trunk/net-im/openfire: openfire 3.9.3
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Thu May 14 23:28:39 EDT 2015
Revision: 18959
http://svnweb.midnightbsd.org/mports/?rev=18959
Author: laffer1
Date: 2015-05-14 23:28:38 -0400 (Thu, 14 May 2015)
Log Message:
-----------
openfire 3.9.3
Modified Paths:
--------------
trunk/net-im/openfire/Makefile
trunk/net-im/openfire/distinfo
trunk/net-im/openfire/pkg-plist
Added Paths:
-----------
trunk/net-im/openfire/files/pkg-message.in
Removed Paths:
-------------
trunk/net-im/openfire/pkg-message
Modified: trunk/net-im/openfire/Makefile
===================================================================
--- trunk/net-im/openfire/Makefile 2015-05-15 03:25:58 UTC (rev 18958)
+++ trunk/net-im/openfire/Makefile 2015-05-15 03:28:38 UTC (rev 18959)
@@ -1,8 +1,8 @@
# $MidnightBSD$
PORTNAME= openfire
-PORTVERSION= 3.8.2
-PORTREVISION= 1
+PORTVERSION= 3.9.3
+PORTEPOCH= 1
CATEGORIES= net-im java
MASTER_SITES= http://download.igniterealtime.org/openfire/
DISTNAME= ${PORTNAME}_src_${PORTVERSION:S/./_/g}
@@ -15,21 +15,20 @@
RUN_DEPENDS= classpath:${PORTSDIR}/java/javavmwrapper \
${JAVAJARDIR}/slf4j-api.jar:${PORTSDIR}/devel/slf4j
-OPTIONS_DEFINE= PLUGINS
+OPTIONS_DEFINE= DOCS PLUGINS
OPTIONS_DEFAULT=PLUGINS
PLUGINS_DESC= Install bundled plugins
-USE_ZIP= yes
+USES= dos2unix zip
+DOS2UNIX_FILES= src/java/org/jivesoftware/openfire/server/ServerDialback.java
USE_LDCONFIG= yes
-USE_DOS2UNIX= src/java/org/jivesoftware/openfire/server/ServerDialback.java
USE_ANT= yes
USE_JAVA= yes
-JAVA_VERSION= 1.6+
+JAVA_VERSION= 1.6 1.7
-CONFLICTS= wildfire-[0-9]*
-
ALL_TARGET= openfire
USE_RC_SUBR= openfire
+SUB_FILES+= pkg-message
WRKSRC= ${WRKDIR}/${PORTNAME}_src
BUILD_WRKSRC= ${WRKSRC}/build
@@ -40,6 +39,8 @@
VARDB= /var/db/openfire
USERS= openfire
GROUPS= ${USERS}
+PLIST_SUB+= VARLOG=${VARLOG} \
+ VARDB=${VARDB}
.include <bsd.mport.options.mk>
@@ -56,9 +57,10 @@
./src/plugins/jingleNodes/src/i18n/jinglenodes_i18n.properties)
do-install:
- ${MKDIR} ${DATADIR}/lib
- ${MKDIR} ${VARLOG}
- ${MKDIR} ${VARDB}
+ @${MKDIR} ${DATADIR}/lib
+ @${MKDIR} ${ETCDIR}
+ @${MKDIR} ${VARDB}
+ @${MKDIR} ${VARLOG}
(cd ${INSTALL_WRKSRC}/lib && ${INSTALL} -m 744 *.jar ${DATADIR}/lib)
(cd ${INSTALL_WRKSRC}/lib && ${INSTALL} -m 744 log4j.xml ${DATADIR}/lib)
@@ -76,48 +78,24 @@
.endif
.if ${PORT_OPTIONS:MDOCS}
- ${MKDIR} ${DOCSDIR}
- (cd ${WRKSRC} && ${INSTALL_DATA} \
- LICENSE.html README.html changelog.html ${DOCSDIR})
+ ${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} ${DOCSDIR} > /dev/null 2>&1 )
.endif
-
-post-install:
- ${LN} -sf ${VARLOG} ${DATADIR}/logs
- ${LN} -sf ${VARDB} ${DATADIR}/embedded-db
- ${LN} -sf ${ETCDIR} ${DATADIR}/conf
- ${LN} -sf ${ETCDIR} ${DATADIR}/resources/security
-
- ${MKDIR} ${EXAMPLESDIR}
-
+ ${LN} -sf ${ETCDIR} ${STAGEDIR}${DATADIR}/conf
+ ${LN} -sf ${ETCDIR} ${STAGEDIR}${DATADIR}/resources/security
+ ${LN} -sf ${VARDB} ${STAGEDIR}${DATADIR}/embedded-db
+ ${LN} -sf ${VARLOG} ${STAGEDIR}${DATADIR}/logs
${INSTALL_DATA} ${INSTALL_WRKSRC}/conf/openfire.xml \
- ${EXAMPLESDIR}/openfire.xml
+ ${STAGEDIR}${ETCDIR}/openfire.xml.sample
${INSTALL} -m 600 ${INSTALL_WRKSRC}/resources/security/truststore \
- ${EXAMPLESDIR}/truststore
+ ${STAGEDIR}${ETCDIR}/truststore.sample
${INSTALL} -m 600 ${INSTALL_WRKSRC}/resources/security/keystore \
- ${EXAMPLESDIR}/keystore
- @if [ ! -f ${ETCDIR}/openfire.xml ]; then \
- ${MKDIR} ${ETCDIR}; \
- ${INSTALL} -m 644 ${INSTALL_WRKSRC}/conf/openfire.xml \
- ${ETCDIR}/openfire.xml; \
- fi
- @if [ ! -f ${ETCDIR}/keystore ]; then \
- ${INSTALL} -m 600 ${INSTALL_WRKSRC}/resources/security/keystore \
- ${ETCDIR}/keystore; \
- fi
- @if [ ! -f ${ETCDIR}/truststore ]; then \
- ${INSTALL} -m 600 ${INSTALL_WRKSRC}/resources/security/truststore \
- ${ETCDIR}/truststore; \
- fi
- ${SETENV} ${SCRIPTS_ENV} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
+ ${STAGEDIR}${ETCDIR}/keystore.sample
+ ${INSTALL_DATA} ${INSTALL_WRKSRC}/conf/security.xml \
+ ${STAGEDIR}${ETCDIR}/security.xml.sample
- ${CHOWN} -Rh ${USERS}:${GROUPS} ${ETCDIR}
- ${CHOWN} -Rh ${USERS}:${GROUPS} ${VARLOG}
- ${CHOWN} -Rh ${USERS}:${GROUPS} ${VARDB}
- ${CHOWN} -Rh ${USERS}:${GROUPS} ${DATADIR}
-
- @${CAT} ${PKGMESSAGE}
-
.include <bsd.port.mk>
Modified: trunk/net-im/openfire/distinfo
===================================================================
--- trunk/net-im/openfire/distinfo 2015-05-15 03:25:58 UTC (rev 18958)
+++ trunk/net-im/openfire/distinfo 2015-05-15 03:28:38 UTC (rev 18959)
@@ -1,2 +1,2 @@
-SHA256 (openfire_src_3_8_2.zip) = a72b9a492e84a71ae2d34ca8731ce6aa6b378b85a1e5b7e31223c00e2237d838
-SIZE (openfire_src_3_8_2.zip) = 72348562
+SHA256 (openfire_src_3_9_3.zip) = ae111674abd3888700f7b6abe61b8a1a9d173faac6bc334f0c4686f9b319b8a0
+SIZE (openfire_src_3_9_3.zip) = 84477282
Copied: trunk/net-im/openfire/files/pkg-message.in (from rev 18924, trunk/net-im/openfire/pkg-message)
===================================================================
--- trunk/net-im/openfire/files/pkg-message.in (rev 0)
+++ trunk/net-im/openfire/files/pkg-message.in 2015-05-15 03:28:38 UTC (rev 18959)
@@ -0,0 +1,2 @@
+To enable the openfire startup script please add
+openfire_enable="YES" to your /etc/rc.conf file.
Deleted: trunk/net-im/openfire/pkg-message
===================================================================
--- trunk/net-im/openfire/pkg-message 2015-05-15 03:25:58 UTC (rev 18958)
+++ trunk/net-im/openfire/pkg-message 2015-05-15 03:28:38 UTC (rev 18959)
@@ -1,2 +0,0 @@
-To enable the openfire startup script please add
-openfire_enable="YES" to your /etc/rc.conf file.
Modified: trunk/net-im/openfire/pkg-plist
===================================================================
--- trunk/net-im/openfire/pkg-plist 2015-05-15 03:25:58 UTC (rev 18958)
+++ trunk/net-im/openfire/pkg-plist 2015-05-15 03:28:38 UTC (rev 18959)
@@ -1,11 +1,18 @@
- at unexec if cmp -s %D/%%ETCDIR%%/openfire.xml %D/%%EXAMPLESDIR%%/openfire.xml; then rm -f %D/%%ETCDIR%%/openfire.xml; else echo If permanently deleting this package, %D/%%ETCDIR%%/openfire.xml must be removed manually; fi
- at unexec if cmp -s %D/%%ETCDIR%%/keystore %D/%%EXAMPLESDIR%%/keystore; then rm -f %D/%%ETCDIR%%/keystore; else echo If permanently deleting this package, %D/%%ETCDIR%%/keystore must be removed manually; fi
- at unexec if cmp -s %D/%%ETCDIR%%/truststore %D/%%EXAMPLESDIR%%/truststore; then rm -f %D/%%ETCDIR%%/truststore; else echo If permanently deleting this package, %D/%%ETCDIR%%/truststore must be removed manually; fi
-%%EXAMPLESDIR%%/openfire.xml
-%%EXAMPLESDIR%%/keystore
-%%EXAMPLESDIR%%/truststore
+ at owner openfire
+ at group openfire
+ at mode 0600
+ at sample %%ETCDIR%%/openfire.xml.sample
+ at sample %%ETCDIR%%/security.xml.sample
+ at sample %%ETCDIR%%/keystore.sample
+ at sample %%ETCDIR%%/truststore.sample
+ at mode
+%%DATADIR%%/conf
+%%DATADIR%%/embedded-db
+%%DATADIR%%/logs
%%DATADIR%%/lib/activation.jar
-%%DATADIR%%/lib/bouncycastle.jar
+%%DATADIR%%/lib/bcpg-jdk15on.jar
+%%DATADIR%%/lib/bcpkix-jdk15on.jar
+%%DATADIR%%/lib/bcprov-jdk15on.jar
%%DATADIR%%/lib/commons-el.jar
%%DATADIR%%/lib/hsqldb.jar
%%DATADIR%%/lib/jasper-compiler.jar
@@ -12,17 +19,14 @@
%%DATADIR%%/lib/jasper-runtime.jar
%%DATADIR%%/lib/jdic.jar
%%DATADIR%%/lib/jtds.jar
+%%DATADIR%%/lib/log4j.xml
%%DATADIR%%/lib/mail.jar
%%DATADIR%%/lib/mysql.jar
%%DATADIR%%/lib/openfire.jar
%%DATADIR%%/lib/postgres.jar
%%DATADIR%%/lib/servlet.jar
+%%DATADIR%%/lib/slf4j-log4j12.jar
%%DATADIR%%/lib/startup.jar
-%%DATADIR%%/lib/slf4j-log4j12.jar
-%%DATADIR%%/lib/log4j.xml
-%%DATADIR%%/conf
-%%DATADIR%%/embedded-db
-%%DATADIR%%/logs
%%DATADIR%%/plugins/admin/plugin.xml
%%DATADIR%%/plugins/admin/webapp/WEB-INF/admin.tld
%%DATADIR%%/plugins/admin/webapp/WEB-INF/decorators.xml
@@ -183,6 +187,8 @@
%%DATADIR%%/plugins/admin/webapp/style/lightbox.css
%%DATADIR%%/plugins/admin/webapp/style/login.css
%%DATADIR%%/plugins/admin/webapp/style/setup.css
+%%PLUGINS%%%%DATADIR%%/plugins/jitsivideobridge.jar
+%%PLUGINS%%%%DATADIR%%/plugins/rayo.jar
%%PLUGINS%%%%DATADIR%%/plugins/fastpath.jar
%%PLUGINS%%%%DATADIR%%/plugins/broadcast.jar
%%PLUGINS%%%%DATADIR%%/plugins/clientControl.jar
@@ -360,50 +366,51 @@
%%DATADIR%%/resources/security
%%DATADIR%%/resources/spank/WEB-INF/web.xml
%%DATADIR%%/resources/spank/index.html
- at dirrm %%DATADIR%%/resources/spank/WEB-INF
- at dirrm %%DATADIR%%/resources/spank
- at dirrm %%DATADIR%%/resources/nativeAuth/win32-x86
- at dirrm %%DATADIR%%/resources/nativeAuth/solaris-sparc
- at dirrm %%DATADIR%%/resources/nativeAuth/osx-ppc
- at dirrm %%DATADIR%%/resources/nativeAuth/linux-i386
- at dirrm %%DATADIR%%/resources/nativeAuth
- at dirrm %%DATADIR%%/resources/database/upgrade/9
- at dirrm %%DATADIR%%/resources/database/upgrade/8
- at dirrm %%DATADIR%%/resources/database/upgrade/7
- at dirrm %%DATADIR%%/resources/database/upgrade/6
- at dirrm %%DATADIR%%/resources/database/upgrade/5
- at dirrm %%DATADIR%%/resources/database/upgrade/4
- at dirrm %%DATADIR%%/resources/database/upgrade/21
- at dirrm %%DATADIR%%/resources/database/upgrade/20
- at dirrm %%DATADIR%%/resources/database/upgrade/2
- at dirrm %%DATADIR%%/resources/database/upgrade/19
- at dirrm %%DATADIR%%/resources/database/upgrade/18
- at dirrm %%DATADIR%%/resources/database/upgrade/17
- at dirrm %%DATADIR%%/resources/database/upgrade/16
- at dirrm %%DATADIR%%/resources/database/upgrade/15
- at dirrm %%DATADIR%%/resources/database/upgrade/14
- at dirrm %%DATADIR%%/resources/database/upgrade/13
- at dirrm %%DATADIR%%/resources/database/upgrade/12
- at dirrm %%DATADIR%%/resources/database/upgrade/11
- at dirrm %%DATADIR%%/resources/database/upgrade/10
- at dirrm %%DATADIR%%/resources/database/upgrade/1
- at dirrm %%DATADIR%%/resources/database/upgrade
- at dirrm %%DATADIR%%/resources/database
- at dirrm %%DATADIR%%/resources
- at dirrm %%DATADIR%%/plugins/admin/webapp/style
- at dirrm %%DATADIR%%/plugins/admin/webapp/setup
- at dirrm %%DATADIR%%/plugins/admin/webapp/js/tooltips
- at dirrm %%DATADIR%%/plugins/admin/webapp/js/jscalendar
- at dirrm %%DATADIR%%/plugins/admin/webapp/js
- at dirrm %%DATADIR%%/plugins/admin/webapp/images
- at dirrm %%DATADIR%%/plugins/admin/webapp/WEB-INF/lib
- at dirrm %%DATADIR%%/plugins/admin/webapp/WEB-INF
- at dirrm %%DATADIR%%/plugins/admin/webapp
- at dirrm %%DATADIR%%/plugins/admin
-%%PLUGINS%%@dirrm %%DATADIR%%/plugins
- at dirrm %%DATADIR%%/lib
- at dirrm %%EXAMPLESDIR%%
- at unexec rmdir %D/%%DATADIR%% 2> /dev/null
- at unexec rmdir %D/%%ETCDIR%% 2> /dev/null || echo "If permanently deleting this package, %D/%%ETCDIR%% must be removed manually"
- at unexec rmdir /var/db/openfire 2> /dev/null || echo "If permanently deleting this package, /var/db/openfire must be removed manually"
- at unexec rmdir /var/log/openfire 2> /dev/null || echo "If permanently deleting this package, /var/log/openfire must be removed manually"
+ at dir %%DATADIR%%/resources/spank/WEB-INF
+ at dir %%DATADIR%%/resources/spank
+ at dir %%DATADIR%%/resources/nativeAuth/win32-x86
+ at dir %%DATADIR%%/resources/nativeAuth/solaris-sparc
+ at dir %%DATADIR%%/resources/nativeAuth/osx-ppc
+ at dir %%DATADIR%%/resources/nativeAuth/linux-i386
+ at dir %%DATADIR%%/resources/nativeAuth
+ at dir %%DATADIR%%/resources/database/upgrade/9
+ at dir %%DATADIR%%/resources/database/upgrade/8
+ at dir %%DATADIR%%/resources/database/upgrade/7
+ at dir %%DATADIR%%/resources/database/upgrade/6
+ at dir %%DATADIR%%/resources/database/upgrade/5
+ at dir %%DATADIR%%/resources/database/upgrade/4
+ at dir %%DATADIR%%/resources/database/upgrade/21
+ at dir %%DATADIR%%/resources/database/upgrade/20
+ at dir %%DATADIR%%/resources/database/upgrade/2
+ at dir %%DATADIR%%/resources/database/upgrade/19
+ at dir %%DATADIR%%/resources/database/upgrade/18
+ at dir %%DATADIR%%/resources/database/upgrade/17
+ at dir %%DATADIR%%/resources/database/upgrade/16
+ at dir %%DATADIR%%/resources/database/upgrade/15
+ at dir %%DATADIR%%/resources/database/upgrade/14
+ at dir %%DATADIR%%/resources/database/upgrade/13
+ at dir %%DATADIR%%/resources/database/upgrade/12
+ at dir %%DATADIR%%/resources/database/upgrade/11
+ at dir %%DATADIR%%/resources/database/upgrade/10
+ at dir %%DATADIR%%/resources/database/upgrade/1
+ at dir %%DATADIR%%/resources/database/upgrade
+ at dir %%DATADIR%%/resources/database
+ at dir %%DATADIR%%/resources
+ at dir %%DATADIR%%/plugins/admin/webapp/style
+ at dir %%DATADIR%%/plugins/admin/webapp/setup
+ at dir %%DATADIR%%/plugins/admin/webapp/js/tooltips
+ at dir %%DATADIR%%/plugins/admin/webapp/js/jscalendar
+ at dir %%DATADIR%%/plugins/admin/webapp/js
+ at dir %%DATADIR%%/plugins/admin/webapp/images
+ at dir %%DATADIR%%/plugins/admin/webapp/WEB-INF/lib
+ at dir %%DATADIR%%/plugins/admin/webapp/WEB-INF
+ at dir %%DATADIR%%/plugins/admin/webapp
+ at dir %%DATADIR%%/plugins/admin
+ at dir %%DATADIR%%/plugins
+ at dir %%DATADIR%%/lib
+ at dir %%DATADIR%%
+ at dir %%ETCDIR%%
+ at dir %%VARLOG%%
+ at dir %%VARDB%%
+ at owner
+ at group
More information about the Midnightbsd-cvs
mailing list