On 02/11/2013 01:56 PM, Stuart Henderson wrote: > On 2013/02/11 13:37, Marc Peters wrote: >> Hopefully it's not too late already and this (trivial) update and >> general bugix release can go in before release. >> >> patches directory is not needed any more (didn't know how to include >> the diff for this :-\) > > 'cvs rm' the patch files, then 'cvs diff -uNp' > >> Build and tested on i386 and amd64. >> >> OKs, comments? > > Looking at the changelog I see quite a number of changes, so it doesn't > quite look like a trivial update, but I don't see anything that really > warrants pushing it for the next OpenBSD release. Please resend after > unlock.. >
After the lock, the update with a better diff: 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 11 Feb 2013 13:15:27 -0000 @@ -1,8 +1,8 @@ # $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 +DISTNAME= openfire_src_3_8_0 +PKGNAME= openfire-3.8.0 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 11 Feb 2013 13:15:27 -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_0.tar.gz) = 2NGSIeJY2OyBCm5JemRv8Ql4ns1kWxeJdoWBZSEr+TA= +SIZE (openfire_src_3_8_0.tar.gz) = 68992387 cvs server: Diffing patches 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> cvs server: Diffing pkg 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 11 Feb 2013 13:15:27 -0000 @@ -382,6 +382,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
