Date: Tue, 30 Dec 2008 01:18:36 +0100 (CET) From: Marcin Cieslak <saper@SYSTEM.PL> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/130042: [MAINTAINER] www/commonist: update to 0.3.32 Message-ID: <200812300018.mBU0IafQ037109@radziecki.saper.info> Resent-Message-ID: <200812300020.mBU0K1eS092966@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 130042 >Category: ports >Synopsis: [MAINTAINER] www/commonist: update to 0.3.32 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Tue Dec 30 00:20:01 UTC 2008 >Closed-Date: >Last-Modified: >Originator: Marcin Cieslak >Release: FreeBSD 7.1-PRERELEASE amd64 >Organization: http://saper.info >Environment: System: FreeBSD radziecki.saper.info 7.1-PRERELEASE FreeBSD 7.1-PRERELEASE #0 r182840M: Sun Sep 7 22:50:12 >Description: - Update to 0.3.32 (required www/jericho-html update to 2.6) Removed file(s): - files/patch-Loader.java Generated with FreeBSD Port Tools 0.77 >How-To-Repeat: >Fix: --- commonist-0.3.32.patch begins here --- diff -ruN --exclude=CVS /usr/origports/www/commonist/Makefile /usr/ports/www/commonist/Makefile --- /usr/origports/www/commonist/Makefile 2008-08-18 02:33:55.000000000 +0200 +++ /usr/ports/www/commonist/Makefile 2008-12-30 01:16:26.093629934 +0100 @@ -6,8 +6,7 @@ # PORTNAME= commonist -PORTVERSION= 0.3.28 -PORTREVISION= 1 +PORTVERSION= 0.3.32 CATEGORIES= www java MASTER_SITES= http://djini.de/software/commonist/ @@ -20,13 +19,16 @@ JAVA_EXTRACT= yes USE_ANT= yes ALL_TARGET= jar -MAKE_ARGS+= -Djar.lib.dir=${WRKSRC}/build/jar -Dtarget.name=${WRKSRC}/build/jar/${PORTNAME}.jar +MAKE_FLAGS+= -verbose +MAKE_ARGS+= -Djar.lib.dir=${WRKSRC}/build/jar -Dtarget.name=${WRKSRC}/build/jar/${PORTNAME}.jar \ + -Djavacc.home=${JAVAJARDIR} SUB_FILES+= commonist SUB_LIST+= TARGET_JAR=${TARGET_JAR} BUILD_DEPENDS+= ${JAVAJARDIR}/commons-httpclient.jar:${PORTSDIR}/java/jakarta-commons-httpclient \ - ${JAVAJARDIR}/bsh.jar:${PORTSDIR}/lang/bsh + ${JAVAJARDIR}/bsh.jar:${PORTSDIR}/lang/bsh \ + ${JAVAJARDIR}/javacc.jar:${PORTSDIR}/textproc/javacc RUN_DEPENDS+= ${JAVAJARDIR}/commons-httpclient.jar:${PORTSDIR}/java/jakarta-commons-httpclient \ ${JAVAJARDIR}/bsh.jar:${PORTSDIR}/lang/bsh diff -ruN --exclude=CVS /usr/origports/www/commonist/distinfo /usr/ports/www/commonist/distinfo --- /usr/origports/www/commonist/distinfo 2008-07-19 19:12:45.000000000 +0200 +++ /usr/ports/www/commonist/distinfo 2008-12-23 03:39:56.648799208 +0100 @@ -1,3 +1,3 @@ -MD5 (commonist-0.3.28.zip) = a1a400b09825a16091457be880f8812a -SHA256 (commonist-0.3.28.zip) = a6352b3939ae2561bf89314a79732443f7421c6a6d34e994c0b406cdee2d30b6 -SIZE (commonist-0.3.28.zip) = 2265234 +MD5 (commonist-0.3.32.zip) = e10de0993bca25dc80e316320a66f32d +SHA256 (commonist-0.3.32.zip) = 9f55ecca1bd81181e03762f4de78acfba4cb270006a1441ae581338c7eae7ff8 +SIZE (commonist-0.3.32.zip) = 2338261 diff -ruN --exclude=CVS /usr/origports/www/commonist/files/patch-Loader.java /usr/ports/www/commonist/files/patch-Loader.java --- /usr/origports/www/commonist/files/patch-Loader.java 2008-07-19 19:12:46.000000000 +0200 +++ /usr/ports/www/commonist/files/patch-Loader.java 1970-01-01 01:00:00.000000000 +0100 @@ -1,20 +0,0 @@ ---- src/net/psammead/commonist/util/Loader.java.orig 2008-06-19 23:45:43.667197457 +0200 -+++ src/net/psammead/commonist/util/Loader.java 2008-06-19 23:46:41.729154606 +0200 -@@ -32,7 +32,7 @@ - File settingsFile = new File(settingsDir, path); - if (settingsFile.exists()) { - log.debug("loading from settings: " + path); -- return settingsFile.toURL(); -+ return settingsFile.toURI().toURL(); - } - } - catch (MalformedURLException e) { -@@ -43,7 +43,7 @@ - File projectFile = new File(projectDir, path); - if (projectFile.exists()) { - log.debug("loading from project: " + path); -- return projectFile.toURL(); -+ return projectFile.toURI().toURL(); - } - } - catch (MalformedURLException e) { diff -ruN --exclude=CVS /usr/origports/www/commonist/files/patch-Main.java /usr/ports/www/commonist/files/patch-Main.java --- /usr/origports/www/commonist/files/patch-Main.java 2008-07-19 19:12:46.000000000 +0200 +++ /usr/ports/www/commonist/files/patch-Main.java 2008-12-23 03:42:52.621164498 +0100 @@ -17,22 +17,3 @@ loader = new Loader(settingsDir, projectDir, "/etc/"); -@@ -77,8 +77,7 @@ - try { licenses = initLicenses(); } - catch (IOException e) { throw new Error("cannot load licenses.txt"); } - -- try { mw = new MediaWiki(); } -- catch (ConfigException e) { throw new Error("cannot instantiate MediaWiki"); } -+ mw = new MediaWiki(); - mw.setLog(System.err); - mw.setupProxy(); - -@@ -226,7 +225,7 @@ - if (!file.getName().endsWith(".family")) continue; - log.info("loading family: " + file); - try { -- mw.loadFamily(file.toURL()); -+ mw.loadFamily(file.toURI().toURL()); - } - catch (ConfigException e) { - log.error("could not load family from: " + file, e); diff -ruN --exclude=CVS /usr/origports/www/commonist/files/patch-build.xml /usr/ports/www/commonist/files/patch-build.xml --- /usr/origports/www/commonist/files/patch-build.xml 2008-07-19 19:12:46.000000000 +0200 +++ /usr/ports/www/commonist/files/patch-build.xml 2008-12-23 06:10:09.572053458 +0100 @@ -1,6 +1,17 @@ ---- build.xml.orig 2008-01-17 21:47:36.000000000 +0100 -+++ build.xml 2008-06-20 01:11:45.983423901 +0200 -@@ -52,10 +52,9 @@ +--- build.xml.orig 2008-06-25 12:52:30.000000000 +0200 ++++ build.xml 2008-12-23 06:09:36.963725735 +0100 +@@ -21,6 +21,10 @@ + + <target name="compile" description="compile java classes"> + <mkdir dir="build/classes"/> ++ <javacc ++ target="src/net/psammead/minibpp/Parser.jj" ++ javacchome="${javacc.home}" ++ /> + <javac + srcdir="src" + destdir="build/classes" +@@ -52,10 +56,9 @@ <attribute name="Creator" value="${author}"/> <attribute name="License" value="${license}"/> @@ -8,7 +19,7 @@ - TODO: use a property, add binary.jars to classpath (manifestclasspath from ant 1.7.0) <attribute name="Main-Class" value="net.psammead.commonist.Main"/> - --> -+ <attribute name="Class-Path" value="commons-httpclient.jar commons-codec.jar commons-logging.jar bsh.jar"/> ++ <attribute name="Class-Path" value="jericho-html.jar commons-httpclient.jar commons-codec.jar commons-logging.jar bsh.jar"/> + </manifest> </jar> --- commonist-0.3.32.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200812300018.mBU0IafQ037109>