From owner-svn-ports-all@FreeBSD.ORG  Wed Oct 30 09:21:23 2013
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id 530D9283;
 Wed, 30 Oct 2013 09:21:23 +0000 (UTC) (envelope-from ale@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 30F092005;
 Wed, 30 Oct 2013 09:21:23 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9U9LM5Q001941;
 Wed, 30 Oct 2013 09:21:22 GMT (envelope-from ale@svn.freebsd.org)
Received: (from ale@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9U9LMrb001939;
 Wed, 30 Oct 2013 09:21:22 GMT (envelope-from ale@svn.freebsd.org)
Message-Id: <201310300921.r9U9LMrb001939@svn.freebsd.org>
From: Alex Dupre <ale@FreeBSD.org>
Date: Wed, 30 Oct 2013 09:21:22 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r332087 - in head/security/iaikpkcs11wrapper: . files
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 30 Oct 2013 09:21:23 -0000

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@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/