diff options
| author | tnn <tnn@pkgsrc.org> | 2011-01-31 15:39:11 +0000 |
|---|---|---|
| committer | tnn <tnn@pkgsrc.org> | 2011-01-31 15:39:11 +0000 |
| commit | 0f1df53aea1514e7df92091105e04bbdf2d95425 (patch) | |
| tree | 2caf0b5a5b2558a632c34d869ea1d7aea60b2509 /wm | |
| parent | 8d665e24824aeacd50bf369370b2f7dd750c40a2 (diff) | |
| download | pkgsrc-0f1df53aea1514e7df92091105e04bbdf2d95425.tar.gz | |
Wire down KDEDIR so we don't get differing PLIST depending on
whether kde4-config was in the path or not. Bump rev.
Diffstat (limited to 'wm')
| -rw-r--r-- | wm/sawfish/Makefile | 3 | ||||
| -rw-r--r-- | wm/sawfish/PLIST | 4 | ||||
| -rw-r--r-- | wm/sawfish/distinfo | 4 | ||||
| -rw-r--r-- | wm/sawfish/patches/patch-aa | 23 |
4 files changed, 26 insertions, 8 deletions
diff --git a/wm/sawfish/Makefile b/wm/sawfish/Makefile index fdc46b6e129..08eb365824f 100644 --- a/wm/sawfish/Makefile +++ b/wm/sawfish/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.59 2011/01/24 00:03:29 tnn Exp $ +# $NetBSD: Makefile,v 1.60 2011/01/31 15:39:11 tnn Exp $ # DISTNAME= sawfish-1.7.1 +PKGREVISION= 1 CATEGORIES= x11 wm MASTER_SITES= http://download.tuxfamily.org/sawfish/sawfish/ EXTRACT_SUFX= .tar.bz2 diff --git a/wm/sawfish/PLIST b/wm/sawfish/PLIST index ea2b08fd71c..5605b560615 100644 --- a/wm/sawfish/PLIST +++ b/wm/sawfish/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.19 2011/01/24 00:03:29 tnn Exp $ +@comment $NetBSD: PLIST,v 1.20 2011/01/31 15:39:11 tnn Exp $ bin/sawfish bin/sawfish-client bin/sawfish-config @@ -29,7 +29,7 @@ man/man1/sawfish.1 share/applications/sawfish.desktop share/gnome/wm-properties/sawfish-wm.desktop share/icons/hicolor/32x32/apps/sawfish-config.png -share/kde4/apps/ksmserver/windowmanagers/sawfish.desktop +share/kde/apps/ksmserver/windowmanagers/sawfish.desktop share/locale/am/LC_MESSAGES/sawfish.mo share/locale/ar/LC_MESSAGES/sawfish.mo share/locale/az/LC_MESSAGES/sawfish.mo diff --git a/wm/sawfish/distinfo b/wm/sawfish/distinfo index cdbc9ae7c07..8b5a03c7eb3 100644 --- a/wm/sawfish/distinfo +++ b/wm/sawfish/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.19 2011/01/24 00:03:29 tnn Exp $ +$NetBSD: distinfo,v 1.20 2011/01/31 15:39:11 tnn Exp $ SHA1 (sawfish-1.7.1.tar.bz2) = d4bd4cad90ece608cef51427994ca5667ee6f939 RMD160 (sawfish-1.7.1.tar.bz2) = de04ff3b740da9dac853a7ef5ca2c0b4998f4808 Size (sawfish-1.7.1.tar.bz2) = 3693938 bytes -SHA1 (patch-aa) = 4cd1f7be1c8e994065f09cb7b4c836551c61552e +SHA1 (patch-aa) = 78a125466b8bacf2971a6d8c73b915b8b70a2d7b SHA1 (patch-ab) = 21a89c87afa9cb5fdf3b028109b0db9c5991fb1e SHA1 (patch-af) = dc60cca36ad2b799a3d11e0c62f198e9277583ba diff --git a/wm/sawfish/patches/patch-aa b/wm/sawfish/patches/patch-aa index b0f0cdffbc0..8fb7030450c 100644 --- a/wm/sawfish/patches/patch-aa +++ b/wm/sawfish/patches/patch-aa @@ -1,8 +1,8 @@ -$NetBSD: patch-aa,v 1.10 2010/08/21 17:33:11 asau Exp $ +$NetBSD: patch-aa,v 1.11 2011/01/31 15:39:12 tnn Exp $ ---- configure.orig 2009-07-03 15:46:24.000000000 +0200 +--- configure.orig 2010-12-10 20:04:17.000000000 +0000 +++ configure -@@ -1043,7 +1043,7 @@ dvidir='${docdir}' +@@ -863,7 +863,7 @@ dvidir='${docdir}' pdfdir='${docdir}' psdir='${docdir}' libdir='${exec_prefix}/lib' @@ -11,3 +11,20 @@ $NetBSD: patch-aa,v 1.10 2010/08/21 17:33:11 asau Exp $ mandir='${datarootdir}/man' ac_prev= +@@ -12778,12 +12778,12 @@ fi + + KDE4_SESSION="$with_kde4session" + +-if test "$with_kde4session" = "yes"; then +- KDEDIR="`kde4-config --install data`" +-fi ++#if test "$with_kde4session" = "yes"; then ++# KDEDIR="`kde4-config --install data`" ++#fi + + if test "x$KDEDIR" = x; then +- KDEDIR="${datadir}/kde4/apps/" ++ KDEDIR="${datadir}/kde/apps/" + fi + + |