svn commit: r333560 - in head: Mk devel/charva java/java-getopt security/xml-security

[Baptiste Daroussin]

Author: bapt
Date: Tue Nov 12 10:36:16 2013
New Revision: 333560
URL: http://svnweb.freebsd.org/changeset/ports/333560

Log:
  Change DESTDIRNAME into a ant compatible argument when a port is staged
  While here remove previous workarounds.
  
  Submitted by:	ale
  Discussed with:	jkim, glewis

Modified:
  head/Mk/bsd.java.mk
  head/devel/charva/Makefile
  head/java/java-getopt/Makefile
  head/security/xml-security/Makefile

Modified: head/Mk/bsd.java.mk
==============================================================================
--- head/Mk/bsd.java.mk	Tue Nov 12 10:32:57 2013	(r333559)
+++ head/Mk/bsd.java.mk	Tue Nov 12 10:36:16 2013	(r333560)
@@ -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

Modified: head/devel/charva/Makefile
==============================================================================
--- head/devel/charva/Makefile	Tue Nov 12 10:32:57 2013	(r333559)
+++ head/devel/charva/Makefile	Tue Nov 12 10:36:16 2013	(r333560)
@@ -28,9 +28,6 @@ PLIST_FILES=	%%JAVAJARDIR%%/${PORTNAME}.
 		%%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}

Modified: head/java/java-getopt/Makefile
==============================================================================
--- head/java/java-getopt/Makefile	Tue Nov 12 10:32:57 2013	(r333559)
+++ head/java/java-getopt/Makefile	Tue Nov 12 10:36:16 2013	(r333560)
@@ -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}

Modified: head/security/xml-security/Makefile
==============================================================================
--- head/security/xml-security/Makefile	Tue Nov 12 10:32:57 2013	(r333559)
+++ head/security/xml-security/Makefile	Tue Nov 12 10:36:16 2013	(r333560)
@@ -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 \