From alex@armada.alexdupre.com  Fri Jan  9 16:03:33 2004
Return-Path: <alex@armada.alexdupre.com>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP
	id 3EE8516A4D4; Fri,  9 Jan 2004 16:03:33 -0800 (PST)
Received: from relay.gufi.org (civetta.gufi.org [212.110.23.10])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id 94ACC43D54; Fri,  9 Jan 2004 16:03:27 -0800 (PST)
	(envelope-from alex@armada.alexdupre.com)
Received: from armada.alexdupre.com (host245-49.pool8288.interbusiness.it [82.88.49.245])
	by relay.gufi.org (Postfix) with ESMTP
	id 4ED0C20F54; Sat, 10 Jan 2004 01:03:25 +0100 (CET)
Received: from armada.alexdupre.com (localhost.alexdupre.com [127.0.0.1])
	by armada.alexdupre.com (8.12.10/8.12.10) with ESMTP id i0A03OpH052680;
	Sat, 10 Jan 2004 01:03:25 +0100 (CET)
	(envelope-from alex@armada.alexdupre.com)
Received: (from alex@localhost)
	by armada.alexdupre.com (8.12.10/8.12.10/Submit) id i0A03Oox052679;
	Sat, 10 Jan 2004 01:03:24 +0100 (CET)
	(envelope-from alex)
Message-Id: <200401100003.i0A03Oox052679@armada.alexdupre.com>
Date: Sat, 10 Jan 2004 01:03:24 +0100 (CET)
From: Alex Dupre <ale@freebsd.org>
Reply-To: Alex Dupre <ale@freebsd.org>
To: FreeBSD-gnats-submit@freebsd.org
Cc: edwin@freebsd.org
Subject: [Maintainer Fix] Port: devel/ZendOptimizer
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         61149
>Category:       ports
>Synopsis:       [Maintainer Fix] Port: devel/ZendOptimizer
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Fri Jan 09 16:10:21 PST 2004
>Closed-Date:    Fri Jan 09 16:17:20 PST 2004
>Last-Modified:  Sun Jan 11 02:20:18 PST 2004
>Originator:     Alex Dupre
>Release:        FreeBSD 5.2-CURRENT i386
>Organization:
>Environment:
System: FreeBSD armada.alexdupre.com 5.2-CURRENT FreeBSD 5.2-CURRENT #0: Wed Jan 7 02:41:45 CET 2004 alex@armada.alexdupre.com:/usr/obj/usr/src/sys/ARMADA i386


	
>Description:
Use bsd.php.mk.
Small other fixes.
Make portlint happy.
	
>How-To-Repeat:
	
>Fix:

	

--- ZendOptimizer.diff begins here ---
diff -ruN ZendOptimizer.orig/Makefile ZendOptimizer/Makefile
--- ZendOptimizer.orig/Makefile	Sat Jan 10 00:28:16 2004
+++ ZendOptimizer/Makefile	Sat Jan 10 00:59:51 2004
@@ -13,51 +13,48 @@
 MAINTAINER=	sysadmin@alexdupre.com
 COMMENT=	An optimizer for PHP code
 
-RUN_DEPENDS=	${LOCALBASE}/bin/php:${PORTSDIR}/www/mod_php4
-
 ONLY_FOR_ARCHS=	i386
 NO_BUILD=	yes
+BROKEN_WITH_PHP=5
 
 RESTRICTED=	"Redistribution of pre-compiled binaries is not permitted"
 NO_CDROM=	"Redistribution of pre-compiled binaries is not permitted"
 
-EXT_DIR=	20020429
-PLIST_SUB=	EXT_DIR=${EXT_DIR}
-
 PKGMESSAGE=	${WRKDIR}/pkg-message
 
 .include <bsd.port.pre.mk>
+.include "${.CURDIR}/../../lang/php4/bsd.php.mk"
 
 # Check for FreeBSD version
 .if ${OSVERSION} < 400000 || ${OSVERSION} > 499999
-BROKEN=         "This port is for FreeBSD 4 only."
-.endif
-
+BROKEN=		"This port is for FreeBSD 4 only"
+.else
 # Check for ZendOptimizer sources
 .if !exists(${DISTDIR}/${DISTNAME}${EXTRACT_SUFX}) && !defined(PACKAGE_BUILDING)
 ECHO_MSG=/usr/bin/printf
-IGNORE= :\n\
+IGNORE=	:\n\
 Because of licensing restrictions, you must fetch the source distribution\n\
 manually.\n\
 Please access http://www.zend.com/store/getfreefile.php?pid=13&zbid=547\n\
 with a web browser, read the license and click the \"I ACCEPT\" button.\n\
-Download the source file, ${DISTFILES},\n\
+Download the source file, ${DISTNAME}${EXTRACT_SUFX},\n\
 and place it in ${DISTDIR}.\n
 .endif
+.endif
 
 do-install:
-	@${MKDIR} ${PREFIX}/lib/php/${EXT_DIR}
+	@${MKDIR} ${PREFIX}/lib/php/${PHP_EXT_DIR}
 	${INSTALL_DATA} ${WRKSRC}/data/4_3_x_comp/ZendOptimizer.so \
-		${PREFIX}/lib/php/${EXT_DIR}/ZendOptimizer.so
+		${PREFIX}/lib/php/${PHP_EXT_DIR}/ZendOptimizer.so
 	${INSTALL_DATA} ${WRKSRC}/data/4_3_x_comp/TS/ZendOptimizer.so \
-		${PREFIX}/lib/php/${EXT_DIR}/ZendOptimizer_TS.so
+		${PREFIX}/lib/php/${PHP_EXT_DIR}/ZendOptimizer_TS.so
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
 	@${INSTALL_DATA} ${WRKSRC}/data/doc/* ${DOCSDIR}
 .endif
 
 post-install:
-	@${SED} "s|%%LOCALBASE%%|${LOCALBASE}|g;s|%%PREFIX%%|${PREFIX}|g;s|%%EXT_DIR%%|${EXT_DIR}|g" \
+	@${SED} "s|%%LOCALBASE%%|${LOCALBASE}|g;s|%%PREFIX%%|${PREFIX}|g;s|%%PHP_EXT_DIR%%|${PHP_EXT_DIR}|g" \
 		${.CURDIR}/pkg-message > ${PKGMESSAGE}
 	@${CAT} ${PKGMESSAGE}
 
diff -ruN ZendOptimizer.orig/pkg-message ZendOptimizer/pkg-message
--- ZendOptimizer.orig/pkg-message	Sat Jan 10 00:28:16 2004
+++ ZendOptimizer/pkg-message	Sat Jan 10 00:32:18 2004
@@ -6,7 +6,7 @@
 
 [Zend]
 zend_optimizer.optimization_level=15
-zend_extension_ts="%%PREFIX%%/lib/php/%%EXT_DIR%%/ZendOptimizer_TS.so"
-zend_extension=""%%PREFIX%%/lib/php/%%EXT_DIR%%/ZendOptimizer.so"
+zend_extension_ts="%%PREFIX%%/lib/php/%%PHP_EXT_DIR%%/ZendOptimizer_TS.so"
+zend_extension=""%%PREFIX%%/lib/php/%%PHP_EXT_DIR%%/ZendOptimizer.so"
 
 *****************************************************************************
diff -ruN ZendOptimizer.orig/pkg-plist ZendOptimizer/pkg-plist
--- ZendOptimizer.orig/pkg-plist	Sat Jan 10 00:28:16 2004
+++ ZendOptimizer/pkg-plist	Sat Jan 10 00:37:41 2004
@@ -1,6 +1,6 @@
-lib/php/%%EXT_DIR%%/ZendOptimizer_TS.so
-lib/php/%%EXT_DIR%%/ZendOptimizer.so
-%%PORTDOCS%%share/doc/ZendOptimizer/ZendOptimizer_TechFAQ.pdf
-%%PORTDOCS%%share/doc/ZendOptimizer/ZendOptimizer_UserGuide.pdf
-@unexec rmdir %D/lib/php/%%EXT_DIR%% 2> /dev/null || true
-%%PORTDOCS%%@dirrm share/doc/ZendOptimizer
+lib/php/%%PHP_EXT_DIR%%/ZendOptimizer_TS.so
+lib/php/%%PHP_EXT_DIR%%/ZendOptimizer.so
+%%PORTDOCS%%%%DOCSDIR%%/ZendOptimizer_TechFAQ.pdf
+%%PORTDOCS%%%%DOCSDIR%%/ZendOptimizer_UserGuide.pdf
+@unexec rmdir %D/lib/php/%%PHP_EXT_DIR%% 2> /dev/null || true
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
--- ZendOptimizer.diff ends here ---



>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->closed 
State-Changed-By: edwin 
State-Changed-When: Fri Jan 9 16:17:18 PST 2004 
State-Changed-Why:  
Commited, thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=61149 

From: Alex Dupre <ale@FreeBSD.org>
To: Edwin Groothuis <edwin@FreeBSD.org>
Cc:  
Subject: Re: ports/61149: [Maintainer Fix] Port: devel/ZendOptimizer
Date: Sun, 11 Jan 2004 00:41:48 +0100

 Probably it's better to use IGNORE instead of BROKEN in the Makefile 
 when checking the FreeBSD version. If you agree, you may commit it.
 
 --
 Alex Dupre
 
>Unformatted:
