pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

sddm: minor fixes to the Makefile



Module Name:	pkgsrc-wip
Committed By:	Stepan Ipatov <st.ipatov%gmail.com@localhost>
Pushed By:	st.ipatov
Date:		Thu Nov 20 06:40:18 2025 +0000
Changeset:	73e5dd8cda8fda44dce461c8f9def675ea93eb0f

Modified Files:
	sddm/Makefile

Log Message:
sddm: minor fixes to the Makefile

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

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

diffstat:
 sddm/Makefile | 46 ++++++++++++++++++++++++----------------------
 1 file changed, 24 insertions(+), 22 deletions(-)

diffs:
diff --git a/sddm/Makefile b/sddm/Makefile
index 40287480d9..9919ffe90d 100644
--- a/sddm/Makefile
+++ b/sddm/Makefile
@@ -1,6 +1,7 @@
 # $NetBSD$
 
 DISTNAME=	sddm-0.21.0
+PKGREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_GITHUB:=sddm/}
 GITHUB_TAG=	refs/tags/v${PKGVERSION_NOREV}
@@ -12,18 +13,9 @@ LICENSE=	gnu-gpl-v2 AND gnu-gpl-v3
 
 WRKSRC=		${WRKDIR}/${DISTNAME}
 
-TOOL_DEPENDS+=	extra-cmake-modules-[0-9]*:../../devel/extra-cmake-modules
-TOOL_DEPENDS+=	${PYPKGPREFIX}-docutils-[0-9]*:../../textproc/py-docutils
-DEPENDS+=	dbus-[0-9]*:../../sysutils/dbus
-DEPENDS+=	daemonize-[0-9]*:../../sysutils/daemonize
-
 USE_LANGUAGES=	c c++
 USE_TOOLS+=	pkg-config
 
-RCD_SCRIPTS+=	sddm
-
-BUILD_DEFS+=	VARBASE
-
 .if !exists(/etc/login.defs)
 CMAKE_CONFIGURE_ARGS+=	-DUID_MIN=1000
 CMAKE_CONFIGURE_ARGS+=	-DUID_MAX=65000
@@ -33,6 +25,10 @@ CMAKE_CONFIGURE_ARGS+=	-DCMAKE_INSTALL_SYSCONFDIR:PATH=${PKG_SYSCONFDIR:Q}
 CMAKE_CONFIGURE_ARGS+=	-DBUILD_MAN_PAGES=ON
 CMAKE_CONFIGURE_ARGS+=	-DRST2MAN_EXECUTABLE=${PREFIX}/bin/rst2man-${PYVERSSUFFIX}
 
+TOOL_DEPENDS+=	extra-cmake-modules-[0-9]*:../../devel/extra-cmake-modules
+TOOL_DEPENDS+=	${PYPKGPREFIX}-docutils-[0-9]*:../../textproc/py-docutils
+
+.include "options.mk"
 .include "../../mk/bsd.prefs.mk"
 
 .if ${OPSYS} != "Linux"
@@ -48,8 +44,6 @@ CMAKE_CONFIGURE_ARGS+=	-DSDDM_INITIAL_VT=5
 CMAKE_CONFIGURE_ARGS+=	-DSDDM_INITIAL_VT=7
 .endif
 
-.include "options.mk"
-
 SUBST_CLASSES+=		vars
 SUBST_STAGE.vars=	pre-configure
 SUBST_MESSAGE.vars=	Fix hard-coded absolute paths.
@@ -57,26 +51,34 @@ SUBST_FILES.vars+=	src/common/Configuration.h
 SUBST_FILES.vars+=	data/man/sddm.conf.rst.in
 SUBST_VARS.vars=	PREFIX X11BASE
 
-SDDM_GROUP=			sddm
-SDDM_USER=			sddm
-SDDM_HOME=			${VARBASE}/lib/sddm
-PKG_GROUPS_VARS+=		SMDM_GROUP
-PKG_USERS_VARS+=		SDDM_USER
-PKG_GROUPS=			${SDDM_GROUP}
-PKG_USERS=			${SDDM_USER}:${SDDM_GROUP}
-PKG_GECOS.${SDDM_USER}=		SDDM user
-PKG_HOME.${SDDM_USER}=		${SDDM_HOME}
+BUILD_DEFS+=		VARBASE
+SDDM_GROUP=		sddm
+SDDM_USER=		sddm
+SDDM_HOME=		${VARBASE}/lib/sddm
+PKG_GROUPS_VARS+=	SMDM_GROUP
+PKG_USERS_VARS+=	SDDM_USER
+PKG_GROUPS=		${SDDM_GROUP}
+PKG_USERS=		${SDDM_USER}:${SDDM_GROUP}
+PKG_GECOS.${SDDM_USER}=	SDDM user
+PKG_HOME.${SDDM_USER}=	${SDDM_HOME}
 
 OWN_DIRS_PERMS+=	${SDDM_HOME} ${SDDM_USER} ${SDDM_GROUP} 0770
 
+.if ${INIT_SYSTEM} == "rc.d"
+DEPENDS+=	daemonize-[0-9]*:../../sysutils/daemonize
+RCD_SCRIPTS+=	sddm
+.endif
+
+INSTALLATION_DIRS+=	share/xsessions
+
 post-install:
-	${INSTALL_DIR} ${DESTDIR}${PREFIX}/share/xsessions
 	${INSTALL_DATA} ${FILESDIR}/xsessions/*.desktop ${DESTDIR}${PREFIX}/share/xsessions
 	${INSTALL_SCRIPT} ${FILESDIR}/xinit-session ${DESTDIR}${PREFIX}/share/sddm/scripts/xinit-session
 
-PYTHON_FOR_BUILD_ONLY=	yes
+PYTHON_FOR_BUILD_ONLY=  yes
 .include "../../devel/cmake/build.mk"
 .include "../../lang/python/pyversion.mk"
+.include "../../sysutils/dbus/buildlink3.mk"
 .include "../../x11/libxcb/buildlink3.mk"
 .include "../../mk/pam.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"


Home | Main Index | Thread Index | Old Index