From vvelox@vvelox.net  Sun Feb  9 11:34:17 2014
Return-Path: <vvelox@vvelox.net>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1])
	(using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by hub.freebsd.org (Postfix) with ESMTPS id C8CE14AD
	for <FreeBSD-gnats-submit@freebsd.org>; Sun,  9 Feb 2014 11:34:17 +0000 (UTC)
Received: from vulpes.vvelox.net (vulpes.vvelox.net [99.69.115.42])
	by mx1.freebsd.org (Postfix) with ESMTP id 92B021CEB
	for <FreeBSD-gnats-submit@freebsd.org>; Sun,  9 Feb 2014 11:34:17 +0000 (UTC)
Received: from vixen42.vulpes.vvelox.net (vixen42.vulpes.vvelox.net [192.168.15.2])
	(Authenticated sender: kitsune)
	by vulpes.vvelox.net (Postfix) with ESMTPA id 7BB98492BA64
	for <FreeBSD-gnats-submit@freebsd.org>; Sun,  9 Feb 2014 05:24:08 -0600 (CST)
Message-Id: <1391944718.835602.11634@vixen42.vulpes.vvelox.net>
Date: Sun, 9 Feb 2014 05:18:38 -0600
From: "Zane C.B-H." <vvelox@vvelox.net>
To: "FreeBSD gnats submit" <FreeBSD-gnats-submit@freebsd.org>
Subject: Update: net-im/openfire    update to 3.9.1 from 3.8.2
X-Send-Pr-Version: gtk-send-pr 0.4.9 
X-GNATS-Notify:

>Number:         186585
>Category:       ports
>Synopsis:       Update: net-im/openfire    update to 3.9.1 from 3.8.2
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    gahr
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Sun Feb 09 11:40:00 UTC 2014
>Closed-Date:    Tue Feb 11 10:14:52 UTC 2014
>Last-Modified:  Tue Feb 11 10:20:00 UTC 2014
>Originator:     Zane C.B-H.
>Release:        FreeBSD 9.2-STABLE amd64
>Organization:
>Environment:


System: FreeBSD 9.2-STABLE #2 r261201: Sun Jan 26 22:33:56 CST 2014
    kitsune@vixen42.vulpes.vvelox.net:/usr/obj/arc/src/FreeBSD/9-stable/sys/GENERIC



>Description:





>How-To-Repeat:





>Fix:


--- openfire_Makefile.diff begins here ---
--- Makefile.orig	2014-02-08 23:17:24.648941853 -0600
+++ Makefile	2014-02-09 05:16:03.386942242 -0600
@@ -2,8 +2,7 @@
 # $FreeBSD: head/net-im/openfire/Makefile 338168 2013-12-30 20:55:18Z ohauer $
 
 PORTNAME=	openfire
-PORTVERSION=	3.8.2
-PORTEPOCH=	1
+PORTVERSION=	3.9.1
 CATEGORIES=	net-im java
 MASTER_SITES=	http://download.igniterealtime.org/openfire/
 DISTNAME=	${PORTNAME}_src_${PORTVERSION:S/./_/g}
--- openfire_Makefile.diff ends here ---


--- openfire_distinfo.diff begins here ---
--- distinfo.orig	2013-06-28 09:17:26.594853654 -0500
+++ distinfo	2014-02-09 05:16:23.509152362 -0600
@@ -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_1.zip) = aa027461b1b895551ffcaadd4da03797847ac8c809955af8108ec677abbefaa1
+SIZE (openfire_src_3_9_1.zip) = 126568710
--- openfire_distinfo.diff ends here ---



>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->gahr 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Sun Feb 9 11:40:08 UTC 2014 
Responsible-Changed-Why:  
Over to maintainer (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=186585 
State-Changed-From-To: open->closed 
State-Changed-By: gahr 
State-Changed-When: Tue Feb 11 10:14:51 UTC 2014 
State-Changed-Why:  
Committed. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=186585 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/186585: commit references a PR
Date: Tue, 11 Feb 2014 10:14:44 +0000 (UTC)

 Author: gahr
 Date: Tue Feb 11 10:14:35 2014
 New Revision: 343730
 URL: http://svnweb.freebsd.org/changeset/ports/343730
 QAT: https://qat.redports.org/buildarchive/r343730/
 
 Log:
   - Update to 3.9.1 [1]
   - While at it, simplify the installation and avoid @unexec hell
   
   PR:		186585 [1]
   Submitted by:	"Zane C.B-H." <vvelox@vvelox.net>
 
 Added:
   head/net-im/openfire/files/pkg-message.in
      - copied, changed from r343602, head/net-im/openfire/pkg-message
 Deleted:
   head/net-im/openfire/pkg-message
 Modified:
   head/net-im/openfire/Makefile
   head/net-im/openfire/distinfo
   head/net-im/openfire/pkg-plist
 
 Modified: head/net-im/openfire/Makefile
 ==============================================================================
 --- head/net-im/openfire/Makefile	Tue Feb 11 09:53:43 2014	(r343729)
 +++ head/net-im/openfire/Makefile	Tue Feb 11 10:14:35 2014	(r343730)
 @@ -2,7 +2,7 @@
  # $FreeBSD$
  
  PORTNAME=	openfire
 -PORTVERSION=	3.8.2
 +PORTVERSION=	3.9.1
  PORTEPOCH=	1
  CATEGORIES=	net-im java
  MASTER_SITES=	http://download.igniterealtime.org/openfire/
 @@ -16,13 +16,14 @@ LICENSE=	APACHE20
  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
  
 +USES=		dos2unix
 +DOS2UNIX_FILES=	src/java/org/jivesoftware/openfire/server/ServerDialback.java
  USE_ZIP=	yes
  USE_LDCONFIG=	yes
 -USE_DOS2UNIX=	src/java/org/jivesoftware/openfire/server/ServerDialback.java
  USE_ANT=	yes
  USE_JAVA=	yes
  JAVA_VERSION=	1.6+
 @@ -31,6 +32,7 @@ CONFLICTS=	wildfire-[0-9]*
  
  ALL_TARGET=	openfire
  USE_RC_SUBR=	openfire
 +SUB_FILES+=	pkg-message
  
  WRKSRC=		${WRKDIR}/${PORTNAME}_src
  BUILD_WRKSRC=	${WRKSRC}/build
 @@ -41,8 +43,9 @@ VARLOG=		/var/log/openfire
  VARDB=		/var/db/openfire
  USERS=		openfire
  GROUPS=		${USERS}
 +PLIST_SUB+=	VARLOG=${VARLOG} \
 +		VARDB=${VARDB}
  
 -NO_STAGE=	yes
  .include <bsd.port.options.mk>
  
  .if ${PORT_OPTIONS:MPLUGINS}
 @@ -58,67 +61,44 @@ post-patch:
  	    ./src/plugins/jingleNodes/src/i18n/jinglenodes_i18n.properties)
  
  do-install:
 -	${MKDIR} ${DATADIR}/lib
 -	${MKDIR} ${VARLOG}
 -	${MKDIR} ${VARDB}
 +	@${MKDIR} ${STAGEDIR}${DATADIR}/lib
 +	@${MKDIR} ${STAGEDIR}${VARLOG}
 +	@${MKDIR} ${STAGEDIR}${VARDB}
 +	@${MKDIR} ${STAGEDIR}${ETCDIR}
  
 -	(cd ${INSTALL_WRKSRC}/lib && ${INSTALL} -m 744 *.jar ${DATADIR}/lib)
 -	(cd ${INSTALL_WRKSRC}/lib && ${INSTALL} -m 744 log4j.xml ${DATADIR}/lib)
 +	(cd ${INSTALL_WRKSRC}/lib && ${INSTALL} -m 744 *.jar ${STAGEDIR}${DATADIR}/lib)
 +	(cd ${INSTALL_WRKSRC}/lib && ${INSTALL} -m 744 log4j.xml ${STAGEDIR}${DATADIR}/lib)
  
  	(cd ${INSTALL_WRKSRC}/resources && ${FIND} . \! -path ./security\* \
 -	| ${CPIO} -pvdmu -R ${SHAREOWN}:${SHAREGRP} ${DATADIR}/resources)
 +	| ${CPIO} -pvdmu -R ${SHAREOWN}:${SHAREGRP} ${STAGEDIR}${DATADIR}/resources)
  
  #	always install admin interface
  	(cd ${INSTALL_WRKSRC}/plugins/admin && ${FIND} . \
 -	| ${CPIO} -pvdmu -R ${SHAREOWN}:${SHAREGRP} ${DATADIR}/plugins/admin)
 +	| ${CPIO} -pvdmu -R ${SHAREOWN}:${SHAREGRP} ${STAGEDIR}${DATADIR}/plugins/admin)
  
  .if ${PORT_OPTIONS:MPLUGINS}
  	(cd ${INSTALL_WRKSRC}/plugins && ${FIND} . \
 -	| ${CPIO} -pvdmu -R ${SHAREOWN}:${SHAREGRP} ${DATADIR}/plugins)
 +	| ${CPIO} -pvdmu -R ${SHAREOWN}:${SHAREGRP} ${STAGEDIR}${DATADIR}/plugins)
  .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 )
 +	| ${CPIO} -pdmu -R ${SHAREOWN}:${SHAREGRP} ${STAGEDIR}${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 ${VARLOG} ${STAGEDIR}${DATADIR}/logs
 +	${LN} -sf ${VARDB}  ${STAGEDIR}${DATADIR}/embedded-db
 +	${LN} -sf ${ETCDIR} ${STAGEDIR}${DATADIR}/conf
 +	${LN} -sf ${ETCDIR} ${STAGEDIR}${DATADIR}/resources/security
  
  	${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
 -
 -	${CHOWN} -Rh ${USERS}:${GROUPS} ${ETCDIR}
 -	${CHOWN} -Rh ${USERS}:${GROUPS} ${VARLOG}
 -	${CHOWN} -Rh ${USERS}:${GROUPS} ${VARDB}
 -	${CHOWN} -Rh ${USERS}:${GROUPS} ${DATADIR}
 -
 -	@${CAT} ${PKGMESSAGE}
 +		${STAGEDIR}${ETCDIR}/keystore.sample
  
  .include <bsd.port.mk>
 
 Modified: head/net-im/openfire/distinfo
 ==============================================================================
 --- head/net-im/openfire/distinfo	Tue Feb 11 09:53:43 2014	(r343729)
 +++ head/net-im/openfire/distinfo	Tue Feb 11 10:14:35 2014	(r343730)
 @@ -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_1.zip) = aa027461b1b895551ffcaadd4da03797847ac8c809955af8108ec677abbefaa1
 +SIZE (openfire_src_3_9_1.zip) = 126568710
 
 Copied and modified: head/net-im/openfire/files/pkg-message.in (from r343602, head/net-im/openfire/pkg-message)
 ==============================================================================
 --- head/net-im/openfire/pkg-message	Mon Feb 10 08:18:31 2014	(r343602, copy source)
 +++ head/net-im/openfire/files/pkg-message.in	Tue Feb 11 10:14:35 2014	(r343730)
 @@ -1,2 +1,9 @@
  To enable the openfire startup script please add
  openfire_enable="YES" to your /etc/rc.conf file.
 +
 +The following sample configuration files have been
 +placed in %%ETCDIR%%:
 +
 +openfire.xml.sample
 +keystore.sample
 +truststore.sample
 
 Modified: head/net-im/openfire/pkg-plist
 ==============================================================================
 --- head/net-im/openfire/pkg-plist	Tue Feb 11 09:53:43 2014	(r343729)
 +++ head/net-im/openfire/pkg-plist	Tue Feb 11 10:14:35 2014	(r343730)
 @@ -1,25 +1,26 @@
 -@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
 -@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
 -@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
 +@owner openfire
 +@group openfire
 +%%ETCDIR%%/openfire.xml.sample
 +%%ETCDIR%%/keystore.sample
 +%%ETCDIR%%/truststore.sample
  %%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
  %%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/startup.jar
  %%DATADIR%%/lib/slf4j-log4j12.jar
 -%%DATADIR%%/lib/log4j.xml
 +%%DATADIR%%/lib/startup.jar
  %%DATADIR%%/conf
  %%DATADIR%%/embedded-db
  %%DATADIR%%/logs
 @@ -400,10 +401,9 @@
  @dirrm %%DATADIR%%/plugins/admin/webapp/WEB-INF
  @dirrm %%DATADIR%%/plugins/admin/webapp
  @dirrm %%DATADIR%%/plugins/admin
 -%%PLUGINS%%@dirrm %%DATADIR%%/plugins
 +@dirrm %%DATADIR%%/plugins
  @dirrm %%DATADIR%%/lib
 -@dirrm %%EXAMPLESDIR%%
 -@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%%
 +@dirrmtry %%ETCDIR%%
 +@dirrmtry %%VARLOG%%
 +@dirrmtry %%VARDB%%
 _______________________________________________
 svn-ports-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-ports-all
 To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
 
>Unformatted:
