Received: by mail.netbsd.org (Postfix, from userid 605) id 089BF84D8D; Fri, 18 May 2018 14:51:19 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 7097884D5D for ; Fri, 18 May 2018 14:51:18 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id hppH06zVOGGr for ; Fri, 18 May 2018 14:51:17 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id 9A34F84D28 for ; Fri, 18 May 2018 14:51:17 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 9506EFBEC; Fri, 18 May 2018 14:51:17 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1526655077164790" MIME-Version: 1.0 Date: Fri, 18 May 2018 14:51:17 +0000 From: "Youri Mouton" Subject: CVS commit: pkgsrc/x11/slim To: pkgsrc-changes@NetBSD.org Reply-To: youri@netbsd.org X-Mailer: log_accum Message-Id: <20180518145117.9506EFBEC@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1526655077164790 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: youri Date: Fri May 18 14:51:17 UTC 2018 Added Files: pkgsrc/x11/slim: DESCR Makefile PLIST distinfo pkgsrc/x11/slim/files: slim.sh pkgsrc/x11/slim/patches: patch-CMakeLists.txt patch-slim.conf Log Message: x11/slim: import slim-1.3.6 SLiM (Simple Login Manager) is a graphical login manager for X11. It aims to be simple, fast and independent from the various desktop environments. SLiM is based on latest stable release of Login.app by Per Liden. To generate a diff of this commit: cvs rdiff -u -r0 -r1.1 pkgsrc/x11/slim/DESCR pkgsrc/x11/slim/Makefile \ pkgsrc/x11/slim/PLIST pkgsrc/x11/slim/distinfo cvs rdiff -u -r0 -r1.1 pkgsrc/x11/slim/files/slim.sh cvs rdiff -u -r0 -r1.1 pkgsrc/x11/slim/patches/patch-CMakeLists.txt \ pkgsrc/x11/slim/patches/patch-slim.conf Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1526655077164790 Content-Disposition: inline Content-Length: 8547 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Added files: Index: pkgsrc/x11/slim/DESCR diff -u /dev/null pkgsrc/x11/slim/DESCR:1.1 --- /dev/null Fri May 18 14:51:17 2018 +++ pkgsrc/x11/slim/DESCR Fri May 18 14:51:17 2018 @@ -0,0 +1,4 @@ +SLiM (Simple Login Manager) is a graphical login manager for X11. +It aims to be simple, fast and independent from the various +desktop environments. +SLiM is based on latest stable release of Login.app by Per Liden. Index: pkgsrc/x11/slim/Makefile diff -u /dev/null pkgsrc/x11/slim/Makefile:1.1 --- /dev/null Fri May 18 14:51:17 2018 +++ pkgsrc/x11/slim/Makefile Fri May 18 14:51:17 2018 @@ -0,0 +1,42 @@ +# $NetBSD: Makefile,v 1.1 2018/05/18 14:51:17 youri Exp $ + +DISTNAME= slim-1.3.6 +CATEGORIES= x11 +MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=slim.berlios/} + +MAINTAINER= youri@NetBSD.org +HOMEPAGE= https://github.com/iwamatsu/slim +COMMENT= Simple login manager +LICENSE= gnu-gpl-v2 + +USE_LANGUAGES= c c++ + +USE_CMAKE= yes +CMAKE_ARGS= -DUSE_CONSOLEKIT:Bool=Yes + +AUTO_MKDIRS= yes +RCD_SCRIPTS+= slim + +DEPENDS+= bash-[0-9]*:../../shells/bash + +SUBST_CLASSES+= paths +SUBST_STAGE.paths= pre-configure +SUBST_FILES.paths= CMakeLists.txt slim.conf +SUBST_SED.paths= -e 's,@PREFIX@,${PREFIX},' +SUBST_SED.paths+= -e 's,@X11BASE@,${X11BASE},' + +CONF_FILES+= share/examples/slim/slim.conf \ + ${PKG_SYSCONFDIR}/slim.conf + +.include "../../x11/libX11/buildlink3.mk" +.include "../../x11/libXft/buildlink3.mk" +.include "../../x11/libXmu/buildlink3.mk" +.include "../../x11/libXrandr/buildlink3.mk" +.include "../../x11/libXrender/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" +.include "../../graphics/png/buildlink3.mk" +.include "../../graphics/freetype2/buildlink3.mk" +.include "../../fonts/fontconfig/buildlink3.mk" +.include "../../sysutils/consolekit/buildlink3.mk" +.include "../../mk/pthread.buildlink3.mk" +.include "../../mk/bsd.pkg.mk" Index: pkgsrc/x11/slim/PLIST diff -u /dev/null pkgsrc/x11/slim/PLIST:1.1 --- /dev/null Fri May 18 14:51:17 2018 +++ pkgsrc/x11/slim/PLIST Fri May 18 14:51:17 2018 @@ -0,0 +1,10 @@ +@comment $NetBSD: PLIST,v 1.1 2018/05/18 14:51:17 youri Exp $ +bin/slim +lib/libslim.so +lib/libslim.so.${PKGVERSION} +man/man1/slim.1 +man/man1/slimlock.1 +share/examples/slim/slim.conf +share/slim/themes/default/background.jpg +share/slim/themes/default/panel.png +share/slim/themes/default/slim.theme Index: pkgsrc/x11/slim/distinfo diff -u /dev/null pkgsrc/x11/slim/distinfo:1.1 --- /dev/null Fri May 18 14:51:17 2018 +++ pkgsrc/x11/slim/distinfo Fri May 18 14:51:17 2018 @@ -0,0 +1,8 @@ +$NetBSD: distinfo,v 1.1 2018/05/18 14:51:17 youri Exp $ + +SHA1 (slim-1.3.6.tar.gz) = 9407ea2ee7b2ed649f17a8ddbf1f7b26a7c7b9fb +RMD160 (slim-1.3.6.tar.gz) = 1bf3269b23275c50b67ada8cb5709e093eb6764f +SHA512 (slim-1.3.6.tar.gz) = 345b1dee5d6f0c3716dfa7c5c16274adbf18586bdaaa6af4f310e24c5a61f79a297ffac921a5ba545523317e9fe120916df226c36b9c9b49c2ac9c1ca21dee0c +Size (slim-1.3.6.tar.gz) = 232547 bytes +SHA1 (patch-CMakeLists.txt) = 27f0222a206465e12f22f78e418b1615f7825cd4 +SHA1 (patch-slim.conf) = 374bd751be43a0c04e70f38adc34ddbc03370cf4 Index: pkgsrc/x11/slim/files/slim.sh diff -u /dev/null pkgsrc/x11/slim/files/slim.sh:1.1 --- /dev/null Fri May 18 14:51:17 2018 +++ pkgsrc/x11/slim/files/slim.sh Fri May 18 14:51:17 2018 @@ -0,0 +1,27 @@ +#!/bin/sh +# +# $NetBSD: slim.sh,v 1.1 2018/05/18 14:51:17 youri Exp $ +# + +# PROVIDE: slim +# REQUIRE: DAEMON LOGIN wscons +# KEYWORD: shutdown + +if [ -f /etc/rc.subr ]; then + . /etc/rc.subr +fi + +name="slim" +rcvar=${name} +command="@PREFIX@/bin/${name}" +command_args="-d" +pidfile="/var/run/${name}.lock" +required_files="@PKG_SYSCONFDIR@/slim.conf" + +if [ -f /etc/rc.subr ]; then + load_rc_config ${name} + run_rc_command "$1" +else + echo -n " ${name}" + ${command} ${slim_flags} ${command_args} +fi Index: pkgsrc/x11/slim/patches/patch-CMakeLists.txt diff -u /dev/null pkgsrc/x11/slim/patches/patch-CMakeLists.txt:1.1 --- /dev/null Fri May 18 14:51:17 2018 +++ pkgsrc/x11/slim/patches/patch-CMakeLists.txt Fri May 18 14:51:17 2018 @@ -0,0 +1,61 @@ +$NetBSD: patch-CMakeLists.txt,v 1.1 2018/05/18 14:51:17 youri Exp $ + +Fix build. + +--- CMakeLists.txt.orig 2013-10-01 22:38:05.000000000 +0000 ++++ CMakeLists.txt +@@ -21,11 +21,11 @@ set(SLIM_VERSION_MINOR "3") + set(SLIM_VERSION_PATCH "6") + set(SLIM_VERSION "${SLIM_VERSION_MAJOR}.${SLIM_VERSION_MINOR}.${SLIM_VERSION_PATCH}") + +-set(CMAKE_INSTALL_PREFIX "/usr/local" CACHE PATH "Installation Directory") ++set(CMAKE_INSTALL_PREFIX "@PREFIX@" CACHE PATH "Installation Directory") + set(PKGDATADIR "${CMAKE_INSTALL_PREFIX}/share/slim") +-set(SYSCONFDIR "/etc") ++set(SYSCONFDIR "@PREFIX@/etc") + set(LIBDIR "/lib") +-set(MANDIR "${CMAKE_INSTALL_PREFIX}/share/man") ++set(MANDIR "${CMAKE_INSTALL_PREFIX}/man") + + set(SLIM_DEFINITIONS) + if(${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD" OR +@@ -104,13 +104,13 @@ find_package(PNG REQUIRED) + find_package(ZLIB REQUIRED) + + # Fontconfig +-set(FONTCONFIG_DIR ${CMAKE_MODULE_PATH}) +-find_package(FONTCONFIG REQUIRED) +-if(FONTCONFIG_FOUND) +- message("\tFontConfig Found") +- target_link_libraries(${PROJECT_NAME} ${FONTCONFIG_LIBRARY}) +- include_directories(${FONTCONFIG_INCLUDE_DIR}) +-endif(FONTCONFIG_FOUND) ++#set(FONTCONFIG_DIR ${CMAKE_MODULE_PATH}) ++#find_package(FONTCONFIG REQUIRED) ++#if(FONTCONFIG_FOUND) ++ #message("\tFontConfig Found") ++ #target_link_libraries(${PROJECT_NAME} ${FONTCONFIG_LIBRARY}) ++ #include_directories(${FONTCONFIG_INCLUDE_DIR}) ++#endif(FONTCONFIG_FOUND) + + # PAM + if(USE_PAM) +@@ -221,7 +221,9 @@ endif(BUILD_SLIMLOCK) + ####### install + # slim + install(TARGETS slim RUNTIME DESTINATION bin) ++if(BUILD_SLIMLOCK) + install(TARGETS slimlock RUNTIME DESTINATION bin) ++endif(BUILD_SLIMLOCK) + + if (BUILD_SHARED_LIBS) + set_target_properties(libslim PROPERTIES +@@ -238,7 +240,7 @@ endif (BUILD_SHARED_LIBS) + install(FILES slim.1 DESTINATION ${MANDIR}/man1/) + install(FILES slimlock.1 DESTINATION ${MANDIR}/man1/) + # configure +-install(FILES slim.conf DESTINATION ${SYSCONFDIR}) ++install(FILES slim.conf DESTINATION ${CMAKE_INSTALL_PREFIX}/share/examples/slim/) + # systemd service file + if (${CMAKE_SYSTEM_NAME} MATCHES "Linux") + install(FILES slim.service DESTINATION ${LIBDIR}/systemd/system) Index: pkgsrc/x11/slim/patches/patch-slim.conf diff -u /dev/null pkgsrc/x11/slim/patches/patch-slim.conf:1.1 --- /dev/null Fri May 18 14:51:17 2018 +++ pkgsrc/x11/slim/patches/patch-slim.conf Fri May 18 14:51:17 2018 @@ -0,0 +1,47 @@ +$NetBSD: patch-slim.conf,v 1.1 2018/05/18 14:51:17 youri Exp $ + +Adjust for NetBSD + +--- slim.conf.orig 2013-10-01 22:38:05.000000000 +0000 ++++ slim.conf +@@ -1,17 +1,18 @@ + # Path, X server and arguments (if needed) + # Note: -xauth $authfile is automatically appended +-default_path /bin:/usr/bin:/usr/local/bin +-default_xserver /usr/bin/X ++default_path /bin:/usr/bin:@X11BASE@/bin: ++default_xserver @X11BASE@/bin/X + #xserver_arguments -dpi 75 ++xserver_arguments vt05 + + # Commands for halt, login, etc. + halt_cmd /sbin/shutdown -h now + reboot_cmd /sbin/shutdown -r now +-console_cmd /usr/bin/xterm -C -fg white -bg black +sb -T "Console login" -e /bin/sh -c "/bin/cat /etc/issue; exec /bin/login" ++console_cmd @X11BASE@/bin/xterm -C -fg white -bg black +sb -T "Console login" -e /bin/sh -c "/bin/cat /etc/issue; exec /usr/bin/login" + #suspend_cmd /usr/sbin/suspend + + # Full path to the xauth binary +-xauth_path /usr/bin/xauth ++xauth_path @X11BASE@/bin/xauth + + # Xauth file for server + authfile /var/run/slim.auth +@@ -33,7 +34,7 @@ authfile /var/run/slim.auth + # to adjust the command according to your preferred shell, + # i.e. for freebsd use: + # login_cmd exec /bin/sh - ~/.xinitrc %session +-login_cmd exec /bin/bash -login ~/.xinitrc %session ++login_cmd exec @PREFIX@/bin/bash -login ~/.xinitrc %session + + # Commands executed when starting and exiting a session. + # They can be used for registering a X11 session with +@@ -51,7 +52,7 @@ login_cmd exec /bin/bash -logi + # The current chosen session name is replaced in the login_cmd + # above, so your login command can handle different sessions. + # see the xinitrc.sample file shipped with slim sources +-sessions xfce4,icewm-session,wmaker,blackbox ++sessions xfce4,mate,icewm-session,wmaker,blackbox + + # Executed when pressing F11 (requires imagemagick) + screenshot_cmd import -window root /slim.png --_----------=_1526655077164790--