diff options
| author | salo <salo@pkgsrc.org> | 2002-12-14 02:34:03 +0000 |
|---|---|---|
| committer | salo <salo@pkgsrc.org> | 2002-12-14 02:34:03 +0000 |
| commit | 38083d0c76f1061685b25d62fc190e04cd71b252 (patch) | |
| tree | e5548489c37c18fb38b8b07783515601eec4246b /x11 | |
| parent | 2a287d6bf322bb9ac1a55adc0783adfdf81dc9cc (diff) | |
| download | pkgsrc-38083d0c76f1061685b25d62fc190e04cd71b252.tar.gz | |
Set reasonable GNOME_DATADIR, otherwise files get installed to /share.
Addresses PR pkg/19331 by Richard Rauch, also seen in latest Hubert's bulk
builds.
Diffstat (limited to 'x11')
| -rw-r--r-- | x11/xscreensaver/distinfo | 4 | ||||
| -rw-r--r-- | x11/xscreensaver/patches/patch-ac | 27 |
2 files changed, 26 insertions, 5 deletions
diff --git a/x11/xscreensaver/distinfo b/x11/xscreensaver/distinfo index a6cbc4e27f4..db95a231816 100644 --- a/x11/xscreensaver/distinfo +++ b/x11/xscreensaver/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.21 2002/10/28 22:37:10 wiz Exp $ +$NetBSD: distinfo,v 1.22 2002/12/14 02:34:03 salo Exp $ SHA1 (xscreensaver-4.06.tar.gz) = ba2c14d632ee5d876e1d2b580e6aa6d67b813119 Size (xscreensaver-4.06.tar.gz) = 3209164 bytes SHA1 (patch-aa) = 0b4de3babe3fe191943ce31c055e8047911c1326 SHA1 (patch-ab) = 5d6f368c6f007ac66a3346ba80fe38a8781e03f2 -SHA1 (patch-ac) = a129217c7452421bb9c20278acc8af575687d27c +SHA1 (patch-ac) = 574251635e4046c43a9e368aee84e8fc72a5480b SHA1 (patch-ad) = 64cd7a683da1afea599d1e8b8dffd951243c9d9b diff --git a/x11/xscreensaver/patches/patch-ac b/x11/xscreensaver/patches/patch-ac index 6ec81de6104..d9d849ad556 100644 --- a/x11/xscreensaver/patches/patch-ac +++ b/x11/xscreensaver/patches/patch-ac @@ -1,8 +1,8 @@ -$NetBSD: patch-ac,v 1.7 2002/10/28 22:37:11 wiz Exp $ +$NetBSD: patch-ac,v 1.8 2002/12/14 02:34:04 salo Exp $ --- configure.orig Thu Oct 24 05:26:17 2002 -+++ configure -@@ -11012,7 +11012,7 @@ _ACEOF ++++ configure Sat Dec 14 02:37:53 2002 +@@ -11012,7 +11012,7 @@ if test "$have_kerberos5" = yes ; then # from Matt Knopp <mhat@infocalypse.netlag.com> # (who got it from amu@mit.edu) @@ -11,3 +11,24 @@ $NetBSD: patch-ac,v 1.7 2002/10/28 22:37:11 wiz 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" +@@ -12917,19 +12917,7 @@ + fi + + +- GNOME_DATADIR="" +- if test "$have_gtk" = yes; then +- if test -n "$pkg_config"; then +- if test "$have_gtk2" = yes; then +- GNOME_DATADIR=`$pkg_config --variable=prefix gtk+-2.0` +- else +- GNOME_DATADIR=`$pkg_config --variable=prefix gtk+` +- fi +- else +- GNOME_DATADIR=`$gtk_config --prefix` +- fi +- GNOME_DATADIR="$GNOME_DATADIR/share" +- fi ++ GNOME_DATADIR="$datadir" + + # .desktop files go in different places in Gnome 1.x and Gnome 2.x... + if test "$have_gtk2" = yes; then |