From ce2440275cd99776a09ff05a173e7bdef2444dbd Mon Sep 17 00:00:00 2001 From: espie Date: Tue, 2 Jul 2013 10:36:35 +0000 Subject: [PATCH] rename stuff so that java.port.mk conforms to the new style of overriding do-build. --- databases/postgresql-jdbc/Makefile | 4 ++-- devel/jdk/java.port.mk | 15 +++++++++------ geo/jeoip/Makefile | 4 ++-- java/asm/Makefile | 4 ++-- lang/abcl/Makefile | 4 ++-- lang/clojure/Makefile | 4 ++-- 6 files changed, 19 insertions(+), 16 deletions(-) diff --git a/databases/postgresql-jdbc/Makefile b/databases/postgresql-jdbc/Makefile index edf163319cd..5575efd518b 100644 --- a/databases/postgresql-jdbc/Makefile +++ b/databases/postgresql-jdbc/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.19 2013/03/11 02:52:07 espie Exp $ +# $OpenBSD: Makefile,v 1.20 2013/07/02 10:36:35 espie Exp $ COMMENT-main= JDBC Driver for PostgreSQL COMMENT-docs= API docs for PostgreSQL JDBC Driver @@ -27,7 +27,7 @@ MODULES= java MODJAVA_VER?= 1.6+ MODJAVA_JRERUN= yes MODJAVA_BUILD= ant -MODJAVA_BUILD_TARGET= all publicapi +MODJAVA_BUILD_TARGET_NAME = all publicapi TEST_DEPENDS= databases/postgresql \ java/junit diff --git a/devel/jdk/java.port.mk b/devel/jdk/java.port.mk index 5ebe5156148..b7bdde8eaee 100644 --- a/devel/jdk/java.port.mk +++ b/devel/jdk/java.port.mk @@ -1,4 +1,4 @@ -# $OpenBSD: java.port.mk,v 1.31 2013/02/03 15:03:03 jasper Exp $ +# $OpenBSD: java.port.mk,v 1.32 2013/07/02 10:36:35 espie Exp $ # Set MODJAVA_VER to x.y or x.y+ based on the version # of the jdk needed for the port. x.y means any x.y jdk. @@ -89,21 +89,24 @@ CATEGORIES+= java # Allow ports to that use devel/apache-ant to set MODJAVA_BUILD=ant # In case a non-standard build target, build file or build directory are -# needed, set MODJAVA_BUILD_TARGET, MODJAVA_BUILD_FILE or MODJAVA_BUILD_DIR +# needed, set MODJAVA_BUILD_TARGET_NAME, MODJAVA_BUILD_FILE or MODJAVA_BUILD_DIR # respectively. .if defined(MODJAVA_BUILD) && ${MODJAVA_BUILD:L} == "ant" BUILD_DEPENDS += devel/apache-ant MAKE_ENV += JAVA_HOME=${JAVA_HOME} - MODJAVA_BUILD_TARGET ?= + MODJAVA_BUILD_TARGET_NAME ?= MODJAVA_BUILD_FILE ?= build.xml MODJAVA_BUILD_DIR ?= ${WRKSRC} MODJAVA_BUILD_ARGS ?= -. if !target(do-build) -do-build: + +MODJAVA_BUILD_TARGET = \ cd ${MODJAVA_BUILD_DIR} && \ ${SETENV} ${MAKE_ENV} ${LOCALBASE}/bin/ant \ - -buildfile ${MODJAVA_BUILD_FILE} ${MODJAVA_BUILD_TARGET} \ + -buildfile ${MODJAVA_BUILD_FILE} ${MODJAVA_BUILD_TARGET_NAME} \ ${MODJAVA_BUILD_ARGS} +. if !target(do-build) +do-build: + ${MODJAVA_BUILD_TARGET} . endif .endif diff --git a/geo/jeoip/Makefile b/geo/jeoip/Makefile index a1b4460789b..192968b500c 100644 --- a/geo/jeoip/Makefile +++ b/geo/jeoip/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.22 2013/03/11 11:07:42 espie Exp $ +# $OpenBSD: Makefile,v 1.23 2013/07/02 10:36:35 espie Exp $ COMMENT= Java interface to GeoIP database DISTNAME= jeoip-0.5 @@ -19,7 +19,7 @@ MODULES= java MODJAVA_VER= 1.6+ MODJAVA_JRERUN= Yes MODJAVA_BUILD= ant -MODJAVA_BUILD_TARGET= jar docs +MODJAVA_BUILD_TARGET_NAME = jar docs BUILD_DEPENDS= java/junit TEST_DEPENDS= net/GeoIP \ diff --git a/java/asm/Makefile b/java/asm/Makefile index c28db3591fa..e73f254c1bb 100644 --- a/java/asm/Makefile +++ b/java/asm/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.2 2013/03/11 11:12:34 espie Exp $ +# $OpenBSD: Makefile,v 1.3 2013/07/02 10:36:35 espie Exp $ COMMENT= Java bytecode manipulation framework @@ -16,7 +16,7 @@ MASTER_SITES= http://download.forge.objectweb.org/asm/ MODULES= java MODJAVA_VER= 1.6+ MODJAVA_BUILD= ant -MODJAVA_BUILD_TARGET=dist +MODJAVA_BUILD_TARGET_NAME = dist JARS= asm asm-analysis asm-commons asm-tree asm-util asm-xml diff --git a/lang/abcl/Makefile b/lang/abcl/Makefile index 94f6034f96f..4278507639d 100644 --- a/lang/abcl/Makefile +++ b/lang/abcl/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.1.1.1 2013/05/13 09:25:54 jasper Exp $ +# $OpenBSD: Makefile,v 1.2 2013/07/02 10:36:35 espie Exp $ COMMENT = Common Lisp dialect for the Java Virtual Machine @@ -19,7 +19,7 @@ MASTER_SITES = ${HOMEPAGE}/releases/$V/ MODULES = java MODJAVA_VER = 1.6+ MODJAVA_BUILD = ant -MODJAVA_BUILD_TARGET = abcl.jar +MODJAVA_BUILD_TARGET_NAME = abcl.jar MODJAVA_JRERUN = Yes RUN_DEPENDS = java/javaPathHelper \ diff --git a/lang/clojure/Makefile b/lang/clojure/Makefile index 6e3b3af4d36..79d56cd4399 100644 --- a/lang/clojure/Makefile +++ b/lang/clojure/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.17 2013/03/17 19:35:06 jasper Exp $ +# $OpenBSD: Makefile,v 1.18 2013/07/02 10:36:35 espie Exp $ COMMENT = Lisp-1 dialect for the Java Virtual Machine @@ -21,7 +21,7 @@ MASTER_SITES = http://repo1.maven.org/maven2/org/clojure/clojure/$V/ MODULES = java MODJAVA_VER = 1.6+ MODJAVA_BUILD = ant -MODJAVA_BUILD_TARGET = jar +MODJAVA_BUILD_TARGET_NAME = jar MODJAVA_JRERUN = Yes RUN_DEPENDS = java/javaPathHelper \