- Add USES=libtool and INSTALL_TARGET=install-strip

- Remove WITHOUT_USB
- Remove FreeBSD < 8 support
- Remove .keep_me files

3 files changed, 12 insertions, 47 deletions

diff --git a/devel/pcsc-lite/Makefile b/devel/pcsc-lite/Makefile
index 584bcd0ae061..afadc8a829b2 100644
--- a/devel/pcsc-lite/Makefile
+++ b/devel/pcsc-lite/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	pcsc-lite
 PORTVERSION=	1.8.11
-PORTREVISION=	1
+PORTREVISION=	2
 PORTEPOCH=	2
 CATEGORIES=	devel security
 MASTER_SITES=	https://alioth.debian.org/frs/download.php/file/3991/
@@ -15,33 +15,28 @@ LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 GNU_CONFIGURE=	yes
-USES=		gmake perl5 pathfix pkgconfig shebangfix tar:bzip2
+INSTALL_TARGET=	install-strip
+USES=		gmake libtool pathfix perl5 pkgconfig shebangfix tar:bzip2
 USE_PERL5=	build
 USE_RC_SUBR=	pcscd
 SHEBANG_FILES=	${WRKSRC}/src/spy/pcsc-spy
 
 USE_LDCONFIG=	yes
-CONFIGURE_ARGS=	--enable-usbdropdir=${PREFIX}/lib/pcsc/drivers/
+CONFIGURE_ARGS=	--enable-usbdropdir=${PREFIX}/lib/pcsc/drivers/ \
+		LIBUSB_CFLAGS=" " LIBUSB_LIBS="-lusb"
 
 PKGMESSAGE=	${WRKDIR}/pkg-message
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if ${OSVERSION} < 1000000
+.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1000000
 FETCH_DEPENDS=	wget:${PORTSDIR}/ftp/wget
 DISABLE_SIZE=	yes
 FETCH_CMD=	${LOCALBASE}/bin/wget -c -nc --no-check-certificate
 .endif
 
-.if !defined(WITHOUT_USB) && ${OSVERSION} >= 800069
-CONFIGURE_ENV+=	LIBUSB_LIBS="-lusb"
-CONFIGURE_ARGS+=--enable-libusb=/usr
-.else
-BROKEN=		FreeBSD 7.x does not ship with a supported libusb
-.endif
-
 post-patch:
 	${REINPLACE_CMD} -e "s,^datadir,#datadir,; s,^data_DATA,#data_DATA," \
 		${WRKSRC}/doc/Makefile.in
@@ -53,14 +48,6 @@ post-patch:
 	${REINPLACE_CMD} -e '/^install-data-am: / s|install-docDATA||' ${WRKSRC}/doc/Makefile.in
 .endif
 
-pre-everything::
-.if !defined(WITHOUT_USB) && ${OSVERSION} >= 800069
-	@${ECHO_MSG}
-	@${ECHO_MSG} "pcsc-lite has the following option(s):"
-	@${ECHO_MSG} "  WITHOUT_USB=yes            Disable USB support"
-	@${ECHO_MSG}
-.endif
-
 post-install:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/doc/example/Makefile.am ${STAGEDIR}${EXAMPLESDIR}
@@ -68,10 +55,7 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/doc/example/pcsc_demo.c ${STAGEDIR}${EXAMPLESDIR}
 	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/pcsc/drivers
 	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/pcsc/services
-	${TOUCH} ${STAGEDIR}${PREFIX}/lib/pcsc/drivers/.keep_me
-	${TOUCH} ${STAGEDIR}${PREFIX}/lib/pcsc/services/.keep_me
 	@${SED} 's,%%PREFIX%%,${PREFIX},g' < ${FILESDIR}/pkg-message.in > \
 		${WRKDIR}/pkg-message
-	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libpcsclite.so.1 ${STAGEDIR}${PREFIX}/lib/libpcscspy.so.0
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/pcsc-lite/files/patch-ltmain.sh b/devel/pcsc-lite/files/patch-ltmain.sh
deleted file mode 100644
index 95f3c985c7be..000000000000
--- a/devel/pcsc-lite/files/patch-ltmain.sh
+++ /dev/null
@@ -1,15 +0,0 @@
---- ltmain.sh.orig	2009-07-28 23:45:57.000000000 +0200
-+++ ltmain.sh	2009-10-16 19:51:48.000000000 +0200
-@@ -2077,10 +2077,12 @@
- 	fi
- 
- 	# Install the pseudo-library for information purposes.
-+	if /usr/bin/false; then
- 	func_basename "$file"
- 	name="$func_basename_result"
- 	instname="$dir/$name"i
- 	func_show_eval "$install_prog $instname $destdir/$name" 'exit $?'
-+	fi
- 
- 	# Maybe install the static library, too.
- 	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
diff --git a/devel/pcsc-lite/pkg-plist b/devel/pcsc-lite/pkg-plist
index 8847933221f0..e53f62308424 100644
--- a/devel/pcsc-lite/pkg-plist
+++ b/devel/pcsc-lite/pkg-plist
@@ -7,10 +7,10 @@ include/PCSC/winscard.h
 include/PCSC/wintypes.h
 lib/libpcsclite.so
 lib/libpcsclite.so.1
+lib/libpcsclite.so.1.0.0
 lib/libpcscspy.so
 lib/libpcscspy.so.0
-lib/pcsc/drivers/.keep_me
-lib/pcsc/services/.keep_me
+lib/libpcscspy.so.0.0.0
 libdata/pkgconfig/libpcsclite.pc
 sbin/pcscd
 %%PORTDOCS%%%%DOCSDIR%%/README.DAEMON
@@ -18,12 +18,8 @@ sbin/pcscd
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/Makefile.am
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/Makefile.in
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/pcsc_demo.c
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
 man/man1/pcsc-spy.1.gz
 man/man5/reader.conf.5.gz
 man/man8/pcscd.8.gz
-@dirrm lib/pcsc/services
-@dirrm lib/pcsc/drivers
-@dirrm lib/pcsc
-@dirrm include/PCSC
+@dir lib/pcsc/services
+@dir lib/pcsc/drivers