diff options
| author | miwi <miwi@FreeBSD.org> | 2009-01-10 07:15:39 +0800 |
|---|---|---|
| committer | miwi <miwi@FreeBSD.org> | 2009-01-10 07:15:39 +0800 |
| commit | 205cb58652d60c698783100d60e6cc544e1c78de (patch) | |
| tree | 69e6e0a3dd9fe101872177714f07cef5988226c5 /www/commonist/files | |
| parent | 0c5611194b9e12dbe6641fe1b27ebc684469e5a3 (diff) | |
| download | freebsd-ports-gnome-205cb58652d60c698783100d60e6cc544e1c78de.tar.gz freebsd-ports-gnome-205cb58652d60c698783100d60e6cc544e1c78de.tar.zst freebsd-ports-gnome-205cb58652d60c698783100d60e6cc544e1c78de.zip | |
- Update to 0.3.32
PR: 130042
Submitted by: Marcin Cieslak <saper@SYSTEM.PL> (maintainer)
Diffstat (limited to 'www/commonist/files')
| -rw-r--r-- | www/commonist/files/patch-Loader.java | 20 | ||||
| -rw-r--r-- | www/commonist/files/patch-Main.java | 19 | ||||
| -rw-r--r-- | www/commonist/files/patch-build.xml | 19 |
3 files changed, 15 insertions, 43 deletions
diff --git a/www/commonist/files/patch-Loader.java b/www/commonist/files/patch-Loader.java deleted file mode 100644 index 7388a017d810..000000000000 --- a/www/commonist/files/patch-Loader.java +++ /dev/null @@ -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 --git a/www/commonist/files/patch-Main.java b/www/commonist/files/patch-Main.java index eff175ca3f22..3aba5c0d7139 100644 --- a/www/commonist/files/patch-Main.java +++ b/www/commonist/files/patch-Main.java @@ -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 --git a/www/commonist/files/patch-build.xml b/www/commonist/files/patch-build.xml index daa2ea89ed4f..4396a725b3bc 100644 --- a/www/commonist/files/patch-build.xml +++ b/www/commonist/files/patch-build.xml @@ -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> |