10 files changed, 16 insertions, 91 deletions

diff --git a/security/pear-Auth/Makefile b/security/pear-Auth/Makefile
index b27185860141..d14676343a87 100644
--- a/security/pear-Auth/Makefile
+++ b/security/pear-Auth/Makefile
@@ -7,31 +7,17 @@
 
 PORTNAME=	Auth
 PORTVERSION=	1.2.0
+PORTREVISION=	1
 CATEGORIES=	security www
-MASTER_SITES=	http://pear.php.net/get/
-PKGNAMEPREFIX=	pear-
-EXTRACT_SUFX=	.tgz
-DIST_SUBDIR=	PEAR
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	PEAR authentication methods
 
-BUILD_DEPENDS=	${PEARDIR}/PEAR.php.dist:${PORTSDIR}/devel/pear-PEAR
+BUILD_DEPENDS=	${PEARDIR}/PEAR.php:${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=	${PHP_BASE}/${LPHP_LIB}
-PLIST_SUB=	PEARDIR=${LPHP_LIB}
+.include "${.CURDIR}/../../devel/pear-PEAR/Makefile.common"
 
 MANIFEST=	Auth.php Container Container.php
 
@@ -43,8 +29,4 @@ do-install:
 	@${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${PEARDIR}/Auth
 	@${CHMOD} -R a-x ${PEARDIR}/Auth/Container/*.php
 
-post-install:
-# Register a new package
-	@${PEAR} install -r -f ${WRKDIR}/package.xml
-
 .include <bsd.port.post.mk>
diff --git a/security/pear-Auth/pkg-deinstall b/security/pear-Auth/pkg-deinstall
deleted file mode 100644
index c17e9d19ced0..000000000000
--- a/security/pear-Auth/pkg-deinstall
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/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-Auth/pkg-plist b/security/pear-Auth/pkg-plist
index ef71d90ca45c..eaf0cdd3898c 100644
--- a/security/pear-Auth/pkg-plist
+++ b/security/pear-Auth/pkg-plist
@@ -8,5 +8,7 @@
 %%PEARDIR%%/Auth/Container/RADIUS.php
 %%PEARDIR%%/Auth/Container/SOAP.php
 %%PEARDIR%%/Auth/Container/vpopmail.php
+%%PKGREGDIR%%/package.xml
 @dirrm %%PEARDIR%%/Auth/Container
 @dirrm %%PEARDIR%%/Auth
+@dirrm %%PKGREGDIR%%
diff --git a/security/pear-Auth_SASL/Makefile b/security/pear-Auth_SASL/Makefile
index f422354793cc..5fc46edc5913 100644
--- a/security/pear-Auth_SASL/Makefile
+++ b/security/pear-Auth_SASL/Makefile
@@ -7,12 +7,8 @@
 
 PORTNAME=	Auth_SASL
 PORTVERSION=	1.0.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	security www
-MASTER_SITES=	http://pear.php.net/get/
-PKGNAMEPREFIX=	pear-
-EXTRACT_SUFX=	.tgz
-DIST_SUBDIR=	PEAR
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	PEAR abstraction of various SASL mechanism responses
@@ -20,19 +16,8 @@ COMMENT=	PEAR abstraction of various SASL mechanism responses
 BUILD_DEPENDS=	${PEARDIR}/Auth/Auth.php:${PORTSDIR}/security/pear-Auth
 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=	${PHP_BASE}/${LPHP_LIB}
-PLIST_SUB=	PEARDIR=${LPHP_LIB}
+.include "${.CURDIR}/../../devel/pear-PEAR/Makefile.common"
 
 MANIFEST=	SASL.php SASL
 
@@ -44,8 +29,4 @@ do-install:
 	@${CHMOD} a-x ${PEARDIR}/Auth/SASL/*
 	@${CHMOD} a-x ${PEARDIR}/Auth/SASL.php
 
-post-install:
-# Register a new package
-	@${PEAR} install -r -f ${WRKDIR}/package.xml
-
 .include <bsd.port.post.mk>
diff --git a/security/pear-Auth_SASL/pkg-deinstall b/security/pear-Auth_SASL/pkg-deinstall
deleted file mode 100644
index c17e9d19ced0..000000000000
--- a/security/pear-Auth_SASL/pkg-deinstall
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/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-Auth_SASL/pkg-descr b/security/pear-Auth_SASL/pkg-descr
index afaefb265022..7750e6715e3d 100644
--- a/security/pear-Auth_SASL/pkg-descr
+++ b/security/pear-Auth_SASL/pkg-descr
@@ -6,4 +6,4 @@ o Plain
 o Anonymous
 o Login (Pseudo mechanism).
 
-WWW: http://pear.php.net/package-info.php?pacid=123
+WWW: http://pear.php.net/package-info.php?package=Auth_SASL
diff --git a/security/pear-Auth_SASL/pkg-plist b/security/pear-Auth_SASL/pkg-plist
index 5621d945fdc2..5b786210180e 100644
--- a/security/pear-Auth_SASL/pkg-plist
+++ b/security/pear-Auth_SASL/pkg-plist
@@ -5,4 +5,6 @@
 %%PEARDIR%%/Auth/SASL/DigestMD5.php
 %%PEARDIR%%/Auth/SASL/Login.php
 %%PEARDIR%%/Auth/SASL/Plain.php
+%%PKGREGDIR%%/package.xml
 @dirrm %%PEARDIR%%/Auth/SASL
+@dirrm %%PKGREGDIR%%
diff --git a/security/pear-Crypt_CBC/Makefile b/security/pear-Crypt_CBC/Makefile
index 89a452ca4b94..3e301a771c35 100644
--- a/security/pear-Crypt_CBC/Makefile
+++ b/security/pear-Crypt_CBC/Makefile
@@ -7,39 +7,21 @@
 
 PORTNAME=	Crypt_CBC
 PORTVERSION=	0.4
+PORTREVISION=	1
 CATEGORIES=	security www
-MASTER_SITES=	http://pear.php.net/get/
-PKGNAMEPREFIX=	pear-
-EXTRACT_SUFX=	.tgz
-DIST_SUBDIR=	PEAR
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	PEAR class to emulate Perl's Crypt::CBC module
 
-BUILD_DEPENDS=	${PEARDIR}/PEAR.php.dist:${PORTSDIR}/devel/pear-PEAR
+BUILD_DEPENDS=	${PEARDIR}/PEAR.php:${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=	${PHP_BASE}/${LPHP_LIB}
-PLIST_SUB=	PEARDIR=${LPHP_LIB}
+.include "${.CURDIR}/../../devel/pear-PEAR/Makefile.common"
 
 do-install:
 	@${MKDIR} ${PEARDIR}/Crypt
 	@${CP} -Rp ${WRKSRC}/CBC.php ${PEARDIR}/Crypt
 	@${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${PEARDIR}/Crypt
 
-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-descr b/security/pear-Crypt_CBC/pkg-descr
index af138b21b04f..dd4723d43949 100644
--- a/security/pear-Crypt_CBC/pkg-descr
+++ b/security/pear-Crypt_CBC/pkg-descr
@@ -1,3 +1,3 @@
 A PEAR class to emulate Perl's Crypt::CBC module.
 
-WWW: http://pear.php.net/package-info.php?pacid=48
+WWW: http://pear.php.net/package-info.php?package=Crypt_CBC
diff --git a/security/pear-Crypt_CBC/pkg-plist b/security/pear-Crypt_CBC/pkg-plist
index e873b488ba5f..82ab5e846889 100644
--- a/security/pear-Crypt_CBC/pkg-plist
+++ b/security/pear-Crypt_CBC/pkg-plist
@@ -1,2 +1,4 @@
 %%PEARDIR%%/Crypt/CBC.php
+%%PKGREGDIR%%/package.xml
 @dirrm %%PEARDIR%%/Crypt
+@dirrm %%PKGREGDIR%%