Re: 2015Q1, misc/calibre fails to package [now with patch]

[Joerg Sonnenberger <joerg%britannica.bec.de@localhost>]

On Wed, Apr 15, 2015 at 10:33:41PM +0200, Rhialto wrote:
> Index: patches/patch-setup_extensions.py
> ===================================================================
> RCS file: /cvsroot/pkgsrc/misc/calibre/patches/patch-setup_extensions.py,v
> retrieving revision 1.5
> diff -u -r1.5 patch-setup_extensions.py
> --- patches/patch-setup_extensions.py	8 Feb 2015 00:37:10 -0000	1.5
> +++ patches/patch-setup_extensions.py	15 Apr 2015 20:30:54 -0000
> @@ -1,10 +1,28 @@
> -$NetBSD: patch-setup_extensions.py,v 1.5 2015/02/08 00:37:10 wiz Exp $
> +$NetBSD$
>  
> -Fix build for pictureflow.
> +Fix build for libheadless, pictureflow, progress_indicator and qt_hack.
>  
> ---- setup/extensions.py.orig	2014-08-29 03:59:29.000000000 +0000
> +--- setup/extensions.py.orig	2015-03-13 03:56:40.000000000 +0000
>  +++ setup/extensions.py
> -@@ -602,7 +602,7 @@ class Build(Command):
> +@@ -536,6 +536,8 @@ class Build(Command):
> +             ''').format(
> +                 headers=' '.join(headers), sources=' '.join(sources), others=' '.join(others), destdir=self.d(
> +                     target), glib=glib_flags, fontconfig=fontconfig_flags, freetype=' '.join(ft_inc_dirs))
> ++        if isbsd:
> ++            pro += "\nLIBS += -Wl,-rpath,@X11LIB@\n"

Why don't you use sys.environ here instead of the substing?

Joerg