Date: Wed, 24 Sep 2003 13:21:59 +0200 (CEST)
From: Roman Neuhauser <neuhauser@bellavista.cz>
To: FreeBSD-gnats-submit@FreeBSD.org
Subject: ports/57155: make pear-* ports use standard ${DOCSDIR}
Message-ID: <20030924112159.911A52FDA01@freepuppy.bellavista.cz>
Resent-Message-ID: <200309241130.h8OBU1Md046803@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 57155
>Category: ports
>Synopsis: make pear-* ports use standard ${DOCSDIR}
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Wed Sep 24 04:30:01 PDT 2003
>Closed-Date:
>Last-Modified:
>Originator: Roman Neuhauser
>Release: FreeBSD 4.8-STABLE i386
>Organization:
>Environment:
System: FreeBSD freepuppy.bellavista.cz 4.8-STABLE FreeBSD 4.8-STABLE #3: Tue Aug 26 12:34:53 CEST 2003 roman@freepuppy.bellavista.cz:/usr/obj/usr/src/sys/FREEPUPPY2_5 i386
>Description:
As it is, pear-* ports install their documentation in
${PREFIX}/share/pear/<port>/docs. I believe the location should
be ${PREFIX}/share/doc/pear/<port>: WTF factor, hier(7), yada yada.
>How-To-Repeat:
>Fix:
--- pear-ports-standard-DOCSDIR.patch begins here ---
diff -urN ./archivers/pear-Archive_Tar.1/pkg-plist ./archivers/pear-Archive_Tar/pkg-plist
--- ./archivers/pear-Archive_Tar.1/pkg-plist Wed Jun 11 15:28:04 2003
+++ ./archivers/pear-Archive_Tar/pkg-plist Wed Sep 24 12:48:08 2003
@@ -1,9 +1,9 @@
%%PEARDIR%%/Archive/Tar.php
%%PKGREGDIR%%/package.xml
-%%PORTDOCS%%%%PEARDIR%%/docs/Archive_Tar/Archive_Tar.txt
+%%PORTDOCS%%%%DOCSDIR%%/Archive_Tar.txt
@dirrm %%PEARDIR%%/Archive
@dirrm %%PKGREGDIR%%
-%%PORTDOCS%%@dirrm %%PEARDIR%%/docs/Archive_Tar
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
@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
diff -urN ./devel/pear-Config.1/pkg-plist ./devel/pear-Config/pkg-plist
--- ./devel/pear-Config.1/pkg-plist Mon Sep 8 02:34:19 2003
+++ ./devel/pear-Config/pkg-plist Wed Sep 24 12:48:08 2003
@@ -7,10 +7,10 @@
%%PEARDIR%%/Config/Container/PHPArray.php
%%PEARDIR%%/Config/Container/XML.php
%%PKGREGDIR%%/package.xml
-%%PORTDOCS%%%%PEARDIR%%/docs/Config/Apache.php
-%%PORTDOCS%%%%PEARDIR%%/docs/Config/IniCommented.php
-%%PORTDOCS%%%%PEARDIR%%/docs/Config/IniFromScratch.php
+%%PORTDOCS%%%%DOCSDIR%%/Apache.php
+%%PORTDOCS%%%%DOCSDIR%%/IniCommented.php
+%%PORTDOCS%%%%DOCSDIR%%/IniFromScratch.php
@dirrm %%PEARDIR%%/Config/Container
@dirrm %%PEARDIR%%/Config
@dirrm %%PKGREGDIR%%
-%%PORTDOCS%%@dirrm %%PEARDIR%%/docs/Config
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff -urN ./devel/pear-PEAR.1/Makefile.common ./devel/pear-PEAR/Makefile.common
--- ./devel/pear-PEAR.1/Makefile.common Mon Aug 25 03:12:22 2003
+++ ./devel/pear-PEAR/Makefile.common Wed Sep 24 12:37:34 2003
@@ -24,8 +24,8 @@
PKGINSTALL= ${.CURDIR}/../../devel/pear-PEAR/pkg-install
PKGDEINSTALL= ${.CURDIR}/../../devel/pear-PEAR/pkg-deinstall
-DOCSDIR= ${PEARDIR}/docs/${PORTNAME}
+DOCSDIR= ${PREFIX}/doc/pear/${PORTNAME}
pre-install:
.if exists(${LOCALBASE}/lib/php.DIST_PHP) \
|| exists(${PHP_BASE}/lib/php.DIST_PHP) \
diff -urN ./devel/pear-HTML_Template_PHPLIB.1/pkg-plist ./devel/pear-HTML_Template_PHPLIB/pkg-plist
--- ./devel/pear-HTML_Template_PHPLIB.1/pkg-plist Mon Sep 8 04:13:02 2003
+++ ./devel/pear-HTML_Template_PHPLIB/pkg-plist Wed Sep 24 12:48:08 2003
@@ -1,11 +1,11 @@
%%PEARDIR%%/HTML/Template/PHPLIB.php
%%PKGREGDIR%%/package.xml
-%%PORTDOCS%%%%PEARDIR%%/docs/HTML_Template_PHPLIB/README
-%%PORTDOCS%%%%PEARDIR%%/docs/HTML_Template_PHPLIB/block.ihtml
-%%PORTDOCS%%%%PEARDIR%%/docs/HTML_Template_PHPLIB/block.php
-%%PORTDOCS%%%%PEARDIR%%/docs/HTML_Template_PHPLIB/ittest.php
-%%PORTDOCS%%%%PEARDIR%%/docs/HTML_Template_PHPLIB/tpl1.ihtml
-%%PORTDOCS%%%%PEARDIR%%/docs/HTML_Template_PHPLIB/tpl1.php
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/block.ihtml
+%%PORTDOCS%%%%DOCSDIR%%/block.php
+%%PORTDOCS%%%%DOCSDIR%%/ittest.php
+%%PORTDOCS%%%%DOCSDIR%%/tpl1.ihtml
+%%PORTDOCS%%%%DOCSDIR%%/tpl1.php
@dirrm %%PEARDIR%%/HTML/Template
@dirrm %%PKGREGDIR%%
-%%PORTDOCS%%@dirrm %%PEARDIR%%/docs/HTML_Template_PHPLIB
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff -urN ./devel/pear-XML_Serializer.1/pkg-plist ./devel/pear-XML_Serializer/pkg-plist
--- ./devel/pear-XML_Serializer.1/pkg-plist Mon Sep 8 04:30:58 2003
+++ ./devel/pear-XML_Serializer/pkg-plist Wed Sep 24 12:48:08 2003
@@ -1,11 +1,11 @@
%%PEARDIR%%/XML/Serializer.php
%%PEARDIR%%/XML/Unserializer.php
%%PKGREGDIR%%/package.xml
-%%PORTDOCS%%%%PEARDIR%%/docs/XML_Serializer/serializeObject.php
-%%PORTDOCS%%%%PEARDIR%%/docs/XML_Serializer/serializeRDF.php
-%%PORTDOCS%%%%PEARDIR%%/docs/XML_Serializer/unserializeAnyXML.php
-%%PORTDOCS%%%%PEARDIR%%/docs/XML_Serializer/unserializeObject.php
-%%PORTDOCS%%%%PEARDIR%%/docs/XML_Serializer/unserializeRDF.php
+%%PORTDOCS%%%%DOCSDIR%%/serializeObject.php
+%%PORTDOCS%%%%DOCSDIR%%/serializeRDF.php
+%%PORTDOCS%%%%DOCSDIR%%/unserializeAnyXML.php
+%%PORTDOCS%%%%DOCSDIR%%/unserializeObject.php
+%%PORTDOCS%%%%DOCSDIR%%/unserializeRDF.php
@unexec rmdir %D/%%PEARDIR%%/XML 2>/dev/null || true
@dirrm %%PKGREGDIR%%
-%%PORTDOCS%%@dirrm %%PEARDIR%%/docs/XML_Serializer
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff -urN ./devel/pear-XML_Util.1/pkg-plist ./devel/pear-XML_Util/pkg-plist
--- ./devel/pear-XML_Util.1/pkg-plist Mon Sep 8 02:21:11 2003
+++ ./devel/pear-XML_Util/pkg-plist Wed Sep 24 12:48:08 2003
@@ -1,57 +1,57 @@
%%PEARDIR%%/XML/Util.php
%%PKGREGDIR%%/package.xml
%%PORTDOCS%%%%PEARDIR%%/tests/XML_Util/example.php
-%%PORTDOCS%%%%PEARDIR%%/docs/XML_Util/elementindex_XML_Util.html
-%%PORTDOCS%%%%PEARDIR%%/docs/XML_Util/blank.html
-%%PORTDOCS%%%%PEARDIR%%/docs/XML_Util/errors.html
-%%PORTDOCS%%%%PEARDIR%%/docs/XML_Util/packages.html
-%%PORTDOCS%%%%PEARDIR%%/docs/XML_Util/classtrees_XML_Util.html
-%%PORTDOCS%%%%PEARDIR%%/docs/XML_Util/index.html
-%%PORTDOCS%%%%PEARDIR%%/docs/XML_Util/todolist.html
-%%PORTDOCS%%%%PEARDIR%%/docs/XML_Util/elementindex.html
-%%PORTDOCS%%%%PEARDIR%%/docs/XML_Util/li_XML_Util.html
-%%PORTDOCS%%%%PEARDIR%%/docs/XML_Util/XML_Util/XML_Util.html
-%%PORTDOCS%%%%PEARDIR%%/docs/XML_Util/XML_Util/_Util_XML_XML_Util_php.html
-%%PORTDOCS%%%%PEARDIR%%/docs/XML_Util/media/banner.css
-%%PORTDOCS%%%%PEARDIR%%/docs/XML_Util/media/stylesheet.css
-%%PORTDOCS%%%%PEARDIR%%/docs/XML_Util/media/images/Class.png
-%%PORTDOCS%%%%PEARDIR%%/docs/XML_Util/media/images/Constant.png
-%%PORTDOCS%%%%PEARDIR%%/docs/XML_Util/media/images/Constructor.png
-%%PORTDOCS%%%%PEARDIR%%/docs/XML_Util/media/images/Destructor.png
-%%PORTDOCS%%%%PEARDIR%%/docs/XML_Util/media/images/Function.png
-%%PORTDOCS%%%%PEARDIR%%/docs/XML_Util/media/images/Global.png
-%%PORTDOCS%%%%PEARDIR%%/docs/XML_Util/media/images/I.png
-%%PORTDOCS%%%%PEARDIR%%/docs/XML_Util/media/images/Index.png
-%%PORTDOCS%%%%PEARDIR%%/docs/XML_Util/media/images/L.png
-%%PORTDOCS%%%%PEARDIR%%/docs/XML_Util/media/images/Lminus.png
-%%PORTDOCS%%%%PEARDIR%%/docs/XML_Util/media/images/Lplus.png
-%%PORTDOCS%%%%PEARDIR%%/docs/XML_Util/media/images/Method.png
-%%PORTDOCS%%%%PEARDIR%%/docs/XML_Util/media/images/Page.png
-%%PORTDOCS%%%%PEARDIR%%/docs/XML_Util/media/images/PrivateClass.png
-%%PORTDOCS%%%%PEARDIR%%/docs/XML_Util/media/images/PrivateMethod.png
-%%PORTDOCS%%%%PEARDIR%%/docs/XML_Util/media/images/PrivateVariable.png
-%%PORTDOCS%%%%PEARDIR%%/docs/XML_Util/media/images/T.png
-%%PORTDOCS%%%%PEARDIR%%/docs/XML_Util/media/images/Tminus.png
-%%PORTDOCS%%%%PEARDIR%%/docs/XML_Util/media/images/Tplus.png
-%%PORTDOCS%%%%PEARDIR%%/docs/XML_Util/media/images/Variable.png
-%%PORTDOCS%%%%PEARDIR%%/docs/XML_Util/media/images/blank.png
-%%PORTDOCS%%%%PEARDIR%%/docs/XML_Util/media/images/class_folder.png
-%%PORTDOCS%%%%PEARDIR%%/docs/XML_Util/media/images/file.png
-%%PORTDOCS%%%%PEARDIR%%/docs/XML_Util/media/images/folder.png
-%%PORTDOCS%%%%PEARDIR%%/docs/XML_Util/media/images/function_folder.png
-%%PORTDOCS%%%%PEARDIR%%/docs/XML_Util/media/images/next_button.png
-%%PORTDOCS%%%%PEARDIR%%/docs/XML_Util/media/images/next_button_disabled.png
-%%PORTDOCS%%%%PEARDIR%%/docs/XML_Util/media/images/package.png
-%%PORTDOCS%%%%PEARDIR%%/docs/XML_Util/media/images/package_folder.png
-%%PORTDOCS%%%%PEARDIR%%/docs/XML_Util/media/images/previous_button.png
-%%PORTDOCS%%%%PEARDIR%%/docs/XML_Util/media/images/previous_button_disabled.png
-%%PORTDOCS%%%%PEARDIR%%/docs/XML_Util/media/images/tutorial.png
-%%PORTDOCS%%%%PEARDIR%%/docs/XML_Util/media/images/tutorial_folder.png
-%%PORTDOCS%%%%PEARDIR%%/docs/XML_Util/media/images/up_button.png
+%%PORTDOCS%%%%DOCSDIR%%/elementindex_XML_Util.html
+%%PORTDOCS%%%%DOCSDIR%%/blank.html
+%%PORTDOCS%%%%DOCSDIR%%/errors.html
+%%PORTDOCS%%%%DOCSDIR%%/packages.html
+%%PORTDOCS%%%%DOCSDIR%%/classtrees_XML_Util.html
+%%PORTDOCS%%%%DOCSDIR%%/index.html
+%%PORTDOCS%%%%DOCSDIR%%/todolist.html
+%%PORTDOCS%%%%DOCSDIR%%/elementindex.html
+%%PORTDOCS%%%%DOCSDIR%%/li_XML_Util.html
+%%PORTDOCS%%%%DOCSDIR%%/XML_Util/XML_Util.html
+%%PORTDOCS%%%%DOCSDIR%%/XML_Util/_Util_XML_XML_Util_php.html
+%%PORTDOCS%%%%DOCSDIR%%/media/banner.css
+%%PORTDOCS%%%%DOCSDIR%%/media/stylesheet.css
+%%PORTDOCS%%%%DOCSDIR%%/media/images/Class.png
+%%PORTDOCS%%%%DOCSDIR%%/media/images/Constant.png
+%%PORTDOCS%%%%DOCSDIR%%/media/images/Constructor.png
+%%PORTDOCS%%%%DOCSDIR%%/media/images/Destructor.png
+%%PORTDOCS%%%%DOCSDIR%%/media/images/Function.png
+%%PORTDOCS%%%%DOCSDIR%%/media/images/Global.png
+%%PORTDOCS%%%%DOCSDIR%%/media/images/I.png
+%%PORTDOCS%%%%DOCSDIR%%/media/images/Index.png
+%%PORTDOCS%%%%DOCSDIR%%/media/images/L.png
+%%PORTDOCS%%%%DOCSDIR%%/media/images/Lminus.png
+%%PORTDOCS%%%%DOCSDIR%%/media/images/Lplus.png
+%%PORTDOCS%%%%DOCSDIR%%/media/images/Method.png
+%%PORTDOCS%%%%DOCSDIR%%/media/images/Page.png
+%%PORTDOCS%%%%DOCSDIR%%/media/images/PrivateClass.png
+%%PORTDOCS%%%%DOCSDIR%%/media/images/PrivateMethod.png
+%%PORTDOCS%%%%DOCSDIR%%/media/images/PrivateVariable.png
+%%PORTDOCS%%%%DOCSDIR%%/media/images/T.png
+%%PORTDOCS%%%%DOCSDIR%%/media/images/Tminus.png
+%%PORTDOCS%%%%DOCSDIR%%/media/images/Tplus.png
+%%PORTDOCS%%%%DOCSDIR%%/media/images/Variable.png
+%%PORTDOCS%%%%DOCSDIR%%/media/images/blank.png
+%%PORTDOCS%%%%DOCSDIR%%/media/images/class_folder.png
+%%PORTDOCS%%%%DOCSDIR%%/media/images/file.png
+%%PORTDOCS%%%%DOCSDIR%%/media/images/folder.png
+%%PORTDOCS%%%%DOCSDIR%%/media/images/function_folder.png
+%%PORTDOCS%%%%DOCSDIR%%/media/images/next_button.png
+%%PORTDOCS%%%%DOCSDIR%%/media/images/next_button_disabled.png
+%%PORTDOCS%%%%DOCSDIR%%/media/images/package.png
+%%PORTDOCS%%%%DOCSDIR%%/media/images/package_folder.png
+%%PORTDOCS%%%%DOCSDIR%%/media/images/previous_button.png
+%%PORTDOCS%%%%DOCSDIR%%/media/images/previous_button_disabled.png
+%%PORTDOCS%%%%DOCSDIR%%/media/images/tutorial.png
+%%PORTDOCS%%%%DOCSDIR%%/media/images/tutorial_folder.png
+%%PORTDOCS%%%%DOCSDIR%%/media/images/up_button.png
@dirrm %%PEARDIR%%/XML
@dirrm %%PKGREGDIR%%
-%%PORTDOCS%%@dirrm %%PEARDIR%%/docs/XML_Util/media/images
-%%PORTDOCS%%@dirrm %%PEARDIR%%/docs/XML_Util/media
-%%PORTDOCS%%@dirrm %%PEARDIR%%/docs/XML_Util/XML_Util
-%%PORTDOCS%%@dirrm %%PEARDIR%%/docs/XML_Util
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/media/images
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/media
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/XML_Util
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
%%PORTDOCS%%@dirrm %%PEARDIR%%/tests/XML_Util
diff -urN ./devel/pear-XML_XPath.1/pkg-plist ./devel/pear-XML_XPath/pkg-plist
--- ./devel/pear-XML_XPath.1/pkg-plist Mon Sep 8 04:28:24 2003
+++ ./devel/pear-XML_XPath/pkg-plist Wed Sep 24 12:48:08 2003
@@ -3,7 +3,7 @@
%%PEARDIR%%/XPath/error.php
%%PEARDIR%%/XPath/result.php
%%PKGREGDIR%%/package.xml
-%%PORTDOCS%%%%PEARDIR%%/docs/XML_XPath/XML_XPath_example.php
+%%PORTDOCS%%%%DOCSDIR%%/XML_XPath_example.php
@dirrm %%PEARDIR%%/XPath
@dirrm %%PKGREGDIR%%
-%%PORTDOCS%%@dirrm %%PEARDIR%%/docs/XML_XPath
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff -urN ./mail/pear-mailparse.1/pkg-plist ./mail/pear-mailparse/pkg-plist
--- ./mail/pear-mailparse.1/pkg-plist Sun Aug 31 19:35:41 2003
+++ ./mail/pear-mailparse/pkg-plist Wed Sep 24 12:48:08 2003
@@ -1,8 +1,8 @@
%%EXTDIR%%/mailparse.so
%%PKGREGDIR%%/package.xml
-%%PORTDOCS%%%%PEARDIR%%/docs/mailparse/CREDITS
-%%PORTDOCS%%%%PEARDIR%%/docs/mailparse/README
-%%PORTDOCS%%%%PEARDIR%%/docs/mailparse/try.php
+%%PORTDOCS%%%%DOCSDIR%%/CREDITS
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/try.php
%%PORTDOCS%%%%PEARDIR%%/tests/mailparse/testdata/mime.exp
%%PORTDOCS%%%%PEARDIR%%/tests/mailparse/testdata/mime.txt
%%PORTDOCS%%%%PEARDIR%%/tests/mailparse/testdata/phpcvs1.exp
@@ -21,7 +21,7 @@
%%PORTDOCS%%%%PEARDIR%%/tests/mailparse/008.phpt
%%PORTDOCS%%%%PEARDIR%%/tests/mailparse/009.phpt
%%PORTDOCS%%%%PEARDIR%%/tests/mailparse/parse_test_messages.phpt
-%%PORTDOCS%%@dirrm %%PEARDIR%%/docs/mailparse
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
%%PORTDOCS%%@dirrm %%PEARDIR%%/tests/mailparse/testdata
%%PORTDOCS%%@dirrm %%PEARDIR%%/tests/mailparse/
@dirrm %%PKGREGDIR%%
--- pear-ports-standard-DOCSDIR.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20030924112159.911A52FDA01>