3 files changed, 24 insertions, 38 deletions

diff --git a/lang/php_doc/Makefile b/lang/php_doc/Makefile
index e929f7a5b711..52faeb543042 100644
--- a/lang/php_doc/Makefile
+++ b/lang/php_doc/Makefile
@@ -6,41 +6,23 @@
 #
 
 PORTNAME=	php_doc
-PORTVERSION=	1.20021101
+PORTVERSION=	20040518
 CATEGORIES?=	lang
-MASTER_SITES=	${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	dirk
-DISTNAME=	php_manual_${PHP_LANG}
+MASTER_SITES=	http://www.mavetju.org/download/adopted/
+DISTNAME=	php_manual_${PHP_LANG}-${PORTVERSION}
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	edwin@mavetju.org
 COMMENT=	PHP documentation in HTML
 
 NO_BUILD=	YES
 NO_WRKSUBDIR=	YES
 SLAVEDIRS=	french/php_doc german/php_doc japanese/php_doc
-USE_BZIP2=	YES
 
 PHP_LANG?=	en
-PHPDOCDIR=	${PREFIX}/share/doc/php
+PHPDOCDIR=	${PREFIX}/share/doc/php-${PHP_LANG}
+PLIST=		${WRKDIR}/pkg-plist
 
-.if ${PHP_LANG} != en
-PKGNAMEPREFIX=	${PHP_LANG}-
-PLIST=		${PKGDIR}/pkg-plist.${PHP_LANG}
-PHPDOCDIR=	${PREFIX}/share/doc/${PHP_LANG}-php
-
-.if ${PHP_LANG} == de
-PORTVERSION=	1.20021103
-.endif
-.if ${PHP_LANG} == es
-PORTVERSION=	1.20021104
-.endif
-.if ${PHP_LANG} == fr
-PORTVERSION=	1.20020708
-.endif
-.if ${PHP_LANG} == ja
-PORTVERSION=	1.20021104
-.endif
-.endif
+PKGNAMESUFFIX=	-${PHP_LANG}
 
 PLIST_SUB=	PHPDOCDIR=${PHPDOCDIR:S/^${PREFIX}\///}
 
@@ -56,10 +38,15 @@ pre-fetch:
 	@${ECHO}
 .endif
 
+pre-install:
+	${FIND} ${WRKDIR} -type f ! -name '.*' | ${SED} -e "s,${WRKDIR},%%PHPDOCDIR%%," > ${PLIST}
+	${FIND} ${WRKDIR} -type d | ${SORT} -r | ${SED} -e "s,${WRKDIR},@dirrm %%PHPDOCDIR%%," >> ${PLIST}
+
 do-install:
 	@${MKDIR} ${PHPDOCDIR}
-	@for i in ${WRKSRC}/*; do \
-		${INSTALL_DATA} $$i ${PHPDOCDIR}; \
+	${FIND} ${WRKDIR} -type d | ${SED} -e "s,${WRKDIR},${PHPDOCDIR}/," | ${XARGS} ${MKDIR}
+	for f in `${FIND} ${WRKDIR} -type f ! -name '.*' | ${SED} -e "s,${WRKDIR}/,,"`; do \
+		${INSTALL_DATA} ${WRKDIR}/$$f ${PHPDOCDIR}/$$f; \
 	done
 
 # this is for the maintainer only
diff --git a/lang/php_doc/distinfo b/lang/php_doc/distinfo
index 509a263c5550..18e5e7a225a3 100644
--- a/lang/php_doc/distinfo
+++ b/lang/php_doc/distinfo
@@ -1,10 +1,5 @@
-MD5 (php_manual_de.tar.bz2) = 45b1e9d2e2a326e79d6cca768e72fb07
-SIZE (php_manual_de.tar.bz2) = 1106125
-MD5 (php_manual_en.tar.bz2) = 9905a4a18891e79c9c462ddc52b58a57
-SIZE (php_manual_en.tar.bz2) = 1048870
-MD5 (php_manual_es.tar.bz2) = 0f404259bad1e4d592e65b74ede3ba65
-SIZE (php_manual_es.tar.bz2) = 982461
-MD5 (php_manual_fr.tar.bz2) = b0458e075f8aac862c7e32215d6b5de7
-SIZE (php_manual_fr.tar.bz2) = 974933
-MD5 (php_manual_ja.tar.bz2) = e2f5c083fe84726b3dec3e1a9ef11795
-SIZE (php_manual_ja.tar.bz2) = 1010527
+MD5 (php_manual_de-20040518.tar.gz) = 756aa8c4c3ed5f29dbcf0ca9d9a7e69f
+MD5 (php_manual_en-20040518.tar.gz) = 4bb4f913320e9ef86b051280cf25c248
+MD5 (php_manual_es-20040518.tar.gz) = 5e84af53852e35a831e6c661932e408f
+MD5 (php_manual_fr-20040518.tar.gz) = cde0db8a0ec924203e362ff8177c5172
+MD5 (php_manual_ja-20040518.tar.gz) = 2f4dd3e23deec72d5b058dcbda5527a1
diff --git a/lang/php_doc/pkg-descr b/lang/php_doc/pkg-descr
index a9e59f5b9197..443aae797e35 100644
--- a/lang/php_doc/pkg-descr
+++ b/lang/php_doc/pkg-descr
@@ -1,3 +1,7 @@
 PHP documentation in HTML.
 
-WWW: http://www.php.net/docs.php
+If you feel that the documentation is too much out of sync with the
+files available from the URL below, feel free to contact the
+maintainer about it.
+
+WWW: http://www.php.net/download-docs.php