Fix a bug in the last commit, where the resource file was read out of the

examples directory.

5 files changed, 13 insertions, 14 deletions

diff --git a/x11/xlockmore-lite/Makefile b/x11/xlockmore-lite/Makefile
index 3dc64f71997..d6866170b71 100644
--- a/x11/xlockmore-lite/Makefile
+++ b/x11/xlockmore-lite/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.19 2012/12/13 14:31:03 is Exp $
+# $NetBSD: Makefile,v 1.20 2012/12/14 15:54:30 is Exp $
 
 .include "../../x11/xlockmore/Makefile.common"
 
 PKGNAME=	${DISTNAME:S/-/-lite-/}
 COMMENT=	"lite" version of xlockmore
 
-PKGREVISION=	1
+PKGREVISION=	2
 
 CONFIGURE_ARGS+=	--without-xpm
 CONFIGURE_ARGS+=	--without-gltt
diff --git a/x11/xlockmore/Makefile b/x11/xlockmore/Makefile
index d0db1e393e7..038302bceaf 100644
--- a/x11/xlockmore/Makefile
+++ b/x11/xlockmore/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.103 2012/12/13 14:31:03 is Exp $
+# $NetBSD: Makefile,v 1.104 2012/12/14 15:54:30 is Exp $
 
 .include "Makefile.common"
 
-PKGREVISION=	1
+PKGREVISION=	2
 
 COMMENT=	Like the XLock session-locker/screensaver, but with more
 
diff --git a/x11/xlockmore/Makefile.common b/x11/xlockmore/Makefile.common
index b1e160ed9c1..83b9af6a7cc 100644
--- a/x11/xlockmore/Makefile.common
+++ b/x11/xlockmore/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.69 2012/12/13 14:31:03 is Exp $
+# $NetBSD: Makefile.common,v 1.70 2012/12/14 15:54:30 is Exp $
 #
 # This Makefile.common is included by:
 #
@@ -59,12 +59,11 @@ CONFIGURE_ARGS+=	--without-rplay
 CONFIGURE_ARGS+=	--without-nas
 CONFIGURE_ARGS+=	--without-gtk
 CONFIGURE_ARGS+=	--without-esound
-CONFIGURE_ARGS+=	--enable-appdefaultdir=${EGDIR}/app-defaults
-CONFIGURE_ENV+=		ac_cv_x_app_defaults=${EGDIR}/app-defaults
+CONFIGURE_ARGS+=	--enable-appdefaultdir=${PREFIX}/lib/X11/app-defaults
+CONFIGURE_ENV+=		ac_cv_x_app_defaults=${PREFIX}/lib/X11/app-defaults/XLock
 
 CONF_FILES+=		${EGDIR}/app-defaults/XLock ${PREFIX}/lib/X11/app-defaults/XLock
 
-
 .if ${OPSYS} == "NetBSD"
 XLOCK_AUDIOPLAY?=	/usr/bin/audioplay
 CONFIGURE_ARGS+=	--enable-def-play=${XLOCK_AUDIOPLAY:Q}
diff --git a/x11/xlockmore/distinfo b/x11/xlockmore/distinfo
index a3e7ebcf8f9..68e76f4358e 100644
--- a/x11/xlockmore/distinfo
+++ b/x11/xlockmore/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.51 2012/10/28 20:21:11 is Exp $
+$NetBSD: distinfo,v 1.52 2012/12/14 15:54:30 is Exp $
 
 SHA1 (xlockmore-5.41.tar.bz2) = 68115d9f7b92fea3fa55ce07f03a3fe4a42952ec
 RMD160 (xlockmore-5.41.tar.bz2) = 98eda44768f5d757ad12dc1c0eed1692e6ee725f
@@ -7,5 +7,4 @@ SHA1 (patch-aa) = 548646fe62b2d201328ca25a067e19998d58eb18
 SHA1 (patch-ab) = 48bd5ea9389f646df5ffe290f3230b028916f0d1
 SHA1 (patch-ac) = e05f4956c0b4bd9b90c86e5a1174aab5e474115f
 SHA1 (patch-ad) = a76c7d9f17dec5cf2a3de6d0c3343c80cf53d314
-SHA1 (patch-ae) = b78d7d148c9a62dbdf72e05aeec8d22d10ab9cce
-SHA1 (patch-modes_dclock.c) = e0722e290a52a744bd171741108ab42d457996fb
+SHA1 (patch-ae) = e0cac92c22eb1b83f634f4d1ef2ce0950984ad21
diff --git a/x11/xlockmore/patches/patch-ae b/x11/xlockmore/patches/patch-ae
index d286c1c3ba0..60fc9a9a22f 100644
--- a/x11/xlockmore/patches/patch-ae
+++ b/x11/xlockmore/patches/patch-ae
@@ -1,8 +1,8 @@
-$NetBSD: patch-ae,v 1.6 2008/10/06 22:40:12 hubertf Exp $
+$NetBSD: patch-ae,v 1.7 2012/12/14 15:54:30 is Exp $
 
 --- modes/Makefile.in.orig	2008-10-05 02:50:23.000000000 +0200
 +++ modes/Makefile.in
-@@ -588,19 +588,19 @@ install : install-program install-man in
+@@ -588,19 +588,20 @@ install : install-program install-man in
  	@ $(ECHO) ""
  
  install-program : xlock
@@ -27,7 +27,8 @@ $NetBSD: patch-ae,v 1.6 2008/10/06 22:40:12 hubertf Exp $
 -	$(top_srcdir)/mkinstalldirs $(xapploaddir)
 -	$(INSTALL_DATA) $(UTILDIR)XLock.ad $(xapploaddir)/XLock
 +	$(top_srcdir)/mkinstalldirs ${DESTDIR}$(xapploaddir)
-+	$(INSTALL_DATA) $(UTILDIR)XLock.ad ${DESTDIR}$(xapploaddir)/XLock
++	$(top_srcdir)/mkinstalldirs        ${DESTDIR}${datarootdir}/examples/xlock/app-defaults
++	$(INSTALL_DATA) $(UTILDIR)XLock.ad ${DESTDIR}${datarootdir}/examples/xlock/app-defaults/XLock
  
  uninstall : uninstall-program uninstall-man uninstall-ad