gnome-desktop3: Rename gnome-desktop3-linux to gnome-desktop3

[Dan Cîrnaț <dan%alt.md@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Dan Cîrnaț <dan%alt.md@localhost>
Pushed By:	cirnatdan
Date:		Sat Aug 27 12:06:07 2022 +0200
Changeset:	2e8225c03d7fe4f2cfe4f294e9977af622c6e156

Modified Files:
	Makefile
Added Files:
	gnome-desktop3/DESCR
	gnome-desktop3/Makefile
	gnome-desktop3/buildlink3.mk
Removed Files:
	gnome-desktop3-linux/DESCR
	gnome-desktop3-linux/Makefile
	gnome-desktop3-linux/buildlink3.mk

Log Message:
gnome-desktop3: Rename gnome-desktop3-linux to gnome-desktop3

Package should not be OS-specific

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=2e8225c03d7fe4f2cfe4f294e9977af622c6e156

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

diffstat:
 Makefile                           |  2 +-
 gnome-desktop3-linux/DESCR         |  2 --
 gnome-desktop3-linux/Makefile      | 47 --------------------------------------
 gnome-desktop3-linux/buildlink3.mk | 20 ----------------
 gnome-desktop3/DESCR               |  2 ++
 gnome-desktop3/Makefile            | 47 ++++++++++++++++++++++++++++++++++++++
 gnome-desktop3/buildlink3.mk       | 20 ++++++++++++++++
 7 files changed, 70 insertions(+), 70 deletions(-)

diffs:
diff --git a/Makefile b/Makefile
index f3a37d9632..e4ea6289ca 100644
--- a/Makefile
+++ b/Makefile
@@ -1183,7 +1183,7 @@ SUBDIR+=	gnome-clipboard-daemon
 SUBDIR+=	gnome-common
 SUBDIR+=	gnome-core
 SUBDIR+=	gnome-desktop2
-SUBDIR+=	gnome-desktop3-linux
+SUBDIR+=	gnome-desktop3
 SUBDIR+=	gnome-jabber
 SUBDIR+=	gnome-js-common
 SUBDIR+=	gnome-maps
diff --git a/gnome-desktop3-linux/DESCR b/gnome-desktop3-linux/DESCR
deleted file mode 100644
index a485f9737b..0000000000
--- a/gnome-desktop3-linux/DESCR
+++ /dev/null
@@ -1,2 +0,0 @@
-gnome-desktop contains the libgnome-desktop library, the gnome-about
-program as well as some desktop-wide documents for GNOME 3.
diff --git a/gnome-desktop3-linux/Makefile b/gnome-desktop3-linux/Makefile
deleted file mode 100644
index ac210006d7..0000000000
--- a/gnome-desktop3-linux/Makefile
+++ /dev/null
@@ -1,47 +0,0 @@
-# $NetBSD: Makefile,v 1.46 2021/04/13 17:35:45 cirnatdan Exp $
-PLIST_SRC=	${.CURDIR}/../../x11/gnome-desktop3/PLIST
-PATCHDIR=	${.CURDIR}/../../x11/gnome-desktop3/patches
-DISTINFO_FILE=	${.CURDIR}/../../x11/gnome-desktop3/distinfo
-
-DISTNAME=	gnome-desktop-40.5
-PKGNAME=	${DISTNAME:S/desktop/desktop3/}
-CATEGORIES=	x11 gnome
-MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gnome-desktop/${PKGVERSION_NOREV:R}/}
-EXTRACT_SUFX=	.tar.xz
-
-MAINTAINER=	prlw1%cam.ac.uk@localhost
-HOMEPAGE=	https://www.gnome.org/
-COMMENT=	GNOME3 desktop-wide documents and libgnome-desktop library
-LICENSE=	gnu-gpl-v2 AND gnu-lgpl-v2 AND gnu-fdl-v1.1
-
-USE_TOOLS+=		pkg-config xgettext gdbus-codegen
-PKGCONFIG_OVERRIDE+=	libgnome-desktop/gnome-desktop-3.0.pc.in
-
-MESON_ARGS+=		-Dsystemd=disabled
-MESON_ARGS+=		-Dudev=disabled
-MESON_ARGS+=		-Dgnome_distributor="The NetBSD Foundation"
-MESON_ARGS+=		-Ddate_in_gnome_version=false
-MESON_ARGS+=		-Ddesktop_docs=false
-MESON_ARGS+=		-Dgtk_doc=false
-MESON_ARGS+=		-Ddebug_tools=false
-
-PYTHON_FOR_BUILD_ONLY=	tool
-
-.include "../../mk/bsd.prefs.mk"
-.if ${OPSYS} == "Linux"
-.include "../../wip/mk/libseccomp.buildlink3.mk"
-.endif
-
-BUILDLINK_API_DEPENDS.glib2+=	glib2>=2.44.0
-.include "../../devel/glib2/buildlink3.mk"
-.include "../../devel/gobject-introspection/buildlink3.mk"
-BUILDLINK_API_DEPENDS.gdk-pixbuf2+=	gdk-pixbuf2>=2.36.5
-.include "../../graphics/gdk-pixbuf2/buildlink3.mk"
-BUILDLINK_API_DEPENDS.gsettings-desktop-schemas+=	gsettings-desktop-schemas>=3.27.0
-.include "../../sysutils/gsettings-desktop-schemas/buildlink3.mk"
-.include "../../textproc/iso-codes/buildlink3.mk"
-.include "../../x11/gtk3/buildlink3.mk"
-.include "../../x11/libxkbfile/buildlink3.mk"
-.include "../../x11/xkeyboard-config/buildlink3.mk"
-.include "../../devel/meson/build.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/gnome-desktop3-linux/buildlink3.mk b/gnome-desktop3-linux/buildlink3.mk
deleted file mode 100644
index 5060141d70..0000000000
--- a/gnome-desktop3-linux/buildlink3.mk
+++ /dev/null
@@ -1,20 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.33 2020/11/04 12:12:48 nia Exp $
-
-BUILDLINK_TREE+=	gnome-desktop3
-
-.if !defined(GNOME_DESKTOP3_BUILDLINK3_MK)
-GNOME_DESKTOP3_BUILDLINK3_MK:=
-
-BUILDLINK_API_DEPENDS.gnome-desktop3+=	gnome-desktop3>=3.4.2
-BUILDLINK_ABI_DEPENDS.gnome-desktop3+=	gnome-desktop3>=3.36
-BUILDLINK_PKGSRCDIR.gnome-desktop3?=	../../wip/gnome-desktop3-linux
-
-.include "../../wip/mk/libseccomp.buildlink3.mk"
-BUILDLINK_API_DEPENDS.gsettings-desktop-schemas+=	gsettings-desktop-schemas>=3.27.0
-.include "../../sysutils/gsettings-desktop-schemas/buildlink3.mk"
-.include "../../x11/gtk3/buildlink3.mk"
-.include "../../x11/xkeyboard-config/buildlink3.mk"
-.include "../../textproc/iso-codes/buildlink3.mk"
-.endif
-
-BUILDLINK_TREE+=	-gnome-desktop3
diff --git a/gnome-desktop3/DESCR b/gnome-desktop3/DESCR
new file mode 100644
index 0000000000..a485f9737b
--- /dev/null
+++ b/gnome-desktop3/DESCR
@@ -0,0 +1,2 @@
+gnome-desktop contains the libgnome-desktop library, the gnome-about
+program as well as some desktop-wide documents for GNOME 3.
diff --git a/gnome-desktop3/Makefile b/gnome-desktop3/Makefile
new file mode 100644
index 0000000000..ac210006d7
--- /dev/null
+++ b/gnome-desktop3/Makefile
@@ -0,0 +1,47 @@
+# $NetBSD: Makefile,v 1.46 2021/04/13 17:35:45 cirnatdan Exp $
+PLIST_SRC=	${.CURDIR}/../../x11/gnome-desktop3/PLIST
+PATCHDIR=	${.CURDIR}/../../x11/gnome-desktop3/patches
+DISTINFO_FILE=	${.CURDIR}/../../x11/gnome-desktop3/distinfo
+
+DISTNAME=	gnome-desktop-40.5
+PKGNAME=	${DISTNAME:S/desktop/desktop3/}
+CATEGORIES=	x11 gnome
+MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gnome-desktop/${PKGVERSION_NOREV:R}/}
+EXTRACT_SUFX=	.tar.xz
+
+MAINTAINER=	prlw1%cam.ac.uk@localhost
+HOMEPAGE=	https://www.gnome.org/
+COMMENT=	GNOME3 desktop-wide documents and libgnome-desktop library
+LICENSE=	gnu-gpl-v2 AND gnu-lgpl-v2 AND gnu-fdl-v1.1
+
+USE_TOOLS+=		pkg-config xgettext gdbus-codegen
+PKGCONFIG_OVERRIDE+=	libgnome-desktop/gnome-desktop-3.0.pc.in
+
+MESON_ARGS+=		-Dsystemd=disabled
+MESON_ARGS+=		-Dudev=disabled
+MESON_ARGS+=		-Dgnome_distributor="The NetBSD Foundation"
+MESON_ARGS+=		-Ddate_in_gnome_version=false
+MESON_ARGS+=		-Ddesktop_docs=false
+MESON_ARGS+=		-Dgtk_doc=false
+MESON_ARGS+=		-Ddebug_tools=false
+
+PYTHON_FOR_BUILD_ONLY=	tool
+
+.include "../../mk/bsd.prefs.mk"
+.if ${OPSYS} == "Linux"
+.include "../../wip/mk/libseccomp.buildlink3.mk"
+.endif
+
+BUILDLINK_API_DEPENDS.glib2+=	glib2>=2.44.0
+.include "../../devel/glib2/buildlink3.mk"
+.include "../../devel/gobject-introspection/buildlink3.mk"
+BUILDLINK_API_DEPENDS.gdk-pixbuf2+=	gdk-pixbuf2>=2.36.5
+.include "../../graphics/gdk-pixbuf2/buildlink3.mk"
+BUILDLINK_API_DEPENDS.gsettings-desktop-schemas+=	gsettings-desktop-schemas>=3.27.0
+.include "../../sysutils/gsettings-desktop-schemas/buildlink3.mk"
+.include "../../textproc/iso-codes/buildlink3.mk"
+.include "../../x11/gtk3/buildlink3.mk"
+.include "../../x11/libxkbfile/buildlink3.mk"
+.include "../../x11/xkeyboard-config/buildlink3.mk"
+.include "../../devel/meson/build.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/gnome-desktop3/buildlink3.mk b/gnome-desktop3/buildlink3.mk
new file mode 100644
index 0000000000..5060141d70
--- /dev/null
+++ b/gnome-desktop3/buildlink3.mk
@@ -0,0 +1,20 @@
+# $NetBSD: buildlink3.mk,v 1.33 2020/11/04 12:12:48 nia Exp $
+
+BUILDLINK_TREE+=	gnome-desktop3
+
+.if !defined(GNOME_DESKTOP3_BUILDLINK3_MK)
+GNOME_DESKTOP3_BUILDLINK3_MK:=
+
+BUILDLINK_API_DEPENDS.gnome-desktop3+=	gnome-desktop3>=3.4.2
+BUILDLINK_ABI_DEPENDS.gnome-desktop3+=	gnome-desktop3>=3.36
+BUILDLINK_PKGSRCDIR.gnome-desktop3?=	../../wip/gnome-desktop3-linux
+
+.include "../../wip/mk/libseccomp.buildlink3.mk"
+BUILDLINK_API_DEPENDS.gsettings-desktop-schemas+=	gsettings-desktop-schemas>=3.27.0
+.include "../../sysutils/gsettings-desktop-schemas/buildlink3.mk"
+.include "../../x11/gtk3/buildlink3.mk"
+.include "../../x11/xkeyboard-config/buildlink3.mk"
+.include "../../textproc/iso-codes/buildlink3.mk"
+.endif
+
+BUILDLINK_TREE+=	-gnome-desktop3