diff options
| author | Alex Dupre <ale@FreeBSD.org> | 2013-10-30 09:21:21 +0000 |
|---|---|---|
| committer | Alex Dupre <ale@FreeBSD.org> | 2013-10-30 09:21:21 +0000 |
| commit | 366eac9b9904ae328d9af6ee4c284eeaa04a4a7b (patch) | |
| tree | 3fd2bbadc1c7c349c6f5e5b1619d5c2f0e83e5a1 /security/iaikpkcs11wrapper | |
| parent | 6a1765003e7318334c1951fbc64417a228bf1671 (diff) | |
| download | ports-366eac9b9904ae328d9af6ee4c284eeaa04a4a7b.tar.gz ports-366eac9b9904ae328d9af6ee4c284eeaa04a4a7b.zip | |
Fix build with clang and stagify.
Notes
Notes:
svn path=/head/; revision=332087
Diffstat (limited to 'security/iaikpkcs11wrapper')
| -rw-r--r-- | security/iaikpkcs11wrapper/Makefile | 22 | ||||
| -rw-r--r-- | security/iaikpkcs11wrapper/files/patch-Makefile | 7 |
2 files changed, 19 insertions, 10 deletions
diff --git a/security/iaikpkcs11wrapper/Makefile b/security/iaikpkcs11wrapper/Makefile index c63044fa94ad..3664751748a6 100644 --- a/security/iaikpkcs11wrapper/Makefile +++ b/security/iaikpkcs11wrapper/Makefile @@ -11,8 +11,11 @@ DISTNAME= ${PORTNAME}_${PORTVERSION:S/./_/g} MAINTAINER= ale@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 %%JAVAJARDIR%%/iaikPkcs11Wrapper.jar 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-x86 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 diff --git a/security/iaikpkcs11wrapper/files/patch-Makefile b/security/iaikpkcs11wrapper/files/patch-Makefile new file mode 100644 index 000000000000..1fbed912d449 --- /dev/null +++ b/security/iaikpkcs11wrapper/files/patch-Makefile @@ -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/ |