* Strongly buildlinkify.

* Remove dependency on python.  The python KDE2 interface objects weren't
  being built and installed anyway.

4 files changed, 109 insertions, 16 deletions

diff --git a/devel/kdebindings2/Makefile b/devel/kdebindings2/Makefile
index 031038f411e..298648f282f 100644
--- a/devel/kdebindings2/Makefile
+++ b/devel/kdebindings2/Makefile
@@ -1,21 +1,20 @@
-# $NetBSD: Makefile,v 1.6 2001/10/15 22:46:17 skrll Exp $
-#
+# $NetBSD: Makefile,v 1.7 2001/11/13 21:15:31 jlam Exp $
 
-DISTNAME=		kdebindings-2.2.1
-CATEGORIES=		devel kde
-.include "../../x11/kde2/Makefile.part1"
-COMMENT=		Additional language bindings for KDE integrated X11 desktop
+DISTNAME=	kdebindings-2.2.1
+CATEGORIES=	devel
+COMMENT=	Additional language bindings for KDE integrated X11 desktop
 
-DEPENDS+=		kdebase-2.2.1:../../x11/kdebase2
-DEPENDS+=		gtk+>=1.2.9:../../x11/gtk
-DEPENDS+=		python21>=2.1:../../lang/python21
+.include "../../x11/kde2/Makefile.kde2"
 
-.include "../../x11/kde2/Makefile.part2"
+USE_BUILDLINK_ONLY=	YES
 
-CONFIGURE_ENV+=		PYTHONDIR=${LOCALBASE} \
-			LIBPYTHON="-lpython2.1 -lutil"
-
-PLIST_SUBST+=		PYTHON_LIBDIR=lib/python2.1
-PLIST_SUBST+=		LOCALBASE=${LOCALBASE}
+CONFIGURE_ARGS+=	--without-java
+CONFIGURE_ENV+=		ac_cv_have_mozilla=no
+CONFIGURE_ENV+=		PYTHONINC="-Ino"
+CONFIGURE_ENV+=		PYTHONLIB="-Lno"
 
+.include "../../x11/gtk/buildlink.mk"
+.include "../../x11/kde2/buildlink.mk"
+.include "../../x11/kdebase2/buildlink.mk"
+.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/kdebindings2/distinfo b/devel/kdebindings2/distinfo
index 6c513f2d1d7..85aaa17473a 100644
--- a/devel/kdebindings2/distinfo
+++ b/devel/kdebindings2/distinfo
@@ -1,5 +1,7 @@
-$NetBSD: distinfo,v 1.3 2001/10/15 22:46:17 skrll Exp $
+$NetBSD: distinfo,v 1.4 2001/11/13 21:15:31 jlam Exp $
 
 SHA1 (kdebindings-2.2.1.tar.bz2) = fefb3c419228f465ed0ca01368bae9092a51ac2a
 Size (kdebindings-2.2.1.tar.bz2) = 2457858 bytes
+SHA1 (patch-aa) = 2c79c031d437fa96d202a22a7dfad9044f136e78
 SHA1 (patch-ab) = c0df84f1d1a7dd26dbe79b76babe249001365f37
+SHA1 (patch-ac) = b2e7730ed8e5bfc5fdc432a4aec3029e29f8f8a5
diff --git a/devel/kdebindings2/patches/patch-aa b/devel/kdebindings2/patches/patch-aa
new file mode 100644
index 00000000000..6849ee98f70
--- /dev/null
+++ b/devel/kdebindings2/patches/patch-aa
@@ -0,0 +1,70 @@
+$NetBSD: patch-aa,v 1.3 2001/11/13 21:15:31 jlam Exp $
+
+--- configure.orig	Fri Sep  7 20:50:16 2001
++++ configure
+@@ -8106,7 +8106,9 @@
+   fi
+ fi
+ 
+-PYTHONINC=-I$python_incdir
++if test -z "$PYTHONINC"; then
++  PYTHONINC=-I$python_incdir
++fi
+ 
+ python_libdirs="$ac_python_dir/lib /usr/lib /usr/local /usr/lib $kde_extra_libs"
+ 
+@@ -8146,7 +8148,9 @@
+   fi
+ fi
+ 
+-PYTHONLIB=-L$python_libdir
++if test -z "$PYTHONLIB"; then
++  PYTHONLIB=-L$python_libdir
++fi
+ kde_orig_LIBPYTHON=$LIBPYTHON
+ if test -z "$LIBPYTHON"; then
+   LIBPYTHON=-lpython$version
+@@ -8233,7 +8237,9 @@
+   fi
+ fi
+ 
+-PYTHONINC=-I$python_incdir
++if test -z "$PYTHONINC"; then
++  PYTHONINC=-I$python_incdir
++fi
+ 
+ python_libdirs="$ac_python_dir/lib /usr/lib /usr/local /usr/lib $kde_extra_libs"
+ 
+@@ -8273,7 +8279,9 @@
+   fi
+ fi
+ 
+-PYTHONLIB=-L$python_libdir
++if test -z "$PYTHONLIB"; then
++  PYTHONLIB=-L$python_libdir
++fi
+ kde_orig_LIBPYTHON=$LIBPYTHON
+ if test -z "$LIBPYTHON"; then
+   LIBPYTHON=-lpython$version
+@@ -8360,7 +8368,9 @@
+   fi
+ fi
+ 
+-PYTHONINC=-I$python_incdir
++if test -z "$PYTHONINC"; then
++  PYTHONINC=-I$python_incdir
++fi
+ 
+ python_libdirs="$ac_python_dir/lib /usr/lib /usr/local /usr/lib $kde_extra_libs"
+ 
+@@ -8400,7 +8410,9 @@
+   fi
+ fi
+ 
+-PYTHONLIB=-L$python_libdir
++if test -z "$PYTHONLIB"; then
++  PYTHONLIB=-L$python_libdir
++fi
+ kde_orig_LIBPYTHON=$LIBPYTHON
+ if test -z "$LIBPYTHON"; then
+   LIBPYTHON=-lpython$version
diff --git a/devel/kdebindings2/patches/patch-ac b/devel/kdebindings2/patches/patch-ac
new file mode 100644
index 00000000000..c5d7366b105
--- /dev/null
+++ b/devel/kdebindings2/patches/patch-ac
@@ -0,0 +1,22 @@
+$NetBSD: patch-ac,v 1.1 2001/11/13 21:15:31 jlam Exp $
+
+--- xparts/src/gtk/Makefile.in.orig	Fri Sep  7 20:50:15 2001
++++ xparts/src/gtk/Makefile.in
+@@ -219,7 +219,7 @@
+ x_includes = @x_includes@
+ x_libraries = @x_libraries@
+ 
+-INCLUDES = $(GLIB_INCLUDES) -I$(prefix)/include -I$(top_srcdir) $(all_includes)
++INCLUDES = $(GLIB_INCLUDES) -I$(top_srcdir) $(all_includes)
+ 
+ AM_CFLAGS =  $(GLIB_CFLAGS) $(GTK_CFLAGS)
+ AM_CXXFLAGS =  $(GLIB_CFLAGS) $(GTK_CFLAGS)
+@@ -228,7 +228,7 @@
+ 
+ libgtkxparts_la_SOURCES = gtkpart.c gtkbrowserextension.c
+ libgtkxparts_la_LIBADD = $(GTK_LIBS) $(GLIB_LIBS) $(top_builddir)/dcopc/libdcopc.la
+-libgtkxparts_la_LDFLAGS = -L$(prefix)/lib $(all_libraries) -no-undefined
++libgtkxparts_la_LDFLAGS = $(all_libraries) -no-undefined
+ 
+ gtkxpartsinclude_HEADERS = gtkpart.h gtkbrowserextension.h
+ gtkxpartsincludedir = $(includedir)/xkparts