kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Update to 20120110 snapshot.

Browse source
This commit is contained in:
Alex Dupre 2012-01-10 09:18:20 +00:00
parent a1e1bab917
commit f4c015865d
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=288871
11 changed files with 8 additions and 171 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
devel/jiic/Makefile
View file

@ -6,7 +6,7 @@
# #
PORTNAME= jiic PORTNAME= jiic
PORTVERSION= 20100629 PORTVERSION= 20120110
CATEGORIES= devel multimedia java CATEGORIES= devel multimedia java
MASTER_SITES= ${MASTER_SITE_LOCAL} MASTER_SITES= ${MASTER_SITE_LOCAL}
MASTER_SITE_SUBDIR= ale MASTER_SITE_SUBDIR= ale
@ -20,7 +20,6 @@ RUN_DEPENDS= ${JAVALIBDIR}/sabre.jar:${PORTSDIR}/devel/sabre
LICENSE= LGPL21 LICENSE= LGPL21
WRKSRC= ${WRKDIR}/${PORTNAME} WRKSRC= ${WRKDIR}/${PORTNAME}
USE_ZIP= yes
USE_JAVA= yes USE_JAVA= yes
JAVA_VERSION= 1.5+ JAVA_VERSION= 1.5+
USE_ANT= yes USE_ANT= yes

4
devel/jiic/distinfo
View file

@ -1,2 +1,2 @@
SHA256 (jiic-20100629.zip) = ad95f56f1bd60c99dda64344ead10d0dcf234f54820ac2f4018eadbf02d45a76 SHA256 (jiic-20120110.tar.gz) = 2a2c9961979b0b15a05cb003b7b83ced8079767a2f6b1ae7c963627340694878
SIZE (jiic-20100629.zip) = 125274 SIZE (jiic-20120110.tar.gz) = 101502

7
devel/jiic/files/build.xml
View file

@ -15,14 +15,17 @@
</target> </target>
<target name="compile" depends="prepare"> <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}"/> <src path="${src}"/>
</javac> </javac>
</target> </target>
<target name="jar" depends="compile"> <target name="jar" depends="compile">
<jar destfile="${dist}/iso9660.jar" basedir="${build}/classes"> <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> </jar>
</target> </target>
</project> </project>

29
devel/jiic/files/patch-de_tu_darmstadt_informatik_rbg_hatlak_eltorito_impl_ElToritoHandler.java
View file

@ -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);

57
devel/jiic/files/patch-de_tu_darmstadt_informatik_rbg_hatlak_iso9660_ISO9660File.java
View file

@ -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"

11
devel/jiic/files/patch-de_tu_darmstadt_informatik_rbg_hatlak_iso9660_NamingConventions.java
View file

@ -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();
}

11
devel/jiic/files/patch-de_tu_darmstadt_informatik_rbg_hatlak_iso9660_impl_FileHandler.java
View file

@ -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();

11
devel/jiic/files/patch-de_tu_darmstadt_informatik_rbg_hatlak_iso9660_impl_ISO9660Factory.java
View file

@ -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;

11
devel/jiic/files/patch-de_tu_darmstadt_informatik_rbg_hatlak_iso9660_impl_ISO9660RockRidgeFactory.java
View file

@ -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

20
devel/jiic/files/patch-de_tu_darmstadt_informatik_rbg_hatlak_iso9660_impl_ISOImageFileHandler.java
View file

@ -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 {

15
devel/jiic/files/patch-de_tu_darmstadt_informatik_rbg_hatlak_joliet_impl_JolietNamingConventions.java
View file

@ -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);
}
}