ports/59074: [MAINTAINER-UPDATE] Update php-gtk to 1.0.0, fix conflicts

Sun Nov 9 10:40:22 UTC 2003

>Number:         59074
>Category:       ports
>Synopsis:       [MAINTAINER-UPDATE] Update php-gtk to 1.0.0, fix conflicts
>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:   Sun Nov 09 02:40:09 PST 2003
>Closed-Date:
>Last-Modified:
>Originator:     Alex Kiesel
>Release:        FreeBSD 4.8-RELEASE i386
>Organization:
>Environment:
System: FreeBSD alex.i.schlund.de 4.8-RELEASE FreeBSD 4.8-RELEASE #0: Fri Apr 11 16:29:20 CEST 2003 root at alex.i.schlund.de:/usr/obj/usr/src/sys/KNORKE i386


	
>Description:
    This pr fixes the bento build errors (caused by conflicting dependencies) and updates the php-gtk
    port to the new stable release.
	
>How-To-Repeat:
	
>Fix:
    Apply the attached patch _and_ remove files/patch-ext_combobutton_combobutton.defs

--- phpgtk.diff begins here ---
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/x11-toolkits/php-gtk/Makefile,v
retrieving revision 1.9
diff -u -r1.9 Makefile
--- Makefile	3 Nov 2003 03:56:42 -0000	1.9
+++ Makefile	9 Nov 2003 10:25:03 -0000
@@ -2,12 +2,11 @@
 # Date created: 	03 October 2002
 # Whom: 		Alex Kiesel <kiesel at schlund.de>
 #
-# $FreeBSD$
+# $FreeBSD: ports/x11-toolkits/php-gtk/Makefile,v 1.7 2003/07/11 02:13:17 nork Exp $
 #
 
 PORTNAME=	php-gtk
-PORTVERSION=	0.5.2
-PORTREVISION=	3
+PORTVERSION=	1.0.0
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	http://gtk.php.net/distributions/ \
 		http://document-root.de/mirror/php-gtk/
@@ -15,22 +14,11 @@
 MAINTAINER=	kiesel at schlund.de
 COMMENT=	An extension to use gtk in PHP-applications
 
-BROKEN=		"Conflicting dependencies: php4-cli and php4; will be removed after Feb 2"
-
-.include <bsd.port.pre.mk>
-.include "${.CURDIR}/../../lang/php4/bsd.php.mk"
-
-# Port does only build with automake-1.4 and
-# automake-1.5 installed - what a mess
-BUILD_DEPENDS=	automake:${PORTSDIR}/devel/automake \
-		automake14:${PORTSDIR}/devel/automake14 \
-		autoconf:${PORTSDIR}/devel/autoconf \
-		autoconf213:${PORTSDIR}/devel/autoconf213 \
-		php:${PORTSDIR}/lang/php4-cli
-
 # Don't call autoconf directly, ./buildconf does this
 GNU_CONFIGURE=	yes
 USE_LIBTOOL=	yes
+WANT_AUTOMAKE_VER=	15
+WANT_AUTOCONF_VER=	253
 LIBTOOLFILES=	# none
 WANT_PHP_CLI=	yes
 USE_PHPIZE=	yes
@@ -38,6 +26,10 @@
 USE_GMAKE=	yes
 USE_PERL5_BUILD=yes
 USE_GNOME=	gtk12
+INSTALLS_SHLIB=	yes
+
+.include <bsd.port.pre.mk>
+.include "${.CURDIR}/../../lang/php4/bsd.php.mk"
 
 # Fix environment for self contained extensions
 ENVSCE=		-DHAVE_PHP_GTK=1 -DCOMPILE_DL_PHP_GTK=1	\
@@ -74,14 +66,14 @@
 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
-PLIST_SUB+=     GTKHTML=""
+PLIST_SUB+=	GTKHTML=""
 .else
 PLIST_SUB+=	GTKHTML="@comment "
 .endif
 
 PLIST_SUB+=	PHPEXTDIR="${PHP_EXT_DIR}"
 
-CONFIGURE_ENV=  CPPFLAGS="${ENVSCE}"
+CONFIGURE_ENV=	CPPFLAGS="${ENVSCE}"
 
 USE_REINPLACE=	yes
 REINPLACE_ARGS=	-i ""
Index: distinfo
===================================================================
RCS file: /home/ncvs/ports/x11-toolkits/php-gtk/distinfo,v
retrieving revision 1.1
diff -u -r1.1 distinfo
--- distinfo	1 Apr 2003 23:06:02 -0000	1.1
+++ distinfo	9 Nov 2003 10:25:03 -0000
@@ -1 +1 @@
-MD5 (php-gtk-0.5.2.tar.gz) = 91e18da45272b5b084e90201f95dfefa
+MD5 (php-gtk-1.0.0.tar.gz) = 38d9d124f0478e2bf4fd059ea58df0f3
Index: pkg-message
===================================================================
RCS file: /home/ncvs/ports/x11-toolkits/php-gtk/pkg-message,v
retrieving revision 1.2
diff -u -r1.2 pkg-message
--- pkg-message	11 Jul 2003 02:13:17 -0000	1.2
+++ pkg-message	9 Nov 2003 10:25:03 -0000
@@ -1,7 +1,7 @@
 The port has now been installed. Be sure to adjust the config-file
-in e.g. /usr/local/etc/php.gtk/php.ini.
+in e.g. ${PREFIX}/etc/php.gtk/php.ini.
 Eventually, you must set the correct 'extension_dir'-path in php.ini.
 
 For convenience put something like
-"alias gtkphp='php -c /usr/local/etc/php.gtk/'"
+"alias gtkphp='php -c ${PREFIX}/etc/php.gtk/'"
 in your .profile.
Index: pkg-plist
===================================================================
RCS file: /home/ncvs/ports/x11-toolkits/php-gtk/pkg-plist,v
retrieving revision 1.3
diff -u -r1.3 pkg-plist
--- pkg-plist	11 Jul 2003 02:13:17 -0000	1.3
+++ pkg-plist	9 Nov 2003 10:25:03 -0000
@@ -1,17 +1,17 @@
 etc/php.gtk/php.ini-dist
-%%PHPEXTDIR%%/php_gtk.so
-share/examples/php-gtk/combobutton.php
-share/examples/php-gtk/fileselection.php
-share/examples/php-gtk/gtk.php
-share/examples/php-gtk/hello.php
-share/examples/php-gtk/list.php
-share/examples/php-gtk/piemenu.php
-share/examples/php-gtk/scribble.php
-share/examples/php-gtk/scrollpane.php
-share/examples/php-gtk/spaned.php
-share/examples/php-gtk/sqpane.php
-share/examples/php-gtk/testgtkrc
-share/examples/php-gtk/testgtkrc2
-share/examples/php-gtk/window.xpm
- at dirrm share/examples/php-gtk
+lib/php/%%PHPEXTDIR%%/php_gtk.so
+%%EXAMPLESDIR%%/combobutton.php
+%%EXAMPLESDIR%%/fileselection.php
+%%EXAMPLESDIR%%/gtk.php
+%%EXAMPLESDIR%%/hello.php
+%%EXAMPLESDIR%%/list.php
+%%EXAMPLESDIR%%/piemenu.php
+%%EXAMPLESDIR%%/scribble.php
+%%EXAMPLESDIR%%/scrollpane.php
+%%EXAMPLESDIR%%/spaned.php
+%%EXAMPLESDIR%%/sqpane.php
+%%EXAMPLESDIR%%/testgtkrc
+%%EXAMPLESDIR%%/testgtkrc2
+%%EXAMPLESDIR%%/window.xpm
+ at dirrm %%EXAMPLESDIR%%
 @dirrm etc/php.gtk
--- phpgtk.diff ends here ---


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

