Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 27 Jun 2014 22:08:58 +0000 (UTC)
From:      William Grzybowski <wg@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r359616 - in head/devel/ocfpcsc: . files
Message-ID:  <201406272208.s5RM8wMh037106@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: wg
Date: Fri Jun 27 22:08:58 2014
New Revision: 359616
URL: http://svnweb.freebsd.org/changeset/ports/359616
QAT: https://qat.redports.org/buildarchive/r359616/

Log:
  devel/ocfpcsc: support stage
  
  - Add LICENSE
  - Use options framework
  
  PR:		191419
  Submitted by:	maintainer (with changes)

Added:
  head/devel/ocfpcsc/files/IBMOCF   (contents, props changed)
Modified:
  head/devel/ocfpcsc/Makefile
  head/devel/ocfpcsc/pkg-descr
  head/devel/ocfpcsc/pkg-plist

Modified: head/devel/ocfpcsc/Makefile
==============================================================================
--- head/devel/ocfpcsc/Makefile	Fri Jun 27 22:07:24 2014	(r359615)
+++ head/devel/ocfpcsc/Makefile	Fri Jun 27 22:08:58 2014	(r359616)
@@ -11,25 +11,28 @@ DISTNAME=	OCFPCSC1-${PORTVERSION}
 MAINTAINER=	saper@saper.info
 COMMENT=	Open Card Framework to PC/SC bridge
 
-LIB_DEPENDS=	pcsclite.1:${PORTSDIR}/devel/pcsc-lite
+LICENSE=	IBMOCF
+LICENSE_NAME=	IBM OpenCard Framework
+LICENSE_FILE=	${FILESDIR}/IBMOCF
+LICENSE_PERMS=	dist-sell pkg-sell
+
+LIB_DEPENDS=	libpcsclite.so:${PORTSDIR}/devel/pcsc-lite
 
 USES=		gmake
-USE_JAVA=	1.2+
+USE_JAVA=	yes
 USE_LDCONFIG=	yes
 
 CFLAGS+=	-fPIC
 
+OPTIONS_DEFINE=	DOCS EXAMPLES MOZILLA_PLUGIN
+OPTIONS_DEFAULT=MOZILLA_PLUGIN
+
+OPTIONS_SUB=	yes
+
 PORTEXAMPLES=	opencard.properties
 PORTDOCS=	README
 
-NO_STAGE=	yes
-.include <bsd.port.pre.mk>
-
-.if !defined(WITHOUT_MOZILLA_PLUGIN)
-PLIST_SUB+=	PLUGIN=""
-.else
-PLIST_SUB+=	PLUGIN="@comment "
-.endif
+.include <bsd.port.options.mk>
 
 post-patch:
 	${REINPLACE_CMD} -e 's,malloc.h,stdlib.h,' \
@@ -51,22 +54,18 @@ post-build:
 	(cd ${WRKSRC} && ${LD} -Bsymbolic -shared dummy.o -o libWINSCARD.so)
 
 do-install:
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-	@${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
-.endif
-.if !defined(NOPORTEXAMPLES)
-	@${MKDIR} ${EXAMPLESDIR}
-	@${INSTALL_DATA} ${WRKSRC}/opencard.properties ${EXAMPLESDIR}
-.endif
-	@${INSTALL_DATA} ${WRKSRC}/libOCFPCSC1.so ${PREFIX}/lib/libOCFPCSC1.so.1
-	@${INSTALL_DATA} ${WRKSRC}/libWINSCARD.so ${PREFIX}/lib/libWINSCARD.so.1
-	@${LN} -fs ${PREFIX}/lib/libOCFPCSC1.so.1 ${PREFIX}/lib/libOCFPCSC1.so
-	@${LN} -fs ${PREFIX}/lib/libWINSCARD.so.1 ${PREFIX}/lib/libWINSCARD.so
-.if !defined (WITHOUT_MOZILLA_PLUGIN)
-	@${MKDIR} ${PREFIX}/lib/browser_plugins
-	@${LN} -fs ${PREFIX}/lib/libOCFPCSC1.so.1 ${PREFIX}/lib/browser_plugins/libOCFPCSC1.so
-	@${LN} -fs ${PREFIX}/lib/libWINSCARD.so.1 ${PREFIX}/lib/browser_plugins/libWINSCARD.so
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	@${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
+	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
+	${INSTALL_DATA} ${WRKSRC}/opencard.properties ${STAGEDIR}${EXAMPLESDIR}/opencard.properties
+	${INSTALL_DATA} ${WRKSRC}/libOCFPCSC1.so ${STAGEDIR}${PREFIX}/lib/libOCFPCSC1.so.1
+	${INSTALL_DATA} ${WRKSRC}/libWINSCARD.so ${STAGEDIR}${PREFIX}/lib/libWINSCARD.so.1
+	${LN} -fs libOCFPCSC1.so.1 ${STAGEDIR}${PREFIX}/lib/libOCFPCSC1.so
+	${LN} -fs libWINSCARD.so.1 ${STAGEDIR}${PREFIX}/lib/libWINSCARD.so
+.if ${PORT_OPTIONS:MMOZILLA_PLUGIN}
+	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/browser_plugins
+	@${LN} -fs ../../lib/libOCFPCSC1.so.1 ${STAGEDIR}${PREFIX}/lib/browser_plugins/libOCFPCSC1.so
+	@${LN} -fs ../../lib/libWINSCARD.so.1 ${STAGEDIR}${PREFIX}/lib/browser_plugins/libWINSCARD.so
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Added: head/devel/ocfpcsc/files/IBMOCF
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/devel/ocfpcsc/files/IBMOCF	Fri Jun 27 22:08:58 2014	(r359616)
@@ -0,0 +1,34 @@
+/*
+ * Copyright (c) 1997 - 1999 IBM Corporation.
+ * 
+ * Redistribution and use in source (source code) and binary (object code)
+ * forms, with or without modification, are permitted provided that the
+ * following conditions are met:
+ * 1. Redistributed source code must retain the above copyright notice, this
+ * list of conditions and the disclaimer below.
+ * 2. Redistributed object code must reproduce the above copyright notice,
+ * this list of conditions and the disclaimer below in the documentation
+ * and/or other materials provided with the distribution.
+ * 3. The name of IBM may not be used to endorse or promote products derived
+ * from this software or in any other form without specific prior written
+ * permission from IBM.
+ * 4. Redistribution of any modified code must be labeled "Code derived from
+ * the original OpenCard Framework".
+ * 
+ * THIS SOFTWARE IS PROVIDED BY IBM "AS IS" FREE OF CHARGE. IBM SHALL NOT BE
+ * LIABLE FOR INFRINGEMENTS OF THIRD PARTIES RIGHTS BASED ON THIS SOFTWARE.  ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED.  IBM DOES NOT WARRANT THAT THE FUNCTIONS CONTAINED IN THIS
+ * SOFTWARE WILL MEET THE USER'S REQUIREMENTS OR THAT THE OPERATION OF IT WILL
+ * BE UNINTERRUPTED OR ERROR-FREE.  IN NO EVENT, UNLESS REQUIRED BY APPLICABLE
+ * LAW, SHALL IBM BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+ * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.  ALSO, IBM IS UNDER NO OBLIGATION
+ * TO MAINTAIN, CORRECT, UPDATE, CHANGE, MODIFY, OR OTHERWISE SUPPORT THIS
+ * SOFTWARE.
+ */

Modified: head/devel/ocfpcsc/pkg-descr
==============================================================================
--- head/devel/ocfpcsc/pkg-descr	Fri Jun 27 22:07:24 2014	(r359615)
+++ head/devel/ocfpcsc/pkg-descr	Fri Jun 27 22:08:58 2014	(r359616)
@@ -2,4 +2,4 @@ A library to provide a means to use Open
 to PC/SC supported smartcard readers.
 
 Author: David Corcoran
-WWW:	http://www.musclecard.com/middleware/
+WWW: http://www.musclecard.com/middleware/

Modified: head/devel/ocfpcsc/pkg-plist
==============================================================================
--- head/devel/ocfpcsc/pkg-plist	Fri Jun 27 22:07:24 2014	(r359615)
+++ head/devel/ocfpcsc/pkg-plist	Fri Jun 27 22:08:58 2014	(r359616)
@@ -1,7 +1,7 @@
-%%PLUGIN%%lib/browser_plugins/libOCFPCSC1.so
-%%PLUGIN%%lib/browser_plugins/libWINSCARD.so
+%%MOZILLA_PLUGIN%%lib/browser_plugins/libOCFPCSC1.so
+%%MOZILLA_PLUGIN%%lib/browser_plugins/libWINSCARD.so
 lib/libOCFPCSC1.so
 lib/libOCFPCSC1.so.1
 lib/libWINSCARD.so
 lib/libWINSCARD.so.1
-%%PLUGIN%%@dirrmtry lib/browser_plugins
+%%MOZILLA_PLUGIN%%@dirrmtry lib/browser_plugins



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