[PATCH] simplify pear-* ports

	These patches do the following things for PEAR ports:

	* devel-pear-PEAR-Makefile.common.patch
	    - provides a do-install target and all that jazz in
	      devel/pear-PEAR/Makefile.common
	    - individual PEAR ports now just set a few variables:
	* pear-ports-Makefile.common-ng.patch
	    contains changes for all pear-* ports including devel/pear-PEAR

	See http://smradoch.innuendo.cz/FreeBSD/ for complete description.

Note: still missing are:
	devel/pear-HTML_Common
	devel/pear-I18N
	net/pear-Net_NNTP
	security/pear-Auth

PR:		ports/59213
Submitted by:	Roman Neuhauser <neuhauser@bellavista.cz>

10 files changed, 23 insertions, 54 deletions

diff --git a/net/pear-Net_SMTP/Makefile b/net/pear-Net_SMTP/Makefile
index 91346ac0f360..06e17422ae2f 100644
--- a/net/pear-Net_SMTP/Makefile
+++ b/net/pear-Net_SMTP/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	Net_SMTP
 PORTVERSION=	1.2.3
+PORTREVISION=	1
 CATEGORIES=	net mail www pear
 
 MAINTAINER=	ports@FreeBSD.org
@@ -17,13 +18,9 @@ BUILD_DEPENDS=	${PEARDIR}/Auth/SASL.php:${PORTSDIR}/security/pear-Auth_SASL \
 # The Auth_SASL package is no longer absolutely required, but it will be used if it is available.
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
-.include <bsd.port.pre.mk>
-.include "${.CURDIR}/../../devel/pear-PEAR/Makefile.common"
-
-MANIFEST=	Net/SMTP.php
-
-do-install:
-	@${CP} -p ${WRKSRC}/SMTP.php ${PEARDIR}/Net
-	@${CHOWN} ${SHAREOWN}:${SHAREGRP} ${PEARDIR}/${MANIFEST}
+CATEGORY=	Net
+FILES=		SMTP.php
 
+.include <bsd.port.pre.mk>
+.include "${PORTSDIR}/devel/pear-PEAR/Makefile.common"
 .include <bsd.port.post.mk>
diff --git a/net/pear-Net_SMTP/pkg-plist b/net/pear-Net_SMTP/pkg-plist
deleted file mode 100644
index 4d01f94a59c7..000000000000
--- a/net/pear-Net_SMTP/pkg-plist
+++ /dev/null
@@ -1,3 +0,0 @@
-%%PEARDIR%%/Net/SMTP.php
-%%PKGREGDIR%%/package.xml
-@dirrm %%PKGREGDIR%%
diff --git a/net/pear-Net_Sieve/Makefile b/net/pear-Net_Sieve/Makefile
index ce0ba59ccbbd..cb390d9cf3bb 100644
--- a/net/pear-Net_Sieve/Makefile
+++ b/net/pear-Net_Sieve/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	Net_Sieve
 PORTVERSION=	0.8.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	net www pear
 
 MAINTAINER=	ports@FreeBSD.org
@@ -16,12 +16,9 @@ COMMENT=	PEAR class to handle talking to timsieved
 BUILD_DEPENDS=	${PEARDIR}/Net/Socket.php:${PORTSDIR}/net/pear-Net_Socket
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
-.include <bsd.port.pre.mk>
-.include "${.CURDIR}/../../devel/pear-PEAR/Makefile.common"
-
-do-install:
-	@${CP} -Rp ${WRKSRC}/* ${PEARDIR}/Net
-	@${CHOWN} ${SHAREOWN}:${SHAREGRP} ${PEARDIR}/Net/Sieve.php
-	@${CHMOD} a-x ${PEARDIR}/Net/Sieve.php
+CATEGORY=	Net
+FILES=		Sieve.php
 
+.include <bsd.port.pre.mk>
+.include "${PORTSDIR}/devel/pear-PEAR/Makefile.common"
 .include <bsd.port.post.mk>
diff --git a/net/pear-Net_Sieve/pkg-plist b/net/pear-Net_Sieve/pkg-plist
deleted file mode 100644
index 769b8a5fea1c..000000000000
--- a/net/pear-Net_Sieve/pkg-plist
+++ /dev/null
@@ -1,3 +0,0 @@
-%%PEARDIR%%/Net/Sieve.php
-%%PKGREGDIR%%/package.xml
-@dirrm %%PKGREGDIR%%
diff --git a/net/pear-Net_Socket/Makefile b/net/pear-Net_Socket/Makefile
index dda8685b7387..1b00ff5baade 100644
--- a/net/pear-Net_Socket/Makefile
+++ b/net/pear-Net_Socket/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	Net_Socket
 PORTVERSION=	1.0.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net www pear
 
 MAINTAINER=	ports@FreeBSD.org
@@ -16,12 +16,9 @@ COMMENT=	PEAR Network Socket Interface
 BUILD_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear-PEAR
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
-.include <bsd.port.pre.mk>
-.include "${.CURDIR}/../../devel/pear-PEAR/Makefile.common"
-
-do-install:
-	@${MKDIR} ${PEARDIR}/Net
-	@${CP} -Rp ${WRKSRC}/* ${PEARDIR}/Net
-	@${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${PEARDIR}/Net
+CATEGORY=	Net
+FILES=		Socket.php
 
+.include <bsd.port.pre.mk>
+.include "${PORTSDIR}/devel/pear-PEAR/Makefile.common"
 .include <bsd.port.post.mk>
diff --git a/net/pear-Net_Socket/pkg-plist b/net/pear-Net_Socket/pkg-plist
deleted file mode 100644
index da686f64a0e6..000000000000
--- a/net/pear-Net_Socket/pkg-plist
+++ /dev/null
@@ -1,4 +0,0 @@
-%%PEARDIR%%/Net/Socket.php
-%%PKGREGDIR%%/package.xml
-@dirrm %%PKGREGDIR%%
-@unexec rmdir %D/share/pear/Net 2> /dev/null || true
diff --git a/net/pear-Net_URL/Makefile b/net/pear-Net_URL/Makefile
index 69f0b6fd4aa7..285d1b5d8505 100644
--- a/net/pear-Net_URL/Makefile
+++ b/net/pear-Net_URL/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	Net_URL
 PORTVERSION=	1.0.10
+PORTREVISION=	1
 CATEGORIES=	net www pear
 MASTER_SITES=	http://pear.php.net/get/
 PKGNAMEPREFIX=	pear-
@@ -19,13 +20,9 @@ COMMENT=	Easy parsing of Urls
 BUILD_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear-PEAR
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
+CATEGORY=	Net
+FILES=		URL.php
+
 .include <bsd.port.pre.mk>
 .include "${PORTSDIR}/devel/pear-PEAR/Makefile.common"
-
-do-install:
-	@${INSTALL} -d -m 755 ${PKGREGDIR}
-	@${INSTALL} -d -m 755 ${PEARDIR}/Net
-	@${INSTALL_DATA} ${WRKDIR}/package.xml ${PKGREGDIR}
-	@${INSTALL_DATA} ${WRKSRC}/URL.php ${PEARDIR}/Net
-
 .include <bsd.port.post.mk>
diff --git a/net/pear-Net_URL/pkg-plist b/net/pear-Net_URL/pkg-plist
deleted file mode 100644
index 72900be63c12..000000000000
--- a/net/pear-Net_URL/pkg-plist
+++ /dev/null
@@ -1,3 +0,0 @@
-%%PEARDIR%%/Net/URL.php
-%%PKGREGDIR%%/package.xml
-@unexec rmdir %%PKGREGDIR%% 2>/dev/null || true
diff --git a/net/pear-Net_URL2/Makefile b/net/pear-Net_URL2/Makefile
index 69f0b6fd4aa7..285d1b5d8505 100644
--- a/net/pear-Net_URL2/Makefile
+++ b/net/pear-Net_URL2/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	Net_URL
 PORTVERSION=	1.0.10
+PORTREVISION=	1
 CATEGORIES=	net www pear
 MASTER_SITES=	http://pear.php.net/get/
 PKGNAMEPREFIX=	pear-
@@ -19,13 +20,9 @@ COMMENT=	Easy parsing of Urls
 BUILD_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear-PEAR
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
+CATEGORY=	Net
+FILES=		URL.php
+
 .include <bsd.port.pre.mk>
 .include "${PORTSDIR}/devel/pear-PEAR/Makefile.common"
-
-do-install:
-	@${INSTALL} -d -m 755 ${PKGREGDIR}
-	@${INSTALL} -d -m 755 ${PEARDIR}/Net
-	@${INSTALL_DATA} ${WRKDIR}/package.xml ${PKGREGDIR}
-	@${INSTALL_DATA} ${WRKSRC}/URL.php ${PEARDIR}/Net
-
 .include <bsd.port.post.mk>
diff --git a/net/pear-Net_URL2/pkg-plist b/net/pear-Net_URL2/pkg-plist
deleted file mode 100644
index 72900be63c12..000000000000
--- a/net/pear-Net_URL2/pkg-plist
+++ /dev/null
@@ -1,3 +0,0 @@
-%%PEARDIR%%/Net/URL.php
-%%PKGREGDIR%%/package.xml
-@unexec rmdir %%PKGREGDIR%% 2>/dev/null || true