From nobody@FreeBSD.org  Tue Oct  1 04:20:50 2013
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
	(using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by hub.freebsd.org (Postfix) with ESMTP id 2352E467
	for <freebsd-gnats-submit@FreeBSD.org>; Tue,  1 Oct 2013 04:20:50 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from oldred.freebsd.org (oldred.freebsd.org [8.8.178.121])
	(using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by mx1.freebsd.org (Postfix) with ESMTPS id 118582A23
	for <freebsd-gnats-submit@FreeBSD.org>; Tue,  1 Oct 2013 04:20:50 +0000 (UTC)
Received: from oldred.freebsd.org ([127.0.1.6])
	by oldred.freebsd.org (8.14.5/8.14.7) with ESMTP id r914Kna7028081
	for <freebsd-gnats-submit@FreeBSD.org>; Tue, 1 Oct 2013 04:20:49 GMT
	(envelope-from nobody@oldred.freebsd.org)
Received: (from nobody@localhost)
	by oldred.freebsd.org (8.14.5/8.14.5/Submit) id r914KnC0028064;
	Tue, 1 Oct 2013 04:20:49 GMT
	(envelope-from nobody)
Message-Id: <201310010420.r914KnC0028064@oldred.freebsd.org>
Date: Tue, 1 Oct 2013 04:20:49 GMT
From: Henry Hu <henry.hu.sh@gmail.com>
To: freebsd-gnats-submit@FreeBSD.org
Subject: [maintainer update] x11/slim: enable PAM by default
X-Send-Pr-Version: www-3.1
X-GNATS-Notify:

>Number:         182533
>Category:       ports
>Synopsis:       [maintainer update] x11/slim: enable PAM by default
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    lme
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Tue Oct 01 04:30:00 UTC 2013
>Closed-Date:    Sun Oct 06 09:09:44 UTC 2013
>Last-Modified:  Sun Oct  6 09:10:00 UTC 2013
>Originator:     Henry Hu
>Release:        FreeBSD 10-CURRENT
>Organization:
Columbia University
>Environment:
FreeBSD pepsi 10.0-CURRENT FreeBSD 10.0-CURRENT #1 r255532M: Sat Sep 14 17:30:47 PDT 2013     root@pepsi:/usr/obj/usr/src/sys/MYKERNEL  amd64

>Description:
Enable PAM by default for x11/slim.
Some users use pre-compiled packages and want PAM support.
This does not add new dependencies.
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

Index: x11/slim/Makefile
===================================================================
--- x11/slim/Makefile	(版本 328316)
+++ x11/slim/Makefile	(工作副本)
@@ -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
@@ -31,6 +32,7 @@
 MAN1=		slim.1
 
 OPTIONS_DEFINE=	PAM
+OPTIONS_DEFAULT=	PAM
 
 NO_STAGE=	yes
 .include <bsd.port.options.mk>


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->lme 
Responsible-Changed-By: lme 
Responsible-Changed-When: Sun Oct 6 09:03:59 UTC 2013 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=182533 
State-Changed-From-To: open->closed 
State-Changed-By: lme 
State-Changed-When: Sun Oct 6 09:09:43 UTC 2013 
State-Changed-Why:  
Committed. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=182533 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/182533: commit references a PR
Date: Sun,  6 Oct 2013 09:09:29 +0000 (UTC)

 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 <bsd.port.options.mk>
  
  .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 <bsd.port.mk>
 
 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
 _______________________________________________
 svn-ports-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-ports-all
 To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
 
>Unformatted:
