s|${X11PREFIX}/var/lib|${SCROLLKEEPER_DATADIR}|

Include missing scrollkeeper buildlink2.mk where necessary

9 files changed, 59 insertions, 51 deletions

diff --git a/audio/gnome-media/Makefile b/audio/gnome-media/Makefile
index bd5cad0e891..36f3dd69ee3 100644
--- a/audio/gnome-media/Makefile
+++ b/audio/gnome-media/Makefile
@@ -1,22 +1,22 @@
-# $NetBSD: Makefile,v 1.18 2002/10/19 10:54:42 rh Exp $
+# $NetBSD: Makefile,v 1.19 2002/11/02 02:42:01 rh Exp $
 
-DISTNAME=	gnome-media-1.2.3
-PKGREVISION=	3
-CATEGORIES=	audio gnome
-MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gnome-media/1.2/}
+DISTNAME=		gnome-media-1.2.3
+PKGREVISION=		3
+CATEGORIES=		audio gnome
+MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnome-media/1.2/}
 
-MAINTAINER=	rh@netbsd.org
-HOMEPAGE=	http://www.gnome.org/
-COMMENT=	Set of audio/multimedia applications for GNOME
+MAINTAINER=		rh@netbsd.org
+HOMEPAGE=		http://www.gnome.org/
+COMMENT=		Set of audio/multimedia applications for GNOME
 
-GNU_CONFIGURE=	YES
-USE_BUILDLINK2=	YES
-USE_LIBTOOL=	YES
-USE_X11BASE=	YES
-USE_GMAKE=	YES
+GNU_CONFIGURE=		YES
+USE_BUILDLINK2=		YES
+USE_LIBTOOL=		YES
+USE_X11BASE=		YES
+USE_GMAKE=		YES
 BUILD_USES_MSGFMT=	YES
 LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
-CONFIGURE_ARGS+=--localstatedir=${X11PREFIX}/var/lib
+CONFIGURE_ARGS+=	--localstatedir=${SCROLLKEEPER_DATADIR}
 
 CONFIGURE_ENV+=	XGETTEXT="${LOCALBASE}/bin/xgettext"
 
diff --git a/devel/glade/Makefile b/devel/glade/Makefile
index 4410566097b..7147df8cced 100644
--- a/devel/glade/Makefile
+++ b/devel/glade/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2002/10/19 10:54:47 rh Exp $
+# $NetBSD: Makefile,v 1.30 2002/11/02 02:42:03 rh Exp $
 #
 
 DISTNAME=	glade-0.6.2
@@ -17,7 +17,7 @@ USE_BUILDLINK2=	yes
 
 CONFIGURE_ENV+=	LOCALEDIR=${PKGLOCALEDIR}
 CONFIGURE_ARGS+=--with-bonobo
-CONFIGURE_ARGS+=--localstatedir=${X11PREFIX}/var/lib
+CONFIGURE_ARGS+=--localstatedir=${SCROLLKEEPER_DATADIR}
 
 post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/glade
@@ -31,5 +31,6 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/doc/portability.txt ${PREFIX}/share/doc/glade
 	${INSTALL_DATA} ${WRKSRC}/doc/source_code.txt ${PREFIX}/share/doc/glade
 
+.include "../../textproc/scrollkeeper/buildlink2.mk"
 .include "../../x11/gnome-core/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/glade2/Makefile b/devel/glade2/Makefile
index 6cd393fd781..254ab4f7c49 100644
--- a/devel/glade2/Makefile
+++ b/devel/glade2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2002/10/30 09:14:27 rh Exp $
+# $NetBSD: Makefile,v 1.2 2002/11/02 02:42:03 rh Exp $
 #
 
 DISTNAME=		glade-1.1.2
@@ -22,8 +22,9 @@ USE_LIBTOOL=		YES
 LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 
 CONFIGURE_ENV+=		LOCALEDIR=${PKGLOCALEDIR}
-CONFIGURE_ARGS+=	--localstatedir=${X11PREFIX}/var/lib
+CONFIGURE_ARGS+=	--localstatedir=${SCROLLKEEPER_DATADIR}
 
-.include "../../databases/gnome-db/buildlink2.mk"
+.include "../../textproc/scrollkeeper/buildlink2.mk"
 .include "../../print/libgnomeprintui/buildlink2.mk"
+.include "../../databases/gnome-db/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/gnome-chess/Makefile b/games/gnome-chess/Makefile
index 2cc66e9bf12..4a677653750 100644
--- a/games/gnome-chess/Makefile
+++ b/games/gnome-chess/Makefile
@@ -1,19 +1,20 @@
-# $NetBSD: Makefile,v 1.13 2002/10/26 20:04:31 bouyer Exp $
+# $NetBSD: Makefile,v 1.14 2002/11/02 02:42:03 rh Exp $
 
-DISTNAME=	gnome-chess-0.3.3
-PKGREVISION=	3
-CATEGORIES=	games gnome
-MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gnome-chess/0.3/}
+DISTNAME=		gnome-chess-0.3.3
+PKGREVISION=		3
+CATEGORIES=		games gnome
+MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnome-chess/0.3/}
 
-MAINTAINER=	tron@netbsd.org
-HOMEPAGE=	http://arcavia.com/rd/gnome-chess/
-COMMENT=	GNOME's graphical interface for playing chess
+MAINTAINER=		tron@netbsd.org
+HOMEPAGE=		http://arcavia.com/rd/gnome-chess/
+COMMENT=		GNOME\'s graphical interface for playing chess
 
 USE_BUILDLINK2=		yes
 USE_X11BASE=		yes
 GNU_CONFIGURE=		yes
-CONFIGURE_ARGS+=	--localstatedir=${X11PREFIX}/var/lib
+CONFIGURE_ARGS+=	--localstatedir=${SCROLLKEEPER_DATADIR}
 
+.include "../../textproc/scrollkeeper/buildlink2.mk"
 .include "../../x11/gnome-core/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
 
diff --git a/math/gnumeric/Makefile b/math/gnumeric/Makefile
index 045eab7f3f0..3911186c1cf 100644
--- a/math/gnumeric/Makefile
+++ b/math/gnumeric/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.61 2002/10/16 11:31:24 martti Exp $
+# $NetBSD: Makefile,v 1.62 2002/11/02 02:42:04 rh Exp $
 #
 
 DISTNAME=		gnumeric-1.0.10
@@ -24,7 +24,7 @@ GNU_CONFIGURE=		YES
 CONFIGURE_ARGS+=	--without-guile		# needs CVS-only guile-1.5
 CONFIGURE_ARGS+=	--without-python
 CONFIGURE_ARGS+=	--without-psiconv
-CONFIGURE_ARGS+=	--localstatedir=${X11PREFIX}/var/lib
+CONFIGURE_ARGS+=	--localstatedir=${SCROLLKEEPER_DATADIR}
 LIBS+=      		-lunicode
 
 USE_LIBTOOL=		YES
diff --git a/misc/gnome-utils/Makefile b/misc/gnome-utils/Makefile
index 74a798dad62..ba384bbc597 100644
--- a/misc/gnome-utils/Makefile
+++ b/misc/gnome-utils/Makefile
@@ -1,4 +1,4 @@
-## $NetBSD: Makefile,v 1.49 2002/10/19 10:54:55 rh Exp $
+## $NetBSD: Makefile,v 1.50 2002/11/02 02:42:04 rh Exp $
 
 DISTNAME=		gnome-utils-1.4.1
 PKGREVISION=		3
@@ -18,8 +18,9 @@ USE_BUILDLINK2=		YES
 
 GNU_CONFIGURE=		YES
 CONFIGURE_ENV+=		PKGLOCALEDIR=${PKGLOCALEDIR}
-CONFIGURE_ARGS+=	--localstatedir=${X11PREFIX}/var/lib
+CONFIGURE_ARGS+=	--localstatedir=${SCROLLKEEPER_DATADIR}
 
+.include "../../textproc/scrollkeeper/buildlink2.mk"
 .include "../../devel/gettext-lib/buildlink2.mk"
 .include "../../devel/libglade/buildlink2.mk"
 .include "../../devel/libgtop/buildlink2.mk"
diff --git a/print/ggv/Makefile b/print/ggv/Makefile
index afac8b56eb4..01dae94529d 100644
--- a/print/ggv/Makefile
+++ b/print/ggv/Makefile
@@ -1,24 +1,26 @@
-# $NetBSD: Makefile,v 1.33 2002/10/27 03:35:21 rh Exp $
+# $NetBSD: Makefile,v 1.34 2002/11/02 02:42:04 rh Exp $
 #
 
-DISTNAME=	ggv-1.0.2
-PKGREVISION=	4
-CATEGORIES=	print gnome
-MASTER_SITES=	${MASTER_SITE_GNOME:=sources/ggv/1.0/}
+DISTNAME=		ggv-1.0.2
+PKGREVISION=		4
+CATEGORIES=		print gnome
+MASTER_SITES=		${MASTER_SITE_GNOME:=sources/ggv/1.0/}
 
-MAINTAINER=	rh@netbsd.org
-HOMEPAGE=	http://www.gnome.org/
-COMMENT=	GNOME frontend for GhostScript
+MAINTAINER=		rh@netbsd.org
+HOMEPAGE=		http://www.gnome.org/
+COMMENT=		GNOME frontend for GhostScript
 
-GNU_CONFIGURE=	YES
-USE_BUILDLINK2=	YES
-USE_GMAKE=	YES
-USE_LIBTOOL=	YES
-USE_X11BASE=	YES
 BUILD_USES_MSGFMT=	YES
-CONFIGURE_ARGS+=	--localstatedir=${X11PREFIX}/var/lib
+
+GNU_CONFIGURE=		YES
+USE_BUILDLINK2=		YES
+USE_GMAKE=		YES
+USE_LIBTOOL=		YES
+USE_X11BASE=		YES
+CONFIGURE_ARGS+=	--localstatedir=${SCROLLKEEPER_DATADIR}
 LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 
+.include "../../textproc/scrollkeeper/buildlink2.mk"
 .include "../../x11/gnome-core/buildlink2.mk"
 .include "../../mk/ghostscript.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/gnome-applets/Makefile b/x11/gnome-applets/Makefile
index 6709d28ddd7..d78e992adaf 100644
--- a/x11/gnome-applets/Makefile
+++ b/x11/gnome-applets/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2002/10/19 10:55:00 rh Exp $
+# $NetBSD: Makefile,v 1.23 2002/11/02 02:42:05 rh Exp $
 #
 
 DISTNAME=		gnome-applets-1.4.0.4
@@ -21,8 +21,9 @@ LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
 BUILD_USES_MSGFMT=	YES
 
 GNU_CONFIGURE=		YES
-CONFIGURE_ARGS+=        --localstatedir=${X11PREFIX}/var/lib
+CONFIGURE_ARGS+=        --localstatedir=${SCROLLKEEPER_DATADIR}
 
-.include "../../devel/libgtop/buildlink2.mk"
+.include "../../textproc/scrollkeeper/buildlink2.mk"
 .include "../../x11/gnome-core/buildlink2.mk"
+.include "../../devel/libgtop/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/gnome-session/Makefile b/x11/gnome-session/Makefile
index 449e9b6e8cf..7f0c3685e44 100644
--- a/x11/gnome-session/Makefile
+++ b/x11/gnome-session/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2002/10/19 10:55:01 rh Exp $
+# $NetBSD: Makefile,v 1.3 2002/11/02 02:42:06 rh Exp $
 #
 
 DISTNAME=		gnome-session-2.0.7
@@ -21,12 +21,13 @@ USE_LIBTOOL=		yes
 LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 
 CONFIGURE_ARGS+=	--program-transform-name=s,gnome,gnome2,
-CONFIGURE_ARGS+=	--localstatedir=${X11PREFIX}/var/gnome
+CONFIGURE_ARGS+=	--localstatedir=${SCROLLKEEPER_DATADIR}
 
 .include "../../audio/esound/buildlink2.mk"
 .include "../../devel/gettext-lib/buildlink2.mk"
 .include "../../devel/GConf2/buildlink2.mk"
 .include "../../devel/libgnome/buildlink2.mk"
 .include "../../devel/libgnomeui/buildlink2.mk"
+.include "../../textproc/scrollkeeper/buildlink2.mk"
 .include "../../x11/gnome2-control-center/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"