- Add missing default value to rc.d script (pcscd)

- Respect PORTDOCS and PORTEXAMPLES
- Pet portlint
- Bump PORTREVISION for rc.d script change

PR:		ports/155189
Submitted by:	sunpoet (myself)
Approved by:	arved (maintainer)

4 files changed, 22 insertions, 12 deletions

diff --git a/devel/pcsc-lite/Makefile b/devel/pcsc-lite/Makefile
index 2a178d9115b1..bfeabe5e8a42 100644
--- a/devel/pcsc-lite/Makefile
+++ b/devel/pcsc-lite/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	pcsc-lite
 PORTVERSION=	1.6.4
+PORTREVISION=	1
 PORTEPOCH=	2
 CATEGORIES=	devel security
 MASTER_SITES=	http://alioth.debian.org/frs/download.php/3337/
@@ -24,10 +25,10 @@ USE_GNOME=	gnomehack pkgconfig
 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 +51,9 @@ post-patch:
 	${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 +64,15 @@ pre-everything::
 .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
diff --git a/devel/pcsc-lite/distinfo b/devel/pcsc-lite/distinfo
index 1b4fdf5d4bcf..0c4278de85f6 100644
--- a/devel/pcsc-lite/distinfo
+++ b/devel/pcsc-lite/distinfo
@@ -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
diff --git a/devel/pcsc-lite/files/pcscd.in b/devel/pcsc-lite/files/pcscd.in
index 6d0d5548862a..d8e781b8dcc5 100644
--- a/devel/pcsc-lite/files/pcscd.in
+++ b/devel/pcsc-lite/files/pcscd.in
@@ -17,4 +17,7 @@ rcvar="pcscd_enable"
 command="%%PREFIX%%/sbin/pcscd"
 
 load_rc_config "$name"
+
+: ${pcscd_enable="NO"}
+
 run_rc_command "$1"
diff --git a/devel/pcsc-lite/pkg-plist b/devel/pcsc-lite/pkg-plist
index d797c49700ea..ffcc1445bafa 100644
--- a/devel/pcsc-lite/pkg-plist
+++ b/devel/pcsc-lite/pkg-plist
@@ -10,13 +10,13 @@ lib/pcsc/drivers/.keep_me
 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