pkgsrc-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc/print Update teTeX packages to 2.0.2 (really merge teT...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/27f52b08a272
branches:  trunk
changeset: 465237:27f52b08a272
user:      jmmv <jmmv%pkgsrc.org@localhost>
date:      Wed Dec 24 12:51:31 2003 +0000

description:
Update teTeX packages to 2.0.2 (really merge teTeX2 into teTeX).  The 2.x
branch becomes the default teTeX package.

diffstat:

 print/teTeX-bin/Makefile                    |     85 +-
 print/teTeX-bin/Makefile.common             |     62 +
 print/teTeX-bin/PLIST                       |    692 +-
 print/teTeX-bin/distinfo                    |     27 +-
 print/teTeX-bin/kpathsea.buildlink2.mk      |      4 +-
 print/teTeX-bin/patches/patch-aa            |     30 -
 print/teTeX-bin/patches/patch-ab            |     13 -
 print/teTeX-bin/patches/patch-ac            |     12 +-
 print/teTeX-bin/patches/patch-ad            |     12 +-
 print/teTeX-bin/patches/patch-ae            |     13 -
 print/teTeX-bin/patches/patch-af            |     22 -
 print/teTeX-bin/patches/patch-ag            |     13 -
 print/teTeX-bin/patches/patch-ah            |     98 -
 print/teTeX-bin/patches/patch-ai            |     92 -
 print/teTeX-bin/patches/patch-aj            |     12 -
 print/teTeX-bin/patches/patch-ak            |     49 -
 print/teTeX-bin/patches/patch-al            |    132 -
 print/teTeX-bin/patches/patch-am            |     40 -
 print/teTeX-bin/patches/patch-an            |     13 -
 print/teTeX-bin/patches/patch-ao            |     18 -
 print/teTeX-bin/patches/patch-ap            |     78 +-
 print/teTeX-bin/patches/patch-aq            |     24 +-
 print/teTeX-share/Makefile                  |     30 +-
 print/teTeX-share/PLIST                     |  13685 +++++++++++++++----------
 print/teTeX-share/distinfo                  |      6 +-
 print/teTeX-share/files/dvipdfm-config.diff |     13 +
 print/teTeX-share/files/dvipdfm.def         |    131 -
 print/teTeX-share/files/exclude             |      2 -
 print/teTeX-share/files/latex.ltx.diff      |     21 -
 print/teTeX-sharesrc/Makefile               |     29 +-
 print/teTeX-sharesrc/PLIST                  |   1842 ++-
 print/teTeX-sharesrc/distinfo               |      6 +-
 print/teTeX/Makefile                        |     15 +-
 33 files changed, 10173 insertions(+), 7148 deletions(-)

diffs (truncated from 21094 to 300 lines):

diff -r 284c2465796c -r 27f52b08a272 print/teTeX-bin/Makefile
--- a/print/teTeX-bin/Makefile  Wed Dec 24 12:03:08 2003 +0000
+++ b/print/teTeX-bin/Makefile  Wed Dec 24 12:51:31 2003 +0000
@@ -1,92 +1,36 @@
-# $NetBSD: Makefile,v 1.50 2003/11/07 16:20:26 gavan Exp $
+# $NetBSD: Makefile,v 1.51 2003/12/24 12:51:31 jmmv Exp $
 
-DISTNAME=      teTeX-src-1.0.7
-PKGNAME=       teTeX-bin-1.0.7
-PKGREVISION=   3
-WRKSRC=                ${WRKDIR}/teTeX-1.0
+DISTNAME=      tetex-src-${TETEX_BIN_VERS}
+PKGNAME=       teTeX-bin-${TETEX_BIN_VERS}
 CATEGORIES=    print
-MASTER_SITES=  ${MASTER_SITE_TEX_CTAN:=systems/unix/teTeX/1.0/distrib/sources/}
+MASTER_SITES=  ${MASTER_SITE_TEX_CTAN:=systems/unix/teTeX/2.0/distrib/}
 
-MAINTAINER=    hubertf%NetBSD.org@localhost
+MAINTAINER=    kei%NetBSD.org@localhost
 HOMEPAGE=      http://www.tug.org/tetex/
-COMMENT=       TeX distribution for UNIX compatible systems - executables
+COMMENT=       TeX distribution for UNIX compatible systems - executables, version 2
+
+CONFLICTS+=    teTeX2-bin-[0-9]*
 
 BUILD_DEPENDS+=        bison-[0-9]*:../../devel/bison
-DEPENDS+=      teTeX-share>=1.0.2nb1:../teTeX-share
+DEPENDS+=      teTeX-share>=2.0.2:../teTeX-share
 DEPENDS+=      dialog-0.6z*:../../misc/dialog
 
 CONFLICTS+=    omega-[0-9]*
 
-DIST_SUBDIR=           teTeX
-ALL_TARGET=            all
-INSTALL_TARGET=                install strip
+INFO_FILES=    latex.info dvips.info web2c.info kpathsea.info
 
-USE_BUILDLINK2=                yes
-USE_PKGINSTALL=                yes
-USE_GCC_SHLIB=         yes
-USE_GMAKE=             yes
-USE_X11=               yes
-CFLAGS+=               -Dunix
-
-INFO_FILES=            latex.info dvips.info web2c.info kpathsea.info
+REPLACE_PERL=  texk/xdvik/t1mapper \
+               texk/oxdvik/t1mapper
 
 INSTALL_EXTRA_TMPL+=   ${.CURDIR}/INSTALL
 
-GNU_CONFIGURE=         yes
-CONFIG_GUESS_OVERRIDE= ${WRKSRC}/texk/config.guess
-CONFIG_GUESS_OVERRIDE+=        ${WRKSRC}/config/config.guess
-CONFIG_GUESS_OVERRIDE+=        ${WRKSRC}/libs/ncurses/config.guess
-CONFIG_GUESS_OVERRIDE+=        ${WRKSRC}/texinfo/config.guess
-CONFIG_SUB_OVERRIDE=   ${WRKSRC}/texk/config.sub
-CONFIG_SUB_OVERRIDE+=  ${WRKSRC}/config/config.sub
-CONFIG_SUB_OVERRIDE+=  ${WRKSRC}/libs/ncurses/config.sub
-CONFIG_SUB_OVERRIDE+=  ${WRKSRC}/texinfo/config.sub
-CONFIGURE_ARGS+=       --without-texinfo
-CONFIGURE_ARGS+=       --without-dialog
-CONFIGURE_ARGS+=       --disable-multiplatform
-CONFIGURE_ARGS+=       --enable-ipc
-CONFIGURE_ARGS+=       --with-epsfwin
-CONFIGURE_ARGS+=       --with-hp2627win
-CONFIGURE_ARGS+=       --with-mftalkwin
-CONFIGURE_ARGS+=       --with-x11
-CONFIGURE_ARGS+=       --with-libwww-config=${LOCALBASE}/bin/libwww-config
-CONFIGURE_ARGS+=       --with-system-pnglib
-CONFIGURE_ARGS+=       --with-pnglib-include=${BUILDLINK_PREFIX.png}/include
-CONFIGURE_ARGS+=       --with-pnglib-libdir=${BUILDLINK_PREFIX.png}/lib
-CONFIGURE_ARGS+=       --with-system-zlib
-CONFIGURE_ARGS+=       --with-zlib-include=${BUILDLINK_PREFIX.zlib}/include
-CONFIGURE_ARGS+=       --with-zlib-libdir=${BUILDLINK_PREFIX.zlib}/lib
-
 .include "../../mk/bsd.prefs.mk"
 # sysutils/coreutils installs a 'readlink' program, so conflict with it if
 # GNU_PROGRAM_PREFIX == ''
 .if ${GNU_PROGRAM_PREFIX} == ""
-CONFLICTS+=            coreutils-[0-9]*
-.endif
-
-.if defined(PAPERSIZE) && ${PAPERSIZE} == "A4"
-CONFIGURE_ARGS+=       --enable-a4
-.endif
-
-.if ${OPSYS} != "SunOS"
-CONFIGURE_ARGS+=       --enable-auto-core
+CONFLICTS+=    coreutils-[0-9]*
 .endif
 
-.if ${OPSYS} == "Darwin" && ${OS_VERSION:R} == "6"
-# Darwin 6.x's default (3.1ish) g++ has a bug that breaks the xpdf build
-CXX=                   g++2
-.endif
-
-CONFIGURE_ENV+=        INSTALL_PROGRAM="${INSTALL_PROGRAM}" \
-               INSTALL_SCRIPT="${INSTALL_SCRIPT}" \
-               INSTALL_DATA="${INSTALL_DATA}"
-
-TEXFONTSDIR=           /var/spool/texfonts
-OWN_DIRS=              ${TEXFONTSDIR}
-OWN_DIRS_PERMS=                ${TEXFONTSDIR}/pk ${ROOT_USER} ${ROOT_GROUP} 1777
-OWN_DIRS_PERMS+=       ${TEXFONTSDIR}/source ${ROOT_USER} ${ROOT_GROUP} 1777
-OWN_DIRS_PERMS+=       ${TEXFONTSDIR}/tfm ${ROOT_USER} ${ROOT_GROUP} 1777
-
 post-install:
        @${RM} ${PREFIX}/share/texmf/web2c/*.log
 .if defined(PAPERSIZE)
@@ -101,7 +45,6 @@
        ${LOCALBASE}/bin/texconfig font vardir /var/spool/texfonts
        ${LOCALBASE}/bin/texconfig font options appendonlydir varfonts
 
-.include "../../graphics/png/buildlink2.mk"
-.include "../../www/libwww/buildlink2.mk"
+.include "../../print/teTeX-bin/Makefile.common"
 
 .include "../../mk/bsd.pkg.mk"
diff -r 284c2465796c -r 27f52b08a272 print/teTeX-bin/Makefile.common
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/print/teTeX-bin/Makefile.common   Wed Dec 24 12:51:31 2003 +0000
@@ -0,0 +1,62 @@
+# $NetBSD: Makefile.common,v 1.1 2003/12/24 12:51:31 jmmv Exp $
+
+TETEX_BIN_VERS=                2.0.2
+DIST_SUBDIR=           teTeX
+ALL_TARGET=            all
+INSTALL_TARGET=                install strip
+
+USE_BUILDLINK2=                yes
+USE_GMAKE=             yes
+USE_PKGINSTALL=                yes
+USE_X11=               yes
+CFLAGS+=               -Dunix
+
+GNU_CONFIGURE=         yes
+CONFIGURE_ARGS+=       --without-texinfo
+CONFIGURE_ARGS+=       --without-dialog
+CONFIGURE_ARGS+=       --disable-multiplatform
+CONFIGURE_ARGS+=       --enable-ipc
+CONFIGURE_ARGS+=       --with-epsfwin
+CONFIGURE_ARGS+=       --with-hp2627win
+CONFIGURE_ARGS+=       --with-mftalkwin
+CONFIGURE_ARGS+=       --with-x11
+CONFIGURE_ARGS+=       --with-system-wwwlib
+CONFIGURE_ARGS+=       --with-libwww-config=${LOCALBASE}/bin/libwww-config
+CONFIGURE_ARGS+=       --with-system-ncurses
+CONFIGURE_ARGS+=       --with-ncurses-include=${BUILDLINK_PREFIX.ncurses}/include
+CONFIGURE_ARGS+=       --with-ncurses-libdir=${BUILDLINK_PREFIX.ncurses}/lib
+CONFIGURE_ARGS+=       --with-system-pnglib
+CONFIGURE_ARGS+=       --with-pnglib-include=${BUILDLINK_PREFIX.png}/include
+CONFIGURE_ARGS+=       --with-pnglib-libdir=${BUILDLINK_PREFIX.png}/lib
+CONFIGURE_ARGS+=       --with-system-t1lib
+CONFIGURE_ARGS+=       --with-t1lib-include=${BUILDLINK_PREFIX.t1lib}/include
+CONFIGURE_ARGS+=       --with-t1lib-libdir=${BUILDLINK_PREFIX.t1lib}/lib
+CONFIGURE_ARGS+=       --with-system-zlib
+CONFIGURE_ARGS+=       --with-zlib-include=${BUILDLINK_PREFIX.zlib}/include
+CONFIGURE_ARGS+=       --with-zlib-libdir=${BUILDLINK_PREFIX.zlib}/lib
+
+.include "../../mk/bsd.prefs.mk"
+
+.if defined(PAPERSIZE) && ${PAPERSIZE} != "A4"
+CONFIGURE_ARGS+=       --disable-a4
+.endif
+
+.if ${OPSYS} != "SunOS"
+CONFIGURE_ARGS+=       --enable-auto-core
+.endif
+
+CONFIGURE_ENV+=        INSTALL_PROGRAM="${INSTALL_PROGRAM}" \
+               INSTALL_SCRIPT="${INSTALL_SCRIPT}" \
+               INSTALL_DATA="${INSTALL_DATA}"
+
+TEXFONTSDIR=           /var/spool/texfonts
+OWN_DIRS=              ${TEXFONTSDIR}
+OWN_DIRS_PERMS=                ${TEXFONTSDIR}/pk ${ROOT_USER} ${ROOT_GROUP} 1777
+OWN_DIRS_PERMS+=       ${TEXFONTSDIR}/source ${ROOT_USER} ${ROOT_GROUP} 1777
+OWN_DIRS_PERMS+=       ${TEXFONTSDIR}/tfm ${ROOT_USER} ${ROOT_GROUP} 1777
+
+.include "../../www/libwww/buildlink2.mk"
+.include "../../graphics/png/buildlink2.mk"
+.include "../../fonts/t1lib/buildlink2.mk"
+.include "../../devel/zlib/buildlink2.mk"
+.include "../../devel/ncurses/buildlink2.mk"
diff -r 284c2465796c -r 27f52b08a272 print/teTeX-bin/PLIST
--- a/print/teTeX-bin/PLIST     Wed Dec 24 12:03:08 2003 +0000
+++ b/print/teTeX-bin/PLIST     Wed Dec 24 12:51:31 2003 +0000
@@ -1,345 +1,381 @@
-@comment $NetBSD: PLIST,v 1.4 2003/08/04 22:02:30 seb Exp $
+@comment $NetBSD: PLIST,v 1.5 2003/12/24 12:51:31 jmmv Exp $
 @comment There are three files in this package that teTeX-share installs
 @comment and that teTeX-bin modifies. Take care of this:
-lib/libkpathsea.a
-info/latex.info-3
-info/latex.info-2
-info/latex.info-1
-info/latex.info
-info/dvips.info-4
-info/dvips.info-3
-info/dvips.info-2
-info/dvips.info-1
-info/dvips.info
-info/web2c.info-4
-info/web2c.info-3
-info/web2c.info-2
-info/web2c.info-1
-info/web2c.info
-info/kpathsea.info
-include/kpathsea/xstat.h
-include/kpathsea/xopendir.h
-include/kpathsea/win32lib.h
-include/kpathsea/variable.h
-include/kpathsea/types.h
-include/kpathsea/truncate.h
-include/kpathsea/tilde.h
-include/kpathsea/tex-make.h
-include/kpathsea/tex-hush.h
-include/kpathsea/tex-glyph.h
-include/kpathsea/tex-file.h
-include/kpathsea/systypes.h
-include/kpathsea/str-llist.h
-include/kpathsea/str-list.h
-include/kpathsea/readable.h
-include/kpathsea/progname.h
-include/kpathsea/proginit.h
-include/kpathsea/pathsearch.h
-include/kpathsea/paths.h
-include/kpathsea/magstep.h
-include/kpathsea/line.h
-include/kpathsea/lib.h
-include/kpathsea/kpathsea.h
-include/kpathsea/hash.h
-include/kpathsea/getopt.h
-include/kpathsea/fontmap.h
-include/kpathsea/fn.h
-include/kpathsea/expand.h
-include/kpathsea/default.h
-include/kpathsea/debug.h
-include/kpathsea/db.h
-include/kpathsea/config.h
-include/kpathsea/concatn.h
-include/kpathsea/cnf.h
-include/kpathsea/c-vararg.h
-include/kpathsea/c-unistd.h
-include/kpathsea/c-std.h
-include/kpathsea/c-stat.h
-include/kpathsea/c-proto.h
-include/kpathsea/c-pathmx.h
-include/kpathsea/c-pathch.h
-include/kpathsea/c-namemx.h
-include/kpathsea/c-minmax.h
-include/kpathsea/c-memstr.h
-include/kpathsea/c-limits.h
-include/kpathsea/c-fopen.h
-include/kpathsea/c-errno.h
-include/kpathsea/c-dir.h
-include/kpathsea/c-ctype.h
-include/kpathsea/c-auto.h
+bin/MakeTeXPK
+bin/access
+bin/afm2tfm
+bin/allcm
+bin/allec
+bin/allneeded
+bin/bibtex
+bin/ctangle
+bin/cweave
+bin/dmp
+bin/dvi2fax
+bin/dvicopy
+bin/dvihp
+bin/dvilj
+bin/dvilj2p
+bin/dvilj4
+bin/dvilj4l
+bin/dvilj6
+bin/dvipdfm
+bin/dvipdft
+bin/dvips
+bin/dvired
+bin/dvitomp
+bin/dvitype
+bin/e2pall
+bin/ebb
+bin/einitex
+bin/elatex
+bin/epstopdf
+bin/etex
+bin/evirtex
+bin/fdf2tan
+bin/fmtutil
+bin/fontexport
+bin/fontimport
+bin/fontinst
+bin/gftodvi
+bin/gftopk
+bin/gftype
+bin/gsftopk
+bin/inimf
+bin/inimpost



Home | Main Index | Thread Index | Old Index