From owner-svn-ports-head@FreeBSD.ORG Sun Oct 5 20:23:21 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id BE36FD19; Sun, 5 Oct 2014 20:23:21 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id A88B8679; Sun, 5 Oct 2014 20:23:21 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s95KNLZ9093233; Sun, 5 Oct 2014 20:23:21 GMT (envelope-from tijl@FreeBSD.org) Received: (from tijl@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s95KNL1l093231; Sun, 5 Oct 2014 20:23:21 GMT (envelope-from tijl@FreeBSD.org) Message-Id: <201410052023.s95KNL1l093231@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: tijl set sender to tijl@FreeBSD.org using -f From: Tijl Coosemans Date: Sun, 5 Oct 2014 20:23:21 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r370112 - in head/devel/pcsc-lite: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 05 Oct 2014 20:23:21 -0000 Author: tijl Date: Sun Oct 5 20:23:20 2014 New Revision: 370112 URL: https://svnweb.freebsd.org/changeset/ports/370112 QAT: https://qat.redports.org/buildarchive/r370112/ Log: - Add USES=libtool and INSTALL_TARGET=install-strip - Remove WITHOUT_USB - Remove FreeBSD < 8 support - Remove .keep_me files Deleted: head/devel/pcsc-lite/files/patch-ltmain.sh Modified: head/devel/pcsc-lite/Makefile head/devel/pcsc-lite/pkg-plist Modified: head/devel/pcsc-lite/Makefile ============================================================================== --- head/devel/pcsc-lite/Makefile Sun Oct 5 20:17:59 2014 (r370111) +++ head/devel/pcsc-lite/Makefile Sun Oct 5 20:23:20 2014 (r370112) @@ -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 +.include -.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 +.include Modified: head/devel/pcsc-lite/pkg-plist ============================================================================== --- head/devel/pcsc-lite/pkg-plist Sun Oct 5 20:17:59 2014 (r370111) +++ head/devel/pcsc-lite/pkg-plist Sun Oct 5 20:23:20 2014 (r370112) @@ -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