Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 15 Oct 2013 13:37:48 +0000 (UTC)
From:      Alex Dupre <ale@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r330400 - head/security/xml-security
Message-ID:  <201310151337.r9FDbmhw030111@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: ale
Date: Tue Oct 15 13:37:48 2013
New Revision: 330400
URL: http://svnweb.freebsd.org/changeset/ports/330400

Log:
  Update to 1.5.5 release (OPTIONify & STAGEify).

Modified:
  head/security/xml-security/Makefile
  head/security/xml-security/distinfo

Modified: head/security/xml-security/Makefile
==============================================================================
--- head/security/xml-security/Makefile	Tue Oct 15 12:58:12 2013	(r330399)
+++ head/security/xml-security/Makefile	Tue Oct 15 13:37:48 2013	(r330400)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	xml-security
-PORTVERSION=	1.5.3
+PORTVERSION=	1.5.5
 CATEGORIES=	security java
 MASTER_SITES=	${MASTER_SITE_APACHE}
 MASTER_SITE_SUBDIR=	santuario/java-library/${PORTVERSION:S/./_/g}
@@ -17,6 +17,7 @@ RUN_DEPENDS=	${JAVALIBDIR}/commons-loggi
 
 LICENSE=	AL2
 
+OPTIONS_DEFINE=	DOCS EXAMPLES
 USE_ZIP=	yes
 USE_JAVA=	yes
 JAVA_VERSION=	1.6+
@@ -24,30 +25,39 @@ WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVER
 USE_ANT=	yes
 MAKE_ENV=	ANT_INCLUDE_SHARED_JARS=YES
 ALL_TARGET=	jar
-.if !defined(NOPORTDOCS)
-ALL_TARGET+=	javadoc
-.endif
 
 PORTDOCS=	*
 PORTEXAMPLES=	*
 
 PLIST_FILES=	%%JAVAJARDIR%%/xmlsec.jar
 
-NO_STAGE=	yes
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MDOCS}
+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 ${JAVAJARDIR}/xmlsec.jar
+	@${INSTALL_DATA} ${WRKSRC}/build/xmlsec-${PORTVERSION}.jar \
+		${STAGEDIR}/${JAVAJARDIR}/xmlsec.jar
 	@${ECHO} " [ DONE ]"
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	@${ECHO} -n ">> Installing documentation in ${DOCSDIR}..."
-	@${MKDIR} ${DOCSDIR}
-	@(cd ${WRKSRC}/build/docs/html && ${COPYTREE_SHARE} javadoc ${DOCSDIR})
+	@${MKDIR} ${STAGEDIR}/${DOCSDIR}
+	@(cd ${WRKSRC}/build/docs/html && ${COPYTREE_SHARE} javadoc \
+		${STAGEDIR}/${DOCSDIR})
 	@${ECHO} " [ DONE ]"
 .endif
-.if !defined(NOPORTEXAMPLES)
+.if ${PORT_OPTIONS:MEXAMPLES}
 	@${ECHO} -n ">> Installing examples in ${EXAMPLESDIR}..."
-	@${MKDIR} ${EXAMPLESDIR}
-	@(cd ${WRKSRC}/samples && ${COPYTREE_SHARE} "javax org" ${EXAMPLESDIR})
+	@${MKDIR} ${STAGEDIR}/${EXAMPLESDIR}
+	@(cd ${WRKSRC}/samples && ${COPYTREE_SHARE} "javax org" \
+		${STAGEDIR}/${EXAMPLESDIR})
 	@${ECHO} " [ DONE ]"
 .endif
 

Modified: head/security/xml-security/distinfo
==============================================================================
--- head/security/xml-security/distinfo	Tue Oct 15 12:58:12 2013	(r330399)
+++ head/security/xml-security/distinfo	Tue Oct 15 13:37:48 2013	(r330400)
@@ -1,2 +1,2 @@
-SHA256 (xml-security-src-1_5_3.zip) = 0eb4cfa83bfb6ff3beee87f193d0bc6c45902d2bd3c6c7fb315a3e014dc15fdf
-SIZE (xml-security-src-1_5_3.zip) = 2436355
+SHA256 (xml-security-src-1_5_5.zip) = 68d0e567134913a1ba9571b587980306522f34d66ff495d065f734c08cc793c0
+SIZE (xml-security-src-1_5_5.zip) = 2437645



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201310151337.r9FDbmhw030111>