6 files changed, 10 insertions, 56 deletions
diff --git a/www/pear-HTTP_Session/Makefile b/www/pear-HTTP_Session/Makefile
index 5b94c8a269f0..6145ca927186 100644
--- a/www/pear-HTTP_Session/Makefile
+++ b/www/pear-HTTP_Session/Makefile
@@ -15,22 +15,10 @@ COMMENT=	PEAR Object-oriented interface to the session_* family functions
 BUILD_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear-PEAR
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
+FILES=		Session.php Session/Container.php Session/Container/DB.php
+EXAMPLES=	HTTP_Session_Example.php sessiondata.sql
+_EXAMPLESDIR=	docs
+
 .include <bsd.port.pre.mk>
 .include "${PORTSDIR}/devel/pear-PEAR/Makefile.common"
-
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-	@${INSTALL_DATA} ${WRKSRC}/docs/sessiondata.sql ${DOCSDIR}
-	@${INSTALL_DATA} ${WRKSRC}/docs/HTTP_Session_Example.php ${DOCSDIR}
-	@${ECHO_MSG} "===> Documentation installed in ${DOCSDIR}."
-.endif
-
-do-install:
-	@${MKDIR} ${PEARDIR}/Session/Container
-	@${CP} -p ${WRKSRC}/Session/Container/DB.php ${PEARDIR}/Session/Container
-	@${CP} -p ${WRKSRC}/Session/Container.php ${PEARDIR}/Session
-	@${CP} ${WRKSRC}/Session.php ${PEARDIR}
-	@${CHOWN} ${SHAREOWN}:${SHAREGRP} ${PEARDIR}/Session.php
-	@${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${PEARDIR}/Session
-
 .include <bsd.port.post.mk>
diff --git a/www/pear-HTTP_Session/pkg-descr b/www/pear-HTTP_Session/pkg-descr
index 0044e1adbf32..91fd113c536f 100644
--- a/www/pear-HTTP_Session/pkg-descr
+++ b/www/pear-HTTP_Session/pkg-descr
@@ -4,4 +4,4 @@ session data using DB package. It introduces new methods
 like isNew(), useCookies(), setExpire(), setIdle(),
 isExpired(), isIdled() and others.
 
-WWW: http://pear.php.net/package-info.php?package=HTTP_Session
+WWW: http://pear.php.net/package/HTTP_Session/
diff --git a/www/pear-HTTP_Session/pkg-plist b/www/pear-HTTP_Session/pkg-plist
deleted file mode 100644
index f61cf5d6d37b..000000000000
--- a/www/pear-HTTP_Session/pkg-plist
+++ /dev/null
@@ -1,11 +0,0 @@
-%%PEARDIR%%/Session.php
-%%PEARDIR%%/Session/Container.php
-%%PEARDIR%%/Session/Container/DB.php
-%%PKGREGDIR%%/package.xml
-%%PORTDOCS%%%%DOCSDIR%%/HTTP_Session_Example.php
-%%PORTDOCS%%%%DOCSDIR%%/sessiondata.sql
-@dirrm %%PEARDIR%%/Session/Container
-@unexec rmdir %D/%%PEARDIR%%/Session/Container 2>/dev/null || true
-@unexec rmdir %D/%%PEARDIR%%/Session 2>/dev/null || true
-@dirrm %%PKGREGDIR%%
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/www/pear-HTTP_Session2/Makefile b/www/pear-HTTP_Session2/Makefile
index 5b94c8a269f0..6145ca927186 100644
--- a/www/pear-HTTP_Session2/Makefile
+++ b/www/pear-HTTP_Session2/Makefile
@@ -15,22 +15,10 @@ COMMENT=	PEAR Object-oriented interface to the session_* family functions
 BUILD_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear-PEAR
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
+FILES=		Session.php Session/Container.php Session/Container/DB.php
+EXAMPLES=	HTTP_Session_Example.php sessiondata.sql
+_EXAMPLESDIR=	docs
+
 .include <bsd.port.pre.mk>
 .include "${PORTSDIR}/devel/pear-PEAR/Makefile.common"
-
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-	@${INSTALL_DATA} ${WRKSRC}/docs/sessiondata.sql ${DOCSDIR}
-	@${INSTALL_DATA} ${WRKSRC}/docs/HTTP_Session_Example.php ${DOCSDIR}
-	@${ECHO_MSG} "===> Documentation installed in ${DOCSDIR}."
-.endif
-
-do-install:
-	@${MKDIR} ${PEARDIR}/Session/Container
-	@${CP} -p ${WRKSRC}/Session/Container/DB.php ${PEARDIR}/Session/Container
-	@${CP} -p ${WRKSRC}/Session/Container.php ${PEARDIR}/Session
-	@${CP} ${WRKSRC}/Session.php ${PEARDIR}
-	@${CHOWN} ${SHAREOWN}:${SHAREGRP} ${PEARDIR}/Session.php
-	@${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${PEARDIR}/Session
-
 .include <bsd.port.post.mk>
diff --git a/www/pear-HTTP_Session2/pkg-descr b/www/pear-HTTP_Session2/pkg-descr
index 0044e1adbf32..91fd113c536f 100644
--- a/www/pear-HTTP_Session2/pkg-descr
+++ b/www/pear-HTTP_Session2/pkg-descr
@@ -4,4 +4,4 @@ session data using DB package. It introduces new methods
 like isNew(), useCookies(), setExpire(), setIdle(),
 isExpired(), isIdled() and others.
 
-WWW: http://pear.php.net/package-info.php?package=HTTP_Session
+WWW: http://pear.php.net/package/HTTP_Session/
diff --git a/www/pear-HTTP_Session2/pkg-plist b/www/pear-HTTP_Session2/pkg-plist
deleted file mode 100644
index f61cf5d6d37b..000000000000
--- a/www/pear-HTTP_Session2/pkg-plist
+++ /dev/null
@@ -1,11 +0,0 @@
-%%PEARDIR%%/Session.php
-%%PEARDIR%%/Session/Container.php
-%%PEARDIR%%/Session/Container/DB.php
-%%PKGREGDIR%%/package.xml
-%%PORTDOCS%%%%DOCSDIR%%/HTTP_Session_Example.php
-%%PORTDOCS%%%%DOCSDIR%%/sessiondata.sql
-@dirrm %%PEARDIR%%/Session/Container
-@unexec rmdir %D/%%PEARDIR%%/Session/Container 2>/dev/null || true
-@unexec rmdir %D/%%PEARDIR%%/Session 2>/dev/null || true
-@dirrm %%PKGREGDIR%%
-%%PORTDOCS%%@dirrm %%DOCSDIR%%