From owner-svn-ports-head@FreeBSD.ORG Mon Aug 6 12:30:14 2012 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 08B48106564A; Mon, 6 Aug 2012 12:30:14 +0000 (UTC) (envelope-from arved@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id DDB2F8FC0C; Mon, 6 Aug 2012 12:30:13 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q76CUDkW036503; Mon, 6 Aug 2012 12:30:13 GMT (envelope-from arved@svn.freebsd.org) Received: (from arved@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q76CUDvs036498; Mon, 6 Aug 2012 12:30:13 GMT (envelope-from arved@svn.freebsd.org) Message-Id: <201208061230.q76CUDvs036498@svn.freebsd.org> From: Tilman Keskinoz Date: Mon, 6 Aug 2012 12:30:13 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r302175 - in head/devel/pcsc-lite: . files X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.5 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: Mon, 06 Aug 2012 12:30:14 -0000 Author: arved Date: Mon Aug 6 12:30:13 2012 New Revision: 302175 URL: http://svn.freebsd.org/changeset/ports/302175 Log: * Remove reference to deleted port from pkg-message PR: 169271 Submitted by: Sevan Janiyan * Revert OptionsNGification, as OPTIONS depending on OSVERSION is not possible Reported by: sunpoet and pointyhat * Update to 1.8.5 Submitted by: arved Modified: head/devel/pcsc-lite/Makefile head/devel/pcsc-lite/distinfo head/devel/pcsc-lite/files/pkg-message.in Modified: head/devel/pcsc-lite/Makefile ============================================================================== --- head/devel/pcsc-lite/Makefile Mon Aug 6 12:19:25 2012 (r302174) +++ head/devel/pcsc-lite/Makefile Mon Aug 6 12:30:13 2012 (r302175) @@ -6,10 +6,10 @@ # PORTNAME= pcsc-lite -PORTVERSION= 1.8.3 +PORTVERSION= 1.8.5 PORTEPOCH= 2 CATEGORIES= devel security -MASTER_SITES= https://alioth.debian.org/frs/download.php/3706/ +MASTER_SITES= https://alioth.debian.org/frs/download.php/3741/ MAINTAINER= arved@FreeBSD.org COMMENT= A smartcard development library @@ -38,19 +38,11 @@ MAN8= pcscd.8 .include -.if ${OSVERSION} >= 800069 -OPTIONS_DEFINE= USB -OPTIONS_DEFAULT=USB - -USB_DESC= Support for USB-reader - -.if $(PORT_OPTIONS:MUSB) -CONFIGURE_ENV+= LIBUSB_LIBS="-lusb" +.if !defined(WITHOUT_USB) && ${OSVERSION} >= 800069 +CONFIGURE_ENV+= LIBUSB_LIBS="-lusb" CONFIGURE_ARGS+=--enable-libusb=/usr .else -CONFIGURE_ARGS+=--disable-libusb -.endif - +BROKEN= FreeBSD 7.x does not ship with a supported libusb .endif post-patch: @@ -64,6 +56,14 @@ 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: .if !defined(NOPORTEXAMPLES) @${MKDIR} ${EXAMPLESDIR} Modified: head/devel/pcsc-lite/distinfo ============================================================================== --- head/devel/pcsc-lite/distinfo Mon Aug 6 12:19:25 2012 (r302174) +++ head/devel/pcsc-lite/distinfo Mon Aug 6 12:30:13 2012 (r302175) @@ -1,2 +1,2 @@ -SHA256 (pcsc-lite-1.8.3.tar.bz2) = b4442d76e9d033340844fb419783f4ee4817dc8d0e5ff208991bb0be1db45d73 -SIZE (pcsc-lite-1.8.3.tar.bz2) = 552100 +SHA256 (pcsc-lite-1.8.5.tar.bz2) = 917f6c24d2a766cc7b20ad78b70f29613f134dea997d60613826a9ce68eee6a6 +SIZE (pcsc-lite-1.8.5.tar.bz2) = 560995 Modified: head/devel/pcsc-lite/files/pkg-message.in ============================================================================== --- head/devel/pcsc-lite/files/pkg-message.in Mon Aug 6 12:19:25 2012 (r302174) +++ head/devel/pcsc-lite/files/pkg-message.in Mon Aug 6 12:30:13 2012 (r302175) @@ -4,7 +4,6 @@ PC/SC-Lite has been installed. You can fetch drivers from http://www.linuxnet.com/sourcedrivers.html or install one of the following ports: devel/libccid -security/ifd-gempc410 security/ifd-slb_rf60 For cardreaders connected to the serial port: After installing the driver,