diff options
| author | mat <mat@FreeBSD.org> | 2016-06-21 00:23:28 +0800 |
|---|---|---|
| committer | mat <mat@FreeBSD.org> | 2016-06-21 00:23:28 +0800 |
| commit | bc12b6beb26907f267f34c1f8598d120cabecbae (patch) | |
| tree | e83ee6693050a76e305a95a376451aa583df151e /java | |
| parent | 5616a93eb39854a280bacec86824bbec7824d5b3 (diff) | |
| download | freebsd-ports-gnome-bc12b6beb26907f267f34c1f8598d120cabecbae.tar.gz freebsd-ports-gnome-bc12b6beb26907f267f34c1f8598d120cabecbae.tar.zst freebsd-ports-gnome-bc12b6beb26907f267f34c1f8598d120cabecbae.zip | |
With the power of USES=dos2unix, get rid of most patches and files
with CRLF.
While there, run make makepatch, rename patches to use the new scheme,
and various fixes.
With hat: portmgr
Sponsored by: Absolight
Diffstat (limited to 'java')
| -rw-r--r-- | java/jakarta-commons-pool/Makefile | 4 | ||||
| -rw-r--r-- | java/jakarta-commons-pool/files/patch-build.xml | 20 | ||||
| -rw-r--r-- | java/jgrapht/Makefile | 5 | ||||
| -rw-r--r-- | java/jgrapht/files/patch-build.xml | 20 |
4 files changed, 26 insertions, 23 deletions
diff --git a/java/jakarta-commons-pool/Makefile b/java/jakarta-commons-pool/Makefile index 1dabad7964da..badb32bfbf49 100644 --- a/java/jakarta-commons-pool/Makefile +++ b/java/jakarta-commons-pool/Makefile @@ -15,13 +15,15 @@ LICENSE= APACHE20 OPTIONS_DEFINE= DOCS +USES= dos2unix +DOS2UNIX_GLOB= *.xml *.java USE_JAVA= yes JAVA_VERSION= 1.6+ USE_ANT= yes ALL_TARGET= build-jar -PLIST_FILES= %%JAVAJARDIR%%/${PORTNAME}.jar +PLIST_FILES= ${JAVAJARDIR}/${PORTNAME}.jar PORTDOCS= * diff --git a/java/jakarta-commons-pool/files/patch-build.xml b/java/jakarta-commons-pool/files/patch-build.xml index d82eb5bb0f09..bb1ff678dfc1 100644 --- a/java/jakarta-commons-pool/files/patch-build.xml +++ b/java/jakarta-commons-pool/files/patch-build.xml @@ -1,11 +1,11 @@ ---- build.xml.orig 2012-01-10 13:14:30.000000000 +0100 -+++ build.xml 2012-01-10 13:14:40.000000000 +0100 +--- build.xml.orig 2016-06-20 15:05:02 UTC ++++ build.xml @@ -40,7 +40,7 @@ -
- <property name="name" value="commons-pool"/>
- <property name="title" value="Apache Commons Object Pooling Package"/>
-- <property name="version" value="1.6-SNAPSHOT"/>
-+ <property name="version" value="1.6"/>
- <property name="package" value="org.apache.commons.pool.*"/>
-
- <property name="src.dir" value="${basedir}/src"/>
+ + <property name="name" value="commons-pool"/> + <property name="title" value="Apache Commons Object Pooling Package"/> +- <property name="version" value="1.6-SNAPSHOT"/> ++ <property name="version" value="1.6"/> + <property name="package" value="org.apache.commons.pool.*"/> + + <property name="src.dir" value="${basedir}/src"/> diff --git a/java/jgrapht/Makefile b/java/jgrapht/Makefile index 947fc6d446c8..a7f194798f98 100644 --- a/java/jgrapht/Makefile +++ b/java/jgrapht/Makefile @@ -10,7 +10,8 @@ MASTER_SITES= SF/${PORTNAME}/JGraphT/Version%20${PORTVERSION} MAINTAINER= ports@FreeBSD.org COMMENT= Java package for mathematical graph-theory objects and algorithms -USES= zip +USES= dos2unix zip +DOS2UNIX_GLOB= *.xml *.java USE_JAVA= yes JAVA_VERSION= 1.6 1.7 @@ -30,7 +31,7 @@ NO_BUILD= yes PORTDOCS= * -PLIST_FILES= %%JAVAJARDIR%%/${PORTNAME}.jar +PLIST_FILES= ${JAVAJARDIR}/${PORTNAME}.jar .include <bsd.port.pre.mk> diff --git a/java/jgrapht/files/patch-build.xml b/java/jgrapht/files/patch-build.xml index eb39cf5aabd2..2870d1748c70 100644 --- a/java/jgrapht/files/patch-build.xml +++ b/java/jgrapht/files/patch-build.xml @@ -1,12 +1,12 @@ Patch to allow the JDK API location to be passed to Ant using -Djdk.api ---- build.xml.orig Mon Jul 3 00:53:38 2006 -+++ build.xml Sun Mar 11 12:16:31 2007 -@@ -400,6 +400,7 @@ - <include name="**"/>
- <exclude name="org/jgrapht/experimental/**"/>
- </packageset>
-+ <link offline="true" packagelistLoc="${jdk.api}" href="${jdk.api}"/>
- </javadoc>
- </target>
-
+--- build.xml.orig 2016-06-20 15:06:43 UTC ++++ build.xml +@@ -355,6 +355,7 @@ + <include name="**"/> + <exclude name="org/jgrapht/experimental/**"/> + </packageset> ++ <link offline="true" packagelistLoc="${jdk.api}" href="${jdk.api}"/> + </javadoc> + </target> + |