From owner-freebsd-ports-bugs@FreeBSD.ORG Thu Jul 31 02:20:02 2008 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A64211065674 for ; Thu, 31 Jul 2008 02:20:02 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 812268FC0A for ; Thu, 31 Jul 2008 02:20:02 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.14.2/8.14.2) with ESMTP id m6V2K2o4041265 for ; Thu, 31 Jul 2008 02:20:02 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.2/8.14.1/Submit) id m6V2K23a041264; Thu, 31 Jul 2008 02:20:02 GMT (envelope-from gnats) Resent-Date: Thu, 31 Jul 2008 02:20:02 GMT Resent-Message-Id: <200807310220.m6V2K23a041264@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Marcin Wisnicki Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C63A31065674 for ; Thu, 31 Jul 2008 02:17:42 +0000 (UTC) (envelope-from mwisnicki@gmail.com) Received: from fg-out-1718.google.com (fg-out-1718.google.com [72.14.220.156]) by mx1.freebsd.org (Postfix) with ESMTP id 58B848FC18 for ; Thu, 31 Jul 2008 02:17:42 +0000 (UTC) (envelope-from mwisnicki@gmail.com) Received: by fg-out-1718.google.com with SMTP id l26so344326fgb.35 for ; Wed, 30 Jul 2008 19:17:41 -0700 (PDT) Received: by 10.86.31.19 with SMTP id e19mr5541819fge.42.1217470660469; Wed, 30 Jul 2008 19:17:40 -0700 (PDT) Received: from ghost.pnet.one.pl ( [84.40.242.20]) by mx.google.com with ESMTPS id 3sm2095562fge.3.2008.07.30.19.17.38 (version=TLSv1/SSLv3 cipher=RC4-MD5); Wed, 30 Jul 2008 19:17:39 -0700 (PDT) Received: by ghost.pnet.one.pl (sSMTP sendmail emulation); Thu, 31 Jul 2008 04:17:36 +0200 Message-Id: <489120c3.0305560a.3fa7.7fcb@mx.google.com> Date: Thu, 31 Jul 2008 04:17:36 +0200 From: Marcin Wisnicki Sender: =?UTF-8?B?TWFyY2luIFdpxZtuaWNraQ==?= To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: gnome@FreeBSD.org Subject: ports/126114: [PATCH] x11/xscreensaver-gnome: [SUMMARIZE CHANGES] X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 31 Jul 2008 02:20:02 -0000 >Number: 126114 >Category: ports >Synopsis: [PATCH] x11/xscreensaver-gnome: [SUMMARIZE CHANGES] >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Thu Jul 31 02:20:01 UTC 2008 >Closed-Date: >Last-Modified: >Originator: Marcin Wisnicki >Release: FreeBSD 7.0-STABLE i386 >Organization: >Environment: System: FreeBSD ghost.pnet.one.pl 7.0-STABLE FreeBSD 7.0-STABLE #15: Fri Jul 25 18:16:53 CEST 2008 >Description: - mention dependency of KEYRING on PAM in its description - force PAM when KEYRING is enabled - remove .warning that confuses portupgrade Port maintainer (gnome@FreeBSD.org) is cc'd. Generated with FreeBSD Port Tools 0.77 >How-To-Repeat: >Fix: --- xscreensaver-gnome-5.06_1.patch begins here --- diff -ruN --exclude=CVS /usr/ports/x11/xscreensaver-gnome.orig/Makefile /usr/ports/x11/xscreensaver-gnome/Makefile --- /usr/ports/x11/xscreensaver-gnome.orig/Makefile 2008-07-27 22:21:19.000000000 +0200 +++ /usr/ports/x11/xscreensaver-gnome/Makefile 2008-07-31 04:13:38.000000000 +0200 @@ -37,7 +37,7 @@ LDFLAGS="-L${LOCALBASE}/lib" OPTIONS?= PAM "Pluggable Authentication Module support" on \ - KEYRING "Enable GnomeKeyring/PAM integration" on \ + KEYRING "Enable GnomeKeyring integration (needs PAM)" on \ ALL_FORTUNES "Enable support for all fortunes" off \ SETUID_HACKS "Install sonar hack suid so it can ping" off @@ -90,22 +90,20 @@ CONFIGURE_ARGS+= --with-fortune="/usr/games/fortune -sa" .endif -.if defined(WITH_PAM) +.if defined(WITH_PAM) || defined(WITH_KEYRING) CONFIGURE_ARGS+= --with-pam PLIST_SUB+= PAM="" +.else +CONFIGURE_ARGS+= --without-pam +PLIST_SUB+= PAM="@comment " +.endif + .if defined(WITH_KEYRING) SUB_LIST+= PAM_KEYRING= RUN_DEPENDS+= ${LOCALBASE}/lib/pam_gnome_keyring.so:${PORTSDIR}/security/gnome-keyring .else SUB_LIST+= PAM_KEYRING=\# .endif -.else -CONFIGURE_ARGS+= --without-pam -PLIST_SUB+= PAM="@comment " -.if defined(WITH_KEYRING) -.warning Option KEYRING needs PAM, but PAM is disabled. -.endif -.endif .if defined(WITH_SETUID_HACKS) CONFIGURE_ARGS+= --with-setuid-hacks --- xscreensaver-gnome-5.06_1.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: