Hi,

an update of Openfire to 3.8.2 for stable. Attached a patchfile to avoid
linewrapping.

Builds and runs fine on amd64.

OKs? Comments?

Marc
Index: Makefile
===================================================================
RCS file: /cvs/ports/net/openfire/Makefile,v
retrieving revision 1.25
diff -u -p -r1.25 Makefile
--- Makefile    23 Oct 2012 20:43:52 -0000      1.25
+++ Makefile    12 Jul 2013 09:36:34 -0000
@@ -1,8 +1,9 @@
 # $OpenBSD: Makefile,v 1.25 2012/10/23 20:43:52 jasper Exp $
 
 COMMENT=       XMPP real time collaboration server
-DISTNAME=      openfire_src_3_7_1
-PKGNAME=       openfire-3.7.1
+V=             3.8.2
+DISTNAME=      openfire_src_${V:S/./_/g}
+PKGNAME=       openfire-$V
 CATEGORIES=    net
 
 MASTER_SITES=  http://www.igniterealtime.org/downloadServlet?filename=openfire/
Index: distinfo
===================================================================
RCS file: /cvs/ports/net/openfire/distinfo,v
retrieving revision 1.3
diff -u -p -r1.3 distinfo
--- distinfo    23 Oct 2012 20:43:52 -0000      1.3
+++ distinfo    12 Jul 2013 09:36:34 -0000
@@ -1,2 +1,2 @@
-SHA256 (openfire_src_3_7_1.tar.gz) = 
0vPaJK8rtcFzsYHL9SGbfwQsiEtfDogdBE1yCT5IN9I=
-SIZE (openfire_src_3_7_1.tar.gz) = 66740973
+SHA256 (openfire_src_3_8_2.tar.gz) = 
LRv5dSPq/pSFoBO7tw/ygtQUcPZbhC9NdlbJeIq5bI0=
+SIZE (openfire_src_3_8_2.tar.gz) = 69222202
Index: patches/patch-build_build_xml
===================================================================
RCS file: patches/patch-build_build_xml
diff -N patches/patch-build_build_xml
--- patches/patch-build_build_xml       1 May 2011 09:25:02 -0000       1.1
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -1,11 +0,0 @@
-$OpenBSD: patch-build_build_xml,v 1.1 2011/05/01 09:25:02 landry Exp $
---- build/build.xml.orig       Sat Apr 30 18:05:10 2011
-+++ build/build.xml    Sat Apr 30 18:05:56 2011
-@@ -234,6 +234,7 @@
-                 <or>
-                     <contains string="${ant.java.version}" substring="1.5"/>
-                     <contains string="${ant.java.version}" substring="1.6"/>
-+                    <contains string="${ant.java.version}" substring="1.7"/>
-                 </or>
-             </not>
-         </condition>
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/net/openfire/pkg/PLIST,v
retrieving revision 1.4
diff -u -p -r1.4 PLIST
--- pkg/PLIST   9 Mar 2011 16:50:40 -0000       1.4
+++ pkg/PLIST   12 Jul 2013 09:36:34 -0000
@@ -1,6 +1,9 @@
 @comment $OpenBSD: PLIST,v 1.4 2011/03/09 16:50:40 ian Exp $
 @newgroup _openfire:632
 @newuser _openfire:632:_openfire:daemon:openfire user:/var/empty:/bin/sh
+@extraunexec rm -rf %D/openfire/conf/*
+@extraunexec rm -rf %D/openfire/embedded-db
+@extraunexec rm -rf %D/openfire/logs/*
 @mode 775
 @owner root
 @group _openfire
@@ -382,6 +385,7 @@ share/doc/openfire/database.html
 share/doc/openfire/db-integration-guide.html
 share/doc/openfire/install-guide.html
 share/doc/openfire/ldap-guide.html
+share/doc/openfire/pluggable-roster-support-guide.html
 share/doc/openfire/plugin-dev-guide.html
 share/doc/openfire/ssl-guide.html
 share/doc/openfire/translator-guide.html
Index: pkg/openfire.rc
===================================================================
RCS file: /cvs/ports/net/openfire/pkg/openfire.rc,v
retrieving revision 1.2
diff -u -p -r1.2 openfire.rc
--- pkg/openfire.rc     9 Mar 2011 17:08:00 -0000       1.2
+++ pkg/openfire.rc     12 Jul 2013 09:36:34 -0000
@@ -5,8 +5,8 @@
 OPENFIRE_HOME="${TRUEPREFIX}/openfire"
 OPENFIRE_LIB="${OPENFIRE_HOME}/lib"
 
-JAVACMD="$(javaPathHelper -c openfire)"
-JAVA_HOME="$(javaPathHelper -h openfire)"
+JAVACMD="$(${LOCALBASE}/bin/javaPathHelper -c openfire)"
+JAVA_HOME="$(${LOCALBASE}/bin/javaPathHelper -h openfire)"
 
 daemon="${JAVACMD}"
 daemon_flags="-server -DopenfireHome=${OPENFIRE_HOME} 
-Dopenfire.lib.dir=${OPENFIRE_LIB} -jar ${OPENFIRE_LIB}/startup.jar"

Reply via email to