ports/58840: [PATCH] exclude possibly unrequired dependencies from x11/gnome2

[Jens Rehsack]

>Number:         58840
>Category:       ports
>Synopsis:       [PATCH] exclude possibly unrequired dependencies from x11/gnome2
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sun Nov 02 11:10:23 PST 2003
>Closed-Date:
>Last-Modified:
>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 at 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:
>Unformatted: