Date: Thu, 11 Jul 2013 10:41:06 GMT From: Horia Racoviceanu <horia@racoviceanu.com> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/180459: Port devel/py-dbus ' wrong PORTDOCS logic and pkg-plist break package [patch] Message-ID: <201307111041.r6BAf6jt065885@oldred.freebsd.org> Resent-Message-ID: <201307111050.r6BAo01U055656@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 180459 >Category: ports >Synopsis: Port devel/py-dbus ' wrong PORTDOCS logic and pkg-plist break package [patch] >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: Thu Jul 11 10:50:00 UTC 2013 >Closed-Date: >Last-Modified: >Originator: Horia Racoviceanu >Release: FreeBSD 9.1-RELEASE >Organization: >Environment: FreeBSD horia.lan 9.1-RELEASE-p4 FreeBSD 9.1-RELEASE-p4 #0: Mon Jun 17 11:42:37 UTC 2013 root@amd64-builder.daemonology.net:/usr/obj/usr/src/sys/GENERIC amd64 >Description: Unsetting HTMLDOCS breaks package from incorrect pkg-plist and logic that prevents PORTDOCS from being installed. /usr/ports/devel/py-dbus # make deinstall ===> Deinstalling for devel/py-dbus ===> Deinstalling py27-dbus-1.1.1 pkg_delete: file '/usr/local/share/doc/py-dbus/API_CHANGES.txt' doesn't exist pkg_delete: file '/usr/local/share/doc/py-dbus/HACKING.txt' doesn't exist pkg_delete: file '/usr/local/share/doc/py-dbus/NEWS' doesn't exist pkg_delete: file '/usr/local/share/doc/py-dbus/PY3PORT.txt' doesn't exist pkg_delete: file '/usr/local/share/doc/py-dbus/README' doesn't exist pkg_delete: file '/usr/local/share/doc/py-dbus/tutorial.txt' doesn't exist pkg_delete: file '/usr/local/share/doc/py-dbus' doesn't exist pkg_delete: unable to completely remove directory '/usr/local/share/doc/py-dbus' pkg_delete: couldn't entirely delete package `py27-dbus-1.1.1' (perhaps the packing list is incorrectly specified?) Furthermore, pkg-plist has incorrect values which break "make package" even when HTMLDOCS is set. ===> Registering installation for py27-dbus-1.1.1 ===> Building package for py27-dbus-1.1.1 tar: share/doc/py-dbus/TODO.html: Cannot stat: No such file or directory tar: Error exit delayed from previous errors. pkg_create: make_dist: tar command failed with code 256 *** [do-package] Error code 1 Buildlog: https://redports.org/buildarchive/20130710235800-32687/ Mentioned: http://portsmon.freebsd.org/portoverview.py?category=devel&portname=py-dbus http://lists.freebsd.org/pipermail/svn-ports-all/2013-July/024211.html No related information in ports/UPDATING >How-To-Repeat: # make deinstall # pkg_delete # make package >Fix: Changed Makefile and pkg-plist to handle DOCS properly: See buildlog https://redports.org/buildarchive/20130711074301-32666/ See attachment Patch attached with submission follows: diff -ruN py-dbus-orig/Makefile py-dbus/Makefile --- py-dbus-orig/Makefile 2013-06-25 07:09:26.000000000 -0400 +++ py-dbus/Makefile 2013-07-11 03:29:54.000000000 -0400 @@ -25,6 +25,8 @@ DOCSDIR= ${PREFIX}/share/doc/py-${PORTNAME} EXAMPLESDIR= ${PREFIX}/share/examples/py-${PORTNAME} +PORTDOCS= * + OPTIONS_DEFINE=HTMLDOCS HTMLDOCS_DESC= build html documentation @@ -39,7 +41,7 @@ .endif post-patch: -.if ! ${PORT_OPTIONS:MHTMLDOCS} +.if ! ${PORT_OPTIONS:MDOCS} @${REINPLACE_CMD} -e 's|HEADERS install-dist_docDATA|HEADERS|g ; \ s|PYTHON install-nodist_docDATA|PYTHON|g' \ ${WRKSRC}/Makefile.in diff -ruN py-dbus-orig/pkg-plist py-dbus/pkg-plist --- py-dbus-orig/pkg-plist 2013-06-25 07:09:26.000000000 -0400 +++ py-dbus/pkg-plist 2013-07-11 03:31:09.000000000 -0400 @@ -63,18 +63,6 @@ %%PYTHON_SITELIBDIR%%/dbus/types.pyc %%PYTHON_SITELIBDIR%%/dbus/types.pyo libdata/pkgconfig/dbus-python.pc -%%PORTDOCS%%%%DOCSDIR%%/API_CHANGES.txt -%%HTML%%%%PORTDOCS%%%%DOCSDIR%%/API_CHANGES.html -%%PORTDOCS%%%%DOCSDIR%%/HACKING.txt -%%HTML%%%%PORTDOCS%%%%DOCSDIR%%/HACKING.html -%%PORTDOCS%%%%DOCSDIR%%/NEWS -%%HTML%%%%PORTDOCS%%%%DOCSDIR%%/NEWS.html -%%PORTDOCS%%%%DOCSDIR%%/PY3PORT.txt -%%PORTDOCS%%%%DOCSDIR%%/README -%%HTML%%%%PORTDOCS%%%%DOCSDIR%%/README.html -%%HTML%%%%PORTDOCS%%%%DOCSDIR%%/TODO.html -%%PORTDOCS%%%%DOCSDIR%%/tutorial.txt -%%HTML%%%%PORTDOCS%%%%DOCSDIR%%/tutorial.html %%PORTEXAMPLES%%%%EXAMPLESDIR%%/example-async-client.py %%PORTEXAMPLES%%%%EXAMPLESDIR%%/example-client.py %%PORTEXAMPLES%%%%EXAMPLESDIR%%/example-service.py @@ -82,6 +70,5 @@ %%PORTEXAMPLES%%%%EXAMPLESDIR%%/example-signal-recipient.py %%PORTEXAMPLES%%%%EXAMPLESDIR%%/list-system-services.py %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%% -%%PORTDOCS%%@dirrm %%DOCSDIR%% @dirrm %%PYTHON_SITELIBDIR%%/dbus/mainloop @dirrm %%PYTHON_SITELIBDIR%%/dbus >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201307111041.r6BAf6jt065885>