Sun Apr 18 12:10:16 2021 UTC ()
libgdm: set GITHUB_PROJECT to fix fetch state

Simplify PKGNAME while here.


(wiz)
diff -r1.1 -r1.2 pkgsrc/x11/libgdm/Makefile
cvs diff -r1.1 -r1.2 pkgsrc/x11/libgdm/Makefile (switch to unified diff)

--- pkgsrc/x11/libgdm/Makefile 2021/04/16 13:57:52 1.1
+++ pkgsrc/x11/libgdm/Makefile 2021/04/18 12:10:16 1.2
@@ -1,94 +1,95 @@ @@ -1,94 +1,95 @@
1# $NetBSD: Makefile,v 1.1 2021/04/16 13:57:52 cirnatdan Exp $ 1# $NetBSD: Makefile,v 1.2 2021/04/18 12:10:16 wiz Exp $
2 2
3DISTNAME= gdm-40.0 3DISTNAME= gdm-40.0
4PKGNAME= ${DISTNAME:S/gdm/libgdm/} 4PKGNAME= lib${DISTNAME}
5CATEGORIES= x11 gnome 5CATEGORIES= x11 gnome
6MASTER_SITES= ${MASTER_SITE_GITHUB:=GNOME/} 6MASTER_SITES= ${MASTER_SITE_GITHUB:=GNOME/}
 7GITHUB_PROJECT= gdm
7 8
8MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= https://www.gnome.org/ 10HOMEPAGE= https://www.gnome.org/
10COMMENT= Gnome Display Manager - client library 11COMMENT= Gnome Display Manager - client library
11LICENSE= gnu-gpl-v2 12LICENSE= gnu-gpl-v2
12 13
13DEPENDS+= zenity>=3.32.0:../../x11/zenity 14DEPENDS+= zenity>=3.32.0:../../x11/zenity
14 15
15USE_PKGLOCALEDIR= YES 16USE_PKGLOCALEDIR= YES
16GNU_CONFIGURE= YES 17GNU_CONFIGURE= YES
17USE_LIBTOOL= YES 18USE_LIBTOOL= YES
18USE_TOOLS+= msgfmt pkg-config 19USE_TOOLS+= msgfmt pkg-config
19BUILD_DEFS+= VARBASE 20BUILD_DEFS+= VARBASE
20 21
21USE_LANGUAGES= c c++ 22USE_LANGUAGES= c c++
22 23
23CPPFLAGS+= -DWITH_CONSOLE_KIT=1 24CPPFLAGS+= -DWITH_CONSOLE_KIT=1
24CPPFLAGS+= -DCONSOLEKIT_DIR=\"${PREFIX}/libexec\" 25CPPFLAGS+= -DCONSOLEKIT_DIR=\"${PREFIX}/libexec\"
25 26
26MESON_ARGS+= -Dlocalstatedir=${VARBASE} 27MESON_ARGS+= -Dlocalstatedir=${VARBASE}
27MESON_ARGS+= --sysconfdir=${EGDIR} 28MESON_ARGS+= --sysconfdir=${EGDIR}
28MESON_ARGS+= -Ddmconfdir=${PKG_SYSCONFDIR}/dm 29MESON_ARGS+= -Ddmconfdir=${PKG_SYSCONFDIR}/dm
29MESON_ARGS+= -Dsysconfsubdir= 30MESON_ARGS+= -Dsysconfsubdir=
30MESON_ARGS+= -Dprefetch=yes 31MESON_ARGS+= -Dprefetch=yes
31MESON_ARGS+= -Dplymouth=disabled 32MESON_ARGS+= -Dplymouth=disabled
32MESON_ARGS+= -Dsystemd=disabled 33MESON_ARGS+= -Dsystemd=disabled
33MESON_ARGS+= -Dsystemd-journal=false 34MESON_ARGS+= -Dsystemd-journal=false
34MESON_ARGS+= -Duser-display-server=false 35MESON_ARGS+= -Duser-display-server=false
35MESON_ARGS+= -Duser=${GDMOWN} 36MESON_ARGS+= -Duser=${GDMOWN}
36MESON_ARGS+= -Dgroup=${GDMGRP} 37MESON_ARGS+= -Dgroup=${GDMGRP}
37MESON_ARGS+= -Ddbus-sys=${PREFIX}/share/examples/dbus-1/system.d 38MESON_ARGS+= -Ddbus-sys=${PREFIX}/share/examples/dbus-1/system.d
38MESON_ARGS+= -Dgdm-xsession=true 39MESON_ARGS+= -Dgdm-xsession=true
39MESON_ARGS+= -Dwayland-support=false 40MESON_ARGS+= -Dwayland-support=false
40MESON_ARGS+= -Ddefault-path="/usr/local/bin:/usr/local/sbin:${PREFIX}/bin:${PREFIX}/sbin:/usr/bin:/usr/sbin:/bin/sbin" 41MESON_ARGS+= -Ddefault-path="/usr/local/bin:/usr/local/sbin:${PREFIX}/bin:${PREFIX}/sbin:/usr/bin:/usr/sbin:/bin/sbin"
41INSTALL_MAKE_FLAGS+= ${MAKE_FLAGS} 42INSTALL_MAKE_FLAGS+= ${MAKE_FLAGS}
42INSTALL_MAKE_FLAGS+= GDM_CUSTOM_CONF=${EGDIR}/custom.conf 43INSTALL_MAKE_FLAGS+= GDM_CUSTOM_CONF=${EGDIR}/custom.conf
43INSTALL_MAKE_FLAGS+= sysconfdir=${EGDIR} 44INSTALL_MAKE_FLAGS+= sysconfdir=${EGDIR}
44MAKE_ENV+= CHMOD=${CHMOD:Q} CHOWN=${CHOWN:Q} 45MAKE_ENV+= CHMOD=${CHMOD:Q} CHOWN=${CHOWN:Q}
45 46
46# only install libgdm, without the daemon and login screen 47# only install libgdm, without the daemon and login screen
47INSTALLATION_DIRS+= include/gdm 48INSTALLATION_DIRS+= include/gdm
48INSTALLATION_DIRS+= lib/girepository-1.0 49INSTALLATION_DIRS+= lib/girepository-1.0
49INSTALLATION_DIRS+= lib/ 50INSTALLATION_DIRS+= lib/
50INSTALLATION_DIRS+= lib/pkgconfig 51INSTALLATION_DIRS+= lib/pkgconfig
51INSTALLATION_DIRS+= share/gir-1.0 share/glib-2.0/schemas 52INSTALLATION_DIRS+= share/gir-1.0 share/glib-2.0/schemas
52 53
53INSTALL_DIRS= # disable meson install 54INSTALL_DIRS= # disable meson install
54 55
55do-install: 56do-install:
56 ${INSTALL_DATA} ${WRKSRC}/output/libgdm/gdm-client-glue.h \ 57 ${INSTALL_DATA} ${WRKSRC}/output/libgdm/gdm-client-glue.h \
57 ${DESTDIR}${PREFIX}/include/gdm 58 ${DESTDIR}${PREFIX}/include/gdm
58 ${INSTALL_DATA} ${WRKSRC}/libgdm/gdm-client.h \ 59 ${INSTALL_DATA} ${WRKSRC}/libgdm/gdm-client.h \
59 ${DESTDIR}${PREFIX}/include/gdm 60 ${DESTDIR}${PREFIX}/include/gdm
60 ${INSTALL_DATA} ${WRKSRC}/libgdm/gdm-sessions.h \ 61 ${INSTALL_DATA} ${WRKSRC}/libgdm/gdm-sessions.h \
61 ${DESTDIR}${PREFIX}/include/gdm 62 ${DESTDIR}${PREFIX}/include/gdm
62 ${INSTALL_DATA} ${WRKSRC}/libgdm/gdm-user-switching.h \ 63 ${INSTALL_DATA} ${WRKSRC}/libgdm/gdm-user-switching.h \
63 ${DESTDIR}${PREFIX}/include/gdm 64 ${DESTDIR}${PREFIX}/include/gdm
64 65
65 ${INSTALL_DATA} ${WRKSRC}/output/libgdm/Gdm-1.0.typelib \ 66 ${INSTALL_DATA} ${WRKSRC}/output/libgdm/Gdm-1.0.typelib \
66 ${DESTDIR}${PREFIX}/lib/girepository-1.0 67 ${DESTDIR}${PREFIX}/lib/girepository-1.0
67 ${INSTALL_LIB} ${WRKSRC}/output/libgdm/libgdm.so \ 68 ${INSTALL_LIB} ${WRKSRC}/output/libgdm/libgdm.so \
68 ${DESTDIR}${PREFIX}/lib 69 ${DESTDIR}${PREFIX}/lib
69 ${INSTALL_LIB} ${WRKSRC}/output/libgdm/libgdm.so.1 \ 70 ${INSTALL_LIB} ${WRKSRC}/output/libgdm/libgdm.so.1 \
70 ${DESTDIR}${PREFIX}/lib 71 ${DESTDIR}${PREFIX}/lib
71 ${INSTALL_LIB} ${WRKSRC}/output/libgdm/libgdm.so.1.0.0 \ 72 ${INSTALL_LIB} ${WRKSRC}/output/libgdm/libgdm.so.1.0.0 \
72 ${DESTDIR}${PREFIX}/lib 73 ${DESTDIR}${PREFIX}/lib
73 74
74 ${INSTALL_DATA} ${WRKSRC}/output/meson-private/gdm.pc \ 75 ${INSTALL_DATA} ${WRKSRC}/output/meson-private/gdm.pc \
75 ${DESTDIR}${PREFIX}/lib/pkgconfig 76 ${DESTDIR}${PREFIX}/lib/pkgconfig
76 77
77 ${INSTALL_DATA} ${WRKSRC}/output/libgdm/Gdm-1.0.gir \ 78 ${INSTALL_DATA} ${WRKSRC}/output/libgdm/Gdm-1.0.gir \
78 ${DESTDIR}${PREFIX}/share/gir-1.0 79 ${DESTDIR}${PREFIX}/share/gir-1.0
79 ${INSTALL_DATA} ${WRKSRC}/data/org.gnome.login-screen.gschema.xml \ 80 ${INSTALL_DATA} ${WRKSRC}/data/org.gnome.login-screen.gschema.xml \
80 ${DESTDIR}${PREFIX}/share/glib-2.0/schemas 81 ${DESTDIR}${PREFIX}/share/glib-2.0/schemas
81 82
82.include "../../devel/meson/build.mk" 83.include "../../devel/meson/build.mk"
83#.include "../../sysutils/gsettings-desktop-schemas/buildlink3.mk" 84#.include "../../sysutils/gsettings-desktop-schemas/buildlink3.mk"
84BUILDLINK_DEPMETHOD.openpam= build 85BUILDLINK_DEPMETHOD.openpam= build
85.include "../../security/openpam/buildlink3.mk" 86.include "../../security/openpam/buildlink3.mk"
86BUILDLINK_DEPMETHOD.dconf= build 87BUILDLINK_DEPMETHOD.dconf= build
87.include "../../devel/dconf/buildlink3.mk" 88.include "../../devel/dconf/buildlink3.mk"
88.include "../../audio/libcanberra/buildlink3.mk" 89.include "../../audio/libcanberra/buildlink3.mk"
89BUILDLINK_DEPMETHOD.gtk3= build 90BUILDLINK_DEPMETHOD.gtk3= build
90.include "../../x11/gtk3/buildlink3.mk" 91.include "../../x11/gtk3/buildlink3.mk"
91.include "../../sysutils/accountsservice/buildlink3.mk" 92.include "../../sysutils/accountsservice/buildlink3.mk"
92.include "../../devel/gettext-lib/buildlink3.mk" 93.include "../../devel/gettext-lib/buildlink3.mk"
93.include "../../devel/glib2/schemas.mk" 94.include "../../devel/glib2/schemas.mk"
94.include "../../mk/bsd.pkg.mk" 95.include "../../mk/bsd.pkg.mk"