11 files changed, 8 insertions, 171 deletions

diff --git a/devel/jiic/Makefile b/devel/jiic/Makefile
index 6591c07336a0..fe3f83a514b3 100644
--- a/devel/jiic/Makefile
+++ b/devel/jiic/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	jiic
-PORTVERSION=	20100629
+PORTVERSION=	20120110
 CATEGORIES=	devel multimedia java
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	ale
@@ -20,7 +20,6 @@ RUN_DEPENDS=	${JAVALIBDIR}/sabre.jar:${PORTSDIR}/devel/sabre
 LICENSE=	LGPL21
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
-USE_ZIP=	yes
 USE_JAVA=	yes
 JAVA_VERSION=	1.5+
 USE_ANT=	yes
diff --git a/devel/jiic/distinfo b/devel/jiic/distinfo
index 035f6c596004..7d0b70f92ac8 100644
--- a/devel/jiic/distinfo
+++ b/devel/jiic/distinfo
@@ -1,2 +1,2 @@
-SHA256 (jiic-20100629.zip) = ad95f56f1bd60c99dda64344ead10d0dcf234f54820ac2f4018eadbf02d45a76
-SIZE (jiic-20100629.zip) = 125274
+SHA256 (jiic-20120110.tar.gz) = 2a2c9961979b0b15a05cb003b7b83ced8079767a2f6b1ae7c963627340694878
+SIZE (jiic-20120110.tar.gz) = 101502
diff --git a/devel/jiic/files/build.xml b/devel/jiic/files/build.xml
index 2de5512ed21f..778b41a27f7e 100644
--- a/devel/jiic/files/build.xml
+++ b/devel/jiic/files/build.xml
@@ -15,14 +15,17 @@
 	</target>
 	
 	<target name="compile" depends="prepare">
-		<javac destdir="${build}/classes" debug="on">
+		<javac destdir="${build}/classes" source="1.5" target="1.5" includeantruntime="true" debug="on">
 		    <src path="${src}"/>
 		</javac>
 	</target>
 	
 	<target name="jar" depends="compile">
 		<jar destfile="${dist}/iso9660.jar" basedir="${build}/classes">
-			<include name="de/tu_darmstadt/informatik/rbg/**/*.class"/>
+			<include name="de/**/*.class"/>
+			<manifest>
+				<attribute name="Class-Path" value="sabre.jar"/>
+			</manifest>
 		</jar>
 	</target>
 </project>
diff --git a/devel/jiic/files/patch-de_tu_darmstadt_informatik_rbg_hatlak_eltorito_impl_ElToritoHandler.java b/devel/jiic/files/patch-de_tu_darmstadt_informatik_rbg_hatlak_eltorito_impl_ElToritoHandler.java
deleted file mode 100644
index b41f4c6b30a4..000000000000
--- a/devel/jiic/files/patch-de_tu_darmstadt_informatik_rbg_hatlak_eltorito_impl_ElToritoHandler.java
+++ /dev/null
@@ -1,29 +0,0 @@
---- de/tu_darmstadt/informatik/rbg/hatlak/eltorito/impl/ElToritoHandler.java	2009-03-22 13:35:13.000000000 +0100
-+++ de/tu_darmstadt/informatik/rbg/hatlak/eltorito/impl/ElToritoHandler.java	2010-06-29 10:10:02.000000000 +0200
-@@ -114,7 +114,7 @@
- 		}
- 
- 		// Write Boot Image
--		FileDataReference fdr = new FileDataReference(config.getBootImage());
-+		FileDataReference fdr = new FileDataReference(config.getBootImage().getFile());
- 		data(fdr);
- 
- 		super.endElement();
-@@ -124,7 +124,7 @@
- 		// Patch the Boot Image: write 56 byte boot information table
- 		// (cf. man mkisofs, section EL TORITO BOOT INFORMATION TABLE)
- 		try {
--			String orgName = config.getBootImage().getAbsolutePath();
-+			String orgName = config.getBootImage().getFile().getAbsolutePath();
- 			File orgFile = new File(orgName);
- 
- 			// Compute the checksum over all 32-bit words starting at byte offset 64
-@@ -173,7 +173,7 @@
- 			buffer[i++] = (byte) ((lba>>16)&0xFF);
- 			buffer[i++] = (byte) ((lba>>24)&0xFF);
- 			// Boot file length in bytes, 7.3.1 format
--			int len = (int) config.getBootImage().getAbsoluteFile().length();
-+			int len = (int) config.getBootImage().getFile().getAbsoluteFile().length();
- 			buffer[i++] = (byte) (len&0xFF);
- 			buffer[i++] = (byte) ((len>>8)&0xFF);
- 			buffer[i++] = (byte) ((len>>16)&0xFF);
diff --git a/devel/jiic/files/patch-de_tu_darmstadt_informatik_rbg_hatlak_iso9660_ISO9660File.java b/devel/jiic/files/patch-de_tu_darmstadt_informatik_rbg_hatlak_iso9660_ISO9660File.java
deleted file mode 100644
index b7ec9ff4eb9a..000000000000
--- a/devel/jiic/files/patch-de_tu_darmstadt_informatik_rbg_hatlak_iso9660_ISO9660File.java
+++ /dev/null
@@ -1,57 +0,0 @@
---- de/tu_darmstadt/informatik/rbg/hatlak/iso9660/ISO9660File.java	2007-03-30 17:06:58.000000000 +0200
-+++ de/tu_darmstadt/informatik/rbg/hatlak/iso9660/ISO9660File.java	2010-06-29 10:10:52.000000000 +0200
-@@ -29,8 +29,9 @@
- /**
-  * Note: this class has a natural ordering that is inconsistent with equals.
-  */
--public class ISO9660File extends File implements ISO9660HierarchyObject {
-+public class ISO9660File implements ISO9660HierarchyObject {
- 	public static final Pattern FILEPATTERN = Pattern.compile("^([^.]+)\\.(.+)$");
-+	private File file;
- 	private boolean enforceDotDelimiter = false;
- 	private static final long serialVersionUID = 1L;
- 	private String filename, extension;
-@@ -47,7 +48,7 @@
- 	 * @throws HandlerException Invalid File version or file is a directory
- 	 */
- 	public ISO9660File(File file, int version) throws HandlerException {
--		super(file.getPath());
-+		this.file = file;
- 		setName(file.getName());
- 		setVersion(version);
- 		id = new Object();
-@@ -67,8 +68,8 @@
- 	 * @throws HandlerException Invalid File version or file is a directory
- 	 */
- 	public ISO9660File(String pathname, int version) throws HandlerException {
--		super(pathname);
--		setName(super.getName());
-+		file = new File(pathname);
-+		setName(file.getName());
- 		setVersion(version);
- 		id = new Object();
- 		enforce8plus3 = false;
-@@ -99,6 +100,10 @@
- 		this(pathname, 1);
- 	}
- 
-+	public File getFile() {
-+	    return file;
-+	}
-+	
- 	/**
- 	 * Returns the name of the file (without dot)
- 	 * 
-@@ -133,7 +138,11 @@
- 		} // else
- 
- 		return filename;
--	}	
-+	}
-+	
-+	public boolean isDirectory() {
-+	    return file.isDirectory();
-+	}
- 	
- 	/**
- 	 * Declare this file to be a moved directory "totem pole" 
diff --git a/devel/jiic/files/patch-de_tu_darmstadt_informatik_rbg_hatlak_iso9660_NamingConventions.java b/devel/jiic/files/patch-de_tu_darmstadt_informatik_rbg_hatlak_iso9660_NamingConventions.java
deleted file mode 100644
index 4b805fc1a990..000000000000
--- a/devel/jiic/files/patch-de_tu_darmstadt_informatik_rbg_hatlak_iso9660_NamingConventions.java
+++ /dev/null
@@ -1,11 +0,0 @@
---- de/tu_darmstadt/informatik/rbg/hatlak/iso9660/NamingConventions.java	2007-03-30 17:06:58.000000000 +0200
-+++ de/tu_darmstadt/informatik/rbg/hatlak/iso9660/NamingConventions.java	2010-06-29 10:12:14.000000000 +0200
-@@ -178,7 +178,7 @@
- 				// First try to append the number
- 				ISO9660File copy = null;
- 				try {
--					copy = new ISO9660File(file);
-+					copy = new ISO9660File(file.getFile());
- 				} catch (HandlerException e) {
- 					e.printStackTrace();
- 				}
diff --git a/devel/jiic/files/patch-de_tu_darmstadt_informatik_rbg_hatlak_iso9660_impl_FileHandler.java b/devel/jiic/files/patch-de_tu_darmstadt_informatik_rbg_hatlak_iso9660_impl_FileHandler.java
deleted file mode 100644
index da4b64723441..000000000000
--- a/devel/jiic/files/patch-de_tu_darmstadt_informatik_rbg_hatlak_iso9660_impl_FileHandler.java
+++ /dev/null
@@ -1,11 +0,0 @@
---- de/tu_darmstadt/informatik/rbg/hatlak/iso9660/impl/FileHandler.java	2007-03-30 17:06:58.000000000 +0200
-+++ de/tu_darmstadt/informatik/rbg/hatlak/iso9660/impl/FileHandler.java	2010-06-29 10:10:17.000000000 +0200
-@@ -69,7 +69,7 @@
- 	private void doFile(ISO9660File file) throws HandlerException {
- 		super.startElement(new FileElement(file));
- 
--		FileDataReference fdr = new FileDataReference(file);
-+		FileDataReference fdr = new FileDataReference(file.getFile());
- 		data(fdr);
- 
- 		super.endElement();
diff --git a/devel/jiic/files/patch-de_tu_darmstadt_informatik_rbg_hatlak_iso9660_impl_ISO9660Factory.java b/devel/jiic/files/patch-de_tu_darmstadt_informatik_rbg_hatlak_iso9660_impl_ISO9660Factory.java
deleted file mode 100644
index 5e0312d8207d..000000000000
--- a/devel/jiic/files/patch-de_tu_darmstadt_informatik_rbg_hatlak_iso9660_impl_ISO9660Factory.java
+++ /dev/null
@@ -1,11 +0,0 @@
---- de/tu_darmstadt/informatik/rbg/hatlak/iso9660/impl/ISO9660Factory.java	2007-03-30 17:06:58.000000000 +0200
-+++ de/tu_darmstadt/informatik/rbg/hatlak/iso9660/impl/ISO9660Factory.java	2010-06-29 10:11:08.000000000 +0200
-@@ -322,7 +322,7 @@
- 		
- 		// Write and close Length Fixup
- 		Fixup dataLengthFixup = (Fixup) memory.get("drDataLengthFixup");
--		dataLengthFixup.data(new BothWordDataReference(file.length()));
-+		dataLengthFixup.data(new BothWordDataReference(file.getFile().length()));
- 		dataLengthFixup.close();
- 		
- 		return memory;
diff --git a/devel/jiic/files/patch-de_tu_darmstadt_informatik_rbg_hatlak_iso9660_impl_ISO9660RockRidgeFactory.java b/devel/jiic/files/patch-de_tu_darmstadt_informatik_rbg_hatlak_iso9660_impl_ISO9660RockRidgeFactory.java
deleted file mode 100644
index 59dd2358ef11..000000000000
--- a/devel/jiic/files/patch-de_tu_darmstadt_informatik_rbg_hatlak_iso9660_impl_ISO9660RockRidgeFactory.java
+++ /dev/null
@@ -1,11 +0,0 @@
---- de/tu_darmstadt/informatik/rbg/hatlak/iso9660/impl/ISO9660RockRidgeFactory.java	2007-03-30 17:06:58.000000000 +0200
-+++ de/tu_darmstadt/informatik/rbg/hatlak/iso9660/impl/ISO9660RockRidgeFactory.java	2010-06-29 10:11:23.000000000 +0200
-@@ -160,7 +160,7 @@
- 		rripFactory.doPXEntry(fileModes, 1, 0, 0, 1);
- 		
- 		// TF: Timestamp
--		ISO9660ShortDateDataReference date = new ISO9660ShortDateDataReference(file.lastModified());
-+		ISO9660ShortDateDataReference date = new ISO9660ShortDateDataReference(file.getFile().lastModified());
- 		rripFactory.doTFEntry(RRIPFactory.TF_MODIFY, date);
- 
- 		// Compute length up to here
diff --git a/devel/jiic/files/patch-de_tu_darmstadt_informatik_rbg_hatlak_iso9660_impl_ISOImageFileHandler.java b/devel/jiic/files/patch-de_tu_darmstadt_informatik_rbg_hatlak_iso9660_impl_ISOImageFileHandler.java
deleted file mode 100644
index 46141163ae3f..000000000000
--- a/devel/jiic/files/patch-de_tu_darmstadt_informatik_rbg_hatlak_iso9660_impl_ISOImageFileHandler.java
+++ /dev/null
@@ -1,20 +0,0 @@
---- de/tu_darmstadt/informatik/rbg/hatlak/iso9660/impl/ISOImageFileHandler.java	2007-03-30 17:06:58.000000000 +0200
-+++ de/tu_darmstadt/informatik/rbg/hatlak/iso9660/impl/ISOImageFileHandler.java	2010-06-28 17:26:15.000000000 +0200
-@@ -93,10 +93,13 @@
- 	}
- 	
- 	public Fixup fixup(DataReference reference) throws HandlerException {
--		Fixup fixup = null;
--		fixup = new FileFixup(file, position, reference.getLength());
--		data(reference);
--		return fixup;
-+		try {
-+			Fixup fixup = new FileFixup(new RandomAccessFile(file, "rw"), position, reference.getLength());
-+			data(reference);
-+			return fixup;
-+		} catch (FileNotFoundException e) {
-+			throw new HandlerException(e);
-+		}
- 	}
- 	
- 	public long mark() throws HandlerException {
diff --git a/devel/jiic/files/patch-de_tu_darmstadt_informatik_rbg_hatlak_joliet_impl_JolietNamingConventions.java b/devel/jiic/files/patch-de_tu_darmstadt_informatik_rbg_hatlak_joliet_impl_JolietNamingConventions.java
deleted file mode 100644
index 04b0f81962c0..000000000000
--- a/devel/jiic/files/patch-de_tu_darmstadt_informatik_rbg_hatlak_joliet_impl_JolietNamingConventions.java
+++ /dev/null
@@ -1,15 +0,0 @@
---- de/tu_darmstadt/informatik/rbg/hatlak/joliet/impl/JolietNamingConventions.java	2007-03-30 17:06:58.000000000 +0200
-+++ de/tu_darmstadt/informatik/rbg/hatlak/joliet/impl/JolietNamingConventions.java	2010-06-29 09:23:15.000000000 +0200
-@@ -82,10 +82,10 @@
- 		if (filename.length() + extension.length() + (file.getVersion()+"").length() + 2 > 64) {
- 			if (filename.length() >= extension.length()) {
- 				// Shorten filename
--				filename = filename.substring(0, 64-extension.length());
-+				filename = filename.substring(0, 64-extension.length()-(file.getVersion()+"").length()-2);
- 			} else {
- 				// Shorten extension
--				extension = extension.substring(0, 64-filename.length());				
-+				extension = extension.substring(0, 64-filename.length()-(file.getVersion()+"").length()-2);				
- 			}
- 		}
-