From owner-freebsd-ports-bugs@FreeBSD.ORG Wed Jan 4 02:40:10 2012 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 8BD62106566C for ; Wed, 4 Jan 2012 02:40:10 +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 10B2E8FC0A for ; Wed, 4 Jan 2012 02:40:10 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.5/8.14.5) with ESMTP id q042e9rh031172 for ; Wed, 4 Jan 2012 02:40:09 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.5/8.14.5/Submit) id q042e9GY031171; Wed, 4 Jan 2012 02:40:09 GMT (envelope-from gnats) Resent-Date: Wed, 4 Jan 2012 02:40:09 GMT Resent-Message-Id: <201201040240.q042e9GY031171@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, "A.J. Kehoe IV (Nanoman)" Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 5DBC71065670 for ; Wed, 4 Jan 2012 02:37:51 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from red.freebsd.org (red.freebsd.org [IPv6:2001:4f8:fff6::22]) by mx1.freebsd.org (Postfix) with ESMTP id 2E5858FC1A for ; Wed, 4 Jan 2012 02:37:51 +0000 (UTC) Received: from red.freebsd.org (localhost [127.0.0.1]) by red.freebsd.org (8.14.4/8.14.4) with ESMTP id q042boHv032079 for ; Wed, 4 Jan 2012 02:37:50 GMT (envelope-from nobody@red.freebsd.org) Received: (from nobody@localhost) by red.freebsd.org (8.14.4/8.14.4/Submit) id q042bolM032078; Wed, 4 Jan 2012 02:37:50 GMT (envelope-from nobody) Message-Id: <201201040237.q042bolM032078@red.freebsd.org> Date: Wed, 4 Jan 2012 02:37:50 GMT From: "A.J. Kehoe IV (Nanoman)" To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Cc: Subject: ports/163807: print/libgnomeprint CUPS Option Patch 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: Wed, 04 Jan 2012 02:40:10 -0000 >Number: 163807 >Category: ports >Synopsis: print/libgnomeprint CUPS Option Patch >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: Wed Jan 04 02:40:09 UTC 2012 >Closed-Date: >Last-Modified: >Originator: A.J. Kehoe IV (Nanoman) >Release: 8.2 >Organization: Nanoman's Company >Environment: FreeBSD localhost 8.2-RELEASE-p3 FreeBSD 8.2-RELEASE-p3 #0: Tue Sep 27 18:07:27 UTC 2011 root@i386-builder.daemonology.net:/usr/obj/usr/src/sys/GENERIC i386 >Description: After running "make config" recursively for a port that depends on print/libgnomeprint, creating an index of the ports tree will produce varying results depending on whether or not CUPS is installed at the time the index is created. This conflicts with the conventional behaviour of the FreeBSD Ports Collection, and causes problems for ports management scripts. >How-To-Repeat: 1. Run "make config" recursively for a port that depends on print/libgnomeprint, and use the default options for each port. 2. Create an index of the ports tree. 3. Run "make install" for the port from step #1. 4. Create another index of the ports tree. You'll notice that the index created in step #2 differs from the index created in step #4. >Fix: In ports/print/libgnomeprint/Makefile, replace the current CUPS detection method with the "OPTIONS" variable. This also eliminates the need for the notice in "pre-everything". I've attached a patch with the fix I'm using. Patch attached with submission follows: --- ports/print/libgnomeprint/Makefile.old 2011-09-23 18:25:01.000000000 -0400 +++ ports/print/libgnomeprint/Makefile 2012-01-03 21:21:21.967862000 -0500 @@ -36,9 +36,11 @@ PLIST_SUB= VERSION=${PORTVERSION} \ LIBVERSION=2.2 +OPTIONS= CUPS "Enable CUPS support" on + .include -.if (defined(WITH_CUPS) || exists(${LOCALBASE}/lib/libcups.so)) && !defined(WITHOUT_CUPS) +.if defined(WITH_CUPS) && !defined(WITHOUT_CUPS) CONFIGURE_ARGS+= --with-cups LIB_DEPENDS+= gnomecups-1.0:${PORTSDIR}/print/libgnomecups PLIST_SUB+= CUPS:="" @@ -47,13 +49,6 @@ PLIST_SUB+= CUPS:="@comment " .endif -pre-everything:: -.if !defined(WITH_CUPS) - @${ECHO_MSG} " Enable cups support by defining" - @${ECHO_MSG} " WITH_CUPS" - @${ECHO_MSG} "" -.endif - post-patch: @${FIND} ${WRKSRC} -name '*.[ch]' | ${XARGS} ${REINPLACE_CMD} -e \ 's|||' >Release-Note: >Audit-Trail: >Unformatted: