From owner-svn-ports-head@FreeBSD.ORG Sun Oct 6 15:51:29 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 87A4B71E; Sun, 6 Oct 2013 15:51:29 +0000 (UTC) (envelope-from h.skuhra@gmail.com) Received: from mail-ea0-x232.google.com (mail-ea0-x232.google.com [IPv6:2a00:1450:4013:c01::232]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id A08C52129; Sun, 6 Oct 2013 15:51:28 +0000 (UTC) Received: by mail-ea0-f178.google.com with SMTP id a15so2736970eae.37 for ; Sun, 06 Oct 2013 08:51:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=date:message-id:from:to:cc:subject:in-reply-to:references :user-agent:mime-version:content-type; bh=EUkUECDKTkRr0iIS8cpCQ2hNWP51Fat4buTTCRNRqh4=; b=aFp0Ej13p3iL2mdb+v9aBCmOeXRGDVVvgKJnwxnNgbFiquaE0YNcE4mnNnSeKfEMiW i9zFKvOqfFwVdxi8j3/hnCfERuZR6lBXflDYT02NfLv97n9dlNBCs8GmeQr8wZ1t8NxQ ZU2H/ORzc+6g2MP4SIrZourebimRhiXYkwvKbPhIxHRhp7zUZQ+5BxWVhVG87UwNNxIb W2Qv03l/AyIsEf4ZMDwATNPtHxq5tN5f3nAp7EJCA2pOa28cj+vluAx3g65qaCHx9DmZ JjBXazZkvJAuSYcHQr4J9ftzpDtro868e8cPoVmka+1CGgWYCCuT6ayyZtC8+hlOt79p nDIA== X-Received: by 10.15.100.198 with SMTP id bn46mr40344713eeb.11.1381074686957; Sun, 06 Oct 2013 08:51:26 -0700 (PDT) Received: from oslo.ath.cx ([2001:470:6f:44d:ed27:ff57:fefe:f3e7]) by mx.google.com with ESMTPSA id a6sm52485484eei.10.1969.12.31.16.00.00 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Sun, 06 Oct 2013 08:51:26 -0700 (PDT) Date: Sun, 06 Oct 2013 17:51:24 +0200 Message-ID: <86k3hqv1mr.wl%h.skuhra@gmail.com> From: "Herbert J. Skuhra" To: Lars Engels Subject: Re: svn commit: r329541 - head/x11/slim In-Reply-To: <201310060909.r9699LrB021783@svn.freebsd.org> References: <201310060909.r9699LrB021783@svn.freebsd.org> User-Agent: Wanderlust/2.15.9 (Almost Unreal) SEMI-EPG/1.14.7 (Harue) FLIM/1.14.9 (=?ISO-8859-4?Q?Goj=F2?=) APEL/10.8 EasyPG/1.0.0 Emacs/24.3.50 (i386-pc-freebsd9.2) MULE/6.0 (HANACHIRUSATO) MIME-Version: 1.0 (generated by SEMI-EPG 1.14.7 - "Harue") Content-Type: text/plain; charset=US-ASCII Cc: svn-ports-head@freebsd.org, svn-ports-all@freebsd.org, ports-committers@freebsd.org 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 15:51:29 -0000 On Sun, 6 Oct 2013 09:09:21 +0000 (UTC) Lars Engels wrote: > 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) This commit obviously breaks the pkg-plist: --- pkg-plist (revision 329550) +++ pkg-plist (working copy) @@ -8,7 +8,7 @@ @dirrmtry %%DATADIR%% @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 +@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/pam.d/slim fi +%%PAM%%@exec if [ ! -f %D/etc/pam.d/slim ]; then cp -p %D/%F %B/slim ; fi -- Herbert