diff options
| author | amdmi3 <amdmi3@FreeBSD.org> | 2009-02-06 03:11:51 +0800 |
|---|---|---|
| committer | amdmi3 <amdmi3@FreeBSD.org> | 2009-02-06 03:11:51 +0800 |
| commit | c842342bdd0d59d25fdb96a966caab8466e041fd (patch) | |
| tree | dc9b8bcecc437d41fd40b7e1f4fae1faa282084d /devel | |
| parent | 0af91b218cabede0d5c099bac05eceaa3d75667f (diff) | |
| download | freebsd-ports-gnome-c842342bdd0d59d25fdb96a966caab8466e041fd.tar.gz freebsd-ports-gnome-c842342bdd0d59d25fdb96a966caab8466e041fd.tar.zst freebsd-ports-gnome-c842342bdd0d59d25fdb96a966caab8466e041fd.zip | |
- Reorder include paths to not conflict with graphics/libflash when it's installed
- Thus, remove CONFLICTS
- Fix CFLAGS handling
PR: 130887
Submitted by: "Walter C. Pelissero" <walter dot pelissero at iesy dot net>
Approved by: Steve Franks <bahamasfranks at gmail dot com> (maintainer)
Diffstat (limited to 'devel')
| -rw-r--r-- | devel/urjtag/Makefile | 10 | ||||
| -rw-r--r-- | devel/urjtag/files/patch-configure | 11 | ||||
| -rw-r--r-- | devel/urjtag/files/patch-configure.ac | 11 |
3 files changed, 26 insertions, 6 deletions
diff --git a/devel/urjtag/Makefile b/devel/urjtag/Makefile index ea80511bcd9c..9ae946fa74a4 100644 --- a/devel/urjtag/Makefile +++ b/devel/urjtag/Makefile @@ -14,17 +14,18 @@ MASTER_SITES= SF MAINTAINER= bahamasfranks@gmail.com COMMENT= Extended utility to work with JTAG-aware boards +BUILD_DEPENDS= ${LOCALBASE}/bin/flex:${PORTSDIR}/textproc/flex + USE_BZIP2= yes USE_GETTEXT= yes USE_GMAKE= yes GNU_CONFIGURE= yes +CONFIGURE_ENV= LEX=${LOCALBASE}/bin/flex -CONFIGURE_ENV+= CFLAGS=--std=c99 +CFLAGS+= --std=c99 MAN1= jtag.1 bsdl2jtag.1 -CONFLICTS= libflash-0.* - OPTIONS= \ USB "Build support for USB JTAG adapters" On \ FTDI "Build support for FTDI-based USB JTAG adapters" On \ @@ -32,9 +33,6 @@ OPTIONS= \ .include <bsd.port.pre.mk> -BUILD_DEPENDS+= ${LOCALBASE}/bin/flex:${PORTSDIR}/textproc/flex -CONFIGURE_ENV+= LEX=${LOCALBASE}/bin/flex - .if defined(WITH_JEDEC) CONFIGURE_ARGS+= --enable-jedec .endif diff --git a/devel/urjtag/files/patch-configure b/devel/urjtag/files/patch-configure new file mode 100644 index 000000000000..db6d895bf8ad --- /dev/null +++ b/devel/urjtag/files/patch-configure @@ -0,0 +1,11 @@ +--- configure.orig 2008-09-14 14:51:22.000000000 +0400 ++++ configure 2009-02-05 17:39:12.000000000 +0300 +@@ -9269,7 +9269,7 @@ + + + CFLAGS="$CFLAGS -Wall" +-CPPFLAGS="$CPPFLAGS -I\$(top_srcdir) -I\$(top_srcdir)/include" ++CPPFLAGS="-I\$(top_srcdir) -I\$(top_srcdir)/include $CPPFLAGS" + + + # check for lex/flex diff --git a/devel/urjtag/files/patch-configure.ac b/devel/urjtag/files/patch-configure.ac new file mode 100644 index 000000000000..423d50c281a3 --- /dev/null +++ b/devel/urjtag/files/patch-configure.ac @@ -0,0 +1,11 @@ +--- configure.ac.orig 2008-09-14 14:50:54.000000000 +0400 ++++ configure.ac 2009-02-05 17:39:28.000000000 +0300 +@@ -244,7 +244,7 @@ + + + CFLAGS="$CFLAGS -Wall" +-CPPFLAGS="$CPPFLAGS -I\$(top_srcdir) -I\$(top_srcdir)/include" ++CPPFLAGS="-I\$(top_srcdir) -I\$(top_srcdir)/include $CPPFLAGS" + + + # check for lex/flex |