Date: Tue, 17 Dec 2013 02:47:38 +0900 From: KATO Tsuguru <tkato432@yahoo.com> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/184810: devel/urjtag: Fix build on -current Message-ID: <20131217024738.5f32d41a0423e51d5f5d3d31@yahoo.com> Resent-Message-ID: <201312161810.rBGIA0C9015703@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 184810
>Category: ports
>Synopsis: devel/urjtag: Fix build on -current
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Mon Dec 16 18:10:00 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator: KATO Tsuguru
>Release: FreeBSD 8.4-RELEASE-p4 i386
>Organization:
>Environment:
>Description:
- Fix build on -current
- Fix BUILD_DEPENDS/RUN_DEPENDS
- Support readline/shebangfix
Remove file:
files/extra-patch-usb
>How-To-Repeat:
>Fix:
diff -urN /usr/ports/devel/urjtag/Makefile devel/urjtag/Makefile
--- /usr/ports/devel/urjtag/Makefile 2013-11-06 21:51:49.000000000 +0900
+++ devel/urjtag/Makefile 2013-12-17 00:00:00.000000000 +0900
@@ -3,7 +3,7 @@
PORTNAME= urjtag
PORTVERSION= 0.10
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= devel
MASTER_SITES= SF
@@ -12,26 +12,24 @@
LICENSE= GPLv2
-BUILD_DEPENDS= flex:${PORTSDIR}/textproc/flex
+RUN_DEPENDS= bash:${PORTSDIR}/shells/bash
USE_BZIP2= yes
-USE_GMAKE= yes
+USES= gmake readline shebangfix
+SHEBANG_FILES= src/bsdl2jtag
+USE_CSTD= c99
GNU_CONFIGURE= yes
-CONFIGURE_ENV= LEX=${LOCALBASE}/bin/flex
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
-CFLAGS+= --std=c99
-
-MAN1= jtag.1 bsdl2jtag.1
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
-NO_STAGE= yes
.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MJEDEC}
@@ -39,29 +37,34 @@
.endif
.if ${PORT_OPTIONS:MUSB}
-CONFIGURE_ARGS+= --with-libusb
-EXTRA_PATCHES= ${FILESDIR}/extra-patch-usb
-.endif
-
-.if ${PORT_OPTIONS:MFTDI}
-CONFIGURE_ARGS+= --with-libftdi
-LIB_DEPENDS+= ftdi:${PORTSDIR}/devel/libftdi
+CONFIGURE_ARGS+= --with-libusb=/usr
.endif
-.if exists(${LOCALBASE}/lib/libreadline.so.6)
-LIB_DEPENDS+= readline.6:${PORTSDIR}/devel/readline
+.if ! ${PORT_OPTIONS:MFTDI}
+CONFIGURE_ARGS+= --without-libftdi
+.else
+LIB_DEPENDS+= libftdi.so:${PORTSDIR}/devel/libftdi
.endif
.if ${PORT_OPTIONS:MNLS}
-USES+= gettext
-PLIST_SUB+= NLS=""
+USES+= gettext
.else
-PLIST_SUB+= NLS="@comment "
CONFIGURE_ARGS+=--disable-nls
.endif
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} < 1000033
+BUILD_DEPENDS+= flex>0:${PORTSDIR}/textproc/flex
+CONFIGURE_ENV+= LEX=${LOCALBASE}/bin/flex
+.endif
+
post-patch:
# Suppress svn(1) binary detection
- @${REINPLACE_CMD} -e 's|^SVN=.*|SVN=''|' ${WRKSRC}/configure
+ @${REINPLACE_CMD} -e \
+ 's|^SVN=.*|SVN=''| ; \
+ s|-Lwith_libusb |-L$$with_libusb/lib | ; \
+ s|-I$$with_libusb"|-I$$with_libusb/include"|' \
+ ${WRKSRC}/configure
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff -urN /usr/ports/devel/urjtag/files/extra-patch-usb devel/urjtag/files/extra-patch-usb
--- /usr/ports/devel/urjtag/files/extra-patch-usb 2013-11-06 21:51:49.000000000 +0900
+++ devel/urjtag/files/extra-patch-usb 1970-01-01 09:00:00.000000000 +0900
@@ -1,14 +0,0 @@
---- configure.orig 2008-09-14 14:51:22.000000000 +0400
-+++ configure 2009-03-07 20:52:56.000000000 +0300
-@@ -8604,6 +8604,10 @@
- USBLIBS="-L$with_libusb/lib/gcc -lusb"
- USBCLAGS="-I$with_libusb/include"
- ;;
-+ *-*-freebsd*)
-+ USBLIBS="-lusb"
-+ USBCLAGS=""
-+ ;;
- *)
- USBLIBS="-Lwith_libusb -lusb"
- USBCFLAGS="-I$with_libusb"
- # check for lex/flex
diff -urN /usr/ports/devel/urjtag/pkg-plist devel/urjtag/pkg-plist
--- /usr/ports/devel/urjtag/pkg-plist 2013-11-06 21:51:49.000000000 +0900
+++ devel/urjtag/pkg-plist 2013-12-17 00:00:00.000000000 +0900
@@ -1,5 +1,7 @@
bin/bsdl2jtag
bin/jtag
+man/man1/bsdl2jtag.1.gz
+man/man1/jtag.1.gz
%%NLS%%share/locale/fr/LC_MESSAGES/urjtag.mo
%%NLS%%share/locale/rw/LC_MESSAGES/urjtag.mo
%%NLS%%share/locale/sk/LC_MESSAGES/urjtag.mo
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20131217024738.5f32d41a0423e51d5f5d3d31>