[pkgsrc/pkgsrc-2009Q3]: pkgsrc/x11 Pullup ticket #2915 - requested by sborrill

[tron <tron%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/b03c6c28b5c4
branches:  pkgsrc-2009Q3
changeset: 399944:b03c6c28b5c4
user:      tron <tron%pkgsrc.org@localhost>
date:      Wed Oct 21 12:44:36 2009 +0000

description:
Pullup ticket #2915 - requested by sborrill
xlockmore: build fix
xlockmore-lite: build fix

Revisions pulled up:
- x11/xlockmore-lite/Makefile                   1.12
- x11/xlockmore/Makefile                        1.80
- x11/xlockmore/Makefile.common                 1.55
---
Module Name:    pkgsrc
Committed By:   sborrill
Date:           Tue Oct 20 13:15:29 UTC 2009

Modified Files:
        pkgsrc/x11/xlockmore: Makefile Makefile.common
        pkgsrc/x11/xlockmore-lite: Makefile

Log Message:
Set app-defaults folder so it is in  (previously tried to install
in /usr/lib).
Bump PKGREVISION

diffstat:

 x11/xlockmore-lite/Makefile   |  3 ++-
 x11/xlockmore/Makefile        |  4 ++--
 x11/xlockmore/Makefile.common |  3 ++-
 3 files changed, 6 insertions(+), 4 deletions(-)

diffs (44 lines):

diff -r b9df7c61b32d -r b03c6c28b5c4 x11/xlockmore-lite/Makefile
--- a/x11/xlockmore-lite/Makefile       Mon Oct 19 21:17:31 2009 +0000
+++ b/x11/xlockmore-lite/Makefile       Wed Oct 21 12:44:36 2009 +0000
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.11 2009/02/04 13:16:33 tron Exp $
+# $NetBSD: Makefile,v 1.11.6.1 2009/10/21 12:44:37 tron Exp $
 
 .include "../../x11/xlockmore/Makefile.common"
 
+PKGREVISION=   1
 PKGNAME=       ${DISTNAME:S/-/-lite-/}
 COMMENT=       "lite" version of xlockmore
 
diff -r b9df7c61b32d -r b03c6c28b5c4 x11/xlockmore/Makefile
--- a/x11/xlockmore/Makefile    Mon Oct 19 21:17:31 2009 +0000
+++ b/x11/xlockmore/Makefile    Wed Oct 21 12:44:36 2009 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.79 2009/09/30 14:59:06 tnn Exp $
+# $NetBSD: Makefile,v 1.79.2.1 2009/10/21 12:44:36 tron Exp $
 
 .include "Makefile.common"
 
-PKGREVISION=   2
+PKGREVISION=   3
 COMMENT=       Like the XLock session-locker/screensaver, but with more
 
 CONFIGURE_ARGS+=       --with-mesagl
diff -r b9df7c61b32d -r b03c6c28b5c4 x11/xlockmore/Makefile.common
--- a/x11/xlockmore/Makefile.common     Mon Oct 19 21:17:31 2009 +0000
+++ b/x11/xlockmore/Makefile.common     Wed Oct 21 12:44:36 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.54 2009/04/16 12:31:18 tron Exp $
+# $NetBSD: Makefile.common,v 1.54.4.1 2009/10/21 12:44:36 tron Exp $
 #
 # This Makefile.common is included by:
 #
@@ -57,6 +57,7 @@
 CONFIGURE_ARGS+=       --without-rplay
 CONFIGURE_ARGS+=       --without-nas
 CONFIGURE_ARGS+=       --without-gtk
+CONFIGURE_ARGS+=       --enable-appdefaultdir=${PREFIX}/lib/X11/app-defaults
 
 .if ${OPSYS} == "NetBSD"
 XLOCK_AUDIOPLAY?=      /usr/bin/audioplay