Package DeforaOS Locker 0.3.1

This release brings:
- user interface improvements to the "password" authentication
- themeing for the "slider" authentication and "logo" demo
- support for demo cycling
- improved test suite
- fewer dependencies ("panel" plug-in moved to the Integration project)

7 files changed, 11 insertions, 68 deletions

diff --git a/x11/deforaos-locker/Makefile b/x11/deforaos-locker/Makefile
index 257f0c3758b..cac2c863f81 100644
--- a/x11/deforaos-locker/Makefile
+++ b/x11/deforaos-locker/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.16 2015/08/23 23:18:31 khorben Exp $
-#
+# $NetBSD: Makefile,v 1.17 2015/08/25 23:58:20 khorben Exp $
 
-DISTNAME=	Locker-0.3.0
-PKGNAME=	deforaos-locker-0.3.0
+DISTNAME=	Locker-0.3.1
+PKGNAME=	deforaos-locker-0.3.1
 CATEGORIES=	x11
-MASTER_SITES=	http://www.defora.org/os/download/download/4347/
+MASTER_SITES=	http://www.defora.org/os/download/download/4368/
 
 MAINTAINER=	khorben@defora.org
 HOMEPAGE=	http://www.defora.org/
@@ -21,6 +20,7 @@ BUILD_DEPENDS+=	docbook-xsl-[0-9]*:../../textproc/docbook-xsl
 MAKE_FLAGS+=	DESTDIR=${DESTDIR}
 MAKE_FLAGS+=	PREFIX=${PREFIX}
 MAKE_FLAGS+=	CFLAGS=${CFLAGS:Q}
+MAKE_FLAGS+=	LDFLAGS=${LDFLAGS:Q}
 AUTO_MKDIRS=	yes
 
 .include "../../mk/bsd.prefs.mk"
@@ -40,6 +40,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 50528b7d943..7f9ea1dcd39 100644
--- a/x11/deforaos-locker/PLIST
+++ b/x11/deforaos-locker/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2015/06/13 21:55:01 khorben Exp $
+@comment $NetBSD: PLIST,v 1.3 2015/08/25 23:58:20 khorben Exp $
 bin/locker
 bin/lockerctl
 include/Desktop/Locker.h
@@ -14,7 +14,6 @@ lib/Locker/demos/logo.so
 lib/Locker/demos/xscreensaver.so
 lib/Locker/demos/xterm.so
 lib/Locker/plugins/openmoko.so
-lib/Locker/plugins/panel.so
 lib/Locker/plugins/suspend.so
 lib/Locker/plugins/systray.so
 man/man1/locker.1
diff --git a/x11/deforaos-locker/buildlink3.mk b/x11/deforaos-locker/buildlink3.mk
index e9d381b7db0..9a3aeed0adf 100644
--- a/x11/deforaos-locker/buildlink3.mk
+++ b/x11/deforaos-locker/buildlink3.mk
@@ -1,5 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.9 2015/04/25 14:25:03 tnn Exp $
-#
+# $NetBSD: buildlink3.mk,v 1.10 2015/08/25 23:58:20 khorben Exp $
 
 BUILDLINK_TREE+=	deforaos-locker
 
diff --git a/x11/deforaos-locker/distinfo b/x11/deforaos-locker/distinfo
index b7f25064eae..0a0e9c5e597 100644
--- a/x11/deforaos-locker/distinfo
+++ b/x11/deforaos-locker/distinfo
@@ -1,8 +1,5 @@
-$NetBSD: distinfo,v 1.4 2015/08/23 23:18:31 khorben Exp $
+$NetBSD: distinfo,v 1.5 2015/08/25 23:58:20 khorben Exp $
 
-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
-SHA1 (patch-src_auth_Makefile) = c31af40326342f7899c406acdb8387e1eaff2df0
-SHA1 (patch-src_demos_Makefile) = 2525cdf5a00fdd84058a1d0a7f62eaae228df56a
-SHA1 (patch-src_plugins_Makefile) = fd24d890c9a14482f2fd3642e8021b4ff73d3b96
+SHA1 (Locker-0.3.1.tar.gz) = d2dab75ba9bbb0e9e6041a47ae5d2b2269d07a51
+RMD160 (Locker-0.3.1.tar.gz) = b707ab024e4482a1863812d24c56cd705f142078
+Size (Locker-0.3.1.tar.gz) = 61182 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 f57d68cabb6..00000000000
--- a/x11/deforaos-locker/patches/patch-src_auth_Makefile
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-src_auth_Makefile,v 1.4 2015/08/23 23:18:31 khorben Exp $
-
-Fix build with CFLAGS set
-
---- src/auth/Makefile.orig	2015-03-16 00:09:01.000000000 +0000
-+++ src/auth/Makefile
-@@ -6,8 +6,8 @@ LIBDIR	= $(PREFIX)/lib
- CC	= cc
- CPPFLAGSF= -I ../../include
- CPPFLAGS=
--CFLAGSF	= -W `pkg-config --cflags libSystem gtk+-2.0`
--CFLAGS	= -Wall -g -O2 -pedantic -fPIC
-+CFLAGSF	= `pkg-config --cflags libSystem gtk+-2.0` -fPIC
-+CFLAGS	= -W -Wall -g -O2 -pedantic
- LDFLAGSF= -W `pkg-config --libs libSystem gtk+-2.0`
- AR	= ar
- RANLIB	= ranlib
diff --git a/x11/deforaos-locker/patches/patch-src_demos_Makefile b/x11/deforaos-locker/patches/patch-src_demos_Makefile
deleted file mode 100644
index 8c33d7bd5fe..00000000000
--- a/x11/deforaos-locker/patches/patch-src_demos_Makefile
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-src_demos_Makefile,v 1.1 2015/08/23 23:18:31 khorben Exp $
-
-Fix build with CFLAGS set
-
---- src/demos/Makefile.orig	2015-03-16 00:09:01.000000000 +0000
-+++ src/demos/Makefile
-@@ -6,8 +6,8 @@ LIBDIR	= $(PREFIX)/lib
- CC	= cc
- CPPFLAGSF= -I ../../include
- CPPFLAGS=
--CFLAGSF	= -W `pkg-config --cflags libSystem gtk+-2.0 x11`
--CFLAGS	= -Wall -g -O2 -pedantic -fPIC
-+CFLAGSF	= `pkg-config --cflags libSystem gtk+-2.0 x11` -fPIC
-+CFLAGS	= -W -Wall -g -O2 -pedantic
- LDFLAGSF= -W `pkg-config --libs libSystem gtk+-2.0 x11`
- AR	= ar
- RANLIB	= ranlib
diff --git a/x11/deforaos-locker/patches/patch-src_plugins_Makefile b/x11/deforaos-locker/patches/patch-src_plugins_Makefile
deleted file mode 100644
index 8c44ab920c0..00000000000
--- a/x11/deforaos-locker/patches/patch-src_plugins_Makefile
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-src_plugins_Makefile,v 1.1 2015/08/23 23:18:31 khorben Exp $
-
-Fix build with CFLAGS set
-
---- src/plugins/Makefile.orig	2015-03-16 00:09:01.000000000 +0000
-+++ src/plugins/Makefile
-@@ -6,8 +6,8 @@ LIBDIR	= $(PREFIX)/lib
- CC	= cc
- CPPFLAGSF= -I ../../include
- CPPFLAGS=
--CFLAGSF	= -W `pkg-config --cflags libSystem gtk+-2.0`
--CFLAGS	= -Wall -g -O2 -pedantic -fPIC
-+CFLAGSF	= `pkg-config --cflags libSystem gtk+-2.0` -fPIC
-+CFLAGS	= -W -Wall -g -O2 -pedantic
- LDFLAGSF= -W `pkg-config --libs libSystem gtk+-2.0`
- AR	= ar
- RANLIB	= ranlib