Use ${VARBASE} instead of hardcoding /var.

4 files changed, 15 insertions, 8 deletions

diff --git a/x11/gnome-libs/Makefile b/x11/gnome-libs/Makefile
index e1bf54709e8..6dc05e10bdb 100644
--- a/x11/gnome-libs/Makefile
+++ b/x11/gnome-libs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.105 2004/10/03 00:18:31 tv Exp $
+# $NetBSD: Makefile,v 1.106 2004/11/10 14:49:36 sketch Exp $
 
 DISTNAME=		gnome-libs-1.4.2
 PKGREVISION=		4
@@ -32,6 +32,13 @@ USE_PKGLOCALEDIR=	YES
 LOCALSTATEDIR=		${VARBASE}/gnome
 PLIST_SUBST+=		LOCALSTATEDIR=${LOCALSTATEDIR}
 
+SUBST_CLASSES+=		varbase
+SUBST_MESSAGE.varbase=	"Fixing path to score files."
+SUBST_STAGE.varbase=	post-patch
+SUBST_FILES.varbase+=	gnome-data/Makefile.in
+SUBST_FILES.varbase+=	libgnome/gnome-score.c
+SUBST_SED.varbase=	-e 's,@VARBASE@,${VARBASE},g'
+
 .include "../../audio/esound/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../graphics/imlib/buildlink3.mk"
diff --git a/x11/gnome-libs/distinfo b/x11/gnome-libs/distinfo
index abc47cb7953..ad73cfb0300 100644
--- a/x11/gnome-libs/distinfo
+++ b/x11/gnome-libs/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.17 2004/05/04 03:54:51 danw Exp $
+$NetBSD: distinfo,v 1.18 2004/11/10 14:49:36 sketch Exp $
 
 SHA1 (gnome-libs-1.4.2.tar.gz) = 9925d28237f0269a2678fdcfa7ec6033dab04789
 Size (gnome-libs-1.4.2.tar.gz) = 3781173 bytes
 SHA1 (patch-aa) = bcc6ba3d4375a38fe8b515725aff4903e6df1be7
-SHA1 (patch-ab) = 13a6c8c58a1acfb61150d13408fa260a82f49484
+SHA1 (patch-ab) = 9962993088a5adc43350f671868a54085938f089
 SHA1 (patch-ac) = 601cb8850ab9497fb9ab25843d1e9fd47306256e
 SHA1 (patch-ad) = 10e46c8965137c8c0a3acf177898ca07fb4c90fa
 SHA1 (patch-ae) = 85e0395394602628b4bec63ac0e96a31bacc9f10
@@ -12,7 +12,7 @@ SHA1 (patch-ag) = 7cc30aa025384c4d0c2d7250f0e6c6aa39c469b7
 SHA1 (patch-ah) = d0725757c6132e777c7d5d45453c7a744b51de2f
 SHA1 (patch-aj) = 292c4efccc9650c8244348bdcf22c3c1cbd3ebe6
 SHA1 (patch-ak) = fa6f2db6faff3ca6427784b84acf5856be24af82
-SHA1 (patch-an) = 94189a17d893cc7290354ddb200bea41dffb7953
+SHA1 (patch-an) = 528ee8254f988ade48ab2ec6bde01bfd4ca423ad
 SHA1 (patch-ao) = 31724d3e4eb9d44b6a701f4317fc5ae35c4f2f66
 SHA1 (patch-ap) = 31e535a78dfb1fe38d7a1bb0e651b9189e88bdff
 SHA1 (patch-aq) = 58ea5945277d08678988eb6598eb82c724376842
diff --git a/x11/gnome-libs/patches/patch-ab b/x11/gnome-libs/patches/patch-ab
index c167f517e8d..585bb2bc438 100644
--- a/x11/gnome-libs/patches/patch-ab
+++ b/x11/gnome-libs/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.5 2002/03/24 19:53:43 rh Exp $
+$NetBSD: patch-ab,v 1.6 2004/11/10 14:49:36 sketch Exp $
 
 --- gnome-data/Makefile.in.orig	Sun Mar 24 13:17:54 2002
 +++ gnome-data/Makefile.in
@@ -7,7 +7,7 @@ $NetBSD: patch-ab,v 1.5 2002/03/24 19:53:43 rh Exp $
  
  
 -scoredir = $(localstatedir)/games
-+scoredir = /var/games
++scoredir = @VARBASE@/games
  sysconf_DATA = paper.config mime-magic
  
  soundlistdir = $(sysconfdir)/sound/events
diff --git a/x11/gnome-libs/patches/patch-an b/x11/gnome-libs/patches/patch-an
index c8020e7aeed..5d2d5d9332b 100644
--- a/x11/gnome-libs/patches/patch-an
+++ b/x11/gnome-libs/patches/patch-an
@@ -1,4 +1,4 @@
-$NetBSD: patch-an,v 1.3 2000/10/17 23:57:46 jlam Exp $
+$NetBSD: patch-an,v 1.4 2004/11/10 14:49:36 sketch Exp $
 
 --- libgnome/gnome-score.c.orig	Sat Jun 17 12:53:33 2000
 +++ libgnome/gnome-score.c
@@ -7,7 +7,7 @@ $NetBSD: patch-an,v 1.3 2000/10/17 23:57:46 jlam Exp $
  #endif
  
 -#define SCORE_PATH GNOMELOCALSTATEDIR "/games"
-+#define SCORE_PATH "/var/games"
++#define SCORE_PATH "@VARBASE@/games"
  
  struct command
  {