Package DeforaOS Locker 0.3.0

This release brought:
- new demo animation
- Spanish translation
- support for power management (DPMS)
- improved build system
- improved documentation
- various bugfixes and improvements

5 files changed, 16 insertions, 47 deletions

diff --git a/x11/deforaos-locker/Makefile b/x11/deforaos-locker/Makefile
index 16bbaee5ab5..7a7ccc365c7 100644
--- a/x11/deforaos-locker/Makefile
+++ b/x11/deforaos-locker/Makefile
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.10 2015/04/25 14:25:03 tnn Exp $
+# $NetBSD: Makefile,v 1.11 2015/06/13 21:55:01 khorben Exp $
 #
 
-DISTNAME=	Locker-0.2.1
-PKGNAME=	deforaos-locker-0.2.1
-PKGREVISION=	9
+DISTNAME=	Locker-0.3.0
+PKGNAME=	deforaos-locker-0.3.0
 CATEGORIES=	x11
-MASTER_SITES=	http://www.defora.org/os/download/download/3703/
+MASTER_SITES=	http://www.defora.org/os/download/download/4347/
 
 MAINTAINER=	khorben@defora.org
 HOMEPAGE=	http://www.defora.org/
@@ -26,7 +25,10 @@ AUTO_MKDIRS=	yes
 post-install:
 	${MV} ${DESTDIR}${PREFIX}/share/man/man1/locker.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/locker.1
 	${MV} ${DESTDIR}${PREFIX}/share/man/man1/lockerctl.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/lockerctl.1
+	${MV} ${DESTDIR}${PREFIX}/share/man/html1/locker.html ${DESTDIR}${PREFIX}/share/doc/html/Locker/locker.html
+	${MV} ${DESTDIR}${PREFIX}/share/man/html1/lockerctl.html ${DESTDIR}${PREFIX}/share/doc/html/Locker/lockerctl.html
 	${RMDIR} ${DESTDIR}${PREFIX}/share/man/man1
+	${RMDIR} ${DESTDIR}${PREFIX}/share/man/html1
 	${RMDIR} ${DESTDIR}${PREFIX}/share/man
 
 .include "options.mk"
@@ -34,4 +36,5 @@ post-install:
 .include "../../x11/deforaos-libdesktop/buildlink3.mk"
 .include "../../x11/libXScrnSaver/buildlink3.mk"
 .include "../../x11/deforaos-panel/buildlink3.mk"
+.include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/deforaos-locker/PLIST b/x11/deforaos-locker/PLIST
index 57a767bd19b..50528b7d943 100644
--- a/x11/deforaos-locker/PLIST
+++ b/x11/deforaos-locker/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2012/12/17 00:47:37 khorben Exp $
+@comment $NetBSD: PLIST,v 1.2 2015/06/13 21:55:01 khorben Exp $
 bin/locker
 bin/lockerctl
 include/Desktop/Locker.h
@@ -8,6 +8,7 @@ include/Desktop/Locker/locker.h
 include/Desktop/Locker/plugin.h
 lib/Locker/auth/password.so
 lib/Locker/auth/slider.so
+lib/Locker/demos/colors.so
 lib/Locker/demos/gtk-demo.so
 lib/Locker/demos/logo.so
 lib/Locker/demos/xscreensaver.so
@@ -18,7 +19,8 @@ lib/Locker/plugins/suspend.so
 lib/Locker/plugins/systray.so
 man/man1/locker.1
 man/man1/lockerctl.1
-share/applications/locker-settings.desktop
+share/applications/deforaos-locker-settings.desktop
 share/doc/html/Locker/locker.html
 share/doc/html/Locker/lockerctl.html
+share/locale/es/LC_MESSAGES/Locker.mo
 share/locale/fr/LC_MESSAGES/Locker.mo
diff --git a/x11/deforaos-locker/distinfo b/x11/deforaos-locker/distinfo
index 6da05d5b337..785dc9913eb 100644
--- a/x11/deforaos-locker/distinfo
+++ b/x11/deforaos-locker/distinfo
@@ -1,7 +1,5 @@
-$NetBSD: distinfo,v 1.2 2013/06/15 12:25:23 khorben Exp $
+$NetBSD: distinfo,v 1.3 2015/06/13 21:55:01 khorben Exp $
 
-SHA1 (Locker-0.2.1.tar.gz) = b78288b7a45212dc2b89361539c7b63c85f7ee83
-RMD160 (Locker-0.2.1.tar.gz) = 81d96bcff075eac749027841f2194351940f9a55
-Size (Locker-0.2.1.tar.gz) = 49812 bytes
-SHA1 (patch-src_auth_Makefile) = 23c5cafc182e32eb226ab1e283ac0260a8ca0e45
-SHA1 (patch-src_locker.c) = 63a7f11d9e1948de3f27107392b9a962f7885880
+SHA1 (Locker-0.3.0.tar.gz) = 8ea2f5cc854085eda06a39c88bd5a07fab10eff2
+RMD160 (Locker-0.3.0.tar.gz) = 773e3638f610e6500f7674995337a5114ae1fb46
+Size (Locker-0.3.0.tar.gz) = 57770 bytes
diff --git a/x11/deforaos-locker/patches/patch-src_auth_Makefile b/x11/deforaos-locker/patches/patch-src_auth_Makefile
deleted file mode 100644
index 718dda755d3..00000000000
--- a/x11/deforaos-locker/patches/patch-src_auth_Makefile
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-src_auth_Makefile,v 1.2 2013/06/15 12:25:23 khorben Exp $
-
-Fixes build in src/auth on netbsd-6
-
---- src/auth/Makefile.orig	2012-10-14 16:56:53.000000000 +0000
-+++ src/auth/Makefile
-@@ -21,7 +21,7 @@ all: $(TARGETS)
- 
- password_OBJS = password.o
- password_CFLAGS = $(CPPFLAGSF) $(CPPFLAGS) $(CFLAGSF) $(CFLAGS)
--password_LDFLAGS = $(LDFLAGSF) $(LDFLAGS) -l crypt
-+password_LDFLAGS = $(LDFLAGSF) $(LDFLAGS) -lcrypt
- 
- password.so: $(password_OBJS)
- 	$(CCSHARED) -o password.so $(password_OBJS) $(password_LDFLAGS)
diff --git a/x11/deforaos-locker/patches/patch-src_locker.c b/x11/deforaos-locker/patches/patch-src_locker.c
deleted file mode 100644
index a56feb4b004..00000000000
--- a/x11/deforaos-locker/patches/patch-src_locker.c
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-src_locker.c,v 1.1 2013/06/15 12:25:23 khorben Exp $
-
-API change in libDesktop 0.0.10
-
---- src/locker.c.orig	2012-10-12 23:18:24.000000000 +0000
-+++ src/locker.c
-@@ -268,8 +268,10 @@ Locker * locker_new(char const * demo, c
- 			GDK_WINDOW_XID(root), ScreenSaverNotifyMask);
- 	gdk_x11_register_standard_event_type(locker->display, locker->event, 1);
- 	gdk_window_add_filter(root, _locker_on_filter, locker);
--	desktop_message_register(LOCKER_CLIENT_MESSAGE, _locker_on_message,
--			locker);
-+	/* listen to desktop messages */
-+	gtk_widget_realize(locker->windows[0]);
-+	desktop_message_register(locker->windows[0], LOCKER_CLIENT_MESSAGE,
-+			_locker_on_message, locker);
- 	return locker;
- }
-