Date: Wed, 2 Mar 2011 20:26:08 +0800 (CST) From: Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org> To: FreeBSD-gnats-submit@FreeBSD.org Cc: arved@FreeBSD.org Subject: ports/155189: [PATCH] devel/pcsc-lite: add missing default value, respect PORTDOCS and PORTEXAMPLES Message-ID: <20110302122608.B6DF42AEC517@sunpoet.net> Resent-Message-ID: <201103021230.p22CUGEh021397@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 155189 >Category: ports >Synopsis: [PATCH] devel/pcsc-lite: add missing default value, respect PORTDOCS and PORTEXAMPLES >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Wed Mar 02 12:30:15 UTC 2011 >Closed-Date: >Last-Modified: >Originator: Sunpoet Po-Chuan Hsieh >Release: FreeBSD 8.2-STABLE amd64 >Organization: The FreeBSD Project >Environment: System: FreeBSD bonjour.sunpoet.net 8.2-STABLE FreeBSD 8.2-STABLE #0: Sun Feb 27 15:28:25 CST 2011 >Description: - Add missing default value to rc.d script (pcscd) - Respect PORTDOCS and PORTEXAMPLES - Pet portlint Port maintainer (arved@FreeBSD.org) is cc'd. Generated with FreeBSD Port Tools 0.99 >How-To-Repeat: - Add missing default value to rc.d script (pcscd): % grep pcscd_enable /etc/rc.conf % /usr/local/etc/rc.d/pcscd start /usr/local/etc/rc.d/pcscd: WARNING: $pcscd_enable is not set properly - see rc.conf(5). >Fix: --- pcsc-lite-1.6.4,2.patch begins here --- Index: Makefile =================================================================== RCS file: /home/ncvs/ports/devel/pcsc-lite/Makefile,v retrieving revision 1.51 diff -u -u -r1.51 Makefile --- Makefile 6 Sep 2010 07:54:03 -0000 1.51 +++ Makefile 2 Mar 2011 12:19:44 -0000 @@ -24,10 +24,10 @@ USE_RC_SUBR= pcscd USE_LDCONFIG= yes -CONFIGURE_ENV+= LIBS="${LIBS} ${PTHREAD_LIBS}" \ - CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS}" -CONFIGURE_ARGS+=--enable-ipcdir=/var/tmp/ \ - --enable-usbdropdir=${PREFIX}/lib/pcsc/drivers/ \ +CFLAGS+= ${PTHREAD_CFLAGS} +CONFIGURE_ENV= LIBS="${LIBS} ${PTHREAD_LIBS}" +CONFIGURE_ARGS= --enable-ipcdir=/var/tmp/ \ + --enable-usbdropdir=${PREFIX}/lib/pcsc/drivers/ PKGMESSAGE= ${WRKDIR}/pkg-message @@ -50,6 +50,9 @@ ${REINPLACE_CMD} -e "s,libusb-1.0/libusb.h,libusb.h,; \ s,libusb_strerror(ret),ret," ${WRKSRC}/configure \ ${WRKSRC}/src/hotplug_libusb.c +.if defined(NOPORTDOCS) + ${REINPLACE_CMD} -e '/ifdhandler-3.tex/d' ${WRKSRC}/doc/Makefile.in +.endif pre-everything:: .if !defined(WITHOUT_USB) && ${OSVERSION} >= 800069 @@ -60,11 +63,15 @@ .endif post-install: +.if !defined(NOPORTDOCS) ${INSTALL_DATA} ${WRKSRC}/doc/README.DAEMON ${DOCSDIR} +.endif +.if !defined(NOPORTEXAMPLES) @${MKDIR} ${EXAMPLESDIR} ${INSTALL_DATA} ${WRKSRC}/doc/example/Makefile.am ${EXAMPLESDIR} ${INSTALL_DATA} ${WRKSRC}/doc/example/Makefile.in ${EXAMPLESDIR} ${INSTALL_DATA} ${WRKSRC}/doc/example/pcsc_demo.c ${EXAMPLESDIR} +.endif @${MKDIR} ${PREFIX}/lib/pcsc/drivers @${MKDIR} ${PREFIX}/lib/pcsc/services ${TOUCH} ${PREFIX}/lib/pcsc/drivers/.keep_me Index: distinfo =================================================================== RCS file: /home/ncvs/ports/devel/pcsc-lite/distinfo,v retrieving revision 1.27 diff -u -u -r1.27 distinfo --- distinfo 6 Sep 2010 07:54:03 -0000 1.27 +++ distinfo 2 Mar 2011 12:19:44 -0000 @@ -1,3 +1,2 @@ -MD5 (pcsc-lite-1.6.4.tar.bz2) = d2106e881803784fe2f27922d2d73bc0 SHA256 (pcsc-lite-1.6.4.tar.bz2) = f5011a7167ad00e312958eace65f14e4cfd20655b02e80f7de1438828c7f730a SIZE (pcsc-lite-1.6.4.tar.bz2) = 481349 Index: pkg-plist =================================================================== RCS file: /home/ncvs/ports/devel/pcsc-lite/pkg-plist,v retrieving revision 1.21 diff -u -u -r1.21 pkg-plist --- pkg-plist 16 Aug 2010 18:45:06 -0000 1.21 +++ pkg-plist 2 Mar 2011 12:19:44 -0000 @@ -10,13 +10,13 @@ lib/pcsc/services/.keep_me libdata/pkgconfig/libpcsclite.pc sbin/pcscd -%%DOCSDIR%%/README.DAEMON -%%DOCSDIR%%/ifdhandler-3.tex -%%EXAMPLESDIR%%/Makefile.am -%%EXAMPLESDIR%%/Makefile.in -%%EXAMPLESDIR%%/pcsc_demo.c -@dirrm %%EXAMPLESDIR%% -@dirrm %%DOCSDIR%% +%%PORTDOCS%%%%DOCSDIR%%/README.DAEMON +%%PORTDOCS%%%%DOCSDIR%%/ifdhandler-3.tex +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Makefile.am +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Makefile.in +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pcsc_demo.c +%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%% +%%PORTDOCS%%@dirrm %%DOCSDIR%% @dirrm lib/pcsc/services @dirrm lib/pcsc/drivers @dirrm lib/pcsc Index: files/pcscd.in =================================================================== RCS file: /home/ncvs/ports/devel/pcsc-lite/files/pcscd.in,v retrieving revision 1.2 diff -u -u -r1.2 pcscd.in --- files/pcscd.in 27 Mar 2010 00:12:53 -0000 1.2 +++ files/pcscd.in 2 Mar 2011 12:19:44 -0000 @@ -17,4 +17,7 @@ command="%%PREFIX%%/sbin/pcscd" load_rc_config "$name" + +: ${pcscd_enable="NO"} + run_rc_command "$1" --- pcsc-lite-1.6.4,2.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20110302122608.B6DF42AEC517>