Merge lp:~james-page/ubuntu/natty/libjna-java/multiarch-fix into lp:ubuntu/natty/libjna-java

[James Page]

Update to path searching code to support multi-arch locations of libraries.

I'm happy with (and have tested) the code that detects and sets the path for i386 and amd64 but I would appreciate close review of both the ARM and PPC multi-arch generation code.

The key part is in the NativeLibrary.java part of the patch.

[James Page (james-page)]

Hmm - handily I also managed to tidy up the .pc folder - looks like the patches where checked in applied to the bzr branch.

debian/patches/07-multiarch-support.patch is the interesting bit.

[Steve Langasek (vorlon)]

I'm not thrilled about this being handled in non-generic fashion within libjna-java. Why does this need to construct such a path? For native loading we should always be able defer to the built-in search path from libdl as used for dlopen().

++ } else if (Platform.isARM()) {
++ cpu = "arm";
++ kernel = "linuxapcs";
++ }

This looks like it might be based on <http://wiki.debian.org/Multiarch/Tuples>, which has been abandoned in the final multiarch implementation in favor of GNU triplets. Sorry about that, I've marked it now as obsolete on <http://wiki.debian.org/Multiarch>. The triplet used on armel is 'arm-linux-gnueabi' (linuxapcs, in any case, refers to the obsolete OABI interface).

Also, there is an armhf port pending which will also show up as 'arm' with this check, but has a different ABI for library calls and will have its libraries installed in a different path. It would be nice if any solution here was generic enough to handle this architecture too.

Finally, the rationale for this seems to be that libjna-java needs to look up unversioned libraries. This is just plain *wrong* for any caller to do with a shared library. The soname declares the ABI, and if you don't know the soname, you don't know the ABI and should not be trying to poke at its symbols. In the case of libpam.so which started this, the unversioned '.so' symlink shouldn't even be present on a normal system; it's only installed when you have libpam-dev, which should not be a runtime requirement.

review: Needs Fixing

[James Page (james-page)]

Steve

I agree that I would rather leave library resolution up to libdl and let the system handle it - however that does not change the fact that moving to multi-arch has broken the path search behaviour in libjna-java.

I think that the version-less approach comes from the Java specification/jdk and is probably related to Java being inherently cross platform plus trying to take away complexity from developers.

Most native library loads that I have seen (using jna or native System calls) simply pass the library name - for example 'pam' or 'c'.

Native JDK maps this to libpam.so which as Ubuntu no longer has versionless .so's does not work (but that's a different issue).

In a cross platform world this allows developers to map 'mylibrary' to 'libmylibrary.so' in Linux and 'mylibrary.dll' in Windows.....

If jna can't find a versionless .so it makes an attempt to match to a 'best version' - meaning highest version - by searching its native library path which is created dynamically based on the platform.

jna can use versioned library names i.e. libpam.so.0 - I did a quick test with the pam integration in Jenkins and it works OK (so I will patch this specific library use-case).

However I still think that we should fix the fallback behaviour of jna to work with multi-arch based libraries. I intend to submit this back upstream as well as anyone using a non-Ubuntu distributed version of jna will also have the same issue.

I'll make the amends with reference to the armel platform and the armhf port - where can I find information on what ports/architectures we need to support?

[Colin Watson (cjwatson)]

On Wed, Mar 23, 2011 at 09:45:25AM -0000, James Page wrote:
> Native JDK maps this to libpam.so which as Ubuntu no longer has
> versionless .so's does not work (but that's a different issue).

Just to be clear, Ubuntu has only ever installed versionless .so files
in development library packages, never in runtime library packages; this
isn't a recent change.

[James Page (james-page)]

On Wed, 2011-03-23 at 10:01 +0000, Colin Watson wrote:
> Just to be clear, Ubuntu has only ever installed versionless .so files
> in development library packages, never in runtime library packages;
> this
> isn't a recent change.

Hi Colin

The libraries that install into /usr/lib/jni install versionless .so's.

As this directory is specifically for Java Native Integration and the
JVM won't read a versioned .so this is understandable.

The issue here is that libjna-java works around deficiencies in the JVM
native library integration (which is over simplistic) and makes it much
easier to wrap an existing system library in a Java wrapper without
having to provide an intermediary library in /usr/lib/jni
(unversioned....).

I also found libpam.so in ia32-libs on a 64 bit Maverick install which
was clouding my understanding of the issue.

--
James Page
Software Engineer, Ubuntu Server Team

[Steve Langasek (vorlon)]

On Wed, Mar 23, 2011 at 10:37:24AM -0000, James Page wrote:
> On Wed, 2011-03-23 at 10:01 +0000, Colin Watson wrote:
> > Just to be clear, Ubuntu has only ever installed versionless .so files
> > in development library packages, never in runtime library packages;
> > this
> > isn't a recent change.

> The libraries that install into /usr/lib/jni install versionless .so's.

Yes, but that's not what's meant here by a "library". The runtime system
libraries - those that get referenced via DT_NEEDED entries in the ELF
headers of binaries - need to have revision handling via their sonames,
because they ensure the system continues to interoperate over time.
Dynamically loaded objects in private directories, such as /usr/lib/jni, may
well have other conventions for dealing with ABI changes, but when Java
loads libraries from public system directories, the soname is *the*
convention for ensuring you have the object you were looking for. dlopening
libpam.so, even when it doesn't fail immediately, is still wrong.

> As this directory is specifically for Java Native Integration and the
> JVM won't read a versioned .so this is understandable.

Having looked at the openjdk code, that was not my understanding; but I
guess there may be multiple interfaces for this. :/

> The issue here is that libjna-java works around deficiencies in the JVM
> native library integration (which is over simplistic) and makes it much
> easier to wrap an existing system library in a Java wrapper without
> having to provide an intermediary library in /usr/lib/jni
> (unversioned....).

Well, not so much easier when it means depending on -dev packages, or
soon-to-be-deprecated ia32-libs, to find the library at runtime. :)

--
Steve Langasek Give me a lever long enough and a Free OS
Debian Developer to set it on, and I can move the world.
Ubuntu Developer http://www.debian.org/
<email address hidden> <email address hidden>

[lp:~james-page/ubuntu/natty/libjna-java/multiarch-fix]

11. By James Page on 2011-03-24

Minor amendment to fix arm multi-arch path

[James Page (james-page)]

Steve

I've pushed a revised branch with the arm multi-arch detection + path creation corrected as above (and as discussed via irc).

debian/patches/07-multiarch-support.patch - still contains the interesting stuff

Cheers

James

review: Needs Resubmitting

=== removed directory '.pc'
=== removed file '.pc/.version'
--- .pc/.version	2010-04-08 14:51:06 +0000
+++ .pc/.version	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-2

=== removed directory '.pc/01-nbproject.patch'
=== removed file '.pc/01-nbproject.patch/build.xml'
--- .pc/01-nbproject.patch/build.xml	2010-04-21 16:36:37 +0000
+++ .pc/01-nbproject.patch/build.xml	1970-01-01 00:00:00 +0000
@@ -1,645 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="JNA" default="default" basedir=".">
-  <description>Builds and tests JNA</description>
-
-  <!--  
-  Conventions (since ant can't easily specify arbitrary file dependencies):
-  The uptodate property for a given target TARGET is "-TARGET"; the actual
-  target to generate the uptodate property is named ":TARGET".
-
-  Properties (except for uptodate properties) separate words by dots, targets
-  by dashes. 
-  -->
-
-  <!-- global properties -->
-  <!-- (all build-related props should go in -dynamic-properties) -->
-  <property name="name" value="jna"/>
-  <property name="jar" value="${name}.jar"/>
-  <property name="testjar" value="${name}-test.jar"/>
-  <property name="debug" value="true"/>
-  <property name="debug.native" value="false"/>
-  <property name="cflags_extra.native" value=""/>
-  <property name="dynlink.native" value="false"/>
-  <property name="native" location="native"/>
-  <property name="src" location="src"/>
-  <property name="dist" location="dist"/>
-  <property name="test.src" location="test"/>
-  <property name="doc" location="doc"/>
-  <property name="javadoc" location="${doc}/javadoc"/>
-  <property name="stylesheet" location="${javadoc}/doc/css/javadoc.css"/>
-  <property name="vendor" value="JNA Development Team"/>
-  <property name="copyright"
-            value="Copyright &amp;copy; 2007-2009 Timothy Wall. All Rights Reserved."/>
-  <buildnumber/>
-  <!-- JNA library release version -->            
-  <property name="jna.major" value="3"/>
-  <property name="jna.minor" value="2"/>
-  <property name="jna.revision" value="4"/>
-  <property name="jna.build" value="${build.number}"/>
-  <property name="jna.version" value="${jna.major}.${jna.minor}.${jna.revision}"/>
-  <!-- jnidispatch library release version -->
-  <property name="jni.major" value="3"/>
-  <property name="jni.minor" value="2"/>
-  <property name="jni.revision" value="1"/>
-  <property name="jni.build" value="${build.number}"/>
-  <property name="jni.version" value="${jni.major}.${jni.minor}.${jni.revision}"/>
-  <property name="jni.md5" value="c870290c36c8d3fdf85db7c782febc3f"/>
-  <property name="spec.title" value="Java Native Access (JNA)"/>
-  <property name="spec.vendor" value="${vendor}"/>
-  <property name="spec.version" value="${jna.major}"/>
-  <property name="impl.title" value="com.sun.jna"/>
-  <property name="impl.vendor" value="${spec.vendor}"/>
-  <property name="impl.version" value="${jna.version} (b${jna.build})"/>
-
-  <property name="compatibility" value="1.4"/>
-  <property name="test.compatibility" value="1.5"/>
-
-  <!-- Miscellaneous -->
-  <property name="build.compiler.emacs" value="true"/>
-
-  <target name="default" depends="test" description="Build and Test."/>
-
-  <import file="nbproject/profiler-build-impl.xml"/>
-  <target name="init" depends="-setup"/>
-  <target name="compile-test-single" depends="compile-tests"/>
-  <target name="compile-single" depends="compile"/>
-
-  <target name="-dynamic-properties">
-    <echo>Java version ${java.version}, compatibility: ${compatibility}</echo>
-    <echo>JNA version ${jna.version}, native ${jni.version}</echo>
-    <echo>${java.vm.name} (${java.vm.vendor}, ${java.vm.version})</echo>
-    <echo>java.home=${java.home}</echo>
-    <echo>java.library.path=${java.library.path}</echo>
-
-    <replaceregexp match="(&lt;version&gt;).*(&lt;/version&gt;)"
-                   replace="\1${jna.version}\2" 
-                   file="pom.xml"/>
-    <replaceregexp match='VERSION = ".*";'
-                   replace='VERSION = "${jna.version}";'
-                   file="src/com/sun/jna/Native.java"/>
-
-    <condition property="jar.omitted" value="**/*jnidispatch*" else="jnilib-included">
-      <isset property="omit-jnilib"/>
-    </condition>
-    <condition property="vm.arch" value="-d64" else="">
-      <or>
-        <equals arg1="${sun.arch.data.model}" arg2="64" trim="true"/>
-        <equals arg1="${com.ibm.vm.bitmode}" arg2="64" trim="true"/>
-        <os arch="x86_64"/>
-        <os arch="ppc64"/>
-        <os arch="sparcv9"/>
-        <os arch="amd64"/>
-      </or>
-    </condition>
-    <condition property="ld.preload" value="LD_PRELOAD_64" else="LD_PRELOAD">
-      <and>
-        <os name="SunOS"/>
-        <equals arg1="${vm.arch}" arg2="-d64"/>
-      </and>
-    </condition>
-    <property name="build" value="build${vm.arch}"/>
-    <property name="classes" location="${build}/classes"/>
-    <property name="eclipse.classes" location="build.eclipse/classes"/>
-    <property name="test.classes" location="${build}/test-classes"/>
-    <property name="reports" value="${build}/reports"/>
-
-    <!-- Add other supported platforms here -->
-    <condition property="jre.arch" value="i386">
-      <equals arg1="x86" arg2="${os.arch}"/>
-    </condition>
-    <condition property="jre.arch" value="amd64">
-      <equals arg1="x86_64" arg2="${os.arch}"/>
-    </condition>
-    <property name="jre.arch" value="${os.arch}"/>
-    <condition property="os.prefix" value="linux-${jre.arch}">
-      <os name="Linux"/>
-    </condition>
-    <condition property="os.prefix" value="win32-${os.arch}">
-      <os family="windows"/>
-    </condition>
-    <!-- Darwin builds are universal, no arch required -->
-    <condition property="os.prefix" value="darwin">
-      <os family="mac"/>
-    </condition>
-    <condition property="os.prefix" value="sunos-${os.arch}">
-      <os name="SunOS"/>
-    </condition>
-    <condition property="os.prefix" value="freebsd-${os.arch}">
-      <os name="FreeBSD"/>
-    </condition>
-    <condition property="os.prefix" value="openbsd-${os.arch}">
-      <os name="OpenBSD"/>
-    </condition>
-    <fail unless="os.prefix" message="OS/arch not supported (${os.name}/${os.arch}), edit build.xml and native/Makefile to add it."/>
-    <condition property="jdk.home" value="${java.home}">
-      <available file="${java.home}/include"/>
-    </condition>
-    <condition property="jdk.home" value="${java.home}/..">
-      <available file="${java.home}/../include"/>
-    </condition>
-    <fail unless="jdk.home" message="JAVA_HOME/java.home must be a JDK, not JRE"/>
-    <condition property="libjsig"
-               value="${java.home}/lib/${jre.arch}/libjsig.so" else="">
-      <available file="${java.home}/lib/${jre.arch}/libjsig.so"/>
-    </condition>
-    <property name="native.jar" value="${os.prefix}.jar"/>
-    <property name="build.native" location="${build}/native"/>
-    <property name="md5.file" location="${build.native}/sig"/>
-
-    <mkdir dir="${build}"/>
-    <mkdir dir="${build.native}"/>
-    <mkdir dir="${classes}"/>
-    <mkdir dir="${test.classes}"/>
-    <mkdir dir="${reports}"/>
-    <mkdir dir="${doc}"/>
-
-  </target>
-
-  <target name="-setup" depends="-dynamic-properties">
-    <path id="compile-test.path">
-      <pathelement path="${test.src}"/>
-      <path id="test.libs">
-        <fileset dir="lib">
-          <include name="junit.jar"/>   
-        </fileset>
-        <pathelement path="${classes}"/>
-      </path>
-      <path id="compile.path">
-        <path id="src.path">
-          <pathelement location="${src}"/>
-        </path>
-      </path>                           
-    </path>                           
-
-    <path id="test.runpath">
-      <pathelement path="${build}/${jar}"/>
-      <pathelement path="${build}/examples.jar"/>
-      <pathelement path="${test.classes}"/>
-      <pathelement path="lib/clover.jar"/>
-      <path refid="test.libs"/>
-    </path>
-  </target>
-
-  <target name="compile" depends="-setup"
-          description="Compile all Java source">
-    <javac classpathref="compile.path"
-           source="${compatibility}"
-           target="${compatibility}"
-           destdir="${classes}" 
-           deprecation="on" debug="${debug}">
-      <src path="${src}"/>
-    </javac>
-  </target>
-
-  <target name=":jar">
-    <uptodate property="-jar" targetfile="${build}/${jar}">
-      <srcfiles dir="${classes}">
-        <patternset id="jar-compiled">
-          <include name="com/sun/jna/*"/>
-          <include name="com/sun/jna/**/*"/>
-          <exclude name="com/sun/jna/examples/*"/>
-          <exclude name="com/sun/jna/examples/**/*"/>
-        </patternset>
-      </srcfiles>
-    </uptodate>
-  </target>
-  <target name="jar" depends="-setup,native,:jar" unless="-jar"
-          description="Build primary jar">
-    <jar jarfile="${build}/${jar}">
-      <manifest>
-        <attribute name="Main-Class" value="com.sun.jna.Native"/>
-        <section name="com/sun/jna/">
-          <attribute name="Implementation-Title" value="${impl.title}"/>
-          <attribute name="Implementation-Vendor" value="${vendor}"/>
-          <attribute name="Implementation-Version" value="${impl.version}"/>
-          <attribute name="Specification-Title" value="${spec.title}"/>
-          <attribute name="Specification-Vendor" value="${spec.vendor}"/>
-          <attribute name="Specification-Version" value="${spec.version}"/>
-        </section>
-      </manifest>
-      <fileset dir="${classes}" excludes="${jar.omitted}">
-        <patternset refid="jar-compiled"/>
-      </fileset>
-    </jar>
-  </target>
-  <target name="examples" depends="jar,native">
-    <jar jarfile="${build}/examples.jar">
-      <manifest>
-        <attribute name="Class-Path" value="jna.jar"/>
-        <attribute name="Main-Class" value="com.sun.jna.examples.ShapedWindowDemo"/>
-      </manifest>
-      <fileset dir="${src}" includes="**/examples/**/*.png"/>
-      <fileset dir="${classes}" includes="**/examples/*,**/examples/**/*"/>
-      <fileset dir="${classes}" includes="jnidispatch.dll"/>
-    </jar>
-  </target>
-
-  <target name="javah" depends="compile">
-    <javah classpath="${classes}" destdir="${build.native}" force="yes">
-      <class name="com.sun.jna.Function"/>
-      <class name="com.sun.jna.Pointer"/>
-      <class name="com.sun.jna.Memory"/>
-      <class name="com.sun.jna.Native"/>
-      <class name="com.sun.jna.NativeLibrary"/>
-      <class name="com.sun.jna.CallbackReference"/>
-    </javah>
-    <condition property="grep" value="/usr/sfw/bin/ggrep">
-      <os name="SunOS"/>
-    </condition>
-    <condition property="grep" value="ggrep">
-      <os name="OpenBSD"/>
-    </condition>
-    <property name="grep" value="grep"/>
-    <apply dir="${build.native}" executable="${grep}" parallel="true"
-           failonerror="true" relative="true" output="${md5.file}">
-      <arg value="-A"/>
-      <arg value="1"/>
-      <arg value="JNIEXPORT"/>
-      <fileset dir="${build.native}" includes="*.h"/>
-    </apply>
-    <fixcrlf srcdir="${build.native}" includes="sig" eol="unix"/>
-    <checksum property="md5" file="${md5.file}" />
-    <condition property="jni.valid" value="true">
-      <or>
-        <equals arg1="${jni.md5}" arg2="${md5}" trim="true"/>
-        <equals arg1="${jni.md5}" arg2=""/>
-      </or>
-    </condition>
-  </target>
-
-  <!-- Invalidate native libraries when native API changes -->
-  <target name="-native-api-check" depends="javah" unless="jni.valid">
-    <echo>Invalidating native code, new checksum is ${md5}</echo>
-    <copy file="${dist}/out-of-date.jar" tofile="${dist}/darwin.jar" overwrite="true"/>
-    <copy file="${dist}/out-of-date.jar" tofile="${dist}/win32-x86.jar" overwrite="true"/>
-    <copy file="${dist}/out-of-date.jar" tofile="${dist}/win32-amd64.jar" overwrite="true"/>
-    <copy file="${dist}/out-of-date.jar" tofile="${dist}/linux-i386.jar" overwrite="true"/>
-    <copy file="${dist}/out-of-date.jar" tofile="${dist}/linux-amd64.jar" overwrite="true"/>
-    <copy file="${dist}/out-of-date.jar" tofile="${dist}/linux-ia64.jar" overwrite="true"/>
-    <copy file="${dist}/out-of-date.jar" tofile="${dist}/freebsd-i386.jar" overwrite="true"/>
-    <copy file="${dist}/out-of-date.jar" tofile="${dist}/freebsd-amd64.jar" overwrite="true"/>
-    <copy file="${dist}/out-of-date.jar" tofile="${dist}/openbsd-i386.jar" overwrite="true"/>
-    <copy file="${dist}/out-of-date.jar" tofile="${dist}/sunos-x86.jar" overwrite="true"/>
-    <copy file="${dist}/out-of-date.jar" tofile="${dist}/sunos-amd64.jar" overwrite="true"/>
-    <copy file="${dist}/out-of-date.jar" tofile="${dist}/sunos-sparc.jar" overwrite="true"/>
-    <copy file="${dist}/out-of-date.jar" tofile="${dist}/sunos-sparcv9.jar" overwrite="true"/>
-    <delete failOnError="false" includeEmptyDirs="true">
-      <fileset dir="${build.native}" includes="*.o,*jnidispatch*"/>
-    </delete>
-    <fail>API for native code has changed.  Re-run this build after updating jni.version and jni.md5 in build.xml</fail>
-  </target>
-
-  <target name=":rsrc">
-    <condition property="-rsrc">
-      <not><os family="windows"/></not>
-    </condition>
-  </target>
-  <target name="rsrc" depends="-setup,:rsrc" unless="-rsrc"
-          description="Generate w32 DLL version resource information">
-    <property name="rsrc" location="${build.native}/jnidispatch.rc"/>
-    <copy todir="${build.native}" file="${native}/jnidispatch.rc"/>
-    <replaceregexp match="FILEVERSION.*"
-                   replace="FILEVERSION ${jni.major},${jni.minor},${jni.revision},${jni.build}"
-                   file="${rsrc}" byline="true"/>
-    <replaceregexp match="PRODUCTVERSION.*"
-                   replace="PRODUCTVERSION ${jna.major},${jna.minor},${jna.revision},${jna.build}"
-                   file="${rsrc}" byline="true"/>
-    <replaceregexp match="FileVersion.*"
-                   replace="FileVersion&quot;,&quot;${jni.version}&quot;"
-                   file="${rsrc}" byline="true"/>
-    <replaceregexp match="Full Version.*"
-                   replace="Full Version&quot;,&quot;${jni.version} b${jni.build}&quot;"
-                   file="${rsrc}" byline="true"/>
-    <replaceregexp match="ProductVersion.*"
-                   replace="ProductVersion&quot;,&quot;${spec.version}&quot;"
-                   file="${rsrc}" byline="true"/>
-  </target>
-
-  <target name="native" depends="-setup,javah,-native-api-check,rsrc"
-          description="Build native libraries.  Use 'ant -DCC=xxx' to build using a compiler other than gcc">
-    <property name="comment" value="# auto-generated by ant"/>
-    <replaceregexp match="^VERSION=.*"
-                   replace="VERSION=${jni.version} ${comment}"
-                   file="native/Makefile" byline="true"/>
-    <replaceregexp match="^CHECKSUM=.*"
-                   replace="CHECKSUM=${jni.md5} ${comment}"
-                   file="native/Makefile" byline="true"/>
-    <!-- ensure ARCH is set properly for 64-bit capable platforms -->
-    <!-- use ANT_OPTS=-d64 to build 64-bit if not the platform default -->
-    <property name="ARCH" value="${os.arch}"/>
-    <condition property="make.CC" value="CC=${CC}" else="IGNORE=">
-      <isset property="CC"/>
-    </condition>
-    <condition property="make.ARCH" value="ARCH=${ARCH}" else="IGNORE=">
-      <isset property="ARCH"/>
-    </condition>
-    <condition property="make.SDKROOT" value="SDKROOT=${SDKROOT}">
-      <isset property="SDKROOT"/>
-    </condition>
-    <condition property="make.SDKROOT"
-	       value="SDKROOT=/Developer/SDKs/MacOSX10.5.sdk">
-      <available file="/Developer/SDKs/MacOSX10.5.sdk"/>
-    </condition>
-    <condition property="make.SDKROOT"
-	       value="SDKROOT=/Developer/SDKs/MacOSX10.4u.sdk" else="IGNORE=">
-      <available file="/Developer/SDKs/MacOSX10.4u.sdk"/>
-    </condition>
-    <!-- Windows' drive letters and spaces in absolute paths wreak havoc on 
-         make --> 
-    <condition property="make.BUILD" value="BUILD=../${build}/native" else="BUILD=${build.native}">
-      <os family="windows"/>
-    </condition>
-    <condition property="make.PATH" value="PATH=/usr/sfw/bin:/usr/bin:/usr/ccs/bin" else="IGNORE=">
-      <os name="SunOS"/>
-    </condition>
-    <condition property="make" value="/usr/sfw/bin/gmake">
-      <os name="SunOS"/>
-    </condition>
-    <condition property="make" value="gmake">
-      <or>
-        <os name="FreeBSD"/>
-        <os name="OpenBSD"/>
-      </or>
-    </condition>
-    <!-- Default make program -->
-    <property name="make" value="make"/>
-
-    <exec executable="${make}" dir="${native}" failonerror="true">
-      <arg value="JAVA_HOME=${jdk.home}"/>
-      <arg value="JAVAH=${build.native}"/>
-      <arg value="DEBUG=${debug.native}"/>
-      <arg value="CFLAGS_EXTRA=${cflags_extra.native}"/>
-      <arg value="DYNAMIC_LIBFFI=${dynlink.native}"/>
-      <arg value="${make.CC}"/>
-      <arg value="${make.BUILD}"/>
-      <arg value="${make.SDKROOT}"/>
-      <arg value="${make.ARCH}"/>
-      <arg value="${make.PATH}"/>
-      <arg value="VERSION=${jni.version}"/>
-      <arg value="CHECKSUM=${jni.md5}"/>
-    </exec>
-    <mkdir dir="${classes}/com/sun/jna/${os.prefix}"/>
-    <copy todir="${classes}/com/sun/jna/${os.prefix}">
-      <fileset dir="${build.native}"
-               includes="jnidispatch.dll,libjnidispatch.*"/>
-    </copy>
-    <mkdir dir="${eclipse.classes}/com/sun/jna/${os.prefix}"/>
-    <copy todir="${eclipse.classes}/com/sun/jna/${os.prefix}"
-          failonerror="false">
-      <fileset dir="${build.native}"
-               includes="jnidispatch.dll,libjnidispatch.*"/>
-    </copy>
-    <!-- For web start, native libraries may be provided in the root of -->
-    <!-- an included jar file -->
-    <jar jarfile="${build}/${native.jar}">
-      <fileset dir="${build.native}" includes="jnidispatch.dll,libjnidispatch.*"/>
-      <manifest>
-        <attribute name="Implementation-Version" value="${jni.version} b${jni.build}"/>
-        <attribute name="Specification-Version" value="${jni.version}"/>
-      </manifest>
-    </jar>
-  </target>
-
-  <target name="compile-tests" depends="compile,native,jar"
-          description="Compile all test code">
-    <javac classpathref="compile-test.path"
-           source="${test.compatibility}"
-           target="${test.compatibility}"
-           destdir="${test.classes}" 
-           deprecation="on" debug="${debug}">
-      <src path="${test.src}"/>
-    </javac>
-    <jar jarfile="${build}/${testjar}">
-      <fileset dir="${test.classes}">
-        <patternset refid="jar-compiled"/>
-      </fileset>
-    </jar>
-    <mkdir dir="${build}/jws"/>
-    <copy todir="${build}/jws" file="${build}/${jar}"/>
-    <copy todir="${build}/jws" file="${build}/${testjar}"/>
-    <copy todir="${build}/jws" file="lib/junit.jar"/>
-    <copy todir="${build}/jws" file="lib/clover.jar"/>
-    <jar jarfile="${build}/jws/jnidispatch.jar">
-      <fileset dir="${build.native}" includes="*jnidispatch.*"/>
-    </jar>
-    <signjar alias="jna" keystore="jna.keystore" storepass="jnadev" lazy="true"> 
-      <fileset dir="${build}/jws" includes="jna.jar,jna-test.jar,junit.jar,jnidispatch.jar,clover.jar"/>
-    </signjar>
-  </target>
-
-  <!-- When running tests from an IDE, be sure to set jna.library.path -->
-  <!-- to where the test library (testlib) is found.                   -->
-  <target name="test" depends="jar,examples,compile-tests"
-          description="Run all unit tests">
-    <property name="test.fork" value="yes"/>
-    <property name="reports.junit" location="${reports}/junit"/>
-    <property name="results.junit" location="${build}/junit-results"/>
-    <mkdir dir="${results.junit}"/>
-    <echo>Saving test results in ${results.junit}</echo>
-    <property name="tests.stdcall" value="**/win32/*StdCallTest.java"/>
-    <condition property="tests.platform" value="**/win32/*Test.java">
-      <os family="windows"/>
-    </condition>
-    <condition property="tests.exclude" value="**/win32/*StdCallTest.java">
-      <and><os family="windows"/><not><os arch="x86"/></not></and>
-    </condition>
-    <condition property="tests.platform" value="**/unix/*Test.java">
-      <and>
-        <os family="unix"/>
-        <not><os family="mac"/></not>
-      </and>
-    </condition>
-    <condition property="vmopt.arch" value="-d64" else="-Dignore">
-      <and>
-        <!-- Sun 64-bit VM for windows doesn't support the -d64 switch -->
-        <not><os family="windows"/></not>
-        <equals arg1="${vm.arch}" arg2="-d64" trim="true"/>
-      </and>
-    </condition>
-    <property name="tests.platform" value=""/>
-    <property name="tests.exclude" value=""/>
-    <junit printsummary="yes" fork="${test.fork}" failureproperty="testfailure">
-      <!-- avoid VM conflicts with JNA protected mode -->
-      <env key="${ld.preload}" file="${libjsig}"/>
-      <jvmarg value="-Djna.library.path=${build.native}"/>
-      <!-- Avoid VM crashes, if possible -->
-      <jvmarg value="-Djna.protected=true"/>
-      <jvmarg value="-Djna.builddir=${build}"/>
-      <jvmarg value="${vmopt.arch}"/>
-      <classpath><path refid="test.runpath"/></classpath>
-      <formatter type="xml"/>
-      <batchtest todir="${results.junit}">
-        <fileset dir="${test.src}">
-          <include name="com/sun/jna/*Test.java"/>
-          <include name="com/sun/jna/examples/*Test.java"/>
-          <include name="${tests.platform}"/>
-          <exclude name="${tests.exclude}"/>
-        </fileset>
-      </batchtest>
-    </junit>
-    <junitreport todir="${results.junit}">
-      <fileset dir="${results.junit}">
-        <include name="TEST-*.xml"/>
-      </fileset>
-      <report todir="${reports.junit}"/>
-    </junitreport>
-    <echo>View test report in file://${reports.junit}/index.html</echo>
-    <fail if="testfailure" unless="clover">One or more tests failed</fail>
-  </target>
-
-  <target name="with.clover" description="Enable code coverage for tests">
-    <taskdef resource="cloverlib.xml" classpath="lib/clover.jar"/>
-    <property name="clover" value="true"/>
-    <property name="build" value="build.clover"/>
-    <clover-setup/>
-  </target>
-
-  <target name="clover" depends="with.clover,test"
-          description="Generate test code coverage reports">
-    <property name="reports.clover" value="${reports}/clover"/>
-    <mkdir dir="${reports.clover}"/>
-    <clover-report>
-      <current outfile="${reports.clover}" title="clover">
-        <fileset dir="." includes="**/*.java" excludes="**/examples/**/*.java"/>
-        <testresults dir="${results.junit}" includes="TEST-*.xml"/>
-        <format type="html"/>
-      </current>
-    </clover-report>
-    <echo>Reports generated in ${reports.clover}</echo>
-  </target>
-
-  <target name="javadoc" depends="-setup">
-    <property name="header"
-              value="&lt;b&gt;JNA API&lt;/&gt;&lt;font size=&quot;-1&quot;&gt; ${jna.version}&lt;/font&gt;"/>
-    <property name="footer"
-              value="&lt;center&gt;&lt;i&gt;${copyright}&lt;/i&gt;&lt;/center&gt;"/>
-
-    <mkdir dir="${javadoc}"/>
-    <javadoc package="true"
-             windowtitle="JNA API"
-             sourcepathref="src.path"
-             classpathref="compile.path"
-             maxmemory="256m"
-             packagenames="com.sun.jna,com.sun.jna.ptr,com.sun.jna.types,com.sun.jna.examples,com.sun.jna.examples.win32,com.sun.jna.exmaples.unix"
-             overview="${src}/com/sun/jna/overview.html"
-             destdir="${javadoc}">
-      <!-- stylesheetfile="${stylesheet}" -->
-      <doctitle>JNA API Documentation</doctitle>
-      <header>${header}</header>
-      <bottom>${footer}</bottom>
-      <link href="http://java.sun.com/j2se/1.4.2/docs/api/"/>
-
-      <packageset dir="${src}" defaultexcludes="yes">
-        <patternset>
-          <include name="com/sun/jna/**/*"/>
-        </patternset>
-      </packageset>
-
-      <group title="Java Native Access" packages="com.sun.jna,com.sun.jna.ptr,com.sun.jna.types,com.sun.jna.win32"/>
-      <group title="Examples" packages="com.sun.jna.examples,com.sun.jna.examples.dnd"/>
-      <group title="Unix Examples" packages="com.sun.jna.examples.unix"/>
-      <group title="Windows Examples" packages="com.sun.jna.examples.win32"/>
-
-      <arg value="-notimestamp"/>
-    </javadoc>
-  </target>
-
-  <target name="dist" depends="jar,compile-tests,native,examples,javadoc"
-          description="Build distribution files">
-    <jar jarfile="${dist}/jna.jar" duplicate="preserve">
-      <manifest>
-        <attribute name="Main-Class" value="com.sun.jna.Native"/>
-        <section name="com/sun/jna/">
-          <attribute name="Implementation-Title" value="${impl.title}"/>
-          <attribute name="Implementation-Vendor" value="${vendor}"/>
-          <attribute name="Implementation-Version" value="${impl.version}"/>
-          <attribute name="Specification-Title" value="${spec.title}"/>
-          <attribute name="Specification-Vendor" value="${spec.vendor}"/>
-          <attribute name="Specification-Version" value="${spec.version}"/>
-        </section>
-      </manifest>
-      <zipfileset src="${build}/${jar}"/>
-      <zipfileset src="${dist}/win32-x86.jar" 
-                  includes="*jnidispatch*"
-                  prefix="com/sun/jna/win32-x86"/>
-      <zipfileset src="${dist}/darwin.jar" 
-                  includes="*jnidispatch*"
-                  prefix="com/sun/jna/darwin"/>
-      <zipfileset src="${dist}/linux-i386.jar" 
-                  includes="*jnidispatch*"
-                  prefix="com/sun/jna/linux-i386"/>
-      <zipfileset src="${dist}/linux-amd64.jar" 
-                  includes="*jnidispatch*"
-                  prefix="com/sun/jna/linux-amd64"/>
-      <zipfileset src="${dist}/linux-ia64.jar" 
-                  includes="*jnidispatch*"
-                  prefix="com/sun/jna/linux-ia64"/>
-      <zipfileset src="${dist}/sunos-x86.jar" 
-                  includes="*jnidispatch*"
-                  prefix="com/sun/jna/sunos-x86"/>
-      <zipfileset src="${dist}/sunos-amd64.jar" 
-                  includes="*jnidispatch*"
-                  prefix="com/sun/jna/sunos-amd64"/>
-      <zipfileset src="${dist}/sunos-sparc.jar" 
-                  includes="*jnidispatch*"
-                  prefix="com/sun/jna/sunos-sparc"/>
-      <zipfileset src="${dist}/sunos-sparcv9.jar" 
-                  includes="*jnidispatch*"
-                  prefix="com/sun/jna/sunos-sparcv9"/>
-      <zipfileset src="${dist}/freebsd-i386.jar" 
-                  includes="*jnidispatch*"
-                  prefix="com/sun/jna/freebsd-i386"/>
-      <zipfileset src="${dist}/freebsd-amd64.jar" 
-                  includes="*jnidispatch*"
-                  prefix="com/sun/jna/freebsd-amd64"/>
-      <zipfileset src="${dist}/openbsd-i386.jar" 
-                  includes="*jnidispatch*"
-                  prefix="com/sun/jna/openbsd-i386"/>
-      <zipfileset src="${dist}/win32-amd64.jar" 
-                  includes="*jnidispatch*"
-                  prefix="com/sun/jna/win32-amd64"/>
-    </jar>
-    <copy todir="${dist}">
-      <fileset dir="${build}">
-        <include name="${native.jar}"/>
-        <include name="examples.jar"/>
-      </fileset>
-    </copy>
-    <zip zipfile="${dist}/doc.zip">
-      <zipfileset dir="${javadoc}" prefix="javadoc"/>
-    </zip>
-    <!-- JNA sources only, for use in Linux build from source/shared libffi -->
-    <zip zipfile="${dist}/src.zip">
-      <zipfileset dir="." includes="build.xml,LICENSE.txt"/>
-      <zipfileset dir="${src}" includes="**/*.java" prefix="src"/>
-      <zipfileset dir="${test.src}" includes="**/*.java" prefix="test"/>
-      <zipfileset dir="${native}" excludes="libffi,libffi/**/*" prefix="native"/>
-    </zip>
-    <!-- Full sources required to build and test everything -->
-    <zip zipfile="${dist}/src-full.zip">
-      <zipfileset src="${dist}/src.zip"/>
-      <zipfileset dir="lib" includes="junit.jar,clover.jar" prefix="lib"/>
-      <zipfileset dir="." includes=".classpath,.project"/>
-      <zipfileset dir="nbproject" includes="**/*" prefix="nbproject"/>
-      <zipfileset dir="${native}" includes="libffi,libffi/**/*" prefix="native"/>
-    </zip>
-    <!-- Sources package as required by maven -->
-    <zip zipfile="${dist}/src-mvn.zip">
-      <zipfileset dir="${src}" includes="**/*.java,**/*.html,**/*.png"/>
-    </zip>
-  </target>
-
-  <target name="clean" depends="-dynamic-properties">
-    <delete failOnError="false" includeEmptyDirs="true">
-      <fileset dir="${build}"/>
-    </delete>
-    <delete quiet="true" includeEmptyDirs="true">
-      <fileset dir=".clover"/>
-      <fileset dir="${javadoc}"/>
-      <fileset dir="." includes="*~,**/*~"/>
-    </delete>
-  </target>
-
-</project>
-
-

=== removed directory '.pc/02-builddir.patch'
=== removed file '.pc/02-builddir.patch/build.xml'
--- .pc/02-builddir.patch/build.xml	2010-04-21 16:36:37 +0000
+++ .pc/02-builddir.patch/build.xml	1970-01-01 00:00:00 +0000
@@ -1,643 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="JNA" default="default" basedir=".">
-  <description>Builds and tests JNA</description>
-
-  <!--  
-  Conventions (since ant can't easily specify arbitrary file dependencies):
-  The uptodate property for a given target TARGET is "-TARGET"; the actual
-  target to generate the uptodate property is named ":TARGET".
-
-  Properties (except for uptodate properties) separate words by dots, targets
-  by dashes. 
-  -->
-
-  <!-- global properties -->
-  <!-- (all build-related props should go in -dynamic-properties) -->
-  <property name="name" value="jna"/>
-  <property name="jar" value="${name}.jar"/>
-  <property name="testjar" value="${name}-test.jar"/>
-  <property name="debug" value="true"/>
-  <property name="debug.native" value="false"/>
-  <property name="cflags_extra.native" value=""/>
-  <property name="dynlink.native" value="false"/>
-  <property name="native" location="native"/>
-  <property name="src" location="src"/>
-  <property name="dist" location="dist"/>
-  <property name="test.src" location="test"/>
-  <property name="doc" location="doc"/>
-  <property name="javadoc" location="${doc}/javadoc"/>
-  <property name="stylesheet" location="${javadoc}/doc/css/javadoc.css"/>
-  <property name="vendor" value="JNA Development Team"/>
-  <property name="copyright"
-            value="Copyright &amp;copy; 2007-2009 Timothy Wall. All Rights Reserved."/>
-  <buildnumber/>
-  <!-- JNA library release version -->            
-  <property name="jna.major" value="3"/>
-  <property name="jna.minor" value="2"/>
-  <property name="jna.revision" value="4"/>
-  <property name="jna.build" value="${build.number}"/>
-  <property name="jna.version" value="${jna.major}.${jna.minor}.${jna.revision}"/>
-  <!-- jnidispatch library release version -->
-  <property name="jni.major" value="3"/>
-  <property name="jni.minor" value="2"/>
-  <property name="jni.revision" value="1"/>
-  <property name="jni.build" value="${build.number}"/>
-  <property name="jni.version" value="${jni.major}.${jni.minor}.${jni.revision}"/>
-  <property name="jni.md5" value="c870290c36c8d3fdf85db7c782febc3f"/>
-  <property name="spec.title" value="Java Native Access (JNA)"/>
-  <property name="spec.vendor" value="${vendor}"/>
-  <property name="spec.version" value="${jna.major}"/>
-  <property name="impl.title" value="com.sun.jna"/>
-  <property name="impl.vendor" value="${spec.vendor}"/>
-  <property name="impl.version" value="${jna.version} (b${jna.build})"/>
-
-  <property name="compatibility" value="1.4"/>
-  <property name="test.compatibility" value="1.5"/>
-
-  <!-- Miscellaneous -->
-  <property name="build.compiler.emacs" value="true"/>
-
-  <target name="default" depends="test" description="Build and Test."/>
-
-  <target name="init" depends="-setup"/>
-  <target name="compile-test-single" depends="compile-tests"/>
-  <target name="compile-single" depends="compile"/>
-
-  <target name="-dynamic-properties">
-    <echo>Java version ${java.version}, compatibility: ${compatibility}</echo>
-    <echo>JNA version ${jna.version}, native ${jni.version}</echo>
-    <echo>${java.vm.name} (${java.vm.vendor}, ${java.vm.version})</echo>
-    <echo>java.home=${java.home}</echo>
-    <echo>java.library.path=${java.library.path}</echo>
-
-    <replaceregexp match="(&lt;version&gt;).*(&lt;/version&gt;)"
-                   replace="\1${jna.version}\2" 
-                   file="pom.xml"/>
-    <replaceregexp match='VERSION = ".*";'
-                   replace='VERSION = "${jna.version}";'
-                   file="src/com/sun/jna/Native.java"/>
-
-    <condition property="jar.omitted" value="**/*jnidispatch*" else="jnilib-included">
-      <isset property="omit-jnilib"/>
-    </condition>
-    <condition property="vm.arch" value="-d64" else="">
-      <or>
-        <equals arg1="${sun.arch.data.model}" arg2="64" trim="true"/>
-        <equals arg1="${com.ibm.vm.bitmode}" arg2="64" trim="true"/>
-        <os arch="x86_64"/>
-        <os arch="ppc64"/>
-        <os arch="sparcv9"/>
-        <os arch="amd64"/>
-      </or>
-    </condition>
-    <condition property="ld.preload" value="LD_PRELOAD_64" else="LD_PRELOAD">
-      <and>
-        <os name="SunOS"/>
-        <equals arg1="${vm.arch}" arg2="-d64"/>
-      </and>
-    </condition>
-    <property name="build" value="build${vm.arch}"/>
-    <property name="classes" location="${build}/classes"/>
-    <property name="eclipse.classes" location="build.eclipse/classes"/>
-    <property name="test.classes" location="${build}/test-classes"/>
-    <property name="reports" value="${build}/reports"/>
-
-    <!-- Add other supported platforms here -->
-    <condition property="jre.arch" value="i386">
-      <equals arg1="x86" arg2="${os.arch}"/>
-    </condition>
-    <condition property="jre.arch" value="amd64">
-      <equals arg1="x86_64" arg2="${os.arch}"/>
-    </condition>
-    <property name="jre.arch" value="${os.arch}"/>
-    <condition property="os.prefix" value="linux-${jre.arch}">
-      <os name="Linux"/>
-    </condition>
-    <condition property="os.prefix" value="win32-${os.arch}">
-      <os family="windows"/>
-    </condition>
-    <!-- Darwin builds are universal, no arch required -->
-    <condition property="os.prefix" value="darwin">
-      <os family="mac"/>
-    </condition>
-    <condition property="os.prefix" value="sunos-${os.arch}">
-      <os name="SunOS"/>
-    </condition>
-    <condition property="os.prefix" value="freebsd-${os.arch}">
-      <os name="FreeBSD"/>
-    </condition>
-    <condition property="os.prefix" value="openbsd-${os.arch}">
-      <os name="OpenBSD"/>
-    </condition>
-    <fail unless="os.prefix" message="OS/arch not supported (${os.name}/${os.arch}), edit build.xml and native/Makefile to add it."/>
-    <condition property="jdk.home" value="${java.home}">
-      <available file="${java.home}/include"/>
-    </condition>
-    <condition property="jdk.home" value="${java.home}/..">
-      <available file="${java.home}/../include"/>
-    </condition>
-    <fail unless="jdk.home" message="JAVA_HOME/java.home must be a JDK, not JRE"/>
-    <condition property="libjsig"
-               value="${java.home}/lib/${jre.arch}/libjsig.so" else="">
-      <available file="${java.home}/lib/${jre.arch}/libjsig.so"/>
-    </condition>
-    <property name="native.jar" value="${os.prefix}.jar"/>
-    <property name="build.native" location="${build}/native"/>
-    <property name="md5.file" location="${build.native}/sig"/>
-
-    <mkdir dir="${build}"/>
-    <mkdir dir="${build.native}"/>
-    <mkdir dir="${classes}"/>
-    <mkdir dir="${test.classes}"/>
-    <mkdir dir="${reports}"/>
-    <mkdir dir="${doc}"/>
-
-  </target>
-
-  <target name="-setup" depends="-dynamic-properties">
-    <path id="compile-test.path">
-      <pathelement path="${test.src}"/>
-      <path id="test.libs">
-        <fileset dir="lib">
-          <include name="junit.jar"/>   
-        </fileset>
-        <pathelement path="${classes}"/>
-      </path>
-      <path id="compile.path">
-        <path id="src.path">
-          <pathelement location="${src}"/>
-        </path>
-      </path>                           
-    </path>                           
-
-    <path id="test.runpath">
-      <pathelement path="${build}/${jar}"/>
-      <pathelement path="${build}/examples.jar"/>
-      <pathelement path="${test.classes}"/>
-      <pathelement path="lib/clover.jar"/>
-      <path refid="test.libs"/>
-    </path>
-  </target>
-
-  <target name="compile" depends="-setup"
-          description="Compile all Java source">
-    <javac classpathref="compile.path"
-           source="${compatibility}"
-           target="${compatibility}"
-           destdir="${classes}" 
-           deprecation="on" debug="${debug}">
-      <src path="${src}"/>
-    </javac>
-  </target>
-
-  <target name=":jar">
-    <uptodate property="-jar" targetfile="${build}/${jar}">
-      <srcfiles dir="${classes}">
-        <patternset id="jar-compiled">
-          <include name="com/sun/jna/*"/>
-          <include name="com/sun/jna/**/*"/>
-          <exclude name="com/sun/jna/examples/*"/>
-          <exclude name="com/sun/jna/examples/**/*"/>
-        </patternset>
-      </srcfiles>
-    </uptodate>
-  </target>
-  <target name="jar" depends="-setup,native,:jar" unless="-jar"
-          description="Build primary jar">
-    <jar jarfile="${build}/${jar}">
-      <manifest>
-        <attribute name="Main-Class" value="com.sun.jna.Native"/>
-        <section name="com/sun/jna/">
-          <attribute name="Implementation-Title" value="${impl.title}"/>
-          <attribute name="Implementation-Vendor" value="${vendor}"/>
-          <attribute name="Implementation-Version" value="${impl.version}"/>
-          <attribute name="Specification-Title" value="${spec.title}"/>
-          <attribute name="Specification-Vendor" value="${spec.vendor}"/>
-          <attribute name="Specification-Version" value="${spec.version}"/>
-        </section>
-      </manifest>
-      <fileset dir="${classes}" excludes="${jar.omitted}">
-        <patternset refid="jar-compiled"/>
-      </fileset>
-    </jar>
-  </target>
-  <target name="examples" depends="jar,native">
-    <jar jarfile="${build}/examples.jar">
-      <manifest>
-        <attribute name="Class-Path" value="jna.jar"/>
-        <attribute name="Main-Class" value="com.sun.jna.examples.ShapedWindowDemo"/>
-      </manifest>
-      <fileset dir="${src}" includes="**/examples/**/*.png"/>
-      <fileset dir="${classes}" includes="**/examples/*,**/examples/**/*"/>
-      <fileset dir="${classes}" includes="jnidispatch.dll"/>
-    </jar>
-  </target>
-
-  <target name="javah" depends="compile">
-    <javah classpath="${classes}" destdir="${build.native}" force="yes">
-      <class name="com.sun.jna.Function"/>
-      <class name="com.sun.jna.Pointer"/>
-      <class name="com.sun.jna.Memory"/>
-      <class name="com.sun.jna.Native"/>
-      <class name="com.sun.jna.NativeLibrary"/>
-      <class name="com.sun.jna.CallbackReference"/>
-    </javah>
-    <condition property="grep" value="/usr/sfw/bin/ggrep">
-      <os name="SunOS"/>
-    </condition>
-    <condition property="grep" value="ggrep">
-      <os name="OpenBSD"/>
-    </condition>
-    <property name="grep" value="grep"/>
-    <apply dir="${build.native}" executable="${grep}" parallel="true"
-           failonerror="true" relative="true" output="${md5.file}">
-      <arg value="-A"/>
-      <arg value="1"/>
-      <arg value="JNIEXPORT"/>
-      <fileset dir="${build.native}" includes="*.h"/>
-    </apply>
-    <fixcrlf srcdir="${build.native}" includes="sig" eol="unix"/>
-    <checksum property="md5" file="${md5.file}" />
-    <condition property="jni.valid" value="true">
-      <or>
-        <equals arg1="${jni.md5}" arg2="${md5}" trim="true"/>
-        <equals arg1="${jni.md5}" arg2=""/>
-      </or>
-    </condition>
-  </target>
-
-  <!-- Invalidate native libraries when native API changes -->
-  <target name="-native-api-check" depends="javah" unless="jni.valid">
-    <echo>Invalidating native code, new checksum is ${md5}</echo>
-    <copy file="${dist}/out-of-date.jar" tofile="${dist}/darwin.jar" overwrite="true"/>
-    <copy file="${dist}/out-of-date.jar" tofile="${dist}/win32-x86.jar" overwrite="true"/>
-    <copy file="${dist}/out-of-date.jar" tofile="${dist}/win32-amd64.jar" overwrite="true"/>
-    <copy file="${dist}/out-of-date.jar" tofile="${dist}/linux-i386.jar" overwrite="true"/>
-    <copy file="${dist}/out-of-date.jar" tofile="${dist}/linux-amd64.jar" overwrite="true"/>
-    <copy file="${dist}/out-of-date.jar" tofile="${dist}/linux-ia64.jar" overwrite="true"/>
-    <copy file="${dist}/out-of-date.jar" tofile="${dist}/freebsd-i386.jar" overwrite="true"/>
-    <copy file="${dist}/out-of-date.jar" tofile="${dist}/freebsd-amd64.jar" overwrite="true"/>
-    <copy file="${dist}/out-of-date.jar" tofile="${dist}/openbsd-i386.jar" overwrite="true"/>
-    <copy file="${dist}/out-of-date.jar" tofile="${dist}/sunos-x86.jar" overwrite="true"/>
-    <copy file="${dist}/out-of-date.jar" tofile="${dist}/sunos-amd64.jar" overwrite="true"/>
-    <copy file="${dist}/out-of-date.jar" tofile="${dist}/sunos-sparc.jar" overwrite="true"/>
-    <copy file="${dist}/out-of-date.jar" tofile="${dist}/sunos-sparcv9.jar" overwrite="true"/>
-    <delete failOnError="false" includeEmptyDirs="true">
-      <fileset dir="${build.native}" includes="*.o,*jnidispatch*"/>
-    </delete>
-    <fail>API for native code has changed.  Re-run this build after updating jni.version and jni.md5 in build.xml</fail>
-  </target>
-
-  <target name=":rsrc">
-    <condition property="-rsrc">
-      <not><os family="windows"/></not>
-    </condition>
-  </target>
-  <target name="rsrc" depends="-setup,:rsrc" unless="-rsrc"
-          description="Generate w32 DLL version resource information">
-    <property name="rsrc" location="${build.native}/jnidispatch.rc"/>
-    <copy todir="${build.native}" file="${native}/jnidispatch.rc"/>
-    <replaceregexp match="FILEVERSION.*"
-                   replace="FILEVERSION ${jni.major},${jni.minor},${jni.revision},${jni.build}"
-                   file="${rsrc}" byline="true"/>
-    <replaceregexp match="PRODUCTVERSION.*"
-                   replace="PRODUCTVERSION ${jna.major},${jna.minor},${jna.revision},${jna.build}"
-                   file="${rsrc}" byline="true"/>
-    <replaceregexp match="FileVersion.*"
-                   replace="FileVersion&quot;,&quot;${jni.version}&quot;"
-                   file="${rsrc}" byline="true"/>
-    <replaceregexp match="Full Version.*"
-                   replace="Full Version&quot;,&quot;${jni.version} b${jni.build}&quot;"
-                   file="${rsrc}" byline="true"/>
-    <replaceregexp match="ProductVersion.*"
-                   replace="ProductVersion&quot;,&quot;${spec.version}&quot;"
-                   file="${rsrc}" byline="true"/>
-  </target>
-
-  <target name="native" depends="-setup,javah,-native-api-check,rsrc"
-          description="Build native libraries.  Use 'ant -DCC=xxx' to build using a compiler other than gcc">
-    <property name="comment" value="# auto-generated by ant"/>
-    <replaceregexp match="^VERSION=.*"
-                   replace="VERSION=${jni.version} ${comment}"
-                   file="native/Makefile" byline="true"/>
-    <replaceregexp match="^CHECKSUM=.*"
-                   replace="CHECKSUM=${jni.md5} ${comment}"
-                   file="native/Makefile" byline="true"/>
-    <!-- ensure ARCH is set properly for 64-bit capable platforms -->
-    <!-- use ANT_OPTS=-d64 to build 64-bit if not the platform default -->
-    <property name="ARCH" value="${os.arch}"/>
-    <condition property="make.CC" value="CC=${CC}" else="IGNORE=">
-      <isset property="CC"/>
-    </condition>
-    <condition property="make.ARCH" value="ARCH=${ARCH}" else="IGNORE=">
-      <isset property="ARCH"/>
-    </condition>
-    <condition property="make.SDKROOT" value="SDKROOT=${SDKROOT}">
-      <isset property="SDKROOT"/>
-    </condition>
-    <condition property="make.SDKROOT"
-	       value="SDKROOT=/Developer/SDKs/MacOSX10.5.sdk">
-      <available file="/Developer/SDKs/MacOSX10.5.sdk"/>
-    </condition>
-    <condition property="make.SDKROOT"
-	       value="SDKROOT=/Developer/SDKs/MacOSX10.4u.sdk" else="IGNORE=">
-      <available file="/Developer/SDKs/MacOSX10.4u.sdk"/>
-    </condition>
-    <!-- Windows' drive letters and spaces in absolute paths wreak havoc on 
-         make --> 
-    <condition property="make.BUILD" value="BUILD=../${build}/native" else="BUILD=${build.native}">
-      <os family="windows"/>
-    </condition>
-    <condition property="make.PATH" value="PATH=/usr/sfw/bin:/usr/bin:/usr/ccs/bin" else="IGNORE=">
-      <os name="SunOS"/>
-    </condition>
-    <condition property="make" value="/usr/sfw/bin/gmake">
-      <os name="SunOS"/>
-    </condition>
-    <condition property="make" value="gmake">
-      <or>
-        <os name="FreeBSD"/>
-        <os name="OpenBSD"/>
-      </or>
-    </condition>
-    <!-- Default make program -->
-    <property name="make" value="make"/>
-
-    <exec executable="${make}" dir="${native}" failonerror="true">
-      <arg value="JAVA_HOME=${jdk.home}"/>
-      <arg value="JAVAH=${build.native}"/>
-      <arg value="DEBUG=${debug.native}"/>
-      <arg value="CFLAGS_EXTRA=${cflags_extra.native}"/>
-      <arg value="DYNAMIC_LIBFFI=${dynlink.native}"/>
-      <arg value="${make.CC}"/>
-      <arg value="${make.BUILD}"/>
-      <arg value="${make.SDKROOT}"/>
-      <arg value="${make.ARCH}"/>
-      <arg value="${make.PATH}"/>
-      <arg value="VERSION=${jni.version}"/>
-      <arg value="CHECKSUM=${jni.md5}"/>
-    </exec>
-    <mkdir dir="${classes}/com/sun/jna/${os.prefix}"/>
-    <copy todir="${classes}/com/sun/jna/${os.prefix}">
-      <fileset dir="${build.native}"
-               includes="jnidispatch.dll,libjnidispatch.*"/>
-    </copy>
-    <mkdir dir="${eclipse.classes}/com/sun/jna/${os.prefix}"/>
-    <copy todir="${eclipse.classes}/com/sun/jna/${os.prefix}"
-          failonerror="false">
-      <fileset dir="${build.native}"
-               includes="jnidispatch.dll,libjnidispatch.*"/>
-    </copy>
-    <!-- For web start, native libraries may be provided in the root of -->
-    <!-- an included jar file -->
-    <jar jarfile="${build}/${native.jar}">
-      <fileset dir="${build.native}" includes="jnidispatch.dll,libjnidispatch.*"/>
-      <manifest>
-        <attribute name="Implementation-Version" value="${jni.version} b${jni.build}"/>
-        <attribute name="Specification-Version" value="${jni.version}"/>
-      </manifest>
-    </jar>
-  </target>
-
-  <target name="compile-tests" depends="compile,native,jar"
-          description="Compile all test code">
-    <javac classpathref="compile-test.path"
-           source="${test.compatibility}"
-           target="${test.compatibility}"
-           destdir="${test.classes}" 
-           deprecation="on" debug="${debug}">
-      <src path="${test.src}"/>
-    </javac>
-    <jar jarfile="${build}/${testjar}">
-      <fileset dir="${test.classes}">
-        <patternset refid="jar-compiled"/>
-      </fileset>
-    </jar>
-    <mkdir dir="${build}/jws"/>
-    <copy todir="${build}/jws" file="${build}/${jar}"/>
-    <copy todir="${build}/jws" file="${build}/${testjar}"/>
-    <copy todir="${build}/jws" file="lib/junit.jar"/>
-    <copy todir="${build}/jws" file="lib/clover.jar"/>
-    <jar jarfile="${build}/jws/jnidispatch.jar">
-      <fileset dir="${build.native}" includes="*jnidispatch.*"/>
-    </jar>
-    <signjar alias="jna" keystore="jna.keystore" storepass="jnadev" lazy="true"> 
-      <fileset dir="${build}/jws" includes="jna.jar,jna-test.jar,junit.jar,jnidispatch.jar,clover.jar"/>
-    </signjar>
-  </target>
-
-  <!-- When running tests from an IDE, be sure to set jna.library.path -->
-  <!-- to where the test library (testlib) is found.                   -->
-  <target name="test" depends="jar,examples,compile-tests"
-          description="Run all unit tests">
-    <property name="test.fork" value="yes"/>
-    <property name="reports.junit" location="${reports}/junit"/>
-    <property name="results.junit" location="${build}/junit-results"/>
-    <mkdir dir="${results.junit}"/>
-    <echo>Saving test results in ${results.junit}</echo>
-    <property name="tests.stdcall" value="**/win32/*StdCallTest.java"/>
-    <condition property="tests.platform" value="**/win32/*Test.java">
-      <os family="windows"/>
-    </condition>
-    <condition property="tests.exclude" value="**/win32/*StdCallTest.java">
-      <and><os family="windows"/><not><os arch="x86"/></not></and>
-    </condition>
-    <condition property="tests.platform" value="**/unix/*Test.java">
-      <and>
-        <os family="unix"/>
-        <not><os family="mac"/></not>
-      </and>
-    </condition>
-    <condition property="vmopt.arch" value="-d64" else="-Dignore">
-      <and>
-        <!-- Sun 64-bit VM for windows doesn't support the -d64 switch -->
-        <not><os family="windows"/></not>
-        <equals arg1="${vm.arch}" arg2="-d64" trim="true"/>
-      </and>
-    </condition>
-    <property name="tests.platform" value=""/>
-    <property name="tests.exclude" value=""/>
-    <junit printsummary="yes" fork="${test.fork}" failureproperty="testfailure">
-      <!-- avoid VM conflicts with JNA protected mode -->
-      <env key="${ld.preload}" file="${libjsig}"/>
-      <jvmarg value="-Djna.library.path=${build.native}"/>
-      <!-- Avoid VM crashes, if possible -->
-      <jvmarg value="-Djna.protected=true"/>
-      <jvmarg value="-Djna.builddir=${build}"/>
-      <jvmarg value="${vmopt.arch}"/>
-      <classpath><path refid="test.runpath"/></classpath>
-      <formatter type="xml"/>
-      <batchtest todir="${results.junit}">
-        <fileset dir="${test.src}">
-          <include name="com/sun/jna/*Test.java"/>
-          <include name="com/sun/jna/examples/*Test.java"/>
-          <include name="${tests.platform}"/>
-          <exclude name="${tests.exclude}"/>
-        </fileset>
-      </batchtest>
-    </junit>
-    <junitreport todir="${results.junit}">
-      <fileset dir="${results.junit}">
-        <include name="TEST-*.xml"/>
-      </fileset>
-      <report todir="${reports.junit}"/>
-    </junitreport>
-    <echo>View test report in file://${reports.junit}/index.html</echo>
-    <fail if="testfailure" unless="clover">One or more tests failed</fail>
-  </target>
-
-  <target name="with.clover" description="Enable code coverage for tests">
-    <taskdef resource="cloverlib.xml" classpath="lib/clover.jar"/>
-    <property name="clover" value="true"/>
-    <property name="build" value="build.clover"/>
-    <clover-setup/>
-  </target>
-
-  <target name="clover" depends="with.clover,test"
-          description="Generate test code coverage reports">
-    <property name="reports.clover" value="${reports}/clover"/>
-    <mkdir dir="${reports.clover}"/>
-    <clover-report>
-      <current outfile="${reports.clover}" title="clover">
-        <fileset dir="." includes="**/*.java" excludes="**/examples/**/*.java"/>
-        <testresults dir="${results.junit}" includes="TEST-*.xml"/>
-        <format type="html"/>
-      </current>
-    </clover-report>
-    <echo>Reports generated in ${reports.clover}</echo>
-  </target>
-
-  <target name="javadoc" depends="-setup">
-    <property name="header"
-              value="&lt;b&gt;JNA API&lt;/&gt;&lt;font size=&quot;-1&quot;&gt; ${jna.version}&lt;/font&gt;"/>
-    <property name="footer"
-              value="&lt;center&gt;&lt;i&gt;${copyright}&lt;/i&gt;&lt;/center&gt;"/>
-
-    <mkdir dir="${javadoc}"/>
-    <javadoc package="true"
-             windowtitle="JNA API"
-             sourcepathref="src.path"
-             classpathref="compile.path"
-             maxmemory="256m"
-             packagenames="com.sun.jna,com.sun.jna.ptr,com.sun.jna.types,com.sun.jna.examples,com.sun.jna.examples.win32,com.sun.jna.exmaples.unix"
-             overview="${src}/com/sun/jna/overview.html"
-             destdir="${javadoc}">
-      <!-- stylesheetfile="${stylesheet}" -->
-      <doctitle>JNA API Documentation</doctitle>
-      <header>${header}</header>
-      <bottom>${footer}</bottom>
-      <link href="http://java.sun.com/j2se/1.4.2/docs/api/"/>
-
-      <packageset dir="${src}" defaultexcludes="yes">
-        <patternset>
-          <include name="com/sun/jna/**/*"/>
-        </patternset>
-      </packageset>
-
-      <group title="Java Native Access" packages="com.sun.jna,com.sun.jna.ptr,com.sun.jna.types,com.sun.jna.win32"/>
-      <group title="Examples" packages="com.sun.jna.examples,com.sun.jna.examples.dnd"/>
-      <group title="Unix Examples" packages="com.sun.jna.examples.unix"/>
-      <group title="Windows Examples" packages="com.sun.jna.examples.win32"/>
-
-      <arg value="-notimestamp"/>
-    </javadoc>
-  </target>
-
-  <target name="dist" depends="jar,compile-tests,native,examples,javadoc"
-          description="Build distribution files">
-    <jar jarfile="${dist}/jna.jar" duplicate="preserve">
-      <manifest>
-        <attribute name="Main-Class" value="com.sun.jna.Native"/>
-        <section name="com/sun/jna/">
-          <attribute name="Implementation-Title" value="${impl.title}"/>
-          <attribute name="Implementation-Vendor" value="${vendor}"/>
-          <attribute name="Implementation-Version" value="${impl.version}"/>
-          <attribute name="Specification-Title" value="${spec.title}"/>
-          <attribute name="Specification-Vendor" value="${spec.vendor}"/>
-          <attribute name="Specification-Version" value="${spec.version}"/>
-        </section>
-      </manifest>
-      <zipfileset src="${build}/${jar}"/>
-      <zipfileset src="${dist}/win32-x86.jar" 
-                  includes="*jnidispatch*"
-                  prefix="com/sun/jna/win32-x86"/>
-      <zipfileset src="${dist}/darwin.jar" 
-                  includes="*jnidispatch*"
-                  prefix="com/sun/jna/darwin"/>
-      <zipfileset src="${dist}/linux-i386.jar" 
-                  includes="*jnidispatch*"
-                  prefix="com/sun/jna/linux-i386"/>
-      <zipfileset src="${dist}/linux-amd64.jar" 
-                  includes="*jnidispatch*"
-                  prefix="com/sun/jna/linux-amd64"/>
-      <zipfileset src="${dist}/linux-ia64.jar" 
-                  includes="*jnidispatch*"
-                  prefix="com/sun/jna/linux-ia64"/>
-      <zipfileset src="${dist}/sunos-x86.jar" 
-                  includes="*jnidispatch*"
-                  prefix="com/sun/jna/sunos-x86"/>
-      <zipfileset src="${dist}/sunos-amd64.jar" 
-                  includes="*jnidispatch*"
-                  prefix="com/sun/jna/sunos-amd64"/>
-      <zipfileset src="${dist}/sunos-sparc.jar" 
-                  includes="*jnidispatch*"
-                  prefix="com/sun/jna/sunos-sparc"/>
-      <zipfileset src="${dist}/sunos-sparcv9.jar" 
-                  includes="*jnidispatch*"
-                  prefix="com/sun/jna/sunos-sparcv9"/>
-      <zipfileset src="${dist}/freebsd-i386.jar" 
-                  includes="*jnidispatch*"
-                  prefix="com/sun/jna/freebsd-i386"/>
-      <zipfileset src="${dist}/freebsd-amd64.jar" 
-                  includes="*jnidispatch*"
-                  prefix="com/sun/jna/freebsd-amd64"/>
-      <zipfileset src="${dist}/openbsd-i386.jar" 
-                  includes="*jnidispatch*"
-                  prefix="com/sun/jna/openbsd-i386"/>
-      <zipfileset src="${dist}/win32-amd64.jar" 
-                  includes="*jnidispatch*"
-                  prefix="com/sun/jna/win32-amd64"/>
-    </jar>
-    <copy todir="${dist}">
-      <fileset dir="${build}">
-        <include name="${native.jar}"/>
-        <include name="examples.jar"/>
-      </fileset>
-    </copy>
-    <zip zipfile="${dist}/doc.zip">
-      <zipfileset dir="${javadoc}" prefix="javadoc"/>
-    </zip>
-    <!-- JNA sources only, for use in Linux build from source/shared libffi -->
-    <zip zipfile="${dist}/src.zip">
-      <zipfileset dir="." includes="build.xml,LICENSE.txt"/>
-      <zipfileset dir="${src}" includes="**/*.java" prefix="src"/>
-      <zipfileset dir="${test.src}" includes="**/*.java" prefix="test"/>
-      <zipfileset dir="${native}" excludes="libffi,libffi/**/*" prefix="native"/>
-    </zip>
-    <!-- Full sources required to build and test everything -->
-    <zip zipfile="${dist}/src-full.zip">
-      <zipfileset src="${dist}/src.zip"/>
-      <zipfileset dir="lib" includes="junit.jar,clover.jar" prefix="lib"/>
-      <zipfileset dir="." includes=".classpath,.project"/>
-      <zipfileset dir="${native}" includes="libffi,libffi/**/*" prefix="native"/>
-    </zip>
-    <!-- Sources package as required by maven -->
-    <zip zipfile="${dist}/src-mvn.zip">
-      <zipfileset dir="${src}" includes="**/*.java,**/*.html,**/*.png"/>
-    </zip>
-  </target>
-
-  <target name="clean" depends="-dynamic-properties">
-    <delete failOnError="false" includeEmptyDirs="true">
-      <fileset dir="${build}"/>
-    </delete>
-    <delete quiet="true" includeEmptyDirs="true">
-      <fileset dir=".clover"/>
-      <fileset dir="${javadoc}"/>
-      <fileset dir="." includes="*~,**/*~"/>
-    </delete>
-  </target>
-
-</project>
-
-

=== removed directory '.pc/03-dynlink-and-cflags.patch'
=== removed file '.pc/03-dynlink-and-cflags.patch/build.xml'
--- .pc/03-dynlink-and-cflags.patch/build.xml	2010-04-21 16:36:37 +0000
+++ .pc/03-dynlink-and-cflags.patch/build.xml	1970-01-01 00:00:00 +0000
@@ -1,643 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="JNA" default="default" basedir=".">
-  <description>Builds and tests JNA</description>
-
-  <!--  
-  Conventions (since ant can't easily specify arbitrary file dependencies):
-  The uptodate property for a given target TARGET is "-TARGET"; the actual
-  target to generate the uptodate property is named ":TARGET".
-
-  Properties (except for uptodate properties) separate words by dots, targets
-  by dashes. 
-  -->
-
-  <!-- global properties -->
-  <!-- (all build-related props should go in -dynamic-properties) -->
-  <property name="name" value="jna"/>
-  <property name="jar" value="${name}.jar"/>
-  <property name="testjar" value="${name}-test.jar"/>
-  <property name="debug" value="true"/>
-  <property name="debug.native" value="false"/>
-  <property name="cflags_extra.native" value=""/>
-  <property name="dynlink.native" value="false"/>
-  <property name="native" location="native"/>
-  <property name="src" location="src"/>
-  <property name="dist" location="dist"/>
-  <property name="test.src" location="test"/>
-  <property name="doc" location="doc"/>
-  <property name="javadoc" location="${doc}/javadoc"/>
-  <property name="stylesheet" location="${javadoc}/doc/css/javadoc.css"/>
-  <property name="vendor" value="JNA Development Team"/>
-  <property name="copyright"
-            value="Copyright &amp;copy; 2007-2009 Timothy Wall. All Rights Reserved."/>
-  <buildnumber/>
-  <!-- JNA library release version -->            
-  <property name="jna.major" value="3"/>
-  <property name="jna.minor" value="2"/>
-  <property name="jna.revision" value="4"/>
-  <property name="jna.build" value="${build.number}"/>
-  <property name="jna.version" value="${jna.major}.${jna.minor}.${jna.revision}"/>
-  <!-- jnidispatch library release version -->
-  <property name="jni.major" value="3"/>
-  <property name="jni.minor" value="2"/>
-  <property name="jni.revision" value="1"/>
-  <property name="jni.build" value="${build.number}"/>
-  <property name="jni.version" value="${jni.major}.${jni.minor}.${jni.revision}"/>
-  <property name="jni.md5" value="c870290c36c8d3fdf85db7c782febc3f"/>
-  <property name="spec.title" value="Java Native Access (JNA)"/>
-  <property name="spec.vendor" value="${vendor}"/>
-  <property name="spec.version" value="${jna.major}"/>
-  <property name="impl.title" value="com.sun.jna"/>
-  <property name="impl.vendor" value="${spec.vendor}"/>
-  <property name="impl.version" value="${jna.version} (b${jna.build})"/>
-
-  <property name="compatibility" value="1.4"/>
-  <property name="test.compatibility" value="1.5"/>
-
-  <!-- Miscellaneous -->
-  <property name="build.compiler.emacs" value="true"/>
-
-  <target name="default" depends="test" description="Build and Test."/>
-
-  <target name="init" depends="-setup"/>
-  <target name="compile-test-single" depends="compile-tests"/>
-  <target name="compile-single" depends="compile"/>
-
-  <target name="-dynamic-properties">
-    <echo>Java version ${java.version}, compatibility: ${compatibility}</echo>
-    <echo>JNA version ${jna.version}, native ${jni.version}</echo>
-    <echo>${java.vm.name} (${java.vm.vendor}, ${java.vm.version})</echo>
-    <echo>java.home=${java.home}</echo>
-    <echo>java.library.path=${java.library.path}</echo>
-
-    <replaceregexp match="(&lt;version&gt;).*(&lt;/version&gt;)"
-                   replace="\1${jna.version}\2" 
-                   file="pom.xml"/>
-    <replaceregexp match='VERSION = ".*";'
-                   replace='VERSION = "${jna.version}";'
-                   file="src/com/sun/jna/Native.java"/>
-
-    <condition property="jar.omitted" value="**/*jnidispatch*" else="jnilib-included">
-      <isset property="omit-jnilib"/>
-    </condition>
-    <condition property="vm.arch" value="-d64" else="">
-      <or>
-        <equals arg1="${sun.arch.data.model}" arg2="64" trim="true"/>
-        <equals arg1="${com.ibm.vm.bitmode}" arg2="64" trim="true"/>
-        <os arch="x86_64"/>
-        <os arch="ppc64"/>
-        <os arch="sparcv9"/>
-        <os arch="amd64"/>
-      </or>
-    </condition>
-    <condition property="ld.preload" value="LD_PRELOAD_64" else="LD_PRELOAD">
-      <and>
-        <os name="SunOS"/>
-        <equals arg1="${vm.arch}" arg2="-d64"/>
-      </and>
-    </condition>
-    <property name="build" value="build"/>
-    <property name="classes" location="${build}/classes"/>
-    <property name="eclipse.classes" location="build.eclipse/classes"/>
-    <property name="test.classes" location="${build}/test-classes"/>
-    <property name="reports" value="${build}/reports"/>
-
-    <!-- Add other supported platforms here -->
-    <condition property="jre.arch" value="i386">
-      <equals arg1="x86" arg2="${os.arch}"/>
-    </condition>
-    <condition property="jre.arch" value="amd64">
-      <equals arg1="x86_64" arg2="${os.arch}"/>
-    </condition>
-    <property name="jre.arch" value="${os.arch}"/>
-    <condition property="os.prefix" value="linux-${jre.arch}">
-      <os name="Linux"/>
-    </condition>
-    <condition property="os.prefix" value="win32-${os.arch}">
-      <os family="windows"/>
-    </condition>
-    <!-- Darwin builds are universal, no arch required -->
-    <condition property="os.prefix" value="darwin">
-      <os family="mac"/>
-    </condition>
-    <condition property="os.prefix" value="sunos-${os.arch}">
-      <os name="SunOS"/>
-    </condition>
-    <condition property="os.prefix" value="freebsd-${os.arch}">
-      <os name="FreeBSD"/>
-    </condition>
-    <condition property="os.prefix" value="openbsd-${os.arch}">
-      <os name="OpenBSD"/>
-    </condition>
-    <fail unless="os.prefix" message="OS/arch not supported (${os.name}/${os.arch}), edit build.xml and native/Makefile to add it."/>
-    <condition property="jdk.home" value="${java.home}">
-      <available file="${java.home}/include"/>
-    </condition>
-    <condition property="jdk.home" value="${java.home}/..">
-      <available file="${java.home}/../include"/>
-    </condition>
-    <fail unless="jdk.home" message="JAVA_HOME/java.home must be a JDK, not JRE"/>
-    <condition property="libjsig"
-               value="${java.home}/lib/${jre.arch}/libjsig.so" else="">
-      <available file="${java.home}/lib/${jre.arch}/libjsig.so"/>
-    </condition>
-    <property name="native.jar" value="${os.prefix}.jar"/>
-    <property name="build.native" location="${build}/native"/>
-    <property name="md5.file" location="${build.native}/sig"/>
-
-    <mkdir dir="${build}"/>
-    <mkdir dir="${build.native}"/>
-    <mkdir dir="${classes}"/>
-    <mkdir dir="${test.classes}"/>
-    <mkdir dir="${reports}"/>
-    <mkdir dir="${doc}"/>
-
-  </target>
-
-  <target name="-setup" depends="-dynamic-properties">
-    <path id="compile-test.path">
-      <pathelement path="${test.src}"/>
-      <path id="test.libs">
-        <fileset dir="lib">
-          <include name="junit.jar"/>   
-        </fileset>
-        <pathelement path="${classes}"/>
-      </path>
-      <path id="compile.path">
-        <path id="src.path">
-          <pathelement location="${src}"/>
-        </path>
-      </path>                           
-    </path>                           
-
-    <path id="test.runpath">
-      <pathelement path="${build}/${jar}"/>
-      <pathelement path="${build}/examples.jar"/>
-      <pathelement path="${test.classes}"/>
-      <pathelement path="lib/clover.jar"/>
-      <path refid="test.libs"/>
-    </path>
-  </target>
-
-  <target name="compile" depends="-setup"
-          description="Compile all Java source">
-    <javac classpathref="compile.path"
-           source="${compatibility}"
-           target="${compatibility}"
-           destdir="${classes}" 
-           deprecation="on" debug="${debug}">
-      <src path="${src}"/>
-    </javac>
-  </target>
-
-  <target name=":jar">
-    <uptodate property="-jar" targetfile="${build}/${jar}">
-      <srcfiles dir="${classes}">
-        <patternset id="jar-compiled">
-          <include name="com/sun/jna/*"/>
-          <include name="com/sun/jna/**/*"/>
-          <exclude name="com/sun/jna/examples/*"/>
-          <exclude name="com/sun/jna/examples/**/*"/>
-        </patternset>
-      </srcfiles>
-    </uptodate>
-  </target>
-  <target name="jar" depends="-setup,native,:jar" unless="-jar"
-          description="Build primary jar">
-    <jar jarfile="${build}/${jar}">
-      <manifest>
-        <attribute name="Main-Class" value="com.sun.jna.Native"/>
-        <section name="com/sun/jna/">
-          <attribute name="Implementation-Title" value="${impl.title}"/>
-          <attribute name="Implementation-Vendor" value="${vendor}"/>
-          <attribute name="Implementation-Version" value="${impl.version}"/>
-          <attribute name="Specification-Title" value="${spec.title}"/>
-          <attribute name="Specification-Vendor" value="${spec.vendor}"/>
-          <attribute name="Specification-Version" value="${spec.version}"/>
-        </section>
-      </manifest>
-      <fileset dir="${classes}" excludes="${jar.omitted}">
-        <patternset refid="jar-compiled"/>
-      </fileset>
-    </jar>
-  </target>
-  <target name="examples" depends="jar,native">
-    <jar jarfile="${build}/examples.jar">
-      <manifest>
-        <attribute name="Class-Path" value="jna.jar"/>
-        <attribute name="Main-Class" value="com.sun.jna.examples.ShapedWindowDemo"/>
-      </manifest>
-      <fileset dir="${src}" includes="**/examples/**/*.png"/>
-      <fileset dir="${classes}" includes="**/examples/*,**/examples/**/*"/>
-      <fileset dir="${classes}" includes="jnidispatch.dll"/>
-    </jar>
-  </target>
-
-  <target name="javah" depends="compile">
-    <javah classpath="${classes}" destdir="${build.native}" force="yes">
-      <class name="com.sun.jna.Function"/>
-      <class name="com.sun.jna.Pointer"/>
-      <class name="com.sun.jna.Memory"/>
-      <class name="com.sun.jna.Native"/>
-      <class name="com.sun.jna.NativeLibrary"/>
-      <class name="com.sun.jna.CallbackReference"/>
-    </javah>
-    <condition property="grep" value="/usr/sfw/bin/ggrep">
-      <os name="SunOS"/>
-    </condition>
-    <condition property="grep" value="ggrep">
-      <os name="OpenBSD"/>
-    </condition>
-    <property name="grep" value="grep"/>
-    <apply dir="${build.native}" executable="${grep}" parallel="true"
-           failonerror="true" relative="true" output="${md5.file}">
-      <arg value="-A"/>
-      <arg value="1"/>
-      <arg value="JNIEXPORT"/>
-      <fileset dir="${build.native}" includes="*.h"/>
-    </apply>
-    <fixcrlf srcdir="${build.native}" includes="sig" eol="unix"/>
-    <checksum property="md5" file="${md5.file}" />
-    <condition property="jni.valid" value="true">
-      <or>
-        <equals arg1="${jni.md5}" arg2="${md5}" trim="true"/>
-        <equals arg1="${jni.md5}" arg2=""/>
-      </or>
-    </condition>
-  </target>
-
-  <!-- Invalidate native libraries when native API changes -->
-  <target name="-native-api-check" depends="javah" unless="jni.valid">
-    <echo>Invalidating native code, new checksum is ${md5}</echo>
-    <copy file="${dist}/out-of-date.jar" tofile="${dist}/darwin.jar" overwrite="true"/>
-    <copy file="${dist}/out-of-date.jar" tofile="${dist}/win32-x86.jar" overwrite="true"/>
-    <copy file="${dist}/out-of-date.jar" tofile="${dist}/win32-amd64.jar" overwrite="true"/>
-    <copy file="${dist}/out-of-date.jar" tofile="${dist}/linux-i386.jar" overwrite="true"/>
-    <copy file="${dist}/out-of-date.jar" tofile="${dist}/linux-amd64.jar" overwrite="true"/>
-    <copy file="${dist}/out-of-date.jar" tofile="${dist}/linux-ia64.jar" overwrite="true"/>
-    <copy file="${dist}/out-of-date.jar" tofile="${dist}/freebsd-i386.jar" overwrite="true"/>
-    <copy file="${dist}/out-of-date.jar" tofile="${dist}/freebsd-amd64.jar" overwrite="true"/>
-    <copy file="${dist}/out-of-date.jar" tofile="${dist}/openbsd-i386.jar" overwrite="true"/>
-    <copy file="${dist}/out-of-date.jar" tofile="${dist}/sunos-x86.jar" overwrite="true"/>
-    <copy file="${dist}/out-of-date.jar" tofile="${dist}/sunos-amd64.jar" overwrite="true"/>
-    <copy file="${dist}/out-of-date.jar" tofile="${dist}/sunos-sparc.jar" overwrite="true"/>
-    <copy file="${dist}/out-of-date.jar" tofile="${dist}/sunos-sparcv9.jar" overwrite="true"/>
-    <delete failOnError="false" includeEmptyDirs="true">
-      <fileset dir="${build.native}" includes="*.o,*jnidispatch*"/>
-    </delete>
-    <fail>API for native code has changed.  Re-run this build after updating jni.version and jni.md5 in build.xml</fail>
-  </target>
-
-  <target name=":rsrc">
-    <condition property="-rsrc">
-      <not><os family="windows"/></not>
-    </condition>
-  </target>
-  <target name="rsrc" depends="-setup,:rsrc" unless="-rsrc"
-          description="Generate w32 DLL version resource information">
-    <property name="rsrc" location="${build.native}/jnidispatch.rc"/>
-    <copy todir="${build.native}" file="${native}/jnidispatch.rc"/>
-    <replaceregexp match="FILEVERSION.*"
-                   replace="FILEVERSION ${jni.major},${jni.minor},${jni.revision},${jni.build}"
-                   file="${rsrc}" byline="true"/>
-    <replaceregexp match="PRODUCTVERSION.*"
-                   replace="PRODUCTVERSION ${jna.major},${jna.minor},${jna.revision},${jna.build}"
-                   file="${rsrc}" byline="true"/>
-    <replaceregexp match="FileVersion.*"
-                   replace="FileVersion&quot;,&quot;${jni.version}&quot;"
-                   file="${rsrc}" byline="true"/>
-    <replaceregexp match="Full Version.*"
-                   replace="Full Version&quot;,&quot;${jni.version} b${jni.build}&quot;"
-                   file="${rsrc}" byline="true"/>
-    <replaceregexp match="ProductVersion.*"
-                   replace="ProductVersion&quot;,&quot;${spec.version}&quot;"
-                   file="${rsrc}" byline="true"/>
-  </target>
-
-  <target name="native" depends="-setup,javah,-native-api-check,rsrc"
-          description="Build native libraries.  Use 'ant -DCC=xxx' to build using a compiler other than gcc">
-    <property name="comment" value="# auto-generated by ant"/>
-    <replaceregexp match="^VERSION=.*"
-                   replace="VERSION=${jni.version} ${comment}"
-                   file="native/Makefile" byline="true"/>
-    <replaceregexp match="^CHECKSUM=.*"
-                   replace="CHECKSUM=${jni.md5} ${comment}"
-                   file="native/Makefile" byline="true"/>
-    <!-- ensure ARCH is set properly for 64-bit capable platforms -->
-    <!-- use ANT_OPTS=-d64 to build 64-bit if not the platform default -->
-    <property name="ARCH" value="${os.arch}"/>
-    <condition property="make.CC" value="CC=${CC}" else="IGNORE=">
-      <isset property="CC"/>
-    </condition>
-    <condition property="make.ARCH" value="ARCH=${ARCH}" else="IGNORE=">
-      <isset property="ARCH"/>
-    </condition>
-    <condition property="make.SDKROOT" value="SDKROOT=${SDKROOT}">
-      <isset property="SDKROOT"/>
-    </condition>
-    <condition property="make.SDKROOT"
-	       value="SDKROOT=/Developer/SDKs/MacOSX10.5.sdk">
-      <available file="/Developer/SDKs/MacOSX10.5.sdk"/>
-    </condition>
-    <condition property="make.SDKROOT"
-	       value="SDKROOT=/Developer/SDKs/MacOSX10.4u.sdk" else="IGNORE=">
-      <available file="/Developer/SDKs/MacOSX10.4u.sdk"/>
-    </condition>
-    <!-- Windows' drive letters and spaces in absolute paths wreak havoc on 
-         make --> 
-    <condition property="make.BUILD" value="BUILD=../${build}/native" else="BUILD=${build.native}">
-      <os family="windows"/>
-    </condition>
-    <condition property="make.PATH" value="PATH=/usr/sfw/bin:/usr/bin:/usr/ccs/bin" else="IGNORE=">
-      <os name="SunOS"/>
-    </condition>
-    <condition property="make" value="/usr/sfw/bin/gmake">
-      <os name="SunOS"/>
-    </condition>
-    <condition property="make" value="gmake">
-      <or>
-        <os name="FreeBSD"/>
-        <os name="OpenBSD"/>
-      </or>
-    </condition>
-    <!-- Default make program -->
-    <property name="make" value="make"/>
-
-    <exec executable="${make}" dir="${native}" failonerror="true">
-      <arg value="JAVA_HOME=${jdk.home}"/>
-      <arg value="JAVAH=${build.native}"/>
-      <arg value="DEBUG=${debug.native}"/>
-      <arg value="CFLAGS_EXTRA=${cflags_extra.native}"/>
-      <arg value="DYNAMIC_LIBFFI=${dynlink.native}"/>
-      <arg value="${make.CC}"/>
-      <arg value="${make.BUILD}"/>
-      <arg value="${make.SDKROOT}"/>
-      <arg value="${make.ARCH}"/>
-      <arg value="${make.PATH}"/>
-      <arg value="VERSION=${jni.version}"/>
-      <arg value="CHECKSUM=${jni.md5}"/>
-    </exec>
-    <mkdir dir="${classes}/com/sun/jna/${os.prefix}"/>
-    <copy todir="${classes}/com/sun/jna/${os.prefix}">
-      <fileset dir="${build.native}"
-               includes="jnidispatch.dll,libjnidispatch.*"/>
-    </copy>
-    <mkdir dir="${eclipse.classes}/com/sun/jna/${os.prefix}"/>
-    <copy todir="${eclipse.classes}/com/sun/jna/${os.prefix}"
-          failonerror="false">
-      <fileset dir="${build.native}"
-               includes="jnidispatch.dll,libjnidispatch.*"/>
-    </copy>
-    <!-- For web start, native libraries may be provided in the root of -->
-    <!-- an included jar file -->
-    <jar jarfile="${build}/${native.jar}">
-      <fileset dir="${build.native}" includes="jnidispatch.dll,libjnidispatch.*"/>
-      <manifest>
-        <attribute name="Implementation-Version" value="${jni.version} b${jni.build}"/>
-        <attribute name="Specification-Version" value="${jni.version}"/>
-      </manifest>
-    </jar>
-  </target>
-
-  <target name="compile-tests" depends="compile,native,jar"
-          description="Compile all test code">
-    <javac classpathref="compile-test.path"
-           source="${test.compatibility}"
-           target="${test.compatibility}"
-           destdir="${test.classes}" 
-           deprecation="on" debug="${debug}">
-      <src path="${test.src}"/>
-    </javac>
-    <jar jarfile="${build}/${testjar}">
-      <fileset dir="${test.classes}">
-        <patternset refid="jar-compiled"/>
-      </fileset>
-    </jar>
-    <mkdir dir="${build}/jws"/>
-    <copy todir="${build}/jws" file="${build}/${jar}"/>
-    <copy todir="${build}/jws" file="${build}/${testjar}"/>
-    <copy todir="${build}/jws" file="lib/junit.jar"/>
-    <copy todir="${build}/jws" file="lib/clover.jar"/>
-    <jar jarfile="${build}/jws/jnidispatch.jar">
-      <fileset dir="${build.native}" includes="*jnidispatch.*"/>
-    </jar>
-    <signjar alias="jna" keystore="jna.keystore" storepass="jnadev" lazy="true"> 
-      <fileset dir="${build}/jws" includes="jna.jar,jna-test.jar,junit.jar,jnidispatch.jar,clover.jar"/>
-    </signjar>
-  </target>
-
-  <!-- When running tests from an IDE, be sure to set jna.library.path -->
-  <!-- to where the test library (testlib) is found.                   -->
-  <target name="test" depends="jar,examples,compile-tests"
-          description="Run all unit tests">
-    <property name="test.fork" value="yes"/>
-    <property name="reports.junit" location="${reports}/junit"/>
-    <property name="results.junit" location="${build}/junit-results"/>
-    <mkdir dir="${results.junit}"/>
-    <echo>Saving test results in ${results.junit}</echo>
-    <property name="tests.stdcall" value="**/win32/*StdCallTest.java"/>
-    <condition property="tests.platform" value="**/win32/*Test.java">
-      <os family="windows"/>
-    </condition>
-    <condition property="tests.exclude" value="**/win32/*StdCallTest.java">
-      <and><os family="windows"/><not><os arch="x86"/></not></and>
-    </condition>
-    <condition property="tests.platform" value="**/unix/*Test.java">
-      <and>
-        <os family="unix"/>
-        <not><os family="mac"/></not>
-      </and>
-    </condition>
-    <condition property="vmopt.arch" value="-d64" else="-Dignore">
-      <and>
-        <!-- Sun 64-bit VM for windows doesn't support the -d64 switch -->
-        <not><os family="windows"/></not>
-        <equals arg1="${vm.arch}" arg2="-d64" trim="true"/>
-      </and>
-    </condition>
-    <property name="tests.platform" value=""/>
-    <property name="tests.exclude" value=""/>
-    <junit printsummary="yes" fork="${test.fork}" failureproperty="testfailure">
-      <!-- avoid VM conflicts with JNA protected mode -->
-      <env key="${ld.preload}" file="${libjsig}"/>
-      <jvmarg value="-Djna.library.path=${build.native}"/>
-      <!-- Avoid VM crashes, if possible -->
-      <jvmarg value="-Djna.protected=true"/>
-      <jvmarg value="-Djna.builddir=${build}"/>
-      <jvmarg value="${vmopt.arch}"/>
-      <classpath><path refid="test.runpath"/></classpath>
-      <formatter type="xml"/>
-      <batchtest todir="${results.junit}">
-        <fileset dir="${test.src}">
-          <include name="com/sun/jna/*Test.java"/>
-          <include name="com/sun/jna/examples/*Test.java"/>
-          <include name="${tests.platform}"/>
-          <exclude name="${tests.exclude}"/>
-        </fileset>
-      </batchtest>
-    </junit>
-    <junitreport todir="${results.junit}">
-      <fileset dir="${results.junit}">
-        <include name="TEST-*.xml"/>
-      </fileset>
-      <report todir="${reports.junit}"/>
-    </junitreport>
-    <echo>View test report in file://${reports.junit}/index.html</echo>
-    <fail if="testfailure" unless="clover">One or more tests failed</fail>
-  </target>
-
-  <target name="with.clover" description="Enable code coverage for tests">
-    <taskdef resource="cloverlib.xml" classpath="lib/clover.jar"/>
-    <property name="clover" value="true"/>
-    <property name="build" value="build.clover"/>
-    <clover-setup/>
-  </target>
-
-  <target name="clover" depends="with.clover,test"
-          description="Generate test code coverage reports">
-    <property name="reports.clover" value="${reports}/clover"/>
-    <mkdir dir="${reports.clover}"/>
-    <clover-report>
-      <current outfile="${reports.clover}" title="clover">
-        <fileset dir="." includes="**/*.java" excludes="**/examples/**/*.java"/>
-        <testresults dir="${results.junit}" includes="TEST-*.xml"/>
-        <format type="html"/>
-      </current>
-    </clover-report>
-    <echo>Reports generated in ${reports.clover}</echo>
-  </target>
-
-  <target name="javadoc" depends="-setup">
-    <property name="header"
-              value="&lt;b&gt;JNA API&lt;/&gt;&lt;font size=&quot;-1&quot;&gt; ${jna.version}&lt;/font&gt;"/>
-    <property name="footer"
-              value="&lt;center&gt;&lt;i&gt;${copyright}&lt;/i&gt;&lt;/center&gt;"/>
-
-    <mkdir dir="${javadoc}"/>
-    <javadoc package="true"
-             windowtitle="JNA API"
-             sourcepathref="src.path"
-             classpathref="compile.path"
-             maxmemory="256m"
-             packagenames="com.sun.jna,com.sun.jna.ptr,com.sun.jna.types,com.sun.jna.examples,com.sun.jna.examples.win32,com.sun.jna.exmaples.unix"
-             overview="${src}/com/sun/jna/overview.html"
-             destdir="${javadoc}">
-      <!-- stylesheetfile="${stylesheet}" -->
-      <doctitle>JNA API Documentation</doctitle>
-      <header>${header}</header>
-      <bottom>${footer}</bottom>
-      <link href="http://java.sun.com/j2se/1.4.2/docs/api/"/>
-
-      <packageset dir="${src}" defaultexcludes="yes">
-        <patternset>
-          <include name="com/sun/jna/**/*"/>
-        </patternset>
-      </packageset>
-
-      <group title="Java Native Access" packages="com.sun.jna,com.sun.jna.ptr,com.sun.jna.types,com.sun.jna.win32"/>
-      <group title="Examples" packages="com.sun.jna.examples,com.sun.jna.examples.dnd"/>
-      <group title="Unix Examples" packages="com.sun.jna.examples.unix"/>
-      <group title="Windows Examples" packages="com.sun.jna.examples.win32"/>
-
-      <arg value="-notimestamp"/>
-    </javadoc>
-  </target>
-
-  <target name="dist" depends="jar,compile-tests,native,examples,javadoc"
-          description="Build distribution files">
-    <jar jarfile="${dist}/jna.jar" duplicate="preserve">
-      <manifest>
-        <attribute name="Main-Class" value="com.sun.jna.Native"/>
-        <section name="com/sun/jna/">
-          <attribute name="Implementation-Title" value="${impl.title}"/>
-          <attribute name="Implementation-Vendor" value="${vendor}"/>
-          <attribute name="Implementation-Version" value="${impl.version}"/>
-          <attribute name="Specification-Title" value="${spec.title}"/>
-          <attribute name="Specification-Vendor" value="${spec.vendor}"/>
-          <attribute name="Specification-Version" value="${spec.version}"/>
-        </section>
-      </manifest>
-      <zipfileset src="${build}/${jar}"/>
-      <zipfileset src="${dist}/win32-x86.jar" 
-                  includes="*jnidispatch*"
-                  prefix="com/sun/jna/win32-x86"/>
-      <zipfileset src="${dist}/darwin.jar" 
-                  includes="*jnidispatch*"
-                  prefix="com/sun/jna/darwin"/>
-      <zipfileset src="${dist}/linux-i386.jar" 
-                  includes="*jnidispatch*"
-                  prefix="com/sun/jna/linux-i386"/>
-      <zipfileset src="${dist}/linux-amd64.jar" 
-                  includes="*jnidispatch*"
-                  prefix="com/sun/jna/linux-amd64"/>
-      <zipfileset src="${dist}/linux-ia64.jar" 
-                  includes="*jnidispatch*"
-                  prefix="com/sun/jna/linux-ia64"/>
-      <zipfileset src="${dist}/sunos-x86.jar" 
-                  includes="*jnidispatch*"
-                  prefix="com/sun/jna/sunos-x86"/>
-      <zipfileset src="${dist}/sunos-amd64.jar" 
-                  includes="*jnidispatch*"
-                  prefix="com/sun/jna/sunos-amd64"/>
-      <zipfileset src="${dist}/sunos-sparc.jar" 
-                  includes="*jnidispatch*"
-                  prefix="com/sun/jna/sunos-sparc"/>
-      <zipfileset src="${dist}/sunos-sparcv9.jar" 
-                  includes="*jnidispatch*"
-                  prefix="com/sun/jna/sunos-sparcv9"/>
-      <zipfileset src="${dist}/freebsd-i386.jar" 
-                  includes="*jnidispatch*"
-                  prefix="com/sun/jna/freebsd-i386"/>
-      <zipfileset src="${dist}/freebsd-amd64.jar" 
-                  includes="*jnidispatch*"
-                  prefix="com/sun/jna/freebsd-amd64"/>
-      <zipfileset src="${dist}/openbsd-i386.jar" 
-                  includes="*jnidispatch*"
-                  prefix="com/sun/jna/openbsd-i386"/>
-      <zipfileset src="${dist}/win32-amd64.jar" 
-                  includes="*jnidispatch*"
-                  prefix="com/sun/jna/win32-amd64"/>
-    </jar>
-    <copy todir="${dist}">
-      <fileset dir="${build}">
-        <include name="${native.jar}"/>
-        <include name="examples.jar"/>
-      </fileset>
-    </copy>
-    <zip zipfile="${dist}/doc.zip">
-      <zipfileset dir="${javadoc}" prefix="javadoc"/>
-    </zip>
-    <!-- JNA sources only, for use in Linux build from source/shared libffi -->
-    <zip zipfile="${dist}/src.zip">
-      <zipfileset dir="." includes="build.xml,LICENSE.txt"/>
-      <zipfileset dir="${src}" includes="**/*.java" prefix="src"/>
-      <zipfileset dir="${test.src}" includes="**/*.java" prefix="test"/>
-      <zipfileset dir="${native}" excludes="libffi,libffi/**/*" prefix="native"/>
-    </zip>
-    <!-- Full sources required to build and test everything -->
-    <zip zipfile="${dist}/src-full.zip">
-      <zipfileset src="${dist}/src.zip"/>
-      <zipfileset dir="lib" includes="junit.jar,clover.jar" prefix="lib"/>
-      <zipfileset dir="." includes=".classpath,.project"/>
-      <zipfileset dir="${native}" includes="libffi,libffi/**/*" prefix="native"/>
-    </zip>
-    <!-- Sources package as required by maven -->
-    <zip zipfile="${dist}/src-mvn.zip">
-      <zipfileset dir="${src}" includes="**/*.java,**/*.html,**/*.png"/>
-    </zip>
-  </target>
-
-  <target name="clean" depends="-dynamic-properties">
-    <delete failOnError="false" includeEmptyDirs="true">
-      <fileset dir="${build}"/>
-    </delete>
-    <delete quiet="true" includeEmptyDirs="true">
-      <fileset dir=".clover"/>
-      <fileset dir="${javadoc}"/>
-      <fileset dir="." includes="*~,**/*~"/>
-    </delete>
-  </target>
-
-</project>
-
-

=== removed directory '.pc/04-load-native-code-from-fs.patch'
=== removed directory '.pc/04-load-native-code-from-fs.patch/src'
=== removed directory '.pc/04-load-native-code-from-fs.patch/src/com'
=== removed directory '.pc/04-load-native-code-from-fs.patch/src/com/sun'
=== removed directory '.pc/04-load-native-code-from-fs.patch/src/com/sun/jna'
=== removed file '.pc/04-load-native-code-from-fs.patch/src/com/sun/jna/Native.java'
--- .pc/04-load-native-code-from-fs.patch/src/com/sun/jna/Native.java	2010-04-21 16:36:37 +0000
+++ .pc/04-load-native-code-from-fs.patch/src/com/sun/jna/Native.java	1970-01-01 00:00:00 +0000
@@ -1,1441 +0,0 @@
-/* Copyright (c) 2007, 2008, 2009 Timothy Wall, All Rights Reserved
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- * <p/>
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.  
- */
-package com.sun.jna;
-
-import java.awt.Component;
-import java.awt.GraphicsEnvironment;
-import java.awt.HeadlessException;
-import java.awt.Window;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.UnsupportedEncodingException;
-import java.lang.ref.WeakReference;
-import java.lang.reflect.Array;
-import java.lang.reflect.Field;
-import java.lang.reflect.InvocationHandler;
-import java.lang.reflect.Method;
-import java.lang.reflect.Modifier;
-import java.lang.reflect.Proxy;
-import java.net.URL;
-import java.net.URISyntaxException;
-import java.nio.Buffer;
-import java.nio.ByteBuffer;
-import java.security.AccessController;
-import java.security.PrivilegedAction;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.WeakHashMap;
-
-import com.sun.jna.Callback.UncaughtExceptionHandler;
-import com.sun.jna.Structure.FFIType;
-
-/** Provides generation of invocation plumbing for a defined native
- * library interface.  Also provides various utilities for native operations.
- * <p>
- * {@link #getTypeMapper} and {@link #getStructureAlignment} are provided
- * to avoid having to explicitly pass these parameters to {@link Structure}s, 
- * which would require every {@link Structure} which requires custom mapping
- * or alignment to define a constructor and pass parameters to the superclass.
- * To avoid lots of boilerplate, the base {@link Structure} constructor
- * figures out these properties based on its enclosing interface.<p>
- * <a name=library_loading></a>
- * <h2>Library Loading</h2>
- * When JNA classes are loaded, the native shared library (jnidispatch) is
- * loaded as well.  An attempt is made to load it from the system library path
- * using {@link System#loadLibrary}.  If not found, the appropriate library
- * will be extracted from the class path into a temporary directory and
- * loaded from there.  If your system has additional security constraints
- * regarding execution or load of files (SELinux, for example), you should 
- * probably install the native library in an accessible location and configure 
- * your system accordingly, rather than relying on JNA to extract the library 
- * from its own jar file.
- * @see Library
- * @author Todd Fast, [e-mail]
- * @author [e-mail]
- */
-public final class Native {
-
-    private static final String VERSION = "3.2.4";
-
-    private static String nativeLibraryPath = null;
-    private static boolean unpacked;
-    private static Map typeMappers = new WeakHashMap();
-    private static Map alignments = new WeakHashMap();
-    private static Map options = new WeakHashMap();
-    private static Map libraries = new WeakHashMap();
-    private static final UncaughtExceptionHandler DEFAULT_HANDLER = 
-        new UncaughtExceptionHandler() {
-            public void uncaughtException(Callback c, Throwable e) {
-                System.err.println("JNA: Callback " + c + " threw the following exception:");
-                e.printStackTrace();
-            }
-        };
-    private static UncaughtExceptionHandler callbackExceptionHandler = DEFAULT_HANDLER;
-    
-    /** The size of a native pointer (<code>void*</code>) on the current 
-     * platform, in bytes. 
-     */
-    public static final int POINTER_SIZE;
-    /** Size of a native <code>long</code> type, in bytes. */
-    public static final int LONG_SIZE;
-    /** Size of a native <code>wchar_t</code> type, in bytes. */
-    public static final int WCHAR_SIZE;
-    /** Size of a native <code>size_t</code> type, in bytes. */
-    public static final int SIZE_T_SIZE;
-
-    private static final int TYPE_VOIDP = 0;
-    private static final int TYPE_LONG = 1;
-    private static final int TYPE_WCHAR_T = 2;
-    private static final int TYPE_SIZE_T = 3;
-
-    static {
-        loadNativeLibrary();
-        POINTER_SIZE = sizeof(TYPE_VOIDP);
-        LONG_SIZE = sizeof(TYPE_LONG);
-        WCHAR_SIZE = sizeof(TYPE_WCHAR_T);
-        SIZE_T_SIZE = sizeof(TYPE_SIZE_T);
-        // Perform initialization of other JNA classes until *after* 
-        // initializing the above final fields
-        initIDs();
-        if (Boolean.getBoolean("jna.protected")) {
-            setProtected(true);
-        }
-    }
-    
-    /** Ensure our unpacked native library gets cleaned up if this class gets
-        garbage-collected.
-    */
-    private static final Object finalizer = new Object() {
-        protected void finalize() {
-            deleteNativeLibrary();
-        }
-    };
-
-    /** Remove any unpacked native library.  Forcing the class loader to
-        unload it first is required on Windows, since the temporary native
-        library can't be deleted until the native library is unloaded.  Any
-        deferred execution we might install at this point would prevent the
-        Native class and its class loader from being GC'd, so we instead force
-        the native library unload just a little bit prematurely.
-     */
-    private static boolean deleteNativeLibrary() {
-        String path = nativeLibraryPath;
-        if (path == null || !unpacked) return true;
-        File flib = new File(path);
-        if (flib.delete()) {
-            nativeLibraryPath = null;
-            unpacked = false;
-            return true;
-        }
-        // Reach into the bowels of ClassLoader to force the native
-        // library to unload
-        try {
-            ClassLoader cl = Native.class.getClassLoader();
-            Field f = ClassLoader.class.getDeclaredField("nativeLibraries");
-            f.setAccessible(true);
-            List libs = (List)f.get(cl);
-            for (Iterator i = libs.iterator();i.hasNext();) {
-                Object lib = i.next();
-                f = lib.getClass().getDeclaredField("name");
-                f.setAccessible(true);
-                String name = (String)f.get(lib);
-                if (name.equals(path) || name.indexOf(path) != -1) {
-                    Method m = lib.getClass().getDeclaredMethod("finalize", new Class[0]);
-                    m.setAccessible(true);
-                    m.invoke(lib, new Object[0]);
-                    nativeLibraryPath = null;
-                    if (unpacked) {
-                        if (flib.exists()) {
-                            if (flib.delete()) {
-                                unpacked = false;
-                                return true;
-                            }
-                            return false;
-                        }
-                    }
-                    return true;
-                }
-            }
-        }
-        catch(Exception e) {
-        }
-        return false;
-    }
-
-    private Native() { }
-    
-    private static native void initIDs();
-
-    /** Set whether native memory accesses are protected from invalid
-     * accesses.  This should only be set true when testing or debugging,
-     * and should not be considered reliable or robust for applications
-     * where JNA native calls are occurring on multiple threads.
-     * Protected mode will be automatically set if the
-     * system property <code>jna.protected</code> has a value of "true"
-     * when the JNA library is first loaded.<p>
-     * If not supported by the underlying platform, this setting will
-     * have no effect.<p>
-     * NOTE: On platforms which support signals (non-Windows), JNA uses
-     * signals to trap errors.  This may interfere with the JVM's own use of
-     * signals.  When protected mode is enabled, you should make use of the
-     * jsig library, if available (see <a href="http://java.sun.com/j2se/1.4.2/docs/guide/vm/signal-chaining.html">Signal Chaining</a>).
-     * In short, set the environment variable <code>LD_PRELOAD</code> to the
-     * path to <code>libjsig.so</code> in your JRE lib directory
-     * (usually ${java.home}/lib/${os.arch}/libjsig.so) before launching your
-     * Java application.
-     */
-    public static synchronized native void setProtected(boolean enable);
-    
-    /** Returns whether protection is enabled.  Check the result of this method
-     * after calling {@link #setProtected setProtected(true)} to determine
-     * if this platform supports protecting memory accesses.
-     */
-    public static synchronized native boolean isProtected();
-
-    /** Set whether the system last error result is captured after every
-     * native invocation.  Defaults to <code>true</code> (<code>false</code>
-     * for direct-mapped calls).<p>
-     * @deprecated The preferred method of obtaining the last error result is
-     * to declare your mapped method to throw {@link LastErrorException}
-     * instead. 
-     */
-    public static synchronized native void setPreserveLastError(boolean enable);
-    
-    /** Indicates whether the system last error result is preserved
-     * after every invocation.<p>
-     * @deprecated The preferred method of obtaining the last error result is
-     * to declare your mapped method to throw {@link LastErrorException}
-     * instead. 
-     */
-    public static synchronized native boolean getPreserveLastError();
-    
-    /** Utility method to get the native window ID for a Java {@link Window}
-     * as a <code>long</code> value.
-     * This method is primarily for X11-based systems, which use an opaque
-     * <code>XID</code> (usually <code>long int</code>) to identify windows.
-     * @throws HeadlessException if the current VM is running headless 
-     */
-    public static long getWindowID(Window w) throws HeadlessException {
-        return getComponentID(w);
-    }
-
-    /** Utility method to get the native window ID for a heavyweight Java 
-     * {@link Component} as a <code>long</code> value.
-     * This method is primarily for X11-based systems, which use an opaque
-     * <code>XID</code> (usually <code>long int</code>) to identify windows. 
-     * @throws HeadlessException if the current VM is running headless 
-     */
-    public static long getComponentID(Component c) throws HeadlessException {
-        if (GraphicsEnvironment.isHeadless()) {
-            throw new HeadlessException("No native windows when headless");
-        }
-        if (c.isLightweight()) {
-            throw new IllegalArgumentException("Component must be heavyweight");
-        }
-        if (!c.isDisplayable()) 
-            throw new IllegalStateException("Component must be displayable");
-        // On X11 VMs prior to 1.5, the window must be visible
-        if (Platform.isX11()
-            && System.getProperty("java.version").startsWith("1.4")) {
-            if (!c.isVisible()) {
-                throw new IllegalStateException("Component must be visible");
-            }
-        }
-        // By this point, we're certain that Toolkit.loadLibraries() has
-        // been called, thus avoiding AWT/JAWT link errors
-        // (see http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=6539705).
-        return getWindowHandle0(c);
-    }
-    
-    /** Utility method to get the native window pointer for a Java 
-     * {@link Window} as a {@link Pointer} value.  This method is primarily for 
-     * w32, which uses the <code>HANDLE</code> type (actually 
-     * <code>void *</code>) to identify windows. 
-     * @throws HeadlessException if the current VM is running headless 
-     */
-    public static Pointer getWindowPointer(Window w) throws HeadlessException {
-        return getComponentPointer(w);
-    }
-    
-    /** Utility method to get the native window pointer for a heavyweight Java 
-     * {@link Component} as a {@link Pointer} value.  This method is primarily 
-     * for w32, which uses the <code>HWND</code> type (actually 
-     * <code>void *</code>) to identify windows. 
-     * @throws HeadlessException if the current VM is running headless 
-     */
-    public static Pointer getComponentPointer(Component c) throws HeadlessException {
-        return new Pointer(getComponentID(c));
-    }
-    
-    private static native long getWindowHandle0(Component c);
-
-    /** Convert a direct {@link Buffer} into a {@link Pointer}. 
-     * @throws IllegalArgumentException if the buffer is not direct.
-     */
-    public static native Pointer getDirectBufferPointer(Buffer b);
-    
-    /** Obtain a Java String from the given native byte array.  If there is
-     * no NUL terminator, the String will comprise the entire array.  If the
-     * system property <code>jna.encoding</code> is set, its value will 
-     * override the platform default encoding (if supported).
-     */
-    public static String toString(byte[] buf) {
-        return toString(buf, System.getProperty("jna.encoding"));
-    }
-
-    /** Obtain a Java String from the given native byte array, using the given
-     * encoding.  If there is no NUL terminator, the String will comprise the
-     * entire array.  If the <code>encoding</code> parameter is null, 
-     * the platform default encoding will be used.
-     */
-    public static String toString(byte[] buf, String encoding) {
-        String s = null;
-        if (encoding != null) {
-            try {
-                s = new String(buf, encoding);
-            }
-            catch(UnsupportedEncodingException e) { }
-        }
-        if (s == null) {
-            s = new String(buf);
-        }
-        int term = s.indexOf(0);
-        if (term != -1)
-            s = s.substring(0, term);
-        return s;
-    }
-    
-    /** Obtain a Java String from the given native wchar_t array.  If there is
-     * no NUL terminator, the String will comprise the entire array.
-     */
-    public static String toString(char[] buf) {
-        String s = new String(buf); 
-        int term = s.indexOf(0);
-        if (term != -1)
-            s = s.substring(0, term);
-        return s;
-    }
-    
-    /** Map a library interface to the current process, providing
-     * the explicit interface class.
-     * @param interfaceClass
-     */
-    public static Object loadLibrary(Class interfaceClass) {
-        return loadLibrary(null, interfaceClass);
-    }
-
-    /** Map a library interface to the current process, providing
-     * the explicit interface class.
-     * @param interfaceClass
-     * @param options Map of library options
-     */
-    public static Object loadLibrary(Class interfaceClass, Map options) {
-        return loadLibrary(null, interfaceClass, options);
-    }
-
-    /** Map a library interface to the given shared library, providing
-     * the explicit interface class.
-     * If <code>name</code> is null, attempts to map onto the current process.
-     * @param name
-     * @param interfaceClass
-     */
-    public static Object loadLibrary(String name, Class interfaceClass) {
-        return loadLibrary(name, interfaceClass, Collections.EMPTY_MAP);
-    }
-
-    /** Load a library interface from the given shared library, providing
-     * the explicit interface class and a map of options for the library.
-     * If no library options are detected the map is interpreted as a map
-     * of Java method names to native function names.<p>
-     * If <code>name</code> is null, attempts to map onto the current process.
-     * @param name
-     * @param interfaceClass
-     * @param options Map of library options
-     */
-    public static Object loadLibrary(String name, 
-                                     Class interfaceClass,
-                                     Map options) {
-        Library.Handler handler = 
-            new Library.Handler(name, interfaceClass, options);
-        ClassLoader loader = interfaceClass.getClassLoader();
-        Library proxy = (Library)
-            Proxy.newProxyInstance(loader, new Class[] {interfaceClass},
-                                   handler);
-        cacheOptions(interfaceClass, options, proxy);
-        return proxy;
-    }
-
-    /** Attempts to force initialization of an instance of the library interface
-     * by loading a public static field of the requisite type.
-     * Returns whether an instance variable was instantiated. 
-     * Expects that lock on libraries is already held
-     */
-    private static void loadLibraryInstance(Class cls) {
-        if (cls != null && !libraries.containsKey(cls)) {
-            try {
-                Field[] fields = cls.getFields();
-                for (int i=0;i < fields.length;i++) {
-                    Field field = fields[i];
-                    if (field.getType() == cls 
-                        && Modifier.isStatic(field.getModifiers())) {
-                        // Ensure the field gets initialized by reading it
-                        libraries.put(cls, new WeakReference(field.get(null)));
-                        break;
-                    }
-                }
-            }
-            catch (Exception e) {
-                throw new IllegalArgumentException("Could not access instance of " 
-                                                   + cls + " (" + e + ")");
-            }
-        }
-    }
-    
-    /** Find the library interface corresponding to the given class.  Checks
-     * all ancestor classes and interfaces for a declaring class which
-     * implements {@link Library}.
-     */
-    static Class findEnclosingLibraryClass(Class cls) {
-        if (cls == null) { 
-            return null;
-        }
-        synchronized(libraries) {
-            if (options.containsKey(cls)) {
-                return cls;
-            }
-        }
-        if (Library.class.isAssignableFrom(cls)) {
-            return cls;
-        }
-        if (Callback.class.isAssignableFrom(cls)) {
-            cls = CallbackReference.findCallbackClass(cls);
-        }
-        Class declaring = cls.getDeclaringClass();
-        Class fromDeclaring = findEnclosingLibraryClass(declaring);
-        if (fromDeclaring != null) {
-            return fromDeclaring;
-        }
-        return findEnclosingLibraryClass(cls.getSuperclass());
-    }
-    
-
-    /** Return the preferred native library configuration options for the given 
-     * class.
-     * @see Library 
-     */
-    public static Map getLibraryOptions(Class type) {
-        synchronized(libraries) {
-            Class interfaceClass = findEnclosingLibraryClass(type);
-            if (interfaceClass != null) 
-                loadLibraryInstance(interfaceClass);
-            else
-                interfaceClass = type;
-            if (!options.containsKey(interfaceClass)) {
-                try {
-                    Field field = interfaceClass.getField("OPTIONS");
-                    field.setAccessible(true);
-                    options.put(interfaceClass, field.get(null));
-                }
-                catch (NoSuchFieldException e) {
-                }
-                catch (Exception e) {
-                    throw new IllegalArgumentException("OPTIONS must be a public field of type java.util.Map (" 
-                                                       + e + "): " + interfaceClass);
-                }
-            }
-            return (Map)options.get(interfaceClass);
-        }
-    }
-
-    /** Return the preferred {@link TypeMapper} for the given native interface.
-     * See {@link com.sun.jna.Library#OPTION_TYPE_MAPPER}. 
-     */
-    public static TypeMapper getTypeMapper(Class cls) {
-        synchronized(libraries) {
-            Class interfaceClass = findEnclosingLibraryClass(cls);
-            if (interfaceClass != null)
-                loadLibraryInstance(interfaceClass);
-            else
-                interfaceClass = cls;
-
-            if (!typeMappers.containsKey(interfaceClass)) {
-                try {
-                    Field field = interfaceClass.getField("TYPE_MAPPER");
-                    field.setAccessible(true);
-                    typeMappers.put(interfaceClass, field.get(null));
-                }
-                catch (NoSuchFieldException e) {
-                    Map options = getLibraryOptions(cls);
-                    if (options != null
-                        && options.containsKey(Library.OPTION_TYPE_MAPPER)) {
-                        typeMappers.put(interfaceClass, options.get(Library.OPTION_TYPE_MAPPER));
-                    }
-                }
-                catch (Exception e) {
-                    throw new IllegalArgumentException("TYPE_MAPPER must be a public field of type "
-                                                       + TypeMapper.class.getName() + " (" 
-                                                       + e + "): " + interfaceClass);
-                }
-            }
-            return (TypeMapper)typeMappers.get(interfaceClass);
-        }
-    }
-
-    /** Return the preferred structure alignment for the given native interface. 
-     * See {@link com.sun.jna.Library#OPTION_STRUCTURE_ALIGNMENT}.
-     */
-    public static int getStructureAlignment(Class cls) {
-        synchronized(libraries) {
-            Class interfaceClass = findEnclosingLibraryClass(cls);
-            if (interfaceClass != null) 
-                loadLibraryInstance(interfaceClass);
-            else
-                interfaceClass = cls;
-            if (!alignments.containsKey(interfaceClass)) {
-                try {
-                    Field field = interfaceClass.getField("STRUCTURE_ALIGNMENT");
-                    field.setAccessible(true);
-                    alignments.put(interfaceClass, field.get(null));
-                }
-                catch(NoSuchFieldException e) {
-                    Map options = getLibraryOptions(interfaceClass);
-                    if (options != null
-                        && options.containsKey(Library.OPTION_STRUCTURE_ALIGNMENT)) {
-                        alignments.put(interfaceClass, options.get(Library.OPTION_STRUCTURE_ALIGNMENT));
-                    }
-                }
-                catch(Exception e) {
-                    throw new IllegalArgumentException("STRUCTURE_ALIGNMENT must be a public field of type int ("
-                                                       + e + "): " + interfaceClass);
-                }
-            }
-            Integer value = (Integer)alignments.get(interfaceClass);
-            return value != null ? value.intValue() : Structure.ALIGN_DEFAULT;
-        }
-    }
-    
-    /** Return a byte array corresponding to the given String.  If the
-     * system property <code>jna.encoding</code> is set, its value will override
-     * the default platform encoding (if supported).
-     */
-    static byte[] getBytes(String s) {
-        try {
-            return getBytes(s, System.getProperty("jna.encoding"));
-        }
-        catch (UnsupportedEncodingException e) {
-            return s.getBytes();
-        }
-    }
-
-    /** Return a byte array corresponding to the given String, using the given
-        encoding.
-    */
-    static byte[] getBytes(String s, String encoding) throws UnsupportedEncodingException {
-        if (encoding != null) {
-            return s.getBytes(encoding);
-        }
-        return s.getBytes();
-    }
-
-    /** Obtain a NUL-terminated byte buffer equivalent to the given String,
-        using <code>jna.encoding</code> or the default platform encoding if
-        that property is not set.
-    */
-    public static byte[] toByteArray(String s) {
-        byte[] bytes = getBytes(s);
-        byte[] buf = new byte[bytes.length+1];
-        System.arraycopy(bytes, 0, buf, 0, bytes.length);
-        return buf;
-    }
-
-    /** Obtain a NUL-terminated byte buffer equivalent to the given String,
-        using the given encoding.
-     */
-    public static byte[] toByteArray(String s, String encoding) throws UnsupportedEncodingException {
-        byte[] bytes = getBytes(s, encoding);
-        byte[] buf = new byte[bytes.length+1];
-        System.arraycopy(bytes, 0, buf, 0, bytes.length);
-        return buf;
-    }
-
-    /** Obtain a NUL-terminated wide character buffer equivalent to the given
-        String.
-    */ 
-    public static char[] toCharArray(String s) {
-        char[] chars = s.toCharArray();
-        char[] buf = new char[chars.length+1];
-        System.arraycopy(chars, 0, buf, 0, chars.length);
-        return buf;
-    }
-
-    static String getNativeLibraryResourcePath(int osType, String arch, String name) {
-        String osPrefix;
-        arch = arch.toLowerCase();
-        switch(osType) {
-        case Platform.WINDOWS:
-            if ("i386".equals(arch))
-                arch = "x86";
-            osPrefix = "win32-" + arch;
-            break;
-        case Platform.MAC:
-            osPrefix = "darwin";
-            break;
-        case Platform.LINUX:
-            if ("x86".equals(arch)) {
-                arch = "i386";
-            }
-            else if ("x86_64".equals(arch)) {
-                arch = "amd64";
-            }
-            osPrefix = "linux-" + arch;
-            break;
-        case Platform.SOLARIS:
-            osPrefix = "sunos-" + arch;
-            break;
-        default:
-            osPrefix = name.toLowerCase();
-            if ("x86".equals(arch)) {
-                arch = "i386";
-            }
-            if ("x86_64".equals(arch)) {
-                arch = "amd64";
-            }
-            if ("powerpc".equals(arch)) {
-                arch = "ppc";
-            }
-            int space = osPrefix.indexOf(" ");
-            if (space != -1) {
-                osPrefix = osPrefix.substring(0, space);
-            }
-            osPrefix += "-" + arch;
-            break;
-        }
-        return "/com/sun/jna/" + osPrefix;
-    }
-
-    /**
-     * Loads the JNA stub library.  It will first attempt to load this library
-     * from the directories specified in jna.boot.library.path.  If that fails,
-     * it will fallback to loading from the system library paths. Finally it will
-     * attempt to extract the stub library from from the JNA jar file, and load it.
-     * <p>
-     * The jna.boot.library.path property is mainly to support jna.jar being
-     * included in -Xbootclasspath, where java.library.path and LD_LIBRARY_PATH
-     * are ignored.  It might also be useful in other situations.
-     * </p>
-     */
-    private static void loadNativeLibrary() {
-        String libName = "jnidispatch";
-        String bootPath = System.getProperty("jna.boot.library.path");
-        if (bootPath != null) {
-            String[] dirs = bootPath.split(File.pathSeparator);
-            for (int i = 0; i < dirs.length; ++i) {
-                String path = new File(new File(dirs[i]), System.mapLibraryName(libName)).getAbsolutePath();
-                try {
-                    System.load(path);
-                    nativeLibraryPath = path;
-                    return;
-                } catch (UnsatisfiedLinkError ex) {
-                }
-                if (Platform.isMac()) {
-                    String orig, ext;
-                    if (path.endsWith("dylib")) {
-                        orig = "dylib";
-                        ext = "jnilib";
-                    } else {
-                        orig = "jnilib";
-                        ext = "dylib";
-                    }
-                    try {
-                        path = path.substring(0, path.lastIndexOf(orig)) + ext;
-                        System.load(path);
-                        nativeLibraryPath = path;
-                        return;
-                    } catch (UnsatisfiedLinkError ex) {
-                    }
-                }
-            }
-        }
-        try {
-            System.loadLibrary(libName);
-            nativeLibraryPath = libName;
-        }
-        catch(UnsatisfiedLinkError e) {
-            loadNativeLibraryFromJar();
-        }
-    }
-
-    /**
-     * Attempts to load the native library resource from the filesystem,
-     * extracting the JNA stub library from jna.jar if not already available.
-     */
-    private static void loadNativeLibraryFromJar() {
-        String libname = System.mapLibraryName("jnidispatch");
-        String arch = System.getProperty("os.arch");
-        String name = System.getProperty("os.name");
-        String resourceName = getNativeLibraryResourcePath(Platform.getOSType(), arch, name) + "/" + libname;
-        URL url = Native.class.getResource(resourceName);
-                
-        // Add an ugly hack for OpenJDK (soylatte) - JNI libs use the usual
-        // .dylib extension 
-        if (url == null && Platform.isMac()
-            && resourceName.endsWith(".dylib")) {
-            resourceName = resourceName.substring(0, resourceName.lastIndexOf(".dylib")) + ".jnilib";
-            url = Native.class.getResource(resourceName);
-        }
-        if (url == null) {
-            throw new UnsatisfiedLinkError("jnidispatch (" + resourceName 
-                                           + ") not found in resource path");
-        }
-    
-        File lib = null;
-        if (url.getProtocol().toLowerCase().equals("file")) {
-            try {
-                lib = new File(url.toURI());
-            }
-            catch(URISyntaxException e) {
-                lib = new File(url.getPath());
-            }
-            if (!lib.exists()) {
-                throw new Error("File URL " + url + " could not be properly decoded");
-            }
-        }
-        else {
-            InputStream is = Native.class.getResourceAsStream(resourceName);
-            if (is == null) {
-                throw new Error("Can't obtain jnidispatch InputStream");
-            }
-            
-            FileOutputStream fos = null;
-            try {
-                // Suffix is required on windows, or library fails to load
-                // Let Java pick the suffix, except on windows, to avoid
-                // problems with Web Start.
-                lib = File.createTempFile("jna", Platform.isWindows()?".dll":null);
-                lib.deleteOnExit();
-                ClassLoader cl = Native.class.getClassLoader();
-                if (Platform.deleteNativeLibraryAfterVMExit()
-                    && (cl == null
-                        || cl.equals(ClassLoader.getSystemClassLoader()))) {
-                    Runtime.getRuntime().addShutdownHook(new DeleteNativeLibrary(lib));
-                }
-                fos = new FileOutputStream(lib);
-                int count;
-                byte[] buf = new byte[1024];
-                while ((count = is.read(buf, 0, buf.length)) > 0) {
-                    fos.write(buf, 0, count);
-                }
-            }
-            catch(IOException e) {
-                throw new Error("Failed to create temporary file for jnidispatch library: " + e);
-            }
-            finally {
-                try { is.close(); } catch(IOException e) { }
-                if (fos != null) {
-                    try { fos.close(); } catch(IOException e) { }
-                }
-            }
-            unpacked = true;
-        }
-        System.load(lib.getAbsolutePath());
-        nativeLibraryPath = lib.getAbsolutePath();
-    }
-
-    /**
-     * Initialize field and method IDs for native methods of this class. 
-     * Returns the size of a native pointer.
-     **/
-    private static native int sizeof(int type);
-
-    private static native String getNativeVersion();
-    private static native String getAPIChecksum();
-
-    private static final ThreadLocal lastError = new ThreadLocal() {
-        protected synchronized Object initialValue() {
-            return new Integer(0);
-        }
-    };
-    
-    /** Retrieve the last error set by the OS.  This corresponds to
-     * <code>GetLastError()</code> on Windows, and <code>errno</code> on
-     * most other platforms.  The value is preserved per-thread, but whether 
-     * the original value is per-thread depends on the underlying OS.  The 
-     * result is undefined if {@link #getPreserveLastError} is 
-     * <code>false</code>.<p>
-     * The preferred method of obtaining the last error result is
-     * to declare your mapped method to throw {@link LastErrorException}
-     * instead. 
-     */
-    public static int getLastError() {
-        return ((Integer)lastError.get()).intValue();
-    }
-    
-    /** Set the OS last error code.  Whether the setting is per-thread
-     * or global depends on the underlying OS.
-     */
-    public static native void setLastError(int code);
-
-    /** Update the last error value (called from native code). */
-    static void updateLastError(int e) {
-        lastError.set(new Integer(e));
-    }
-
-    /**
-     * Returns a synchronized (thread-safe) library backed by the specified
-     * library.  This wrapping will prevent simultaneous invocations of any
-     * functions mapped to a given {@link NativeLibrary}.  Note that the 
-     * native library may still be sensitive to being called from different
-     * threads.
-     * <p>
-     * @param  library the library to be "wrapped" in a synchronized library.
-     * @return a synchronized view of the specified library.
-     */
-    public static Library synchronizedLibrary(final Library library) {
-        Class cls = library.getClass();
-        if (!Proxy.isProxyClass(cls)) {
-            throw new IllegalArgumentException("Library must be a proxy class");
-        }
-        InvocationHandler ih = Proxy.getInvocationHandler(library);
-        if (!(ih instanceof Library.Handler)) {
-            throw new IllegalArgumentException("Unrecognized proxy handler: " + ih);
-        }
-        final Library.Handler handler = (Library.Handler)ih; 
-        InvocationHandler newHandler = new InvocationHandler() {
-            public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
-                synchronized(handler.getNativeLibrary()) {
-                    return handler.invoke(library, method, args);
-                }
-            }
-        };
-        return (Library)Proxy.newProxyInstance(cls.getClassLoader(),
-                                               cls.getInterfaces(),
-                                               newHandler);
-    }
-    
-    /** If running web start, determine the location of a given native 
-     * library.  This value may be used to properly set 
-     * <code>jna.library.path</code> so that JNA can load libraries identified
-     * by the &lt;nativelib&gt; tag in the JNLP configuration file.  Returns 
-     * <code>null</code> if the Web Start native library cache location can not 
-     * be determined.  Note that the path returned may be different for any
-     * given library name.
-     * <p>
-     * Use <code>System.getProperty("javawebstart.version")</code> to detect
-     * whether your code is running under Web Start.
-     * @throws UnsatisfiedLinkError if the library can't be found by the
-     * Web Start class loader, which usually means it wasn't included as 
-     * a <code>&lt;nativelib&gt;</code> resource in the JNLP file.
-     * @return null if unable to query the web start loader.
-     */
-    public static String getWebStartLibraryPath(final String libName) {
-        if (System.getProperty("javawebstart.version") == null)
-            return null;
-        try {
-
-            final ClassLoader cl = Native.class.getClassLoader();
-            Method m = (Method)AccessController.doPrivileged(new PrivilegedAction() {
-                public Object run() {
-                    try {
-                        Method m = ClassLoader.class.getDeclaredMethod("findLibrary", new Class[] { String.class });
-                        m.setAccessible(true);
-                        return m;
-                    }
-                    catch(Exception e) {
-                        return null;
-                    }
-                }
-            });
-            String libpath = (String)m.invoke(cl, new Object[] { libName });
-            if (libpath != null) {
-                return new File(libpath).getParent();
-            }
-            return null;
-        }
-        catch (Exception e) {
-            return null;
-        }
-    }
-
-    /** For internal use only. */
-    public static class DeleteNativeLibrary extends Thread {
-        private final File file;
-        public DeleteNativeLibrary(File file) {
-            this.file = file;
-        }
-        public void run() {
-            // If we can't force an unload/delete, spawn a new process
-            // to do so
-            if (!deleteNativeLibrary()) {
-                try {
-                    Runtime.getRuntime().exec(new String[] {
-                        System.getProperty("java.home") + "/bin/java",
-                        "-cp", System.getProperty("java.class.path"),
-                        getClass().getName(),
-                        file.getAbsolutePath(),
-                    });
-                }
-                catch(IOException e) { e.printStackTrace(); }
-            }
-        }
-        public static void main(String[] args) {
-            if (args.length == 1) {
-                File file = new File(args[0]);
-                if (file.exists()) { 
-                    long start = System.currentTimeMillis();
-                    while (!file.delete() && file.exists()) {
-                        try { Thread.sleep(10); }
-                        catch(InterruptedException e) { }
-                        if (System.currentTimeMillis() - start > 5000) {
-                            System.err.println("Could not remove temp file: "
-                                               + file.getAbsolutePath());
-                            break;
-                        }
-                    }
-                }
-            }
-            System.exit(0);
-        }
-    }
-
-    /** Returns the native size of the given class, in bytes. 
-     * For use with arrays.
-     */
-    public static int getNativeSize(Class type, Object value) {
-        if (type.isArray()) {
-            int len = Array.getLength(value);
-            if (len > 0) {
-                Object o = Array.get(value, 0);
-                return len * getNativeSize(type.getComponentType(), o);
-            }
-            // Don't process zero-length arrays
-            throw new IllegalArgumentException("Arrays of length zero not allowed: " + type);
-        }
-        if (Structure.class.isAssignableFrom(type)
-            && !Structure.ByReference.class.isAssignableFrom(type)) {
-            if (value == null)
-                value = Structure.newInstance(type);
-            return ((Structure)value).size();
-        }
-        try {
-            return getNativeSize(type);
-        }
-        catch(IllegalArgumentException e) {
-            throw new IllegalArgumentException("The type \"" + type.getName()
-                                               + "\" is not supported: "
-                                               + e.getMessage());
-        }
-    }
-
-    /** Returns the native size for a given Java class.  Structures are
-     * assumed to be <code>struct</code> pointers unless they implement
-     * {@link Structure.ByValue}.
-     */
-    public static int getNativeSize(Class cls) {
-        if (NativeMapped.class.isAssignableFrom(cls)) {
-            cls = NativeMappedConverter.getInstance(cls).nativeType();
-        }
-        // boolean defaults to 32 bit integer if not otherwise mapped
-        if (cls == boolean.class || cls == Boolean.class) return 4;
-        if (cls == byte.class || cls == Byte.class) return 1;
-        if (cls == short.class || cls == Short.class) return 2; 
-        if (cls == char.class || cls == Character.class) return WCHAR_SIZE;
-        if (cls == int.class || cls == Integer.class) return 4;
-        if (cls == long.class || cls == Long.class) return 8;
-        if (cls == float.class || cls == Float.class) return 4;
-        if (cls == double.class || cls == Double.class) return 8;
-        if (Structure.class.isAssignableFrom(cls)) {
-            if (Structure.ByValue.class.isAssignableFrom(cls)) {
-                return Structure.newInstance(cls).size();
-            }
-            return POINTER_SIZE;
-        }
-        if (Pointer.class.isAssignableFrom(cls)
-            || Buffer.class.isAssignableFrom(cls)
-            || Callback.class.isAssignableFrom(cls)
-            || String.class == cls
-            || WString.class == cls) {
-            return POINTER_SIZE;
-        }
-        throw new IllegalArgumentException("Native size for type \"" + cls.getName() 
-        								   + "\" is unknown");
-    }
-
-    /** Indicate whether the given class is supported as a native argument
-     * type.
-     */  
-    public static boolean isSupportedNativeType(Class cls) {
-        if (Structure.class.isAssignableFrom(cls)) {
-            return true;
-        }
-        try {
-            return getNativeSize(cls) != 0;
-        }
-        catch(IllegalArgumentException e) {
-            return false;
-        }
-    }
-
-    /** Set the default handler invoked when a callback throws an uncaught
-     * exception.  If the given handler is <code>null</code>, the default
-     * handler will be reinstated.
-     */
-    public static void setCallbackExceptionHandler(UncaughtExceptionHandler eh) {
-        callbackExceptionHandler = eh == null ? DEFAULT_HANDLER : eh;
-    }
-
-    /** Returns the current handler for callback uncaught exceptions. */
-    public static UncaughtExceptionHandler getCallbackExceptionHandler() {
-        return callbackExceptionHandler;
-    }
-    
-    /** When called from a class static initializer, maps all native methods
-     * found within that class to native libraries via the JNA raw calling
-     * interface.
-     * @param libName library name to which functions should be bound
-     */
-    public static void register(String libName) {
-        register(getNativeClass(getCallingClass()),
-                 NativeLibrary.getInstance(libName));
-    }
-
-    /** When called from a class static initializer, maps all native methods
-     * found within that class to native libraries via the JNA raw calling
-     * interface.
-     * @param lib native library to which functions should be bound
-     */
-    public static void register(NativeLibrary lib) {
-        register(getNativeClass(getCallingClass()), lib);
-    }
-
-    static Class getNativeClass(Class cls) {
-        Method[] methods = cls.getDeclaredMethods();
-        for (int i=0;i < methods.length;i++) {
-            if ((methods[i].getModifiers() & Modifier.NATIVE) != 0) {
-                return cls;
-            }
-        }
-        int idx = cls.getName().lastIndexOf("$");
-        if (idx != -1) {
-            String name = cls.getName().substring(0, idx);
-            try {
-                return getNativeClass(Class.forName(name, true, cls.getClassLoader()));
-            }
-            catch(ClassNotFoundException e) {
-            }
-        }
-        throw new IllegalArgumentException("Can't determine class with native methods from the current context (" + cls + ")");
-    }
-
-    static Class getCallingClass() {
-        Class[] context = new SecurityManager() {
-            public Class[] getClassContext() {
-                return super.getClassContext();
-            }
-        }.getClassContext();
-        if (context.length < 4) {
-            throw new IllegalStateException("This method must be called from the static initializer of a class");
-        }
-        return context[3];
-    }
-
-    private static Map registeredClasses = new HashMap();
-    private static Map registeredLibraries = new HashMap();
-    private static Object unloader = new Object() {
-        protected void finalize() {
-            synchronized(registeredClasses) {
-                for (Iterator i=registeredClasses.entrySet().iterator();i.hasNext();) {
-                    Map.Entry e = (Map.Entry)i.next();
-                    unregister((Class)e.getKey(), (long[])e.getValue());
-                    i.remove();
-                }
-            }
-        }
-    };
-
-    /** Remove all native mappings for the calling class.
-        Should only be called if the class is no longer referenced and about
-        to be garbage collected.
-     */
-    public static void unregister() {
-        unregister(getNativeClass(getCallingClass()));
-    }
-
-    /** Remove all native mappings for the given class.
-        Should only be called if the class is no longer referenced and about
-        to be garbage collected.
-     */
-    public static void unregister(Class cls) {
-        synchronized(registeredClasses) {
-            if (registeredClasses.containsKey(cls)) {
-                unregister(cls, (long[])registeredClasses.get(cls));
-                registeredClasses.remove(cls);
-                registeredLibraries.remove(cls);
-            }
-        }
-    }
-
-    /** Unregister the native methods for the given class. */
-    private static native void unregister(Class cls, long[] handles);
-
-    private static String getSignature(Class cls) {
-        if (cls.isArray()) {
-            return "[" + getSignature(cls.getComponentType());
-        }
-        if (cls.isPrimitive()) {
-            if (cls == void.class) return "V";
-            if (cls == boolean.class) return "Z";
-            if (cls == byte.class) return "B";
-            if (cls == short.class) return "S";
-            if (cls == char.class) return "C";
-            if (cls == int.class) return "I";
-            if (cls == long.class) return "J";
-            if (cls == float.class) return "F";
-            if (cls == double.class) return "D";
-        }
-        return "L" + cls.getName().replace(".", "/") + ";";
-    }
-
-    private static final int CVT_UNSUPPORTED = -1;
-    private static final int CVT_DEFAULT = 0;
-    private static final int CVT_POINTER = 1;
-    private static final int CVT_STRING = 2;
-    private static final int CVT_STRUCTURE = 3;
-    private static final int CVT_STRUCTURE_BYVAL = 4;
-    private static final int CVT_BUFFER = 5;
-    private static final int CVT_ARRAY_BYTE = 6;
-    private static final int CVT_ARRAY_SHORT = 7;
-    private static final int CVT_ARRAY_CHAR = 8;
-    private static final int CVT_ARRAY_INT = 9;
-    private static final int CVT_ARRAY_LONG = 10;
-    private static final int CVT_ARRAY_FLOAT = 11;
-    private static final int CVT_ARRAY_DOUBLE = 12;
-    private static final int CVT_ARRAY_BOOLEAN = 13;
-    private static final int CVT_BOOLEAN = 14;
-    private static final int CVT_CALLBACK = 15;
-    private static final int CVT_FLOAT = 16;
-    private static final int CVT_NATIVE_MAPPED = 17;
-    private static final int CVT_WSTRING = 18;
-    private static final int CVT_INTEGER_TYPE = 19;
-    private static final int CVT_POINTER_TYPE = 20;
-    private static final int CVT_TYPE_MAPPER = 21;
-
-    private static int getConversion(Class type, TypeMapper mapper) {
-        if (type == Boolean.class) type = boolean.class;
-        else if (type == Byte.class) type = byte.class;
-        else if (type == Short.class) type = short.class;
-        else if (type == Character.class) type = char.class;
-        else if (type == Integer.class) type = int.class;
-        else if (type == Long.class) type = long.class;
-        else if (type == Float.class) type = float.class;
-        else if (type == Double.class) type = double.class;
-        else if (type == Void.class) type = void.class;
-            
-        if (mapper != null
-            && (mapper.getFromNativeConverter(type) != null
-                || mapper.getToNativeConverter(type) != null)) {
-            return CVT_TYPE_MAPPER;
-        }
-
-        if (Pointer.class.isAssignableFrom(type)) {
-            return CVT_POINTER;
-        }
-        if (String.class == type) {
-            return CVT_STRING;
-        }
-        if (WString.class.isAssignableFrom(type)) {
-            return CVT_WSTRING;
-        }
-        if (Buffer.class.isAssignableFrom(type)) {
-            return CVT_BUFFER;
-        }
-        if (Structure.class.isAssignableFrom(type)) {
-            if (Structure.ByValue.class.isAssignableFrom(type)) {
-                return CVT_STRUCTURE_BYVAL;
-            }
-            return CVT_STRUCTURE;
-        }
-        if (type.isArray()) {
-            switch(type.getName().charAt(1)) {
-            case 'Z': return CVT_ARRAY_BOOLEAN;
-            case 'B': return CVT_ARRAY_BYTE;
-            case 'S': return CVT_ARRAY_SHORT;
-            case 'C': return CVT_ARRAY_CHAR;
-            case 'I': return CVT_ARRAY_INT;
-            case 'J': return CVT_ARRAY_LONG;
-            case 'F': return CVT_ARRAY_FLOAT;
-            case 'D': return CVT_ARRAY_DOUBLE;
-            default: break;
-            }
-        }
-        if (type.isPrimitive()) {
-            return type == boolean.class ? CVT_BOOLEAN : CVT_DEFAULT;
-        }
-        if (Callback.class.isAssignableFrom(type)) {
-            return CVT_CALLBACK;
-        }
-        if (IntegerType.class.isAssignableFrom(type)) {
-            return CVT_INTEGER_TYPE;
-        }
-        if (PointerType.class.isAssignableFrom(type)) {
-            return CVT_POINTER_TYPE;
-        }
-        if (NativeMapped.class.isAssignableFrom(type)) {
-            return CVT_NATIVE_MAPPED;
-        }
-        return CVT_UNSUPPORTED;
-    }
-
-    /** When called from a class static initializer, maps all native methods
-     * found within that class to native libraries via the JNA raw calling
-     * interface.
-     * @param lib library to which functions should be bound
-     */
-    // TODO: derive options from annotations (per-class or per-method)
-    // options: read parameter type mapping (long/native long),
-    // method name, library name, call conv
-    public static void register(Class cls, NativeLibrary lib) {
-        Method[] methods = cls.getDeclaredMethods();
-        List mlist = new ArrayList();
-        TypeMapper mapper = (TypeMapper)
-            lib.getOptions().get(Library.OPTION_TYPE_MAPPER);
-
-        for (int i=0;i < methods.length;i++) {
-            if ((methods[i].getModifiers() & Modifier.NATIVE) != 0) {
-                mlist.add(methods[i]);
-            }
-        }
-        long[] handles = new long[mlist.size()];
-        for (int i=0;i < handles.length;i++) {
-            Method method = (Method)mlist.get(i);
-            String sig = "(";
-            Class rclass = method.getReturnType();
-            long rtype, closure_rtype;
-            Class[] ptypes = method.getParameterTypes();
-            long[] atypes = new long[ptypes.length];
-            long[] closure_atypes = new long[ptypes.length];
-            int[] cvt = new int[ptypes.length];
-            ToNativeConverter[] toNative = new ToNativeConverter[ptypes.length];
-            FromNativeConverter fromNative = null;
-            int rcvt = getConversion(rclass, mapper);
-            boolean throwLastError = false;
-            switch (rcvt) {
-            case CVT_UNSUPPORTED:
-                throw new IllegalArgumentException(rclass + " is not a supported return type (in method " + method.getName() + " in " + cls + ")");
-            case CVT_TYPE_MAPPER:
-                fromNative = mapper.getFromNativeConverter(rclass);
-                closure_rtype = FFIType.get(rclass).peer;
-                rtype = FFIType.get(fromNative.nativeType()).peer;
-                break;
-            case CVT_NATIVE_MAPPED:
-            case CVT_INTEGER_TYPE:
-            case CVT_POINTER_TYPE:
-                closure_rtype = FFIType.get(Pointer.class).peer;
-                rtype = FFIType.get(NativeMappedConverter.getInstance(rclass).nativeType()).peer;
-                break;
-            case CVT_STRUCTURE:
-                closure_rtype = rtype = FFIType.get(Pointer.class).peer;
-                break;
-            case CVT_STRUCTURE_BYVAL:
-                closure_rtype = FFIType.get(Pointer.class).peer;
-                rtype = FFIType.get(rclass).peer;
-                break;
-            default:
-                closure_rtype = rtype = FFIType.get(rclass).peer;
-                break;
-            }
-            for (int t=0;t < ptypes.length;t++) {
-                Class type = ptypes[t];
-                sig += getSignature(type);
-                cvt[t] = getConversion(type, mapper);
-                if (cvt[t] == CVT_UNSUPPORTED) {
-                    throw new IllegalArgumentException(type + " is not a supported argument type (in method " + method.getName() + " in " + cls + ")");
-                }
-                if (cvt[t] == CVT_NATIVE_MAPPED
-                    || cvt[t] == CVT_INTEGER_TYPE) {
-                    type = NativeMappedConverter.getInstance(type).nativeType();
-                }
-                else if (cvt[t] == CVT_TYPE_MAPPER) {
-                    toNative[t] = mapper.getToNativeConverter(type);
-                }
-                // Determine the type that will be passed to the native
-                // function, as well as the type to be passed
-                // from Java initially
-                switch(cvt[t]) {
-                case CVT_STRUCTURE_BYVAL:
-                case CVT_INTEGER_TYPE:
-                case CVT_POINTER_TYPE:
-                case CVT_NATIVE_MAPPED:
-                    atypes[t] = FFIType.get(type).peer;
-                    closure_atypes[t] = FFIType.get(Pointer.class).peer;
-                    break;
-                case CVT_TYPE_MAPPER:
-                    if (type.isPrimitive())
-                        closure_atypes[t] = FFIType.get(type).peer;
-                    else
-                        closure_atypes[t] = FFIType.get(Pointer.class).peer;
-                    atypes[t] = FFIType.get(toNative[t].nativeType()).peer;
-                    break;
-                case CVT_DEFAULT:
-                    closure_atypes[t] = atypes[t] = FFIType.get(type).peer;
-                    break;
-                default:
-                    closure_atypes[t] = atypes[t] = FFIType.get(Pointer.class).peer;
-                    break;
-                }
-            }
-            sig += ")";
-            sig += getSignature(rclass);
-            
-            Class[] etypes = method.getExceptionTypes();
-            for (int e=0;e < etypes.length;e++) {
-                if (LastErrorException.class.isAssignableFrom(etypes[e])) {
-                    throwLastError = true;
-                    break;
-                }
-            }
-
-            String name = method.getName();
-            FunctionMapper fmapper = (FunctionMapper)lib.getOptions().get(Library.OPTION_FUNCTION_MAPPER);
-            if (fmapper != null) {
-                name = fmapper.getFunctionName(lib, method);
-            }
-            Function f = lib.getFunction(name, method);
-            try {
-                handles[i] = registerMethod(cls, method.getName(),
-                                            sig, cvt,
-                                            closure_atypes, atypes, rcvt,
-                                            closure_rtype, rtype, 
-                                            rclass,
-                                            f.peer, f.getCallingConvention(),
-                                            throwLastError,
-                                            toNative, fromNative);
-            }
-            catch(NoSuchMethodError e) {
-                throw new UnsatisfiedLinkError("No method " + method.getName() + " with signature " + sig + " in " + cls);
-            }
-        }
-        synchronized(registeredClasses) {
-            registeredClasses.put(cls, handles);
-            registeredLibraries.put(cls, lib);
-        }
-        cacheOptions(cls, lib.getOptions(), null);
-    }
-
-    /** Take note of options used for a given library mapping, to facilitate
-        looking them up later.
-    */
-    private static void cacheOptions(Class cls, Map libOptions, Object proxy) {
-        synchronized(libraries) {
-            if (!libOptions.isEmpty()) 
-                options.put(cls, libOptions);
-            if (libOptions.containsKey(Library.OPTION_TYPE_MAPPER))
-                typeMappers.put(cls, libOptions.get(Library.OPTION_TYPE_MAPPER));
-            if (libOptions.containsKey(Library.OPTION_STRUCTURE_ALIGNMENT))
-                alignments.put(cls, libOptions.get(Library.OPTION_STRUCTURE_ALIGNMENT));
-            if (proxy != null) {
-                libraries.put(cls, new WeakReference(proxy));
-            }
-
-            // If it's a direct mapping, AND implements a Library interface,
-            // cache the library interface as well, so that any nested
-            // classes get the appropriate associated options
-            if (!cls.isInterface()
-                && Library.class.isAssignableFrom(cls)) {
-                Class ifaces[] = cls.getInterfaces();
-                for (int i=0;i < ifaces.length;i++) {
-                    if (Library.class.isAssignableFrom(ifaces[i])) {
-                        cacheOptions(ifaces[i], libOptions, proxy);
-                        break;
-                    }
-                }
-            }
-        }
-    }
-
-    private static native long registerMethod(Class cls,
-                                              String name,
-                                              String signature,
-                                              int[] conversions,
-                                              long[] closure_arg_types,
-                                              long[] arg_types,
-                                              int rconversion,
-                                              long closure_rtype,
-                                              long rtype,
-                                              Class rclass,
-                                              long fptr,
-                                              int callingConvention,
-                                              boolean throwLastError,
-                                              ToNativeConverter[] toNative,
-                                              FromNativeConverter fromNative);
-    
-
-    // Called from native code
-    private static NativeMapped fromNative(Class cls, Object value) {
-        // NOTE: technically should be either CallbackParameterContext or
-        // FunctionResultContext 
-        return (NativeMapped)NativeMappedConverter.getInstance(cls).fromNative(value, new FromNativeContext(cls));
-    }
-    // Called from native code
-    private static Class nativeType(Class cls) {
-        return NativeMappedConverter.getInstance(cls).nativeType();
-    }
-    // Called from native code
-    private static Object toNative(ToNativeConverter cvt, Object o) {
-        // NOTE: technically should be either CallbackResultContext or
-        // FunctionParameterContext
-        return cvt.toNative(o, new ToNativeContext());
-    }
-    // Called from native code
-    private static Object fromNative(FromNativeConverter cvt, Object o, Class cls) {
-        // NOTE: technically should be FunctionResultContext 
-        return cvt.fromNative(o, new FromNativeContext(cls));
-    }
-
-    public static native long ffi_prep_cif(int abi, int nargs, long ffi_return_type, long ffi_types);
-    public static native void ffi_call(long cif, long fptr, long resp, long args);
-    public static native long ffi_prep_closure(long cif, ffi_callback cb);
-    public static native void ffi_free_closure(long closure);
-    
-    /** Returns the size (calculated by libffi) of the given type. */
-    static native int initialize_ffi_type(long type_info);
-
-    public interface ffi_callback {
-        void invoke(long cif, long resp, long argp);
-    }
-
-    /** Prints JNA library details to the console. */
-    public static void main(String[] args) {
-        final String DEFAULT_TITLE = "Java Native Access (JNA)";
-        final String DEFAULT_VERSION = VERSION;
-        final String DEFAULT_BUILD = VERSION + " (package information missing)";
-        Package pkg = Native.class.getPackage();
-        String title = pkg.getSpecificationTitle();
-        if (title == null) title = DEFAULT_TITLE;
-        String version = pkg.getSpecificationVersion();
-        if (version == null) version = DEFAULT_VERSION;
-        title += " API Version " + version;
-        System.out.println(title);
-        version = pkg.getImplementationVersion();
-        if (version == null) version = DEFAULT_BUILD;
-        System.out.println("Version: " + version);
-        System.out.println(" Native: " + getNativeVersion() + " ("
-                           + getAPIChecksum() + ")");
-        System.exit(0);
-    }
-}

=== removed directory '.pc/05-support-gnu-kfreebsd.patch'
=== removed file '.pc/05-support-gnu-kfreebsd.patch/build.xml'
--- .pc/05-support-gnu-kfreebsd.patch/build.xml	2010-05-26 00:14:07 +0000
+++ .pc/05-support-gnu-kfreebsd.patch/build.xml	1970-01-01 00:00:00 +0000
@@ -1,647 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="JNA" default="default" basedir=".">
-  <description>Builds and tests JNA</description>
-
-  <!--  
-  Conventions (since ant can't easily specify arbitrary file dependencies):
-  The uptodate property for a given target TARGET is "-TARGET"; the actual
-  target to generate the uptodate property is named ":TARGET".
-
-  Properties (except for uptodate properties) separate words by dots, targets
-  by dashes. 
-  -->
-
-  <!-- global properties -->
-  <!-- (all build-related props should go in -dynamic-properties) -->
-  <property name="name" value="jna"/>
-  <property name="jar" value="${name}.jar"/>
-  <property name="testjar" value="${name}-test.jar"/>
-  <property name="debug" value="true"/>
-  <property name="debug.native" value="false"/>
-  <property name="cflags_extra.native" value=""/>
-  <property name="dynlink.native" value="false"/>
-  <property name="native" location="native"/>
-  <property name="src" location="src"/>
-  <property name="dist" location="dist"/>
-  <property name="test.src" location="test"/>
-  <property name="doc" location="doc"/>
-  <property name="javadoc" location="${doc}/javadoc"/>
-  <property name="stylesheet" location="${javadoc}/doc/css/javadoc.css"/>
-  <property name="vendor" value="JNA Development Team"/>
-  <property name="copyright"
-            value="Copyright &amp;copy; 2007-2009 Timothy Wall. All Rights Reserved."/>
-  <buildnumber/>
-  <!-- JNA library release version -->            
-  <property name="jna.major" value="3"/>
-  <property name="jna.minor" value="2"/>
-  <property name="jna.revision" value="4"/>
-  <property name="jna.build" value="${build.number}"/>
-  <property name="jna.version" value="${jna.major}.${jna.minor}.${jna.revision}"/>
-  <!-- jnidispatch library release version -->
-  <property name="jni.major" value="3"/>
-  <property name="jni.minor" value="2"/>
-  <property name="jni.revision" value="1"/>
-  <property name="jni.build" value="${build.number}"/>
-  <property name="jni.version" value="${jni.major}.${jni.minor}.${jni.revision}"/>
-  <property name="jni.md5" value="c870290c36c8d3fdf85db7c782febc3f"/>
-  <property name="spec.title" value="Java Native Access (JNA)"/>
-  <property name="spec.vendor" value="${vendor}"/>
-  <property name="spec.version" value="${jna.major}"/>
-  <property name="impl.title" value="com.sun.jna"/>
-  <property name="impl.vendor" value="${spec.vendor}"/>
-  <property name="impl.version" value="${jna.version} (b${jna.build})"/>
-
-  <property name="compatibility" value="1.4"/>
-  <property name="test.compatibility" value="1.5"/>
-
-  <!-- Miscellaneous -->
-  <property name="build.compiler.emacs" value="true"/>
-
-  <target name="default" depends="test" description="Build and Test."/>
-
-  <target name="init" depends="-setup"/>
-  <target name="compile-test-single" depends="compile-tests"/>
-  <target name="compile-single" depends="compile"/>
-
-  <target name="-dynamic-properties">
-    <echo>Java version ${java.version}, compatibility: ${compatibility}</echo>
-    <echo>JNA version ${jna.version}, native ${jni.version}</echo>
-    <echo>${java.vm.name} (${java.vm.vendor}, ${java.vm.version})</echo>
-    <echo>java.home=${java.home}</echo>
-    <echo>java.library.path=${java.library.path}</echo>
-
-    <replaceregexp match="(&lt;version&gt;).*(&lt;/version&gt;)"
-                   replace="\1${jna.version}\2" 
-                   file="pom.xml"/>
-    <replaceregexp match='VERSION = ".*";'
-                   replace='VERSION = "${jna.version}";'
-                   file="src/com/sun/jna/Native.java"/>
-
-    <condition property="jar.omitted" value="**/*jnidispatch*" else="jnilib-included">
-      <isset property="omit-jnilib"/>
-    </condition>
-    <condition property="vm.arch" value="-d64" else="">
-      <or>
-        <equals arg1="${sun.arch.data.model}" arg2="64" trim="true"/>
-        <equals arg1="${com.ibm.vm.bitmode}" arg2="64" trim="true"/>
-        <os arch="x86_64"/>
-        <os arch="ppc64"/>
-        <os arch="sparcv9"/>
-        <os arch="amd64"/>
-      </or>
-    </condition>
-    <condition property="ld.preload" value="LD_PRELOAD_64" else="LD_PRELOAD">
-      <and>
-        <os name="SunOS"/>
-        <equals arg1="${vm.arch}" arg2="-d64"/>
-      </and>
-    </condition>
-    <property name="build" value="build"/>
-    <property name="classes" location="${build}/classes"/>
-    <property name="eclipse.classes" location="build.eclipse/classes"/>
-    <property name="test.classes" location="${build}/test-classes"/>
-    <property name="reports" value="${build}/reports"/>
-
-    <!-- Add other supported platforms here -->
-    <condition property="jre.arch" value="i386">
-      <equals arg1="x86" arg2="${os.arch}"/>
-    </condition>
-    <condition property="jre.arch" value="amd64">
-      <equals arg1="x86_64" arg2="${os.arch}"/>
-    </condition>
-    <property name="jre.arch" value="${os.arch}"/>
-    <condition property="os.prefix" value="linux-${jre.arch}">
-      <os name="Linux"/>
-    </condition>
-    <condition property="os.prefix" value="win32-${os.arch}">
-      <os family="windows"/>
-    </condition>
-    <!-- Darwin builds are universal, no arch required -->
-    <condition property="os.prefix" value="darwin">
-      <os family="mac"/>
-    </condition>
-    <condition property="os.prefix" value="sunos-${os.arch}">
-      <os name="SunOS"/>
-    </condition>
-    <condition property="os.prefix" value="freebsd-${os.arch}">
-      <os name="FreeBSD"/>
-    </condition>
-    <condition property="os.prefix" value="openbsd-${os.arch}">
-      <os name="OpenBSD"/>
-    </condition>
-    <fail unless="os.prefix" message="OS/arch not supported (${os.name}/${os.arch}), edit build.xml and native/Makefile to add it."/>
-    <condition property="jdk.home" value="${java.home}">
-      <available file="${java.home}/include"/>
-    </condition>
-    <condition property="jdk.home" value="${java.home}/..">
-      <available file="${java.home}/../include"/>
-    </condition>
-    <fail unless="jdk.home" message="JAVA_HOME/java.home must be a JDK, not JRE"/>
-    <condition property="libjsig"
-               value="${java.home}/lib/${jre.arch}/libjsig.so" else="">
-      <available file="${java.home}/lib/${jre.arch}/libjsig.so"/>
-    </condition>
-    <property name="native.jar" value="${os.prefix}.jar"/>
-    <property name="build.native" location="${build}/native"/>
-    <property name="md5.file" location="${build.native}/sig"/>
-
-    <mkdir dir="${build}"/>
-    <mkdir dir="${build.native}"/>
-    <mkdir dir="${classes}"/>
-    <mkdir dir="${test.classes}"/>
-    <mkdir dir="${reports}"/>
-    <mkdir dir="${doc}"/>
-
-  </target>
-
-  <target name="-setup" depends="-dynamic-properties">
-    <path id="compile-test.path">
-      <pathelement path="${test.src}"/>
-      <path id="test.libs">
-        <fileset dir="lib">
-          <include name="junit.jar"/>   
-        </fileset>
-        <pathelement path="${classes}"/>
-      </path>
-      <path id="compile.path">
-        <path id="src.path">
-          <pathelement location="${src}"/>
-        </path>
-      </path>                           
-    </path>                           
-
-    <path id="test.runpath">
-      <pathelement path="${build}/${jar}"/>
-      <pathelement path="${build}/examples.jar"/>
-      <pathelement path="${test.classes}"/>
-      <pathelement path="lib/clover.jar"/>
-      <path refid="test.libs"/>
-    </path>
-  </target>
-
-  <target name="compile" depends="-setup"
-          description="Compile all Java source">
-    <javac classpathref="compile.path"
-           source="${compatibility}"
-           target="${compatibility}"
-           destdir="${classes}" 
-           deprecation="on" debug="${debug}">
-      <src path="${src}"/>
-    </javac>
-  </target>
-
-  <target name=":jar">
-    <uptodate property="-jar" targetfile="${build}/${jar}">
-      <srcfiles dir="${classes}">
-        <patternset id="jar-compiled">
-          <include name="com/sun/jna/*"/>
-          <include name="com/sun/jna/**/*"/>
-          <exclude name="com/sun/jna/examples/*"/>
-          <exclude name="com/sun/jna/examples/**/*"/>
-        </patternset>
-      </srcfiles>
-    </uptodate>
-  </target>
-  <target name="jar" depends="-setup,native,:jar" unless="-jar"
-          description="Build primary jar">
-    <jar jarfile="${build}/${jar}">
-      <manifest>
-        <attribute name="Main-Class" value="com.sun.jna.Native"/>
-        <section name="com/sun/jna/">
-          <attribute name="Implementation-Title" value="${impl.title}"/>
-          <attribute name="Implementation-Vendor" value="${vendor}"/>
-          <attribute name="Implementation-Version" value="${impl.version}"/>
-          <attribute name="Specification-Title" value="${spec.title}"/>
-          <attribute name="Specification-Vendor" value="${spec.vendor}"/>
-          <attribute name="Specification-Version" value="${spec.version}"/>
-        </section>
-      </manifest>
-      <fileset dir="${classes}" excludes="${jar.omitted}">
-        <patternset refid="jar-compiled"/>
-      </fileset>
-    </jar>
-  </target>
-  <target name="examples" depends="jar,native">
-    <jar jarfile="${build}/examples.jar">
-      <manifest>
-        <attribute name="Class-Path" value="jna.jar"/>
-        <attribute name="Main-Class" value="com.sun.jna.examples.ShapedWindowDemo"/>
-      </manifest>
-      <fileset dir="${src}" includes="**/examples/**/*.png"/>
-      <fileset dir="${classes}" includes="**/examples/*,**/examples/**/*"/>
-      <fileset dir="${classes}" includes="jnidispatch.dll"/>
-    </jar>
-  </target>
-
-  <target name="javah" depends="compile">
-    <javah classpath="${classes}" destdir="${build.native}" force="yes">
-      <class name="com.sun.jna.Function"/>
-      <class name="com.sun.jna.Pointer"/>
-      <class name="com.sun.jna.Memory"/>
-      <class name="com.sun.jna.Native"/>
-      <class name="com.sun.jna.NativeLibrary"/>
-      <class name="com.sun.jna.CallbackReference"/>
-    </javah>
-    <condition property="grep" value="/usr/sfw/bin/ggrep">
-      <os name="SunOS"/>
-    </condition>
-    <condition property="grep" value="ggrep">
-      <os name="OpenBSD"/>
-    </condition>
-    <property name="grep" value="grep"/>
-    <apply dir="${build.native}" executable="${grep}" parallel="true"
-           failonerror="true" relative="true" output="${md5.file}">
-      <arg value="-A"/>
-      <arg value="1"/>
-      <arg value="JNIEXPORT"/>
-      <fileset dir="${build.native}" includes="*.h"/>
-    </apply>
-    <fixcrlf srcdir="${build.native}" includes="sig" eol="unix"/>
-    <checksum property="md5" file="${md5.file}" />
-    <condition property="jni.valid" value="true">
-      <or>
-        <equals arg1="${jni.md5}" arg2="${md5}" trim="true"/>
-        <equals arg1="${jni.md5}" arg2=""/>
-      </or>
-    </condition>
-  </target>
-
-  <!-- Invalidate native libraries when native API changes -->
-  <target name="-native-api-check" depends="javah" unless="jni.valid">
-    <echo>Invalidating native code, new checksum is ${md5}</echo>
-    <copy file="${dist}/out-of-date.jar" tofile="${dist}/darwin.jar" overwrite="true"/>
-    <copy file="${dist}/out-of-date.jar" tofile="${dist}/win32-x86.jar" overwrite="true"/>
-    <copy file="${dist}/out-of-date.jar" tofile="${dist}/win32-amd64.jar" overwrite="true"/>
-    <copy file="${dist}/out-of-date.jar" tofile="${dist}/linux-i386.jar" overwrite="true"/>
-    <copy file="${dist}/out-of-date.jar" tofile="${dist}/linux-amd64.jar" overwrite="true"/>
-    <copy file="${dist}/out-of-date.jar" tofile="${dist}/linux-ia64.jar" overwrite="true"/>
-    <copy file="${dist}/out-of-date.jar" tofile="${dist}/freebsd-i386.jar" overwrite="true"/>
-    <copy file="${dist}/out-of-date.jar" tofile="${dist}/freebsd-amd64.jar" overwrite="true"/>
-    <copy file="${dist}/out-of-date.jar" tofile="${dist}/openbsd-i386.jar" overwrite="true"/>
-    <copy file="${dist}/out-of-date.jar" tofile="${dist}/sunos-x86.jar" overwrite="true"/>
-    <copy file="${dist}/out-of-date.jar" tofile="${dist}/sunos-amd64.jar" overwrite="true"/>
-    <copy file="${dist}/out-of-date.jar" tofile="${dist}/sunos-sparc.jar" overwrite="true"/>
-    <copy file="${dist}/out-of-date.jar" tofile="${dist}/sunos-sparcv9.jar" overwrite="true"/>
-    <delete failOnError="false" includeEmptyDirs="true">
-      <fileset dir="${build.native}" includes="*.o,*jnidispatch*"/>
-    </delete>
-    <fail>API for native code has changed.  Re-run this build after updating jni.version and jni.md5 in build.xml</fail>
-  </target>
-
-  <target name=":rsrc">
-    <condition property="-rsrc">
-      <not><os family="windows"/></not>
-    </condition>
-  </target>
-  <target name="rsrc" depends="-setup,:rsrc" unless="-rsrc"
-          description="Generate w32 DLL version resource information">
-    <property name="rsrc" location="${build.native}/jnidispatch.rc"/>
-    <copy todir="${build.native}" file="${native}/jnidispatch.rc"/>
-    <replaceregexp match="FILEVERSION.*"
-                   replace="FILEVERSION ${jni.major},${jni.minor},${jni.revision},${jni.build}"
-                   file="${rsrc}" byline="true"/>
-    <replaceregexp match="PRODUCTVERSION.*"
-                   replace="PRODUCTVERSION ${jna.major},${jna.minor},${jna.revision},${jna.build}"
-                   file="${rsrc}" byline="true"/>
-    <replaceregexp match="FileVersion.*"
-                   replace="FileVersion&quot;,&quot;${jni.version}&quot;"
-                   file="${rsrc}" byline="true"/>
-    <replaceregexp match="Full Version.*"
-                   replace="Full Version&quot;,&quot;${jni.version} b${jni.build}&quot;"
-                   file="${rsrc}" byline="true"/>
-    <replaceregexp match="ProductVersion.*"
-                   replace="ProductVersion&quot;,&quot;${spec.version}&quot;"
-                   file="${rsrc}" byline="true"/>
-  </target>
-
-  <target name="native" depends="-setup,javah,-native-api-check,rsrc"
-          description="Build native libraries.  Use 'ant -DCC=xxx' to build using a compiler other than gcc">
-    <property name="comment" value="# auto-generated by ant"/>
-    <replaceregexp match="^VERSION=.*"
-                   replace="VERSION=${jni.version} ${comment}"
-                   file="native/Makefile" byline="true"/>
-    <replaceregexp match="^CHECKSUM=.*"
-                   replace="CHECKSUM=${jni.md5} ${comment}"
-                   file="native/Makefile" byline="true"/>
-    <!-- ensure ARCH is set properly for 64-bit capable platforms -->
-    <!-- use ANT_OPTS=-d64 to build 64-bit if not the platform default -->
-    <property name="ARCH" value="${os.arch}"/>
-    <condition property="make.CC" value="CC=${CC}" else="IGNORE=">
-      <isset property="CC"/>
-    </condition>
-    <condition property="make.ARCH" value="ARCH=${ARCH}" else="IGNORE=">
-      <isset property="ARCH"/>
-    </condition>
-    <condition property="make.SDKROOT" value="SDKROOT=${SDKROOT}">
-      <isset property="SDKROOT"/>
-    </condition>
-    <condition property="make.SDKROOT"
-	       value="SDKROOT=/Developer/SDKs/MacOSX10.5.sdk">
-      <available file="/Developer/SDKs/MacOSX10.5.sdk"/>
-    </condition>
-    <condition property="make.SDKROOT"
-	       value="SDKROOT=/Developer/SDKs/MacOSX10.4u.sdk" else="IGNORE=">
-      <available file="/Developer/SDKs/MacOSX10.4u.sdk"/>
-    </condition>
-    <!-- Windows' drive letters and spaces in absolute paths wreak havoc on 
-         make --> 
-    <condition property="make.BUILD" value="BUILD=../${build}/native" else="BUILD=${build.native}">
-      <os family="windows"/>
-    </condition>
-    <condition property="make.PATH" value="PATH=/usr/sfw/bin:/usr/bin:/usr/ccs/bin" else="IGNORE=">
-      <os name="SunOS"/>
-    </condition>
-    <condition property="make" value="/usr/sfw/bin/gmake">
-      <os name="SunOS"/>
-    </condition>
-    <condition property="make" value="gmake">
-      <or>
-        <os name="FreeBSD"/>
-        <os name="OpenBSD"/>
-      </or>
-    </condition>
-    <!-- Default make program -->
-    <property name="make" value="make"/>
-
-    <exec executable="${make}" dir="${native}" failonerror="true">
-      <arg value="JAVA_HOME=${jdk.home}"/>
-      <arg value="JAVAH=${build.native}"/>
-      <arg value="DEBUG=${debug.native}"/>
-      <arg value="CFLAGS_EXTRA=${cflags_extra.native}"/>
-      <arg value="DYNAMIC_LIBFFI=${dynlink.native}"/>
-      <arg value="${make.CC}"/>
-      <arg value="${make.BUILD}"/>
-      <arg value="${make.SDKROOT}"/>
-      <arg value="${make.ARCH}"/>
-      <arg value="${make.PATH}"/>
-      <arg value="VERSION=${jni.version}"/>
-      <arg value="CHECKSUM=${jni.md5}"/>
-    </exec>
-    <antcall target="native-mixedjar"/>
-    <!-- For web start, native libraries may be provided in the root of -->
-    <!-- an included jar file -->
-    <jar jarfile="${build}/${native.jar}">
-      <fileset dir="${build.native}" includes="jnidispatch.dll,libjnidispatch.*"/>
-      <manifest>
-        <attribute name="Implementation-Version" value="${jni.version} b${jni.build}"/>
-        <attribute name="Specification-Version" value="${jni.version}"/>
-      </manifest>
-    </jar>
-  </target>
-
-  <target name="native-mixedjar" unless="nomixedjar.native">    
-    <mkdir dir="${classes}/com/sun/jna/${os.prefix}"/>
-    <copy todir="${classes}/com/sun/jna/${os.prefix}">
-      <fileset dir="${build.native}"
-               includes="jnidispatch.dll,libjnidispatch.*"/>
-    </copy>
-    <mkdir dir="${eclipse.classes}/com/sun/jna/${os.prefix}"/>
-    <copy todir="${eclipse.classes}/com/sun/jna/${os.prefix}"
-          failonerror="false">
-      <fileset dir="${build.native}"
-               includes="jnidispatch.dll,libjnidispatch.*"/>
-    </copy>
-  </target>
-
-  <target name="compile-tests" depends="compile,native,jar"
-          description="Compile all test code">
-    <javac classpathref="compile-test.path"
-           source="${test.compatibility}"
-           target="${test.compatibility}"
-           destdir="${test.classes}" 
-           deprecation="on" debug="${debug}">
-      <src path="${test.src}"/>
-    </javac>
-    <jar jarfile="${build}/${testjar}">
-      <fileset dir="${test.classes}">
-        <patternset refid="jar-compiled"/>
-      </fileset>
-    </jar>
-    <mkdir dir="${build}/jws"/>
-    <copy todir="${build}/jws" file="${build}/${jar}"/>
-    <copy todir="${build}/jws" file="${build}/${testjar}"/>
-    <copy todir="${build}/jws" file="lib/junit.jar"/>
-    <copy todir="${build}/jws" file="lib/clover.jar"/>
-    <jar jarfile="${build}/jws/jnidispatch.jar">
-      <fileset dir="${build.native}" includes="*jnidispatch.*"/>
-    </jar>
-    <signjar alias="jna" keystore="jna.keystore" storepass="jnadev" lazy="true"> 
-      <fileset dir="${build}/jws" includes="jna.jar,jna-test.jar,junit.jar,jnidispatch.jar,clover.jar"/>
-    </signjar>
-  </target>
-
-  <!-- When running tests from an IDE, be sure to set jna.library.path -->
-  <!-- to where the test library (testlib) is found.                   -->
-  <target name="test" depends="jar,examples,compile-tests"
-          description="Run all unit tests">
-    <property name="test.fork" value="yes"/>
-    <property name="reports.junit" location="${reports}/junit"/>
-    <property name="results.junit" location="${build}/junit-results"/>
-    <mkdir dir="${results.junit}"/>
-    <echo>Saving test results in ${results.junit}</echo>
-    <property name="tests.stdcall" value="**/win32/*StdCallTest.java"/>
-    <condition property="tests.platform" value="**/win32/*Test.java">
-      <os family="windows"/>
-    </condition>
-    <condition property="tests.exclude" value="**/win32/*StdCallTest.java">
-      <and><os family="windows"/><not><os arch="x86"/></not></and>
-    </condition>
-    <condition property="tests.platform" value="**/unix/*Test.java">
-      <and>
-        <os family="unix"/>
-        <not><os family="mac"/></not>
-      </and>
-    </condition>
-    <condition property="vmopt.arch" value="-d64" else="-Dignore">
-      <and>
-        <!-- Sun 64-bit VM for windows doesn't support the -d64 switch -->
-        <not><os family="windows"/></not>
-        <equals arg1="${vm.arch}" arg2="-d64" trim="true"/>
-      </and>
-    </condition>
-    <property name="tests.platform" value=""/>
-    <property name="tests.exclude" value=""/>
-    <junit printsummary="yes" fork="${test.fork}" failureproperty="testfailure">
-      <!-- avoid VM conflicts with JNA protected mode -->
-      <env key="${ld.preload}" file="${libjsig}"/>
-      <jvmarg value="-Djna.library.path=${build.native}"/>
-      <!-- Avoid VM crashes, if possible -->
-      <jvmarg value="-Djna.protected=true"/>
-      <jvmarg value="-Djna.builddir=${build}"/>
-      <jvmarg value="${vmopt.arch}"/>
-      <classpath><path refid="test.runpath"/></classpath>
-      <formatter type="xml"/>
-      <batchtest todir="${results.junit}">
-        <fileset dir="${test.src}">
-          <include name="com/sun/jna/*Test.java"/>
-          <include name="com/sun/jna/examples/*Test.java"/>
-          <include name="${tests.platform}"/>
-          <exclude name="${tests.exclude}"/>
-        </fileset>
-      </batchtest>
-    </junit>
-    <junitreport todir="${results.junit}">
-      <fileset dir="${results.junit}">
-        <include name="TEST-*.xml"/>
-      </fileset>
-      <report todir="${reports.junit}"/>
-    </junitreport>
-    <echo>View test report in file://${reports.junit}/index.html</echo>
-    <fail if="testfailure" unless="clover">One or more tests failed</fail>
-  </target>
-
-  <target name="with.clover" description="Enable code coverage for tests">
-    <taskdef resource="cloverlib.xml" classpath="lib/clover.jar"/>
-    <property name="clover" value="true"/>
-    <property name="build" value="build.clover"/>
-    <clover-setup/>
-  </target>
-
-  <target name="clover" depends="with.clover,test"
-          description="Generate test code coverage reports">
-    <property name="reports.clover" value="${reports}/clover"/>
-    <mkdir dir="${reports.clover}"/>
-    <clover-report>
-      <current outfile="${reports.clover}" title="clover">
-        <fileset dir="." includes="**/*.java" excludes="**/examples/**/*.java"/>
-        <testresults dir="${results.junit}" includes="TEST-*.xml"/>
-        <format type="html"/>
-      </current>
-    </clover-report>
-    <echo>Reports generated in ${reports.clover}</echo>
-  </target>
-
-  <target name="javadoc" depends="-setup">
-    <property name="header"
-              value="&lt;b&gt;JNA API&lt;/&gt;&lt;font size=&quot;-1&quot;&gt; ${jna.version}&lt;/font&gt;"/>
-    <property name="footer"
-              value="&lt;center&gt;&lt;i&gt;${copyright}&lt;/i&gt;&lt;/center&gt;"/>
-
-    <mkdir dir="${javadoc}"/>
-    <javadoc package="true"
-             windowtitle="JNA API"
-             sourcepathref="src.path"
-             classpathref="compile.path"
-             maxmemory="256m"
-             packagenames="com.sun.jna,com.sun.jna.ptr,com.sun.jna.types,com.sun.jna.examples,com.sun.jna.examples.win32,com.sun.jna.exmaples.unix"
-             overview="${src}/com/sun/jna/overview.html"
-             destdir="${javadoc}">
-      <!-- stylesheetfile="${stylesheet}" -->
-      <doctitle>JNA API Documentation</doctitle>
-      <header>${header}</header>
-      <bottom>${footer}</bottom>
-      <link href="http://java.sun.com/j2se/1.4.2/docs/api/"/>
-
-      <packageset dir="${src}" defaultexcludes="yes">
-        <patternset>
-          <include name="com/sun/jna/**/*"/>
-        </patternset>
-      </packageset>
-
-      <group title="Java Native Access" packages="com.sun.jna,com.sun.jna.ptr,com.sun.jna.types,com.sun.jna.win32"/>
-      <group title="Examples" packages="com.sun.jna.examples,com.sun.jna.examples.dnd"/>
-      <group title="Unix Examples" packages="com.sun.jna.examples.unix"/>
-      <group title="Windows Examples" packages="com.sun.jna.examples.win32"/>
-
-      <arg value="-notimestamp"/>
-    </javadoc>
-  </target>
-
-  <target name="dist" depends="jar,compile-tests,native,examples,javadoc"
-          description="Build distribution files">
-    <jar jarfile="${dist}/jna.jar" duplicate="preserve">
-      <manifest>
-        <attribute name="Main-Class" value="com.sun.jna.Native"/>
-        <section name="com/sun/jna/">
-          <attribute name="Implementation-Title" value="${impl.title}"/>
-          <attribute name="Implementation-Vendor" value="${vendor}"/>
-          <attribute name="Implementation-Version" value="${impl.version}"/>
-          <attribute name="Specification-Title" value="${spec.title}"/>
-          <attribute name="Specification-Vendor" value="${spec.vendor}"/>
-          <attribute name="Specification-Version" value="${spec.version}"/>
-        </section>
-      </manifest>
-      <zipfileset src="${build}/${jar}"/>
-      <zipfileset src="${dist}/win32-x86.jar" 
-                  includes="*jnidispatch*"
-                  prefix="com/sun/jna/win32-x86"/>
-      <zipfileset src="${dist}/darwin.jar" 
-                  includes="*jnidispatch*"
-                  prefix="com/sun/jna/darwin"/>
-      <zipfileset src="${dist}/linux-i386.jar" 
-                  includes="*jnidispatch*"
-                  prefix="com/sun/jna/linux-i386"/>
-      <zipfileset src="${dist}/linux-amd64.jar" 
-                  includes="*jnidispatch*"
-                  prefix="com/sun/jna/linux-amd64"/>
-      <zipfileset src="${dist}/linux-ia64.jar" 
-                  includes="*jnidispatch*"
-                  prefix="com/sun/jna/linux-ia64"/>
-      <zipfileset src="${dist}/sunos-x86.jar" 
-                  includes="*jnidispatch*"
-                  prefix="com/sun/jna/sunos-x86"/>
-      <zipfileset src="${dist}/sunos-amd64.jar" 
-                  includes="*jnidispatch*"
-                  prefix="com/sun/jna/sunos-amd64"/>
-      <zipfileset src="${dist}/sunos-sparc.jar" 
-                  includes="*jnidispatch*"
-                  prefix="com/sun/jna/sunos-sparc"/>
-      <zipfileset src="${dist}/sunos-sparcv9.jar" 
-                  includes="*jnidispatch*"
-                  prefix="com/sun/jna/sunos-sparcv9"/>
-      <zipfileset src="${dist}/freebsd-i386.jar" 
-                  includes="*jnidispatch*"
-                  prefix="com/sun/jna/freebsd-i386"/>
-      <zipfileset src="${dist}/freebsd-amd64.jar" 
-                  includes="*jnidispatch*"
-                  prefix="com/sun/jna/freebsd-amd64"/>
-      <zipfileset src="${dist}/openbsd-i386.jar" 
-                  includes="*jnidispatch*"
-                  prefix="com/sun/jna/openbsd-i386"/>
-      <zipfileset src="${dist}/win32-amd64.jar" 
-                  includes="*jnidispatch*"
-                  prefix="com/sun/jna/win32-amd64"/>
-    </jar>
-    <copy todir="${dist}">
-      <fileset dir="${build}">
-        <include name="${native.jar}"/>
-        <include name="examples.jar"/>
-      </fileset>
-    </copy>
-    <zip zipfile="${dist}/doc.zip">
-      <zipfileset dir="${javadoc}" prefix="javadoc"/>
-    </zip>
-    <!-- JNA sources only, for use in Linux build from source/shared libffi -->
-    <zip zipfile="${dist}/src.zip">
-      <zipfileset dir="." includes="build.xml,LICENSE.txt"/>
-      <zipfileset dir="${src}" includes="**/*.java" prefix="src"/>
-      <zipfileset dir="${test.src}" includes="**/*.java" prefix="test"/>
-      <zipfileset dir="${native}" excludes="libffi,libffi/**/*" prefix="native"/>
-    </zip>
-    <!-- Full sources required to build and test everything -->
-    <zip zipfile="${dist}/src-full.zip">
-      <zipfileset src="${dist}/src.zip"/>
-      <zipfileset dir="lib" includes="junit.jar,clover.jar" prefix="lib"/>
-      <zipfileset dir="." includes=".classpath,.project"/>
-      <zipfileset dir="${native}" includes="libffi,libffi/**/*" prefix="native"/>
-    </zip>
-    <!-- Sources package as required by maven -->
-    <zip zipfile="${dist}/src-mvn.zip">
-      <zipfileset dir="${src}" includes="**/*.java,**/*.html,**/*.png"/>
-    </zip>
-  </target>
-
-  <target name="clean" depends="-dynamic-properties">
-    <delete failOnError="false" includeEmptyDirs="true">
-      <fileset dir="${build}"/>
-    </delete>
-    <delete quiet="true" includeEmptyDirs="true">
-      <fileset dir=".clover"/>
-      <fileset dir="${javadoc}"/>
-      <fileset dir="." includes="*~,**/*~"/>
-    </delete>
-  </target>
-
-</project>
-
-

=== removed directory '.pc/05-support-gnu-kfreebsd.patch/native'
=== removed file '.pc/05-support-gnu-kfreebsd.patch/native/Makefile'
--- .pc/05-support-gnu-kfreebsd.patch/native/Makefile	2010-05-26 00:14:07 +0000
+++ .pc/05-support-gnu-kfreebsd.patch/native/Makefile	1970-01-01 00:00:00 +0000
@@ -1,275 +0,0 @@
-#
-# Makefile for JNA native bits
-# Copyright (c) 2007 Timothy Wall All Rights Reserved
-#
-# You may need to run 'ant javah' at the root before performing a build from 
-# this directory.
-#
-# To build with debug information, use 'make DEBUG=true'
-#
-# Supported platforms (built and tested):
-#
-#   Windows 2000/XP/2003/Vista (x86)
-#   Darwin/OS X (i386/x86_64/ppc)
-#   Linux (i386/amd64) 
-#   Solaris (i386/amd64/sparc/sparcv9)
-#   FreeBSD (i386/amd64)
-#
-
-# Systems which support POSIX signals may be able to support VM crash
-# protection simply by defining HAVE_PROTECTION.  This has been enabled
-# only for those platforms on which it has been tested successfully.
-
-OS=$(shell uname | sed -e 's/\(CYGWIN\|MINGW32\).*/win32/g' \
-                        -e 's/SunOS.*/solaris/g' \
-                        -e 's/FreeBSD.*/freebsd/g' \
-                        -e 's/OpenBSD.*/openbsd/g' \
-                        -e 's/Darwin.*/darwin/g' \
-                        -e 's/Linux.*/linux/g')
-
-VERSION=3.2.1 # auto-generated by ant
-CHECKSUM=c870290c36c8d3fdf85db7c782febc3f # auto-generated by ant
-
-JAVA_INCLUDES=-I"$(JAVA_HOME)/include" \
-              -I"$(JAVA_HOME)/include/$(OS)"
-
-BUILD=../build/native
-JAVAH=$(BUILD)
-INSTALLDIR=../build/$(OS)
-JNIDISPATCH_OBJS=$(BUILD)/dispatch.o $(BUILD)/callback.o $(EXTRAOBJS)
-RSRC=$(BUILD)/rsrc.o
-ifneq ($(DYNAMIC_LIBFFI),true)
-FFI_SRC=$(shell pwd)/libffi
-FFI_BUILD=$(BUILD)/libffi
-FFI_LIB=$(FFI_BUILD)/.libs/libffi$(ARSFX)
-FFI_ENV=CC="$(CC)" CFLAGS="$(COPT) $(CDEBUG)" CPPFLAGS="$(CDEFINES)"
-FFI_CONFIG=--enable-static --disable-shared --with-pic=yes
-endif
-LIBRARY=$(BUILD)/$(LIBPFX)jnidispatch$(JNISFX)
-TESTLIB=$(BUILD)/$(LIBPFX)testlib$(LIBSFX)
-TESTLIB2=$(BUILD)/$(LIBPFX)testlib2$(LIBSFX)
-
-# Reasonable defaults based on GCC
-LIBPFX=lib
-LIBSFX=.so
-ARSFX=.a
-JNISFX=$(LIBSFX)
-CC=gcc
-LD=gcc
-LIBS=
-# Default to Sun recommendations for JNI compilation
-COPT=-O2 -fno-omit-frame-pointer -fno-strict-aliasing 
-CASM=-S
-ifeq ($(DEBUG),true)
-CDEBUG=-g
-endif
-CFLAGS_EXTRA=
-COUT=-o $@
-CINCLUDES=$(JAVA_INCLUDES) -I"$(JAVAH)" -I$(FFI_BUILD)/include
-CDEFINES=-D_REENTRANT
-PCFLAGS=-W -Wall -Wno-unused -Wno-parentheses
-CFLAGS=$(PCFLAGS) $(CFLAGS_EXTRA) $(COPT) $(CDEBUG) $(CDEFINES) $(CINCLUDES) \
-       -DVERSION='"$(VERSION)"' -DCHECKSUM='"$(CHECKSUM)"'
-LDFLAGS=-o $@ -shared 
-ifeq ($(DYNAMIC_LIBFFI),true)
-CFLAGS += $(shell pkg-config --cflags libffi 2>/dev/null || echo)
-LIBS += $(shell pkg-config --libs libffi 2>/dev/null || echo -lffi)
-else
-# -static-libgcc avoids gcc library incompatibilities across linux systems
-LDFLAGS += -static-libgcc
-endif
-# Avoid bug in X11-based 1.5/1.6 VMs; dynamically load instead of linking
-# See http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=6539705
-#LIBS=-L"$(LIBDIR)" -ljawt 
-STRIP=strip -x
-# end defaults
-
-ifeq ($(OS),win32)
-ARCH=$(shell uname -m | sed 's/i.86/i386/g')
-CDEFINES=-DHAVE_PROTECTION -DPSAPI_VERSION=1
-LIBS=-lpsapi
-WINDRES=windres
-EXTRAOBJS=$(RSRC)
-STRIP=@echo
-LIBPFX=
-LIBSFX=.dll
-
-ifeq ($(CC),gcc)
-CC += -mno-cygwin
-LD += -mno-cygwin -Wl,--add-stdcall-alias
-endif
-
-ifeq ($(ARCH),amd64)
-
-WINDRES=/usr/local/mingw64-cross/bin/x86_64-pc-mingw32-windres
-
-# Uncomment to enable MINGW64 cross compiler
-# Should build properly as of 090601, but lacks SEH, so MSVC build is preferred
-#MINGW = x86_64-pc-mingw32-gcc
-ifneq ($(MINGW),)
-CC = $(MINGW) -m64 -mno-cygwin
-LD = $(CC)
-LDFLAGS=-o $@ -shared
-LIBS= -lmingwex -lpsapi -lkernel32 -lmsvcrt 
-FFI_CONFIG += --host=x86_64-pc-mingw32
-else
-# MSVC (wrapper scripts)
-CC=$(FFI_SRC)/../cc.sh -m64
-LD=$(FFI_SRC)/../ld.sh -m64
-COPT=
-LIBS=psapi.lib
-ARSFX=.lib
-FFI_CONFIG += --host=x86_64-pc-mingw32 && rm -f include/ffitarget.h && cp $(FFI_SRC)/include/*.h $(FFI_SRC)/src/x86/ffitarget.h include
-FFI_ENV += LD="$(LD)" CPP=cpp
-endif
-endif
-endif
-
-ifeq ($(OS),linux)
-ARCH=$(shell uname -m | sed 's/i.86/i386/g')
-PCFLAGS+=-fPIC
-CDEFINES+=-DHAVE_PROTECTION
-LDFLAGS+=-Wl,-soname,$@
-endif
-
-ifeq ($(OS),freebsd)
-ARCH=$(shell uname -m | sed 's/i.86/i386/g')
-PCFLAGS+=-fPIC
-CINCLUDES+=-I/usr/X11R6/include
-LDFLAGS=-o $@ -shared 
-CDEFINES+=-DHAVE_PROTECTION -DFFI_MMAP_EXEC_WRIT
-endif
-
-ifeq ($(OS),openbsd)
-ARCH=$(shell uname -m | sed 's/i.86/i386/g')
-PCFLAGS+=-fPIC
-CINCLUDES+=-I/usr/X11R6/include
-LDFLAGS=-o $@ -shared 
-CDEFINES+=-DHAVE_PROTECTION -DFFI_MMAP_EXEC_WRIT
-endif
-
-ifeq ($(OS),solaris)
-ifeq ($(ARCH),)
-ARCH=$(shell uname -p)
-endif
-PCFLAGS+=-fPIC
-CDEFINES+=-DHAVE_PROTECTION -DFFI_MMAP_EXEC_WRIT
-ifeq ($(ARCH), sparcv9)
-  # alter CC instead of PCFLAGS, since we need to pass it down to libffi 
-  # configure and some of the other settings in PCFLAGS might make the build 
-  # choke
-  CC += -m64  
-  LD += -m64 
-endif
-endif
-
-# Enable 64-bit builds if the arch demands it
-ifeq ($(CC),gcc)
-ifeq ($(ARCH),amd64)
-  CC += -m64
-  LD += -m64
-endif
-endif
-
-ifeq ($(OS),darwin)
-ARCH=$(shell arch)
-ifeq ($(ARCH),ppc)
-ALT_ARCHS=i386
-else
-ALT_ARCHS=ppc
-endif
-LIBSFX=.dylib
-JNISFX=.jnilib
-ifneq ($(SDKROOT),)
-SYSLIBROOT=-Wl,-syslibroot,$(SDKROOT)
-ISYSROOT=-isysroot $(SDKROOT)
-ARCHFLAGS=-arch ppc -arch i386
-ifneq ($(findstring 10.5,$(SDKROOT)),)
-ALT_ARCHS+=x86_64 
-ARCHFLAGS+=-arch x86_64
-endif
-endif
-PCFLAGS+=$(ISYSROOT) -x objective-c
-CDEFINES+=-DTARGET_RT_MAC_CFM=0 -DFFI_MMAP_EXEC_WRIT
-LDFLAGS=$(ARCHFLAGS) -dynamiclib -o $@ -framework JavaVM \
-  -compatibility_version $(shell echo ${VERSION}|sed 's/^\([0-9][0-9]*\).*/\1/g') \
-  -current_version $(VERSION) \
-  -mmacosx-version-min=10.3 \
-  -install_name ${@F} \
-  $(SYSLIBROOT)
-# JAWT linkage handled by -framework JavaVM
-LIBS=
-endif
-
-# Unfortunately, we have to use different libffi include files depending on 
-# the target, so we can't do a simple universal build on darwin.  Do 
-# separate builds, then merge the results.
-$(BUILD)/%.o : %.c dispatch.h $(FFI_LIB)
-	@mkdir -p $(BUILD)
-ifneq ($(SDKROOT),)
-	$(CC) -arch $(ARCH) $(CFLAGS) -c $< -o $@.$(ARCH)
-	for arch in $(ALT_ARCHS); do \
-	  $(CC) -arch $$arch -I$(BUILD)/libffi.$$arch/include $(CFLAGS) -c $< -o $@.$$arch; \
-	done
-	lipo -create -output $@ $@.*
-else
-	$(CC) $(CFLAGS) -c $< $(COUT)
-endif
-
-all: $(LIBRARY) $(TESTLIB) $(TESTLIB2)
-
-install:
-	mkdir $(INSTALLDIR)
-	cp $(LIBRARY) $(INSTALLDIR)
-
-$(RSRC): $(BUILD)/jnidispatch.rc
-	$(WINDRES) -i $< -o $@ \
-          || (echo > $@.c && $(CC) $(CFLAGS) -c $@.c $(COUT))
-
-$(LIBRARY): $(JNIDISPATCH_OBJS) $(FFI_LIB) 
-	$(LD) $(LDFLAGS) $(JNIDISPATCH_OBJS) $(FFI_LIB) $(LIBS)
-
-$(TESTLIB): $(BUILD)/testlib.o 
-	$(LD) $(LDFLAGS) $<
-
-ifeq ($(ARSFX),.lib)
-TESTDEP=$(TESTLIB:.dll=.lib)
-else
-TESTDEP=$(TESTLIB)
-endif
-$(TESTLIB2): $(BUILD)/testlib2.o 
-	$(LD) $(LDFLAGS) $< $(TESTDEP)
-
-ifneq ($(DYNAMIC_LIBFFI),true)
-$(FFI_LIB):
-	@mkdir -p $(FFI_BUILD)
-	@if [ ! -f $(FFI_BUILD)/Makefile ]; then \
-	  echo "Configuring libffi ($(ARCH))"; \
-	  (cd $(FFI_BUILD) \
-	    && $(FFI_ENV) $(FFI_SRC)/configure $(FFI_CONFIG)); \
-	fi
-	$(MAKE) -C $(FFI_BUILD)
-ifneq ($(SDKROOT),)
-	@for arch in $(ALT_ARCHS); do \
-	  mkdir -p $(BUILD)/libffi.$$arch; \
-	  if [ ! -f $(BUILD)/libffi.$$arch/Makefile ]; then \
-	    echo "Configuring libffi ($$arch)"; \
-	    (cd $(BUILD)/libffi.$$arch \
-	     && CC="$(CC)" CFLAGS="-arch $$arch $(ISYSROOT) $(COPT) $(CDEBUG)" CPPFLAGS="$(CDEFINES)" \
-                LDFLAGS="-arch $$arch" \
-               $(FFI_SRC)/configure $(FFI_CONFIG) --host=$$arch-apple-darwin --disable-dependency-tracking); \
-	  fi; \
-	  $(MAKE) -C $(BUILD)/libffi.$$arch; \
-	done
-	/usr/bin/libtool -static -o $@.tmp $(FFI_BUILD)/.libs/${@F} $(BUILD)/libffi.*/.libs/${@F}
-	mv $@.tmp $@
-endif
-endif
-
-clean:
-	$(RM) -rf $(BUILD) 
-
-version:
-	@echo version=$(VERSION)
-
-#EOF

=== removed directory '.pc/06-remove-gjdoc-inexistent-options.patch'
=== removed file '.pc/06-remove-gjdoc-inexistent-options.patch/build.xml'
--- .pc/06-remove-gjdoc-inexistent-options.patch/build.xml	2010-05-26 00:14:07 +0000
+++ .pc/06-remove-gjdoc-inexistent-options.patch/build.xml	1970-01-01 00:00:00 +0000
@@ -1,650 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="JNA" default="default" basedir=".">
-  <description>Builds and tests JNA</description>
-
-  <!--  
-  Conventions (since ant can't easily specify arbitrary file dependencies):
-  The uptodate property for a given target TARGET is "-TARGET"; the actual
-  target to generate the uptodate property is named ":TARGET".
-
-  Properties (except for uptodate properties) separate words by dots, targets
-  by dashes. 
-  -->
-
-  <!-- global properties -->
-  <!-- (all build-related props should go in -dynamic-properties) -->
-  <property name="name" value="jna"/>
-  <property name="jar" value="${name}.jar"/>
-  <property name="testjar" value="${name}-test.jar"/>
-  <property name="debug" value="true"/>
-  <property name="debug.native" value="false"/>
-  <property name="cflags_extra.native" value=""/>
-  <property name="dynlink.native" value="false"/>
-  <property name="native" location="native"/>
-  <property name="src" location="src"/>
-  <property name="dist" location="dist"/>
-  <property name="test.src" location="test"/>
-  <property name="doc" location="doc"/>
-  <property name="javadoc" location="${doc}/javadoc"/>
-  <property name="stylesheet" location="${javadoc}/doc/css/javadoc.css"/>
-  <property name="vendor" value="JNA Development Team"/>
-  <property name="copyright"
-            value="Copyright &amp;copy; 2007-2009 Timothy Wall. All Rights Reserved."/>
-  <buildnumber/>
-  <!-- JNA library release version -->            
-  <property name="jna.major" value="3"/>
-  <property name="jna.minor" value="2"/>
-  <property name="jna.revision" value="4"/>
-  <property name="jna.build" value="${build.number}"/>
-  <property name="jna.version" value="${jna.major}.${jna.minor}.${jna.revision}"/>
-  <!-- jnidispatch library release version -->
-  <property name="jni.major" value="3"/>
-  <property name="jni.minor" value="2"/>
-  <property name="jni.revision" value="1"/>
-  <property name="jni.build" value="${build.number}"/>
-  <property name="jni.version" value="${jni.major}.${jni.minor}.${jni.revision}"/>
-  <property name="jni.md5" value="c870290c36c8d3fdf85db7c782febc3f"/>
-  <property name="spec.title" value="Java Native Access (JNA)"/>
-  <property name="spec.vendor" value="${vendor}"/>
-  <property name="spec.version" value="${jna.major}"/>
-  <property name="impl.title" value="com.sun.jna"/>
-  <property name="impl.vendor" value="${spec.vendor}"/>
-  <property name="impl.version" value="${jna.version} (b${jna.build})"/>
-
-  <property name="compatibility" value="1.4"/>
-  <property name="test.compatibility" value="1.5"/>
-
-  <!-- Miscellaneous -->
-  <property name="build.compiler.emacs" value="true"/>
-
-  <target name="default" depends="test" description="Build and Test."/>
-
-  <target name="init" depends="-setup"/>
-  <target name="compile-test-single" depends="compile-tests"/>
-  <target name="compile-single" depends="compile"/>
-
-  <target name="-dynamic-properties">
-    <echo>Java version ${java.version}, compatibility: ${compatibility}</echo>
-    <echo>JNA version ${jna.version}, native ${jni.version}</echo>
-    <echo>${java.vm.name} (${java.vm.vendor}, ${java.vm.version})</echo>
-    <echo>java.home=${java.home}</echo>
-    <echo>java.library.path=${java.library.path}</echo>
-
-    <replaceregexp match="(&lt;version&gt;).*(&lt;/version&gt;)"
-                   replace="\1${jna.version}\2" 
-                   file="pom.xml"/>
-    <replaceregexp match='VERSION = ".*";'
-                   replace='VERSION = "${jna.version}";'
-                   file="src/com/sun/jna/Native.java"/>
-
-    <condition property="jar.omitted" value="**/*jnidispatch*" else="jnilib-included">
-      <isset property="omit-jnilib"/>
-    </condition>
-    <condition property="vm.arch" value="-d64" else="">
-      <or>
-        <equals arg1="${sun.arch.data.model}" arg2="64" trim="true"/>
-        <equals arg1="${com.ibm.vm.bitmode}" arg2="64" trim="true"/>
-        <os arch="x86_64"/>
-        <os arch="ppc64"/>
-        <os arch="sparcv9"/>
-        <os arch="amd64"/>
-      </or>
-    </condition>
-    <condition property="ld.preload" value="LD_PRELOAD_64" else="LD_PRELOAD">
-      <and>
-        <os name="SunOS"/>
-        <equals arg1="${vm.arch}" arg2="-d64"/>
-      </and>
-    </condition>
-    <property name="build" value="build"/>
-    <property name="classes" location="${build}/classes"/>
-    <property name="eclipse.classes" location="build.eclipse/classes"/>
-    <property name="test.classes" location="${build}/test-classes"/>
-    <property name="reports" value="${build}/reports"/>
-
-    <!-- Add other supported platforms here -->
-    <condition property="jre.arch" value="i386">
-      <equals arg1="x86" arg2="${os.arch}"/>
-    </condition>
-    <condition property="jre.arch" value="amd64">
-      <equals arg1="x86_64" arg2="${os.arch}"/>
-    </condition>
-    <property name="jre.arch" value="${os.arch}"/>
-    <condition property="os.prefix" value="linux-${jre.arch}">
-      <os name="Linux"/>
-    </condition>
-    <condition property="os.prefix" value="win32-${os.arch}">
-      <os family="windows"/>
-    </condition>
-    <!-- Darwin builds are universal, no arch required -->
-    <condition property="os.prefix" value="darwin">
-      <os family="mac"/>
-    </condition>
-    <condition property="os.prefix" value="sunos-${os.arch}">
-      <os name="SunOS"/>
-    </condition>
-    <condition property="os.prefix" value="freebsd-${os.arch}">
-      <os name="FreeBSD"/>
-    </condition>
-    <condition property="os.prefix" value="linux-${jre.arch}">
-      <os name="GNU/kFreeBSD"/>
-    </condition>
-    <condition property="os.prefix" value="openbsd-${os.arch}">
-      <os name="OpenBSD"/>
-    </condition>
-    <fail unless="os.prefix" message="OS/arch not supported (${os.name}/${os.arch}), edit build.xml and native/Makefile to add it."/>
-    <condition property="jdk.home" value="${java.home}">
-      <available file="${java.home}/include"/>
-    </condition>
-    <condition property="jdk.home" value="${java.home}/..">
-      <available file="${java.home}/../include"/>
-    </condition>
-    <fail unless="jdk.home" message="JAVA_HOME/java.home must be a JDK, not JRE"/>
-    <condition property="libjsig"
-               value="${java.home}/lib/${jre.arch}/libjsig.so" else="">
-      <available file="${java.home}/lib/${jre.arch}/libjsig.so"/>
-    </condition>
-    <property name="native.jar" value="${os.prefix}.jar"/>
-    <property name="build.native" location="${build}/native"/>
-    <property name="md5.file" location="${build.native}/sig"/>
-
-    <mkdir dir="${build}"/>
-    <mkdir dir="${build.native}"/>
-    <mkdir dir="${classes}"/>
-    <mkdir dir="${test.classes}"/>
-    <mkdir dir="${reports}"/>
-    <mkdir dir="${doc}"/>
-
-  </target>
-
-  <target name="-setup" depends="-dynamic-properties">
-    <path id="compile-test.path">
-      <pathelement path="${test.src}"/>
-      <path id="test.libs">
-        <fileset dir="lib">
-          <include name="junit.jar"/>   
-        </fileset>
-        <pathelement path="${classes}"/>
-      </path>
-      <path id="compile.path">
-        <path id="src.path">
-          <pathelement location="${src}"/>
-        </path>
-      </path>                           
-    </path>                           
-
-    <path id="test.runpath">
-      <pathelement path="${build}/${jar}"/>
-      <pathelement path="${build}/examples.jar"/>
-      <pathelement path="${test.classes}"/>
-      <pathelement path="lib/clover.jar"/>
-      <path refid="test.libs"/>
-    </path>
-  </target>
-
-  <target name="compile" depends="-setup"
-          description="Compile all Java source">
-    <javac classpathref="compile.path"
-           source="${compatibility}"
-           target="${compatibility}"
-           destdir="${classes}" 
-           deprecation="on" debug="${debug}">
-      <src path="${src}"/>
-    </javac>
-  </target>
-
-  <target name=":jar">
-    <uptodate property="-jar" targetfile="${build}/${jar}">
-      <srcfiles dir="${classes}">
-        <patternset id="jar-compiled">
-          <include name="com/sun/jna/*"/>
-          <include name="com/sun/jna/**/*"/>
-          <exclude name="com/sun/jna/examples/*"/>
-          <exclude name="com/sun/jna/examples/**/*"/>
-        </patternset>
-      </srcfiles>
-    </uptodate>
-  </target>
-  <target name="jar" depends="-setup,native,:jar" unless="-jar"
-          description="Build primary jar">
-    <jar jarfile="${build}/${jar}">
-      <manifest>
-        <attribute name="Main-Class" value="com.sun.jna.Native"/>
-        <section name="com/sun/jna/">
-          <attribute name="Implementation-Title" value="${impl.title}"/>
-          <attribute name="Implementation-Vendor" value="${vendor}"/>
-          <attribute name="Implementation-Version" value="${impl.version}"/>
-          <attribute name="Specification-Title" value="${spec.title}"/>
-          <attribute name="Specification-Vendor" value="${spec.vendor}"/>
-          <attribute name="Specification-Version" value="${spec.version}"/>
-        </section>
-      </manifest>
-      <fileset dir="${classes}" excludes="${jar.omitted}">
-        <patternset refid="jar-compiled"/>
-      </fileset>
-    </jar>
-  </target>
-  <target name="examples" depends="jar,native">
-    <jar jarfile="${build}/examples.jar">
-      <manifest>
-        <attribute name="Class-Path" value="jna.jar"/>
-        <attribute name="Main-Class" value="com.sun.jna.examples.ShapedWindowDemo"/>
-      </manifest>
-      <fileset dir="${src}" includes="**/examples/**/*.png"/>
-      <fileset dir="${classes}" includes="**/examples/*,**/examples/**/*"/>
-      <fileset dir="${classes}" includes="jnidispatch.dll"/>
-    </jar>
-  </target>
-
-  <target name="javah" depends="compile">
-    <javah classpath="${classes}" destdir="${build.native}" force="yes">
-      <class name="com.sun.jna.Function"/>
-      <class name="com.sun.jna.Pointer"/>
-      <class name="com.sun.jna.Memory"/>
-      <class name="com.sun.jna.Native"/>
-      <class name="com.sun.jna.NativeLibrary"/>
-      <class name="com.sun.jna.CallbackReference"/>
-    </javah>
-    <condition property="grep" value="/usr/sfw/bin/ggrep">
-      <os name="SunOS"/>
-    </condition>
-    <condition property="grep" value="ggrep">
-      <os name="OpenBSD"/>
-    </condition>
-    <property name="grep" value="grep"/>
-    <apply dir="${build.native}" executable="${grep}" parallel="true"
-           failonerror="true" relative="true" output="${md5.file}">
-      <arg value="-A"/>
-      <arg value="1"/>
-      <arg value="JNIEXPORT"/>
-      <fileset dir="${build.native}" includes="*.h"/>
-    </apply>
-    <fixcrlf srcdir="${build.native}" includes="sig" eol="unix"/>
-    <checksum property="md5" file="${md5.file}" />
-    <condition property="jni.valid" value="true">
-      <or>
-        <equals arg1="${jni.md5}" arg2="${md5}" trim="true"/>
-        <equals arg1="${jni.md5}" arg2=""/>
-      </or>
-    </condition>
-  </target>
-
-  <!-- Invalidate native libraries when native API changes -->
-  <target name="-native-api-check" depends="javah" unless="jni.valid">
-    <echo>Invalidating native code, new checksum is ${md5}</echo>
-    <copy file="${dist}/out-of-date.jar" tofile="${dist}/darwin.jar" overwrite="true"/>
-    <copy file="${dist}/out-of-date.jar" tofile="${dist}/win32-x86.jar" overwrite="true"/>
-    <copy file="${dist}/out-of-date.jar" tofile="${dist}/win32-amd64.jar" overwrite="true"/>
-    <copy file="${dist}/out-of-date.jar" tofile="${dist}/linux-i386.jar" overwrite="true"/>
-    <copy file="${dist}/out-of-date.jar" tofile="${dist}/linux-amd64.jar" overwrite="true"/>
-    <copy file="${dist}/out-of-date.jar" tofile="${dist}/linux-ia64.jar" overwrite="true"/>
-    <copy file="${dist}/out-of-date.jar" tofile="${dist}/freebsd-i386.jar" overwrite="true"/>
-    <copy file="${dist}/out-of-date.jar" tofile="${dist}/freebsd-amd64.jar" overwrite="true"/>
-    <copy file="${dist}/out-of-date.jar" tofile="${dist}/openbsd-i386.jar" overwrite="true"/>
-    <copy file="${dist}/out-of-date.jar" tofile="${dist}/sunos-x86.jar" overwrite="true"/>
-    <copy file="${dist}/out-of-date.jar" tofile="${dist}/sunos-amd64.jar" overwrite="true"/>
-    <copy file="${dist}/out-of-date.jar" tofile="${dist}/sunos-sparc.jar" overwrite="true"/>
-    <copy file="${dist}/out-of-date.jar" tofile="${dist}/sunos-sparcv9.jar" overwrite="true"/>
-    <delete failOnError="false" includeEmptyDirs="true">
-      <fileset dir="${build.native}" includes="*.o,*jnidispatch*"/>
-    </delete>
-    <fail>API for native code has changed.  Re-run this build after updating jni.version and jni.md5 in build.xml</fail>
-  </target>
-
-  <target name=":rsrc">
-    <condition property="-rsrc">
-      <not><os family="windows"/></not>
-    </condition>
-  </target>
-  <target name="rsrc" depends="-setup,:rsrc" unless="-rsrc"
-          description="Generate w32 DLL version resource information">
-    <property name="rsrc" location="${build.native}/jnidispatch.rc"/>
-    <copy todir="${build.native}" file="${native}/jnidispatch.rc"/>
-    <replaceregexp match="FILEVERSION.*"
-                   replace="FILEVERSION ${jni.major},${jni.minor},${jni.revision},${jni.build}"
-                   file="${rsrc}" byline="true"/>
-    <replaceregexp match="PRODUCTVERSION.*"
-                   replace="PRODUCTVERSION ${jna.major},${jna.minor},${jna.revision},${jna.build}"
-                   file="${rsrc}" byline="true"/>
-    <replaceregexp match="FileVersion.*"
-                   replace="FileVersion&quot;,&quot;${jni.version}&quot;"
-                   file="${rsrc}" byline="true"/>
-    <replaceregexp match="Full Version.*"
-                   replace="Full Version&quot;,&quot;${jni.version} b${jni.build}&quot;"
-                   file="${rsrc}" byline="true"/>
-    <replaceregexp match="ProductVersion.*"
-                   replace="ProductVersion&quot;,&quot;${spec.version}&quot;"
-                   file="${rsrc}" byline="true"/>
-  </target>
-
-  <target name="native" depends="-setup,javah,-native-api-check,rsrc"
-          description="Build native libraries.  Use 'ant -DCC=xxx' to build using a compiler other than gcc">
-    <property name="comment" value="# auto-generated by ant"/>
-    <replaceregexp match="^VERSION=.*"
-                   replace="VERSION=${jni.version} ${comment}"
-                   file="native/Makefile" byline="true"/>
-    <replaceregexp match="^CHECKSUM=.*"
-                   replace="CHECKSUM=${jni.md5} ${comment}"
-                   file="native/Makefile" byline="true"/>
-    <!-- ensure ARCH is set properly for 64-bit capable platforms -->
-    <!-- use ANT_OPTS=-d64 to build 64-bit if not the platform default -->
-    <property name="ARCH" value="${os.arch}"/>
-    <condition property="make.CC" value="CC=${CC}" else="IGNORE=">
-      <isset property="CC"/>
-    </condition>
-    <condition property="make.ARCH" value="ARCH=${ARCH}" else="IGNORE=">
-      <isset property="ARCH"/>
-    </condition>
-    <condition property="make.SDKROOT" value="SDKROOT=${SDKROOT}">
-      <isset property="SDKROOT"/>
-    </condition>
-    <condition property="make.SDKROOT"
-	       value="SDKROOT=/Developer/SDKs/MacOSX10.5.sdk">
-      <available file="/Developer/SDKs/MacOSX10.5.sdk"/>
-    </condition>
-    <condition property="make.SDKROOT"
-	       value="SDKROOT=/Developer/SDKs/MacOSX10.4u.sdk" else="IGNORE=">
-      <available file="/Developer/SDKs/MacOSX10.4u.sdk"/>
-    </condition>
-    <!-- Windows' drive letters and spaces in absolute paths wreak havoc on 
-         make --> 
-    <condition property="make.BUILD" value="BUILD=../${build}/native" else="BUILD=${build.native}">
-      <os family="windows"/>
-    </condition>
-    <condition property="make.PATH" value="PATH=/usr/sfw/bin:/usr/bin:/usr/ccs/bin" else="IGNORE=">
-      <os name="SunOS"/>
-    </condition>
-    <condition property="make" value="/usr/sfw/bin/gmake">
-      <os name="SunOS"/>
-    </condition>
-    <condition property="make" value="gmake">
-      <or>
-        <os name="FreeBSD"/>
-        <os name="OpenBSD"/>
-      </or>
-    </condition>
-    <!-- Default make program -->
-    <property name="make" value="make"/>
-
-    <exec executable="${make}" dir="${native}" failonerror="true">
-      <arg value="JAVA_HOME=${jdk.home}"/>
-      <arg value="JAVAH=${build.native}"/>
-      <arg value="DEBUG=${debug.native}"/>
-      <arg value="CFLAGS_EXTRA=${cflags_extra.native}"/>
-      <arg value="DYNAMIC_LIBFFI=${dynlink.native}"/>
-      <arg value="${make.CC}"/>
-      <arg value="${make.BUILD}"/>
-      <arg value="${make.SDKROOT}"/>
-      <arg value="${make.ARCH}"/>
-      <arg value="${make.PATH}"/>
-      <arg value="VERSION=${jni.version}"/>
-      <arg value="CHECKSUM=${jni.md5}"/>
-    </exec>
-    <antcall target="native-mixedjar"/>
-    <!-- For web start, native libraries may be provided in the root of -->
-    <!-- an included jar file -->
-    <jar jarfile="${build}/${native.jar}">
-      <fileset dir="${build.native}" includes="jnidispatch.dll,libjnidispatch.*"/>
-      <manifest>
-        <attribute name="Implementation-Version" value="${jni.version} b${jni.build}"/>
-        <attribute name="Specification-Version" value="${jni.version}"/>
-      </manifest>
-    </jar>
-  </target>
-
-  <target name="native-mixedjar" unless="nomixedjar.native">    
-    <mkdir dir="${classes}/com/sun/jna/${os.prefix}"/>
-    <copy todir="${classes}/com/sun/jna/${os.prefix}">
-      <fileset dir="${build.native}"
-               includes="jnidispatch.dll,libjnidispatch.*"/>
-    </copy>
-    <mkdir dir="${eclipse.classes}/com/sun/jna/${os.prefix}"/>
-    <copy todir="${eclipse.classes}/com/sun/jna/${os.prefix}"
-          failonerror="false">
-      <fileset dir="${build.native}"
-               includes="jnidispatch.dll,libjnidispatch.*"/>
-    </copy>
-  </target>
-
-  <target name="compile-tests" depends="compile,native,jar"
-          description="Compile all test code">
-    <javac classpathref="compile-test.path"
-           source="${test.compatibility}"
-           target="${test.compatibility}"
-           destdir="${test.classes}" 
-           deprecation="on" debug="${debug}">
-      <src path="${test.src}"/>
-    </javac>
-    <jar jarfile="${build}/${testjar}">
-      <fileset dir="${test.classes}">
-        <patternset refid="jar-compiled"/>
-      </fileset>
-    </jar>
-    <mkdir dir="${build}/jws"/>
-    <copy todir="${build}/jws" file="${build}/${jar}"/>
-    <copy todir="${build}/jws" file="${build}/${testjar}"/>
-    <copy todir="${build}/jws" file="lib/junit.jar"/>
-    <copy todir="${build}/jws" file="lib/clover.jar"/>
-    <jar jarfile="${build}/jws/jnidispatch.jar">
-      <fileset dir="${build.native}" includes="*jnidispatch.*"/>
-    </jar>
-    <signjar alias="jna" keystore="jna.keystore" storepass="jnadev" lazy="true"> 
-      <fileset dir="${build}/jws" includes="jna.jar,jna-test.jar,junit.jar,jnidispatch.jar,clover.jar"/>
-    </signjar>
-  </target>
-
-  <!-- When running tests from an IDE, be sure to set jna.library.path -->
-  <!-- to where the test library (testlib) is found.                   -->
-  <target name="test" depends="jar,examples,compile-tests"
-          description="Run all unit tests">
-    <property name="test.fork" value="yes"/>
-    <property name="reports.junit" location="${reports}/junit"/>
-    <property name="results.junit" location="${build}/junit-results"/>
-    <mkdir dir="${results.junit}"/>
-    <echo>Saving test results in ${results.junit}</echo>
-    <property name="tests.stdcall" value="**/win32/*StdCallTest.java"/>
-    <condition property="tests.platform" value="**/win32/*Test.java">
-      <os family="windows"/>
-    </condition>
-    <condition property="tests.exclude" value="**/win32/*StdCallTest.java">
-      <and><os family="windows"/><not><os arch="x86"/></not></and>
-    </condition>
-    <condition property="tests.platform" value="**/unix/*Test.java">
-      <and>
-        <os family="unix"/>
-        <not><os family="mac"/></not>
-      </and>
-    </condition>
-    <condition property="vmopt.arch" value="-d64" else="-Dignore">
-      <and>
-        <!-- Sun 64-bit VM for windows doesn't support the -d64 switch -->
-        <not><os family="windows"/></not>
-        <equals arg1="${vm.arch}" arg2="-d64" trim="true"/>
-      </and>
-    </condition>
-    <property name="tests.platform" value=""/>
-    <property name="tests.exclude" value=""/>
-    <junit printsummary="yes" fork="${test.fork}" failureproperty="testfailure">
-      <!-- avoid VM conflicts with JNA protected mode -->
-      <env key="${ld.preload}" file="${libjsig}"/>
-      <jvmarg value="-Djna.library.path=${build.native}"/>
-      <!-- Avoid VM crashes, if possible -->
-      <jvmarg value="-Djna.protected=true"/>
-      <jvmarg value="-Djna.builddir=${build}"/>
-      <jvmarg value="${vmopt.arch}"/>
-      <classpath><path refid="test.runpath"/></classpath>
-      <formatter type="xml"/>
-      <batchtest todir="${results.junit}">
-        <fileset dir="${test.src}">
-          <include name="com/sun/jna/*Test.java"/>
-          <include name="com/sun/jna/examples/*Test.java"/>
-          <include name="${tests.platform}"/>
-          <exclude name="${tests.exclude}"/>
-        </fileset>
-      </batchtest>
-    </junit>
-    <junitreport todir="${results.junit}">
-      <fileset dir="${results.junit}">
-        <include name="TEST-*.xml"/>
-      </fileset>
-      <report todir="${reports.junit}"/>
-    </junitreport>
-    <echo>View test report in file://${reports.junit}/index.html</echo>
-    <fail if="testfailure" unless="clover">One or more tests failed</fail>
-  </target>
-
-  <target name="with.clover" description="Enable code coverage for tests">
-    <taskdef resource="cloverlib.xml" classpath="lib/clover.jar"/>
-    <property name="clover" value="true"/>
-    <property name="build" value="build.clover"/>
-    <clover-setup/>
-  </target>
-
-  <target name="clover" depends="with.clover,test"
-          description="Generate test code coverage reports">
-    <property name="reports.clover" value="${reports}/clover"/>
-    <mkdir dir="${reports.clover}"/>
-    <clover-report>
-      <current outfile="${reports.clover}" title="clover">
-        <fileset dir="." includes="**/*.java" excludes="**/examples/**/*.java"/>
-        <testresults dir="${results.junit}" includes="TEST-*.xml"/>
-        <format type="html"/>
-      </current>
-    </clover-report>
-    <echo>Reports generated in ${reports.clover}</echo>
-  </target>
-
-  <target name="javadoc" depends="-setup">
-    <property name="header"
-              value="&lt;b&gt;JNA API&lt;/&gt;&lt;font size=&quot;-1&quot;&gt; ${jna.version}&lt;/font&gt;"/>
-    <property name="footer"
-              value="&lt;center&gt;&lt;i&gt;${copyright}&lt;/i&gt;&lt;/center&gt;"/>
-
-    <mkdir dir="${javadoc}"/>
-    <javadoc package="true"
-             windowtitle="JNA API"
-             sourcepathref="src.path"
-             classpathref="compile.path"
-             maxmemory="256m"
-             packagenames="com.sun.jna,com.sun.jna.ptr,com.sun.jna.types,com.sun.jna.examples,com.sun.jna.examples.win32,com.sun.jna.exmaples.unix"
-             overview="${src}/com/sun/jna/overview.html"
-             destdir="${javadoc}">
-      <!-- stylesheetfile="${stylesheet}" -->
-      <doctitle>JNA API Documentation</doctitle>
-      <header>${header}</header>
-      <bottom>${footer}</bottom>
-      <link href="http://java.sun.com/j2se/1.4.2/docs/api/"/>
-
-      <packageset dir="${src}" defaultexcludes="yes">
-        <patternset>
-          <include name="com/sun/jna/**/*"/>
-        </patternset>
-      </packageset>
-
-      <group title="Java Native Access" packages="com.sun.jna,com.sun.jna.ptr,com.sun.jna.types,com.sun.jna.win32"/>
-      <group title="Examples" packages="com.sun.jna.examples,com.sun.jna.examples.dnd"/>
-      <group title="Unix Examples" packages="com.sun.jna.examples.unix"/>
-      <group title="Windows Examples" packages="com.sun.jna.examples.win32"/>
-
-      <arg value="-notimestamp"/>
-    </javadoc>
-  </target>
-
-  <target name="dist" depends="jar,compile-tests,native,examples,javadoc"
-          description="Build distribution files">
-    <jar jarfile="${dist}/jna.jar" duplicate="preserve">
-      <manifest>
-        <attribute name="Main-Class" value="com.sun.jna.Native"/>
-        <section name="com/sun/jna/">
-          <attribute name="Implementation-Title" value="${impl.title}"/>
-          <attribute name="Implementation-Vendor" value="${vendor}"/>
-          <attribute name="Implementation-Version" value="${impl.version}"/>
-          <attribute name="Specification-Title" value="${spec.title}"/>
-          <attribute name="Specification-Vendor" value="${spec.vendor}"/>
-          <attribute name="Specification-Version" value="${spec.version}"/>
-        </section>
-      </manifest>
-      <zipfileset src="${build}/${jar}"/>
-      <zipfileset src="${dist}/win32-x86.jar" 
-                  includes="*jnidispatch*"
-                  prefix="com/sun/jna/win32-x86"/>
-      <zipfileset src="${dist}/darwin.jar" 
-                  includes="*jnidispatch*"
-                  prefix="com/sun/jna/darwin"/>
-      <zipfileset src="${dist}/linux-i386.jar" 
-                  includes="*jnidispatch*"
-                  prefix="com/sun/jna/linux-i386"/>
-      <zipfileset src="${dist}/linux-amd64.jar" 
-                  includes="*jnidispatch*"
-                  prefix="com/sun/jna/linux-amd64"/>
-      <zipfileset src="${dist}/linux-ia64.jar" 
-                  includes="*jnidispatch*"
-                  prefix="com/sun/jna/linux-ia64"/>
-      <zipfileset src="${dist}/sunos-x86.jar" 
-                  includes="*jnidispatch*"
-                  prefix="com/sun/jna/sunos-x86"/>
-      <zipfileset src="${dist}/sunos-amd64.jar" 
-                  includes="*jnidispatch*"
-                  prefix="com/sun/jna/sunos-amd64"/>
-      <zipfileset src="${dist}/sunos-sparc.jar" 
-                  includes="*jnidispatch*"
-                  prefix="com/sun/jna/sunos-sparc"/>
-      <zipfileset src="${dist}/sunos-sparcv9.jar" 
-                  includes="*jnidispatch*"
-                  prefix="com/sun/jna/sunos-sparcv9"/>
-      <zipfileset src="${dist}/freebsd-i386.jar" 
-                  includes="*jnidispatch*"
-                  prefix="com/sun/jna/freebsd-i386"/>
-      <zipfileset src="${dist}/freebsd-amd64.jar" 
-                  includes="*jnidispatch*"
-                  prefix="com/sun/jna/freebsd-amd64"/>
-      <zipfileset src="${dist}/openbsd-i386.jar" 
-                  includes="*jnidispatch*"
-                  prefix="com/sun/jna/openbsd-i386"/>
-      <zipfileset src="${dist}/win32-amd64.jar" 
-                  includes="*jnidispatch*"
-                  prefix="com/sun/jna/win32-amd64"/>
-    </jar>
-    <copy todir="${dist}">
-      <fileset dir="${build}">
-        <include name="${native.jar}"/>
-        <include name="examples.jar"/>
-      </fileset>
-    </copy>
-    <zip zipfile="${dist}/doc.zip">
-      <zipfileset dir="${javadoc}" prefix="javadoc"/>
-    </zip>
-    <!-- JNA sources only, for use in Linux build from source/shared libffi -->
-    <zip zipfile="${dist}/src.zip">
-      <zipfileset dir="." includes="build.xml,LICENSE.txt"/>
-      <zipfileset dir="${src}" includes="**/*.java" prefix="src"/>
-      <zipfileset dir="${test.src}" includes="**/*.java" prefix="test"/>
-      <zipfileset dir="${native}" excludes="libffi,libffi/**/*" prefix="native"/>
-    </zip>
-    <!-- Full sources required to build and test everything -->
-    <zip zipfile="${dist}/src-full.zip">
-      <zipfileset src="${dist}/src.zip"/>
-      <zipfileset dir="lib" includes="junit.jar,clover.jar" prefix="lib"/>
-      <zipfileset dir="." includes=".classpath,.project"/>
-      <zipfileset dir="${native}" includes="libffi,libffi/**/*" prefix="native"/>
-    </zip>
-    <!-- Sources package as required by maven -->
-    <zip zipfile="${dist}/src-mvn.zip">
-      <zipfileset dir="${src}" includes="**/*.java,**/*.html,**/*.png"/>
-    </zip>
-  </target>
-
-  <target name="clean" depends="-dynamic-properties">
-    <delete failOnError="false" includeEmptyDirs="true">
-      <fileset dir="${build}"/>
-    </delete>
-    <delete quiet="true" includeEmptyDirs="true">
-      <fileset dir=".clover"/>
-      <fileset dir="${javadoc}"/>
-      <fileset dir="." includes="*~,**/*~"/>
-    </delete>
-  </target>
-
-</project>
-
-

=== removed file '.pc/applied-patches'
--- .pc/applied-patches	2010-05-26 00:14:07 +0000
+++ .pc/applied-patches	1970-01-01 00:00:00 +0000