From amdmi3@amdmi3.ru  Mon Jun 21 23:30:21 2010
Return-Path: <amdmi3@amdmi3.ru>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 9B95E1065670
	for <FreeBSD-gnats-submit@freebsd.org>; Mon, 21 Jun 2010 23:30:21 +0000 (UTC)
	(envelope-from amdmi3@amdmi3.ru)
Received: from smtp.timeweb.ru (smtp.timeweb.ru [92.53.116.15])
	by mx1.freebsd.org (Postfix) with ESMTP id 57E388FC0C
	for <FreeBSD-gnats-submit@freebsd.org>; Mon, 21 Jun 2010 23:30:21 +0000 (UTC)
Received: from [213.148.20.85] (helo=hive.panopticon)
	by smtp.timeweb.ru with esmtpsa (TLSv1:CAMELLIA256-SHA:256)
	(Exim 4.71)
	(envelope-from <amdmi3@amdmi3.ru>)
	id 1OQqRX-0000mj-Kd
	for FreeBSD-gnats-submit@freebsd.org; Tue, 22 Jun 2010 03:30:19 +0400
Received: from hades.panopticon (hades.panopticon [192.168.0.32])
	by hive.panopticon (Postfix) with ESMTP id F4049B855
	for <FreeBSD-gnats-submit@freebsd.org>; Tue, 22 Jun 2010 03:30:17 +0400 (MSD)
Received: by hades.panopticon (Postfix, from userid 1000)
	id F04A8B829; Tue, 22 Jun 2010 03:30:17 +0400 (MSD)
Message-Id: <20100621233017.F04A8B829@hades.panopticon>
Date: Tue, 22 Jun 2010 03:30:17 +0400 (MSD)
From: Dmitry Marakasov <amdmi3@FreeBSD.org>
Reply-To: Dmitry Marakasov <amdmi3@FreeBSD.org>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: bsd.port.mk: include gnome.mk for INSTALLS_ICONS
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         148051
>Category:       ports
>Synopsis:       bsd.port.mk: include gnome.mk for INSTALLS_ICONS
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    portmgr
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Mon Jun 21 23:40:00 UTC 2010
>Closed-Date:    Fri Aug 20 12:17:43 UTC 2010
>Last-Modified:  Fri Aug 20 12:20:04 UTC 2010
>Originator:     Dmitry Marakasov
>Release:        FreeBSD 8.0-RELEASE-p2 i386
>Organization:
>Environment:
System: FreeBSD hades.panopticon 8.0-RELEASE-p2 FreeBSD 8.0-RELEASE-p2 #2: Wed Jun 2 02:28:21 MSD 2010 root@hades.panopticon:/async/obj/usr/src/sys/HADES i386


>Description:
In order for INSTALLS_ICONS to work, gnome.mk should be included. This means that unless USE_GNOME is explicitely defined, one should define WANT_GNOME along with INSTALLS_ICONS, which is easy to forget and error prone, so fix bsd.port.mk to include bsd.gnome.mk if INSTALLS_ICONS is defined.
>How-To-Repeat:
>Fix:

--- bsd.port.mk.patch begins here ---
Index: bsd.port.mk
===================================================================
RCS file: /home/amdmi3/projects/freebsd/FreeBSD.cvs/ports/Mk/bsd.port.mk,v
retrieving revision 1.642
diff -u -r1.642 bsd.port.mk
--- bsd.port.mk	4 Jun 2010 08:09:17 -0000	1.642
+++ bsd.port.mk	21 Jun 2010 23:26:43 -0000
@@ -1556,7 +1556,7 @@
 .include "${PORTSDIR}/Mk/bsd.gecko.mk"
 .endif
 
-.if defined(WANT_GNOME) || defined(USE_GNOME)
+.if defined(WANT_GNOME) || defined(USE_GNOME) || defined(INSTALLS_ICONS)
 .include "${PORTSDIR}/Mk/bsd.gnome.mk"
 .endif
 
--- bsd.port.mk.patch ends here ---

>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->portmgr 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Mon Jun 21 23:40:13 UTC 2010 
Responsible-Changed-Why:  
bsd.port.mk is portmgr territory (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=148051 
State-Changed-From-To: open->closed 
State-Changed-By: pav 
State-Changed-When: Fri Aug 20 12:17:37 UTC 2010 
State-Changed-Why:  
Comitted, thanks 

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

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/148051: commit references a PR
Date: Fri, 20 Aug 2010 12:15:11 +0000 (UTC)

 pav         2010-08-20 12:15:02 UTC
 
   FreeBSD ports repository
 
   Modified files:
     Mk                   bsd.commands.mk bsd.licenses.mk 
                          bsd.port.mk 
   Log:
   - Fix plist leftovers when using LICENSE framework and having @cwd command in
     plist
   
   PR:             ports/147296
   Submitted by:   beat
   
   - Provide end-user DISABLE_LICENSES knob to disable licensing framework
   
   PR:             ports/149070
   Submitted by:   amdmi3
   
   - Include bsd.gnome.mk when INSTALLS_ICONS is defined
   
   PR:             ports/148051
   Submitted by:   amdmi3
   
   - Disable xz memory limit to fix port builds on low-memory systems
   
   PR:             ports/148250
   Submitted by:   Warren Block <wblock@wonkity.com>
   
   - Remove compatibility shim for 6.3-RELEASE and older in describe target
   
   PR:             ports/146067
   Submitted by:   Alex Kozlov <spam@rm-rf.kiev.ua>
   
   - Remove INSTALLS_SHLIB
   
   PR:             ports/146351
   Submitted by:   Alex Kozlov <spam@rm-rf.kiev.ua>
   
   - Remove last trace of APACHE_COMPAT
   
   PR:             ports/147114
   Submitted by:   pgollucci
   
   - Allow ports to override _MAKE_JOBS
   
   PR:             ports/148754
   Submitted by:   Anonymous <swell.k@gmail.com>
   
   - Fixes to comments block
   
   PR:             ports/135649, ports/148190
   Submitted by:   pgollucci, gcooper
   
   Revision  Changes    Path
   1.6       +4 -3      ports/Mk/bsd.commands.mk
   1.3       +6 -10     ports/Mk/bsd.licenses.mk
   1.644     +36 -139   ports/Mk/bsd.port.mk
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
>Unformatted:
