Attachment 88036 Details for Bug 124771 – commonist-0.3.27.shar

commonist-0.3.27.shar

commonist-0.3.27.shar (text/plain), 7.83 KB, created by Marcin Cieslak on 2008-06-20 01:00:07 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Marcin Cieslak

Created: 2008-06-20 01:00:07 UTC

Size: 7.83 KB

patch

obsolete

># This is a shell archive.  Save it in a file, remove anything before
># this line, and then unpack it by entering "sh file".  Note, it may
># create directories; files and directories will be owned by you and
># have default permissions.
>#
># This archive contains:
>#
>#	commonist
>#	commonist/files
>#	commonist/files/patch-Loader.java
>#	commonist/files/patch-build.xml
>#	commonist/files/commonist.in
>#	commonist/files/patch-Main.java
>#	commonist/distinfo
>#	commonist/pkg-descr
>#	commonist/Makefile
>#	commonist/pkg-plist
>#
>echo c - commonist
>mkdir -p commonist > /dev/null 2>&1
>echo c - commonist/files
>mkdir -p commonist/files > /dev/null 2>&1
>echo x - commonist/files/patch-Loader.java
>sed 's/^X//' >commonist/files/patch-Loader.java << 'END-of-commonist/files/patch-Loader.java'
>X--- src/net/psammead/commonist/util/Loader.java.orig	2008-06-19 23:45:43.667197457 +0200
>X+++ src/net/psammead/commonist/util/Loader.java	2008-06-19 23:46:41.729154606 +0200
>X@@ -32,7 +32,7 @@
>X 			File	settingsFile	= new File(settingsDir, path);
>X 			if (settingsFile.exists()) {
>X 				log.debug("loading from settings: " + path);
>X-				return settingsFile.toURL();
>X+				return settingsFile.toURI().toURL();
>X 			}
>X 		}
>X 		catch (MalformedURLException e) {
>X@@ -43,7 +43,7 @@
>X 			File	projectFile	= new File(projectDir, path);
>X 			if (projectFile.exists()) {
>X 				log.debug("loading from project: " + path);
>X-				return projectFile.toURL();
>X+				return projectFile.toURI().toURL();
>X 			}
>X 		}
>X 		catch (MalformedURLException e) {
>END-of-commonist/files/patch-Loader.java
>echo x - commonist/files/patch-build.xml
>sed 's/^X//' >commonist/files/patch-build.xml << 'END-of-commonist/files/patch-build.xml'
>X--- build.xml.orig	2008-01-17 21:47:36.000000000 +0100
>X+++ build.xml	2008-06-20 01:11:45.983423901 +0200
>X@@ -52,10 +52,9 @@
>X 				<attribute name="Creator"		value="${author}"/>
>X 				<attribute name="License"		value="${license}"/>
>X 				
>X-				
>X+				<attribute name="Class-Path"	value="commons-httpclient.jar commons-codec.jar commons-logging.jar bsh.jar"/>
>X+			
>X 			</manifest>
>X 		</jar>
>X 	</target>
>END-of-commonist/files/patch-build.xml
>echo x - commonist/files/commonist.in
>sed 's/^X//' >commonist/files/commonist.in << 'END-of-commonist/files/commonist.in'
>Xjava -jar %%TARGET_JAR%%
>END-of-commonist/files/commonist.in
>echo x - commonist/files/patch-Main.java
>sed 's/^X//' >commonist/files/patch-Main.java << 'END-of-commonist/files/patch-Main.java'
>X--- src/net/psammead/commonist/Main.java.orig	2007-11-28 16:35:58.000000000 +0100
>X+++ src/net/psammead/commonist/Main.java	2008-06-20 00:35:52.532632590 +0200
>X@@ -58,14 +58,14 @@
>X 	private ChangeDirectoryTask changeDirectoryTask;
>X 	private UploadFilesTask 	uploadFilesTask;
>X 	
>X-	public Main(Image programIcon, String programHeading) {
>X+	public Main(Image programIcon, String programHeading) throws ConfigException {
>X 		settingsDir	= new File(new File(System.getProperty("user.home")), ".commonist");
>X 		settingsDir.mkdirs();
>X 		
>X 		// HACK: running from webstart or load from the Filesystem
>X //		boolean fromWebStart	= !(new File("etc/licenses.txt").exists());
>X 		
>X-		File	projectDir	= new File(new File(System.getProperty("user.dir")), "etc");
>X+		File	projectDir	= new File("%%ETCDIR%%");
>X 		
>X 		loader	= new Loader(settingsDir, projectDir, "/etc/");
>X 
>X@@ -77,8 +77,7 @@
>X 		try { licenses	= initLicenses(); }
>X 		catch (IOException e) { throw new Error("cannot load licenses.txt"); }
>X 
>X-		try { mw = new MediaWiki(); }
>X-		catch (ConfigException e) { throw new Error("cannot instantiate MediaWiki"); }
>X+		mw = new MediaWiki(); 
>X 		mw.setLog(System.err);
>X 		mw.setupProxy();
>X 		
>X@@ -226,7 +225,7 @@
>X 			if (!file.getName().endsWith(".family"))	continue;
>X 			log.info("loading family: " + file);
>X 			try {
>X-				mw.loadFamily(file.toURL());
>X+				mw.loadFamily(file.toURI().toURL());
>X 			}
>X 			catch (ConfigException e) {
>X 				log.error("could not load family from: " + file, e);
>END-of-commonist/files/patch-Main.java
>echo x - commonist/distinfo
>sed 's/^X//' >commonist/distinfo << 'END-of-commonist/distinfo'
>XMD5 (commonist-0.3.27.zip) = 131b7182e8934993eb63f0cfe6870bbe
>XSHA256 (commonist-0.3.27.zip) = 0e41dfd2735657aad2c0d7bd196b62cde769e622d5e3a0fbe0a0225dd2a8091c
>XSIZE (commonist-0.3.27.zip) = 2265325
>END-of-commonist/distinfo
>echo x - commonist/pkg-descr
>sed 's/^X//' >commonist/pkg-descr << 'END-of-commonist/pkg-descr'
>XCommonist is a free Java program for easy uploads of large numbers of
>Ximages to Wikimedia Commons and other Mediawiki installations.
>X
>XWWW:	http://commons.wikimedia.org/wiki/Commons:Tools/Commonist
>END-of-commonist/pkg-descr
>echo x - commonist/Makefile
>sed 's/^X//' >commonist/Makefile << 'END-of-commonist/Makefile'
>X# New ports collection makefile for:	commonist
>X# Date created:		2008-06-17
>X# Whom:			Marcin Cieslak <saper@SYSTEM.PL>
>X#
>X# $FreeBSD$
>X#
>X
>XPORTNAME=	commonist
>XPORTVERSION=	0.3.27
>XCATEGORIES=	www java
>XMASTER_SITES=	http://djini.de/software/commonist/
>X
>XMAINTAINER=	saper@SYSTEM.PL
>XCOMMENT=	Easy upload of images to Wikimedia Commons and Mediawiki
>X
>XTARGET_JAR=	${JAVAJARDIR}/${PORTNAME}.jar
>XUSE_ZIP=	yes
>XUSE_JAVA=	1.5+
>XUSE_ANT=	yes
>XALL_TARGET=	jar
>XMAKE_ARGS+=	-Djar.lib.dir=${WRKSRC}/build/jar -Dtarget.name=${WRKSRC}/build/jar/${PORTNAME}.jar
>X
>XSUB_FILES+=	commonist
>XSUB_LIST+=	TARGET_JAR=${TARGET_JAR}
>X
>XBUILD_DEPENDS+=	${JAVAJARDIR}/commons-httpclient.jar:${PORTSDIR}/java/jakarta-commons-httpclient \
>X		${JAVAJARDIR}/bsh.jar:${PORTSDIR}/java/bsh
>X
>XRUN_DEPENDS+=	${JAVAJARDIR}/commons-httpclient.jar:${PORTSDIR}/java/jakarta-commons-httpclient \
>X		${JAVAJARDIR}/bsh.jar:${PORTSDIR}/java/bsh
>X
>X.include <bsd.port.pre.mk>
>X
>Xpost-extract:
>X	(cd ${WRKSRC} && ${JAR} xf lib/lib-util-src.jar src)
>X	(cd ${WRKSRC} && ${JAR} xf lib/mwapi-src.jar src)
>X	(cd ${WRKSRC} && ${JAR} xf lib/minibpp-src.jar source)
>X	(cd ${WRKSRC}/source && ${FIND} * -print | ${CPIO} -pdmu ${WRKSRC}/src)
>X
>Xpost-patch:
>X	${REINPLACE_CMD} -e "s#%%ETCDIR%%#${ETCDIR}#" ${WRKSRC}/src/net/psammead/commonist/Main.java
>X
>Xpre-build:
>X	(cd ${WRKSRC} && ${ANT} clean)
>X	${MKDIR} ${WRKSRC}/build/classes
>X	${JAR} tf ${WRKSRC}/lib/mwapi.jar net/psammead/mwapi/config | ${EGREP} '(site|family|list)' > ${WRKSRC}/configfiles
>X	(cd ${WRKSRC}/build/classes && ${JAR} xf ${WRKSRC}/lib/mwapi.jar `${CAT} ${WRKSRC}/configfiles`)
>X
>Xdo-install:
>X	${MKDIR} ${JAVAJARDIR}
>X	${INSTALL_SCRIPT} ${WRKDIR}/commonist ${PREFIX}/bin
>X	${INSTALL_DATA}	${WRKSRC}/build/jar/${PORTNAME}.jar ${TARGET_JAR}
>X.if !defined(NOPORTEXAMPLES)
>X	${MKDIR} ${EXAMPLESDIR}
>X	${INSTALL_DATA} ${WRKSRC}/etc/startup.bsh ${EXAMPLESDIR}
>X	${INSTALL_DATA} ${WRKSRC}/build/classes/net/psammead/mwapi/config/commons.family ${EXAMPLESDIR}
>X	${INSTALL_DATA} ${WRKSRC}/build/classes/net/psammead/mwapi/config/commons.site ${EXAMPLESDIR}
>X.endif
>X	${MKDIR} ${ETCDIR}
>X.for f in gallery_commons.bpp image_default.bpp messages_fr.properties \
>X		image_commons.bpp gallery_default.bpp licenses.txt messages_en.properties \
>X		messages_sk.properties messages_de.properties
>X		${INSTALL_DATA} ${WRKSRC}/etc/${f} ${ETCDIR}
>X.endfor
>X
>X.include <bsd.port.post.mk>
>END-of-commonist/Makefile
>echo x - commonist/pkg-plist
>sed 's/^X//' >commonist/pkg-plist << 'END-of-commonist/pkg-plist'
>X@comment $FreeBSD$
>Xbin/commonist
>X%%JAVAJARDIR%%/commonist.jar
>X%%ETCDIR%%/gallery_commons.bpp
>X%%ETCDIR%%/gallery_default.bpp
>X%%ETCDIR%%/image_commons.bpp
>X%%ETCDIR%%/image_default.bpp
>X%%ETCDIR%%/licenses.txt
>X%%ETCDIR%%/messages_de.properties
>X%%ETCDIR%%/messages_en.properties
>X%%ETCDIR%%/messages_fr.properties
>X%%ETCDIR%%/messages_sk.properties
>X%%PORTEXAMPLES%%%%EXAMPLESDIR%%/commons.family
>X%%PORTEXAMPLES%%%%EXAMPLESDIR%%/commons.site
>X%%PORTEXAMPLES%%%%EXAMPLESDIR%%/startup.bsh
>X@dirrm %%ETCDIR%%
>X%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
>END-of-commonist/pkg-plist
>exit

Actions: View

Attachments on bug 124771: 88036