diff options
| -rw-r--r-- | Mk/bsd.java.mk | 1 | ||||
| -rw-r--r-- | devel/charva/Makefile | 3 | ||||
| -rw-r--r-- | java/java-getopt/Makefile | 3 | ||||
| -rw-r--r-- | security/xml-security/Makefile | 4 |
4 files changed, 1 insertions, 10 deletions
diff --git a/Mk/bsd.java.mk b/Mk/bsd.java.mk index 98df7cdc773c..5bb6556186ad 100644 --- a/Mk/bsd.java.mk +++ b/Mk/bsd.java.mk @@ -383,6 +383,7 @@ RUN_DEPENDS+= ${DEPEND_JAVA} # Ant support: default do-build target . if defined(USE_ANT) +DESTDIRNAME?= -Dfreebsd.ports.destdir ANT?= ${LOCALBASE}/bin/ant MAKE_ENV+= JAVA_HOME=${JAVA_HOME} BUILD_DEPENDS+= ${ANT}:${PORTSDIR}/devel/apache-ant diff --git a/devel/charva/Makefile b/devel/charva/Makefile index 31034828afa0..cce7e2ddb151 100644 --- a/devel/charva/Makefile +++ b/devel/charva/Makefile @@ -28,9 +28,6 @@ PLIST_FILES= %%JAVAJARDIR%%/${PORTNAME}.jar \ %%JAVA_HOME%%/jre/lib/${MACHINE_ARCH}/libTerminal.so PORTDOCS= * -# Hack to be removed when included in bsd.java.mk -DESTDIRNAME= -Dstagedir - .include <bsd.port.options.mk> .if ${PORT_OPTIONS:MDOCS} diff --git a/java/java-getopt/Makefile b/java/java-getopt/Makefile index dc6f3e8dc47c..686c18f12ebe 100644 --- a/java/java-getopt/Makefile +++ b/java/java-getopt/Makefile @@ -21,9 +21,6 @@ NO_WRKSUBDIR= yes PLIST_FILES= %%JAVAJARDIR%%/${PORTNAME}.jar -# hack to be removed when included in bsd.java.mk -DESTDIRNAME= -Ddestdir - .include <bsd.port.options.mk> .if ${PORT_OPTIONS:MDOCS} diff --git a/security/xml-security/Makefile b/security/xml-security/Makefile index 65de16028ddd..e469a99979c1 100644 --- a/security/xml-security/Makefile +++ b/security/xml-security/Makefile @@ -37,10 +37,6 @@ PLIST_FILES= %%JAVAJARDIR%%/xmlsec.jar ALL_TARGET+= javadoc .endif -do-build: - @(cd ${BUILD_WRKSRC}; \ - ${SETENV} ${MAKE_ENV} ${ANT} ${ALL_TARGET}) - do-install: @${ECHO} -n ">> Installing JAR as ${JAVAJARDIR}/xmlsec.jar..." @${INSTALL_DATA} ${WRKSRC}/build/xmlsec-${PORTVERSION}.jar \ |