From decke@bluelife.at  Tue Dec 16 22:59:34 2008
Return-Path: <decke@bluelife.at>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 63CFB1065670
	for <FreeBSD-gnats-submit@freebsd.org>; Tue, 16 Dec 2008 22:59:34 +0000 (UTC)
	(envelope-from decke@bluelife.at)
Received: from mail.itac.at (mail.itac.at [213.47.211.116])
	by mx1.freebsd.org (Postfix) with ESMTP id 968128FC08
	for <FreeBSD-gnats-submit@freebsd.org>; Tue, 16 Dec 2008 22:59:33 +0000 (UTC)
	(envelope-from decke@bluelife.at)
Received: from home.bluelife.at ([78.142.74.81] helo=chii.bluelife.at)
	by mail.itac.at with esmtpa (Exim 4.63)
	(envelope-from <decke@bluelife.at>)
	id 1LCiQw-0002Cl-67
	for FreeBSD-gnats-submit@freebsd.org; Tue, 16 Dec 2008 23:30:40 +0100
Message-Id: <20081216233032.471d71c5@chii.bluelife.at>
Date: Tue, 16 Dec 2008 23:30:32 +0100
From: Bernhard Froehlich <decke@bluelife.at>
To: FreeBSD-gnats-submit@freebsd.org
Subject: [MAINTAINER] www/helma: update to 1.6.3

>Number:         129696
>Category:       ports
>Synopsis:       [MAINTAINER] www/helma: update to 1.6.3
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    miwi
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Tue Dec 16 23:00:01 UTC 2008
>Closed-Date:    Mon Dec 22 21:13:25 UTC 2008
>Last-Modified:  Mon Dec 22 21:20:05 UTC 2008
>Originator:     Bernhard Fr=F6hlich
>Release:        FreeBSD 7.1-PRERELEASE amd64
>Organization:
=09
>Environment:
System: FreeBSD chii.bluelife.at 7.1-PRERELEASE FreeBSD 7.1-PRERELEASE #2: =
Sat Oct 18 10:09:35 CEST 2008
>Description:
- Update to 1.6.3

Removed file(s):
- files/patch-ApplicationManager.java
- files/patch-Server.java

Generated with FreeBSD Port Tools 0.77
>How-To-Repeat:
>Fix:

--- helma-1.6.3.patch begins here ---
diff -ruN --exclude=3DCVS /usr/ports/www/helma.orig/Makefile /usr/ports/www=
/helma/Makefile
--- /usr/ports/www/helma.orig/Makefile	2008-09-08 00:23:34.000000000 +0200
+++ /usr/ports/www/helma/Makefile	2008-12-16 23:15:49.000000000 +0100
@@ -1,26 +1,26 @@
 # New ports collection makefile for:	helma
 # Date created:		2008-06-22
-# Whom:			Bernhard Fr__hlich <decke@bluelife.at>
+# Whom:			Bernhard Froehlich <decke@bluelife.at>
 #
 # $FreeBSD: ports/www/helma/Makefile,v 1.1 2008/09/07 22:23:34 miwi Exp $
 #
=20
 PORTNAME=3D	helma
-PORTVERSION=3D	1.6.2
+PORTVERSION=3D	1.6.3
 CATEGORIES=3D	www java
 MASTER_SITES=3D	http://adele.helma.org/download/helma/${PORTVERSION}/
-DISTFILES=3D	helma-1.6.2.tar.gz helma-1.6.2-src.tar.gz
+DISTFILES=3D	helma-${PORTVERSION}.tar.gz helma-${PORTVERSION}-src.tar.gz
=20
 MAINTAINER=3D	decke@bluelife.at
 COMMENT=3D	A Web application framework for fast and efficient scripting
=20
 WRKBASE=3D	${WRKDIR}/${PORTNAME}-${PORTVERSION}
-WRKSRC=3D		${WRKBASE}/build
+WRKSRC=3D		${WRKBASE}
 DATADIR=3D	${JAVASHAREDIR}/${PORTNAME}
=20
 USE_RC_SUBR=3D	helma
 USE_JAVA=3D	yes
-JAVA_VERSION=3D	1.5+
+JAVA_VERSION=3D	1.4+
 USE_ANT=3D	yes
 ALL_TARGET=3D	clean jar
=20
diff -ruN --exclude=3DCVS /usr/ports/www/helma.orig/distinfo /usr/ports/www=
/helma/distinfo
--- /usr/ports/www/helma.orig/distinfo	2008-09-08 00:23:34.000000000 +0200
+++ /usr/ports/www/helma/distinfo	2008-12-16 23:15:49.000000000 +0100
@@ -1,6 +1,6 @@
-MD5 (helma-1.6.2.tar.gz) =3D 24d37010aeeb1f4303674ea0dcdecf82
-SHA256 (helma-1.6.2.tar.gz) =3D 5f0e7a54ae07b14ffa3055d81b63e34fc6bebc15e2=
f4ebd0a591802ea446dd12
-SIZE (helma-1.6.2.tar.gz) =3D 6543555
-MD5 (helma-1.6.2-src.tar.gz) =3D 644781ad8eb914307c82d571c8aa8b8e
-SHA256 (helma-1.6.2-src.tar.gz) =3D 225d2527b264bb2042ee0e9b912da74178a4a6=
cd7c41b2707f3195bf7d12004a
-SIZE (helma-1.6.2-src.tar.gz) =3D 4810577
+MD5 (helma-1.6.3.tar.gz) =3D 8999bb92c7192e7adaab7596e581c520
+SHA256 (helma-1.6.3.tar.gz) =3D 01d71d17bbc2c5456af338e4290e820d9bda7bae05=
e9d4ce48ad22f17061d6f3
+SIZE (helma-1.6.3.tar.gz) =3D 6553371
+MD5 (helma-1.6.3-src.tar.gz) =3D ad8dea492dc1147ff17ec07cc74aead5
+SHA256 (helma-1.6.3-src.tar.gz) =3D 8273b7cbd2186a0dda475b6d0e0dcadfe0124e=
347a1d7a0062a96b1a82a0f5f7
+SIZE (helma-1.6.3-src.tar.gz) =3D 4815576
diff -ruN --exclude=3DCVS /usr/ports/www/helma.orig/files/patch-Application=
Manager.java /usr/ports/www/helma/files/patch-ApplicationManager.java
--- /usr/ports/www/helma.orig/files/patch-ApplicationManager.java	2008-09-0=
8 00:23:35.000000000 +0200
+++ /usr/ports/www/helma/files/patch-ApplicationManager.java	1970-01-01 01:=
00:00.000000000 +0100
@@ -1,12 +0,0 @@
---- ../src/helma/main/ApplicationManager.java.orig	2008-04-07 14:45:30.000=
000000 +0200
-+++ ../src/helma/main/ApplicationManager.java	2008-07-12 16:16:14.00000000=
0 +0200
-@@ -369,6 +369,9 @@
-                             repositoryImpl =3D "helma.framework.repositor=
y.FileRepository";
-                         }
-                     }
-+                   =20
-+                    if(!new File(repositoryArgs).isAbsolute())
-+                    	repositoryArgs =3D server.getHopHome() + "/" + repos=
itoryArgs;
-=20
-                     try {
-                         Repository newRepository =3D (Repository) Class.f=
orName(repositoryImpl)
diff -ruN --exclude=3DCVS /usr/ports/www/helma.orig/files/patch-Server.java=
 /usr/ports/www/helma/files/patch-Server.java
--- /usr/ports/www/helma.orig/files/patch-Server.java	2008-09-08 00:23:35.0=
00000000 +0200
+++ /usr/ports/www/helma/files/patch-Server.java	1970-01-01 01:00:00.000000=
000 +0100
@@ -1,26 +0,0 @@
---- ../src/helma/main/Server.java.orig	2008-04-07 14:45:30.000000000 +0200
-+++ ../src/helma/main/Server.java	2008-07-13 21:36:06.000000000 +0200
-@@ -444,14 +444,21 @@
-=20
-=20
-         // read db.properties file in helma home directory
-+	String dbPropfile =3D sysProps.getProperty("dbPropFile");
-+	File file;
-+	if ((dbPropfile !=3D null) && !"".equals(dbPropfile.trim())) {
-+	    file =3D new File(dbPropfile);
-+	} else {
-+	    file =3D new File(hopHome, "db.properties");
-+	}
-+
-         dbProps =3D new ResourceProperties();
-         dbProps.setIgnoreCase(false);
--        dbProps.addResource(new FileResource(new File(hopHome, "db.proper=
ties")));
-+        dbProps.addResource(new FileResource(file));
-         DbSource.setDefaultProps(dbProps);
-=20
-         // read apps.properties file
-         String appsPropfile =3D sysProps.getProperty("appsPropFile");
--        File file;
-         if ((appsPropfile !=3D null) && !"".equals(appsPropfile.trim())) {
-             file =3D new File(appsPropfile);
-         } else {
diff -ruN --exclude=3DCVS /usr/ports/www/helma.orig/pkg-plist /usr/ports/ww=
w/helma/pkg-plist
--- /usr/ports/www/helma.orig/pkg-plist	2008-09-08 00:23:35.000000000 +0200
+++ /usr/ports/www/helma/pkg-plist	2008-12-16 23:15:49.000000000 +0100
@@ -345,6 +345,7 @@
 %%PORTDOCS%%%%DOCSDIR%%/docs/api/helma/main/HelmaSecurityManager.html
 %%PORTDOCS%%%%DOCSDIR%%/docs/api/helma/main/HelmaShutdownHook.html
 %%PORTDOCS%%%%DOCSDIR%%/docs/api/helma/main/HelmaSocketFactory.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/api/helma/main/JettyServer.html
 %%PORTDOCS%%%%DOCSDIR%%/docs/api/helma/main/Server.html
 %%PORTDOCS%%%%DOCSDIR%%/docs/api/helma/main/ServerConfig.html
 %%PORTDOCS%%%%DOCSDIR%%/docs/api/helma/main/package-frame.html
@@ -423,7 +424,6 @@
 %%PORTDOCS%%%%DOCSDIR%%/docs/api/helma/scripting/rhino/HopObjectCtor.html
 %%PORTDOCS%%%%DOCSDIR%%/docs/api/helma/scripting/rhino/JSAdapter.html
 %%PORTDOCS%%%%DOCSDIR%%/docs/api/helma/scripting/rhino/JavaObject.html
-%%PORTDOCS%%%%DOCSDIR%%/docs/api/helma/scripting/rhino/ListViewWrapper.html
 %%PORTDOCS%%%%DOCSDIR%%/docs/api/helma/scripting/rhino/MapWrapper.html
 %%PORTDOCS%%%%DOCSDIR%%/docs/api/helma/scripting/rhino/PathWrapper.html
 %%PORTDOCS%%%%DOCSDIR%%/docs/api/helma/scripting/rhino/PropertyRecorder.ht=
ml
@@ -742,6 +742,7 @@
 %%PORTDOCS%%%%DOCSDIR%%/docs/framework/session.html
 %%PORTDOCS%%%%DOCSDIR%%/docs/framework/styles.css
 %%PORTDOCS%%%%DOCSDIR%%/licenses/apache.txt
+%%PORTDOCS%%%%DOCSDIR%%/licenses/cddl.txt
 %%PORTDOCS%%%%DOCSDIR%%/licenses/jetty.html
 %%PORTDOCS%%%%DOCSDIR%%/licenses/lgpl.txt
 %%PORTDOCS%%%%DOCSDIR%%/licenses/license.txt
--- helma-1.6.3.patch ends here ---

>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: gnats-admin->freebsd-ports-bugs 
Responsible-Changed-By: linimon 
Responsible-Changed-When: Wed Dec 17 01:12:06 UTC 2008 
Responsible-Changed-Why:  
'Confidential' is a relic that should go away. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=129696 
Responsible-Changed-From-To: freebsd-ports-bugs->miwi 
Responsible-Changed-By: miwi 
Responsible-Changed-When: Wed Dec 17 01:36:32 UTC 2008 
Responsible-Changed-Why:  
I'll take it. 

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

From: Bernhard Froehlich <decke@bluelife.at>
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/129696: [MAINTAINER] www/helma: update to 1.6.3
Date: Wed, 17 Dec 2008 22:22:42 +0100

 Looks like the patch got messed up. I'm trying to resend it.
 
 
 --- helma-1.6.3.patch begins here ---
 diff -ruN --exclude=CVS /usr/ports/www/helma.orig/Makefile /usr/ports/www/helma/Makefile
 --- /usr/ports/www/helma.orig/Makefile	2008-09-08 00:23:34.000000000 +0200
 +++ /usr/ports/www/helma/Makefile	2008-12-16 23:15:49.000000000 +0100
 @@ -1,26 +1,26 @@
  # New ports collection makefile for:	helma
  # Date created:		2008-06-22
 -# Whom:			Bernhard Fr__hlich <decke@bluelife.at>
 +# Whom:			Bernhard Froehlich <decke@bluelife.at>
  #
  # $FreeBSD: ports/www/helma/Makefile,v 1.1 2008/09/07 22:23:34 miwi Exp $
  #
  
  PORTNAME=	helma
 -PORTVERSION=	1.6.2
 +PORTVERSION=	1.6.3
  CATEGORIES=	www java
  MASTER_SITES=	http://adele.helma.org/download/helma/${PORTVERSION}/
 -DISTFILES=	helma-1.6.2.tar.gz helma-1.6.2-src.tar.gz
 +DISTFILES=	helma-${PORTVERSION}.tar.gz helma-${PORTVERSION}-src.tar.gz
  
  MAINTAINER=	decke@bluelife.at
  COMMENT=	A Web application framework for fast and efficient scripting
  
  WRKBASE=	${WRKDIR}/${PORTNAME}-${PORTVERSION}
 -WRKSRC=		${WRKBASE}/build
 +WRKSRC=		${WRKBASE}
  DATADIR=	${JAVASHAREDIR}/${PORTNAME}
  
  USE_RC_SUBR=	helma
  USE_JAVA=	yes
 -JAVA_VERSION=	1.5+
 +JAVA_VERSION=	1.4+
  USE_ANT=	yes
  ALL_TARGET=	clean jar
  
 diff -ruN --exclude=CVS /usr/ports/www/helma.orig/distinfo /usr/ports/www/helma/distinfo
 --- /usr/ports/www/helma.orig/distinfo	2008-09-08 00:23:34.000000000 +0200
 +++ /usr/ports/www/helma/distinfo	2008-12-16 23:15:49.000000000 +0100
 @@ -1,6 +1,6 @@
 -MD5 (helma-1.6.2.tar.gz) = 24d37010aeeb1f4303674ea0dcdecf82
 -SHA256 (helma-1.6.2.tar.gz) = 5f0e7a54ae07b14ffa3055d81b63e34fc6bebc15e2f4ebd0a591802ea446dd12
 -SIZE (helma-1.6.2.tar.gz) = 6543555
 -MD5 (helma-1.6.2-src.tar.gz) = 644781ad8eb914307c82d571c8aa8b8e
 -SHA256 (helma-1.6.2-src.tar.gz) = 225d2527b264bb2042ee0e9b912da74178a4a6cd7c41b2707f3195bf7d12004a
 -SIZE (helma-1.6.2-src.tar.gz) = 4810577
 +MD5 (helma-1.6.3.tar.gz) = 8999bb92c7192e7adaab7596e581c520
 +SHA256 (helma-1.6.3.tar.gz) = 01d71d17bbc2c5456af338e4290e820d9bda7bae05e9d4ce48ad22f17061d6f3
 +SIZE (helma-1.6.3.tar.gz) = 6553371
 +MD5 (helma-1.6.3-src.tar.gz) = ad8dea492dc1147ff17ec07cc74aead5
 +SHA256 (helma-1.6.3-src.tar.gz) = 8273b7cbd2186a0dda475b6d0e0dcadfe0124e347a1d7a0062a96b1a82a0f5f7
 +SIZE (helma-1.6.3-src.tar.gz) = 4815576
 diff -ruN --exclude=CVS /usr/ports/www/helma.orig/files/patch-ApplicationManager.java /usr/ports/www/helma/files/patch-ApplicationManager.java
 --- /usr/ports/www/helma.orig/files/patch-ApplicationManager.java	2008-09-08 00:23:35.000000000 +0200
 +++ /usr/ports/www/helma/files/patch-ApplicationManager.java	1970-01-01 01:00:00.000000000 +0100
 @@ -1,12 +0,0 @@
 ---- ../src/helma/main/ApplicationManager.java.orig	2008-04-07 14:45:30.000000000 +0200
 -+++ ../src/helma/main/ApplicationManager.java	2008-07-12 16:16:14.000000000 +0200
 -@@ -369,6 +369,9 @@
 -                             repositoryImpl = "helma.framework.repository.FileRepository";
 -                         }
 -                     }
 -+                    
 -+                    if(!new File(repositoryArgs).isAbsolute())
 -+                    	repositoryArgs = server.getHopHome() + "/" + repositoryArgs;
 - 
 -                     try {
 -                         Repository newRepository = (Repository) Class.forName(repositoryImpl)
 diff -ruN --exclude=CVS /usr/ports/www/helma.orig/files/patch-Server.java /usr/ports/www/helma/files/patch-Server.java
 --- /usr/ports/www/helma.orig/files/patch-Server.java	2008-09-08 00:23:35.000000000 +0200
 +++ /usr/ports/www/helma/files/patch-Server.java	1970-01-01 01:00:00.000000000 +0100
 @@ -1,26 +0,0 @@
 ---- ../src/helma/main/Server.java.orig	2008-04-07 14:45:30.000000000 +0200
 -+++ ../src/helma/main/Server.java	2008-07-13 21:36:06.000000000 +0200
 -@@ -444,14 +444,21 @@
 - 
 - 
 -         // read db.properties file in helma home directory
 -+	String dbPropfile = sysProps.getProperty("dbPropFile");
 -+	File file;
 -+	if ((dbPropfile != null) && !"".equals(dbPropfile.trim())) {
 -+	    file = new File(dbPropfile);
 -+	} else {
 -+	    file = new File(hopHome, "db.properties");
 -+	}
 -+
 -         dbProps = new ResourceProperties();
 -         dbProps.setIgnoreCase(false);
 --        dbProps.addResource(new FileResource(new File(hopHome, "db.properties")));
 -+        dbProps.addResource(new FileResource(file));
 -         DbSource.setDefaultProps(dbProps);
 - 
 -         // read apps.properties file
 -         String appsPropfile = sysProps.getProperty("appsPropFile");
 --        File file;
 -         if ((appsPropfile != null) && !"".equals(appsPropfile.trim())) {
 -             file = new File(appsPropfile);
 -         } else {
 diff -ruN --exclude=CVS /usr/ports/www/helma.orig/pkg-plist /usr/ports/www/helma/pkg-plist
 --- /usr/ports/www/helma.orig/pkg-plist	2008-09-08 00:23:35.000000000 +0200
 +++ /usr/ports/www/helma/pkg-plist	2008-12-16 23:15:49.000000000 +0100
 @@ -345,6 +345,7 @@
  %%PORTDOCS%%%%DOCSDIR%%/docs/api/helma/main/HelmaSecurityManager.html
  %%PORTDOCS%%%%DOCSDIR%%/docs/api/helma/main/HelmaShutdownHook.html
  %%PORTDOCS%%%%DOCSDIR%%/docs/api/helma/main/HelmaSocketFactory.html
 +%%PORTDOCS%%%%DOCSDIR%%/docs/api/helma/main/JettyServer.html
  %%PORTDOCS%%%%DOCSDIR%%/docs/api/helma/main/Server.html
  %%PORTDOCS%%%%DOCSDIR%%/docs/api/helma/main/ServerConfig.html
  %%PORTDOCS%%%%DOCSDIR%%/docs/api/helma/main/package-frame.html
 @@ -423,7 +424,6 @@
  %%PORTDOCS%%%%DOCSDIR%%/docs/api/helma/scripting/rhino/HopObjectCtor.html
  %%PORTDOCS%%%%DOCSDIR%%/docs/api/helma/scripting/rhino/JSAdapter.html
  %%PORTDOCS%%%%DOCSDIR%%/docs/api/helma/scripting/rhino/JavaObject.html
 -%%PORTDOCS%%%%DOCSDIR%%/docs/api/helma/scripting/rhino/ListViewWrapper.html
  %%PORTDOCS%%%%DOCSDIR%%/docs/api/helma/scripting/rhino/MapWrapper.html
  %%PORTDOCS%%%%DOCSDIR%%/docs/api/helma/scripting/rhino/PathWrapper.html
  %%PORTDOCS%%%%DOCSDIR%%/docs/api/helma/scripting/rhino/PropertyRecorder.html
 @@ -742,6 +742,7 @@
  %%PORTDOCS%%%%DOCSDIR%%/docs/framework/session.html
  %%PORTDOCS%%%%DOCSDIR%%/docs/framework/styles.css
  %%PORTDOCS%%%%DOCSDIR%%/licenses/apache.txt
 +%%PORTDOCS%%%%DOCSDIR%%/licenses/cddl.txt
  %%PORTDOCS%%%%DOCSDIR%%/licenses/jetty.html
  %%PORTDOCS%%%%DOCSDIR%%/licenses/lgpl.txt
  %%PORTDOCS%%%%DOCSDIR%%/licenses/license.txt
 --- helma-1.6.3.patch ends here ---
State-Changed-From-To: open->closed 
State-Changed-By: miwi 
State-Changed-When: Mon Dec 22 21:13:23 UTC 2008 
State-Changed-Why:  
Committed. Thanks! 

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

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/129696: commit references a PR
Date: Mon, 22 Dec 2008 21:13:29 +0000 (UTC)

 miwi        2008-12-22 21:13:16 UTC
 
   FreeBSD ports repository
 
   Modified files:
     www/helma            Makefile distinfo pkg-plist 
   Removed files:
     www/helma/files      patch-ApplicationManager.java 
                          patch-Server.java 
   Log:
   - Update to 1.6.3
   
   PR:             129696
   Submitted by:   Bernhard Froehlich <decke@bluelife.at> (maintainer)
   
   Revision  Changes    Path
   1.2       +5 -5      ports/www/helma/Makefile
   1.2       +6 -6      ports/www/helma/distinfo
   1.2       +0 -12     ports/www/helma/files/patch-ApplicationManager.java (dead)
   1.2       +0 -26     ports/www/helma/files/patch-Server.java (dead)
   1.2       +3 -2      ports/www/helma/pkg-plist
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
>Unformatted:
