Index: head/x11/sddm/Makefile =================================================================== --- head/x11/sddm/Makefile (revision 564705) +++ head/x11/sddm/Makefile (revision 564706) @@ -1,55 +1,56 @@ # $FreeBSD$ PORTNAME= sddm PORTVERSION= 0.19.0 DISTVERSIONPREFIX= v +PORTREVISION= 1 CATEGORIES= x11 MAINTAINER= kde@FreeBSD.org COMMENT= QML based login manager # The source code is GPLv2+, but the provided themes are: # - CC-BY 3.0 (default greeter theme, maldives) # - CC-BY 4.0 (maya) # - Apache20 (font included with maya) LICENSE= GPLv2+ CC-BY-3.0 CC-BY-4.0 APACHE20 LICENSE_COMB= multi LICENSE_FILE_GPLv2+ = ${WRKSRC}/LICENSE LICENSE_FILE_CC-BY-3.0= ${WRKSRC}/LICENSE.CC-BY-3.0 BUILD_DEPENDS= rst2man.py-${PYTHON_VER}:textproc/py-docutils@${PY_FLAVOR} RUN_DEPENDS= dbus-run-session:devel/dbus USES= cmake compiler:c++11-lang kde:5 pkgconfig python:build qt:5 xorg USE_GITHUB= yes USE_KDE= ecm USE_QT= core declarative dbus gui network \ buildtools_build linguisttools_build qmake_build USE_XORG= xcb CMAKE_ON= BUILD_MAN_PAGES CMAKE_ARGS= -DUID_MIN=1000 \ -DUID_MAX=65000 \ -DCMAKE_INSTALL_SYSCONFDIR:PATH=${LOCALBASE}/etc \ -DRST2MAN_EXECUTABLE=${LOCALBASE}/bin/rst2man.py-${PYTHON_VER} USE_RC_SUBR= sddm SUB_FILES= xinitrc.desktop USERS= sddm GROUPS= sddm post-patch: @${REINPLACE_CMD} -e 's#/etc/X11#${LOCALBASE}/etc/X11#' \ -e 's#/usr/bin/#${LOCALBASE}/bin/#g' \ -e 's#/usr/share/#${LOCALBASE}/share/#' \ ${WRKSRC}/data/scripts/Xsession \ ${WRKSRC}/src/common/Configuration.h post-install: # Install xsession.desktop to launch .xinitrc via sddm. ${MKDIR} ${STAGEDIR}${PREFIX}/share/xsessions ${INSTALL_DATA} ${WRKDIR}/xinitrc.desktop ${STAGEDIR}${PREFIX}/share/xsessions ${INSTALL_SCRIPT} ${FILESDIR}/xinit-session ${STAGEDIR}${PREFIX}/share/sddm/scripts .include Index: head/x11/sddm/files/sddm.in =================================================================== --- head/x11/sddm/files/sddm.in (revision 564705) +++ head/x11/sddm/files/sddm.in (revision 564706) @@ -1,55 +1,42 @@ #!/bin/sh # $FreeBSD$ # # PROVIDE: sddm -# REQUIRE: LOGIN cleanvar moused syscons dbus hald +# REQUIRE: LOGIN cleanvar moused syscons dbus # KEYWORD: shutdown # # Add the following to /etc/rc.conf to start SDDM at boot time: # # sddm_enable="YES" . /etc/rc.subr name=sddm rcvar=sddm_enable load_rc_config ${name} : ${sddm_lang="en_US"} # .UTF-8 suffix will be added later to comply with locale format : ${sddm_enable="NO"} command="%%PREFIX%%/bin/sddm" start_cmd="sddm_start" sddm_start() { echo "Starting ${name}." local iter ( iter=0 while ! pgrep -f "^/usr/libexec/getty " > /dev/null; do if [ ${iter} -eq 60 ]; then break fi sleep 1 iter=$((${iter} + 1)) done - - if checkyesno hald_enable; then - if [ ! -x %%LOCALBASE%%/sbin/hald ]; then - err 1 "Hald does not seem to be installed." - fi - - iter=0 - while [ ${iter} -lt 60 ] && - ! pgrep -f "^%%LOCALBASE%%/sbin/hald" > /dev/null; do - sleep 1 - iter=$((${iter} + 1)) - done - fi LANG=${sddm_lang}.UTF-8 ${command} ${sddm_flags} ) & } run_rc_command "$1"