ports/52804: [Update] devel/php-dbg

[Alex Dupre]

>Number:         52804
>Category:       ports
>Synopsis:       [Update] devel/php-dbg
>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 May 30 02:30:04 PDT 2003
>Closed-Date:
>Last-Modified:
>Originator:     Alex Dupre
>Release:        FreeBSD 4.8-ALEXDUPRE i386
>Organization:
>Environment:
System: FreeBSD 4.8-ALEXDUPRE i386
>Description:
Unbreak build with new php 4.3.2.
Various fixes.
Require commit of PR 52674.
>How-To-Repeat:
>Fix:

--- php-dbg.diff begins here ---
diff -ruN php-dbg.orig/Makefile php-dbg/Makefile
--- php-dbg.orig/Makefile	Fri May 30 11:04:03 2003
+++ php-dbg/Makefile	Fri May 30 11:24:08 2003
@@ -16,42 +16,25 @@
 MAINTAINER=	rehsack at liwing.de
 COMMENT=	Debugger for PHP4
 
-BUILD_DEPENDS=	aclocal:${PORTSDIR}/devel/automake \
-		autoconf:${PORTSDIR}/devel/autoconf \
-		phpize:${PORTSDIR}/www/mod_php4
-RUN_DEPENDS=	${LOCALBASE}/bin/php:${PORTSDIR}/www/mod_php4
-
-USE_LIBTOOL=	yes
 WRKSRC=		${WRKDIR}/dbg
-CONFIGURE_ARGS=	--enable-dbg=shared --with-dbg-profiler \
-		--with-php-config=${PREFIX}/bin/php-config
-CONFIGURE_ENV=	CFLAGS="${CFLAGS}"
+USE_PHPIZE=	yes
+CONFIGURE_ARGS=	--enable-dbg=shared --with-dbg-profiler
 PKGMESSAGE=	${WRKDIR}/pkg-message
-PLIST=		${WRKDIR}/pkg-plist
-
-.include <bsd.port.pre.mk>
 
-PHPCONFIG=	${LOCALBASE}/bin/php-config
-.if exists(${PHPCONFIG})
-PHPEXTENSIONS!=	${PHPCONFIG} --extension-dir
-.else
-PHPEXTENSIONS=	${LOCALBASE}/lib/php/extensions
-.endif
+PHPEXTENSIONS=	20020429
+PLIST_SUB=	PHPEXTENSIONS=${PHPEXTENSIONS}
 
-post-extract:
-	@${ECHO_MSG} "===>  PHPizing for ${DISTNAME}"
-	@cd ${WRKSRC} && ${LOCALBASE}/bin/phpize
+.include <bsd.port.pre.mk>
+.include "${.CURDIR}/../../lang/php4/bsd.php.mk"
 
 post-build:
-	@${SED} "s|%%LOCALBASE%%|${LOCALBASE}|g;s|%%PHPEXTENSIONS%%|${PHPEXTENSIONS}|g" \
+	@${SED} "s|%%PREFIX%%|${PREFIX}|g;s|%%PHPEXTENSIONS%%|${PHPEXTENSIONS}|g" \
 		${.CURDIR}/pkg-message > ${PKGMESSAGE}
-	@${SED} "s|%%PHPEXTENSIONS%%|${PHPEXTENSIONS}|g" < ${.CURDIR}/pkg-plist | \
-		${SED} "s|${LOCALBASE}/||" >${PLIST}
 
 do-install:
-	@${MKDIR} ${PHPEXTENSIONS}
+	@${MKDIR} ${PREFIX}/lib/php/${PHPEXTENSIONS}
 	@${INSTALL_DATA} ${WRKSRC}/modules/dbg.so \
-		${PHPEXTENSIONS}
+		${PREFIX}/lib/php/${PHPEXTENSIONS}
 
 post-install:
 	@${CAT} ${PKGMESSAGE}
diff -ruN php-dbg.orig/files/patch-configure php-dbg/files/patch-configure
--- php-dbg.orig/files/patch-configure	Fri May 30 11:04:03 2003
+++ php-dbg/files/patch-configure	Thu Jan  1 01:00:00 1970
@@ -1,25 +0,0 @@
---- configure.orig	Mon Feb 24 12:14:38 2003
-+++ configure	Mon Feb 24 12:15:22 2003
-@@ -2217,18 +2217,18 @@
- 
-   OVERALL_TARGET=php
-   php_c_pre='$(CC)'
--  php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
-+  php_c_meta='$(COMMON_FLAGS) ${CFLAGS} $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
-   php_c_post=' && echo > $@'
-   php_cxx_pre='$(CXX)'
--  php_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)'
-+  php_cxx_meta='$(COMMON_FLAGS) ${CXXFLAGS} $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)'
-   php_cxx_post=' && echo > $@'
-   php_lo=o
- 
-   shared_c_pre='$(LIBTOOL) --mode=compile $(CC)'
--  shared_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) -prefer-pic'
-+  shared_c_meta='$(COMMON_FLAGS) ${CFLAGS} $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
-   shared_c_post=
-   shared_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)'
--  shared_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS) -prefer-pic'
-+  shared_cxx_meta='$(COMMON_FLAGS) ${CXXFLAGS} $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)'
-   shared_cxx_post=
-   shared_lo=lo
- 
diff -ruN php-dbg.orig/pkg-message php-dbg/pkg-message
--- php-dbg.orig/pkg-message	Fri May 30 11:04:03 2003
+++ php-dbg/pkg-message	Fri May 30 11:23:58 2003
@@ -5,12 +5,12 @@
 The php debugger has been installed successful.
 Add a line containing
 
-	extension=%%PREFIX%%/lib/php/extensions/dbg.so
+	extension=%%PREFIX%%/lib/php/%%PHPEXTENSIONS%%/dbg.so
 
 to your php.ini to load it.
 If you have the Zend Optimizer installed, add the line
 
-	zend_extension=%%PREFIX%%/lib/php/extensions/dbg.so
+	zend_extension=%%PREFIX%%/lib/php/%%PHPEXTENSIONS%%/dbg.so
 
 to your [zend] section in the php.ini file, too.
 Add following section to enable/disable whatever you need from the debugger:
diff -ruN php-dbg.orig/pkg-plist php-dbg/pkg-plist
--- php-dbg.orig/pkg-plist	Fri May 30 11:04:03 2003
+++ php-dbg/pkg-plist	Fri May 30 11:22:15 2003
@@ -1 +1,2 @@
-%%PHPEXTENSIONS%%/dbg.so
+lib/php/%%PHPEXTENSIONS%%/dbg.so
+ at unexec rmdir %D/lib/php/%%PHPEXTENSIONS%% 2>/dev/null || true
--- php-dbg.diff ends here ---

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