- 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)

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

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

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