Index: Makefile =================================================================== RCS file: /home/pcvs/ports/net-im/openfire/Makefile,v retrieving revision 1.29 diff -u -r1.29 Makefile --- Makefile 24 Jan 2011 11:27:31 -0000 1.29 +++ Makefile 14 Mar 2011 13:20:50 -0000 @@ -6,16 +6,17 @@ # PORTNAME= openfire -PORTVERSION= 3.6.4 +PORTVERSION= 3.7.0 PORTEPOCH= 1 CATEGORIES= net-im java -MASTER_SITES= http://download.igniterealtime.org/openfire/ +MASTER_SITES= http://www.igniterealtime.org/downloadServlet?filename=openfire/ DISTNAME= ${PORTNAME}_src_${PORTVERSION:S/./_/g} MAINTAINER= gahr@FreeBSD.org -COMMENT= Openfire (formerly Wildfire) is an enterprise instant messaging server +COMMENT= Enterprise instant messaging server -RUN_DEPENDS= classpath:${PORTSDIR}/java/javavmwrapper +RUN_DEPENDS= classpath:${PORTSDIR}/java/javavmwrapper \ + ${JAVAJARDIR}/slf4j-api.jar:${PORTSDIR}/devel/slf4j USE_LDCONFIG= yes USE_ANT= yes @@ -24,9 +25,8 @@ CONFLICTS= wildfire-[0-9]* -ALL_TARGET= openfire +ALL_TARGET= openfire plugins USE_RC_SUBR= openfire -SUB_FILES= pkg-message WRKSRC= ${WRKDIR}/${PORTNAME}_src BUILD_WRKSRC= ${WRKSRC}/build @@ -34,8 +34,8 @@ DATADIR= ${JAVASHAREDIR}/${PORTNAME} VARLOG= /var/log/openfire VARDB= /var/db/openfire -PUSER= openfire -PGROUP= ${PUSER} +USERS= openfire +GROUPS= ${USERS} do-install: @@ -88,16 +88,12 @@ ${INSTALL} -m 600 ${INSTALL_WRKSRC}/resources/security/truststore \ ${ETCDIR}/truststore; \ fi - ${SETENV} ${SCRIPTS_ENV} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL - ${CHOWN} -Rh ${PUSER}:${PGROUP} ${ETCDIR} - ${CHOWN} -Rh ${PUSER}:${PGROUP} ${VARDB} - ${CHOWN} -Rh ${PUSER}:${PGROUP} ${VARLOG} - ${CHOWN} -Rh ${PUSER}:${PGROUP} ${DATADIR} + ${CHOWN} -Rh ${USERS}:${GROUPS} ${ETCDIR} + ${CHOWN} -Rh ${USERS}:${GROUPS} ${VARDB} + ${CHOWN} -Rh ${USERS}:${GROUPS} ${VARLOG} + ${CHOWN} -Rh ${USERS}:${GROUPS} ${DATADIR} - @${ECHO_CMD} "===> post-installation information for ${PKGNAME}:" - @${ECHO_CMD} "" @${CAT} ${PKGMESSAGE} - @${ECHO_CMD} "" .include Index: distinfo =================================================================== RCS file: /home/pcvs/ports/net-im/openfire/distinfo,v retrieving revision 1.21 diff -u -r1.21 distinfo --- distinfo 24 Jan 2011 11:27:31 -0000 1.21 +++ distinfo 9 Mar 2011 09:54:59 -0000 @@ -1,2 +1,2 @@ -SHA256 (openfire_src_3_6_4.tar.gz) = 8f5c3334da449e2fb1bdabe2bdd46db1fd96a4dc7b3e34a870401fa90819ea99 -SIZE (openfire_src_3_6_4.tar.gz) = 51183844 +SHA256 (openfire_src_3_7_0.tar.gz) = 838606343b06059cee7d98b9e0d989dc511021b64e0c24a3379192e763b9ef4a +SIZE (openfire_src_3_7_0.tar.gz) = 60928248 Index: pkg-install =================================================================== RCS file: pkg-install diff -N pkg-install --- pkg-install 29 Apr 2008 13:01:21 -0000 1.6 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,30 +0,0 @@ -#!/bin/sh - -case $2 in -POST-INSTALL) - PUSER=openfire - PGROUP=${PUSER} - PUID=342 - PGID=${PUID} - - if ! pw group show "${PGROUP}" > /dev/null; then - if pw groupadd ${PGROUP} -g ${PGID}; then - echo "Added group \"${PGROUP}\"." - else - echo "Adding group \"${PGROUP}\" failed..." - exit 1 - fi - fi - - if ! pw user show "${PUSER}" > /dev/null; then - if pw useradd ${PUSER} -u ${PUID} -g ${PGROUP} -h - \ - -d /nonexistent -s /sbin/nologin -c "Openfire Daemon" - then - echo "Added user \"${PUSER}\"." - else - echo "Adding user \"${PUSER}\" failed..." - exit 1 - fi - fi - ;; -esac Index: pkg-message =================================================================== RCS file: pkg-message diff -N pkg-message --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ pkg-message 14 Mar 2011 09:50:12 -0000 @@ -0,0 +1,2 @@ +To enable the openfire startup script please add +openfire_enable="YES" to your /etc/rc.conf file. Index: pkg-plist =================================================================== RCS file: /home/pcvs/ports/net-im/openfire/pkg-plist,v retrieving revision 1.15 diff -u -r1.15 pkg-plist --- pkg-plist 24 Jan 2011 11:27:31 -0000 1.15 +++ pkg-plist 14 Mar 2011 08:48:18 -0000 @@ -55,6 +55,7 @@ %%JAVAJARDIR%%/postgres.jar %%JAVAJARDIR%%/servlet.jar %%JAVAJARDIR%%/startup.jar +%%JAVAJARDIR%%/slf4j-log4j12.jar %%DATADIR%%/conf %%DATADIR%%/embedded-db %%DATADIR%%/logs @@ -218,6 +219,26 @@ %%DATADIR%%/plugins/admin/webapp/style/lightbox.css %%DATADIR%%/plugins/admin/webapp/style/login.css %%DATADIR%%/plugins/admin/webapp/style/setup.css +%%DATADIR%%/plugins/broadcast.jar +%%DATADIR%%/plugins/clientControl.jar +%%DATADIR%%/plugins/contentFilter.jar +%%DATADIR%%/plugins/dbaccess.jar +%%DATADIR%%/plugins/emailListener.jar +%%DATADIR%%/plugins/fastpath.jar +%%DATADIR%%/plugins/jingleNodes.jar +%%DATADIR%%/plugins/loadStats.jar +%%DATADIR%%/plugins/monitoring.jar +%%DATADIR%%/plugins/motd.jar +%%DATADIR%%/plugins/packetFilter.jar +%%DATADIR%%/plugins/presence.jar +%%DATADIR%%/plugins/registration.jar +%%DATADIR%%/plugins/search.jar +%%DATADIR%%/plugins/sip.jar +%%DATADIR%%/plugins/subscription.jar +%%DATADIR%%/plugins/userCreation.jar +%%DATADIR%%/plugins/userImportExport.jar +%%DATADIR%%/plugins/userservice.jar +%%DATADIR%%/plugins/xmldebugger.jar %%DATADIR%%/resources/database/openfire_db2.sql %%DATADIR%%/resources/database/openfire_hsqldb.sql %%DATADIR%%/resources/database/openfire_mysql.sql @@ -314,6 +335,13 @@ %%DATADIR%%/resources/database/upgrade/20/openfire_postgresql.sql %%DATADIR%%/resources/database/upgrade/20/openfire_sqlserver.sql %%DATADIR%%/resources/database/upgrade/20/openfire_sybase.sql +%%DATADIR%%/resources/database/upgrade/21/openfire_db2.sql +%%DATADIR%%/resources/database/upgrade/21/openfire_hsqldb.sql +%%DATADIR%%/resources/database/upgrade/21/openfire_mysql.sql +%%DATADIR%%/resources/database/upgrade/21/openfire_oracle.sql +%%DATADIR%%/resources/database/upgrade/21/openfire_postgresql.sql +%%DATADIR%%/resources/database/upgrade/21/openfire_sqlserver.sql +%%DATADIR%%/resources/database/upgrade/21/openfire_sybase.sql %%DATADIR%%/resources/database/upgrade/4/openfire_db2.sql %%DATADIR%%/resources/database/upgrade/4/openfire_hsqldb.sql %%DATADIR%%/resources/database/upgrade/4/openfire_mysql.sql @@ -376,6 +404,7 @@ @dirrm %%DATADIR%%/resources/database/upgrade/6 @dirrm %%DATADIR%%/resources/database/upgrade/5 @dirrm %%DATADIR%%/resources/database/upgrade/4 +@dirrm %%DATADIR%%/resources/database/upgrade/21 @dirrm %%DATADIR%%/resources/database/upgrade/20 @dirrm %%DATADIR%%/resources/database/upgrade/2 @dirrm %%DATADIR%%/resources/database/upgrade/19 @@ -402,15 +431,12 @@ @dirrm %%DATADIR%%/plugins/admin/webapp/WEB-INF @dirrm %%DATADIR%%/plugins/admin/webapp @dirrm %%DATADIR%%/plugins/admin -@dirrm %%DATADIR%%/plugins -@dirrm share/java/openfire -@dirrm share/examples/openfire -@dirrm %%PORTDOCS%%%%DOCSDIR%%/licenses -@dirrm %%PORTDOCS%%%%DOCSDIR%%/images -@dirrm share/doc/openfire -@comment @dirrm %%ETCDIR%%/openfire +@dirrm %%EXAMPLESDIR%% +%%PORTDOCS%%@dirrm %%DOCSDIR%%/licenses +%%PORTDOCS%%@dirrm %%DOCSDIR%%/images +%%PORTDOCS%%@dirrm %%DOCSDIR%% @unexec rmdir %D/%%DATADIR%%/plugins 2> /dev/null || echo "If permanently deleting this package, %D/%%DATADIR%%/plugins must be removed manually" +@unexec rmdir %D/%%DATADIR%% 2> /dev/null @unexec rmdir %D/%%ETCDIR%% 2> /dev/null || echo "If permanently deleting this package, %D/%%ETCDIR%% must be removed manually" @unexec rmdir /var/db/openfire 2> /dev/null || echo "If permanently deleting this package, /var/db/openfire must be removed manually" @unexec rmdir /var/log/openfire 2> /dev/null || echo "If permanently deleting this package, /var/log/openfire must be removed manually" -@dirrmtry %%DATADIR%% Index: files/patch-build-build.xml =================================================================== RCS file: files/patch-build-build.xml diff -N files/patch-build-build.xml --- files/patch-build-build.xml 24 Jan 2011 11:27:31 -0000 1.3 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,10 +0,0 @@ ---- build/build.xml.orig 2010-10-27 04:53:55.000000000 -0700 -+++ build/build.xml 2010-10-27 04:54:13.000000000 -0700 -@@ -224,6 +224,7 @@ - - - -+ - - - Index: files/pkg-message.in =================================================================== RCS file: files/pkg-message.in diff -N files/pkg-message.in --- files/pkg-message.in 14 Dec 2007 23:39:32 -0000 1.5 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,4 +0,0 @@ -You can find the documentation files for this package in -%%DOCSDIR%%. -To enable openfire startup script please add openfire_enable="YES" in -your rc.conf file.