svn commit: r370668 - head/devel/urjtag

[Jason E. Hale]

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 <bsd.port.options.mk>
+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 <bsd.port.pre.mk>
 
@@ -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