ports/109738: [maintainer-update] x11-toolkit/php-gtk. Fixed build with scintilla, gtkhtml options support

[Alexander Zhuravlev]

>Number:         109738
>Category:       ports
>Synopsis:       [maintainer-update] x11-toolkit/php-gtk. Fixed build with scintilla, gtkhtml options support
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Fri Mar 02 00:30:03 GMT 2007
>Closed-Date:
>Last-Modified:
>Originator:     Alexander Zhuravlev
>Release:        FreeBSD 5.5-STABLE i386
>Organization:
>Environment:
System: FreeBSD kernel.ulstu.ru 5.5-STABLE FreeBSD 5.5-STABLE #1: Thu Nov 30 14:54:29 MSK 2006 root at kernel.ulstu.ru:/usr/obj/usr/src/sys/KERNEL-s i386


	
>Description:
	
	php-gtk port fails to build when scintilla or gtkhtml option is enabled.

>How-To-Repeat:
	
>Fix:

	Please apply the patch.

--- php-gtk.diff begins here ---
diff -urbBN php-gtk.orig/Makefile php-gtk/Makefile
--- php-gtk.orig/Makefile	Sat Feb 24 13:43:21 2007
+++ php-gtk/Makefile	Fri Mar  2 03:11:14 2007
@@ -7,7 +7,7 @@
 
 PORTNAME=	php-gtk
 PORTVERSION=	1.0.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	http://gtk.php.net/distributions/ \
 		http://document-root.de/mirror/php-gtk/
@@ -50,7 +50,7 @@
 .endif
 
 .if !defined(WITHOUT_SCINTILLA)
-BUILD_DEPENDS+=	${X11BASE}/include/scintilla/gtkscintilla.h:${PORTSDIR}/x11-toolkits/gtkscintilla
+BUILD_DEPENDS+=	${PREFIX}/include/scintilla/gtkscintilla.h:${PORTSDIR}/x11-toolkits/gtkscintilla
 LIB_DEPENDS+=	gtkscintilla.0:${PORTSDIR}/x11-toolkits/gtkscintilla
 ENVSCE+=	-DHAVE_SCINTILLA=1 # -DPHP_GTK_COMPILE_DL_SCINTILLA=1
 CONFIGURE_ARGS+=	--enable-scintilla
@@ -68,7 +68,7 @@
 .if !defined(WITHOUT_GTKHTML)
 USE_GNOME+=	gtkhtml
 CONFIGURE_ARGS+=	--enable-gtkhtml
-ENVSCE+=	-DHAVE_HTML=1 -I${X11BASE}/include/gal-1.0 # -DPHP_GTK_COMPILE_DL_GTKHTML=1 -DGTKHTML_HAVE_GCONF=1 -I${X11BASE}/include/gal-1.0
+ENVSCE+=	-DHAVE_HTML=1 -I${PREFIX}/include/gal-1.0 # -DPHP_GTK_COMPILE_DL_GTKHTML=1 -DGTKHTML_HAVE_GCONF=1 -I${X11BASE}/include/gal-1.0
 PLIST_SUB+=	GTKHTML=""
 .else
 PLIST_SUB+=	GTKHTML="@comment "
diff -urbBN php-gtk.orig/files/patch-ext_scintilla-config.m4 php-gtk/files/patch-ext_scintilla-config.m4
--- php-gtk.orig/files/patch-ext_scintilla-config.m4	Fri Jul 11 06:13:18 2003
+++ php-gtk/files/patch-ext_scintilla-config.m4	Fri Mar  2 01:10:07 2007
@@ -6,7 +6,7 @@
  if test "$PHP_GTK_SCINTILLA" != "no"; then
 -  for x in /usr /usr/local; do
 -	  if test -f $x/include/gtkscintilla.h; then
-+  for x in /usr/include /usr/local/include /usr/X11R6/include/scintilla; do
++  for x in /usr/include /usr/local/include /usr/local/include/scintilla /usr/X11R6/include/scintilla; do
 +	  if test -f $x/gtkscintilla.h; then
  		  SCINTILLA_DIR=$x
 -		  SCINTILLA_INCDIR=$x/include
--- php-gtk.diff ends here ---


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