diff -urN mail/pear-mailparse.orig/Makefile mail/pear-mailparse/Makefile
--- mail/pear-mailparse.orig/Makefile	Sat Apr 12 08:47:43 2003
+++ mail/pear-mailparse/Makefile	Sat May 24 23:18:28 2003
@@ -7,45 +7,37 @@
 
 PORTNAME=	mailparse
 PORTVERSION=	0.9.1
+PORTREVISION=	1
 CATEGORIES=	mail www
-MASTER_SITES=	http://pear.php.net/get/
-PKGNAMEPREFIX=	pear-
-EXTRACT_SUFX=	.tgz
-DIST_SUBDIR=	PEAR
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	PEAR classes to create and decode MIME messages
 
-BUILD_DEPENDS=	${LOCALBASE}/bin/phpize:${PORTSDIR}/www/mod_php4	\
-		${PEARDIR}/PEAR.php.dist:${PORTSDIR}/devel/pear-PEAR
-RUN_DEPENDS=	${PEARDIR}/PEAR.php.dist:${PORTSDIR}/devel/pear-PEAR
-
-USE_AUTOMAKE=	yes
-USE_AUTOCONF=	yes
+BUILD_DEPENDS=	${LOCALBASE}/bin/phpize:${PORTSDIR}/lang/php4		\
+		autoconf:${PORTSDIR}/devel/autoconf			\
+		autoconf213:${PORTSDIR}/devel/autoconf213		\
+		automake:${PORTSDIR}/devel/automake			\
+		automake14:${PORTSDIR}/devel/automake14			\
+		${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear-PEAR
+RUN_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear-PEAR
 
 .include <bsd.port.pre.mk>
+.include "${.CURDIR}/../../devel/pear-PEAR/Makefile.common"
 
 # Don't call autoconf directly, ./buildconf does this
 GNU_CONFIGURE=	yes
 USE_AUTOCONF=	no
-USE_LIBTOOL=	no
 USE_REINPLACE=	yes
 
 REINPLACE_ARGS=	-i.before_mailparse
 
 .if exists(${LOCALBASE}/bin/php-config)
-PHP_BASE!=	${LOCALBASE}/bin/php-config --prefix
 EXT_DIR!=	${LOCALBASE}/bin/php-config --extension-dir | ${SED} -e \
 			"s:${PHP_BASE}/::"
-.else
-PHP_BASE=	${LOCALBASE}
 .endif
-PEAR=		${LOCALBASE}/bin/pear
-LPHP_LIB=	lib/php
 PHP_DIR?=	${LOCALBASE}/etc
 PHP_INI=	${PHP_DIR}/php.ini
-PEARDIR=	${PHP_BASE}/${LPHP_LIB}
-PLIST_SUB=	EXTDIR=${EXT_DIR} PEARDIR=${LPHP_LIB}
+PLIST_SUB+=	EXTDIR=${EXT_DIR}
 
 DOCSDIR=	${PEARDIR}/docs/${PORTNAME}
 DOCS=		CREDITS README try.php
@@ -62,7 +54,7 @@
 	    ${FALSE} ; \
 	fi
 
-post-install:
+post-install-script:
 	@${STRIP_CMD} ${PHP_BASE}/${EXT_DIR}/mailparse.so
 # Configure extension_dir
 	@if [ ! -f ${PHP_INI} ]; then \
@@ -85,7 +77,5 @@
 	@${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${TESTDIR}
 	@${ECHO_MSG} "===> Examples installed in ${TESTDIR}."
 .endif
-# Register a new package
-	@${PEAR} install -r -f ${WRKDIR}/package.xml
 
 .include <bsd.port.post.mk>
diff -urN mail/pear-mailparse.orig/pkg-deinstall mail/pear-mailparse/pkg-deinstall
--- mail/pear-mailparse.orig/pkg-deinstall	Mon Feb 24 06:51:29 2003
+++ mail/pear-mailparse/pkg-deinstall	Thu Jan  1 01:00:00 1970
@@ -1,13 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD: ports/mail/pear-mailparse/pkg-deinstall,v 1.1 2003/02/24 05:51:29 edwin Exp $
-#
-# 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 -urN mail/pear-mailparse.orig/pkg-plist mail/pear-mailparse/pkg-plist
--- mail/pear-mailparse.orig/pkg-plist	Sun Feb  9 23:12:30 2003
+++ mail/pear-mailparse/pkg-plist	Fri May  2 23:47:51 2003
@@ -1,4 +1,5 @@
 %%EXTDIR%%/mailparse.so
+%%PKGREGDIR%%/package.xml
 %%PORTDOCS%%%%PEARDIR%%/docs/mailparse/CREDITS
 %%PORTDOCS%%%%PEARDIR%%/docs/mailparse/README
 %%PORTDOCS%%%%PEARDIR%%/docs/mailparse/try.php
@@ -22,3 +23,4 @@
 %%PORTDOCS%%@dirrm %%PEARDIR%%/docs/mailparse
 %%PORTDOCS%%@dirrm %%PEARDIR%%/tests/mailparse/tests/testdata
 %%PORTDOCS%%@dirrm %%PEARDIR%%/tests/mailparse/tests/
+@dirrm %%PKGREGDIR%%