--- mail/pear-Mail_Mime/Makefile	Tue Feb 25 22:36:30 2003
+++ mail/pear-Mail_Mime/Makefile	Sat May 24 14:32:23 2003
@@ -7,32 +7,17 @@ 
 
 PORTNAME=	Mail_Mime
 PORTVERSION=	1.2.1
-PORTREVISION=	1
+PORTREVISION=	2
 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=	${PEARDIR}/PEAR.php.dist:${PORTSDIR}/devel/pear-PEAR
-RUN_DEPENDS=	${PEARDIR}.DIST_PHP:${PORTSDIR}/devel/pear-install
-
-NO_BUILD=	yes
+BUILD_DEPENDS=	${PEARDIR}/Mail/mail.php:${PORTSDIR}/mail/pear-Mail
+RUN_DEPENDS=	${BUILD_DEPENDS}
 
 .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=	${PHP_BASE}/${LPHP_LIB}
-PLIST_SUB=	PEARDIR=${LPHP_LIB}
+.include "${.CURDIR}/../../devel/pear-PEAR/Makefile.common"
 
 do-install:
 	@${CP} -Rp ${WRKSRC}/* ${PEARDIR}/Mail
@@ -40,9 +25,5 @@ 
 .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>
--- mail/pear-Mail_Mime/pkg-deinstall	Mon Feb 24 06:27:41 2003
+++ mail/pear-Mail_Mime/pkg-deinstall	Thu Jan  1 01:00:00 1970
@@ -1,13 +0,0 @@ 
-#!/bin/sh
-#
-# $FreeBSD: ports/mail/pear-Mail_Mime/pkg-deinstall,v 1.1 2003/02/24 05:27:41 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
--- mail/pear-Mail_Mime/pkg-install	Thu Jan  1 01:00:00 1970
+++ mail/pear-Mail_Mime/pkg-install	Tue Apr  8 22:16:30 2003
@@ -0,0 +1,14 @@ 
+#!/bin/sh
+#
+# $FreeBSD$
+#
+# Register the package $1 in the port registry
+
+PREFIX=${PKG_PREFIX:-/usr/local}
+PEAR=${PREFIX}/bin/pear
+PKGREGDIR=${PREFIX}/.PEAR.pkg/$1
+
+[ "x$1" = "x" ] && exit 1
+if [ "x$2" = "xPOST-INSTALL" ]; then
+	${PEAR} install -r -f ${PKGREGDIR}/package.xml
+fi