From 200fb2f622a117a08f3c5509d8696c406778e895 Mon Sep 17 00:00:00 2001
From: roam <roam@FreeBSD.org>
Date: Wed, 18 Mar 2009 15:25:03 +0000
Subject: Update to libnids-1.23. Fix a couple of portlint warnings by simply
 removing *any* overriding of CFLAGS, LDFLAGS, etc. and fixing the libnids
 configure script to properly use the values obtained from pkg-config.

---
 net/libnids/Makefile              |  7 +------
 net/libnids/distinfo              |  6 +++---
 net/libnids/files/patch-configure | 21 +++++++++++++++++++++
 3 files changed, 25 insertions(+), 9 deletions(-)
 create mode 100644 net/libnids/files/patch-configure

(limited to 'net/libnids')

diff --git a/net/libnids/Makefile b/net/libnids/Makefile
index 840df65124da..02069e16a8a8 100644
--- a/net/libnids/Makefile
+++ b/net/libnids/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	libnids
-PORTVERSION=	1.21
-PORTREVISION=	4
+PORTVERSION=	1.23
 CATEGORIES=	net security
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -21,10 +20,6 @@ OPTIONS=	LIBNET "Include code requiring libnet" ON \
 
 WANT_GNOME=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
-		LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
-
-MAKE_ENV=	LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
 
 MAN3=		libnids.3
 
diff --git a/net/libnids/distinfo b/net/libnids/distinfo
index 81ff076c7557..f6eaac0ef49d 100644
--- a/net/libnids/distinfo
+++ b/net/libnids/distinfo
@@ -1,3 +1,3 @@
-MD5 (libnids-1.21.tar.gz) = 8c43dd7d66350eed99a29be50bc5615f
-SHA256 (libnids-1.21.tar.gz) = 91ec08b9aeb2f869009b5b099f318c476f75942db64804eb50acde94696f4bf5
-SIZE (libnids-1.21.tar.gz) = 140138
+MD5 (libnids-1.23.tar.gz) = af35e8ef403a0ca95df2da94db856428
+SHA256 (libnids-1.23.tar.gz) = 755cd72483c2cdccbc6634c00de9e2d8666419fd80da36a2bdb3f81657130643
+SIZE (libnids-1.23.tar.gz) = 140975
diff --git a/net/libnids/files/patch-configure b/net/libnids/files/patch-configure
new file mode 100644
index 000000000000..3b9cb5cbacce
--- /dev/null
+++ b/net/libnids/files/patch-configure
@@ -0,0 +1,21 @@
+Do not attempt to put -lgthread-2.0 before its -L clause!
+
+--- configure.orig
++++ configure
+@@ -4288,7 +4288,7 @@
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lgthread-2.0 $GTHREAD_LIBS $LIBS"
++LIBS="$GTHREAD_LIBS $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -4350,7 +4350,6 @@
+ #define HAVE_LIBGTHREAD_2_0 1
+ _ACEOF
+ 
+-  LIBS="-lgthread-2.0 $LIBS"
+ 
+ fi
+ 
-- 
cgit