head 1.4; access; symbols pkgsrc-2026Q1:1.4.0.120 pkgsrc-2026Q1-base:1.4 pkgsrc-2025Q4:1.4.0.118 pkgsrc-2025Q4-base:1.4 pkgsrc-2025Q3:1.4.0.116 pkgsrc-2025Q3-base:1.4 pkgsrc-2025Q2:1.4.0.114 pkgsrc-2025Q2-base:1.4 pkgsrc-2025Q1:1.4.0.112 pkgsrc-2025Q1-base:1.4 pkgsrc-2024Q4:1.4.0.110 pkgsrc-2024Q4-base:1.4 pkgsrc-2024Q3:1.4.0.108 pkgsrc-2024Q3-base:1.4 pkgsrc-2024Q2:1.4.0.106 pkgsrc-2024Q2-base:1.4 pkgsrc-2024Q1:1.4.0.104 pkgsrc-2024Q1-base:1.4 pkgsrc-2023Q4:1.4.0.102 pkgsrc-2023Q4-base:1.4 pkgsrc-2023Q3:1.4.0.100 pkgsrc-2023Q3-base:1.4 pkgsrc-2023Q2:1.4.0.98 pkgsrc-2023Q2-base:1.4 pkgsrc-2023Q1:1.4.0.96 pkgsrc-2023Q1-base:1.4 pkgsrc-2022Q4:1.4.0.94 pkgsrc-2022Q4-base:1.4 pkgsrc-2022Q3:1.4.0.92 pkgsrc-2022Q3-base:1.4 pkgsrc-2022Q2:1.4.0.90 pkgsrc-2022Q2-base:1.4 pkgsrc-2022Q1:1.4.0.88 pkgsrc-2022Q1-base:1.4 pkgsrc-2021Q4:1.4.0.86 pkgsrc-2021Q4-base:1.4 pkgsrc-2021Q3:1.4.0.84 pkgsrc-2021Q3-base:1.4 pkgsrc-2021Q2:1.4.0.82 pkgsrc-2021Q2-base:1.4 pkgsrc-2021Q1:1.4.0.80 pkgsrc-2021Q1-base:1.4 pkgsrc-2020Q4:1.4.0.78 pkgsrc-2020Q4-base:1.4 pkgsrc-2020Q3:1.4.0.76 pkgsrc-2020Q3-base:1.4 pkgsrc-2020Q2:1.4.0.72 pkgsrc-2020Q2-base:1.4 pkgsrc-2020Q1:1.4.0.52 pkgsrc-2020Q1-base:1.4 pkgsrc-2019Q4:1.4.0.74 pkgsrc-2019Q4-base:1.4 pkgsrc-2019Q3:1.4.0.70 pkgsrc-2019Q3-base:1.4 pkgsrc-2019Q2:1.4.0.68 pkgsrc-2019Q2-base:1.4 pkgsrc-2019Q1:1.4.0.66 pkgsrc-2019Q1-base:1.4 pkgsrc-2018Q4:1.4.0.64 pkgsrc-2018Q4-base:1.4 pkgsrc-2018Q3:1.4.0.62 pkgsrc-2018Q3-base:1.4 pkgsrc-2018Q2:1.4.0.60 pkgsrc-2018Q2-base:1.4 pkgsrc-2018Q1:1.4.0.58 pkgsrc-2018Q1-base:1.4 pkgsrc-2017Q4:1.4.0.56 pkgsrc-2017Q4-base:1.4 pkgsrc-2017Q3:1.4.0.54 pkgsrc-2017Q3-base:1.4 pkgsrc-2017Q2:1.4.0.50 pkgsrc-2017Q2-base:1.4 pkgsrc-2017Q1:1.4.0.48 pkgsrc-2017Q1-base:1.4 pkgsrc-2016Q4:1.4.0.46 pkgsrc-2016Q4-base:1.4 pkgsrc-2016Q3:1.4.0.44 pkgsrc-2016Q3-base:1.4 pkgsrc-2016Q2:1.4.0.42 pkgsrc-2016Q2-base:1.4 pkgsrc-2016Q1:1.4.0.40 pkgsrc-2016Q1-base:1.4 pkgsrc-2015Q4:1.4.0.38 pkgsrc-2015Q4-base:1.4 pkgsrc-2015Q3:1.4.0.36 pkgsrc-2015Q3-base:1.4 pkgsrc-2015Q2:1.4.0.34 pkgsrc-2015Q2-base:1.4 pkgsrc-2015Q1:1.4.0.32 pkgsrc-2015Q1-base:1.4 pkgsrc-2014Q4:1.4.0.30 pkgsrc-2014Q4-base:1.4 pkgsrc-2014Q3:1.4.0.28 pkgsrc-2014Q3-base:1.4 pkgsrc-2014Q2:1.4.0.26 pkgsrc-2014Q2-base:1.4 pkgsrc-2014Q1:1.4.0.24 pkgsrc-2014Q1-base:1.4 pkgsrc-2013Q4:1.4.0.22 pkgsrc-2013Q4-base:1.4 pkgsrc-2013Q3:1.4.0.20 pkgsrc-2013Q3-base:1.4 pkgsrc-2013Q2:1.4.0.18 pkgsrc-2013Q2-base:1.4 pkgsrc-2013Q1:1.4.0.16 pkgsrc-2013Q1-base:1.4 pkgsrc-2012Q4:1.4.0.14 pkgsrc-2012Q4-base:1.4 pkgsrc-2012Q3:1.4.0.12 pkgsrc-2012Q3-base:1.4 pkgsrc-2012Q2:1.4.0.10 pkgsrc-2012Q2-base:1.4 pkgsrc-2012Q1:1.4.0.8 pkgsrc-2012Q1-base:1.4 pkgsrc-2011Q4:1.4.0.6 pkgsrc-2011Q4-base:1.4 pkgsrc-2011Q3:1.4.0.4 pkgsrc-2011Q3-base:1.4 pkgsrc-2011Q2:1.4.0.2 pkgsrc-2011Q2-base:1.4 pkgsrc-2011Q1:1.3.0.64 pkgsrc-2011Q1-base:1.3 pkgsrc-2010Q4:1.3.0.62 pkgsrc-2010Q4-base:1.3 pkgsrc-2010Q3:1.3.0.60 pkgsrc-2010Q3-base:1.3 pkgsrc-2010Q2:1.3.0.58 pkgsrc-2010Q2-base:1.3 pkgsrc-2010Q1:1.3.0.56 pkgsrc-2010Q1-base:1.3 pkgsrc-2009Q4:1.3.0.54 pkgsrc-2009Q4-base:1.3 pkgsrc-2009Q3:1.3.0.52 pkgsrc-2009Q3-base:1.3 pkgsrc-2009Q2:1.3.0.50 pkgsrc-2009Q2-base:1.3 pkgsrc-2009Q1:1.3.0.48 pkgsrc-2009Q1-base:1.3 pkgsrc-2008Q4:1.3.0.46 pkgsrc-2008Q4-base:1.3 pkgsrc-2008Q3:1.3.0.44 pkgsrc-2008Q3-base:1.3 cube-native-xorg:1.3.0.42 cube-native-xorg-base:1.3 pkgsrc-2008Q2:1.3.0.40 pkgsrc-2008Q2-base:1.3 cwrapper:1.3.0.38 pkgsrc-2008Q1:1.3.0.36 pkgsrc-2008Q1-base:1.3 pkgsrc-2007Q4:1.3.0.34 pkgsrc-2007Q4-base:1.3 pkgsrc-2007Q3:1.3.0.32 pkgsrc-2007Q3-base:1.3 pkgsrc-2007Q2:1.3.0.30 pkgsrc-2007Q2-base:1.3 pkgsrc-2007Q1:1.3.0.28 pkgsrc-2007Q1-base:1.3 pkgsrc-2006Q4:1.3.0.26 pkgsrc-2006Q4-base:1.3 pkgsrc-2006Q3:1.3.0.24 pkgsrc-2006Q3-base:1.3 pkgsrc-2006Q2:1.3.0.22 pkgsrc-2006Q2-base:1.3 pkgsrc-2006Q1:1.3.0.20 pkgsrc-2006Q1-base:1.3 pkgsrc-2005Q4:1.3.0.18 pkgsrc-2005Q4-base:1.3 pkgsrc-2005Q3:1.3.0.16 pkgsrc-2005Q3-base:1.3 pkgsrc-2005Q2:1.3.0.14 pkgsrc-2005Q2-base:1.3 pkgsrc-2005Q1:1.3.0.12 pkgsrc-2005Q1-base:1.3 pkgsrc-2004Q4:1.3.0.10 pkgsrc-2004Q4-base:1.3 pkgsrc-2004Q3:1.3.0.8 pkgsrc-2004Q3-base:1.3 pkgsrc-2004Q2:1.3.0.6 pkgsrc-2004Q2-base:1.3 pkgsrc-2004Q1:1.3.0.4 pkgsrc-2004Q1-base:1.3 pkgsrc-2003Q4:1.3.0.2 pkgsrc-2003Q4-base:1.3 netbsd-1-6-1:1.1.1.1.0.4 netbsd-1-6-1-base:1.1 netbsd-1-6:1.1.1.1.0.6 netbsd-1-6-RELEASE-base:1.1 pkgviews:1.1.1.1.0.8 pkgviews-base:1.1 buildlink2-base:1.1.1.1 buildlink2:1.1.1.1.0.2 pkgsrc-base:1.1.1.1 TNF:1.1.1; locks; strict; comment @# @; 1.4 date 2011.05.28.11.32.04; author obache; state Exp; branches; next 1.3; 1.3 date 2003.10.05.02.00.43; author kei; state Exp; branches; next 1.2; 1.2 date 2003.03.15.19.57.01; author kei; state Exp; branches; next 1.1; 1.1 date 2002.05.31.13.01.06; author seb; state Exp; branches 1.1.1.1; next ; 1.1.1.1 date 2002.05.31.13.01.06; author seb; state Exp; branches 1.1.1.1.2.1; next ; 1.1.1.1.2.1 date 2002.05.31.13.01.06; author jlam; state dead; branches; next 1.1.1.1.2.2; 1.1.1.1.2.2 date 2002.06.23.18.58.22; author jlam; state Exp; branches; next ; desc @@ 1.4 log @Add user-destdir installation support. @ text @$NetBSD: patch-ac,v 1.3 2003/10/05 02:00:43 kei Exp $ --- texk/xdvik/Makefile.in.orig 2011-05-28 09:37:43.000000000 +0000 +++ texk/xdvik/Makefile.in @@@@ -44,8 +44,8 @@@@ x_ext_lib = @@x_ext_lib@@ # -lXaw -lXmu -lXt -lSM -lICE -lXext -lX11 (some may not be present). x_link = $(LDLIBWWW) $(LDLIBT1) $(x_ldflags) $(x_tool_libs) $(x_pre_libs) $(x_ext_lib) -lX11 $(x_extra_libs) -LDLIBWWW=@@LDLIBWWW@@ -LIBWWWCPPFLAGS=@@LIBWWWCPPFLAGS@@ +LDLIBWWW=$(shell libwww-config --libs) +LIBWWWCPPFLAGS=$(shell libwww-config --cflags) LIBWWWDEP=@@LIBWWWDEP@@ LIBWWWDIR = ../../libs/libwww LIBWWWSRCDIR = $(srcdir)/../../libs/libwww @@@@ -78,10 +78,10 @@@@ objects = xdvi.o dvi-draw.o dvi-init.o e paper.o tategaki.o vfontmap.o vf2ft.o \ $(ALLOCA) dvips.o tfmload.o -program = xdvi.bin -perlprog = t1mapper +program = vfxdvi.bin +perlprog = -default all: $(program) $(perlprog) xdvi.1 t1mapper.1 xdviprint +default all: $(program) $(perlprog) vfxdvi.1 vfxdviprint $(program): $(kpathsea) $(objects) $(LIBWWWDEP) $(LIBT1DEP) $(kpathsea_link) $(objects) $(x_link) $(VFLIB) $(LOADLIBES) @@@@ -118,10 +118,10 @@@@ krheader.h: $(CC_CONCAT_FILES) c-auto.h psheader.c: psheader.txt squeeze ./squeeze $(srcdir)/psheader.txt $@@ -xdvi.1: xdvi.man sedscript +vfxdvi.1: xdvi.man sedscript sed -f sedscript <$(srcdir)/xdvi.man >$@@ -xdviprint: Makefile xdviprint.sample +vfxdviprint: Makefile xdviprint.sample if test -x /usr/bin/nawk; then \ sed -e '/^## for @@DVIFILTER@@/,/^##/s/^# //' -e 's/awk/nawk/' \ -e "s,/usr/local/share/texmf/xdvi,$(XDVIETCDIR)," \ @@@@ -142,40 +142,35 @@@@ INSTALL_SCRIPT = @@INSTALL_SCRIPT@@ install: install-exec install-data uninstall: uninstall-exec uninstall-data -install-exec: $(program) xdviprint - $(SHELL) $(top_srcdir)/../mkinstalldirs $(bindir) - for p in $(program); do $(INSTALL_LIBTOOL_PROG) $(bindir) $$p; done - $(INSTALL_SCRIPT) $(srcdir)/$(perlprog) $(scriptdir)/$(perlprog) - $(INSTALL_SCRIPT) $(srcdir)/xdvi-sh $(scriptdir)/xdvi - $(INSTALL_SCRIPT) $(srcdir)/xdvizilla $(scriptdir)/xdvizilla +install-exec: $(program) vfxdviprint + $(SHELL) $(top_srcdir)/../mkinstalldirs $(DESTDIR)$(bindir) + for p in $(program); do $(INSTALL_LIBTOOL_PROG) $(DESTDIR)$(bindir) $$p; done + $(INSTALL_SCRIPT) $(srcdir)/xdvi-sh $(DESTDIR)$(scriptdir)/vfxdvi + $(INSTALL_SCRIPT) $(srcdir)/xdvizilla $(DESTDIR)$(scriptdir)/vfxdvizilla if test "@@XDVIPRINTCMD@@" != no; then \ - if test ! -x @@XDVIPRINTCMD@@; then \ - $(INSTALL_SCRIPT) $(srcdir)/xdviprint @@XDVIPRINTCMD@@; \ + if test ! -x $(DESTDIR)@@XDVIPRINTCMD@@; then \ + $(INSTALL_SCRIPT) $(srcdir)/vfxdviprint $(DESTDIR)@@XDVIPRINTCMD@@; \ fi; \ fi uninstall-exec: - for p in $(program) $(perlprog) xdvi; do rm -f $(bindir)/$$p; done + for p in $(program) $(perlprog) vfxdvi; do rm -f $(bindir)/$$p; done ### //FIXME: add installation for encoding.map here!! (same place where psfonts.map is?) -install-data: xdvi.1 t1mapper.1 vfontmap.sample - $(SHELL) $(top_srcdir)/../mkinstalldirs $(man1dir) $(XDVIETCDIR) - $(INSTALL_DATA) xdvi.1 $(man1dir)/xdvi.$(manext) - $(INSTALL_DATA) $(srcdir)/t1mapper.1 $(man1dir)/t1mapper.$(manext) - $(INSTALL_DATA) $(srcdir)/xdvizilla.1 $(man1dir)/xdvizilla.$(manext) - $(INSTALL_DATA) $(srcdir)/texmf/xdvi-teTeX.cfg $(texmf)/xdvi/xdvi.cfg - if test ! -f $(XDVIETCDIR)/vfontmap; then \ - $(INSTALL_DATA) vfontmap.sample $(XDVIETCDIR)/vfontmap; \ +install-data: vfxdvi.1 vfontmap.sample + $(SHELL) $(top_srcdir)/../mkinstalldirs $(DESTDIR)$(man1dir) $(DESTDIR)$(XDVIETCDIR) + $(INSTALL_DATA) vfxdvi.1 $(DESTDIR)$(man1dir)/vfxdvi.$(manext) + $(INSTALL_DATA) $(srcdir)/xdvizilla.1 $(DESTDIR)$(man1dir)/vfxdvizilla.$(manext) + if test ! -f $(DESTDIR)$(XDVIETCDIR)/vfontmap; then \ + $(INSTALL_DATA) vfontmap.sample $(DESTDIR)$(XDVIETCDIR)/vfontmap; \ fi - $(INSTALL_DATA) xdvipaper.dvi2ps-j $(XDVIETCDIR)/xdvipaper.dvi2ps-j - $(INSTALL_DATA) xdvipaper.dvips $(XDVIETCDIR)/xdvipaper.dvips - $(INSTALL_DATA) xdvipaper.jdvi2kps $(XDVIETCDIR)/xdvipaper.jdvi2kps + $(INSTALL_DATA) xdvipaper.dvi2ps-j $(DESTDIR)$(XDVIETCDIR)/xdvipaper.dvi2ps-j + $(INSTALL_DATA) xdvipaper.dvips $(DESTDIR)$(XDVIETCDIR)/xdvipaper.dvips + $(INSTALL_DATA) xdvipaper.jdvi2kps $(DESTDIR)$(XDVIETCDIR)/xdvipaper.jdvi2kps uninstall-data: - rm -f $(man1dir)/xdvi.$(manext) - rm -f $(man1dir)/t1mapper.$(manext) - rm -f $(texmf)/xdvi/xdvi.cfg $(texmf)/xdvi/XDvi - rm -f $(man1dir)/xdvizilla.$(manext) $(scriptdir)/xdvizilla + rm -f $(man1dir)/vfxdvi.$(manext) + rm -f $(man1dir)/vfxdvizilla.$(manext) $(scriptdir)/vfxdvizilla rm -f $(FILTOPTTBLDIR)/xdvipaper.* distname = xdvik @@@@ -208,9 +203,6 @@@@ distclean:: test -f $(LIBTYPE1DIR)/Makefile && { cd $(LIBTYPE1DIR); $(MAKE) distclean; } || true test -f $(LIBT1DIR)/Makefile && { cd $(LIBT1DIR); $(MAKE) distclean; } || true -$(LIBWWWDIR)/libwww.a: - cd $(LIBWWWDIR); $(MAKE) $(makeargs) libwww.a - $(LIBT1DIR)/libt1.a: cd $(LIBT1DIR); $(MAKE) $(makeargs) libt1.a @ 1.3 log @- do not install ${PREFIX}/bin/t1mapper nor ${PREFIX}/man/man1/t1mapper.1. teTeX2-bin package installs them as well. - fix build problem. tested only on NetBSD-current. bump PKGREVISION. @ text @d1 1 a1 1 $NetBSD$ d3 3 a5 3 --- texk/xdvik/Makefile.in.orig Fri Jul 11 22:28:01 2003 +++ texk/xdvik/Makefile.in Fri Jul 11 22:30:59 2003 @@@@ -44,8 +44,8 @@@@ d16 1 a16 1 @@@@ -78,10 +78,10 @@@@ d30 1 a30 1 @@@@ -118,10 +118,10 @@@@ d43 1 a43 1 @@@@ -142,28 +142,25 @@@@ d48 2 a49 3 +install-exec: $(program) vfxdviprint $(SHELL) $(top_srcdir)/../mkinstalldirs $(bindir) for p in $(program); do $(INSTALL_LIBTOOL_PROG) $(bindir) $$p; done d53 5 a57 2 + $(INSTALL_SCRIPT) $(srcdir)/xdvi-sh $(scriptdir)/vfxdvi + $(INSTALL_SCRIPT) $(srcdir)/xdvizilla $(scriptdir)/vfxdvizilla d59 1 a59 1 if test ! -x @@XDVIPRINTCMD@@; then \ d61 2 a62 1 + $(INSTALL_SCRIPT) $(srcdir)/vfxdviprint @@XDVIPRINTCMD@@; \ d72 1 a72 2 +install-data: vfxdvi.1 vfontmap.sample $(SHELL) $(top_srcdir)/../mkinstalldirs $(man1dir) $(XDVIETCDIR) d77 8 a84 4 + $(INSTALL_DATA) vfxdvi.1 $(man1dir)/vfxdvi.$(manext) + $(INSTALL_DATA) $(srcdir)/xdvizilla.1 $(man1dir)/vfxdvizilla.$(manext) if test ! -f $(XDVIETCDIR)/vfontmap; then \ $(INSTALL_DATA) vfontmap.sample $(XDVIETCDIR)/vfontmap; \ d86 6 a91 2 @@@@ -172,10 +169,8 @@@@ $(INSTALL_DATA) xdvipaper.jdvi2kps $(XDVIETCDIR)/xdvipaper.jdvi2kps d103 1 a103 2 @@@@ -207,9 +202,6 @@@@ test -f $(LIBWWWDIR)/Makefile && { cd $(LIBWWWDIR); $(MAKE) distclean; } || true d106 1 a106 1 - d109 1 a109 1 d112 1 @ 1.2 log @updated ja-vfxdvik package to version 22.40v.j1.14. this version works with teTeX2. @ text @d1 1 a1 1 $NetBSD: patch-ac,v 1.1 2002/05/31 13:01:06 seb Exp $ d3 2 a4 2 --- texk/xdvik/Makefile.in.orig Sun Mar 16 02:51:01 2003 +++ texk/xdvik/Makefile.in Sun Mar 16 03:01:09 2003 d21 1 d23 1 a23 1 perlprog = t1mapper d26 1 a26 1 +default all: $(program) $(perlprog) vfxdvi.1 t1mapper.1 vfxdviprint d43 1 a43 1 @@@@ -142,15 +142,15 @@@@ d51 1 a51 1 $(INSTALL_SCRIPT) $(srcdir)/$(perlprog) $(scriptdir)/$(perlprog) d63 3 a65 2 @@@@ -158,12 +158,11 @@@@ for p in $(program) $(perlprog) xdvi; do rm -f $(bindir)/$$p; done d69 1 a69 1 +install-data: vfxdvi.1 t1mapper.1 vfontmap.sample d72 1 a72 2 + $(INSTALL_DATA) vfxdvi.1 $(man1dir)/vfxdvi.$(manext) $(INSTALL_DATA) $(srcdir)/t1mapper.1 $(man1dir)/t1mapper.$(manext) d75 1 d80 1 a80 1 @@@@ -172,10 +171,9 @@@@ d85 1 a85 2 + rm -f $(man1dir)/vfxdvi.$(manext) rm -f $(man1dir)/t1mapper.$(manext) d88 1 d93 1 a93 1 @@@@ -207,9 +205,6 @@@@ @ 1.1 log @Initial revision @ text @d1 1 a1 1 $NetBSD$ d3 3 a5 3 --- texk/xdvik/Makefile.in.orig Wed May 30 22:11:44 2001 +++ texk/xdvik/Makefile.in Wed May 30 22:12:36 2001 @@@@ -45,8 +45,9 @@@@ d7 1 a7 1 x_link = $(LDLIBWWW) $(x_ldflags) $(x_tool_libs) $(x_pre_libs) $(x_ext_lib) -lX11 $(x_extra_libs) d10 1 d12 1 a12 2 LIBWWWCPPFLAGS=@@LIBWWWCPPFLAGS@@ +#LIBWWWCPPFLAGS=$(shell libwww-config --cflags) d16 3 a18 3 @@@@ -69,13 +70,13 @@@@ paper.o tategaki.o vfontmap.o \ $(ALLOCA) d22 1 a22 1 programs = $(program) d24 2 a25 2 -default all: $(programs) xdvi.1 xdviprint +default all: $(programs) vfxdvi.1 vfxdviprint d27 3 a29 8 -$(program): $(kpathsea) $(objects) $(LIBWWWDEP) - $(kpathsea_link) $(objects) $(x_link) $(VFLIB) $(LOADLIBES) +$(program): $(kpathsea) $(objects) + $(link_command) $(objects) $(x_link) $(VFLIB) $(LOADLIBES) squeeze: squeeze.o $(link_command) squeeze.o $(LIBS) $(XLOADLIBES) @@@@ -83,10 +84,10 @@@@ d42 1 a42 11 @@@@ -102,9 +103,6 @@@@ $(SHELL) $(srcdir)/mksedscript $(srcdir) pkpath sizes vfpath \ figpath headerpath $(DEFS) $(prog_cflags) >$@@ -$(LIBWWWDIR)/libwww.a: - cd $(LIBWWWDIR); $(MAKE) $(makeargs) libwww.a - # ac_include ../make/tkpathsea.mk INSTALL_SCRIPT = @@INSTALL_SCRIPT@@ @@@@ -112,21 +110,21 @@@@ d46 2 a47 2 -install-exec: $(programs) xdviprint +install-exec: $(programs) vfxdviprint d49 2 a50 1 for p in $(programs); do $(INSTALL_LIBTOOL_PROG) $(bindir) $$p; done d52 1 d54 1 a60 2 uninstall-exec: for p in $(programs) xdvi; do rm -f $(bindir)/$$p; done d62 13 a74 5 -install-data: xdvi.1 vfontmap.sample +install-data: vfxdvi.1 vfontmap.sample $(SHELL) $(top_srcdir)/../mkinstalldirs $(mandir) $(psheaderdir) $(XDVIETCDIR) - $(INSTALL_DATA) xdvi.1 $(mandir)/xdvi.$(manext) + $(INSTALL_DATA) vfxdvi.1 $(mandir)/vfxdvi.$(manext) d78 2 a79 3 @@@@ -158,12 +156,8 @@@@ clean:: rm -f *.flc d81 14 a94 2 -# clean:: -# test -f $(LIBWWWDIR)/Makefile && { cd $(LIBWWWDIR); $(MAKE) clean; } || true d96 2 a97 3 distclean:: rm -f psheader.c sedscript xdvi.1 *.flc -# test -f $(LIBWWWDIR)/Makefile && { cd $(LIBWWWDIR); $(MAKE) distclean; } || true d99 2 a100 2 ac_include ../make/rdepend.mk ac_include depend.make @ 1.1.1.1 log @Reimport of package ja-vfxdvik from japanese/vfxdvik into print/ja-vfxdvik. This is part of the japanese category retirement. Pathnames to japanese/ adjusted. @ text @@ 1.1.1.1.2.1 log @file patch-ac was added on branch buildlink2 on 2002-06-23 18:58:22 +0000 @ text @d1 96 @ 1.1.1.1.2.2 log @Merge from pkgsrc-current to buildlink2 branch. @ text @a0 96 $NetBSD: patch-ac,v 1.1.1.1.2.1 2002/06/23 18:58:22 jlam Exp $ --- texk/xdvik/Makefile.in.orig Wed May 30 22:11:44 2001 +++ texk/xdvik/Makefile.in Wed May 30 22:12:36 2001 @@@@ -45,8 +45,9 @@@@ # -lXaw -lXmu -lXt -lSM -lICE -lXext -lX11 (some may not be present). x_link = $(LDLIBWWW) $(x_ldflags) $(x_tool_libs) $(x_pre_libs) $(x_ext_lib) -lX11 $(x_extra_libs) -LDLIBWWW=@@LDLIBWWW@@ +LDLIBWWW=$(shell libwww-config --libs) LIBWWWCPPFLAGS=@@LIBWWWCPPFLAGS@@ +#LIBWWWCPPFLAGS=$(shell libwww-config --cflags) LIBWWWDEP=@@LIBWWWDEP@@ LIBWWWDIR = ../../libs/libwww LIBWWWSRCDIR = $(srcdir)/../../libs/libwww @@@@ -69,13 +70,13 @@@@ paper.o tategaki.o vfontmap.o \ $(ALLOCA) -program = xdvi.bin +program = vfxdvi.bin programs = $(program) -default all: $(programs) xdvi.1 xdviprint +default all: $(programs) vfxdvi.1 vfxdviprint -$(program): $(kpathsea) $(objects) $(LIBWWWDEP) - $(kpathsea_link) $(objects) $(x_link) $(VFLIB) $(LOADLIBES) +$(program): $(kpathsea) $(objects) + $(link_command) $(objects) $(x_link) $(VFLIB) $(LOADLIBES) squeeze: squeeze.o $(link_command) squeeze.o $(LIBS) $(XLOADLIBES) @@@@ -83,10 +84,10 @@@@ psheader.c: psheader.txt squeeze ./squeeze $(srcdir)/psheader.txt $@@ -xdvi.1: xdvi.man sedscript +vfxdvi.1: xdvi.man sedscript sed -f sedscript <$(srcdir)/xdvi.man >$@@ -xdviprint: Makefile xdviprint.sample +vfxdviprint: Makefile xdviprint.sample if test -x /usr/bin/nawk; then \ sed -e '/^## for @@DVIFILTER@@/,/^##/s/^# //' -e 's/awk/nawk/' \ -e "s,/usr/local/share/texmf/xdvi,$(XDVIETCDIR)," \ @@@@ -102,9 +103,6 @@@@ $(SHELL) $(srcdir)/mksedscript $(srcdir) pkpath sizes vfpath \ figpath headerpath $(DEFS) $(prog_cflags) >$@@ -$(LIBWWWDIR)/libwww.a: - cd $(LIBWWWDIR); $(MAKE) $(makeargs) libwww.a - # ac_include ../make/tkpathsea.mk INSTALL_SCRIPT = @@INSTALL_SCRIPT@@ @@@@ -112,21 +110,21 @@@@ install: install-exec install-data uninstall: uninstall-exec uninstall-data -install-exec: $(programs) xdviprint +install-exec: $(programs) vfxdviprint $(SHELL) $(top_srcdir)/../mkinstalldirs $(bindir) for p in $(programs); do $(INSTALL_LIBTOOL_PROG) $(bindir) $$p; done - $(INSTALL_SCRIPT) $(srcdir)/xdvi-sh $(scriptdir)/xdvi + $(INSTALL_SCRIPT) $(srcdir)/xdvi-sh $(scriptdir)/vfxdvi if test "@@XDVIPRINTCMD@@" != no; then \ if test ! -x @@XDVIPRINTCMD@@; then \ - $(INSTALL_SCRIPT) $(srcdir)/xdviprint @@XDVIPRINTCMD@@; \ + $(INSTALL_SCRIPT) $(srcdir)/vfxdviprint @@XDVIPRINTCMD@@; \ fi; \ fi uninstall-exec: for p in $(programs) xdvi; do rm -f $(bindir)/$$p; done -install-data: xdvi.1 vfontmap.sample +install-data: vfxdvi.1 vfontmap.sample $(SHELL) $(top_srcdir)/../mkinstalldirs $(mandir) $(psheaderdir) $(XDVIETCDIR) - $(INSTALL_DATA) xdvi.1 $(mandir)/xdvi.$(manext) + $(INSTALL_DATA) vfxdvi.1 $(mandir)/vfxdvi.$(manext) if test ! -f $(XDVIETCDIR)/vfontmap; then \ $(INSTALL_DATA) vfontmap.sample $(XDVIETCDIR)/vfontmap; \ fi @@@@ -158,12 +156,8 @@@@ clean:: rm -f *.flc -# clean:: -# test -f $(LIBWWWDIR)/Makefile && { cd $(LIBWWWDIR); $(MAKE) clean; } || true - distclean:: rm -f psheader.c sedscript xdvi.1 *.flc -# test -f $(LIBWWWDIR)/Makefile && { cd $(LIBWWWDIR); $(MAKE) distclean; } || true ac_include ../make/rdepend.mk ac_include depend.make @