Strongly buildlinkify.

3 files changed, 89 insertions, 2 deletions

diff --git a/www/glibwww/Makefile b/www/glibwww/Makefile
index f07172bca9b..e6f1aff3f7a 100644
--- a/www/glibwww/Makefile
+++ b/www/glibwww/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2002/03/13 17:37:51 fredb Exp $
+# $NetBSD: Makefile,v 1.5 2002/04/10 16:17:37 jlam Exp $
 #
 
 DISTNAME=		glibwww-0.2
@@ -20,6 +20,16 @@ USE_LIBTOOL=		YES
 
 LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
 
+post-patch:
+	cd ${WRKSRC};							\
+	for file in src/Makefile.in; do					\
+		${SED}	-e "s|[	 ]*-I\$$(includedir)||g"		\
+			$${file} > $${file}.fixed;			\
+		${MV} -f $${file}.fixed $${file};			\
+	done
+
 .include "../../www/libwww/buildlink.mk"
 .include "../../x11/gnome-libs/buildlink.mk"
+
+.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/glibwww/distinfo b/www/glibwww/distinfo
index 574e337f0ff..04ff0f1f972 100644
--- a/www/glibwww/distinfo
+++ b/www/glibwww/distinfo
@@ -1,4 +1,5 @@
-$NetBSD: distinfo,v 1.2 2001/04/20 12:02:35 skrll Exp $
+$NetBSD: distinfo,v 1.3 2002/04/10 16:17:37 jlam Exp $
 
 SHA1 (glibwww-0.2.tar.gz) = ce1d8d3bd8720ace668058114e5192d3d4fd4571
 Size (glibwww-0.2.tar.gz) = 162157 bytes
+SHA1 (patch-aa) = 602fee5394ea1df6aef47eef1b2261f034840b67
diff --git a/www/glibwww/patches/patch-aa b/www/glibwww/patches/patch-aa
new file mode 100644
index 00000000000..f98bf042b77
--- /dev/null
+++ b/www/glibwww/patches/patch-aa
@@ -0,0 +1,76 @@
+$NetBSD: patch-aa,v 1.1 2002/04/10 16:17:38 jlam Exp $
+
+--- configure.orig	Fri Aug 25 01:27:19 2000
++++ configure
+@@ -1034,8 +1034,8 @@
+ fi
+ 	if test x$gnome_cv_orbit_found = xyes; then
+ 		
+-		ORBIT_CFLAGS=`orbit-config --cflags client server`
+-		ORBIT_LIBS=`orbit-config --use-service=name --libs client server`
++		ORBIT_CFLAGS=`$ORBIT_CONFIG --cflags client server`
++		ORBIT_LIBS=`$ORBIT_CONFIG --use-service=name --libs client server`
+ 		
+ 		
+ 	else
+@@ -1052,8 +1052,8 @@
+   
+ 		gnome_cv_gnorba_found=no
+ 		if test x$gnome_cv_orbit_found = xyes; then
+-			GNORBA_CFLAGS="`gnome-config --cflags gnorba gnomeui`"
+-			GNORBA_LIBS="`gnome-config --libs gnorba gnomeui`"
++			GNORBA_CFLAGS="`$GNOME_CONFIG --cflags gnorba gnomeui`"
++			GNORBA_LIBS="`$GNOME_CONFIG --libs gnorba gnomeui`"
+ 			if test -n "$GNORBA_LIBS"; then
+ 				gnome_cv_gnorba_found=yes
+ 			fi
+@@ -1073,8 +1073,8 @@
+ fi
+ 	if test x$gnome_cv_orbit_found = xyes; then
+ 		
+-		GNORBA_CFLAGS="`gnome-config --cflags gnorba gnomeui`"
+-		GNORBA_LIBS="`gnome-config --libs gnorba gnomeui`"
++		GNORBA_CFLAGS="`$GNOME_CONFIG --cflags gnorba gnomeui`"
++		GNORBA_LIBS="`$GNOME_CONFIG --libs gnorba gnomeui`"
+ 		
+ 		
+ 	else
+@@ -2178,19 +2178,22 @@
+ 
+ echo $ac_n "checking for libwww""... $ac_c" 1>&6
+ echo "configure:2181: checking for libwww" >&5
+-if ! `libwww-config --version > /dev/null 2>&1` ; then
++if test -z "${LIBWWW_CONFIG}"; then
++	LIBWWW_CONFIG=libwww-config
++fi
++if ! `$LIBWWW_CONFIG --version > /dev/null 2>&1` ; then
+ 	echo "$ac_t""not found" 1>&6
+ 	have_libwww=false
+ else
+-	vers=`libwww-config --version`
++	vers=`$LIBWWW_CONFIG --version`
+ 	echo "$ac_t""found ("$vers")" 1>&6
+ 
+-	LIBWWW_CFLAGS="`libwww-config --cflags`"
+-	LIBWWW_LIBS="`libwww-config --libs`"
++	LIBWWW_CFLAGS="`$LIBWWW_CONFIG --cflags`"
++	LIBWWW_LIBS="`$LIBWWW_CONFIG --libs`"
+ 
+ 	echo $ac_n "checking if libwww has zlib support built-in""... $ac_c" 1>&6
+ echo "configure:2193: checking if libwww has zlib support built-in" >&5
+-	if ( libwww-config --libs | grep -w -- '-lz' > /dev/null ) ; then
++	if ( $LIBWWW_CONFIG --libs | grep -w -- '-lz' > /dev/null ) ; then
+ 		echo "$ac_t""yes" 1>&6
+ 		have_libwww=true
+ 	else
+@@ -2223,8 +2226,8 @@
+ fi
+ 
+ 
+-EXTRA_GNOME_LIBS="`gnome-config --libs gnomeui` $LIBWWW_LIBS"
+-EXTRA_GNOME_CFLAGS="`gnome-config --cflags` $LIBWWW_CFLAGS"
++EXTRA_GNOME_LIBS="`$GNOME_CONFIG --libs gnomeui` $LIBWWW_LIBS"
++EXTRA_GNOME_CFLAGS="`$GNOME_CONFIG --cflags` $LIBWWW_CFLAGS"
+ 
+ 
+