Index: head/devel/ocfpcsc/Makefile =================================================================== --- head/devel/ocfpcsc/Makefile (revision 274420) +++ head/devel/ocfpcsc/Makefile (revision 274421) @@ -1,74 +1,75 @@ # New ports collection makefile for: ocfpcsc # Date created: 2009-01-07 -# Whom: Marcin Cieslak +# Whom: Marcin Cieslak # # $FreeBSD$ # PORTNAME= ocfpcsc PORTVERSION= 0.0.1 +PORTREVISION= 1 CATEGORIES= devel security java MASTER_SITES= http://www.musclecard.com/middleware/files/ DISTNAME= OCFPCSC1-${PORTVERSION} -MAINTAINER= saper@SYSTEM.PL +MAINTAINER= saper@saper.info COMMENT= Open Card Framework to PC/SC bridge LIB_DEPENDS= pcsclite.1:${PORTSDIR}/devel/pcsc-lite USE_GMAKE= yes USE_JAVA= 1.2+ USE_LDCONFIG= yes CFLAGS+= -fPIC PORTEXAMPLES= opencard.properties PORTDOCS= README .include .if !defined(WITHOUT_MOZILLA_PLUGIN) PLIST_SUB+= PLUGIN="" .else PLIST_SUB+= PLUGIN="@comment " .endif post-patch: ${REINPLACE_CMD} -e 's,malloc.h,stdlib.h,' \ ${WRKSRC}/PcscExceptions.cpp ${TOUCH} ${WRKSRC}/dummy.cpp do-configure: @${REINPLACE_CMD} \ -e 's,CC =.*,CC = ${CXX},' \ -e 's,PCSC_HDRS =.*,PCSC_HDRS = -I${LOCALBASE}/include/PCSC,' \ -e 's,PCSC_LIBS =.*,PCSC_LIBS = -L${LOCALBASE}/lib -lpcsclite,' \ -e 's,JDK_HOME =.*,JDK_HOME = ${JAVA_HOME},'\ -e 's,genunix,freebsd,' \ ${WRKSRC}/Makefile post-build: # Create and install a dummy library for applets that # think they require WINSCARD.DLL (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 .endif .include Property changes on: head/devel/ocfpcsc/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.1 \ No newline at end of property +1.2 \ No newline at end of property Index: head/devel/ocfpcsc/distinfo =================================================================== --- head/devel/ocfpcsc/distinfo (revision 274420) +++ head/devel/ocfpcsc/distinfo (revision 274421) @@ -1,3 +1,2 @@ -MD5 (OCFPCSC1-0.0.1.tar.gz) = bf397949bffe3b75b652c6ba44a431dd SHA256 (OCFPCSC1-0.0.1.tar.gz) = 56deb4d4c8b5adb74ca47027d4772353bdb4043a7b414adf3bbed537296518a1 SIZE (OCFPCSC1-0.0.1.tar.gz) = 11436 Property changes on: head/devel/ocfpcsc/distinfo ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.1 \ No newline at end of property +1.2 \ No newline at end of property Index: head/devel/ocfpcsc/files/patch-OCFPCSC1.cpp =================================================================== --- head/devel/ocfpcsc/files/patch-OCFPCSC1.cpp (nonexistent) +++ head/devel/ocfpcsc/files/patch-OCFPCSC1.cpp (revision 274421) @@ -0,0 +1,11 @@ +--- OCFPCSC1.cpp.orig 2011-05-12 01:27:28.000000000 +0200 ++++ OCFPCSC1.cpp 2011-05-12 01:31:53.000000000 +0200 +@@ -140,7 +140,7 @@ + CONTEXT_INFO cInfo; + + /* check if context exists */ +- if (cPos = isContextAvailable((long)context) < 0) { ++ if ((cPos = isContextAvailable((long)context)) < 0) { + throwPcscException(env, obj, "SCardConnect", "PC/SC Wrapper Error: context not in table", 0); + return 0; + } Property changes on: head/devel/ocfpcsc/files/patch-OCFPCSC1.cpp ___________________________________________________________________ Added: cvs2svn:cvs-rev ## -0,0 +1 ## +1.1 \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Index: head/devel/ocfpcsc/files/patch-PcscExceptions.cpp =================================================================== --- head/devel/ocfpcsc/files/patch-PcscExceptions.cpp (nonexistent) +++ head/devel/ocfpcsc/files/patch-PcscExceptions.cpp (revision 274421) @@ -0,0 +1,11 @@ +--- PcscExceptions.cpp.orig 2011-05-12 01:27:15.000000000 +0200 ++++ PcscExceptions.cpp 2011-05-12 01:28:07.000000000 +0200 +@@ -77,7 +77,7 @@ + /* allocate enough bufferspace for the complete exception message */ + completeMsg = (char *)malloc(strlen(method) + strlen(msg) + 50); + sprintf(completeMsg, "PCSC Exception in method %s: %s\n" \ +- "return code = %8.8x\n", method, msg,returnCode); ++ "return code = %8.8lx\n", method, msg,returnCode); + + if ((exceptionMsg = env->NewStringUTF(completeMsg)) == NULL) { + free(completeMsg); Property changes on: head/devel/ocfpcsc/files/patch-PcscExceptions.cpp ___________________________________________________________________ Added: cvs2svn:cvs-rev ## -0,0 +1 ## +1.1 \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property