Attachment 92118 Details for Bug 129696 – helma-1.6.3.patch

[patch] helma-1.6.3.patch

helma-1.6.3.patch (text/plain), 6.12 KB, created by Bernhard Froehlich on 2008-12-16 23:00:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Bernhard Froehlich

Created: 2008-12-16 23:00:01 UTC

Size: 6.12 KB

patch

obsolete

>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

Actions: View | Diff

Attachments on bug 129696: 92118