From root@helo.liwing.de  Sun Nov  2 11:00:09 2003
Return-Path: <root@helo.liwing.de>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP
	id 0D89116A4CE; Sun,  2 Nov 2003 11:00:09 -0800 (PST)
Received: from helo.liwing.de (helo.liwing.de [213.70.188.163])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id 9D33643F3F; Sun,  2 Nov 2003 11:00:07 -0800 (PST)
	(envelope-from root@helo.liwing.de)
Received: from helo.liwing.de (localhost.liwing.de [127.0.0.1])
	by helo.liwing.de (8.12.9p2/8.12.9) with ESMTP id hA2J06Un053631;
	Sun, 2 Nov 2003 19:00:06 GMT
	(envelope-from root@helo.liwing.de)
Received: (from root@localhost)
	by helo.liwing.de (8.12.9p2/8.12.9/Submit) id hA2J06cD053630;
	Sun, 2 Nov 2003 19:00:06 GMT
	(envelope-from root)
Message-Id: <200311021900.hA2J06cD053630@helo.liwing.de>
Date: Sun, 2 Nov 2003 19:00:06 GMT
From: Jens Rehsack <rehsack@liwing.de>
Reply-To: Jens Rehsack <rehsack@liwing.de>
To: FreeBSD-gnats-submit@freebsd.org
Cc: Jens Rehsack <rehsack@liwing.de>,
	Joe Marcus Clark <marcus@freebsd.org>, gnome@freebsd.org
Subject: [PATCH] exclude possibly unrequired dependencies from x11/gnome2
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         58840
>Category:       ports
>Synopsis:       [PATCH] exclude possibly unrequired dependencies from x11/gnome2
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    gnome
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sun Nov 02 11:10:23 PST 2003
>Closed-Date:    Sun Nov 02 11:27:19 PST 2003
>Last-Modified:  Sun Nov 02 11:27:19 PST 2003
>Originator:     Jens Rehsack
>Release:        FreeBSD 5.1-CURRENT i386
>Organization:
LiWing IT-Services
>Environment:
System: FreeBSD statler 5.1-CURRENT FreeBSD 5.1-CURRENT #0: Sun Nov 2 10:59:13 GMT 2003 root@statler:/usr/obj/usr/src/sys/STATLER i386


	
>Description:
	Because of a complete rebuild of gnome2 and the ports it depends on,
	I looked at the requirements.
	- multimedia/acme is for multimedia keys on laptops with full support
	  for PowerBooks only, I don't think everybody is using it
	- net/gnomemeeting shouln't be implicit, it should be explicit
	  required, eg. as evolution
	- sysutils/gok and x11/gnopernicus may be most useful for impaired
	  people and I think it's good to be added by default. But for most
	  people without disabilities it may just a waste of compile time
	  and disk space
	All requirements will be included by default as they would before,
	but now they are deselectable.
>How-To-Repeat:
	
>Fix:

	

--- patch-really-required begins here ---
Index: x11/gnome2/Makefile
===================================================================
diff -u x11/gnome2/Makefile.orig x11/gnome2/Makefile
--- x11/gnome2/Makefile.orig	Sun Nov  2 18:41:29 2003
+++ x11/gnome2/Makefile	Sun Nov  2 18:46:54 2003
@@ -37,16 +37,25 @@
 		file-roller:${PORTSDIR}/archivers/fileroller \
 		${X11BASE}/share/themes/HighContrast/gtk-2.0/gtkrc:${PORTSDIR}/x11-toolkits/gnome-themes \
 		ggv:${PORTSDIR}/print/ggv2 \
-		acme:${PORTSDIR}/multimedia/acme \
-		gok:${PORTSDIR}/sysutils/gok \
 		gpdf:${PORTSDIR}/graphics/gpdf \
 		nautilus-cd-burner:${PORTSDIR}/sysutils/nautilus-cd-burner \
 		gcalctool:${PORTSDIR}/math/gcalctool \
 		gucharmap:${PORTSDIR}/deskutils/gucharmap \
 		zenity:${PORTSDIR}/x11/zenity \
 		gst-thumbnail:${PORTSDIR}/multimedia/nautilus-media \
-		${X11BASE}/lib/X11/fonts/bitstream-vera/Vera.ttf:${PORTSDIR}/x11-fonts/bitstream-vera \
-		gnopernicus:${PORTSDIR}/x11/gnopernicus
+		${X11BASE}/lib/X11/fonts/bitstream-vera/Vera.ttf:${PORTSDIR}/x11-fonts/bitstream-vera
+
+.ifndef WITHOUT_ACME
+RUN_DEPENDS+=	acme:${PORTSDIR}/multimedia/acme
+.endif
+
+.ifndef WITHOUT_GOK
+RUN_DEPENDS+=	gok:${PORTSDIR}/sysutils/gok \
+.endif
+
+.ifndef WITHOUT_GNOPERNICUS
+RUN_DEPENDS+=	gnopernicus:${PORTSDIR}/x11/gnopernicus
+.endif
 
 NO_BUILD=	yes
 
@@ -66,7 +75,9 @@
 .endif
 
 .if ${ARCH} == "i386"
+.ifndef WITHOUT_GNOMEMEETING
 RUN_DEPENDS+=	gnomemeeting:${PORTSDIR}/net/gnomemeeting
+.endif
 .endif
 
 .include <bsd.port.post.mk>
--- patch-really-required ends here ---


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->gnome 
Responsible-Changed-By: marcus 
Responsible-Changed-When: Sun Nov 2 11:16:41 PST 2003 
Responsible-Changed-Why:  
Over to maintainers. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=58840 
State-Changed-From-To: open->closed 
State-Changed-By: marcus 
State-Changed-When: Sun Nov 2 11:16:54 PST 2003 
State-Changed-Why:  
The list of ports included in the gnome2 meta-port is not arbitrary.  It is 
set by the GNOME release team.  Therefore, I am hesitant to change the  
meta-port.  Sure, these configurable ports are still installed by default, 
but where does the customization end?  I recommend you create your own  
meta-port for gnome2, and stick it in /usr/ports/x11  (I use gnome2-marcus). 
Then, you can track that port, and add to it only the components you want. 
In general, you will only have to worry about updating it when major GNOME 
releases come out (twice a year). 

http://www.freebsd.org/cgi/query-pr.cgi?pr=58840 
>Unformatted:
