pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/print/kpathsea Update kpathsea to 5.0.0.



details:   https://anonhg.NetBSD.org/pkgsrc/rev/f8b34ac75366
branches:  trunk
changeset: 560265:f8b34ac75366
user:      minskim <minskim%pkgsrc.org@localhost>
date:      Tue Jun 09 21:29:17 2009 +0000

description:
Update kpathsea to 5.0.0.

Changes:
* Make shared library version and general package version the same.
* Make library re-entrant.

diffstat:

 print/kpathsea/DEINSTALL        |    3 +-
 print/kpathsea/INSTALL          |    3 +-
 print/kpathsea/Makefile         |   32 ++---
 print/kpathsea/PLIST            |    5 +-
 print/kpathsea/buildlink3.mk    |    4 +-
 print/kpathsea/distinfo         |   11 +-
 print/kpathsea/patches/patch-aa |  203 +--------------------------------------
 print/kpathsea/patches/patch-ab |   13 ++
 8 files changed, 47 insertions(+), 227 deletions(-)

diffs (truncated from 427 to 300 lines):

diff -r 2ebdf400b139 -r f8b34ac75366 print/kpathsea/DEINSTALL
--- a/print/kpathsea/DEINSTALL  Tue Jun 09 19:10:47 2009 +0000
+++ b/print/kpathsea/DEINSTALL  Tue Jun 09 21:29:17 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: DEINSTALL,v 1.1.1.1 2009/01/03 22:12:42 minskim Exp $
+# $NetBSD: DEINSTALL,v 1.2 2009/06/09 21:29:17 minskim Exp $
 
 case "${STAGE}" in
 DEINSTALL)
@@ -6,7 +6,6 @@
                @PKG_SYSCONFDIR@/ls-R \
                @VARBASE@/lib/texmf/ls-R \
                @TEXMFLOCAL@/ls-R \
-               @PREFIX@/share/doc/texmf/ls-R \
                @PREFIX@/share/texmf-dist/ls-R \
                @PREFIX@/share/texmf/ls-R
        ;;
diff -r 2ebdf400b139 -r f8b34ac75366 print/kpathsea/INSTALL
--- a/print/kpathsea/INSTALL    Tue Jun 09 19:10:47 2009 +0000
+++ b/print/kpathsea/INSTALL    Tue Jun 09 21:29:17 2009 +0000
@@ -1,11 +1,10 @@
-# $NetBSD: INSTALL,v 1.1.1.1 2009/01/03 22:12:42 minskim Exp $
+# $NetBSD: INSTALL,v 1.2 2009/06/09 21:29:17 minskim Exp $
 
 case "${STAGE}" in
 POST-INSTALL)
        @PREFIX@/bin/mktexlsr \
                @PREFIX@/share/texmf \
                @PREFIX@/share/texmf-dist \
-               @PREFIX@/share/doc/texmf \
                @TEXMFLOCAL@ \
                @VARBASE@/lib/texmf \
                @PKG_SYSCONFDIR@
diff -r 2ebdf400b139 -r f8b34ac75366 print/kpathsea/Makefile
--- a/print/kpathsea/Makefile   Tue Jun 09 19:10:47 2009 +0000
+++ b/print/kpathsea/Makefile   Tue Jun 09 21:29:17 2009 +0000
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.5 2009/04/11 19:16:33 minskim Exp $
+# $NetBSD: Makefile,v 1.6 2009/06/09 21:29:17 minskim Exp $
 
-DISTNAME=      texlive-20080816-source
-PKGNAME=       kpathsea-3.5.7
-PKGREVISION=   4
+DISTNAME=      luatex-beta-0.40.2
+PKGNAME=       kpathsea-5.0.0
 CATEGORIES=    print
-MASTER_SITES=  ${MASTER_SITE_TEX_CTAN:=systems/texlive/Source/}
-EXTRACT_SUFX=  .tar.lzma
+MASTER_SITES=  http://foundry.supelec.fr/gf/download/frsrelease/341/1275/
+EXTRACT_SUFX=  .tar.bz2
 
 MAINTAINER=    minskim%NetBSD.org@localhost
 HOMEPAGE=      http://www.tug.org/kpathsea/
@@ -14,19 +13,17 @@
 CONFLICTS+=    teTeX-bin<=3.0nb21
 CONFLICTS+=    teTeX-texmf<=3.0nb5
 
-EXTRACT_ELEMENTS=      ${DISTNAME}/texk/kpathsea \
-                       ${DISTNAME}/texk/make \
-                       ${DISTNAME}/texk/config.guess \
-                       ${DISTNAME}/texk/config.sub \
-                       ${DISTNAME}/texk/install.sh \
-                       ${DISTNAME}/texk/mkinstalldirs
+EXTRACT_ELEMENTS=      ${DISTNAME}/source/build-aux \
+                       ${DISTNAME}/source/texk/kpathsea \
+                       ${DISTNAME}/source/texk/make
 
 PKG_DESTDIR_SUPPORT=   user-destdir
 
 GNU_CONFIGURE= yes
 INFO_FILES=    yes
 USE_LIBTOOL=   yes
-WRKSRC=                ${WRKDIR}/${DISTNAME}/texk/kpathsea
+USE_TOOLS+=    gmake
+WRKSRC=                ${WRKDIR}/${DISTNAME}/source/texk/kpathsea
 
 MAKE_FLAGS+=   LIBTOOL=${LIBTOOL:Q}
 
@@ -34,7 +31,8 @@
 SUBST_MESSAGE.texmfdir=        Setting texmf directories.
 SUBST_STAGE.texmfdir=  pre-configure
 SUBST_FILES.texmfdir=  texmf.cnf
-SUBST_SED.texmfdir=    -e 's,@TEXMFLOCAL@,${TEXMFLOCAL},'
+SUBST_SED.texmfdir=    -e 's,@PREFIX@,${PREFIX},'
+SUBST_SED.texmfdir+=   -e 's,@TEXMFLOCAL@,${TEXMFLOCAL},'
 SUBST_SED.texmfdir+=   -e 's,@VARBASE@,${VARBASE},'
 SUBST_SED.texmfdir+=   -e 's,@PKG_SYSCONFDIR@,${PKG_SYSCONFDIR},'
 
@@ -48,10 +46,6 @@
                ${PKG_SYSCONFDIR}/texmf.cnf
 
 OWN_DIRS+=             ${TEXMFLOCAL} ${VARBASE}/lib/texmf
-INSTALLATION_DIRS+=    share/doc/texmf share/texmf-dist
-
-INSTALL_MAKE_FLAGS+=   prefix=${DESTDIR}${PREFIX} \
-                       infodir=${DESTDIR}${PREFIX}/${PKGINFODIR} \
-                       mandir=${DESTDIR}${PREFIX}/${PKGMANDIR}
+INSTALLATION_DIRS+=    share/texmf-dist
 
 .include "../../mk/bsd.pkg.mk"
diff -r 2ebdf400b139 -r f8b34ac75366 print/kpathsea/PLIST
--- a/print/kpathsea/PLIST      Tue Jun 09 19:10:47 2009 +0000
+++ b/print/kpathsea/PLIST      Tue Jun 09 21:29:17 2009 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2009/01/03 22:12:42 minskim Exp $
+@comment $NetBSD: PLIST,v 1.2 2009/06/09 21:29:17 minskim Exp $
 bin/kpseaccess
 bin/kpsereadlink
 bin/kpsestat
@@ -39,6 +39,7 @@
 include/kpathsea/lib.h
 include/kpathsea/line.h
 include/kpathsea/magstep.h
+include/kpathsea/mingw32.h
 include/kpathsea/paths.h
 include/kpathsea/pathsearch.h
 include/kpathsea/proginit.h
@@ -79,6 +80,4 @@
 @exec ${MKDIR} %D/share/texmf-dist
 @dirrm share/texmf-dist
 @dirrm share/texmf
-@exec ${MKDIR} %D/share/doc/texmf
-@dirrm share/doc/texmf
 @dirrm include/kpathsea
diff -r 2ebdf400b139 -r f8b34ac75366 print/kpathsea/buildlink3.mk
--- a/print/kpathsea/buildlink3.mk      Tue Jun 09 19:10:47 2009 +0000
+++ b/print/kpathsea/buildlink3.mk      Tue Jun 09 21:29:17 2009 +0000
@@ -1,11 +1,11 @@
-# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:14 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2009/06/09 21:29:17 minskim Exp $
 
 BUILDLINK_TREE+=       kpathsea
 
 .if !defined(KPATHSEA_BUILDLINK3_MK)
 KPATHSEA_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.kpathsea+=       kpathsea>=3.5.7
+BUILDLINK_API_DEPENDS.kpathsea+=       kpathsea>=5.0.0
 BUILDLINK_PKGSRCDIR.kpathsea?= ../../print/kpathsea
 BUILDLINK_FILES.kpathsea+=     bin/kpsewhich
 .endif # KPATHSEA_BUILDLINK3_MK
diff -r 2ebdf400b139 -r f8b34ac75366 print/kpathsea/distinfo
--- a/print/kpathsea/distinfo   Tue Jun 09 19:10:47 2009 +0000
+++ b/print/kpathsea/distinfo   Tue Jun 09 21:29:17 2009 +0000
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.4 2009/04/11 19:16:33 minskim Exp $
+$NetBSD: distinfo,v 1.5 2009/06/09 21:29:17 minskim Exp $
 
-SHA1 (texlive-20080816-source.tar.lzma) = 730986c628bd658b5062face9e400f61203d6b8d
-RMD160 (texlive-20080816-source.tar.lzma) = 629784b111c0d4bc9fac9f9131f63203d6e1dd38
-Size (texlive-20080816-source.tar.lzma) = 23175835 bytes
-SHA1 (patch-aa) = 87f14f7f2fbdfeff1150290ba1faa971c9137caf
+SHA1 (luatex-beta-0.40.2.tar.bz2) = 8af574490abb5cbcf9b8c2540ad2f623ec66babe
+RMD160 (luatex-beta-0.40.2.tar.bz2) = 2a05f51fdcb869f6398d6e643373ccb99246458f
+Size (luatex-beta-0.40.2.tar.bz2) = 7475791 bytes
+SHA1 (patch-aa) = f22538ddcb94566542984216103da97885377bcf
+SHA1 (patch-ab) = 241176f612485a800ec94974ab00419c92043243
diff -r 2ebdf400b139 -r f8b34ac75366 print/kpathsea/patches/patch-aa
--- a/print/kpathsea/patches/patch-aa   Tue Jun 09 19:10:47 2009 +0000
+++ b/print/kpathsea/patches/patch-aa   Tue Jun 09 21:29:17 2009 +0000
@@ -1,24 +1,19 @@
-$NetBSD: patch-aa,v 1.4 2009/04/11 19:16:34 minskim Exp $
+$NetBSD: patch-aa,v 1.5 2009/06/09 21:29:17 minskim Exp $
 
 - Set paths to texmf trees for pkgsrc.
-- Sync with TeX Live Revision 12509.
 
---- texmf.cnf.orig     2008-07-26 14:39:36.000000000 -0700
+--- texmf.cnf.orig     2009-06-03 06:07:27.000000000 -0700
 +++ texmf.cnf
-@@ -44,18 +44,18 @@
+@@ -53,15 +53,15 @@
  
  % The tree containing the runtime files closely related to the specific
  % program version used:
 -TEXMFMAIN = $SELFAUTOPARENT/texmf
-+TEXMFMAIN = $SELFAUTODIR/share/texmf
++TEXMFMAIN = @PREFIX@/share/texmf
  
  % The main distribution tree:
 -TEXMFDIST = $SELFAUTOPARENT/texmf-dist
-+TEXMFDIST = $SELFAUTODIR/share/texmf-dist
- 
- % Our documentation-only tree, arranged by language:
--TEXMFDOC = $SELFAUTOPARENT/texmf-doc
-+TEXMFDOC = $SELFAUTODIR/share/doc/texmf
++TEXMFDIST = @PREFIX@/share/texmf-dist
  
  % A place for local additions to a "standard" texmf tree.
  % This tree is not used for local configuration maintained by
@@ -28,7 +23,7 @@
  
  % TEXMFSYSVAR, where texconfig-sys stores variable runtime data.
  % With teTeX-3.0 or later, this must be set.
-@@ -63,7 +63,7 @@ TEXMFLOCAL = $SELFAUTOPARENT/../texmf-lo
+@@ -69,7 +69,7 @@ TEXMFLOCAL = $SELFAUTOPARENT/../texmf-lo
  %   TEXMFSYSVAR = $TEXMFMAIN
  % For using a separate tree:
  %   TEXMFSYSVAR = $SELFAUTOPARENT/texmf-var
@@ -37,7 +32,7 @@
  
  % TEXMFSYSCONFIG, where texconfig-sys stores configuration data.
  % With teTeX-3.0 or later, this must be set.
-@@ -71,7 +71,7 @@ TEXMFSYSVAR = $SELFAUTOPARENT/texmf-var
+@@ -77,7 +77,7 @@ TEXMFSYSVAR = $SELFAUTOPARENT/texmf-var
  %   TEXMFSYSCONFIG = $TEXMFMAIN
  % For using a separate tree:
  %   TEXMFSYSCONFIG = $SELFAUTOPARENT/texmf-config
@@ -46,7 +41,7 @@
  
  % User texmf trees are allowed as follows.
  % This used to be HOMETEXMF.
-@@ -122,7 +122,7 @@ SYSTEXMF = $TEXMFSYSVAR;$TEXMFMAIN;$TEXM
+@@ -128,7 +128,7 @@ SYSTEXMF = $TEXMFSYSVAR;$TEXMFMAIN;$TEXM
  % Where generated fonts may be written.  This tree is used when the sources
  % were found in a system tree and either that tree wasn't writable, or the
  % varfonts feature was enabled in MT_FEATURES in mktex.cnf.
@@ -55,153 +50,7 @@
  
  % Where to look for ls-R files.  There need not be an ls-R in the
  % directories in this path, but if there is one, Kpathsea will use it.
-@@ -146,7 +146,7 @@ TEXMFDBS = {!!$TEXMFSYSCONFIG,!!$TEXMFSY
- 
- 
- %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
--% Usually you will not need to edit any of the other variables in part 1. %
-+% Usually you will not need to edit any of the following variables.
- %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
- 
- % WEB2C is for Web2C specific files.  The current directory may not be
-@@ -154,12 +154,16 @@ TEXMFDBS = {!!$TEXMFSYSCONFIG,!!$TEXMFSY
- WEB2C = $TEXMF/web2c
- 
- % TEXINPUTS is for TeX input files -- i.e., anything to be found by \input
--% or \openin, including .sty, .eps, etc.
-+% or \openin, including .sty, .eps, etc.  We specify paths for all known
-+% formats, past or present.  Not all of them are built these days.
- 
- % Plain TeX.  Have the command tex check all directories as a last
- % resort, we may have plain-compatible stuff anywhere.
- TEXINPUTS.tex           = .;$TEXMF/tex/{plain,generic,}//
- 
-+% Fontinst needs to read afm files.
-+TEXINPUTS.fontinst      = .;$TEXMF/{tex,fonts/afm}//
-+
- % Other plain-based formats.
- TEXINPUTS.amstex        = .;$TEXMF/tex/{amstex,plain,generic,}//
- TEXINPUTS.csplain       = .;$TEXMF/tex/{csplain,plain,generic,}//
-@@ -168,7 +172,6 @@ TEXINPUTS.ftex          = .;$TEXMF/tex/{
- TEXINPUTS.jadetex       = .;$TEXMF/tex/{jadetex,plain,generic,}//
- TEXINPUTS.mex           = .;$TEXMF/tex/{mex,plain,generic,}//
- TEXINPUTS.texinfo       = .;$TEXMF/tex/{texinfo,plain,generic,}//
--TEXINPUTS.xetex         = .;$TEXMF/tex/{xetex,plain,generic,}//
- 
- % LaTeX 2e specific macros are stored in latex/, macros that can only be
- % used with 2.09 in latex209/.  In addition, we look in the directory
-@@ -176,12 +179,8 @@ TEXINPUTS.xetex         = .;$TEXMF/tex/{
- % mention 2e at all, but can be used with 2e.
- TEXINPUTS.cslatex       = .;$TEXMF/tex/{cslatex,csplain,latex,generic,}//
- TEXINPUTS.latex         = .;$TEXMF/tex/{latex,generic,}//
--TEXINPUTS.olatex        = .;$TEXMF/tex/{latex,generic,}//
- TEXINPUTS.latex209      = .;$TEXMF/tex/{latex209,generic,latex,}//
--TEXINPUTS.xelatex       = .;$TEXMF/tex/{xelatex,latex,generic,}//
--
--% Fontinst needs to read afm files.
--TEXINPUTS.fontinst      = .;$TEXMF/{tex,fonts/afm}//
-+TEXINPUTS.olatex        = .;$TEXMF/tex/{latex,generic,}//
- 
- % MLTeX.
- TEXINPUTS.frlatex       = .;$TEXMF/tex/{french,latex,generic,}//
-@@ -189,13 +188,11 @@ TEXINPUTS.frtex         = .;$TEXMF/tex/{
- TEXINPUTS.mllatex       = .;$TEXMF/tex/{latex,generic,}//
- TEXINPUTS.mltex         = .;$TEXMF/tex/{plain,generic,}//
- 
--% e-TeX.  This form of the input paths is borrowed from teTeX.  A certain
--% variant of TDS is assumed here, unaffected by the build variables.
-+% e-TeX.
- TEXINPUTS.elatex        = .;$TEXMF/tex/{latex,generic,}//
- TEXINPUTS.etex          = .;$TEXMF/tex/{plain,generic,}//
- 
--% pdfTeX.  This form of the input paths is borrowed from teTeX.  A certain
--% variant of TDS is assumed here, unaffected by the build variables.
-+% pdfTeX.
- TEXINPUTS.pdfcslatex    = .;$TEXMF/tex/{cslatex,csplain,latex,generic,}//
- TEXINPUTS.pdfcsplain    = .;$TEXMF/tex/{csplain,plain,generic,}//
- TEXINPUTS.pdfjadetex    = .;$TEXMF/tex/{jadetex,plain,generic,}//
-@@ -212,39 +209,45 @@ TEXINPUTS.pdfetex       = .;$TEXMF/tex/{
- 
- % pdfxTeX.
- TEXINPUTS.pdfxlatex     = .;$TEXMF/tex/{latex,generic,}//
-+TEXINPUTS.pdfxmex       = .;$TEXMF/tex/{mex,plain,generic,}//
- TEXINPUTS.pdfxtex       = .;$TEXMF/tex/{plain,generic,}//
- 
--% XeTeX
-+% LuaTeX.
-+TEXINPUTS.lualatex      = .;$TEXMF/tex/{lualatex,latex,generic,}//
-+TEXINPUTS.luatex        = .;$TEXMF/tex/{luatex,plain,generic,}//
-+TEXINPUTS.pdflualatex   = .;$TEXMF/tex/{lualatex,latex,generic,}//
-+TEXINPUTS.pdfluatex     = .;$TEXMF/tex/{lualatex,latex,generic,}//
-+



Home | Main Index | Thread Index | Old Index