svn commit: r332087 - in head/security/iaikpkcs11wrapper: . files

[Alex Dupre]

Author: ale
Date: Wed Oct 30 09:21:21 2013
New Revision: 332087
URL: http://svnweb.freebsd.org/changeset/ports/332087

Log:
  Fix build with clang and stagify.

Added:
  head/security/iaikpkcs11wrapper/files/patch-Makefile   (contents, props changed)
Modified:
  head/security/iaikpkcs11wrapper/Makefile

Modified: head/security/iaikpkcs11wrapper/Makefile
==============================================================================
--- head/security/iaikpkcs11wrapper/Makefile	Wed Oct 30 08:19:57 2013	(r332086)
+++ head/security/iaikpkcs11wrapper/Makefile	Wed Oct 30 09:21:21 2013	(r332087)
@@ -11,8 +11,11 @@ DISTNAME=	${PORTNAME}_${PORTVERSION:S/./
 MAINTAINER=	ale at FreeBSD.org
 COMMENT=	PKCS\#11 Java wrapper
 
+OPTIONS_DEFINE=	DOCS EXAMPLES
+
 USE_ZIP=	yes
 USE_JAVA=	yes
+USE_DOS2UNIX=	Makefile
 JAVA_VERSION=	1.6+
 JAVA_OS=	native
 USE_GMAKE=	yes
@@ -23,7 +26,6 @@ PLIST_FILES=	lib/libpkcs11wrapper.so %%J
 PORTDOCS=	*
 PORTEXAMPLES=	*
 
-NO_STAGE=	yes
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == "amd64" || ${ARCH} == "ia64"
@@ -34,23 +36,23 @@ WRKSRC=		${WRKDIR}/src/native/unix/linux
 
 do-install:
 	@${ECHO_MSG} -n ">> Installing JNI library in ${PREFIX}/lib..."
-	@${INSTALL_PROGRAM} ${WRKSRC}/release/libpkcs11wrapper.so ${PREFIX}/lib/
+	@${INSTALL_PROGRAM} ${WRKSRC}/release/libpkcs11wrapper.so ${STAGEDIR}${PREFIX}/lib/
 	@${ECHO_MSG} " [ DONE ]"
 	@${ECHO_MSG} -n ">> Installing JAR file as ${JAVAJARDIR}/iaikPkcs11Wrapper.jar..."
-	@${INSTALL_DATA} ${WRKDIR}/bin/iaikPkcs11Wrapper.jar ${JAVAJARDIR}/
+	@${INSTALL_DATA} ${WRKDIR}/bin/iaikPkcs11Wrapper.jar ${STAGEDIR}${JAVAJARDIR}/
 	@${ECHO_MSG} " [ DONE ]"
-.if !defined(NOPORTDOCS)
 	@${ECHO_MSG} -n ">> Installing documentation in ${DOCSDIR}..."
-	@${MKDIR} ${DOCSDIR}
+.if ${PORT_OPTIONS:MDOCS}
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	@cd ${WRKDIR}/docs && ${FIND} * | \
-		${CPIO} -pdmu -R ${SHAREOWN}:${SHAREGRP} ${DOCSDIR} > /dev/null 2>&1
+		${CPIO} -pdmu -R ${SHAREOWN}:${SHAREGRP} ${STAGEDIR}${DOCSDIR} > /dev/null 2>&1
 	@${ECHO_MSG} " [ DONE ]"
-.endif
-.if !defined(NOPORTEXAMPLES)
 	@${ECHO_MSG} -n ">> Installing examples in ${EXAMPLESDIR}..."
-	@${MKDIR} ${EXAMPLESDIR}
+.endif
+.if ${PORT_OPTIONS:MEXAMPLES}
+	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	@cd ${WRKDIR}/examples && ${FIND} * | \
-		${CPIO} -pdmu -R ${SHAREOWN}:${SHAREGRP} ${EXAMPLESDIR} > /dev/null 2>&1
+		${CPIO} -pdmu -R ${SHAREOWN}:${SHAREGRP} ${STAGEDIR}${EXAMPLESDIR} > /dev/null 2>&1
 	@${ECHO_MSG} " [ DONE ]"
 .endif
 

Added: head/security/iaikpkcs11wrapper/files/patch-Makefile
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/security/iaikpkcs11wrapper/files/patch-Makefile	Wed Oct 30 09:21:21 2013	(r332087)
@@ -0,0 +1,7 @@
+--- Makefile.orig	2013-10-30 08:34:48.105849638 +0000
++++ Makefile	2013-10-30 08:35:06.293848426 +0000
+@@ -1,4 +1,3 @@
+-CC = gcc
+ SOURCE_DIR = ../../common/
+ PLATFORM_SRC_INCLUDE = ../src/
+ DEBUG_OUTPUT_DIR = debug/