ports/115677: [PATCH] Don't depend on XPM for graphics/php5-gd

[Xin LI]

>Number:         115677
>Category:       ports
>Synopsis:       [PATCH] Don't depend on XPM for graphics/php5-gd
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Tue Aug 21 09:10:08 GMT 2007
>Closed-Date:
>Last-Modified:
>Originator:     Xin LI
>Release:        FreeBSD 6.2-RELEASE-p7 i386
>Organization:
The FreeBSD Project
>Environment:
System: FreeBSD tarsier.delphij.net 6.2-RELEASE-p7 FreeBSD 6.2-RELEASE-p7 #5: Thu Aug 2 22:09:50 CST 2007 delphij at tarsier.delphij.net:/usr/obj/usr/src/sys/TARSIER i386


>Description:
	The php5-gd extension depends on XPM by default, while
	graphics/gd does not.

	With this inconsistency, php5-gd extension would install
	XPM, while it does not actually use it.
>How-To-Repeat:
	cd /usr/ports/graphics/php5-gd
	make -V LIB_DEPENDS | grep --color Xpm.4

	cd /usr/ports/graphics/gd
	make -V LIB_DEPENDS | grep --color Xpm.4
>Fix:
	This is not a perfect solution, it simply utilize the flags
	that is employed by gd to distinguish whether we wanted XPM;
	a more better way might be to use gdlib-config --features,
	but that would be very slow, and we really need to take care
	about whether we have XPM feature installed.

--- patch-php5-gd begins here ---
Index: Makefile.ext
===================================================================
RCS file: /home/ncvs/ports/lang/php5/Makefile.ext,v
retrieving revision 1.46
diff -u -p -r1.46 Makefile.ext
--- Makefile.ext	25 Jul 2007 07:19:18 -0000	1.46
+++ Makefile.ext	21 Aug 2007 08:53:45 -0000
@@ -86,7 +86,7 @@ USE_OPENSSL=	yes
 LIB_DEPENDS=	freetype.9:${PORTSDIR}/print/freetype2 \
 		png.5:${PORTSDIR}/graphics/png \
 		jpeg.9:${PORTSDIR}/graphics/jpeg
-.	if !defined(WITHOUT_X11)
+.	if !defined(WITHOUT_X11) && defined(WITH_XPM)
 USE_XPM=	yes
 .	endif
 
@@ -95,7 +95,7 @@ CONFIGURE_ARGS+=--with-gd \
 		--with-jpeg-dir=${LOCALBASE} \
 		--with-png-dir=${LOCALBASE} \
 		--with-zlib-dir=/usr
-.	if !defined(WITHOUT_X11)
+.	if !defined(WITHOUT_X11) && defined(WITH_XPM)
 CONFIGURE_ARGS+=--with-xpm-dir=${X11BASE}
 .	endif
 
--- patch-php5-gd ends here ---


>Release-Note:
>Audit-Trail:
>Unformatted: