Merge packages from the buildlink2 branch back into the main trunk that

have been converted to USE_BUILDLINK2.

5 files changed, 18 insertions, 51 deletions

diff --git a/x11/xscreensaver/Makefile b/x11/xscreensaver/Makefile
index f6cc2480548..acd22f8a3a3 100644
--- a/x11/xscreensaver/Makefile
+++ b/x11/xscreensaver/Makefile
@@ -1,16 +1,15 @@
-# $NetBSD: Makefile,v 1.48 2002/04/09 22:50:02 jlam Exp $
+# $NetBSD: Makefile,v 1.49 2002/08/25 21:52:53 jlam Exp $
 #
 
 COMMENT=	Screen saver and locker for the X window system
 
 CONFLICTS+=	xscreensaver-gnome-[0-9]*
 
-USE_BUILDLINK_ONLY=	yes
+USE_BUILDLINK2=	yes
 
 .include "../../x11/xscreensaver/Makefile.common"
 
 CONFIGURE_ARGS+=	--without-gnome
 CONFIGURE_ARGS+=	--with-configdir=${PREFIX}/libexec/xscreensaver/config
 
-.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/xscreensaver/Makefile.common b/x11/xscreensaver/Makefile.common
index 292c60b3c52..0add1320539 100644
--- a/x11/xscreensaver/Makefile.common
+++ b/x11/xscreensaver/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.32 2002/06/01 22:02:47 wiz Exp $
+# $NetBSD: Makefile.common,v 1.33 2002/08/25 21:52:54 jlam Exp $
 #
 
 DISTNAME=		xscreensaver-4.02
@@ -15,10 +15,10 @@ GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--with-hackdir=${PREFIX}/libexec/xscreensaver
 CONFIGURE_ARGS+=	--with-gl
 CONFIGURE_ARGS+=	--with-gle
-CONFIGURE_ARGS+=	--with-gtk=${BUILDLINK_DIR}
-CONFIGURE_ARGS+=	--with-jpeg=${BUILDLINK_DIR}
-CONFIGURE_ARGS+=	--with-gdk-pixbuf=${BUILDLINK_DIR}
-CONFIGURE_ARGS+=	--with-xml=${BUILDLINK_DIR}
+CONFIGURE_ARGS+=	--with-gtk=${BUILDLINK_PREFIX.gtk}
+CONFIGURE_ARGS+=	--with-jpeg=${BUILDLINK_PREFIX.jpeg}
+CONFIGURE_ARGS+=	--with-gdk-pixbuf=${BUILDLINK_PREFIX.gdk-pixbuf}
+CONFIGURE_ARGS+=	--with-xml=${BUILDLINK_PREFIX.libxml}
 CONFIGURE_ARGS+=	--with-zippy=/usr/games/fortune
 
 CONFIGURE_ARGS+=	--without-motif
@@ -59,7 +59,7 @@ post-patch:
 	[ -f $$f.BAK ] || ${MV} $$f $$f.BAK ; \
 	${SED} -e 's|@PREFIX@|${PREFIX}|g' < $$f.BAK > $$f
 
-.include "../../graphics/gdk-pixbuf/buildlink.mk"
-.include "../../graphics/gle/buildlink.mk"
-.include "../../textproc/libxml/buildlink.mk"
-.include "../../x11/gtk/buildlink.mk"
+.include "../../graphics/gdk-pixbuf/buildlink2.mk"
+.include "../../graphics/gle/buildlink2.mk"
+.include "../../textproc/libxml/buildlink2.mk"
+.include "../../x11/gtk/buildlink2.mk"
diff --git a/x11/xscreensaver/distinfo b/x11/xscreensaver/distinfo
index e4db028b99e..f74f639d212 100644
--- a/x11/xscreensaver/distinfo
+++ b/x11/xscreensaver/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.19 2002/06/01 22:02:47 wiz Exp $
+$NetBSD: distinfo,v 1.20 2002/08/25 21:52:54 jlam Exp $
 
 SHA1 (xscreensaver-4.02.tar.gz) = b32cf3ed37680669a4a7ea2b945fadb5841fc6b3
 Size (xscreensaver-4.02.tar.gz) = 2201442 bytes
-SHA1 (patch-aa) = 4e1c13fdc4019bb190981618f6c3a6583e27b95c
+SHA1 (patch-aa) = 8ca99f66fab3e4eae5830c87f2931cefba6e4b36
 SHA1 (patch-ab) = 3f60a99f7d45f38b6c4afe2fcc6eafc9456acb30
 SHA1 (patch-ac) = 4f201f01b65935c57efa7bfec8291f29a7ff1280
 SHA1 (patch-ae) = 9209256c4dcc7bde3dd812bb8fcbad1f8b4f0f08
-SHA1 (patch-af) = f8b0d2b06d08cdbc128dec8f6342a6489c7824e6
+SHA1 (patch-af) = 506ce93155589766c5f09f726237b7145fd37f3b
diff --git a/x11/xscreensaver/patches/patch-aa b/x11/xscreensaver/patches/patch-aa
index 497ea96b734..67a2fd60c62 100644
--- a/x11/xscreensaver/patches/patch-aa
+++ b/x11/xscreensaver/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.21 2002/06/01 22:02:48 wiz Exp $
+$NetBSD: patch-aa,v 1.22 2002/08/25 21:52:55 jlam Exp $
 
 --- configure.orig	Mon Mar 18 18:42:35 2002
 +++ configure
@@ -20,23 +20,7 @@ $NetBSD: patch-aa,v 1.21 2002/06/01 22:02:48 wiz Exp $
       if test -d $d; then
         X_CFLAGS="-I$d $X_CFLAGS"
         echo "$ac_t""$d" 1>&6
-@@ -10635,15 +10635,6 @@
- DEPEND_DEFINES=
- 
- 
--if test \! -z "$includedir" ; then 
--  INCLUDES="$INCLUDES -I$includedir"
--fi
--
--if test \! -z "$libdir" ; then
--  LDFLAGS="$LDFLAGS -L$libdir"
--fi
--
--
- PREFERRED_DEMO_PROGRAM=xscreensaver-demo-Xm
- ALL_DEMO_PROGRAMS=
- if test "$have_motif" = yes; then
-@@ -10745,7 +10736,7 @@
+@@ -10745,7 +10745,7 @@
    GTK_ICONDIR='$(GNOME_DATADIR)/pixmaps'
  elif test "$have_gtk" = yes; then
    # should this be "$(prefix)/share/pixmaps"? But /usr/X11R6/share/ is wrong...
diff --git a/x11/xscreensaver/patches/patch-af b/x11/xscreensaver/patches/patch-af
index 9e68d7bc9cf..2896e33bdde 100644
--- a/x11/xscreensaver/patches/patch-af
+++ b/x11/xscreensaver/patches/patch-af
@@ -1,4 +1,4 @@
-$NetBSD: patch-af,v 1.8 2002/04/09 22:50:02 jlam Exp $
+$NetBSD: patch-af,v 1.9 2002/08/25 21:52:55 jlam Exp $
 
 --- configure.in.orig	Mon Mar 18 18:01:26 2002
 +++ configure.in
@@ -11,23 +11,7 @@ $NetBSD: patch-af,v 1.8 2002/04/09 22:50:02 jlam Exp $
    elif test "$have_kerberos" = yes ; then
      # from Tim Showalter <tjs@psaux.com> for FreeBSD 4.2
      PASSWD_LIBS="$PASSWD_LIBS -lkrb -ldes -lcom_err"
-@@ -2878,15 +2878,6 @@
- DEPEND_DEFINES=
- 
- 
--if test \! -z "$includedir" ; then 
--  INCLUDES="$INCLUDES -I$includedir"
--fi
--
--if test \! -z "$libdir" ; then
--  LDFLAGS="$LDFLAGS -L$libdir"
--fi
--
--
- PREFERRED_DEMO_PROGRAM=xscreensaver-demo-Xm
- ALL_DEMO_PROGRAMS=
- if test "$have_motif" = yes; then
-@@ -2988,7 +2979,7 @@
+@@ -2988,7 +2988,7 @@
    GTK_ICONDIR='$(GNOME_DATADIR)/pixmaps'
  elif test "$have_gtk" = yes; then
    # should this be "$(prefix)/share/pixmaps"? But /usr/X11R6/share/ is wrong...