PEAR ports: handling PEAR's registry.

	PEAR uses a "registry" to register installed modules, and
	this registry is initialized during the installation of
	mod_php4 (since 4.3.0).

	Unfortunately, installing PEAR modules through the ports
	does not maintain this registry.

	This PR fix this problem for the following ports:
	- sysutils/pear-Log
	- devel/pear-PEAR
	- devel/pear-Date
	- devel/pear-I18N
	- devel/pear-HTML_Common
	- devel/pear-HTML_Select_Common
	- security/pear-Crypt_CBC
	- mail/pear-Mail_Mime
	- net/pear-Net_Sieve
	- sysutils/pear-File
	- archivers/pear-Archive_Tar

PR:		ports/47921
Submitted by:	Thierry Thomas <thierry@pompo.net>

21 files changed, 257 insertions, 32 deletions

diff --git a/archivers/pear-Archive_Tar/Makefile b/archivers/pear-Archive_Tar/Makefile
index c30a917..7f0335e 100644
--- a/archivers/pear-Archive_Tar/Makefile
+++ b/archivers/pear-Archive_Tar/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	Archive_Tar
 PORTVERSION=	1.0
+PORTREVISION=	1
 CATEGORIES=	archivers www
 MASTER_SITES=	http://pear.php.net/get/
 PKGNAMEPREFIX=	pear-
@@ -29,7 +30,7 @@ PHP_BASE!=	${LOCALBASE}/bin/php-config --prefix
 .else
 PHP_BASE=	${LOCALBASE}
 .endif
-
+PEAR=		${LOCALBASE}/bin/pear
 LPHP_LIB=	lib/php
 PEARDIR=	${PHP_BASE}/${LPHP_LIB}
 PLIST_SUB=	PEARDIR=${LPHP_LIB}
@@ -47,4 +48,8 @@ do-install:
 	@${ECHO_MSG} "===> Documentation installed in ${DOCSDIR}."
 .endif
 
+post-install:
+# Register a new package
+	@${PEAR} upgrade -r -f ${WRKDIR}/package.xml
+
 .include <bsd.port.post.mk>
diff --git a/devel/pear-Date/Makefile b/devel/pear-Date/Makefile
index 7ddcb57..0be0463 100644
--- a/devel/pear-Date/Makefile
+++ b/devel/pear-Date/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	Date
 PORTVERSION=	1.3
+PORTREVISION=	1
 CATEGORIES=	devel www
 MASTER_SITES=	http://pear.php.net/get/
 PKGNAMEPREFIX=	pear-
@@ -21,9 +22,18 @@ RUN_DEPENDS=	${BUILD_DEPENDS}
 
 NO_BUILD=	yes
 
+.include <bsd.port.pre.mk>
+
+.if exists(${LOCALBASE}/bin/php-config)
+PHP_BASE!=	${LOCALBASE}/bin/php-config --prefix
+.else
+PHP_BASE!=	${LOCALBASE}
+.endif
+PEAR=		${LOCALBASE}/bin/pear
 LPHP_LIB=	lib/php
-PEARDIR=	${LOCALBASE}/${LPHP_LIB}
+PEARDIR=	${PHP_BASE}/${LPHP_LIB}
 PLIST_SUB=	PEARDIR=${LPHP_LIB}
+
 MANIFEST=	Date Date.php
 
 do-install:
@@ -32,4 +42,8 @@ do-install:
 	@${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${PEARDIR}/${FILE}
 .endfor
 
-.include <bsd.port.mk>
+post-install:
+# Register a new package
+	@${PEAR} install -r -f ${WRKDIR}/package.xml
+
+.include <bsd.port.post.mk>
diff --git a/devel/pear-Date/pkg-deinstall b/devel/pear-Date/pkg-deinstall
new file mode 100644
index 0000000..c17e9d1
--- /dev/null
+++ b/devel/pear-Date/pkg-deinstall
@@ -0,0 +1,13 @@
+#!/bin/sh
+#
+# $FreeBSD$
+#
+# Remove package declaration from PEAR's registry.
+
+if [ x$2 != xDEINSTALL ]; then
+    exit
+fi
+PKG_NAME=${1%%-[0-9._]*}
+PACKAGE=$(echo $PKG_NAME | sed 's/pear-//')
+
+${PKG_PREFIX}/bin/pear uninstall -r ${PACKAGE} || true
diff --git a/devel/pear-HTML_Common/Makefile b/devel/pear-HTML_Common/Makefile
index b434498..538db6f 100644
--- a/devel/pear-HTML_Common/Makefile
+++ b/devel/pear-HTML_Common/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	HTML_Common
 PORTVERSION=	1.0
+PORTREVISION=	1
 CATEGORIES=	devel www
 MASTER_SITES=	http://pear.php.net/get/
 PKGNAMEPREFIX=	pear-
@@ -16,13 +17,21 @@ DIST_SUBDIR=	PEAR
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	PEAR::HTML_Common is a base class for other HTML classes
 
-BUILD_DEPENDS=	${PEARDIR}.DIST_PHP:${PORTSDIR}/devel/pear-install
+BUILD_DEPENDS=	${PEARDIR}/PEAR.php.dist:${PORTSDIR}/devel/pear-PEAR
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 NO_BUILD=	yes
 
+.include <bsd.port.pre.mk>
+
+.if exists(${LOCALBASE}/bin/php-config)
+PHP_BASE!=	${LOCALBASE}/bin/php-config --prefix
+.else
+PHP_BASE!=	${LOCALBASE}
+.endif
+PEAR=		${LOCALBASE}/bin/pear
 LPHP_LIB=	lib/php
-PEARDIR=	${LOCALBASE}/${LPHP_LIB}
+PEARDIR=	${PHP_BASE}/${LPHP_LIB}
 PLIST_SUB=	PEARDIR=${LPHP_LIB}
 
 do-install:
@@ -30,4 +39,8 @@ do-install:
 	@${CP} -Rp ${WRKSRC}/Common.php ${PEARDIR}/HTML
 	@${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${PEARDIR}/HTML
 
-.include <bsd.port.mk>
+post-install:
+# Register a new package
+	@${PEAR} install -r -f ${WRKDIR}/package.xml
+
+.include <bsd.port.post.mk>
diff --git a/devel/pear-HTML_Common/pkg-deinstall b/devel/pear-HTML_Common/pkg-deinstall
new file mode 100644
index 0000000..c17e9d1
--- /dev/null
+++ b/devel/pear-HTML_Common/pkg-deinstall
@@ -0,0 +1,13 @@
+#!/bin/sh
+#
+# $FreeBSD$
+#
+# Remove package declaration from PEAR's registry.
+
+if [ x$2 != xDEINSTALL ]; then
+    exit
+fi
+PKG_NAME=${1%%-[0-9._]*}
+PACKAGE=$(echo $PKG_NAME | sed 's/pear-//')
+
+${PKG_PREFIX}/bin/pear uninstall -r ${PACKAGE} || true
diff --git a/devel/pear-HTML_Select_Common/Makefile b/devel/pear-HTML_Select_Common/Makefile
index 8b25851..9f885a2 100644
--- a/devel/pear-HTML_Select_Common/Makefile
+++ b/devel/pear-HTML_Select_Common/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	HTML_Select_Common
 PORTVERSION=	1.1
+PORTREVISION=	1
 CATEGORIES=	devel www
 MASTER_SITES=	http://pear.php.net/get/
 PKGNAMEPREFIX=	pear-
@@ -21,11 +22,21 @@ RUN_DEPENDS=	${PEARDIR}/HTML/Common.php:${PORTSDIR}/devel/pear-HTML_Common \
 		${PEARDIR}/I18N/Common.php:${PORTSDIR}/devel/pear-I18N
 
 NO_BUILD=	yes
+
 EXAMPLESDIR=	${PREFIX}/share/examples/pear/${PORTNAME}
 
+.include <bsd.port.pre.mk>
+
+.if exists(${LOCALBASE}/bin/php-config)
+PHP_BASE!=	${LOCALBASE}/bin/php-config --prefix
+.else
+PHP_BASE!=	${LOCALBASE}
+.endif
+PEAR=		${LOCALBASE}/bin/pear
 LPHP_LIB=	lib/php
-PEARDIR=	${LOCALBASE}/${LPHP_LIB}
+PEARDIR=	${PHP_BASE}/${LPHP_LIB}
 PLIST_SUB=	PEARDIR=${LPHP_LIB}
+
 MANIFEST=	Country.php FRDepartements.php UKCounty.php USState.php
 EXAMPLES=	Country.php FRDepartements.php UKCounty.php USState.php
 
@@ -40,8 +51,6 @@ do-install:
 #	but should be removed with the next release.
 	@${CP} -p ${FILESDIR}/Select.php ${PEARDIR}/HTML
 	@${CHOWN} ${SHAREOWN}:${SHAREGRP} ${PEARDIR}/HTML/Select.php
-
-post-install:
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${EXAMPLESDIR}
 .for FILE in ${EXAMPLES}
@@ -50,4 +59,8 @@ post-install:
 	@${ECHO_MSG} "===> Examples installed in ${EXAMPLESDIR}."
 .endif
 
-.include <bsd.port.mk>
+post-install:
+# Register a new package
+	@${PEAR} install -r -f ${WRKDIR}/package.xml
+
+.include <bsd.port.post.mk>
diff --git a/devel/pear-HTML_Select_Common/pkg-deinstall b/devel/pear-HTML_Select_Common/pkg-deinstall
new file mode 100644
index 0000000..c17e9d1
--- /dev/null
+++ b/devel/pear-HTML_Select_Common/pkg-deinstall
@@ -0,0 +1,13 @@
+#!/bin/sh
+#
+# $FreeBSD$
+#
+# Remove package declaration from PEAR's registry.
+
+if [ x$2 != xDEINSTALL ]; then
+    exit
+fi
+PKG_NAME=${1%%-[0-9._]*}
+PACKAGE=$(echo $PKG_NAME | sed 's/pear-//')
+
+${PKG_PREFIX}/bin/pear uninstall -r ${PACKAGE} || true
diff --git a/devel/pear-I18N/Makefile b/devel/pear-I18N/Makefile
index bcbc404..603c208 100644
--- a/devel/pear-I18N/Makefile
+++ b/devel/pear-I18N/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	I18N
 PORTVERSION=	0.8
+PORTREVISION=	1
 CATEGORIES=	devel www
 MASTER_SITES=	http://pear.php.net/get/
 PKGNAMEPREFIX=	pear-
@@ -16,14 +17,23 @@ DIST_SUBDIR=	PEAR
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	PEAR internationalization package
 
-BUILD_DEPENDS=	${PEARDIR}.DIST_PHP:${PORTSDIR}/devel/pear-install
+BUILD_DEPENDS=	${PEARDIR}/PEAR.php.dist:${PORTSDIR}/devel/pear-PEAR
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 NO_BUILD=	yes
+
+.include <bsd.port.pre.mk>
+
 EXAMPLESDIR=	${PREFIX}/share/examples/pear
 
+.if exists(${LOCALBASE}/bin/php-config)
+PHP_BASE!=	${LOCALBASE}/bin/php-config --prefix
+.else
+PHP_BASE!=	${LOCALBASE}
+.endif
+PEAR=		${LOCALBASE}/bin/pear
 LPHP_LIB=	lib/php
-PEARDIR=	${LOCALBASE}/${LPHP_LIB}
+PEARDIR=	${PHP_BASE}/${LPHP_LIB}
 PLIST_SUB=	PEARDIR=${LPHP_LIB}
 MANIFEST=	Common.php Country.php Language.php Negotiator.php
 EXAMPLES=	I18N_Message.php I18N_Message_Translate.php \
@@ -38,8 +48,6 @@ do-install:
 	@${CP} -Rp ${WRKSRC}/Messages ${PEARDIR}/I18N
 	@${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${PEARDIR}/I18N
 	@${CHMOD} a-x ${PEARDIR}/I18N/Messages/*
-
-post-install:
 .if !defined(NOPORTDOCS)
 .for FILE in ${EXAMPLES}
 	@${INSTALL_DATA} ${WRKSRC}/examples/${FILE} ${EXAMPLESDIR}
@@ -47,4 +55,8 @@ post-install:
 	@${ECHO_MSG} "===> Examples installed in ${EXAMPLESDIR}."
 .endif
 
-.include <bsd.port.mk>
+post-install:
+# Register a new package
+	@${PEAR} install -r -f ${WRKDIR}/package.xml
+
+.include <bsd.port.post.mk>
diff --git a/devel/pear-I18N/pkg-deinstall b/devel/pear-I18N/pkg-deinstall
new file mode 100644
index 0000000..c17e9d1
--- /dev/null
+++ b/devel/pear-I18N/pkg-deinstall
@@ -0,0 +1,13 @@
+#!/bin/sh
+#
+# $FreeBSD$
+#
+# Remove package declaration from PEAR's registry.
+
+if [ x$2 != xDEINSTALL ]; then
+    exit
+fi
+PKG_NAME=${1%%-[0-9._]*}
+PACKAGE=$(echo $PKG_NAME | sed 's/pear-//')
+
+${PKG_PREFIX}/bin/pear uninstall -r ${PACKAGE} || true
diff --git a/devel/pear-PEAR/Makefile b/devel/pear-PEAR/Makefile
index 9b64f62..923e82a 100644
--- a/devel/pear-PEAR/Makefile
+++ b/devel/pear-PEAR/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	PEAR
 PORTVERSION=	1.0.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel www
 MASTER_SITES=	http://pear.php.net/get/
 PKGNAMEPREFIX=	pear-
@@ -26,7 +26,10 @@ NO_BUILD=	yes
 
 .if exists(${LOCALBASE}/bin/php-config)
 PHP_BASE!=	${LOCALBASE}/bin/php-config --prefix
+.else
+PHP_BASE!=	${LOCALBASE}
 .endif
+PEAR=		${LOCALBASE}/bin/pear
 LPHP_LIB=	lib/php
 PEARDIR=	${PHP_BASE}/${LPHP_LIB}
 PLIST_SUB=	PEARDIR=${LPHP_LIB}
@@ -42,4 +45,8 @@ do-install:
 	@${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${PEARDIR}/${FILE}
 .endfor
 
+post-install:
+# Register an upgraded package
+	@${PEAR} upgrade -r -f ${WRKDIR}/package.xml
+
 .include <bsd.port.post.mk>
diff --git a/mail/pear-Mail_Mime/Makefile b/mail/pear-Mail_Mime/Makefile
index 54f21f2..b304778 100644
--- a/mail/pear-Mail_Mime/Makefile
+++ b/mail/pear-Mail_Mime/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	Mail_Mime
 PORTVERSION=	1.2.1
+PORTREVISION=	1
 CATEGORIES=	mail www
 MASTER_SITES=	http://pear.php.net/get/
 PKGNAMEPREFIX=	pear-
@@ -16,7 +17,7 @@ DIST_SUBDIR=	PEAR
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	PEAR classes to create and decode MIME messages
 
-BUILD_DEPENDS=	${PEARDIR}.DIST_PHP:${PORTSDIR}/devel/pear-install
+BUILD_DEPENDS=	${PEARDIR}/PEAR.php.dist:${PORTSDIR}/devel/pear-PEAR
 RUN_DEPENDS=	${PEARDIR}.DIST_PHP:${PORTSDIR}/devel/pear-install
 
 NO_BUILD=	yes
@@ -25,16 +26,23 @@ NO_BUILD=	yes
 
 .if exists(${LOCALBASE}/bin/php-config)
 PHP_BASE!=	${LOCALBASE}/bin/php-config --prefix
+.else
+PHP_BASE!=	${LOCALBASE}
 .endif
+PEAR=		${LOCALBASE}/bin/pear
 LPHP_LIB=	lib/php
 PEARDIR=	${PHP_BASE}/${LPHP_LIB}
 PLIST_SUB=	PEARDIR=${LPHP_LIB}
 
 do-install:
 	@${CP} -Rp ${WRKSRC}/* ${PEARDIR}/Mail
-	@${CHOWN} -R root:wheel ${PEARDIR}/Mail/*
+	@${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${PEARDIR}/Mail/*
 .for BUGMODE in mimeDecode.php mimePart.php xmail.dtd xmail.xsl
 	@${CHMOD} a-x ${PEARDIR}/Mail/${BUGMODE}
 .endfor
 
+post-install:
+# Register a new package
+	@${PEAR} install -r -f ${WRKDIR}/package.xml
+
 .include <bsd.port.post.mk>
diff --git a/mail/pear-Mail_Mime/pkg-deinstall b/mail/pear-Mail_Mime/pkg-deinstall
new file mode 100644
index 0000000..c17e9d1
--- /dev/null
+++ b/mail/pear-Mail_Mime/pkg-deinstall
@@ -0,0 +1,13 @@
+#!/bin/sh
+#
+# $FreeBSD$
+#
+# Remove package declaration from PEAR's registry.
+
+if [ x$2 != xDEINSTALL ]; then
+    exit
+fi
+PKG_NAME=${1%%-[0-9._]*}
+PACKAGE=$(echo $PKG_NAME | sed 's/pear-//')
+
+${PKG_PREFIX}/bin/pear uninstall -r ${PACKAGE} || true
diff --git a/net/pear-Net_Sieve/Makefile b/net/pear-Net_Sieve/Makefile
index 0fe25d7..a88805f 100644
--- a/net/pear-Net_Sieve/Makefile
+++ b/net/pear-Net_Sieve/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	Net_Sieve
 PORTVERSION=	0.8.1
+PORTREVISION=	1
 CATEGORIES=	net www
 MASTER_SITES=	http://pear.php.net/get/
 PKGNAMEPREFIX=	pear-
@@ -16,8 +17,8 @@ DIST_SUBDIR=	PEAR
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	PEAR class to handle talking to timsieved
 
-BUILD_DEPENDS=	${PEARDIR}/Net/Socket.php:${PORTSDIR}/net/pear-Net_Socket
-RUN_DEPENDS=	${PEARDIR}/Net/Socket.php:${PORTSDIR}/net/pear-Net_Socket
+BUILD_DEPENDS=	${PEARDIR}/PEAR.php.dist:${PORTSDIR}/devel/pear-PEAR
+RUN_DEPENDS=	${BUILD_DEPENDS}
 
 NO_BUILD=	yes
 
@@ -25,14 +26,21 @@ NO_BUILD=	yes
 
 .if exists(${LOCALBASE}/bin/php-config)
 PHP_BASE!=	${LOCALBASE}/bin/php-config --prefix
+.else
+PHP_BASE!=	${LOCALBASE}
 .endif
+PEAR=		${LOCALBASE}/bin/pear
 LPHP_LIB=	lib/php
 PEARDIR=	${PHP_BASE}/${LPHP_LIB}
 PLIST_SUB=	PEARDIR=${LPHP_LIB}
 
 do-install:
 	@${CP} -Rp ${WRKSRC}/* ${PEARDIR}/Net
-	@${CHOWN} root:wheel ${PEARDIR}/Net/Sieve.php
+	@${CHOWN} ${SHAREOWN}:${SHAREGRP} ${PEARDIR}/Net/Sieve.php
 	@${CHMOD} a-x ${PEARDIR}/Net/Sieve.php
 
+post-install:
+# Register a new package
+	@${PEAR} install -r -f ${WRKDIR}/package.xml
+
 .include <bsd.port.post.mk>
diff --git a/net/pear-Net_Sieve/pkg-deinstall b/net/pear-Net_Sieve/pkg-deinstall
new file mode 100644
index 0000000..c17e9d1
--- /dev/null
+++ b/net/pear-Net_Sieve/pkg-deinstall
@@ -0,0 +1,13 @@
+#!/bin/sh
+#
+# $FreeBSD$
+#
+# Remove package declaration from PEAR's registry.
+
+if [ x$2 != xDEINSTALL ]; then
+    exit
+fi
+PKG_NAME=${1%%-[0-9._]*}
+PACKAGE=$(echo $PKG_NAME | sed 's/pear-//')
+
+${PKG_PREFIX}/bin/pear uninstall -r ${PACKAGE} || true
diff --git a/security/pear-Crypt_CBC/Makefile b/security/pear-Crypt_CBC/Makefile
index 1bb1602..77fdf53 100644
--- a/security/pear-Crypt_CBC/Makefile
+++ b/security/pear-Crypt_CBC/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	Crypt_CBC
 PORTVERSION=	0.3
+PORTREVISION=	1
 CATEGORIES=	security www
 MASTER_SITES=	http://pear.php.net/get/
 PKGNAMEPREFIX=	pear-
@@ -16,13 +17,21 @@ DIST_SUBDIR=	PEAR
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	PEAR class to emulate Perl's Crypt::CBC module
 
-BUILD_DEPENDS=	${PEARDIR}.DIST_PHP:${PORTSDIR}/devel/pear-install
+BUILD_DEPENDS=	${PEARDIR}/PEAR.php.dist:${PORTSDIR}/devel/pear-PEAR
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 NO_BUILD=	yes
 
+.include <bsd.port.pre.mk>
+
+.if exists(${LOCALBASE}/bin/php-config)
+PHP_BASE!=	${LOCALBASE}/bin/php-config --prefix
+.else
+PHP_BASE!=	${LOCALBASE}
+.endif
+PEAR=		${LOCALBASE}/bin/pear
 LPHP_LIB=	lib/php
-PEARDIR=	${LOCALBASE}/${LPHP_LIB}
+PEARDIR=	${PHP_BASE}/${LPHP_LIB}
 PLIST_SUB=	PEARDIR=${LPHP_LIB}
 
 do-install:
@@ -33,4 +42,8 @@ do-install:
 	@${CP} -p ${FILESDIR}/Crypt_HCEMD5.php ${PEARDIR}/Crypt/HCEMD5.php
 	@${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${PEARDIR}/Crypt
 
-.include <bsd.port.mk>
+post-install:
+# Register a new package
+	@${PEAR} install -r -f ${WRKDIR}/package.xml
+
+.include <bsd.port.post.mk>
diff --git a/security/pear-Crypt_CBC/pkg-deinstall b/security/pear-Crypt_CBC/pkg-deinstall
new file mode 100644
index 0000000..c17e9d1
--- /dev/null
+++ b/security/pear-Crypt_CBC/pkg-deinstall
@@ -0,0 +1,13 @@
+#!/bin/sh
+#
+# $FreeBSD$
+#
+# Remove package declaration from PEAR's registry.
+
+if [ x$2 != xDEINSTALL ]; then
+    exit
+fi
+PKG_NAME=${1%%-[0-9._]*}
+PACKAGE=$(echo $PKG_NAME | sed 's/pear-//')
+
+${PKG_PREFIX}/bin/pear uninstall -r ${PACKAGE} || true
diff --git a/sysutils/pear-File/Makefile b/sysutils/pear-File/Makefile
index 73117c0..ec6b664 100644
--- a/sysutils/pear-File/Makefile
+++ b/sysutils/pear-File/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	File
 PORTVERSION=	1.0.2
+PORTREVISION=	1
 CATEGORIES=	sysutils www
 MASTER_SITES=	http://pear.php.net/get/
 PKGNAMEPREFIX=	pear-
@@ -16,8 +17,8 @@ DIST_SUBDIR=	PEAR
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	PEAR common file and directory routines
 
-BUILD_DEPENDS=	${PEARDIR}.DIST_PHP:${PORTSDIR}/devel/pear-install
-RUN_DEPENDS=	${PEARDIR}.DIST_PHP:${PORTSDIR}/devel/pear-install
+BUILD_DEPENDS=	${PEARDIR}/PEAR.php.dist:${PORTSDIR}/devel/pear-PEAR
+RUN_DEPENDS=	${BUILD_DEPENDS}
 
 NO_BUILD=	yes
 
@@ -25,14 +26,21 @@ NO_BUILD=	yes
 
 .if exists(${LOCALBASE}/bin/php-config)
 PHP_BASE!=	${LOCALBASE}/bin/php-config --prefix
+.else
+PHP_BASE!=	${LOCALBASE}
 .endif
+PEAR=		${LOCALBASE}/bin/pear
 LPHP_LIB=	lib/php
 PEARDIR=	${PHP_BASE}/${LPHP_LIB}
 PLIST_SUB=	PEARDIR=${LPHP_LIB}
 
 do-install:
 	@${CP} -Rp ${WRKSRC}/* ${PEARDIR}
-	@${CHOWN} -R root:wheel ${PEARDIR}/${PORTNAME}*
-	@${CHOWN} -R root:wheel ${PEARDIR}/tests
+	@${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${PEARDIR}/${PORTNAME}*
+	@${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${PEARDIR}/tests
+
+post-install:
+# Register a new package
+	@${PEAR} install -r -f ${WRKDIR}/package.xml
 
 .include <bsd.port.post.mk>
diff --git a/sysutils/pear-File/pkg-deinstall b/sysutils/pear-File/pkg-deinstall
new file mode 100644
index 0000000..c17e9d1
--- /dev/null
+++ b/sysutils/pear-File/pkg-deinstall
@@ -0,0 +1,13 @@
+#!/bin/sh
+#
+# $FreeBSD$
+#
+# Remove package declaration from PEAR's registry.
+
+if [ x$2 != xDEINSTALL ]; then
+    exit
+fi
+PKG_NAME=${1%%-[0-9._]*}
+PACKAGE=$(echo $PKG_NAME | sed 's/pear-//')
+
+${PKG_PREFIX}/bin/pear uninstall -r ${PACKAGE} || true
diff --git a/sysutils/pear-File/pkg-plist b/sysutils/pear-File/pkg-plist
index af92a14..85b9e5e 100644
--- a/sysutils/pear-File/pkg-plist
+++ b/sysutils/pear-File/pkg-plist
@@ -2,4 +2,3 @@
 %%PEARDIR%%/File.php
 %%PEARDIR%%/tests/parser.php
 %%PEARDIR%%/tests/test.csv
-@dirrm %%PEARDIR%%/tests
diff --git a/sysutils/pear-Log/Makefile b/sysutils/pear-Log/Makefile
index 56088d3..f6d920d 100644
--- a/sysutils/pear-Log/Makefile
+++ b/sysutils/pear-Log/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	Log
 PORTVERSION=	1.5.3
+PORTREVISION=	1
 CATEGORIES=	sysutils www
 MASTER_SITES=	http://pear.php.net/get/
 PKGNAMEPREFIX=	pear-
@@ -16,8 +17,8 @@ DIST_SUBDIR=	PEAR
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	PEAR logging utilities
 
-BUILD_DEPENDS=	${PEARDIR}.DIST_PHP:${PORTSDIR}/devel/pear-install
-RUN_DEPENDS=	${PEARDIR}.DIST_PHP:${PORTSDIR}/devel/pear-install
+BUILD_DEPENDS=	${PEARDIR}/PEAR.php.dist:${PORTSDIR}/devel/pear-PEAR
+RUN_DEPENDS=	${BUILD_DEPENDS}
 
 NO_BUILD=	yes
 
@@ -25,13 +26,20 @@ NO_BUILD=	yes
 
 .if exists(${LOCALBASE}/bin/php-config)
 PHP_BASE!=	${LOCALBASE}/bin/php-config --prefix
+.else
+PHP_BASE!=	${LOCALBASE}
 .endif
+PEAR=		${LOCALBASE}/bin/pear
 LPHP_LIB=	lib/php
 PEARDIR=	${PHP_BASE}/${LPHP_LIB}
 PLIST_SUB=	PEARDIR=${LPHP_LIB}
 
 do-install:
 	@${CP} -Rp ${WRKSRC}/* ${PEARDIR}
-	@${CHOWN} -R root:wheel ${PEARDIR}/${PORTNAME}*
+	@${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${PEARDIR}/${PORTNAME}*
+
+post-install:
+# Register a new package
+	@${PEAR} install -r -f ${WRKDIR}/package.xml
 
 .include <bsd.port.post.mk>
diff --git a/sysutils/pear-Log/pkg-deinstall b/sysutils/pear-Log/pkg-deinstall
new file mode 100644
index 0000000..c17e9d1
--- /dev/null
+++ b/sysutils/pear-Log/pkg-deinstall
@@ -0,0 +1,13 @@
+#!/bin/sh
+#
+# $FreeBSD$
+#
+# Remove package declaration from PEAR's registry.
+
+if [ x$2 != xDEINSTALL ]; then
+    exit
+fi
+PKG_NAME=${1%%-[0-9._]*}
+PACKAGE=$(echo $PKG_NAME | sed 's/pear-//')
+
+${PKG_PREFIX}/bin/pear uninstall -r ${PACKAGE} || true