[pkgsrc/trunk]: pkgsrc/print/teTeX3-bin Do not build xdvi included in teTeX s...

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc/print/teTeX3-bin Do not build xdvi included in teTeX s...
From: minskim <minskim%pkgsrc.org@localhost>
Date: Thu, 14 Oct 2021 07:21:47 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/598ed5a12b4e
branches:  trunk
changeset: 555037:598ed5a12b4e
user:      minskim <minskim%pkgsrc.org@localhost>
date:      Mon Feb 23 20:12:19 2009 +0000

description:
Do not build xdvi included in teTeX so that teTeX-bin can be installed
without X11.  A newer version of xdvi is available in print/xdvik.

Bump PKGREVISION.

diffstat:

 print/teTeX3-bin/INSTALL          |  63 +--------------------------------------
 print/teTeX3-bin/Makefile         |  10 +----
 print/teTeX3-bin/Makefile.common  |   6 +-
 print/teTeX3-bin/PLIST            |  13 +-------
 print/teTeX3-bin/distinfo         |   5 +--
 print/teTeX3-bin/patches/patch-ad |  13 --------
 print/teTeX3-bin/patches/patch-ao |  14 --------
 print/teTeX3-bin/patches/patch-bd |  13 --------
 8 files changed, 9 insertions(+), 128 deletions(-)

diffs (283 lines):

diff -r 0baeff42a46b -r 598ed5a12b4e print/teTeX3-bin/INSTALL
--- a/print/teTeX3-bin/INSTALL  Mon Feb 23 19:33:22 2009 +0000
+++ b/print/teTeX3-bin/INSTALL  Mon Feb 23 20:12:19 2009 +0000
@@ -1,11 +1,10 @@
-# $NetBSD: INSTALL,v 1.11 2009/02/17 21:09:54 minskim Exp $
+# $NetBSD: INSTALL,v 1.12 2009/02/23 20:12:19 minskim Exp $
 
 PATH="@PREFIX@"/bin:"${PATH}"
 export PATH
 
 case "${STAGE}" in
 POST-INSTALL)
-       ${TEST} ! -x ./+TEXCONFIG || ./+TEXCONFIG PAPER
        ${TEST} ! -x ./+TETEX || ./+TETEX ADD
        ;;
 esac
@@ -49,11 +48,6 @@
        ;;
 
 REMOVE)
-       # Remove config files generated by +TEXCONFIG.
-       ${RM} -f @PKG_SYSCONFBASE@/texmf/xdvi/XDvi
-
-       # Remove stray directores.
-       ${RMDIR} -p @PKG_SYSCONFBASE@/texmf/xdvi 2>/dev/null || ${TRUE}
        @MKTEXLSR@ ${TEXMF_VARDIR} @PKG_SYSCONFBASE@/texmf
        ;;
 
@@ -66,58 +60,3 @@
        ${CHMOD} +x ./+TETEX
        ;;
 esac
-
-#
-# Generate a +TEXCONFIG script sets the initial font and papersize
-# settings for the teTeX installation.
-#
-case "${STAGE},$1" in
-UNPACK,|UNPACK,+TEXCONFIG)
-       ${CAT} > ./+TEXCONFIG << 'EOF'
-#!@SH@
-#
-# +TEXCONFIG - default font and papersize settings for teTeX
-#
-# Usage: ./+TEXCONFIG FONTS [fontdir]
-#        ./+TEXCONFIG PAPER [papersize]
-
-ECHO="@ECHO@"
-TEST="@TEST@"
-
-SELF=$0
-ACTION=$1
-: ${PKG_PREFIX=@PREFIX@}
-
-TEXCONFIG="${PKG_PREFIX}/bin/texconfig-sys"
-
-exitcode=0
-case $ACTION in
-FONTS)
-       # Set the default texfonts directory to the specified directory.
-       ${TEST} ! -x ${TEXCONFIG} ||
-               ${TEXCONFIG} font vardir "@VARBASE@/lib/texmf/fonts"
-       ${TEST} ! -x ${TEXCONFIG} ||
-               ${TEXCONFIG} font rw
-       ;;
-
-PAPER)
-       # Set the paper size for xdvi to the specified papersize.
-       PAPERSIZE="${2-@PAPERSIZE@}"
-       PAPERSIZE_xdvi="$PAPERSIZE"
-       case "$PAPERSIZE" in
-       letter) PAPERSIZE_xdvi="us" ;;
-       esac
-       ${TEST} ! -x ${TEXCONFIG} ||
-               ${TEXCONFIG} xdvi paper $PAPERSIZE_xdvi
-       ;;
-
-*)
-       ${ECHO} "Usage: ./+TEXCONFIG FONTS [fontdir]"
-       ${ECHO} "       ./+TEXCONFIG PAPER [papersize]"
-       ;;
-esac
-exit $exitcode
-EOF
-       ${CHMOD} +x ./+TEXCONFIG
-       ;;
-esac
diff -r 0baeff42a46b -r 598ed5a12b4e print/teTeX3-bin/Makefile
--- a/print/teTeX3-bin/Makefile Mon Feb 23 19:33:22 2009 +0000
+++ b/print/teTeX3-bin/Makefile Mon Feb 23 20:12:19 2009 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.38 2009/02/17 21:09:54 minskim Exp $
+# $NetBSD: Makefile,v 1.39 2009/02/23 20:12:19 minskim Exp $
 
 DISTNAME=      tetex-src-3.0
 PKGNAME=       ${DISTNAME:C/tetex/teTeX/:C/src/bin/}
-PKGREVISION=   24
+PKGREVISION=   25
 CATEGORIES=    print
 MASTER_SITES=  ${MASTER_SITE_TEX_CTAN:=systems/unix/teTeX/3.0/distrib/}
 
@@ -20,13 +20,12 @@
 INFO_FILES=    # PLIST
 
 USE_TOOLS+=    bison lex
-REPLACE_PERL=  texk/xdvik/t1mapper
 
 USE_LIBTOOL=   yes
 
 CONFIGURE_ARGS+=       --without-texinfo --without-texi2html
 CONFIGURE_ARGS+=       --without-dvipsk --without-odvipsk
-CONFIGURE_ARGS+=       --with-xdvi-x-toolkit=xaw
+CONFIGURE_ARGS+=       --without-xdvik --without-oxdvik
 
 MAKE_ENV+=             KPATHSEA_PREFIX=${BUILDLINK_PREFIX.kpathsea}
 MAKE_FLAGS+=           LIBTOOL=${LIBTOOL:Q}
@@ -104,9 +103,6 @@
 .include "../../print/teTeX3-bin/Makefile.common"
 .include "../../print/texlive-tetex/format.mk"
 .include "../../print/texlive-tetex/map.mk"
-.include "../../x11/libXp/buildlink3.mk"
-.include "../../x11/libXpm/buildlink3.mk"
-.include "../../mk/xaw.buildlink3.mk"
 
 post-extract:
        ${RM} -rf ${WRKSRC}/texk/kpathsea
diff -r 0baeff42a46b -r 598ed5a12b4e print/teTeX3-bin/Makefile.common
--- a/print/teTeX3-bin/Makefile.common  Mon Feb 23 19:33:22 2009 +0000
+++ b/print/teTeX3-bin/Makefile.common  Mon Feb 23 20:12:19 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.11 2008/12/09 19:43:37 minskim Exp $
+# $NetBSD: Makefile.common,v 1.12 2009/02/23 20:12:19 minskim Exp $
 
 TETEX_BIN_VERS=                3.0
 DIST_SUBDIR=           teTeX
@@ -17,7 +17,8 @@
 CONFIGURE_ARGS+=       --with-epsfwin
 CONFIGURE_ARGS+=       --with-hp2627win
 CONFIGURE_ARGS+=       --with-mftalkwin
-CONFIGURE_ARGS+=       --with-x11
+CONFIGURE_ARGS+=       --with-mf-nowin
+CONFIGURE_ARGS+=       --without-x11
 CONFIGURE_ARGS+=       --with-system-ncurses
 CONFIGURE_ARGS+=       --with-ncurses-include=${BUILDLINK_PREFIX.ncurses}/include
 CONFIGURE_ARGS+=       --with-ncurses-libdir=${BUILDLINK_PREFIX.ncurses}/lib
@@ -49,4 +50,3 @@
 .include "../../fonts/t1lib/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../devel/ncurses/buildlink3.mk"
-.include "../../x11/libX11/buildlink3.mk"
diff -r 0baeff42a46b -r 598ed5a12b4e print/teTeX3-bin/PLIST
--- a/print/teTeX3-bin/PLIST    Mon Feb 23 19:33:22 2009 +0000
+++ b/print/teTeX3-bin/PLIST    Mon Feb 23 20:12:19 2009 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 2009/02/17 21:09:54 minskim Exp $
+@comment $NetBSD: PLIST,v 1.9 2009/02/23 20:12:19 minskim Exp $
 bin/a2ping
 bin/aleph
 bin/bibtex
@@ -53,7 +53,6 @@
 bin/outocp
 bin/ovf2ovp
 bin/ovp2ovf
-bin/oxdvi
 bin/patgen
 bin/pdfcrop
 bin/pdfetex
@@ -82,9 +81,6 @@
 bin/vftovp
 bin/vptovf
 bin/weave
-bin/xdvi
-bin/xdvi-xaw.bin
-bin/xdvizilla
 info/latex.info
 info/web2c.info
 man/man1/amstex.1
@@ -129,7 +125,6 @@
 man/man1/odvicopy.1
 man/man1/odvitype.1
 man/man1/omega.1
-man/man1/oxdvi.1
 man/man1/patgen.1
 man/man1/pdfetex.1
 man/man1/pdflatex.1
@@ -151,8 +146,6 @@
 man/man1/vftovp.1
 man/man1/vptovf.1
 man/man1/weave.1
-man/man1/xdvi.1
-man/man1/xdvizilla.1
 share/texmf/doc/tetex/TETEXDOC.dvi
 share/texmf/doc/tetex/TETEXDOC.pdf
 share/texmf/doc/tetex/TETEXDOC.ps
@@ -168,7 +161,3 @@
 share/texmf/web2c/pdfetex.pool
 share/texmf/web2c/pdfxtex.pool
 share/texmf/web2c/tex.pool
-share/texmf/xdvi/XDvi
-share/texmf/xdvi/pixmaps/toolbar.xpm
-share/texmf/xdvi/pixmaps/toolbar2.xpm
-share/texmf/xdvi/xdvi.cfg
diff -r 0baeff42a46b -r 598ed5a12b4e print/teTeX3-bin/distinfo
--- a/print/teTeX3-bin/distinfo Mon Feb 23 19:33:22 2009 +0000
+++ b/print/teTeX3-bin/distinfo Mon Feb 23 20:12:19 2009 +0000
@@ -1,11 +1,10 @@
-$NetBSD: distinfo,v 1.16 2009/01/26 21:17:05 minskim Exp $
+$NetBSD: distinfo,v 1.17 2009/02/23 20:12:19 minskim Exp $
 
 SHA1 (teTeX/tetex-src-3.0.tar.gz) = 7637789f7f4929694aed1b89820f5bad4753e8fc
 RMD160 (teTeX/tetex-src-3.0.tar.gz) = 15a139f5f36993e4ed3583260e175cfb13ce7bcc
 Size (teTeX/tetex-src-3.0.tar.gz) = 12749314 bytes
 SHA1 (patch-aa) = afdcbf2dafe053db174ca456806667dbe2cc79c2
 SHA1 (patch-ab) = caaf91dbbd8fa94fabf7b4f6fe6e0a97c7a6071a
-SHA1 (patch-ad) = 23d8e8729bc10748cceba5be3272484ab50f34e6
 SHA1 (patch-ae) = 68825699db129b82f476c37ba3b6e20a8831ad6e
 SHA1 (patch-af) = d5fd0e1b30b1ea9fd96fe5983088df5a723f04b7
 SHA1 (patch-ag) = 7cafd77044dabc5a8ac3094fb8685211d81e3262
@@ -16,7 +15,6 @@
 SHA1 (patch-al) = e1fc74bd6ea05176dfac4e99958f0e1281b89b3b
 SHA1 (patch-am) = 54d86197eee3d4e15a6c9bad6ae16ef1e0299667
 SHA1 (patch-an) = a02db18a49f61f965e0277fbc5a3fa72a5060b47
-SHA1 (patch-ao) = 3aa5c8ac2eaf79a2a350febe102872b529f534a9
 SHA1 (patch-aq) = d7a4dd4864e43cd27b1ca803f8ebfe82e65f84a7
 SHA1 (patch-ar) = 92f465143d278d7b081d70c3053194b70585571b
 SHA1 (patch-as) = e67aa6558648480ba686f84e08cee3670c79fbd1
@@ -30,4 +28,3 @@
 SHA1 (patch-ba) = 598a0668da03f01f30239ac1f3dafaa2a0831c58
 SHA1 (patch-bb) = 14e1ca5de201037f4d9d8a818da3a01bc552a389
 SHA1 (patch-bc) = 7a2f9a3f7218a7985b551c0e5023372436b4eb53
-SHA1 (patch-bd) = 6b4947689c1a3763f1cf274583ca10789e2283f5
diff -r 0baeff42a46b -r 598ed5a12b4e print/teTeX3-bin/patches/patch-ad
--- a/print/teTeX3-bin/patches/patch-ad Mon Feb 23 19:33:22 2009 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-$NetBSD: patch-ad,v 1.1.1.1 2005/03/31 22:09:18 hubertf Exp $
-
---- texk/xdvik/Makefile.in.orig        2005-01-23 23:17:52.000000000 +0000
-+++ texk/xdvik/Makefile.in
-@@ -29,7 +29,7 @@ x_ext_lib=@x_ext_lib@
- # It seems that on Cygwin, libXaw needs _XpmReadFileToPixmap, so we put
- # x_xpm_libs last.
- # Xmu needs to come before Xt and after the toolkit libs.
--x_link = $(LDLIBT1) $(x_ldflags) $(x_tool_libs) $(x_xmu_lib) -lXt $(x_pre_libs) $(x_ext_lib) -lX11 $(x_extra_libs) $(x_xpm_libs)
-+x_link = $(LDLIBT1) $(x_ldflags) $(x_tool_libs) $(x_xmu_lib) -lXt $(x_pre_libs) $(x_ext_lib) -lX11 $(x_extra_libs) $(x_xpm_libs) -lz
- 
- LDLIBT1=@LDLIBT1@
- LIBT1CPPFLAGS=@LIBT1CPPFLAGS@
diff -r 0baeff42a46b -r 598ed5a12b4e print/teTeX3-bin/patches/patch-ao
--- a/print/teTeX3-bin/patches/patch-ao Mon Feb 23 19:33:22 2009 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,14 +0,0 @@
-$NetBSD: patch-ao,v 1.3 2009/01/21 22:06:55 schwarz Exp $
-
---- texk/xdvik/special.c.orig  2009-01-21 20:32:23.000000000 +0100
-+++ texk/xdvik/special.c       2009-01-21 20:32:50.000000000 +0100
-@@ -181,7 +181,9 @@
- #define       MAX_PEN_SIZE    7       /* Max pixels of pen width */
- #define       TWOPI           (3.14159265359 * 2.0)
- 
-+#ifndef floor
- extern double floor(double);
-+#endif
- #define       rint(x) floor((x) + 0.5)
- 
- static int xx[MAXPOINTS], yy[MAXPOINTS];      /* Path in milli-inches */
diff -r 0baeff42a46b -r 598ed5a12b4e print/teTeX3-bin/patches/patch-bd
--- a/print/teTeX3-bin/patches/patch-bd Mon Feb 23 19:33:22 2009 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-$NetBSD: patch-bd,v 1.1 2009/01/08 22:09:35 minskim Exp $
-
---- texk/xdvik/gui/Makefile.in.orig    2004-04-18 05:21:13.000000000 -0700
-+++ texk/xdvik/gui/Makefile.in
-@@ -12,7 +12,7 @@ ac_include ../make/library.mk
- ac_include ../make/common.mk
- ac_include ../make/programs.mk
- 
--kpathsea_parent = ../..
-+kpathsea_parent = $(KPATHSEA_PREFIX)/include
- 
- CPP = @CPP@
- RANLIB = @RANLIB@
Prev by Date: [pkgsrc/trunk]: pkgsrc/meta-pkgs/desktop-gnome Import desktop-gnome-0.1 as me...
Next by Date: [pkgsrc/trunk]: pkgsrc/graphics/nvtv - Use gtk2 (nvtv-gtk2 will go away right...
Previous by Thread: [pkgsrc/trunk]: pkgsrc/meta-pkgs/desktop-gnome Import desktop-gnome-0.1 as me...
Next by Thread: [pkgsrc/trunk]: pkgsrc/graphics/nvtv - Use gtk2 (nvtv-gtk2 will go away right...
Indexes:
Home | Main Index | Thread Index | Old Index