On 2013/12/11 06:55, Sébastien Marie wrote:
> Hi,
> 
> During snapshot update, I encounter this problem:
> 
> > guile-1.8.8p3:slib-3b1->3b4p0: ok
> > /bin/sh: guile: not found
> > system(/bin/sh, -c, guile -c "(use-modules (ice-9 slib)) (require 
> > 'printf)") failed:  exit(127)
> > guile-1.8.8p1->1.8.8p3: ok
> 
> It is due to @exec in pkg/PLIST:
> 
> > @comment force the creation of slibcat
> > @exec guile -c "(use-modules (ice-9 slib)) (require 'printf)"
> 
> and because my script for "pkg_add -u" don't include /usr/local in PATH.
> 
> Should be better to don't use search path for @exec ? Specially when
> LOCALBASE is supposed to be included ?
> 
> If it is ok, here a patch for several others ports that relied on
> LOCALBASE in PATH for @exec/@unexec:
> 
>  - devel/doc++
>  - graphics/asymptote
>  - lang/guile
>  - print/texlive
> 
> Please note, that there are others ports that relied on system base (for
> chmod, ln, rm, install-info, cp...), but I suppose it is safe to suppose
> /bin or /usr/bin are in PATH.
> 
> Below a patch for the 4 ports listed before. For all except guile,
> there used mktexlsr, so assure that TEXMFMAIN is setted to good
> directory (like others ports using mktexlsr does).

Makes sense, OK with me, I can commit them later if there are no
objections unless somebody beats me to it.


> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/devel/doc++/Makefile,v
> retrieving revision 1.20
> diff -u -p -r1.20 Makefile
> --- Makefile  11 Mar 2013 10:50:03 -0000      1.20
> +++ Makefile  11 Dec 2013 05:50:26 -0000
> @@ -3,7 +3,7 @@
>  COMMENT=     documentation system for C, C++, IDL and Java
>  
>  DISTNAME=    doc++-3.4.10
> -REVISION =   2
> +REVISION =   3
>  CATEGORIES=  devel
>  
>  HOMEPAGE=    http://docpp.sourceforge.net/
> Index: pkg/PLIST
> ===================================================================
> RCS file: /cvs/ports/devel/doc++/pkg/PLIST,v
> retrieving revision 1.8
> diff -u -p -r1.8 PLIST
> --- pkg/PLIST 11 Aug 2007 10:44:24 -0000      1.8
> +++ pkg/PLIST 11 Dec 2013 05:50:26 -0000
> @@ -48,5 +48,5 @@ share/texmf/tex/latex/doc++/docxx-fr.sty
>  share/texmf/tex/latex/doc++/docxx-ja.sty
>  share/texmf/tex/latex/doc++/docxx-ro.sty
>  share/texmf/tex/latex/doc++/docxx.sty
> -@exec mktexlsr > /dev/null 2>&1
> -@unexec mktexlsr > /dev/null 2>&1
> +@exec TEXMFMAIN=%D/share/texmf %D/bin/mktexlsr > /dev/null 2>&1
> +@unexec TEXMFMAIN=%D/share/texmf %D/bin/mktexlsr > /dev/null 2>&1
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/graphics/asymptote/Makefile,v
> retrieving revision 1.14
> diff -u -p -r1.14 Makefile
> --- Makefile  25 Nov 2013 14:16:22 -0000      1.14
> +++ Makefile  11 Dec 2013 05:50:26 -0000
> @@ -4,7 +4,7 @@ COMMENT=              powerful descriptive vector gr
>  
>  DISTNAME=            asymptote-2.10.src
>  PKGNAME=             ${DISTNAME:S/.src//g}
> -REVISION =           5
> +REVISION =           6
>  CATEGORIES=          graphics
>  
>  HOMEPAGE=            http://asymptote.sourceforge.net/
> Index: pkg/PLIST
> ===================================================================
> RCS file: /cvs/ports/graphics/asymptote/pkg/PLIST,v
> retrieving revision 1.3
> diff -u -p -r1.3 PLIST
> --- pkg/PLIST 1 Aug 2011 11:35:34 -0000       1.3
> +++ pkg/PLIST 11 Dec 2013 05:50:26 -0000
> @@ -444,5 +444,5 @@ share/texmf/tex/latex/asymptote/asycolor
>  share/texmf/tex/latex/asymptote/asymptote.sty
>  share/texmf/tex/latex/asymptote/latexmkrc
>  share/texmf/tex/latex/asymptote/ocg.sty
> -@exec mktexlsr > /dev/null 2>&1
> -@unexec-delete mktexlsr > /dev/null 2>&1
> +@exec TEXMFMAIN=%D/share/texmf %D/bin/mktexlsr > /dev/null 2>&1
> +@unexec-delete TEXMFMAIN=%D/share/texmf %D/bin/mktexlsr > /dev/null 2>&1
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/lang/guile/Makefile,v
> retrieving revision 1.43
> diff -u -p -r1.43 Makefile
> --- Makefile  8 Dec 2013 12:21:09 -0000       1.43
> +++ Makefile  11 Dec 2013 05:50:26 -0000
> @@ -4,7 +4,7 @@ COMMENT=      GNU's Ubiquitous Intelligent La
>  
>  VERSION=     1.8.8
>  DISTNAME=    guile-${VERSION}
> -REVISION=    3
> +REVISION=    4
>  SHARED_LIBS= guile 20.0 \
>               guile-srfi-srfi-1-v-3 3.2 \
>               guile-srfi-srfi-13-14-v-3 3.1 \
> Index: pkg/PLIST
> ===================================================================
> RCS file: /cvs/ports/lang/guile/pkg/PLIST,v
> retrieving revision 1.14
> diff -u -p -r1.14 PLIST
> --- pkg/PLIST 8 Dec 2013 12:21:09 -0000       1.14
> +++ pkg/PLIST 11 Dec 2013 05:50:26 -0000
> @@ -306,5 +306,5 @@ share/guile/${V}/srfi/srfi-88.scm
>  share/guile/${V}/srfi/srfi-9.scm
>  share/guile/slib
>  @comment force the creation of slibcat
> -@exec guile -c "(use-modules (ice-9 slib)) (require 'printf)"
> +@exec %D/bin/guile -c "(use-modules (ice-9 slib)) (require 'printf)"
>  @unexec rm %D/share/guile/${V}/slibcat
> Index: base/Makefile
> ===================================================================
> RCS file: /cvs/ports/print/texlive/base/Makefile,v
> retrieving revision 1.69
> diff -u -p -r1.69 Makefile
> --- base/Makefile     9 Nov 2013 18:22:02 -0000       1.69
> +++ base/Makefile     11 Dec 2013 05:50:27 -0000
> @@ -4,7 +4,7 @@ COMMENT =             base binaries for TeXLive typ
>  
>  DISTNAME =           texlive-${DIST_V}-source
>  PKGNAME =            texlive_base-${V}
> -REVISION =           1
> +REVISION =           2
>  
>  DISTFILES =          ${DISTNAME}${EXTRACT_SUFX} \
>                       texlive-${DIST_V}-extra${EXTRACT_SUFX}
> Index: base/pkg/PLIST
> ===================================================================
> RCS file: /cvs/ports/print/texlive/base/pkg/PLIST,v
> retrieving revision 1.22
> diff -u -p -r1.22 PLIST
> --- base/pkg/PLIST    17 Dec 2012 20:28:04 -0000      1.22
> +++ base/pkg/PLIST    11 Dec 2013 05:50:27 -0000
> @@ -384,7 +384,7 @@ libdata/perl5/site_perl/TeXLive/
>  libdata/perl5/site_perl/TeXLive/TLConfig.pm
>  libdata/perl5/site_perl/TeXLive/TLUtils.pm
>  share/doc/pkg-readmes/${FULLPKGNAME}
> -@exec mktexlsr > /dev/null 2>&1
> +@exec TEXMFMAIN=%D/share/texmf %D/bin/mktexlsr > /dev/null 2>&1
>  @unexec-delete rm %D/share/texmf/ls-R
>  @unexec-delete rm %D/share/texmf-dist/ls-R
>  @unexec-delete rm %D/share/texmf-var/ls-R
> Index: texmf/Makefile
> ===================================================================
> RCS file: /cvs/ports/print/texlive/texmf/Makefile,v
> retrieving revision 1.35
> diff -u -p -r1.35 Makefile
> --- texmf/Makefile    12 Oct 2013 10:23:25 -0000      1.35
> +++ texmf/Makefile    11 Dec 2013 05:50:27 -0000
> @@ -12,6 +12,9 @@ MASTER_SITES0 =             http://theunixzoo.co.uk
>  DISTFILES =          ${DISTNAME}${EXTRACT_SUFX} \
>                       texlive-${DIST_V}-extra${EXTRACT_SUFX} \
>                       texmf-var-pregen-${V}${EXTRACT_SUFX}:0
> +REVISION-context =   0
> +REVISION-docs =              0
> +REVISION-full =              0
>  REVISION-main =              1
>  
>  PKGNAME-main =               texlive_texmf-minimal-${V}
> Index: texmf/pkg/PLIST-context
> ===================================================================
> RCS file: /cvs/ports/print/texlive/texmf/pkg/PLIST-context,v
> retrieving revision 1.4
> diff -u -p -r1.4 PLIST-context
> --- texmf/pkg/PLIST-context   17 Dec 2012 20:28:04 -0000      1.4
> +++ texmf/pkg/PLIST-context   11 Dec 2013 05:50:29 -0000
> @@ -2369,5 +2369,5 @@ share/texmf/tex/context/asymptote/colo-a
>  @unexec rm -Rf %D/share/texmf-var/luatex-cache
>  @exec %D/bin/mtxrun --generate > /dev/null 2>&1
>  @comment some of this could be shared with other parts of TL, hash with kpse
> -@exec %D/bin/mktexlsr > /dev/null 2>&1
> -@unexec-delete %D/bin/mktexlsr > /dev/null 2>&1
> +@exec TEXMFMAIN=%D/share/texmf %D/bin/mktexlsr > /dev/null 2>&1
> +@unexec-delete TEXMFMAIN=%D/share/texmf %D/bin/mktexlsr > /dev/null 2>&1
> Index: texmf/pkg/PLIST-docs
> ===================================================================
> RCS file: /cvs/ports/print/texlive/texmf/pkg/PLIST-docs,v
> retrieving revision 1.13
> diff -u -p -r1.13 PLIST-docs
> --- texmf/pkg/PLIST-docs      17 Dec 2012 20:28:04 -0000      1.13
> +++ texmf/pkg/PLIST-docs      11 Dec 2013 05:50:44 -0000
> @@ -30078,5 +30078,5 @@ share/texmf/doc/xindy/xindy.pdf
>  share/texmf/scripts/
>  share/texmf/scripts/texlive/
>  share/texmf/scripts/texlive/NEWS
> -@exec %D/bin/mktexlsr > /dev/null 2>&1
> -@unexec-delete %D/bin/mktexlsr > /dev/null 2>&1
> +@exec TEXMFMAIN=%D/share/texmf %D/bin/mktexlsr > /dev/null 2>&1
> +@unexec-delete TEXMFMAIN=%D/share/texmf %D/bin/mktexlsr > /dev/null 2>&1
> Index: texmf/pkg/PLIST-full
> ===================================================================
> RCS file: /cvs/ports/print/texlive/texmf/pkg/PLIST-full,v
> retrieving revision 1.16
> diff -u -p -r1.16 PLIST-full
> --- texmf/pkg/PLIST-full      17 Dec 2012 20:28:05 -0000      1.16
> +++ texmf/pkg/PLIST-full      11 Dec 2013 05:51:02 -0000
> @@ -34983,5 +34983,5 @@ share/texmf/xindy/modules/tex/inputenc/l
>  share/texmf/xindy/modules/tex/inputenc/latin1.xdy
>  share/texmf/xindy/modules/tex/inputenc/latin2.xdy
>  share/texmf/xindy/modules/tex/inputenc/latin3.xdy
> -@exec %D/bin/mktexlsr > /dev/null 2>&1
> -@unexec-delete %D/bin/mktexlsr > /dev/null 2>&1
> +@exec TEXMFMAIN=%D/share/texmf %D/bin/mktexlsr > /dev/null 2>&1
> +@unexec-delete TEXMFMAIN=%D/share/texmf %D/bin/mktexlsr > /dev/null 2>&1
> 

Reply via email to