Date: Fri, 10 Dec 2010 17:58:54 GMT From: Olivier Duchateau <duchateau.olivier@gmail.com> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/153000: [PATCH] www/midori, fix correct path compared to the pkg-plist Message-ID: <201012101758.oBAHwsQr074447@red.freebsd.org> Resent-Message-ID: <201012101800.oBAI0SXK091770@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 153000
>Category: ports
>Synopsis: [PATCH] www/midori, fix correct path compared to the pkg-plist
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: sw-bug
>Submitter-Id: current-users
>Arrival-Date: Fri Dec 10 18:00:27 UTC 2010
>Closed-Date:
>Last-Modified:
>Originator: Olivier Duchateau
>Release: FreeBSD 8.1-RELEASE
>Organization:
>Environment:
FreeBSD bornem.errements.net 8.1-RELEASE FreeBSD 8.1-RELEASE #0: Mon Jul 19 02:55:53 UTC 2010 root@almeida.cse.buffalo.edu:/usr/obj/usr/src/sys/GENERIC i386
>Description:
Under a fresh installation of Midori, files (AUTHORS, COPYING, ChangeLog, EXPAT, and README) are not in %%DOCSDIR%% (${PREFIX}/doc/midori), as mentionned in pkg-plist, but in ${PREFIX}/doc (See below)
ls -l /tmp/midori/share/doc/
total 56
-rw-r--r-- 1 root wheel 3495 31 oct 23:20 AUTHORS
-rw-r--r-- 1 root wheel 26436 31 oct 23:20 COPYING
-rw-r--r-- 1 root wheel 21370 31 oct 23:20 ChangeLog
-rw-r--r-- 1 root wheel 1023 31 oct 23:20 EXPAT
-rw-r--r-- 1 root wheel 778 31 oct 23:20 README
And when we remove this package, we get this error message:
===> Deinstalling for www/midori
===> Deinstalling midori-0.2.9
pkg_delete: file '/tmp/midori/share/doc/midori/AUTHORS' doesn't exist
pkg_delete: file '/tmp/midori/share/doc/midori/COPYING' doesn't exist
pkg_delete: file '/tmp/midori/share/doc/midori/ChangeLog' doesn't exist
pkg_delete: file '/tmp/midori/share/doc/midori/EXPAT' doesn't exist
pkg_delete: file '/tmp/midori/share/doc/midori/README' doesn't exist
pkg_delete: file '/tmp/midori/share/doc/midori' doesn't exist
pkg_delete: unable to completely remove directory '/tmp/midori/share/doc/midori'
pkg_delete: couldn't entirely delete package (perhaps the packing list is
incorrectly specified?)
>How-To-Repeat:
>Fix:
Patch attached with submission follows:
--- wscript.orig 2010-10-31 23:20:48.000000000 +0100
+++ wscript 2010-11-01 10:58:02.000000000 +0100
@@ -260,8 +260,7 @@
if not conf.env['HAVE_UNIQUE']:
if Options.platform == 'win32':
conf.check (lib='ws2_32')
- check_pkg ('openssl', mandatory=False)
- conf.define ('USE_SSL', [0,1][conf.env['HAVE_OPENSSL'] == 1])
+ conf.define ('HAVE_OPENSSL', [0,1][conf.check (header_name='openssl/opensslv.h')])
conf.define ('HAVE_NETDB_H', [0,1][conf.check (header_name='netdb.h')])
conf.check (header_name='sys/wait.h')
conf.check (header_name='sys/select.h')
@@ -417,7 +416,7 @@
bld.add_group ()
if bld.env['docs']:
- bld.install_files ('${DOCDIR}/' + '/', \
+ bld.install_files ('${DOCDIR}/' + APPNAME + '/', \
'AUTHORS COPYING ChangeLog EXPAT README')
# Install default configuration
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201012101758.oBAHwsQr074447>