pkgsrc-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc/print/web2c Update web2c to 2009.



details:   https://anonhg.NetBSD.org/pkgsrc/rev/26b06a10043a
branches:  trunk
changeset: 569388:26b06a10043a
user:      minskim <minskim%pkgsrc.org@localhost>
date:      Sat Jan 16 03:15:38 2010 +0000

description:
Update web2c to 2009.

Changes:
    - --shell-restricted aka shell_escape=p for restricted shell access.
    - --enable-write18 and --disable-write18 accepted as synonyms for
      --shell-escape and --no-shell-escape, for compatibility with MiKTeX.
    - Omega removed; use Aleph.
    - Build system now automake-based.

diffstat:

 print/web2c/Makefile         |  56 ++++++++++++--------------------
 print/web2c/PLIST            |  13 +------
 print/web2c/distinfo         |  31 ++---------------
 print/web2c/patches/patch-aa |  19 -----------
 print/web2c/patches/patch-ab |  28 ----------------
 print/web2c/patches/patch-ac |   9 -----
 print/web2c/patches/patch-ad |   9 -----
 print/web2c/patches/patch-ae |   9 -----
 print/web2c/patches/patch-af |  26 ---------------
 print/web2c/patches/patch-ag |  33 -------------------
 print/web2c/patches/patch-ah |  10 -----
 print/web2c/patches/patch-ai |  20 -----------
 print/web2c/patches/patch-aj |  22 -------------
 print/web2c/patches/patch-ak |  47 ---------------------------
 print/web2c/patches/patch-al |  13 -------
 print/web2c/patches/patch-am |  42 +++++++-----------------
 print/web2c/patches/patch-an |  20 -----------
 print/web2c/patches/patch-ao |  72 ------------------------------------------
 print/web2c/patches/patch-ap |  74 --------------------------------------------
 print/web2c/patches/patch-aq |  15 --------
 print/web2c/patches/patch-ar |  15 --------
 print/web2c/patches/patch-as |  14 --------
 print/web2c/patches/patch-at |  15 --------
 print/web2c/patches/patch-au |  17 ----------
 print/web2c/patches/patch-av |  31 ------------------
 25 files changed, 40 insertions(+), 620 deletions(-)

diffs (truncated from 838 to 300 lines):

diff -r 0055e86ae2a0 -r 26b06a10043a print/web2c/Makefile
--- a/print/web2c/Makefile      Sat Jan 16 03:07:43 2010 +0000
+++ b/print/web2c/Makefile      Sat Jan 16 03:15:38 2010 +0000
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.8 2009/07/26 10:10:18 minskim Exp $
+# $NetBSD: Makefile,v 1.9 2010/01/16 03:15:38 minskim Exp $
 
-DISTNAME=      texlive-20080816-source
-PKGNAME=       web2c-7.5.7
-PKGREVISION=   5
+DISTNAME=      texlive-20091011-source
+PKGNAME=       web2c-2009
 CATEGORIES=    print
 MASTER_SITES=  ${MASTER_SITE_TEX_CTAN:=systems/texlive/Source/}
-EXTRACT_SUFX=  .tar.lzma
+EXTRACT_SUFX=  .tar.xz
 
 MAINTAINER=    minskim%NetBSD.org@localhost
 HOMEPAGE=      http://www.tug.org/web2c/
@@ -13,22 +12,9 @@
 
 CONFLICTS+=    teTeX-bin<=3.0nb28
 
-EXTRACT_ELEMENTS=      ${DISTNAME}/config \
-                       ${DISTNAME}/libs/lua51 \
-                       ${DISTNAME}/libs/luafilesystem \
-                       ${DISTNAME}/libs/luafontforge \
-                       ${DISTNAME}/libs/luamd5 \
-                       ${DISTNAME}/libs/luapeg \
-                       ${DISTNAME}/libs/luazip \
-                       ${DISTNAME}/libs/luazlib \
-                       ${DISTNAME}/libs/md5 \
-                       ${DISTNAME}/libs/slnunicode \
-                       ${DISTNAME}/libs/xpdf ${DISTNAME}/libs/obsdcompat \
-                       ${DISTNAME}/texk/make \
-                       ${DISTNAME}/texk/config.guess \
-                       ${DISTNAME}/texk/config.sub \
-                       ${DISTNAME}/texk/install.sh \
-                       ${DISTNAME}/texk/mkinstalldirs \
+EXTRACT_ELEMENTS=      ${DISTNAME}/build-aux \
+                       ${DISTNAME}/libs/obsdcompat \
+                       ${DISTNAME}/libs/xpdf \
                        ${DISTNAME}/texk/web2c
 
 PKG_DESTDIR_SUPPORT=   user-destdir
@@ -37,28 +23,28 @@
 INFO_FILES=    yes
 USE_LANGUAGES= c c++
 USE_LIBTOOL=   yes
-USE_TOOLS+=    gmake lex perl yacc
+USE_TOOLS+=    gmake lex yacc pkg-config
 WRKSRC=                ${WRKDIR}/${DISTNAME}/texk/web2c
 
-CONFIGURE_ARGS+=       --without-luatex
-CONFIGURE_ARGS+=       --without-xetex
-CONFIGURE_ARGS+=       --with-mf-nowin
-CONFIGURE_ARGS+=       --with-system-pnglib \
-                       --with-pnglib-include=${BUILDLINK_PREFIX.png}/include \
-                       --with-pnglib-libdir=${BUILDLINK_PREFIX.png}/lib
+CONFIGURE_ARGS+=       --disable-luatex
+CONFIGURE_ARGS+=       --disable-xetex
+CONFIGURE_ARGS+=       --with-x=no
+CONFIGURE_ARGS+=       --without-mf-x-toolkit
+CONFIGURE_ARGS+=       --with-system-kpathsea \
+               --with-kpathsea-includes=${BUILDLINK_PREFIX.kpathsea}/include \
+               --with-kpathsea-libdir=${BUILDLINK_PREFIX.kpathsea}/lib
+CONFIGURE_ARGS+=       --with-system-libpng \
+                       --with-libpng-includes=${BUILDLINK_PREFIX.png}/include \
+                       --with-libpng-libdir=${BUILDLINK_PREFIX.png}/lib
 CONFIGURE_ARGS+=       --with-system-zlib \
-                       --with-zlib-include=${BUILDLINK_PREFIX.zlib}/include \
+                       --with-zlib-includes=${BUILDLINK_PREFIX.zlib}/include \
                        --with-zlib-libdir=${BUILDLINK_PREFIX.zlib}/lib
-CONFIGURE_ARGS+=       --enable-static
 
-CONFIGURE_DIRS=        ${WRKDIR}/${DISTNAME}/libs/xpdf \
-               ${WRKDIR}/${DISTNAME}/libs/obsdcompat \
+CONFIGURE_DIRS=        ${WRKDIR}/${DISTNAME}/libs/obsdcompat \
+               ${WRKDIR}/${DISTNAME}/libs/xpdf \
                ${WRKDIR}/${DISTNAME}/texk/web2c
 INSTALL_DIRS=  ${WRKDIR}/${DISTNAME}/texk/web2c
 
-MAKE_ENV+=     KPATHSEA_PREFIX=${BUILDLINK_PREFIX.kpathsea}
-MAKE_FLAGS+=   LIBTOOL=${LIBTOOL:Q}
-
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../print/kpathsea/buildlink3.mk"
diff -r 0055e86ae2a0 -r 26b06a10043a print/web2c/PLIST
--- a/print/web2c/PLIST Sat Jan 16 03:07:43 2010 +0000
+++ b/print/web2c/PLIST Sat Jan 16 03:15:38 2010 +0000
@@ -1,29 +1,24 @@
-@comment $NetBSD: PLIST,v 1.3 2009/06/09 22:31:14 minskim Exp $
+@comment $NetBSD: PLIST,v 1.4 2010/01/16 03:15:38 minskim Exp $
 bin/aleph
 bin/bibtex
 bin/ctangle
 bin/ctie
 bin/cweave
-bin/dmp
 bin/dvicopy
 bin/dvitomp
 bin/dvitype
 bin/gftodvi
 bin/gftopk
 bin/gftype
-bin/makempx
 bin/mf
 bin/mf-nowin
 bin/mft
 bin/mkocp
 bin/mkofm
 bin/mpost
-bin/mpto
-bin/newer
 bin/odvicopy
 bin/odvitype
 bin/ofm2opl
-bin/omega
 bin/omfonts
 bin/opl2ofm
 bin/otangle
@@ -48,28 +43,24 @@
 bin/vptovf
 bin/weave
 info/web2c.info
+man/man1/aleph.1
 man/man1/bibtex.1
 man/man1/ctangle.1
 man/man1/ctie.1
 man/man1/cweave.1
 man/man1/cweb.1
-man/man1/dmp.1
 man/man1/dvicopy.1
 man/man1/dvitomp.1
 man/man1/dvitype.1
 man/man1/gftodvi.1
 man/man1/gftopk.1
 man/man1/gftype.1
-man/man1/makempx.1
 man/man1/mf-nowin.1
 man/man1/mf.1
 man/man1/mft.1
 man/man1/mpost.1
-man/man1/mpto.1
-man/man1/newer.1
 man/man1/odvicopy.1
 man/man1/odvitype.1
-man/man1/omega.1
 man/man1/patgen.1
 man/man1/pdftex.1
 man/man1/pdftosrc.1
diff -r 0055e86ae2a0 -r 26b06a10043a print/web2c/distinfo
--- a/print/web2c/distinfo      Sat Jan 16 03:07:43 2010 +0000
+++ b/print/web2c/distinfo      Sat Jan 16 03:15:38 2010 +0000
@@ -1,27 +1,6 @@
-$NetBSD: distinfo,v 1.5 2009/07/17 06:58:51 minskim Exp $
+$NetBSD: distinfo,v 1.6 2010/01/16 03:15:38 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) = d3a3c38638a699b5cb9b4e6da7b53f3ab57ba3f8
-SHA1 (patch-ab) = 06a46cdac3ce4731dda8940848a2c4493f703502
-SHA1 (patch-ac) = 7e604596d3c9c5095937b2bdd094371127f6f05f
-SHA1 (patch-ad) = b61ea68a06def0d23b3b79fb98edb68875181885
-SHA1 (patch-ae) = f700b735a9b0fdd5ae25a556798334f3d05739e1
-SHA1 (patch-af) = af78a42510c7b060340ab770e9065a90c7d06e5f
-SHA1 (patch-ag) = d04526f55500e13757acd9e2a320b2c6737edd3b
-SHA1 (patch-ah) = b518352ae6b2839b2790550b422f1c2860821350
-SHA1 (patch-ai) = 85d011bd5023ea6ef984836d49d7b8d439ce725a
-SHA1 (patch-aj) = 986cae97bbe29164ab0e5ab2b0f9dc9d7c6f8e10
-SHA1 (patch-ak) = 6315532bc4929dcec2d06d1112e424f74a2ae7a9
-SHA1 (patch-al) = b8fc7bad60bffac60a48dccc63af2b9b736b84f0
-SHA1 (patch-am) = fbca2d97fe693b6d964f596e79908680a6e03965
-SHA1 (patch-an) = e2cb5013c035fd9d3ec288af37b7c4f40c6648eb
-SHA1 (patch-ao) = 714bb6752f9f6d7647ecfa53f78305603fb0f9e9
-SHA1 (patch-ap) = afea107d16a936a834b10c526dc5cadd5a5d97bb
-SHA1 (patch-aq) = 6be32b638b283924b5ff70ebd9e653f821bea3a0
-SHA1 (patch-ar) = 58dcc0263b7347d7dfbf10370bcad3ed46849414
-SHA1 (patch-as) = b676605ce6f599d75ef9076316f60a5679656a16
-SHA1 (patch-at) = 590c83e0decf5603a75970e33d8028d794d920d2
-SHA1 (patch-au) = acc255d4e4eacd960d4b9a9807ca4b0cff37d000
-SHA1 (patch-av) = 9b7272f47229daf1daccafdafbf201c34f8ef6d8
+SHA1 (texlive-20091011-source.tar.xz) = 82fc9fcdb82c63a00f4b08a51733c761cbda897d
+RMD160 (texlive-20091011-source.tar.xz) = 81b86cd93e629d6b1b3d7918848dd76babc0d5a9
+Size (texlive-20091011-source.tar.xz) = 29683728 bytes
+SHA1 (patch-am) = d9068b2a3fc307cddada36c328a34b2d0080c9cf
diff -r 0055e86ae2a0 -r 26b06a10043a print/web2c/patches/patch-aa
--- a/print/web2c/patches/patch-aa      Sat Jan 16 03:07:43 2010 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,19 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2009/02/01 06:05:58 minskim Exp $
-
---- ../make/tkpathsea.mk.orig  2008-05-29 13:59:08.000000000 -0700
-+++ ../make/tkpathsea.mk
-@@ -4,10 +4,9 @@ makeargs = $(MFLAGS) CC='$(CC)' CFLAGS='
- 
- # This is wrong: the library doesn't depend on kpsewhich.c or
- # acconfig.h.  But what to do?
--$(kpathsea): $(kpathsea_srcdir)/*.c $(kpathsea_srcdir)/*.h \
--           $(top_srcdir)/../make/paths.mk
--      cd $(kpathsea_dir) && $(MAKE) $(makeargs)
-+$(kpathsea):
-+      true
- 
--$(kpathsea_dir)/paths.h: $(kpathsea_srcdir)/texmf.cnf
--      cd $(kpathsea_dir) && $(MAKE) $(makeargs)
-+$(kpathsea_dir)/paths.h:
-+      true
- # End of tkpathsea.mk.
diff -r 0055e86ae2a0 -r 26b06a10043a print/web2c/patches/patch-ab
--- a/print/web2c/patches/patch-ab      Sat Jan 16 03:07:43 2010 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,28 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 2009/02/01 06:05:58 minskim Exp $
-
---- ../make/common.mk.orig     2007-01-20 03:03:18.000000000 -0800
-+++ ../make/common.mk
-@@ -17,7 +17,7 @@ LIBTOOL = $(SHELL) $(kpathsea_parent)/li
- # You can change [X]CPPFLAGS, [X]CFLAGS, or [X]DEFS, but
- # please don't change ALL_CPPFLAGS or ALL_CFLAGS.
- # prog_cflags is set by subdirectories of web2c.
--ALL_CPPFLAGS = $(DEFS) -I. -I$(srcdir) -I$(kpathsea_parent) \
-+ALL_CPPFLAGS = $(DEFS) -I. -I$(srcdir) -I$(KPATHSEA_PREFIX)/include \
-   -I$(kpathsea_srcdir_parent) $(prog_cflags) $(CPPFLAGS)
- ALL_CFLAGS = $(ALL_CPPFLAGS) $(CFLAGS)
- ALL_CXXFLAGS = $(ALL_CPPFLAGS) $(CXXFLAGS)
-@@ -51,11 +51,11 @@ UNINSTALL_LIBTOOL_LIBS = $(LIBTOOL) --mo
- UNINSTALL_LIBTOOL_PROG = $(LIBTOOL) --mode=uninstall $(RM)
- 
- # We use these for many things.
--kpathsea_parent = ..
-+kpathsea_parent = $(KPATHSEA_PREFIX)/include
- kpathsea_dir = $(kpathsea_parent)/kpathsea
- kpathsea_srcdir_parent = $(top_srcdir)/..
--kpathsea_srcdir = $(kpathsea_srcdir_parent)/kpathsea
--kpathsea = $(kpathsea_dir)/libkpathsea.la
-+kpathsea_srcdir = $(KPATHSEA_PREFIX)/include/kpathsea
-+kpathsea = $(KPATHSEA_PREFIX)/lib/libkpathsea.la
- 
- @MAINT@ifeq ($(CC), gcc)
- @MAINT@XDEFS = -Wpointer-arith $(warn_more)
diff -r 0055e86ae2a0 -r 26b06a10043a print/web2c/patches/patch-ac
--- a/print/web2c/patches/patch-ac      Sat Jan 16 03:07:43 2010 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,9 +0,0 @@
-$NetBSD: patch-ac,v 1.1.1.1 2009/02/01 06:05:58 minskim Exp $
-
---- lib/Makefile.in.orig       2008-01-30 06:56:21.000000000 -0800
-+++ lib/Makefile.in
-@@ -30,4 +30,3 @@ Makefile: Makefile.in ../config.status
- 
- kpse_include ../make/clean.mk
- kpse_include ../make/rdepend.mk
--kpse_include lib/depend.mk
diff -r 0055e86ae2a0 -r 26b06a10043a print/web2c/patches/patch-ad
--- a/print/web2c/patches/patch-ad      Sat Jan 16 03:07:43 2010 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,9 +0,0 @@
-$NetBSD: patch-ad,v 1.1.1.1 2009/02/01 06:05:58 minskim Exp $
-
---- web2c/Makefile.in.orig     2008-04-15 16:20:46.000000000 -0700
-+++ web2c/Makefile.in
-@@ -71,4 +71,3 @@ clean::
-       rm -f y_tab.c y_tab.h y.out* yacc.* $(LEX_OUTPUT_ROOT).c
- 
- kpse_include ../make/rdepend.mk
--kpse_include web2c/depend.mk
diff -r 0055e86ae2a0 -r 26b06a10043a print/web2c/patches/patch-ae
--- a/print/web2c/patches/patch-ae      Sat Jan 16 03:07:43 2010 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,9 +0,0 @@
-$NetBSD: patch-ae,v 1.1.1.1 2009/02/01 06:05:58 minskim Exp $
-
---- window/Makefile.in.orig    2008-01-30 06:56:21.000000000 -0800
-+++ window/Makefile.in
-@@ -35,4 +35,3 @@ distclean::
-       rm -f x11.c
- 
- kpse_include ../make/rdepend.mk
--kpse_include window/depend.mk
diff -r 0055e86ae2a0 -r 26b06a10043a print/web2c/patches/patch-af
--- a/print/web2c/patches/patch-af      Sat Jan 16 03:07:43 2010 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,26 +0,0 @@
-$NetBSD: patch-af,v 1.1.1.1 2009/02/01 06:05:58 minskim Exp $
-
---- mpware/Makefile.in.orig    2008-01-30 06:56:21.000000000 -0800
-+++ mpware/Makefile.in
-@@ -46,11 +46,11 @@ Makefile: Makefile.in ../config.status
- 
- install: install-exec install-data
- install-exec: $(programs)
--      $(SHELL) $(top_srcdir)/../mkinstalldirs $(bindir) $(scriptdir)
--      $(INSTALL_PROGRAM) newer $(bindir)/newer
--      $(INSTALL_LIBTOOL_PROG) dmp $(bindir)
--      $(INSTALL_LIBTOOL_PROG) mpto $(bindir)
--      $(INSTALL_LIBTOOL_PROG) makempx $(bindir)
-+      $(SHELL) $(top_srcdir)/../mkinstalldirs $(DESTDIR)$(bindir) $(DESTDIR)$(scriptdir)



Home | Main Index | Thread Index | Old Index