From owner-svn-ports-all@FreeBSD.ORG Sat Oct 11 21:17:41 2014 Return-Path: Delivered-To: svn-ports-all@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 A4D62C8C; Sat, 11 Oct 2014 21:17:41 +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 779029C9; Sat, 11 Oct 2014 21:17:41 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s9BLHfu0093036; Sat, 11 Oct 2014 21:17:41 GMT (envelope-from jhale@FreeBSD.org) Received: (from jhale@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s9BLHfo7093035; Sat, 11 Oct 2014 21:17:41 GMT (envelope-from jhale@FreeBSD.org) Message-Id: <201410112117.s9BLHfo7093035@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: jhale set sender to jhale@FreeBSD.org using -f From: "Jason E. Hale" Date: Sat, 11 Oct 2014 21:17:41 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r370668 - head/devel/urjtag X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 11 Oct 2014 21:17:41 -0000 Author: jhale Date: Sat Oct 11 21:17:40 2014 New Revision: 370668 URL: https://svnweb.freebsd.org/changeset/ports/370668 QAT: https://qat.redports.org/buildarchive/r370668/ Log: - Convert USE_BZIP2 to USES - Use options helpers - Whitespace cleanup Modified: head/devel/urjtag/Makefile Modified: head/devel/urjtag/Makefile ============================================================================== --- head/devel/urjtag/Makefile Sat Oct 11 20:06:14 2014 (r370667) +++ head/devel/urjtag/Makefile Sat Oct 11 21:17:40 2014 (r370668) @@ -14,8 +14,7 @@ LICENSE= GPLv2 RUN_DEPENDS= bash:${PORTSDIR}/shells/bash -USE_BZIP2= yes -USES= gmake readline shebangfix +USES= gmake readline shebangfix tar:bzip2 SHEBANG_FILES= src/bsdl2jtag USE_CSTD= c99 GNU_CONFIGURE= yes @@ -23,34 +22,22 @@ GNU_CONFIGURE= yes CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -OPTIONS_DEFINE= USB FTDI JEDEC NLS -OPTIONS_DEFAULT= USB FTDI -OPTIONS_SUB= yes -USB_DESC= Build support for USB JTAG adapters -FTDI_DESC= Build support for FTDI-based USB JTAG adapters -JEDEC_DESC= Enable experimental JEDEC flash detection +OPTIONS_DEFINE= FTDI JEDEC NLS USB +OPTIONS_DEFAULT= FTDI USB +OPTIONS_SUB= yes + +FTDI_DESC= FTDI-based USB JTAG adapters support +FTDI_LIB_DEPENDS= libftdi.so:${PORTSDIR}/devel/libftdi +FTDI_CONFIGURE_WITH= libftdi -.include +JEDEC_DESC= Experimental JEDEC flash detection +JEDEC_CONFIGURE_ENABLE= jedec -.if ${PORT_OPTIONS:MJEDEC} -CONFIGURE_ARGS+= --enable-jedec -.endif - -.if ${PORT_OPTIONS:MUSB} -CONFIGURE_ARGS+= --with-libusb=/usr -.endif +NLS_USES= gettext +NLS_CONFIGURE_ENABLE= nls -.if ! ${PORT_OPTIONS:MFTDI} -CONFIGURE_ARGS+= --without-libftdi -.else -LIB_DEPENDS+= libftdi.so:${PORTSDIR}/devel/libftdi -.endif - -.if ${PORT_OPTIONS:MNLS} -USES+= gettext -.else -CONFIGURE_ARGS+=--disable-nls -.endif +USB_DESC= USB JTAG adapters support +USB_CONFIGURE_ON= --with-libusb=/usr .include @@ -63,7 +50,7 @@ post-patch: # Suppress svn(1) binary detection @${REINPLACE_CMD} -e \ 's|^SVN=.*|SVN=''| ; \ - s|-Lwith_libusb |-L$$with_libusb/lib | ; \ + s|-Lwith_libusb |-L$$with_libusb/lib | ; \ s|-I$$with_libusb"|-I$$with_libusb/include"|' \ ${WRKSRC}/configure