From owner-svn-ports-head@FreeBSD.ORG Sun Oct 6 09:09:21 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id D3184540; Sun, 6 Oct 2013 09:09:21 +0000 (UTC) (envelope-from lme@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id BFEEA2FA1; Sun, 6 Oct 2013 09:09:21 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9699Lkn021785; Sun, 6 Oct 2013 09:09:21 GMT (envelope-from lme@svn.freebsd.org) Received: (from lme@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9699LrB021783; Sun, 6 Oct 2013 09:09:21 GMT (envelope-from lme@svn.freebsd.org) Message-Id: <201310060909.r9699LrB021783@svn.freebsd.org> From: Lars Engels Date: Sun, 6 Oct 2013 09:09:21 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r329541 - head/x11/slim X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 06 Oct 2013 09:09:22 -0000 Author: lme Date: Sun Oct 6 09:09:21 2013 New Revision: 329541 URL: http://svnweb.freebsd.org/changeset/ports/329541 Log: - Enable PAM support by default [1] - Support staging - Use new LIB_DEPENDS syntax PR: ports/182533 [1] Approved by: maintainer Modified: head/x11/slim/Makefile head/x11/slim/pkg-plist (contents, props changed) Modified: head/x11/slim/Makefile ============================================================================== --- head/x11/slim/Makefile Sun Oct 6 09:08:22 2013 (r329540) +++ head/x11/slim/Makefile Sun Oct 6 09:09:21 2013 (r329541) @@ -3,6 +3,7 @@ PORTNAME= slim PORTVERSION= 1.3.5 +PORTREVISION= 1 CATEGORIES= x11 MASTER_SITES= ftp://ftp.berlios.de/pub/slim/ \ SF/slim.berlios @@ -12,14 +13,14 @@ COMMENT= Graphical login manager for X11 LICENSE= GPLv2 -LIB_DEPENDS= dbus-1:${PORTSDIR}/devel/dbus \ - pthread-stubs:${PORTSDIR}/devel/libpthread-stubs \ - jpeg:${PORTSDIR}/graphics/jpeg \ - png15:${PORTSDIR}/graphics/png \ - freetype:${PORTSDIR}/print/freetype2 \ - ck-connector:${PORTSDIR}/sysutils/consolekit \ - expat:${PORTSDIR}/textproc/expat2 \ - fontconfig:${PORTSDIR}/x11-fonts/fontconfig +LIB_DEPENDS= libdbus-1.so:${PORTSDIR}/devel/dbus \ + libpthread-stubs.so:${PORTSDIR}/devel/libpthread-stubs \ + libjpeg.so:${PORTSDIR}/graphics/jpeg \ + libpng15.so:${PORTSDIR}/graphics/png \ + libfreetype.so:${PORTSDIR}/print/freetype2 \ + libck-connector.so:${PORTSDIR}/sysutils/consolekit \ + libexpat.so:${PORTSDIR}/textproc/expat2 \ + libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig USES= cmake pkgconfig USE_XORG= ice sm x11 xau xcb xdmcp xext xft xmu xorg-server xrender xt @@ -28,11 +29,9 @@ SUB_FILES= pkg-message CMAKE_ARGS= -DUSE_CONSOLEKIT=yes -MAN1= slim.1 +OPTIONS_DEFINE= PAM +OPTIONS_DEFAULT= PAM -OPTIONS_DEFINE= PAM - -NO_STAGE= yes .include .if ${PORT_OPTIONS:MPAM} @@ -55,15 +54,8 @@ post-patch: ${WRKSRC}/CMakeLists.txt post-install: - @if [ ! -f ${PREFIX}/etc/slim.conf ]; then \ - ${CP} ${PREFIX}/etc/slim.conf.sample ${PREFIX}/etc/slim.conf ; \ - fi . if ${PORT_OPTIONS:MPAM} - @${INSTALL_DATA} ${FILESDIR}/pam.conf ${PREFIX}/etc/pam.d/slim.default - @if [ ! -f ${PREFIX}/etc/pam.d/slim ]; then \ - ${CP} ${PREFIX}/etc/pam.d/slim.default ${PREFIX}/etc/pam.d/slim ; \ - fi + ${INSTALL_DATA} ${FILESDIR}/pam.conf ${STAGEDIR}${PREFIX}/etc/pam.d/slim.default . endif - @${CAT} ${PKGMESSAGE} .include Modified: head/x11/slim/pkg-plist ============================================================================== --- head/x11/slim/pkg-plist Sun Oct 6 09:08:22 2013 (r329540) +++ head/x11/slim/pkg-plist Sun Oct 6 09:09:21 2013 (r329541) @@ -2,12 +2,13 @@ bin/slim %%DATADIR%%/themes/default/background.jpg %%DATADIR%%/themes/default/panel.png %%DATADIR%%/themes/default/slim.theme -@dirrm %%DATADIR%%/themes/default +man/man1/slim.1.gz +@dirrmtry %%DATADIR%%/themes/default @dirrmtry %%DATADIR%%/themes @dirrmtry %%DATADIR%% -@unexec if cmp -s %D/etc/slim.conf.sample %D/etc/slim.conf; then rm -f %D/etc/slim.conf; fi +@unexec if cmp -s %D/etc/slim.conf.sample %D/etc/slim.conf ; then rm -f %D/etc/slim.conf ; fi etc/slim.conf.sample -@exec if [ ! -f %D/etc/slim.conf ] ; then cp -p %D/%F %B/slim.conf; fi -%%PAM%%@unexec if cmp -s %D/etc/pam.d/slim.default %D/etc/pam.d/slim; then rm -f %D/etc/pam.d/slim ; fi +@exec if [ ! -f %D/etc/slim.conf ]; then cp -p %D/%F %B/slim .conf; fi +%%PAM%%@unexec if cmp -s %D/etc/pam.d/slim.default %D/etc/pam.d/slim ; then rm -f %D/etc/pam.d/slim ; fi %%PAM%%etc/pam.d/slim.default -%%PAM%%@exec if [ ! -f %D/etc/pam.d/slim ] ; then cp -p %D/%F %B/slim; fi +%%PAM%%@exec if [ ! -f %D/etc/pam.d/slim ]; then cp -p %D/%F %B/pam.d/slim fi