diff options
| author | gahr <gahr@FreeBSD.org> | 2008-09-10 23:01:53 +0800 |
|---|---|---|
| committer | gahr <gahr@FreeBSD.org> | 2008-09-10 23:01:53 +0800 |
| commit | 9c17a19016908d912584cb9d5ff1026d64e60880 (patch) | |
| tree | 164ef910303c1a7ad22d6b89779a6b6b52d1d0eb /databases/jakarta-commons-dbutils | |
| parent | 1d29bb03eb0603bdf3fae2fe17f04b06df193885 (diff) | |
| download | freebsd-ports-gnome-9c17a19016908d912584cb9d5ff1026d64e60880.tar.gz freebsd-ports-gnome-9c17a19016908d912584cb9d5ff1026d64e60880.tar.zst freebsd-ports-gnome-9c17a19016908d912584cb9d5ff1026d64e60880.zip | |
- Use ant and junit from ports instead of self-downloading old versions
- Fix build
Reported by: QA Tindie
Approved by: portmgr
Diffstat (limited to 'databases/jakarta-commons-dbutils')
| -rw-r--r-- | databases/jakarta-commons-dbutils/Makefile | 4 | ||||
| -rw-r--r-- | databases/jakarta-commons-dbutils/files/patch-build.xml | 43 |
2 files changed, 46 insertions, 1 deletions
diff --git a/databases/jakarta-commons-dbutils/Makefile b/databases/jakarta-commons-dbutils/Makefile index 28f034864988..326c3f5bb127 100644 --- a/databases/jakarta-commons-dbutils/Makefile +++ b/databases/jakarta-commons-dbutils/Makefile @@ -23,7 +23,6 @@ USE_JAVA= yes JAVA_VERSION= 1.3+ USE_ANT= yes -MAKE_ARGS= -cp ${JAVAJARDIR}/junit.jar ALL_TARGET= dist WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}-src PLIST_FILES= %%JAVAJARDIR%%/${PORTNAME}.jar @@ -32,6 +31,9 @@ PLIST_FILES= %%JAVAJARDIR%%/${PORTNAME}.jar PORTDOCS= LICENSE.txt api .endif +post-patch: + ${REINPLACE_CMD} -e 's|%%JAVALIBDIR%%|${JAVALIBDIR}|' ${WRKSRC}/build.xml + do-install: @${ECHO_MSG} -n ">> Installing JAR as ${JAVAJARDIR}/${PORTNAME}.jar..." @${INSTALL_DATA} ${WRKSRC}/dist/commons-dbutils-1.1.jar \ diff --git a/databases/jakarta-commons-dbutils/files/patch-build.xml b/databases/jakarta-commons-dbutils/files/patch-build.xml new file mode 100644 index 000000000000..ce9260c3b4d0 --- /dev/null +++ b/databases/jakarta-commons-dbutils/files/patch-build.xml @@ -0,0 +1,43 @@ +--- build.xml.orig 2008-09-10 14:27:27.000000000 +0200 ++++ build.xml 2008-09-10 14:28:28.000000000 +0200 +@@ -24,7 +24,7 @@ + <project default="jar" name="commons-dbutils" basedir="."> + <property name="defaulttargetdir" value="target"> + </property> +- <property name="libdir" value="target/lib"> ++ <property name="libdir" value="%%JAVALIBDIR%%"> + </property> + <property name="classesdir" value="target/classes"> + </property> +@@ -39,14 +39,12 @@ + <property name="final.name" value="commons-dbutils-1.1"> + </property> + <target name="init" description="o Initializes some properties"> +- <mkdir dir="${libdir}"> +- </mkdir> + <condition property="noget"> + <equals arg2="only" arg1="${build.sysclasspath}"> + </equals> + </condition> + </target> +- <target name="compile" description="o Compile the code" depends="get-deps"> ++ <target name="compile" description="o Compile the code"> + <mkdir dir="${classesdir}"> + </mkdir> + <javac destdir="${classesdir}" deprecation="true" debug="true" optimize="false" excludes="**/package.html"> +@@ -152,15 +150,4 @@ + </classpath> + </javadoc> + </target> +- <target name="get-deps" unless="noget" depends="init"> +- <get dest="${libdir}/junit-3.8.1.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/junit/jars/junit-3.8.1.jar"> +- </get> +- <get dest="${libdir}/ant-1.5.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/ant/jars/ant-1.5.jar"> +- </get> +- <get dest="${libdir}/ant-optional-1.5.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/ant/jars/ant-optional-1.5.jar"> +- </get> +- <echo message="Pay no attention if there is a subsequent warning if building under JDK 1.4+"/> +- <copy file="lib/jdbc2_0-stdext.jar" todir="${libdir}" failonerror="false"> +- </copy> +- </target> + </project> |