Attachment #92118 for bug #129696

View | Details | Raw Unified | Return to bug 129696
Collapse All | Expand All




# New ports collection makefile for:	helma
# Date created:		2008-06-22
# Whom:			Bernhard Froehlich <decke@bluelife.at>
#
# $FreeBSD: ports/www/helma/Makefile,v 1.1 2008/09/07 22:23:34 miwi Exp $
#
PORTNAME=3D	helma
PORTVERSION=3D	1.6.3
CATEGORIES=3D	www java
MASTER_SITES=3D	http://adele.helma.org/download/helma/${PORTVERSION}/
DISTFILES=3D	helma-${PORTVERSION}.tar.gz helma-${PORTVERSION}-src.tar.gz
MAINTAINER=3D	decke@bluelife.at
COMMENT=3D	A Web application framework for fast and efficient scripting
WRKBASE=3D	${WRKDIR}/${PORTNAME}-${PORTVERSION}
WRKSRC=3D		${WRKBASE}
DATADIR=3D	${JAVASHAREDIR}/${PORTNAME}
USE_RC_SUBR=3D	helma
USE_JAVA=3D	yes
JAVA_VERSION=3D	1.4+
USE_ANT=3D	yes
ALL_TARGET=3D	clean jar

Lines 1-6 Link Here

(-)/usr/ports/www/helma/distinfo (-6 / +6 lines)
1	MD5 (helma-1.6.2.tar.gz) =3D 24d37010aeeb1f4303674ea0dcdecf82	1	MD5 (helma-1.6.3.tar.gz) =3D 8999bb92c7192e7adaab7596e581c520
2	SHA256 (helma-1.6.2.tar.gz) =3D 5f0e7a54ae07b14ffa3055d81b63e34fc6bebc15e2=	2	SHA256 (helma-1.6.3.tar.gz) =3D 01d71d17bbc2c5456af338e4290e820d9bda7bae05=
3	SIZE (helma-1.6.2.tar.gz) =3D 6543555	3	SIZE (helma-1.6.3.tar.gz) =3D 6553371
4	MD5 (helma-1.6.2-src.tar.gz) =3D 644781ad8eb914307c82d571c8aa8b8e	4	MD5 (helma-1.6.3-src.tar.gz) =3D ad8dea492dc1147ff17ec07cc74aead5
5	SHA256 (helma-1.6.2-src.tar.gz) =3D 225d2527b264bb2042ee0e9b912da74178a4a6=	5	SHA256 (helma-1.6.3-src.tar.gz) =3D 8273b7cbd2186a0dda475b6d0e0dcadfe0124e=
6	SIZE (helma-1.6.2-src.tar.gz) =3D 4810577
Line 348 Link Here
		1	SIZE (helma-1.6.3-src.tar.gz) =3D 4815576




--- ../src/helma/main/ApplicationManager.java.orig	2008-04-07 14:45:30.000=
+++ ../src/helma/main/ApplicationManager.java	2008-07-12 16:16:14.00000000=
@@ -369,6 +369,9 @@
                             repositoryImpl =3D "helma.framework.repositor=
                         }
                     }
+                   =20
+                    if(!new File(repositoryArgs).isAbsolute())
+                    	repositoryArgs =3D server.getHopHome() + "/" + repos=
=20
                     try {
                         Repository newRepository =3D (Repository) Class.f=
/usr/ports/www/helma/files/patch-Server.java




--- ../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=
+        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 {




%%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

%%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=

%%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

Return to bug 129696

Lines 1-26 Link Here

(-)/usr/ports/www/helma/Makefile (-5 / +5 lines)
1	# New ports collection makefile for: helma	1	# New ports collection makefile for: helma
2	# Date created: 2008-06-22	2	# Date created: 2008-06-22
3	# Whom: Bernhard Fr__hlich <decke@bluelife.at>	3	# Whom: Bernhard Froehlich <decke@bluelife.at>
4	#	4	#
5	# $FreeBSD: ports/www/helma/Makefile,v 1.1 2008/09/07 22:23:34 miwi Exp $	5	# $FreeBSD: ports/www/helma/Makefile,v 1.1 2008/09/07 22:23:34 miwi Exp $
6	#	6	#
7	PORTNAME=3D helma	7	PORTNAME=3D helma
8	PORTVERSION=3D 1.6.2	8	PORTVERSION=3D 1.6.3
9	CATEGORIES=3D www java	9	CATEGORIES=3D www java
10	MASTER_SITES=3D http://adele.helma.org/download/helma/${PORTVERSION}/	10	MASTER_SITES=3D http://adele.helma.org/download/helma/${PORTVERSION}/
11	DISTFILES=3D helma-1.6.2.tar.gz helma-1.6.2-src.tar.gz	11	DISTFILES=3D helma-${PORTVERSION}.tar.gz helma-${PORTVERSION}-src.tar.gz
12	MAINTAINER=3D decke@bluelife.at	12	MAINTAINER=3D decke@bluelife.at
13	COMMENT=3D A Web application framework for fast and efficient scripting	13	COMMENT=3D A Web application framework for fast and efficient scripting
14	WRKBASE=3D ${WRKDIR}/${PORTNAME}-${PORTVERSION}	14	WRKBASE=3D ${WRKDIR}/${PORTNAME}-${PORTVERSION}
15	WRKSRC=3D ${WRKBASE}/build	15	WRKSRC=3D ${WRKBASE}
16	DATADIR=3D ${JAVASHAREDIR}/${PORTNAME}	16	DATADIR=3D ${JAVASHAREDIR}/${PORTNAME}
17	USE_RC_SUBR=3D helma	17	USE_RC_SUBR=3D helma
18	USE_JAVA=3D yes	18	USE_JAVA=3D yes
19	JAVA_VERSION=3D 1.5+	19	JAVA_VERSION=3D 1.4+
20	USE_ANT=3D yes	20	USE_ANT=3D yes
21	ALL_TARGET=3D clean jar	21	ALL_TARGET=3D clean jar

Lines 1-12 Link Here

(-)/usr/ports/www/helma/files/patch-ApplicationManager.java (-12 lines)
1	--- ../src/helma/main/ApplicationManager.java.orig 2008-04-07 14:45:30.000=
2	+++ ../src/helma/main/ApplicationManager.java 2008-07-12 16:16:14.00000000=
3	@@ -369,6 +369,9 @@
4	repositoryImpl =3D "helma.framework.repositor=
5	}
6	}
7	+ =20
8	+ if(!new File(repositoryArgs).isAbsolute())
9	+ repositoryArgs =3D server.getHopHome() + "/" + repos=
10	=20
11	try {
12	Repository newRepository =3D (Repository) Class.f=
13	/usr/ports/www/helma/files/patch-Server.java	0	/usr/ports/www/helma/files/patch-Server.java

Lines 1-26 Link Here

(-)/usr/ports/www/helma/files/patch-Server.java (-26 lines)
1	--- ../src/helma/main/Server.java.orig 2008-04-07 14:45:30.000000000 +0200
2	+++ ../src/helma/main/Server.java 2008-07-13 21:36:06.000000000 +0200
3	@@ -444,14 +444,21 @@
4	=20
5	=20
6	// read db.properties file in helma home directory
7	+ String dbPropfile =3D sysProps.getProperty("dbPropFile");
8	+ File file;
9	+ if ((dbPropfile !=3D null) && !"".equals(dbPropfile.trim())) {
10	+ file =3D new File(dbPropfile);
11	+ } else {
12	+ file =3D new File(hopHome, "db.properties");
13	+ }
14	+
15	dbProps =3D new ResourceProperties();
16	dbProps.setIgnoreCase(false);
17	- dbProps.addResource(new FileResource(new File(hopHome, "db.proper=
18	+ dbProps.addResource(new FileResource(file));
19	DbSource.setDefaultProps(dbProps);
20	=20
21	// read apps.properties file
22	String appsPropfile =3D sysProps.getProperty("appsPropFile");
23	- File file;
24	if ((appsPropfile !=3D null) && !"".equals(appsPropfile.trim())) {
25	file =3D new File(appsPropfile);
26	} else {

Lines 345-350 Link Here

(-)/usr/ports/www/helma/pkg-plist (-1 / +2 lines)
345	%%PORTDOCS%%%%DOCSDIR%%/docs/api/helma/main/HelmaSecurityManager.html	345	%%PORTDOCS%%%%DOCSDIR%%/docs/api/helma/main/HelmaSecurityManager.html
346	%%PORTDOCS%%%%DOCSDIR%%/docs/api/helma/main/HelmaShutdownHook.html	346	%%PORTDOCS%%%%DOCSDIR%%/docs/api/helma/main/HelmaShutdownHook.html
347	%%PORTDOCS%%%%DOCSDIR%%/docs/api/helma/main/HelmaSocketFactory.html	347	%%PORTDOCS%%%%DOCSDIR%%/docs/api/helma/main/HelmaSocketFactory.html
		348	%%PORTDOCS%%%%DOCSDIR%%/docs/api/helma/main/JettyServer.html
348	%%PORTDOCS%%%%DOCSDIR%%/docs/api/helma/main/Server.html	349	%%PORTDOCS%%%%DOCSDIR%%/docs/api/helma/main/Server.html
349	%%PORTDOCS%%%%DOCSDIR%%/docs/api/helma/main/ServerConfig.html	350	%%PORTDOCS%%%%DOCSDIR%%/docs/api/helma/main/ServerConfig.html
350	%%PORTDOCS%%%%DOCSDIR%%/docs/api/helma/main/package-frame.html	351	%%PORTDOCS%%%%DOCSDIR%%/docs/api/helma/main/package-frame.html
Lines 423-429 Link Here
423	%%PORTDOCS%%%%DOCSDIR%%/docs/api/helma/scripting/rhino/HopObjectCtor.html	424	%%PORTDOCS%%%%DOCSDIR%%/docs/api/helma/scripting/rhino/HopObjectCtor.html
424	%%PORTDOCS%%%%DOCSDIR%%/docs/api/helma/scripting/rhino/JSAdapter.html	425	%%PORTDOCS%%%%DOCSDIR%%/docs/api/helma/scripting/rhino/JSAdapter.html
425	%%PORTDOCS%%%%DOCSDIR%%/docs/api/helma/scripting/rhino/JavaObject.html	426	%%PORTDOCS%%%%DOCSDIR%%/docs/api/helma/scripting/rhino/JavaObject.html
426	%%PORTDOCS%%%%DOCSDIR%%/docs/api/helma/scripting/rhino/ListViewWrapper.html
427	%%PORTDOCS%%%%DOCSDIR%%/docs/api/helma/scripting/rhino/MapWrapper.html	427	%%PORTDOCS%%%%DOCSDIR%%/docs/api/helma/scripting/rhino/MapWrapper.html
428	%%PORTDOCS%%%%DOCSDIR%%/docs/api/helma/scripting/rhino/PathWrapper.html	428	%%PORTDOCS%%%%DOCSDIR%%/docs/api/helma/scripting/rhino/PathWrapper.html
429	%%PORTDOCS%%%%DOCSDIR%%/docs/api/helma/scripting/rhino/PropertyRecorder.ht=	429	%%PORTDOCS%%%%DOCSDIR%%/docs/api/helma/scripting/rhino/PropertyRecorder.ht=
Lines 742-747 Link Here
742	%%PORTDOCS%%%%DOCSDIR%%/docs/framework/session.html	742	%%PORTDOCS%%%%DOCSDIR%%/docs/framework/session.html
743	%%PORTDOCS%%%%DOCSDIR%%/docs/framework/styles.css	743	%%PORTDOCS%%%%DOCSDIR%%/docs/framework/styles.css
744	%%PORTDOCS%%%%DOCSDIR%%/licenses/apache.txt	744	%%PORTDOCS%%%%DOCSDIR%%/licenses/apache.txt
		745	%%PORTDOCS%%%%DOCSDIR%%/licenses/cddl.txt
745	%%PORTDOCS%%%%DOCSDIR%%/licenses/jetty.html	746	%%PORTDOCS%%%%DOCSDIR%%/licenses/jetty.html
746	%%PORTDOCS%%%%DOCSDIR%%/licenses/lgpl.txt	747	%%PORTDOCS%%%%DOCSDIR%%/licenses/lgpl.txt
747	%%PORTDOCS%%%%DOCSDIR%%/licenses/license.txt	748	%%PORTDOCS%%%%DOCSDIR%%/licenses/license.txt