4 files changed, 21 insertions, 29 deletions

diff --git a/devel/pear-apd/Makefile b/devel/pear-apd/Makefile
index be00df70cf72..833b2c7d5c54 100644
--- a/devel/pear-apd/Makefile
+++ b/devel/pear-apd/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	apd
-PORTVERSION=	1.0
+PORTVERSION=	1.0.1
 CATEGORIES=	devel pear
 
 MAINTAINER=	ports@FreeBSD.org
@@ -15,49 +15,43 @@ COMMENT=	A full-featured engine-level PHP profiler/debugger
 BUILD_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear-PEAR
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
-BROKEN=		Does not compile
-EXPIRATION_DATE=2005-02-18
-DEPRECATED=	${BROKEN}
-
 USE_PHP=	yes
 USE_PHPIZE=	yes
+DEFAULT_PHP_VER=5
+BROKEN_WITH_PHP=4
+
+IGNORE=	"cannot build package if pear-* have been built with PHP4"
 
 CONFIGURE_ARGS=	--enable-apd
 
+DUMP_DIR?=	/var/tmp/apd
+
+PORTDOCS=	README
+
 .include <bsd.port.pre.mk>
 .include "${PORTSDIR}/devel/pear-PEAR/Makefile.common"
 
-.if exists(${LOCALBASE}/bin/php-config)
-EXT_DIR!=	${LOCALBASE}/bin/php-config --extension-dir | ${SED} -e \
-			"s:${PHP_BASE}/::"
-.endif
-PHP_DIR?=	${LOCALBASE}/etc
-DUMP_DIR?=	/var/tmp/apd
-PHP_INI=	${PHP_DIR}/php.ini
-PLIST_SUB+=	EXTDIR=${EXT_DIR}
-DOCS=		README
+PLIST_SUB+=	EXTDIR=lib/php/${PHP_EXT_DIR}
+
+SUB_FILES=	pkg-message
+SUB_LIST=	PHP_EXT_DIR=${PHP_EXT_DIR} DUMP_DIR=${DUMP_DIR}
 
 post-extract:
 	@${CHMOD} -R u+w ${WRKSRC}
 
 post-install-script:
-	@${STRIP_CMD} ${PHP_BASE}/${EXT_DIR}/apd.so
+	@${STRIP_CMD} ${PHP_BASE}/lib/php/${PHP_EXT_DIR}/apd.so
 	@${MKDIR} ${DUMP_DIR}
 	@${CHMOD} a+w ${DUMP_DIR}
 	${INSTALL_SCRIPT} ${WRKSRC}/pprofp ${PREFIX}/bin
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
-.for FILE in ${DOCS}
+.for FILE in ${PORTDOCS}
 	@${INSTALL_DATA} ${WRKSRC}/${FILE} ${DOCSDIR}
 .endfor
 	@${ECHO_MSG} "===> Documentation installed in ${DOCSDIR}."
 .endif
 	@${ECHO_MSG}
-	@${CAT} ${PKGMESSAGE} | \
-		${SED} -e "s:/usr/local/etc/php.ini:${PHP_INI}:"	\
-			-e "s:/usr/local:${LOCALBASE}:"			\
-			-e "s:lib/php/20020429:${EXT_DIR}:"		\
-			-e "s:/var/tmp/apd:${DUMP_DIR}:"
-	@${ECHO_MSG}
+	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.post.mk>
diff --git a/devel/pear-apd/distinfo b/devel/pear-apd/distinfo
index 4004086f1bc3..4636311eec12 100644
--- a/devel/pear-apd/distinfo
+++ b/devel/pear-apd/distinfo
@@ -1,2 +1,2 @@
-MD5 (PEAR/apd-1.0.tgz) = 36c1045c7c14420e96052999744e1f47
-SIZE (PEAR/apd-1.0.tgz) = 36194
+MD5 (PEAR/apd-1.0.1.tgz) = 470ea75cde09f7504c83441911c86f29
+SIZE (PEAR/apd-1.0.1.tgz) = 36643
diff --git a/devel/pear-apd/pkg-message b/devel/pear-apd/files/pkg-message.in
index c3b17d72b2b5..19d74fd103e5 100644
--- a/devel/pear-apd/pkg-message
+++ b/devel/pear-apd/files/pkg-message.in
@@ -1,10 +1,10 @@
 ************************************************************************
 
-Do not forget to configure your /usr/local/etc/php.ini file:
+Do not forget to configure your %%LOCALBASE%%/etc/php.ini file:
 add the line:
 
-zend_extension = /usr/local/lib/php/20020429/apd.so
-apd.dumpdir = /var/tmp/apd
+zend_extension = %%LOCALBASE%%/lib/php/%%PHP_EXT_DIR%%/apd.so
+apd.dumpdir = %%DUMP_DIR%%
 
 in the section "Dynamic Extensions".
 
diff --git a/devel/pear-apd/pkg-plist b/devel/pear-apd/pkg-plist
index 903acfb8107a..a938c45bdd2b 100644
--- a/devel/pear-apd/pkg-plist
+++ b/devel/pear-apd/pkg-plist
@@ -1,6 +1,4 @@
 bin/pprofp
 %%EXTDIR%%/apd.so
 %%PKGREGDIR%%/package.xml
-%%PORTDOCS%%%%DOCSDIR%%/README
 @dirrm %%PKGREGDIR%%
-%%PORTDOCS%%@dirrm %%DOCSDIR%%