From owner-freebsd-gnome@FreeBSD.ORG Thu Jul 31 02:17:42 2008 Return-Path: Delivered-To: gnome@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id BD0D51065671 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.157]) by mx1.freebsd.org (Postfix) with ESMTP id 538FC8FC16 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 l26so344327fgb.35 for ; Wed, 30 Jul 2008 19:17:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:received:date:to:subject:from :cc:x-send-pr-version:x-gnats-notify:sender:message-id; bh=JAnADIBu1KigRLvIJjcbThyh4hMp4HPzj4xiCIrE/+M=; b=ksgkWblZ4zU1r8ppHJWiTPLS/rpkwtVkh/1An9AREbRKUTKwsvFY3e9TF99pOOhepM 44jGZyi3DJU/wlp8xjrHcixkozWC2XieEgKlUGtKG8F/SmnrSDl1Md2TczUx5JkZjYVN 5VK2ethcDGy1PYFCzBS72Y8RzpTfldSjWd9SU= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=date:to:subject:from:cc:x-send-pr-version:x-gnats-notify:sender :message-id; b=ndHknOfxpH5ytNnls9z5dM+qLFX5DriDGnR4h7wpErn0QgqSmOtc9yaCpdU1a63dqo Fe7FBC/pf0maLmOgjZkVekhn6NtzmPm2F6RuTnX4/CEgtY0NKEDJvMfVuGEAkutL/Ld3 6Fpgn1+ukkcI/j05VNUz3/CCP2uqSwMPDEGZ8= 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 Date: Thu, 31 Jul 2008 04:17:36 +0200 To: FreeBSD-gnats-submit@freebsd.org From: Marcin Wisnicki X-send-pr-version: 3.113 X-GNATS-Notify: Sender: =?UTF-8?B?TWFyY2luIFdpxZtuaWNraQ==?= Message-ID: <489120c3.0305560a.3fa7.7fcb@mx.google.com> Cc: gnome@FreeBSD.org Subject: [PATCH] x11/xscreensaver-gnome: [SUMMARIZE CHANGES] X-BeenThere: freebsd-gnome@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: GNOME for FreeBSD -- porting and maintaining List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 31 Jul 2008 02:17:42 -0000 >Submitter-Id: current-users >Originator: Marcin Wisnicki >Organization: >Confidential: no >Synopsis: [PATCH] x11/xscreensaver-gnome: [SUMMARIZE CHANGES] >Severity: non-critical >Priority: low >Category: ports >Class: change-request >Release: FreeBSD 7.0-STABLE i386 >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 ---