Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_165750341032740"
MIME-Version: 1.0
Date: Mon, 11 Jul 2022 01:36:50 +0000
From: "Pierre Pronchery" <khorben@netbsd.org>
Subject: CVS commit: pkgsrc/x11/deforaos-locker
To: pkgsrc-changes@NetBSD.org
Reply-To: khorben@netbsd.org
Message-Id: <20220711013650.9BBD3FB1A@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

This is a multi-part message in MIME format.

--_----------=_165750341032740
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

Module Name:	pkgsrc
Committed By:	khorben
Date:		Mon Jul 11 01:36:50 UTC 2022

Modified Files:
	pkgsrc/x11/deforaos-locker: Makefile PLIST distinfo options.mk

Log Message:
deforaos-locker: update to version 0.4.2

This update brings:
- re-licensing to the BSD license (2 clause)
- renaming of the desktop files
- documentation for plug-ins with Gtk-Doc
- re-generation of Makefiles with DeforaOS configure


To generate a diff of this commit:
cvs rdiff -u -r1.34 -r1.35 pkgsrc/x11/deforaos-locker/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/x11/deforaos-locker/PLIST
cvs rdiff -u -r1.10 -r1.11 pkgsrc/x11/deforaos-locker/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/x11/deforaos-locker/options.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


--_----------=_165750341032740
Content-Disposition: inline
Content-Length: 4545
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Modified files:

Index: pkgsrc/x11/deforaos-locker/Makefile
diff -u pkgsrc/x11/deforaos-locker/Makefile:1.34 pkgsrc/x11/deforaos-locker/Makefile:1.35
--- pkgsrc/x11/deforaos-locker/Makefile:1.34	Wed Dec  8 16:02:49 2021
+++ pkgsrc/x11/deforaos-locker/Makefile	Mon Jul 11 01:36:50 2022
@@ -1,16 +1,14 @@
-# $NetBSD: Makefile,v 1.34 2021/12/08 16:02:49 adam Exp $
+# $NetBSD: Makefile,v 1.35 2022/07/11 01:36:50 khorben Exp $
 
-DISTNAME=	Locker-0.4.1
-PKGNAME=	deforaos-locker-0.4.1
-PKGREVISION=	4
+DISTNAME=	Locker-0.4.2
+PKGNAME=	deforaos-locker-0.4.2
 CATEGORIES=	x11
 MASTER_SITES=	https://ftp.defora.org/pub/DeforaOS/Apps/Desktop/src/Locker/
 
 MAINTAINER=	khorben@defora.org
 HOMEPAGE=	https://www.defora.org/
 COMMENT=	DeforaOS desktop screensaver
-
-LICENSE=	gnu-gpl-v3
+LICENSE=	2-clause-bsd
 
 USE_TOOLS+=	pkg-config
 USE_TOOLS+=	xgettext
@@ -41,7 +39,10 @@ post-install:
 
 .include "options.mk"
 
+.include "../../devel/deforaos-configure/deforaos-configure.mk"
 .include "../../x11/deforaos-libdesktop/buildlink3.mk"
 .include "../../x11/libXScrnSaver/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
+BUILDLINK_API_DEPENDS.gtk-doc+=	gtk-doc>=1.32nb9
+.include "../../textproc/gtk-doc/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/x11/deforaos-locker/PLIST
diff -u pkgsrc/x11/deforaos-locker/PLIST:1.5 pkgsrc/x11/deforaos-locker/PLIST:1.6
--- pkgsrc/x11/deforaos-locker/PLIST:1.5	Sun Feb 18 05:24:35 2018
+++ pkgsrc/x11/deforaos-locker/PLIST	Mon Jul 11 01:36:50 2022
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2018/02/18 05:24:35 rillig Exp $
+@comment $NetBSD: PLIST,v 1.6 2022/07/11 01:36:50 khorben Exp $
 bin/locker
 bin/lockerctl
 include/Desktop/Locker.h
@@ -18,8 +18,26 @@ lib/Locker/plugins/suspend.so
 lib/Locker/plugins/systray.so
 man/man1/locker.1
 man/man1/lockerctl.1
-share/applications/deforaos-locker-settings.desktop
+share/applications/org.defora.locker-settings.desktop
+share/doc/Locker/COPYING
+share/doc/Locker/README.md
 share/doc/deforaos-locker/locker.html
 share/doc/deforaos-locker/lockerctl.html
+share/gtk-doc/html/Locker/Locker-auth.html
+share/gtk-doc/html/Locker/Locker-demo.html
+share/gtk-doc/html/Locker/Locker-plugin.html
+share/gtk-doc/html/Locker/Locker.devhelp2
+share/gtk-doc/html/Locker/api-index-full.html
+share/gtk-doc/html/Locker/ch01.html
+share/gtk-doc/html/Locker/deprecated-api-index.html
+share/gtk-doc/html/Locker/home.png
+share/gtk-doc/html/Locker/index.html
+share/gtk-doc/html/Locker/left-insensitive.png
+share/gtk-doc/html/Locker/left.png
+share/gtk-doc/html/Locker/right-insensitive.png
+share/gtk-doc/html/Locker/right.png
+share/gtk-doc/html/Locker/style.css
+share/gtk-doc/html/Locker/up-insensitive.png
+share/gtk-doc/html/Locker/up.png
 share/locale/es/LC_MESSAGES/Locker.mo
 share/locale/fr/LC_MESSAGES/Locker.mo

Index: pkgsrc/x11/deforaos-locker/distinfo
diff -u pkgsrc/x11/deforaos-locker/distinfo:1.10 pkgsrc/x11/deforaos-locker/distinfo:1.11
--- pkgsrc/x11/deforaos-locker/distinfo:1.10	Tue Oct 26 11:33:45 2021
+++ pkgsrc/x11/deforaos-locker/distinfo	Mon Jul 11 01:36:50 2022
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.10 2021/10/26 11:33:45 nia Exp $
+$NetBSD: distinfo,v 1.11 2022/07/11 01:36:50 khorben Exp $
 
-BLAKE2s (Locker-0.4.1.tar.gz) = c83ae302cdbbcfff04df05c184f064aae10a39e00b78184d127e13b8eb91726b
-SHA512 (Locker-0.4.1.tar.gz) = 7a0bd2466f670e891af87e7900d318a303501a18f99913f7b5b4109c32e62d54baf1fc65fd3768aaebe7911d2f95717bdd479159d2f03f7786de349a64d8fe02
-Size (Locker-0.4.1.tar.gz) = 63237 bytes
+BLAKE2s (Locker-0.4.2.tar.gz) = 59f3ebbcf821eb5c80851659d1cf7b075fc497c5e7105340e00091004b0c233d
+SHA512 (Locker-0.4.2.tar.gz) = 5d6e4876360a76d323d145bd1edbd7e46f4da4a9050a56c235047d13665de98d8bd2131caf35ee7ad89d05e63ce121e4c00c95d5b4023a807da8c73ddc2a9eae
+Size (Locker-0.4.2.tar.gz) = 54620 bytes

Index: pkgsrc/x11/deforaos-locker/options.mk
diff -u pkgsrc/x11/deforaos-locker/options.mk:1.1 pkgsrc/x11/deforaos-locker/options.mk:1.2
--- pkgsrc/x11/deforaos-locker/options.mk:1.1	Mon Dec 17 00:47:38 2012
+++ pkgsrc/x11/deforaos-locker/options.mk	Mon Jul 11 01:36:50 2022
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.1 2012/12/17 00:47:38 khorben Exp $
+# $NetBSD: options.mk,v 1.2 2022/07/11 01:36:50 khorben Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.deforaos-locker
 PKG_SUPPORTED_OPTIONS=	embedded
@@ -6,5 +6,5 @@ PKG_SUPPORTED_OPTIONS=	embedded
 .include "../../mk/bsd.options.mk"
 
 .if !empty(PKG_OPTIONS:Membedded)
-MAKE_FLAGS+=	CPPFLAGS=-DEMBEDDED
+DEFORAOS_CONFIGURE_MODE=	embedded-debug
 .endif


--_----------=_165750341032740--