4 files changed, 12 insertions, 34 deletions

diff --git a/archivers/pear-Archive_Tar/Makefile b/archivers/pear-Archive_Tar/Makefile
index 7f0335e9a5d3..8b8c98131983 100644
--- a/archivers/pear-Archive_Tar/Makefile
+++ b/archivers/pear-Archive_Tar/Makefile
@@ -6,50 +6,26 @@
 #
 
 PORTNAME=	Archive_Tar
-PORTVERSION=	1.0
-PORTREVISION=	1
+PORTVERSION=	1.1
 CATEGORIES=	archivers www
-MASTER_SITES=	http://pear.php.net/get/
-PKGNAMEPREFIX=	pear-
-EXTRACT_SUFX=	.tgz
-DIST_SUBDIR=	PEAR
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	PEAR tar file management class
-COMMENT=	PEAR tar file management class
 
-BUILD_DEPENDS=	${PEARDIR}/PEAR.php.dist:${PORTSDIR}/devel/pear-PEAR
+BUILD_DEPENDS=	pear:${PORTSDIR}/lang/php4
 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}
-
-DOCSDIR=	${PEARDIR}/docs/Archive_Tar
+.include "${.CURDIR}/../../devel/pear-PEAR/Makefile.common"
 
 do-install:
-	@${MV} ${PEARDIR}/Archive ${PEARDIR}/Archive.dist
+	@${MKDIR} ${PEARDIR}/Archive
 	@${CP} -Rp ${WRKSRC}/Archive ${PEARDIR}
 	@${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${PEARDIR}/Archive
 .if !defined(NOPORTDOCS)
-	@${MV} ${DOCSDIR} ${DOCSDIR}.dist
 	@${MKDIR} ${DOCSDIR}
 	@${INSTALL_DATA} ${WRKSRC}/docs/Archive_Tar.txt ${DOCSDIR}
 	@${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/archivers/pear-Archive_Tar/distinfo b/archivers/pear-Archive_Tar/distinfo
index 7258ae5fedbc..eb18f7d42456 100644
--- a/archivers/pear-Archive_Tar/distinfo
+++ b/archivers/pear-Archive_Tar/distinfo
@@ -1 +1 @@
-MD5 (PEAR/Archive_Tar-1.0.tgz) = 15e5dd6e46b339136e7d2b68f438249a
+MD5 (PEAR/Archive_Tar-1.1.tgz) = 474e37d367f1b96b92809baab00c0464
diff --git a/archivers/pear-Archive_Tar/pkg-descr b/archivers/pear-Archive_Tar/pkg-descr
index 29f95397944d..5baa215e6948 100644
--- a/archivers/pear-Archive_Tar/pkg-descr
+++ b/archivers/pear-Archive_Tar/pkg-descr
@@ -2,5 +2,6 @@ This class provides handling of tar files in PHP.
 
 It supports creating, listing, extracting and adding to tar files.
 Gzip support is available if PHP has the zlib extension built-in or loaded.
+ Bz2 compression is also supported with the bz2 extension loaded.
 
-WWW: http://pear.php.net/manual/en/packages.file.archive-tar.php
+WWW: http://pear.php.net/package-info.php?package=Archive_Tar
diff --git a/archivers/pear-Archive_Tar/pkg-plist b/archivers/pear-Archive_Tar/pkg-plist
index 273ae53d976e..d9d9709b467d 100644
--- a/archivers/pear-Archive_Tar/pkg-plist
+++ b/archivers/pear-Archive_Tar/pkg-plist
@@ -1,8 +1,9 @@
-@exec mv %D/lib/php/Archive %D/lib/php/Archive.dist
-%%PORTDOCS%%@exec mv %D/lib/php/docs/Archive_Tar %D/lib/php/docs/Archive_Tar.dist
 %%PEARDIR%%/Archive/Tar.php
+%%PKGREGDIR%%/package.xml
 %%PORTDOCS%%%%PEARDIR%%/docs/Archive_Tar/Archive_Tar.txt
 @dirrm %%PEARDIR%%/Archive
+@dirrm %%PKGREGDIR%%
 %%PORTDOCS%%@dirrm %%PEARDIR%%/docs/Archive_Tar
-@unexec mv %D/lib/php/Archive.dist %D/lib/php/Archive || true
-%%PORTDOCS%%@unexec mv %D/lib/php/docs/Archive_Tar.dist %D/lib/php/docs/Archive_Tar || true
+@unexec rmdir %D/share/pear/docs 2> /dev/null || true
+@unexec rmdir %D/share/pear/.registry 2> /dev/null || true
+@unexec rmdir %D/share/pear/packages 2> /dev/null || true