- Update to 1.6.3 Removed file(s): - files/patch-ApplicationManager.java - files/patch-Server.java Generated with FreeBSD Port Tools 0.77
Responsible Changed From-To: gnats-admin->freebsd-ports-bugs 'Confidential' is a relic that should go away.
Responsible Changed From-To: freebsd-ports-bugs->miwi I'll take it.
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 Committed. Thanks!
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"