pkgsrc-Changes archive

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

CVS commit: pkgsrc



Module Name:    pkgsrc
Committed By:   wiz
Date:           Wed Sep  6 16:49:48 UTC 2017

Modified Files:
        pkgsrc/devel/tex-multido: Makefile
        pkgsrc/doc: CHANGES-2017
        pkgsrc/doc/guide/files: fixes.xml
        pkgsrc/editors/gummi: Makefile
        pkgsrc/fonts/gsftopkk: Makefile
        pkgsrc/fonts/ps2pkm: Makefile
        pkgsrc/fonts/t1lib: MESSAGE
        pkgsrc/fonts/tex-ae: Makefile
        pkgsrc/fonts/tex-ae-doc: Makefile
        pkgsrc/fonts/tex-amsfonts-doc: Makefile
        pkgsrc/fonts/tex-avantgar: Makefile
        pkgsrc/fonts/tex-bookman: Makefile
        pkgsrc/fonts/tex-cc-pl: Makefile
        pkgsrc/fonts/tex-charter: Makefile
        pkgsrc/fonts/tex-charter-doc: Makefile
        pkgsrc/fonts/tex-cm: Makefile
        pkgsrc/fonts/tex-cm-doc: Makefile
        pkgsrc/fonts/tex-cmcyr: Makefile
        pkgsrc/fonts/tex-cmcyr-doc: Makefile
        pkgsrc/fonts/tex-cmextra: Makefile
        pkgsrc/fonts/tex-courier: Makefile
        pkgsrc/fonts/tex-ec: Makefile
        pkgsrc/fonts/tex-ec-doc: Makefile
        pkgsrc/fonts/tex-esint: Makefile
        pkgsrc/fonts/tex-eurosym: Makefile
        pkgsrc/fonts/tex-eurosym-doc: Makefile
        pkgsrc/fonts/tex-fontinst: Makefile
        pkgsrc/fonts/tex-fontinst-doc: Makefile
        pkgsrc/fonts/tex-fontname: Makefile
        pkgsrc/fonts/tex-fontname-doc: Makefile
        pkgsrc/fonts/tex-fpl: Makefile
        pkgsrc/fonts/tex-fpl-doc: Makefile
        pkgsrc/fonts/tex-helvetic: Makefile
        pkgsrc/fonts/tex-latex-fonts: Makefile
        pkgsrc/fonts/tex-lh: Makefile
        pkgsrc/fonts/tex-lh-doc: Makefile
        pkgsrc/fonts/tex-lm: Makefile
        pkgsrc/fonts/tex-lm-doc: Makefile
        pkgsrc/fonts/tex-manfnt: Makefile
        pkgsrc/fonts/tex-manfnt-font: Makefile
        pkgsrc/fonts/tex-marvosym: Makefile
        pkgsrc/fonts/tex-marvosym-doc: Makefile
        pkgsrc/fonts/tex-mathpazo: Makefile
        pkgsrc/fonts/tex-mathpazo-doc: Makefile
        pkgsrc/fonts/tex-metafont: Makefile
        pkgsrc/fonts/tex-mflogo: Makefile
        pkgsrc/fonts/tex-mflogo-font: Makefile
        pkgsrc/fonts/tex-mfware: Makefile
        pkgsrc/fonts/tex-ncntrsbk: Makefile
        pkgsrc/fonts/tex-palatino: Makefile
        pkgsrc/fonts/tex-psnfss: Makefile
        pkgsrc/fonts/tex-psnfss-doc: Makefile
        pkgsrc/fonts/tex-pxfonts: Makefile
        pkgsrc/fonts/tex-pxfonts-doc: Makefile
        pkgsrc/fonts/tex-rsfs: Makefile
        pkgsrc/fonts/tex-rsfs-doc: Makefile
        pkgsrc/fonts/tex-stmaryrd: Makefile
        pkgsrc/fonts/tex-stmaryrd-doc: Makefile
        pkgsrc/fonts/tex-symbol: Makefile
        pkgsrc/fonts/tex-times: Makefile
        pkgsrc/fonts/tex-txfonts: Makefile
        pkgsrc/fonts/tex-txfonts-doc: Makefile
        pkgsrc/fonts/tex-wasy: Makefile
        pkgsrc/fonts/tex-wasysym: Makefile
        pkgsrc/fonts/tex-zapfchan: Makefile
        pkgsrc/fonts/tex-zapfding: Makefile
        pkgsrc/graphics/tex-a2ping: Makefile
        pkgsrc/graphics/tex-eepic: Makefile
        pkgsrc/graphics/tex-eepic-doc: Makefile
        pkgsrc/graphics/tex-graphics-pln: Makefile
        pkgsrc/graphics/tex-metapost: Makefile
        pkgsrc/graphics/tex-metapost-doc: Makefile
        pkgsrc/graphics/tex-pdfcrop: Makefile
        pkgsrc/graphics/tex-pst-plot: Makefile
        pkgsrc/graphics/tex-pstricks: Makefile
        pkgsrc/graphics/tex-pstricks-doc: Makefile
        pkgsrc/graphics/tex-tex-ps: Makefile
        pkgsrc/graphics/tex-tex-ps-doc: Makefile
        pkgsrc/graphics/tex-texdraw: Makefile
        pkgsrc/graphics/tex-xypic: Makefile
        pkgsrc/graphics/tex-xypic-doc: Makefile
        pkgsrc/math/tex-fp: Makefile
        pkgsrc/meta-pkgs/bulk-large: Makefile
        pkgsrc/meta-pkgs/netbsd-doc-print: DESCR
        pkgsrc/mk/defaults: mk.conf
        pkgsrc/pkgtools/pkglint/files: vardefs.go
        pkgsrc/pkgtools/pkglint4/files: makevars.map
        pkgsrc/print: Makefile
        pkgsrc/print/dviljk: Makefile
        pkgsrc/print/dvipsk: Makefile
        pkgsrc/print/kpathsea: Makefile
        pkgsrc/print/tex-SIunits: Makefile
        pkgsrc/print/tex-abstract: Makefile
        pkgsrc/print/tex-acronym: Makefile
        pkgsrc/print/tex-adrconv: Makefile
        pkgsrc/print/tex-aeguill: Makefile
        pkgsrc/print/tex-aleph: Makefile
        pkgsrc/print/tex-algorithms: Makefile
        pkgsrc/print/tex-algorithms-doc: Makefile
        pkgsrc/print/tex-amscls: Makefile
        pkgsrc/print/tex-amscls-doc: Makefile
        pkgsrc/print/tex-amsmath: Makefile
        pkgsrc/print/tex-amsmath-doc: Makefile
        pkgsrc/print/tex-anysize: Makefile
        pkgsrc/print/tex-appendix: Makefile
        pkgsrc/print/tex-babel: Makefile
        pkgsrc/print/tex-babel-doc: Makefile
        pkgsrc/print/tex-beamer: Makefile
        pkgsrc/print/tex-beton: Makefile
        pkgsrc/print/tex-bezos: Makefile
        pkgsrc/print/tex-bezos-doc: Makefile
        pkgsrc/print/tex-bibtex: Makefile
        pkgsrc/print/tex-bibtex-doc: Makefile
        pkgsrc/print/tex-bibtopic: Makefile
        pkgsrc/print/tex-bibtopic-doc: Makefile
        pkgsrc/print/tex-bibunits: Makefile
        pkgsrc/print/tex-booktabs: Makefile
        pkgsrc/print/tex-booktabs-doc: Makefile
        pkgsrc/print/tex-caption: Makefile
        pkgsrc/print/tex-carlisle: Makefile
        pkgsrc/print/tex-carlisle-doc: Makefile
        pkgsrc/print/tex-changebar: Makefile
        pkgsrc/print/tex-changebar-doc: Makefile
        pkgsrc/print/tex-cite: Makefile
        pkgsrc/print/tex-cmap: Makefile
        pkgsrc/print/tex-comment: Makefile
        pkgsrc/print/tex-context: Makefile
        pkgsrc/print/tex-context-doc: Makefile
        pkgsrc/print/tex-crop: Makefile
        pkgsrc/print/tex-currvita: Makefile
        pkgsrc/print/tex-cyrillic: Makefile
        pkgsrc/print/tex-cyrillic-doc: Makefile
        pkgsrc/print/tex-dehyph-exptl: Makefile
        pkgsrc/print/tex-dk-bib: Makefile
        pkgsrc/print/tex-dvips: Makefile
        pkgsrc/print/tex-eijkhout: Makefile
        pkgsrc/print/tex-enctex: Makefile
        pkgsrc/print/tex-enctex-doc: Makefile
        pkgsrc/print/tex-endfloat: Makefile
        pkgsrc/print/tex-enumitem: Makefile
        pkgsrc/print/tex-enumitem-doc: Makefile
        pkgsrc/print/tex-eplain: Makefile
        pkgsrc/print/tex-epsf: Makefile
        pkgsrc/print/tex-epsf-doc: Makefile
        pkgsrc/print/tex-eso-pic: Makefile
        pkgsrc/print/tex-eso-pic-doc: Makefile
        pkgsrc/print/tex-etex: Makefile
        pkgsrc/print/tex-etex-pkg: Makefile
        pkgsrc/print/tex-euler: Makefile
        pkgsrc/print/tex-exam: Makefile
        pkgsrc/print/tex-fancybox: Makefile
        pkgsrc/print/tex-fancybox-doc: Makefile
        pkgsrc/print/tex-fancyhdr: Makefile
        pkgsrc/print/tex-fancyhdr-doc: Makefile
        pkgsrc/print/tex-fancyvrb: Makefile
        pkgsrc/print/tex-float: Makefile
        pkgsrc/print/tex-footmisc: Makefile
        pkgsrc/print/tex-footmisc-doc: Makefile
        pkgsrc/print/tex-geometry: Makefile
        pkgsrc/print/tex-geometry-doc: Makefile
        pkgsrc/print/tex-german: Makefile
        pkgsrc/print/tex-germbib: Makefile
        pkgsrc/print/tex-graphics: Makefile
        pkgsrc/print/tex-here: Makefile
        pkgsrc/print/tex-hyperref: Makefile
        pkgsrc/print/tex-hyperref-doc: Makefile
        pkgsrc/print/tex-hyphen-ancientgreek: Makefile
        pkgsrc/print/tex-hyphen-arabic: Makefile
        pkgsrc/print/tex-hyphen-basque: Makefile
        pkgsrc/print/tex-hyphen-bulgarian: Makefile
        pkgsrc/print/tex-hyphen-catalan: Makefile
        pkgsrc/print/tex-hyphen-chinese: Makefile
        pkgsrc/print/tex-hyphen-coptic: Makefile
        pkgsrc/print/tex-hyphen-croatian: Makefile
        pkgsrc/print/tex-hyphen-czech: Makefile
        pkgsrc/print/tex-hyphen-danish: Makefile
        pkgsrc/print/tex-hyphen-dutch: Makefile
        pkgsrc/print/tex-hyphen-english: Makefile
        pkgsrc/print/tex-hyphen-esperanto: Makefile
        pkgsrc/print/tex-hyphen-estonian: Makefile
        pkgsrc/print/tex-hyphen-farsi: Makefile
        pkgsrc/print/tex-hyphen-finnish: Makefile
        pkgsrc/print/tex-hyphen-french: Makefile
        pkgsrc/print/tex-hyphen-galician: Makefile
        pkgsrc/print/tex-hyphen-german: Makefile
        pkgsrc/print/tex-hyphen-greek: Makefile
        pkgsrc/print/tex-hyphen-hungarian: Makefile
        pkgsrc/print/tex-hyphen-icelandic: Makefile
        pkgsrc/print/tex-hyphen-indonesian: Makefile
        pkgsrc/print/tex-hyphen-interlingua: Makefile
        pkgsrc/print/tex-hyphen-irish: Makefile
        pkgsrc/print/tex-hyphen-italian: Makefile
        pkgsrc/print/tex-hyphen-latin: Makefile
        pkgsrc/print/tex-hyphen-lithuanian: Makefile
        pkgsrc/print/tex-hyphen-mongolian: Makefile
        pkgsrc/print/tex-hyphen-norwegian: Makefile
        pkgsrc/print/tex-hyphen-polish: Makefile
        pkgsrc/print/tex-hyphen-portuguese: Makefile
        pkgsrc/print/tex-hyphen-romanian: Makefile
        pkgsrc/print/tex-hyphen-russian: Makefile
        pkgsrc/print/tex-hyphen-sanskrit: Makefile
        pkgsrc/print/tex-hyphen-serbian: Makefile
        pkgsrc/print/tex-hyphen-slovak: Makefile
        pkgsrc/print/tex-hyphen-slovenian: Makefile
        pkgsrc/print/tex-hyphen-spanish: Makefile
        pkgsrc/print/tex-hyphen-swedish: Makefile
        pkgsrc/print/tex-hyphen-turkish: Makefile
        pkgsrc/print/tex-hyphen-ukrainian: Makefile
        pkgsrc/print/tex-hyphen-uppersorbian: Makefile
        pkgsrc/print/tex-hyphen-welsh: Makefile
        pkgsrc/print/tex-hyphenat: Makefile
        pkgsrc/print/tex-index: Makefile
        pkgsrc/print/tex-jurabib: Makefile
        pkgsrc/print/tex-koma-script: Makefile
        pkgsrc/print/tex-lambda: Makefile
        pkgsrc/print/tex-lastpage: Makefile
        pkgsrc/print/tex-latex: Makefile
        pkgsrc/print/tex-latex-bin: Makefile
        pkgsrc/print/tex-latex-doc: Makefile
        pkgsrc/print/tex-latexconfig: Makefile
        pkgsrc/print/tex-lineno: Makefile
        pkgsrc/print/tex-listings: Makefile
        pkgsrc/print/tex-listings-doc: Makefile
        pkgsrc/print/tex-mdwtools: Makefile
        pkgsrc/print/tex-memoir: Makefile
        pkgsrc/print/tex-memoir-doc: Makefile
        pkgsrc/print/tex-mex: Makefile
        pkgsrc/print/tex-mfnfss: Makefile
        pkgsrc/print/tex-mfnfss-doc: Makefile
        pkgsrc/print/tex-microtype: Makefile
        pkgsrc/print/tex-microtype-doc: Makefile
        pkgsrc/print/tex-minitoc: Makefile
        pkgsrc/print/tex-minitoc-doc: Makefile
        pkgsrc/print/tex-misc209: Makefile
        pkgsrc/print/tex-mltex: Makefile
        pkgsrc/print/tex-moreverb: Makefile
        pkgsrc/print/tex-ms: Makefile
        pkgsrc/print/tex-ms-doc: Makefile
        pkgsrc/print/tex-multirow: Makefile
        pkgsrc/print/tex-multirow-doc: Makefile
        pkgsrc/print/tex-mwcls: Makefile
        pkgsrc/print/tex-natbib: Makefile
        pkgsrc/print/tex-natbib-doc: Makefile
        pkgsrc/print/tex-nomencl: Makefile
        pkgsrc/print/tex-nomencl-doc: Makefile
        pkgsrc/print/tex-ntgclass: Makefile
        pkgsrc/print/tex-ntgclass-doc: Makefile
        pkgsrc/print/tex-ntheorem: Makefile
        pkgsrc/print/tex-ntheorem-doc: Makefile
        pkgsrc/print/tex-oberdiek: Makefile
        pkgsrc/print/tex-oberdiek-doc: Makefile
        pkgsrc/print/tex-overpic: Makefile
        pkgsrc/print/tex-paralist: Makefile
        pkgsrc/print/tex-pdfpages: Makefile
        pkgsrc/print/tex-pdfpages-doc: Makefile
        pkgsrc/print/tex-pdftex: Makefile
        pkgsrc/print/tex-picinpar: Makefile
        pkgsrc/print/tex-placeins: Makefile
        pkgsrc/print/tex-placeins-doc: Makefile
        pkgsrc/print/tex-preprint: Makefile
        pkgsrc/print/tex-preprint-doc: Makefile
        pkgsrc/print/tex-preview: Makefile
        pkgsrc/print/tex-preview-doc: Makefile
        pkgsrc/print/tex-psfrag: Makefile
        pkgsrc/print/tex-pslatex: Makefile
        pkgsrc/print/tex-revtex4: Makefile
        pkgsrc/print/tex-rotating: Makefile
        pkgsrc/print/tex-rotating-doc: Makefile
        pkgsrc/print/tex-ruhyphen: Makefile
        pkgsrc/print/tex-sectsty: Makefile
        pkgsrc/print/tex-seminar: Makefile
        pkgsrc/print/tex-seminar-doc: Makefile
        pkgsrc/print/tex-setspace: Makefile
        pkgsrc/print/tex-soul: Makefile
        pkgsrc/print/tex-subfig: Makefile
        pkgsrc/print/tex-subfig-doc: Makefile
        pkgsrc/print/tex-subfigure: Makefile
        pkgsrc/print/tex-subfigure-doc: Makefile
        pkgsrc/print/tex-supertabular: Makefile
        pkgsrc/print/tex-t2: Makefile
        pkgsrc/print/tex-tap: Makefile
        pkgsrc/print/tex-tetex-doc: Makefile
        pkgsrc/print/tex-tex: Makefile
        pkgsrc/print/tex-texdoc: Makefile
        pkgsrc/print/tex-texinfo: Makefile
        pkgsrc/print/tex-thumbpdf: Makefile
        pkgsrc/print/tex-titlesec: Makefile
        pkgsrc/print/tex-tocbibind: Makefile
        pkgsrc/print/tex-tocbibind-doc: Makefile
        pkgsrc/print/tex-tocloft: Makefile
        pkgsrc/print/tex-tools: Makefile
        pkgsrc/print/tex-tools-doc: Makefile
        pkgsrc/print/tex-type1cm: Makefile
        pkgsrc/print/tex-type1cm-doc: Makefile
        pkgsrc/print/tex-ukrhyph: Makefile
        pkgsrc/print/tex-umlaute: Makefile
        pkgsrc/print/tex-units: Makefile
        pkgsrc/print/tex-upquote: Makefile
        pkgsrc/print/tex-utf8mex: Makefile
        pkgsrc/print/tex-wrapfig: Makefile
        pkgsrc/print/tex-wrapfig-doc: Makefile
        pkgsrc/print/tex-xcolor: Makefile
        pkgsrc/print/tex-xcomment: Makefile
        pkgsrc/print/tex-xdvi: Makefile
        pkgsrc/print/tex-xkeyval: Makefile
        pkgsrc/print/tex-xtab: Makefile
        pkgsrc/print/tex-xtab-doc: Makefile
        pkgsrc/print/tex-yfonts: Makefile
        pkgsrc/print/tex4ht: Makefile
        pkgsrc/print/web2c: Makefile
        pkgsrc/print/xdvik: Makefile distinfo
        pkgsrc/print/xdvik/patches: patch-ab
        pkgsrc/print/xpdfopen: Makefile
        pkgsrc/textproc/latex2html: distinfo
        pkgsrc/textproc/latex2html/patches: patch-ab
        pkgsrc/textproc/makeindexk: Makefile
        pkgsrc/textproc/texi2html: Makefile
Removed Files:
        pkgsrc/print/teTeX: DESCR Makefile options.mk
        pkgsrc/print/teTeX3-bin: DESCR MESSAGE Makefile buildlink3.mk
        pkgsrc/print/teTeX3-texmf: DESCR Makefile PLIST distinfo

Log Message:
Remove teTeX* packages and references to them.

teTeX was desupported in 2006, and we have texlive in pkgsrc since 2009.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 pkgsrc/devel/tex-multido/Makefile
cvs rdiff -u -r1.3637 -r1.3638 pkgsrc/doc/CHANGES-2017
cvs rdiff -u -r1.144 -r1.145 pkgsrc/doc/guide/files/fixes.xml
cvs rdiff -u -r1.44 -r1.45 pkgsrc/editors/gummi/Makefile
cvs rdiff -u -r1.12 -r1.13 pkgsrc/fonts/gsftopkk/Makefile
cvs rdiff -u -r1.11 -r1.12 pkgsrc/fonts/ps2pkm/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/fonts/t1lib/MESSAGE
cvs rdiff -u -r1.3 -r1.4 pkgsrc/fonts/tex-ae/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/fonts/tex-ae-doc/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/fonts/tex-amsfonts-doc/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/fonts/tex-avantgar/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/fonts/tex-bookman/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/fonts/tex-cc-pl/Makefile
cvs rdiff -u -r1.1.1.1 -r1.2 pkgsrc/fonts/tex-charter/Makefile
cvs rdiff -u -r1.1.1.1 -r1.2 pkgsrc/fonts/tex-charter-doc/Makefile
cvs rdiff -u -r1.8 -r1.9 pkgsrc/fonts/tex-cm/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/fonts/tex-cm-doc/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/fonts/tex-cmcyr/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/fonts/tex-cmcyr-doc/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/fonts/tex-cmextra/Makefile
cvs rdiff -u -r1.9 -r1.10 pkgsrc/fonts/tex-courier/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/fonts/tex-ec/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/fonts/tex-ec-doc/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/fonts/tex-esint/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/fonts/tex-eurosym/Makefile
cvs rdiff -u -r1.1.1.1 -r1.2 pkgsrc/fonts/tex-eurosym-doc/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/fonts/tex-fontinst/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/fonts/tex-fontinst-doc/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/fonts/tex-fontname/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/fonts/tex-fontname-doc/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/fonts/tex-fpl/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/fonts/tex-fpl-doc/Makefile
cvs rdiff -u -r1.8 -r1.9 pkgsrc/fonts/tex-helvetic/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/fonts/tex-latex-fonts/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/fonts/tex-lh/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/fonts/tex-lh-doc/Makefile
cvs rdiff -u -r1.8 -r1.9 pkgsrc/fonts/tex-lm/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/fonts/tex-lm-doc/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/fonts/tex-manfnt/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/fonts/tex-manfnt-font/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/fonts/tex-marvosym/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/fonts/tex-marvosym-doc/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/fonts/tex-mathpazo/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/fonts/tex-mathpazo-doc/Makefile
cvs rdiff -u -r1.10 -r1.11 pkgsrc/fonts/tex-metafont/Makefile
cvs rdiff -u -r1.8 -r1.9 pkgsrc/fonts/tex-mflogo/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/fonts/tex-mflogo-font/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/fonts/tex-mfware/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/fonts/tex-ncntrsbk/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/fonts/tex-palatino/Makefile
cvs rdiff -u -r1.10 -r1.11 pkgsrc/fonts/tex-psnfss/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/fonts/tex-psnfss-doc/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/fonts/tex-pxfonts/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/fonts/tex-pxfonts-doc/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/fonts/tex-rsfs/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/fonts/tex-rsfs-doc/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/fonts/tex-stmaryrd/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/fonts/tex-stmaryrd-doc/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/fonts/tex-symbol/Makefile
cvs rdiff -u -r1.8 -r1.9 pkgsrc/fonts/tex-times/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/fonts/tex-txfonts/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/fonts/tex-txfonts-doc/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/fonts/tex-wasy/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/fonts/tex-wasysym/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/fonts/tex-zapfchan/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/fonts/tex-zapfding/Makefile
cvs rdiff -u -r1.10 -r1.11 pkgsrc/graphics/tex-a2ping/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/graphics/tex-eepic/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/graphics/tex-eepic-doc/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/graphics/tex-graphics-pln/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/graphics/tex-metapost/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/graphics/tex-metapost-doc/Makefile
cvs rdiff -u -r1.9 -r1.10 pkgsrc/graphics/tex-pdfcrop/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/graphics/tex-pst-plot/Makefile
cvs rdiff -u -r1.9 -r1.10 pkgsrc/graphics/tex-pstricks/Makefile
cvs rdiff -u -r1.9 -r1.10 pkgsrc/graphics/tex-pstricks-doc/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/graphics/tex-tex-ps/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/graphics/tex-tex-ps-doc/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/graphics/tex-texdraw/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/graphics/tex-xypic/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/graphics/tex-xypic-doc/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/math/tex-fp/Makefile
cvs rdiff -u -r1.31 -r1.32 pkgsrc/meta-pkgs/bulk-large/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/meta-pkgs/netbsd-doc-print/DESCR
cvs rdiff -u -r1.281 -r1.282 pkgsrc/mk/defaults/mk.conf
cvs rdiff -u -r1.27 -r1.28 pkgsrc/pkgtools/pkglint/files/vardefs.go
cvs rdiff -u -r1.5 -r1.6 pkgsrc/pkgtools/pkglint4/files/makevars.map
cvs rdiff -u -r1.694 -r1.695 pkgsrc/print/Makefile
cvs rdiff -u -r1.12 -r1.13 pkgsrc/print/dviljk/Makefile
cvs rdiff -u -r1.16 -r1.17 pkgsrc/print/dvipsk/Makefile
cvs rdiff -u -r1.28 -r1.29 pkgsrc/print/kpathsea/Makefile
cvs rdiff -u -r1.4 -r0 pkgsrc/print/teTeX/DESCR
cvs rdiff -u -r1.60 -r0 pkgsrc/print/teTeX/Makefile
cvs rdiff -u -r1.1 -r0 pkgsrc/print/teTeX/options.mk
cvs rdiff -u -r1.1.1.1 -r0 pkgsrc/print/teTeX3-bin/DESCR
cvs rdiff -u -r1.2 -r0 pkgsrc/print/teTeX3-bin/MESSAGE
cvs rdiff -u -r1.80 -r0 pkgsrc/print/teTeX3-bin/Makefile
cvs rdiff -u -r1.14 -r0 pkgsrc/print/teTeX3-bin/buildlink3.mk
cvs rdiff -u -r1.1.1.1 -r0 pkgsrc/print/teTeX3-texmf/DESCR
cvs rdiff -u -r1.82 -r0 pkgsrc/print/teTeX3-texmf/Makefile
cvs rdiff -u -r1.53 -r0 pkgsrc/print/teTeX3-texmf/PLIST
cvs rdiff -u -r1.6 -r0 pkgsrc/print/teTeX3-texmf/distinfo
cvs rdiff -u -r1.2 -r1.3 pkgsrc/print/tex-SIunits/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/print/tex-abstract/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/print/tex-acronym/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/print/tex-adrconv/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/print/tex-aeguill/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/print/tex-aleph/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/print/tex-algorithms/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/print/tex-algorithms-doc/Makefile
cvs rdiff -u -r1.8 -r1.9 pkgsrc/print/tex-amscls/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/print/tex-amscls-doc/Makefile
cvs rdiff -u -r1.10 -r1.11 pkgsrc/print/tex-amsmath/Makefile
cvs rdiff -u -r1.9 -r1.10 pkgsrc/print/tex-amsmath-doc/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/print/tex-anysize/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/print/tex-appendix/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/print/tex-babel/Makefile
cvs rdiff -u -r1.8 -r1.9 pkgsrc/print/tex-babel-doc/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/print/tex-beamer/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/print/tex-beton/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/print/tex-bezos/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/print/tex-bezos-doc/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/print/tex-bibtex/Makefile
cvs rdiff -u -r1.8 -r1.9 pkgsrc/print/tex-bibtex-doc/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/print/tex-bibtopic/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/print/tex-bibtopic-doc/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/print/tex-bibunits/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/print/tex-booktabs/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/print/tex-booktabs-doc/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/print/tex-caption/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/print/tex-carlisle/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/print/tex-carlisle-doc/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/print/tex-changebar/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/print/tex-changebar-doc/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/print/tex-cite/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/print/tex-cmap/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/print/tex-comment/Makefile
cvs rdiff -u -r1.13 -r1.14 pkgsrc/print/tex-context/Makefile
cvs rdiff -u -r1.8 -r1.9 pkgsrc/print/tex-context-doc/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/print/tex-crop/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/print/tex-currvita/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/print/tex-cyrillic/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/print/tex-cyrillic-doc/Makefile
cvs rdiff -u -r1.8 -r1.9 pkgsrc/print/tex-dehyph-exptl/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/print/tex-dk-bib/Makefile
cvs rdiff -u -r1.21 -r1.22 pkgsrc/print/tex-dvips/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/print/tex-eijkhout/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/print/tex-enctex/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/print/tex-enctex-doc/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/print/tex-endfloat/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/print/tex-enumitem/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/print/tex-enumitem-doc/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/print/tex-eplain/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/print/tex-epsf/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/print/tex-epsf-doc/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/print/tex-eso-pic/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/print/tex-eso-pic-doc/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/print/tex-etex/Makefile
cvs rdiff -u -r1.8 -r1.9 pkgsrc/print/tex-etex-pkg/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/print/tex-euler/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/print/tex-exam/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/print/tex-fancybox/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/print/tex-fancybox-doc/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/print/tex-fancyhdr/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/print/tex-fancyhdr-doc/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/print/tex-fancyvrb/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/print/tex-float/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/print/tex-footmisc/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/print/tex-footmisc-doc/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/print/tex-geometry/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/print/tex-geometry-doc/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/print/tex-german/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/print/tex-germbib/Makefile
cvs rdiff -u -r1.13 -r1.14 pkgsrc/print/tex-graphics/Makefile
cvs rdiff -u -r1.1.1.1 -r1.2 pkgsrc/print/tex-here/Makefile
cvs rdiff -u -r1.15 -r1.16 pkgsrc/print/tex-hyperref/Makefile
cvs rdiff -u -r1.11 -r1.12 pkgsrc/print/tex-hyperref-doc/Makefile
cvs rdiff -u -r1.8 -r1.9 pkgsrc/print/tex-hyphen-ancientgreek/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/print/tex-hyphen-arabic/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/print/tex-hyphen-basque/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/print/tex-hyphen-bulgarian/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/print/tex-hyphen-catalan/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/print/tex-hyphen-chinese/Makefile
cvs rdiff -u -r1.8 -r1.9 pkgsrc/print/tex-hyphen-coptic/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/print/tex-hyphen-croatian/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/print/tex-hyphen-czech/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/print/tex-hyphen-danish/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/print/tex-hyphen-dutch/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/print/tex-hyphen-english/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/print/tex-hyphen-esperanto/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/print/tex-hyphen-estonian/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/print/tex-hyphen-farsi/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/print/tex-hyphen-finnish/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/print/tex-hyphen-french/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/print/tex-hyphen-galician/Makefile
cvs rdiff -u -r1.8 -r1.9 pkgsrc/print/tex-hyphen-german/Makefile
cvs rdiff -u -r1.8 -r1.9 pkgsrc/print/tex-hyphen-greek/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/print/tex-hyphen-hungarian/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/print/tex-hyphen-icelandic/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/print/tex-hyphen-indonesian/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/print/tex-hyphen-interlingua/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/print/tex-hyphen-irish/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/print/tex-hyphen-italian/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/print/tex-hyphen-latin/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/print/tex-hyphen-lithuanian/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/print/tex-hyphen-mongolian/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/print/tex-hyphen-norwegian/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/print/tex-hyphen-polish/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/print/tex-hyphen-portuguese/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/print/tex-hyphen-romanian/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/print/tex-hyphen-russian/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/print/tex-hyphen-sanskrit/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/print/tex-hyphen-serbian/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/print/tex-hyphen-slovak/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/print/tex-hyphen-slovenian/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/print/tex-hyphen-spanish/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/print/tex-hyphen-swedish/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/print/tex-hyphen-turkish/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/print/tex-hyphen-ukrainian/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/print/tex-hyphen-uppersorbian/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/print/tex-hyphen-welsh/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/print/tex-hyphenat/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/print/tex-index/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/print/tex-jurabib/Makefile
cvs rdiff -u -r1.13 -r1.14 pkgsrc/print/tex-koma-script/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/print/tex-lambda/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/print/tex-lastpage/Makefile
cvs rdiff -u -r1.13 -r1.14 pkgsrc/print/tex-latex/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/print/tex-latex-bin/Makefile
cvs rdiff -u -r1.11 -r1.12 pkgsrc/print/tex-latex-doc/Makefile
cvs rdiff -u -r1.12 -r1.13 pkgsrc/print/tex-latexconfig/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/print/tex-lineno/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/print/tex-listings/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/print/tex-listings-doc/Makefile
cvs rdiff -u -r1.1.1.1 -r1.2 pkgsrc/print/tex-mdwtools/Makefile
cvs rdiff -u -r1.10 -r1.11 pkgsrc/print/tex-memoir/Makefile
cvs rdiff -u -r1.9 -r1.10 pkgsrc/print/tex-memoir-doc/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/print/tex-mex/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/print/tex-mfnfss/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/print/tex-mfnfss-doc/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/print/tex-microtype/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/print/tex-microtype-doc/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/print/tex-minitoc/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/print/tex-minitoc-doc/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/print/tex-misc209/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/print/tex-mltex/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/print/tex-moreverb/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/print/tex-ms/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/print/tex-ms-doc/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/print/tex-multirow/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/print/tex-multirow-doc/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/print/tex-mwcls/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/print/tex-natbib/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/print/tex-natbib-doc/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/print/tex-nomencl/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/print/tex-nomencl-doc/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/print/tex-ntgclass/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/print/tex-ntgclass-doc/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/print/tex-ntheorem/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/print/tex-ntheorem-doc/Makefile
cvs rdiff -u -r1.19 -r1.20 pkgsrc/print/tex-oberdiek/Makefile
cvs rdiff -u -r1.11 -r1.12 pkgsrc/print/tex-oberdiek-doc/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/print/tex-overpic/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/print/tex-paralist/Makefile
cvs rdiff -u -r1.9 -r1.10 pkgsrc/print/tex-pdfpages/Makefile
cvs rdiff -u -r1.8 -r1.9 pkgsrc/print/tex-pdfpages-doc/Makefile
cvs rdiff -u -r1.22 -r1.23 pkgsrc/print/tex-pdftex/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/print/tex-picinpar/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/print/tex-placeins/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/print/tex-placeins-doc/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/print/tex-preprint/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/print/tex-preprint-doc/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/print/tex-preview/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/print/tex-preview-doc/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/print/tex-psfrag/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/print/tex-pslatex/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/print/tex-revtex4/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/print/tex-rotating/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/print/tex-rotating-doc/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/print/tex-ruhyphen/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/print/tex-sectsty/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/print/tex-seminar/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/print/tex-seminar-doc/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/print/tex-setspace/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/print/tex-soul/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/print/tex-subfig/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/print/tex-subfig-doc/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/print/tex-subfigure/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/print/tex-subfigure-doc/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/print/tex-supertabular/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/print/tex-t2/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/print/tex-tap/Makefile
cvs rdiff -u -r1.18 -r1.19 pkgsrc/print/tex-tetex-doc/Makefile
cvs rdiff -u -r1.9 -r1.10 pkgsrc/print/tex-tex/Makefile
cvs rdiff -u -r1.8 -r1.9 pkgsrc/print/tex-texdoc/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/print/tex-texinfo/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/print/tex-thumbpdf/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/print/tex-titlesec/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/print/tex-tocbibind/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/print/tex-tocbibind-doc/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/print/tex-tocloft/Makefile
cvs rdiff -u -r1.10 -r1.11 pkgsrc/print/tex-tools/Makefile
cvs rdiff -u -r1.10 -r1.11 pkgsrc/print/tex-tools-doc/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/print/tex-type1cm/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/print/tex-type1cm-doc/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/print/tex-ukrhyph/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/print/tex-umlaute/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/print/tex-units/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/print/tex-upquote/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/print/tex-utf8mex/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/print/tex-wrapfig/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/print/tex-wrapfig-doc/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/print/tex-xcolor/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/print/tex-xcomment/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/print/tex-xdvi/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/print/tex-xkeyval/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/print/tex-xtab/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/print/tex-xtab-doc/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/print/tex-yfonts/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/print/tex4ht/Makefile
cvs rdiff -u -r1.62 -r1.63 pkgsrc/print/web2c/Makefile
cvs rdiff -u -r1.22 -r1.23 pkgsrc/print/xdvik/Makefile
cvs rdiff -u -r1.12 -r1.13 pkgsrc/print/xdvik/distinfo
cvs rdiff -u -r1.1.1.1 -r1.2 pkgsrc/print/xdvik/patches/patch-ab
cvs rdiff -u -r1.7 -r1.8 pkgsrc/print/xpdfopen/Makefile
cvs rdiff -u -r1.15 -r1.16 pkgsrc/textproc/latex2html/distinfo
cvs rdiff -u -r1.3 -r1.4 pkgsrc/textproc/latex2html/patches/patch-ab
cvs rdiff -u -r1.12 -r1.13 pkgsrc/textproc/makeindexk/Makefile
cvs rdiff -u -r1.42 -r1.43 pkgsrc/textproc/texi2html/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/tex-multido/Makefile
diff -u pkgsrc/devel/tex-multido/Makefile:1.1.1.1 pkgsrc/devel/tex-multido/Makefile:1.2
--- pkgsrc/devel/tex-multido/Makefile:1.1.1.1   Wed Mar 16 17:49:02 2011
+++ pkgsrc/devel/tex-multido/Makefile   Wed Sep  6 16:49:21 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2011/03/16 17:49:02 minskim Exp $
+# $NetBSD: Makefile,v 1.2 2017/09/06 16:49:21 wiz Exp $
 
 DISTNAME=      multido
 PKGNAME=       tex-${DISTNAME}-1.42
@@ -7,7 +7,5 @@ TEXLIVE_REV=    18302
 MAINTAINER=    minskim%NetBSD.org@localhost
 COMMENT=       Loop facility for Generic TeX
 
-CONFLICTS=     teTeX-texmf<=3.0nb29
-
 .include "../../print/texlive/package.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/doc/CHANGES-2017
diff -u pkgsrc/doc/CHANGES-2017:1.3637 pkgsrc/doc/CHANGES-2017:1.3638
--- pkgsrc/doc/CHANGES-2017:1.3637      Wed Sep  6 16:29:43 2017
+++ pkgsrc/doc/CHANGES-2017     Wed Sep  6 16:49:21 2017
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES-2017,v 1.3637 2017/09/06 16:29:43 wiz Exp $
+$NetBSD: CHANGES-2017,v 1.3638 2017/09/06 16:49:21 wiz Exp $
 
 Changes to the packages collection and infrastructure in 2017:
 
@@ -5135,3 +5135,5 @@ Changes to the packages collection and i
        Updated devel/py-tox to 2.8.1 [adam 2017-09-06]
        Updated print/tex-plain to 3.141592653.43076nb1 [wiz 2017-09-06]
        Updated print/tex-ptex to 3.2pl41220nb4 [wiz 2017-09-06]
+       Removed print/teTeX3-texmf [wiz 2017-09-06]
+       Removed print/teTeX3-bin [wiz 2017-09-06]

Index: pkgsrc/doc/guide/files/fixes.xml
diff -u pkgsrc/doc/guide/files/fixes.xml:1.144 pkgsrc/doc/guide/files/fixes.xml:1.145
--- pkgsrc/doc/guide/files/fixes.xml:1.144      Sat Jul 16 14:28:49 2016
+++ pkgsrc/doc/guide/files/fixes.xml    Wed Sep  6 16:49:22 2017
@@ -1,4 +1,4 @@
-<!-- $NetBSD: fixes.xml,v 1.144 2016/07/16 14:28:49 jakllsch Exp $ -->
+<!-- $NetBSD: fixes.xml,v 1.145 2017/09/06 16:49:22 wiz Exp $ -->
 
 <chapter id="fixes"> <?dbhtml filename="fixes.html"?>
 <title>Making your package work</title>
@@ -367,11 +367,11 @@ BUILD_DEPENDS+= scons-[0-9]*:../../devel
        <filename>buildlink3.mk</filename> file, this is specified
        using the <varname>DEPENDS</varname> variable. The
        <filename role="pkg">print/lyx</filename> package needs to
-       be able to execute the latex binary from the teTeX package
+       be able to execute the latex binary from the tex-latex-bin package
        when it runs, and that is specified:</para>
 
 <programlisting>
-DEPENDS+=        teTeX-[0-9]*:../../print/teTeX
+DEPENDS+=        tex-latex-bin-[0-9]*:../../print/tex-latex-bin
 </programlisting>
       </listitem>
       <listitem>

Index: pkgsrc/editors/gummi/Makefile
diff -u pkgsrc/editors/gummi/Makefile:1.44 pkgsrc/editors/gummi/Makefile:1.45
--- pkgsrc/editors/gummi/Makefile:1.44  Mon Sep  4 20:20:53 2017
+++ pkgsrc/editors/gummi/Makefile       Wed Sep  6 16:49:22 2017
@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.44 2017/09/04 20:20:53 ryoon Exp $
-#
+# $NetBSD: Makefile,v 1.45 2017/09/06 16:49:22 wiz Exp $
 
 DISTNAME=              gummi-0.6.6
 PKGREVISION=           8
@@ -17,7 +16,7 @@ USE_TOOLS+=           pkg-config intltool msgfmt
 BUILD_DEPENDS+=                gettext-m4-[0-9]*:../../devel/gettext-m4
 
 # we need some latex, but not all
-#DEPENDS+= teTeX-texmf-[0-9]*:../../print/teTeX3-texmf
+#DEPENDS+= texlive-collection-all-[0-9]*:../../meta-pkgs/texlive-collection-all
 
 GNU_CONFIGURE=         YES
 USE_PKGLOCALEDIR=      yes

Index: pkgsrc/fonts/gsftopkk/Makefile
diff -u pkgsrc/fonts/gsftopkk/Makefile:1.12 pkgsrc/fonts/gsftopkk/Makefile:1.13
--- pkgsrc/fonts/gsftopkk/Makefile:1.12 Tue Jun 20 20:50:49 2017
+++ pkgsrc/fonts/gsftopkk/Makefile      Wed Sep  6 16:49:22 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2017/06/20 20:50:49 markd Exp $
+# $NetBSD: Makefile,v 1.13 2017/09/06 16:49:22 wiz Exp $
 
 DISTNAME=      texlive-20170524-source
 PKGNAME=       gsftopkk-1.19.2
@@ -11,8 +11,6 @@ MAINTAINER=   minskim%NetBSD.org@localhost
 HOMEPAGE=      http://math.berkeley.edu/~vojta/gsftopk.html
 COMMENT=       Tool to convert bitmaps to .pk format
 
-CONFLICTS+=    teTeX-bin<=3.0nb34
-
 EXTRACT_ELEMENTS=      ${DISTNAME}/build-aux \
                        ${DISTNAME}/texk/gsftopk
 

Index: pkgsrc/fonts/ps2pkm/Makefile
diff -u pkgsrc/fonts/ps2pkm/Makefile:1.11 pkgsrc/fonts/ps2pkm/Makefile:1.12
--- pkgsrc/fonts/ps2pkm/Makefile:1.11   Tue Jun 20 20:50:49 2017
+++ pkgsrc/fonts/ps2pkm/Makefile        Wed Sep  6 16:49:22 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2017/06/20 20:50:49 markd Exp $
+# $NetBSD: Makefile,v 1.12 2017/09/06 16:49:22 wiz Exp $
 
 DISTNAME=      texlive-20170524-source
 PKGNAME=       ps2pkm-1.8
@@ -11,7 +11,6 @@ MAINTAINER=   minskim%NetBSD.org@localhost
 HOMEPAGE=      http://www.tug.org/texlive/
 COMMENT=       Tool to convert PostSCript fonts into TeX PK fonts
 
-CONFLICTS+=    teTeX-bin<=3.0nb34
 DEPENDS+=      kpathsea>=6.0.1:../../print/kpathsea
 
 EXTRACT_ELEMENTS=      ${DISTNAME}/build-aux \

Index: pkgsrc/fonts/t1lib/MESSAGE
diff -u pkgsrc/fonts/t1lib/MESSAGE:1.2 pkgsrc/fonts/t1lib/MESSAGE:1.3
--- pkgsrc/fonts/t1lib/MESSAGE:1.2      Fri Nov  8 15:51:25 2002
+++ pkgsrc/fonts/t1lib/MESSAGE  Wed Sep  6 16:49:22 2017
@@ -1,5 +1,5 @@
 ===========================================================================
-$NetBSD: MESSAGE,v 1.2 2002/11/08 15:51:25 fredb Exp $
+$NetBSD: MESSAGE,v 1.3 2017/09/06 16:49:22 wiz Exp $
 
 Most programs that use the lib will look first in the directory
 specified by the environment variable T1LIB_CONFIG_DIR, and then
@@ -8,7 +8,7 @@ to run the "xglyph" test X client. E.g, 
  ``T1LIB_CONFIG_DIR=${PREFIX}/share/t1lib xglyph &''
 
 The complete documentation requires LaTeX to build. If you have
-the print/teTeX package (or some other "tex"),
+the meta-pkgs/texlive-collection-all package (or some subset),
 ``cd ${PREFIX}/share/doc/t1lib; make'' to build t1lib_doc.dvi.
 
 ===========================================================================

Index: pkgsrc/fonts/tex-ae/Makefile
diff -u pkgsrc/fonts/tex-ae/Makefile:1.3 pkgsrc/fonts/tex-ae/Makefile:1.4
--- pkgsrc/fonts/tex-ae/Makefile:1.3    Sat Jan 30 04:56:40 2016
+++ pkgsrc/fonts/tex-ae/Makefile        Wed Sep  6 16:49:22 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2016/01/30 04:56:40 markd Exp $
+# $NetBSD: Makefile,v 1.4 2017/09/06 16:49:22 wiz Exp $
 # TeX Live Revision 15878
 
 DISTNAME=      ae
@@ -8,7 +8,6 @@ MAINTAINER=     minskim%NetBSD.org@localhost
 COMMENT=       Virtual fonts for T1 encoded CMR-fonts
 LICENSE=       lppl-1.3c
 
-CONFLICTS+=    teTeX-texmf<=3.0nb18
 DEPENDS+=      tex-latex-[0-9]*:../../print/tex-latex
 
 .include "../../print/texlive/package.mk"

Index: pkgsrc/fonts/tex-ae-doc/Makefile
diff -u pkgsrc/fonts/tex-ae-doc/Makefile:1.3 pkgsrc/fonts/tex-ae-doc/Makefile:1.4
--- pkgsrc/fonts/tex-ae-doc/Makefile:1.3        Sat Jan 30 04:56:40 2016
+++ pkgsrc/fonts/tex-ae-doc/Makefile    Wed Sep  6 16:49:22 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2016/01/30 04:56:40 markd Exp $
+# $NetBSD: Makefile,v 1.4 2017/09/06 16:49:22 wiz Exp $
 # TeX Live Revision 15878
 
 DISTNAME=      ae.doc
@@ -8,7 +8,5 @@ MAINTAINER=     minskim%NetBSD.org@localhost
 COMMENT=       Documentation for tex-ae
 LICENSE=       lppl-1.3c
 
-CONFLICTS+=    teTeX-texmf<=3.0nb18
-
 .include "../../print/texlive/package.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/fonts/tex-amsfonts-doc/Makefile
diff -u pkgsrc/fonts/tex-amsfonts-doc/Makefile:1.6 pkgsrc/fonts/tex-amsfonts-doc/Makefile:1.7
--- pkgsrc/fonts/tex-amsfonts-doc/Makefile:1.6  Sun Nov 17 18:49:37 2013
+++ pkgsrc/fonts/tex-amsfonts-doc/Makefile      Wed Sep  6 16:49:22 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2013/11/17 18:49:37 minskim Exp $
+# $NetBSD: Makefile,v 1.7 2017/09/06 16:49:22 wiz Exp $
 
 DISTNAME=      amsfonts.doc
 PKGNAME=       tex-${DISTNAME:S/./-/}-3.04
@@ -8,7 +8,5 @@ MAINTAINER=     minskim%NetBSD.org@localhost
 COMMENT=       Documentation for tex-amsfonts
 LICENSE=       ofl-v1.1
 
-CONFLICTS+=    teTeX-texmf<=3.0nb13
-
 .include "../../print/texlive/package.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/fonts/tex-avantgar/Makefile
diff -u pkgsrc/fonts/tex-avantgar/Makefile:1.5 pkgsrc/fonts/tex-avantgar/Makefile:1.6
--- pkgsrc/fonts/tex-avantgar/Makefile:1.5      Sat Jan 30 04:56:40 2016
+++ pkgsrc/fonts/tex-avantgar/Makefile  Wed Sep  6 16:49:22 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2016/01/30 04:56:40 markd Exp $
+# $NetBSD: Makefile,v 1.6 2017/09/06 16:49:22 wiz Exp $
 
 DISTNAME=      avantgar
 PKGNAME=       tex-${DISTNAME}-2014
@@ -8,8 +8,6 @@ MAINTAINER=     minskim%NetBSD.org@localhost
 COMMENT=       Avantgarde font
 LICENSE=       gnu-gpl-v2
 
-CONFLICTS=     teTeX-texmf<=3.0nb29
-
 TEX_MAP_FILES+=        uag.map
 
 .include "../../print/texlive/package.mk"

Index: pkgsrc/fonts/tex-bookman/Makefile
diff -u pkgsrc/fonts/tex-bookman/Makefile:1.5 pkgsrc/fonts/tex-bookman/Makefile:1.6
--- pkgsrc/fonts/tex-bookman/Makefile:1.5       Sat Jan 30 04:56:41 2016
+++ pkgsrc/fonts/tex-bookman/Makefile   Wed Sep  6 16:49:22 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2016/01/30 04:56:41 markd Exp $
+# $NetBSD: Makefile,v 1.6 2017/09/06 16:49:22 wiz Exp $
 
 DISTNAME=      bookman
 PKGNAME=       tex-${DISTNAME}-2014
@@ -8,8 +8,6 @@ MAINTAINER=     minskim%NetBSD.org@localhost
 COMMENT=       Bookman font
 LICENSE=       gnu-gpl-v2
 
-CONFLICTS=     teTeX-texmf<=3.0nb29
-
 TEX_MAP_FILES+=        ubk.map
 
 .include "../../print/texlive/package.mk"

Index: pkgsrc/fonts/tex-cc-pl/Makefile
diff -u pkgsrc/fonts/tex-cc-pl/Makefile:1.1 pkgsrc/fonts/tex-cc-pl/Makefile:1.2
--- pkgsrc/fonts/tex-cc-pl/Makefile:1.1 Tue Sep 20 12:27:48 2016
+++ pkgsrc/fonts/tex-cc-pl/Makefile     Wed Sep  6 16:49:22 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2016/09/20 12:27:48 markd Exp $
+# $NetBSD: Makefile,v 1.2 2017/09/06 16:49:22 wiz Exp $
 
 DISTNAME=      cc-pl
 PKGNAME=       tex-${DISTNAME}-1.02.2
@@ -9,8 +9,6 @@ HOMEPAGE=       http://ctan.org/pkg/cc-pl
 COMMENT=       Polish extension of Computer Concrete fonts
 LICENSE=       public-domain
 
-CONFLICTS+=    teTeX-texmf<=3.0nb56
-
 TEX_MIXEDMAP_FILES+=   ccpl.map
 
 .include "../../print/texlive/package.mk"

Index: pkgsrc/fonts/tex-charter/Makefile
diff -u pkgsrc/fonts/tex-charter/Makefile:1.1.1.1 pkgsrc/fonts/tex-charter/Makefile:1.2
--- pkgsrc/fonts/tex-charter/Makefile:1.1.1.1   Thu Mar  3 04:13:17 2011
+++ pkgsrc/fonts/tex-charter/Makefile   Wed Sep  6 16:49:22 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2011/03/03 04:13:17 minskim Exp $
+# $NetBSD: Makefile,v 1.2 2017/09/06 16:49:22 wiz Exp $
 
 DISTNAME=      charter
 PKGNAME=       tex-${DISTNAME}-2010
@@ -7,7 +7,5 @@ TEXLIVE_REV=    15878
 MAINTAINER=    minskim%NetBSD.org@localhost
 COMMENT=       Charter fonts
 
-CONFLICTS+=    teTeX-texmf<=3.0nb29
-
 .include "../../print/texlive/package.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/fonts/tex-charter-doc/Makefile
diff -u pkgsrc/fonts/tex-charter-doc/Makefile:1.1.1.1 pkgsrc/fonts/tex-charter-doc/Makefile:1.2
--- pkgsrc/fonts/tex-charter-doc/Makefile:1.1.1.1       Thu Mar  3 04:13:26 2011
+++ pkgsrc/fonts/tex-charter-doc/Makefile       Wed Sep  6 16:49:23 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2011/03/03 04:13:26 minskim Exp $
+# $NetBSD: Makefile,v 1.2 2017/09/06 16:49:23 wiz Exp $
 
 DISTNAME=      charter.doc
 PKGNAME=       tex-${DISTNAME:S/./-/}-2010
@@ -7,7 +7,5 @@ TEXLIVE_REV=    15878
 MAINTAINER=    minskim%NetBSD.org@localhost
 COMMENT=       Documentation for tex-charter
 
-CONFLICTS+=    teTeX-texmf<=3.0nb29
-
 .include "../../print/texlive/package.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/fonts/tex-cm/Makefile
diff -u pkgsrc/fonts/tex-cm/Makefile:1.8 pkgsrc/fonts/tex-cm/Makefile:1.9
--- pkgsrc/fonts/tex-cm/Makefile:1.8    Tue May  5 16:44:41 2015
+++ pkgsrc/fonts/tex-cm/Makefile        Wed Sep  6 16:49:23 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2015/05/05 16:44:41 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2017/09/06 16:49:23 wiz Exp $
 
 DISTNAME=      cm
 PKGNAME=       tex-${DISTNAME}-2014
@@ -10,8 +10,6 @@ HOMEPAGE=     http://ctan.org/pkg/cm
 COMMENT=       Computer Modern fonts
 #LICENSE=      knuth
 
-CONFLICTS+=    teTeX-texmf<=3.0nb11
-
 TEX_MIXEDMAP_FILES+=   cmtext-bsr-interpolated.map
 
 .include "../../print/texlive/package.mk"

Index: pkgsrc/fonts/tex-cm-doc/Makefile
diff -u pkgsrc/fonts/tex-cm-doc/Makefile:1.6 pkgsrc/fonts/tex-cm-doc/Makefile:1.7
--- pkgsrc/fonts/tex-cm-doc/Makefile:1.6        Tue May  5 16:45:57 2015
+++ pkgsrc/fonts/tex-cm-doc/Makefile    Wed Sep  6 16:49:23 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2015/05/05 16:45:57 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2017/09/06 16:49:23 wiz Exp $
 
 DISTNAME=      cm.doc
 PKGNAME=       tex-${DISTNAME:S/./-/}-2014
@@ -9,7 +9,5 @@ HOMEPAGE=       http://ctan.org/pkg/cm
 COMMENT=       Documentation for tex-cm
 #LICENSE=      knuth
 
-CONFLICTS+=    teTeX-texmf<=3.0nb22
-
 .include "../../print/texlive/package.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/fonts/tex-cmcyr/Makefile
diff -u pkgsrc/fonts/tex-cmcyr/Makefile:1.5 pkgsrc/fonts/tex-cmcyr/Makefile:1.6
--- pkgsrc/fonts/tex-cmcyr/Makefile:1.5 Thu Jun 16 03:57:27 2016
+++ pkgsrc/fonts/tex-cmcyr/Makefile     Wed Sep  6 16:49:23 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2016/06/16 03:57:27 markd Exp $
+# $NetBSD: Makefile,v 1.6 2017/09/06 16:49:23 wiz Exp $
 
 DISTNAME=      cmcyr
 PKGNAME=       tex-${DISTNAME}-2016
@@ -8,8 +8,6 @@ MAINTAINER=     minskim%NetBSD.org@localhost
 COMMENT=       Computer Modern fonts with cyrillic extensions
 LICENSE=       public-domain
 
-CONFLICTS+=    teTeX-texmf<=3.0nb24
-
 TEX_MAP_FILES+=        cmcyr.map
 
 .include "../../print/texlive/package.mk"

Index: pkgsrc/fonts/tex-cmcyr-doc/Makefile
diff -u pkgsrc/fonts/tex-cmcyr-doc/Makefile:1.4 pkgsrc/fonts/tex-cmcyr-doc/Makefile:1.5
--- pkgsrc/fonts/tex-cmcyr-doc/Makefile:1.4     Thu Jun 16 03:57:27 2016
+++ pkgsrc/fonts/tex-cmcyr-doc/Makefile Wed Sep  6 16:49:23 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2016/06/16 03:57:27 markd Exp $
+# $NetBSD: Makefile,v 1.5 2017/09/06 16:49:23 wiz Exp $
 
 DISTNAME=      cmcyr.doc
 PKGNAME=       tex-${DISTNAME:S/./-/}-2016
@@ -8,7 +8,5 @@ MAINTAINER=     minskim%NetBSD.org@localhost
 COMMENT=       Documentation for tex-cmcyr
 LICENSE=       public-domain
 
-CONFLICTS+=    teTeX-texmf<=3.0nb24
-
 .include "../../print/texlive/package.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/fonts/tex-cmextra/Makefile
diff -u pkgsrc/fonts/tex-cmextra/Makefile:1.2 pkgsrc/fonts/tex-cmextra/Makefile:1.3
--- pkgsrc/fonts/tex-cmextra/Makefile:1.2       Sat Apr 25 07:52:01 2015
+++ pkgsrc/fonts/tex-cmextra/Makefile   Wed Sep  6 16:49:23 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2015/04/25 07:52:01 markd Exp $
+# $NetBSD: Makefile,v 1.3 2017/09/06 16:49:23 wiz Exp $
 
 DISTNAME=      cmextra
 PKGNAME=       tex-${DISTNAME}-2014
@@ -7,7 +7,5 @@ TEXLIVE_REV=    32831
 MAINTAINER=    minskim%NetBSD.org@localhost
 COMMENT=       Extra Computer Modern fonts
 
-CONFLICTS+=    teTeX-texmf<=3.0nb29
-
 .include "../../print/texlive/package.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/fonts/tex-courier/Makefile
diff -u pkgsrc/fonts/tex-courier/Makefile:1.9 pkgsrc/fonts/tex-courier/Makefile:1.10
--- pkgsrc/fonts/tex-courier/Makefile:1.9       Sat Jan 30 04:56:41 2016
+++ pkgsrc/fonts/tex-courier/Makefile   Wed Sep  6 16:49:23 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2016/01/30 04:56:41 markd Exp $
+# $NetBSD: Makefile,v 1.10 2017/09/06 16:49:23 wiz Exp $
 
 DISTNAME=      courier
 PKGNAME=       tex-${DISTNAME}-2014
@@ -8,8 +8,6 @@ MAINTAINER=     minskim%NetBSD.org@localhost
 COMMENT=       Adobe Type 1 "free" copies of Courier
 LICENSE=       gnu-gpl-v2
 
-CONFLICTS+=    teTeX-texmf<=3.0nb19
-
 TEX_MAP_FILES+=        ucr.map
 
 .include "../../print/texlive/package.mk"

Index: pkgsrc/fonts/tex-ec/Makefile
diff -u pkgsrc/fonts/tex-ec/Makefile:1.2 pkgsrc/fonts/tex-ec/Makefile:1.3
--- pkgsrc/fonts/tex-ec/Makefile:1.2    Tue Jan 11 17:00:01 2011
+++ pkgsrc/fonts/tex-ec/Makefile        Wed Sep  6 16:49:23 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2011/01/11 17:00:01 minskim Exp $
+# $NetBSD: Makefile,v 1.3 2017/09/06 16:49:23 wiz Exp $
 
 DISTNAME=      ec
 PKGNAME=       tex-${DISTNAME}-1.0
@@ -8,7 +8,5 @@ DIST_SUBDIR=    tex-${DISTNAME}-${TEXLIVE_R
 MAINTAINER=    minskim%NetBSD.org@localhost
 COMMENT=       Computer modern fonts in T1 and TS1 encodings
 
-CONFLICTS+=    teTeX-texmf<=3.0nb24
-
 .include "../../print/texlive/package.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/fonts/tex-ec-doc/Makefile
diff -u pkgsrc/fonts/tex-ec-doc/Makefile:1.2 pkgsrc/fonts/tex-ec-doc/Makefile:1.3
--- pkgsrc/fonts/tex-ec-doc/Makefile:1.2        Tue Jan 11 17:00:01 2011
+++ pkgsrc/fonts/tex-ec-doc/Makefile    Wed Sep  6 16:49:23 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2011/01/11 17:00:01 minskim Exp $
+# $NetBSD: Makefile,v 1.3 2017/09/06 16:49:23 wiz Exp $
 
 DISTNAME=      ec.doc
 PKGNAME=       tex-${DISTNAME:S/./-/}-1.0
@@ -8,7 +8,5 @@ DIST_SUBDIR=    tex-${DISTNAME:S/.doc//}-${
 MAINTAINER=    minskim%NetBSD.org@localhost
 COMMENT=       Documentation for tex-ec
 
-CONFLICTS+=    teTeX-texmf<=3.0nb24
-
 .include "../../print/texlive/package.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/fonts/tex-esint/Makefile
diff -u pkgsrc/fonts/tex-esint/Makefile:1.2 pkgsrc/fonts/tex-esint/Makefile:1.3
--- pkgsrc/fonts/tex-esint/Makefile:1.2 Sat Jan 30 04:56:41 2016
+++ pkgsrc/fonts/tex-esint/Makefile     Wed Sep  6 16:49:23 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2016/01/30 04:56:41 markd Exp $
+# $NetBSD: Makefile,v 1.3 2017/09/06 16:49:23 wiz Exp $
 
 DISTNAME=      esint
 PKGNAME=       tex-${DISTNAME}-1.1
@@ -8,7 +8,6 @@ MAINTAINER=     minskim%NetBSD.org@localhost
 COMMENT=       Extended set of integrals for Computer Modern
 LICENSE=       public-domain
 
-CONFLICTS=     teTeX-texmf<=3.0nb29
 DEPENDS+=      tex-latex-bin-[0-9]*:../../print/tex-latex-bin
 
 .include "../../print/texlive/package.mk"

Index: pkgsrc/fonts/tex-eurosym/Makefile
diff -u pkgsrc/fonts/tex-eurosym/Makefile:1.3 pkgsrc/fonts/tex-eurosym/Makefile:1.4
--- pkgsrc/fonts/tex-eurosym/Makefile:1.3       Sun Nov  6 08:43:31 2011
+++ pkgsrc/fonts/tex-eurosym/Makefile   Wed Sep  6 16:49:23 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2011/11/06 08:43:31 minskim Exp $
+# $NetBSD: Makefile,v 1.4 2017/09/06 16:49:23 wiz Exp $
 
 DISTNAME=      eurosym
 PKGNAME=       tex-${DISTNAME}-1.4
@@ -10,8 +10,6 @@ TEXLIVE_REV=  17265
 MAINTAINER=    nico%orgrim.net@localhost
 COMMENT=       MetaFont and macros for Euro sign
 
-CONFLICTS+=    teTeX-texmf<=3.0nb27
-
 TEX_MIXEDMAP_FILES+=   eurosym.map
 
 .include "../../print/texlive/package.mk"

Index: pkgsrc/fonts/tex-eurosym-doc/Makefile
diff -u pkgsrc/fonts/tex-eurosym-doc/Makefile:1.1.1.1 pkgsrc/fonts/tex-eurosym-doc/Makefile:1.2
--- pkgsrc/fonts/tex-eurosym-doc/Makefile:1.1.1.1       Wed Sep  8 18:32:06 2010
+++ pkgsrc/fonts/tex-eurosym-doc/Makefile       Wed Sep  6 16:49:23 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2010/09/08 18:32:06 minskim Exp $
+# $NetBSD: Makefile,v 1.2 2017/09/06 16:49:23 wiz Exp $
 
 DISTNAME=      eurosym.doc
 PKGNAME=       tex-${DISTNAME:S/./-/}-1.4
@@ -8,7 +8,5 @@ TEXLIVE_REV=    17265
 MAINTAINER=    nico%orgrim.net@localhost
 COMMENT=       Documentation for tex-eurosym
 
-CONFLICTS+=    teTeX-texmf<=3.0nb27
-
 .include "../../print/texlive/package.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/fonts/tex-fontinst/Makefile
diff -u pkgsrc/fonts/tex-fontinst/Makefile:1.2 pkgsrc/fonts/tex-fontinst/Makefile:1.3
--- pkgsrc/fonts/tex-fontinst/Makefile:1.2      Thu Apr 30 07:23:54 2015
+++ pkgsrc/fonts/tex-fontinst/Makefile  Wed Sep  6 16:49:23 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2015/04/30 07:23:54 markd Exp $
+# $NetBSD: Makefile,v 1.3 2017/09/06 16:49:23 wiz Exp $
 
 DISTNAME=      fontinst
 PKGNAME=       tex-${DISTNAME}-1.933
@@ -8,8 +8,6 @@ MAINTAINER=     pkgsrc-users%NetBSD.org@localhost
 COMMENT=       Help with installing fonts for TeX and LaTeX
 LICENSE=       lppl-1.3c
 
-CONFLICTS+=    teTeX-texmf<=3.0nb45
-
 USE_TOOLS+=    sh:run
 REPLACE_SH=    bin/fontinst
 

Index: pkgsrc/fonts/tex-fontinst-doc/Makefile
diff -u pkgsrc/fonts/tex-fontinst-doc/Makefile:1.2 pkgsrc/fonts/tex-fontinst-doc/Makefile:1.3
--- pkgsrc/fonts/tex-fontinst-doc/Makefile:1.2  Thu Apr 30 07:23:54 2015
+++ pkgsrc/fonts/tex-fontinst-doc/Makefile      Wed Sep  6 16:49:24 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2015/04/30 07:23:54 markd Exp $
+# $NetBSD: Makefile,v 1.3 2017/09/06 16:49:24 wiz Exp $
 
 DISTNAME=      fontinst.doc
 PKGNAME=       tex-${DISTNAME:S/./-/}-1.933
@@ -8,7 +8,5 @@ MAINTAINER=     pkgsrc-users%NetBSD.org@localhost
 COMMENT=       Documentation for tex-fontinst
 LICENSE=       lppl-1.3c
 
-CONFLICTS+=    teTeX-texmf<=3.0nb45
-
 .include "../../print/texlive/package.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/fonts/tex-fontname/Makefile
diff -u pkgsrc/fonts/tex-fontname/Makefile:1.4 pkgsrc/fonts/tex-fontname/Makefile:1.5
--- pkgsrc/fonts/tex-fontname/Makefile:1.4      Thu Jun 16 03:57:28 2016
+++ pkgsrc/fonts/tex-fontname/Makefile  Wed Sep  6 16:49:24 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2016/06/16 03:57:28 markd Exp $
+# $NetBSD: Makefile,v 1.5 2017/09/06 16:49:24 wiz Exp $
 
 DISTNAME=      fontname
 PKGNAME=       tex-${DISTNAME}-2016
@@ -8,7 +8,5 @@ MAINTAINER=     minskim%NetBSD.org@localhost
 COMMENT=       Scheme for naming fonts in TeX
 LICENSE=       gnu-gpl-v2
 
-CONFLICTS=     teTeX-texmf<=3.0nb29
-
 .include "../../print/texlive/package.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/fonts/tex-fontname-doc/Makefile
diff -u pkgsrc/fonts/tex-fontname-doc/Makefile:1.4 pkgsrc/fonts/tex-fontname-doc/Makefile:1.5
--- pkgsrc/fonts/tex-fontname-doc/Makefile:1.4  Thu Jun 16 03:57:28 2016
+++ pkgsrc/fonts/tex-fontname-doc/Makefile      Wed Sep  6 16:49:24 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2016/06/16 03:57:28 markd Exp $
+# $NetBSD: Makefile,v 1.5 2017/09/06 16:49:24 wiz Exp $
 
 DISTNAME=      fontname.doc
 PKGNAME=       tex-${DISTNAME:S/./-/}-2016
@@ -8,8 +8,6 @@ MAINTAINER=     minskim%NetBSD.org@localhost
 COMMENT=       Documentation for tex-fontname
 LICENSE=       gnu-gpl-v2
 
-CONFLICTS=     teTeX-texmf<=3.0nb29
-
 INFO_FILES=    yes
 
 .include "../../print/texlive/package.mk"

Index: pkgsrc/fonts/tex-fpl/Makefile
diff -u pkgsrc/fonts/tex-fpl/Makefile:1.2 pkgsrc/fonts/tex-fpl/Makefile:1.3
--- pkgsrc/fonts/tex-fpl/Makefile:1.2   Sat Jan 30 04:56:42 2016
+++ pkgsrc/fonts/tex-fpl/Makefile       Wed Sep  6 16:49:24 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2016/01/30 04:56:42 markd Exp $
+# $NetBSD: Makefile,v 1.3 2017/09/06 16:49:24 wiz Exp $
 
 DISTNAME=      fpl
 PKGNAME=       tex-${DISTNAME}-1.002
@@ -8,7 +8,5 @@ MAINTAINER=     minskim%NetBSD.org@localhost
 COMMENT=       SC and OsF fonts for URW Palladio L
 LICENSE=       gnu-gpl-v2
 
-CONFLICTS=     teTeX-texmf<=3.0nb29
-
 .include "../../print/texlive/package.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/fonts/tex-fpl-doc/Makefile
diff -u pkgsrc/fonts/tex-fpl-doc/Makefile:1.3 pkgsrc/fonts/tex-fpl-doc/Makefile:1.4
--- pkgsrc/fonts/tex-fpl-doc/Makefile:1.3       Sat Jan 30 04:56:42 2016
+++ pkgsrc/fonts/tex-fpl-doc/Makefile   Wed Sep  6 16:49:24 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2016/01/30 04:56:42 markd Exp $
+# $NetBSD: Makefile,v 1.4 2017/09/06 16:49:24 wiz Exp $
 
 DISTNAME=      fpl.doc
 PKGNAME=       tex-${DISTNAME:S/./-/}-1.002
@@ -8,7 +8,5 @@ MAINTAINER=     minskim%NetBSD.org@localhost
 COMMENT=       Documentation for tex-fpl
 LICENSE=       gnu-gpl-v2
 
-CONFLICTS=     teTeX-texmf<=3.0nb29
-
 .include "../../print/texlive/package.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/fonts/tex-helvetic/Makefile
diff -u pkgsrc/fonts/tex-helvetic/Makefile:1.8 pkgsrc/fonts/tex-helvetic/Makefile:1.9
--- pkgsrc/fonts/tex-helvetic/Makefile:1.8      Sat Jan 30 04:56:42 2016
+++ pkgsrc/fonts/tex-helvetic/Makefile  Wed Sep  6 16:49:24 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2016/01/30 04:56:42 markd Exp $
+# $NetBSD: Makefile,v 1.9 2017/09/06 16:49:24 wiz Exp $
 
 DISTNAME=      helvetic
 PKGNAME=       tex-${DISTNAME}-2014
@@ -8,8 +8,6 @@ MAINTAINER=     minskim%NetBSD.org@localhost
 COMMENT=       Adobe Helvetica fonts
 LICENSE=       gnu-gpl-v2
 
-CONFLICTS+=    teTeX-texmf<=3.0nb19
-
 TEX_MAP_FILES+=        uhv.map
 
 .include "../../print/texlive/package.mk"

Index: pkgsrc/fonts/tex-latex-fonts/Makefile
diff -u pkgsrc/fonts/tex-latex-fonts/Makefile:1.7 pkgsrc/fonts/tex-latex-fonts/Makefile:1.8
--- pkgsrc/fonts/tex-latex-fonts/Makefile:1.7   Sat Jan 30 04:56:42 2016
+++ pkgsrc/fonts/tex-latex-fonts/Makefile       Wed Sep  6 16:49:24 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2016/01/30 04:56:42 markd Exp $
+# $NetBSD: Makefile,v 1.8 2017/09/06 16:49:24 wiz Exp $
 
 DISTNAME=      latex-fonts
 PKGNAME=       tex-${DISTNAME}-2013
@@ -9,7 +9,5 @@ MAINTAINER=     minskim%NetBSD.org@localhost
 COMMENT=       Collection of fonts used in LaTeX distributions
 LICENSE=       lppl-1.3c
 
-CONFLICTS+=    teTeX-texmf<=3.0nb12
-
 .include "../../print/texlive/package.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/fonts/tex-lh/Makefile
diff -u pkgsrc/fonts/tex-lh/Makefile:1.2 pkgsrc/fonts/tex-lh/Makefile:1.3
--- pkgsrc/fonts/tex-lh/Makefile:1.2    Sat Jan 30 04:56:43 2016
+++ pkgsrc/fonts/tex-lh/Makefile        Wed Sep  6 16:49:24 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2016/01/30 04:56:43 markd Exp $
+# $NetBSD: Makefile,v 1.3 2017/09/06 16:49:24 wiz Exp $
 
 DISTNAME=      lh
 PKGNAME=       tex-${DISTNAME}-3.5g
@@ -8,7 +8,6 @@ MAINTAINER=     minskim%NetBSD.org@localhost
 COMMENT=       Cyrillic fonts that support LaTeX standard encodings
 LICENSE=       lppl-1.3c
 
-CONFLICTS+=    teTeX-texmf<=3.0nb24
 DEPENDS+=      tex-ec>=1.0:../../fonts/tex-ec
 
 .include "../../print/texlive/package.mk"

Index: pkgsrc/fonts/tex-lh-doc/Makefile
diff -u pkgsrc/fonts/tex-lh-doc/Makefile:1.2 pkgsrc/fonts/tex-lh-doc/Makefile:1.3
--- pkgsrc/fonts/tex-lh-doc/Makefile:1.2        Sat Jan 30 04:56:43 2016
+++ pkgsrc/fonts/tex-lh-doc/Makefile    Wed Sep  6 16:49:24 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2016/01/30 04:56:43 markd Exp $
+# $NetBSD: Makefile,v 1.3 2017/09/06 16:49:24 wiz Exp $
 
 DISTNAME=      lh.doc
 PKGNAME=       tex-${DISTNAME:S/./-/}-3.5g
@@ -8,7 +8,5 @@ MAINTAINER=     minskim%NetBSD.org@localhost
 COMMENT=       Documentation for tex-lh
 LICENSE=       lppl-1.3c
 
-CONFLICTS+=    teTeX-texmf<=3.0nb24
-
 .include "../../print/texlive/package.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/fonts/tex-lm/Makefile
diff -u pkgsrc/fonts/tex-lm/Makefile:1.8 pkgsrc/fonts/tex-lm/Makefile:1.9
--- pkgsrc/fonts/tex-lm/Makefile:1.8    Sat Jan 30 04:56:43 2016
+++ pkgsrc/fonts/tex-lm/Makefile        Wed Sep  6 16:49:24 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2016/01/30 04:56:43 markd Exp $
+# $NetBSD: Makefile,v 1.9 2017/09/06 16:49:24 wiz Exp $
 
 DISTNAME=      lm
 PKGNAME=       tex-${DISTNAME}-2.004
@@ -9,8 +9,6 @@ MAINTAINER=     minskim%NetBSD.org@localhost
 COMMENT=       Latin modern fonts in outline formats
 LICENSE=       gfsl
 
-CONFLICTS+=    teTeX-texmf<=3.0nb16
-
 TEX_MAP_FILES+=        lm.map
 
 .include "../../print/texlive/package.mk"

Index: pkgsrc/fonts/tex-lm-doc/Makefile
diff -u pkgsrc/fonts/tex-lm-doc/Makefile:1.5 pkgsrc/fonts/tex-lm-doc/Makefile:1.6
--- pkgsrc/fonts/tex-lm-doc/Makefile:1.5        Sat Jan 30 04:56:43 2016
+++ pkgsrc/fonts/tex-lm-doc/Makefile    Wed Sep  6 16:49:24 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2016/01/30 04:56:43 markd Exp $
+# $NetBSD: Makefile,v 1.6 2017/09/06 16:49:24 wiz Exp $
 
 DISTNAME=      lm.doc
 PKGNAME=       tex-${DISTNAME:S/./-/}-2.004
@@ -8,7 +8,5 @@ MAINTAINER=     minskim%NetBSD.org@localhost
 COMMENT=       Documentation for tex-lm
 LICENSE=       gfsl
 
-CONFLICTS+=    teTeX-texmf<=3.0nb16
-
 .include "../../print/texlive/package.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/fonts/tex-manfnt/Makefile
diff -u pkgsrc/fonts/tex-manfnt/Makefile:1.6 pkgsrc/fonts/tex-manfnt/Makefile:1.7
--- pkgsrc/fonts/tex-manfnt/Makefile:1.6        Sat Jan 30 04:56:43 2016
+++ pkgsrc/fonts/tex-manfnt/Makefile    Wed Sep  6 16:49:24 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2016/01/30 04:56:43 markd Exp $
+# $NetBSD: Makefile,v 1.7 2017/09/06 16:49:24 wiz Exp $
 
 DISTNAME=      manfnt
 PKGNAME=       tex-${DISTNAME}-2014
@@ -8,7 +8,5 @@ MAINTAINER=     minskim%NetBSD.org@localhost
 COMMENT=       LaTeX support for the TeX book symbols
 LICENSE=       lppl-1.3c
 
-CONFLICTS+=    teTeX-texmf<=3.0nb15
-
 .include "../../print/texlive/package.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/fonts/tex-manfnt-font/Makefile
diff -u pkgsrc/fonts/tex-manfnt-font/Makefile:1.2 pkgsrc/fonts/tex-manfnt-font/Makefile:1.3
--- pkgsrc/fonts/tex-manfnt-font/Makefile:1.2   Sat Jan 30 04:56:43 2016
+++ pkgsrc/fonts/tex-manfnt-font/Makefile       Wed Sep  6 16:49:25 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2016/01/30 04:56:43 markd Exp $
+# $NetBSD: Makefile,v 1.3 2017/09/06 16:49:25 wiz Exp $
 
 DISTNAME=      manfnt-font
 PKGNAME=       tex-${DISTNAME}-2014
@@ -8,8 +8,6 @@ MAINTAINER=     pkgsrc-users%NetBSD.org@localhost
 COMMENT=       Font for LaTeX support for the TeX book symbols
 LICENSE=       lppl-1.3c
 
-CONFLICTS+=    teTeX-texmf<=3.0nb15
-
 TEX_MIXEDMAP_FILES+=   manfnt.map
 
 .include "../../print/texlive/package.mk"

Index: pkgsrc/fonts/tex-marvosym/Makefile
diff -u pkgsrc/fonts/tex-marvosym/Makefile:1.5 pkgsrc/fonts/tex-marvosym/Makefile:1.6
--- pkgsrc/fonts/tex-marvosym/Makefile:1.5      Sat Jan 30 04:56:43 2016
+++ pkgsrc/fonts/tex-marvosym/Makefile  Wed Sep  6 16:49:25 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2016/01/30 04:56:43 markd Exp $
+# $NetBSD: Makefile,v 1.6 2017/09/06 16:49:25 wiz Exp $
 
 DISTNAME=      marvosym
 PKGNAME=       tex-${DISTNAME}-2.2a
@@ -8,8 +8,6 @@ MAINTAINER=     minskim%NetBSD.org@localhost
 COMMENT=       Martin Vogel's Symbols font
 LICENSE=       ofl-v1.1
 
-CONFLICTS+=    teTeX-texmf<=3.0nb13
-
 TEX_MAP_FILES+=        marvosym.map
 
 .include "../../print/texlive/package.mk"

Index: pkgsrc/fonts/tex-marvosym-doc/Makefile
diff -u pkgsrc/fonts/tex-marvosym-doc/Makefile:1.4 pkgsrc/fonts/tex-marvosym-doc/Makefile:1.5
--- pkgsrc/fonts/tex-marvosym-doc/Makefile:1.4  Sat Jan 30 04:56:43 2016
+++ pkgsrc/fonts/tex-marvosym-doc/Makefile      Wed Sep  6 16:49:25 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2016/01/30 04:56:43 markd Exp $
+# $NetBSD: Makefile,v 1.5 2017/09/06 16:49:25 wiz Exp $
 
 DISTNAME=      marvosym.doc
 PKGNAME=       tex-${DISTNAME:S/./-/}-2.2a
@@ -8,7 +8,5 @@ MAINTAINER=     minskim%NetBSD.org@localhost
 COMMENT=       Documentation for tex-marvosym
 LICENSE=       ofl-v1.1
 
-CONFLICTS+=    teTeX-texmf<=3.0nb13
-
 .include "../../print/texlive/package.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/fonts/tex-mathpazo/Makefile
diff -u pkgsrc/fonts/tex-mathpazo/Makefile:1.2 pkgsrc/fonts/tex-mathpazo/Makefile:1.3
--- pkgsrc/fonts/tex-mathpazo/Makefile:1.2      Sat Jan 30 04:56:43 2016
+++ pkgsrc/fonts/tex-mathpazo/Makefile  Wed Sep  6 16:49:25 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2016/01/30 04:56:43 markd Exp $
+# $NetBSD: Makefile,v 1.3 2017/09/06 16:49:25 wiz Exp $
 
 DISTNAME=      mathpazo
 PKGNAME=       tex-${DISTNAME}-1.003
@@ -8,7 +8,5 @@ MAINTAINER=     minskim%NetBSD.org@localhost
 COMMENT=       Fonts to typeset mathematics to match Palatino
 LICENSE=       lppl-1.3c
 
-CONFLICTS=     teTeX-texmf<=3.0nb29
-
 .include "../../print/texlive/package.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/fonts/tex-mathpazo-doc/Makefile
diff -u pkgsrc/fonts/tex-mathpazo-doc/Makefile:1.2 pkgsrc/fonts/tex-mathpazo-doc/Makefile:1.3
--- pkgsrc/fonts/tex-mathpazo-doc/Makefile:1.2  Sat Jan 30 04:56:43 2016
+++ pkgsrc/fonts/tex-mathpazo-doc/Makefile      Wed Sep  6 16:49:25 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2016/01/30 04:56:43 markd Exp $
+# $NetBSD: Makefile,v 1.3 2017/09/06 16:49:25 wiz Exp $
 
 DISTNAME=      mathpazo.doc
 PKGNAME=       tex-${DISTNAME:S/./-/}-1.003
@@ -8,7 +8,5 @@ MAINTAINER=     minskim%NetBSD.org@localhost
 COMMENT=       Documentation for tex-mathpazo
 LICENSE=       lppl-1.3c
 
-CONFLICTS=     teTeX-texmf<=3.0nb29
-
 .include "../../print/texlive/package.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/fonts/tex-metafont/Makefile
diff -u pkgsrc/fonts/tex-metafont/Makefile:1.10 pkgsrc/fonts/tex-metafont/Makefile:1.11
--- pkgsrc/fonts/tex-metafont/Makefile:1.10     Tue May  5 18:25:36 2015
+++ pkgsrc/fonts/tex-metafont/Makefile  Wed Sep  6 16:49:25 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2015/05/05 18:25:36 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2017/09/06 16:49:25 wiz Exp $
 
 DISTNAME=      metafont
 # should be this instead:
@@ -12,9 +12,6 @@ HOMEPAGE=     http://ctan.org/pkg/metafont
 COMMENT=       METAFONT system for specifying fonts
 #LICENSE=      knuth
 
-CONFLICTS+=    teTeX-bin<=3.0nb32
-CONFLICTS+=    teTeX-texmf<=3.0nb13
-CONFLICTS+=    tex-bin-metapost-[0-9]*
 DEPENDS+=      tex-kpathsea-[0-9]*:../../print/tex-kpathsea
 DEPENDS+=      web2c-[0-9]*:../../print/web2c
 

Index: pkgsrc/fonts/tex-mflogo/Makefile
diff -u pkgsrc/fonts/tex-mflogo/Makefile:1.8 pkgsrc/fonts/tex-mflogo/Makefile:1.9
--- pkgsrc/fonts/tex-mflogo/Makefile:1.8        Thu Jun 16 03:57:30 2016
+++ pkgsrc/fonts/tex-mflogo/Makefile    Wed Sep  6 16:49:25 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2016/06/16 03:57:30 markd Exp $
+# $NetBSD: Makefile,v 1.9 2017/09/06 16:49:25 wiz Exp $
 
 DISTNAME=      mflogo
 # should be 
@@ -11,7 +11,5 @@ HOMEPAGE=     http://ctan.org/pkg/mflogo
 COMMENT=       LaTeX support for MetaFont logo fonts
 LICENSE=       lppl-1.3c
 
-CONFLICTS+=    teTeX-texmf<=3.0nb15
-
 .include "../../print/texlive/package.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/fonts/tex-mflogo-font/Makefile
diff -u pkgsrc/fonts/tex-mflogo-font/Makefile:1.2 pkgsrc/fonts/tex-mflogo-font/Makefile:1.3
--- pkgsrc/fonts/tex-mflogo-font/Makefile:1.2   Sun Jun 14 11:19:59 2015
+++ pkgsrc/fonts/tex-mflogo-font/Makefile       Wed Sep  6 16:49:25 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2015/06/14 11:19:59 markd Exp $
+# $NetBSD: Makefile,v 1.3 2017/09/06 16:49:25 wiz Exp $
 
 DISTNAME=      mflogo-font
 PKGNAME=       tex-${DISTNAME}-1.002pl36898
@@ -7,8 +7,6 @@ TEXLIVE_REV=    36898
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 COMMENT=       Metafont logo font
 
-CONFLICTS+=    teTeX-texmf<=3.0nb15
-
 TEX_MIXEDMAP_FILES+=   mflogo.map
 
 .include "../../print/texlive/package.mk"

Index: pkgsrc/fonts/tex-mfware/Makefile
diff -u pkgsrc/fonts/tex-mfware/Makefile:1.6 pkgsrc/fonts/tex-mfware/Makefile:1.7
--- pkgsrc/fonts/tex-mfware/Makefile:1.6        Tue May  5 18:33:51 2015
+++ pkgsrc/fonts/tex-mfware/Makefile    Wed Sep  6 16:49:25 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2015/05/05 18:33:51 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2017/09/06 16:49:25 wiz Exp $
 
 DISTNAME=      mfware
 PKGNAME=       tex-${DISTNAME}-2014
@@ -9,7 +9,6 @@ HOMEPAGE=       http://ctan.org/pkg/mfware
 COMMENT=       Supporting tools for use with MetaFont
 #LICENSE=      knuth
 
-CONFLICTS+=    teTeX-texmf<=3.0nb22
 DEPENDS+=      web2c-[0-9]*:../../print/web2c
 
 .include "../../print/texlive/package.mk"

Index: pkgsrc/fonts/tex-ncntrsbk/Makefile
diff -u pkgsrc/fonts/tex-ncntrsbk/Makefile:1.5 pkgsrc/fonts/tex-ncntrsbk/Makefile:1.6
--- pkgsrc/fonts/tex-ncntrsbk/Makefile:1.5      Sat Jan 30 04:56:43 2016
+++ pkgsrc/fonts/tex-ncntrsbk/Makefile  Wed Sep  6 16:49:25 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2016/01/30 04:56:43 markd Exp $
+# $NetBSD: Makefile,v 1.6 2017/09/06 16:49:25 wiz Exp $
 
 DISTNAME=      ncntrsbk
 PKGNAME=       tex-${DISTNAME}-2014
@@ -8,8 +8,6 @@ MAINTAINER=     minskim%NetBSD.org@localhost
 COMMENT=       New Century Schoolbook fonts
 LICENSE=       gnu-gpl-v2
 
-CONFLICTS=     teTeX-texmf<=3.0nb29
-
 TEX_MAP_FILES+=        unc.map
 
 .include "../../print/texlive/package.mk"

Index: pkgsrc/fonts/tex-palatino/Makefile
diff -u pkgsrc/fonts/tex-palatino/Makefile:1.5 pkgsrc/fonts/tex-palatino/Makefile:1.6
--- pkgsrc/fonts/tex-palatino/Makefile:1.5      Sat Jan 30 04:56:43 2016
+++ pkgsrc/fonts/tex-palatino/Makefile  Wed Sep  6 16:49:25 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2016/01/30 04:56:43 markd Exp $
+# $NetBSD: Makefile,v 1.6 2017/09/06 16:49:25 wiz Exp $
 
 DISTNAME=      palatino
 PKGNAME=       tex-${DISTNAME}-2014
@@ -8,8 +8,6 @@ MAINTAINER=     minskim%NetBSD.org@localhost
 COMMENT=       Palatino font family for TeX
 LICENSE=       lppl-1.3c
 
-CONFLICTS=     teTeX-texmf<=3.0nb29
-
 TEX_MAP_FILES+=        upl.map
 
 .include "../../print/texlive/package.mk"

Index: pkgsrc/fonts/tex-psnfss/Makefile
diff -u pkgsrc/fonts/tex-psnfss/Makefile:1.10 pkgsrc/fonts/tex-psnfss/Makefile:1.11
--- pkgsrc/fonts/tex-psnfss/Makefile:1.10       Sat Jan 30 04:56:44 2016
+++ pkgsrc/fonts/tex-psnfss/Makefile    Wed Sep  6 16:49:25 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2016/01/30 04:56:44 markd Exp $
+# $NetBSD: Makefile,v 1.11 2017/09/06 16:49:25 wiz Exp $
 
 DISTNAME=      psnfss
 PKGNAME=       tex-${DISTNAME}-9.2a.33946
@@ -8,7 +8,6 @@ MAINTAINER=     minskim%NetBSD.org@localhost
 COMMENT=       Font support for common PostScript fonts
 LICENSE=       lppl-1.3c
 
-CONFLICTS+=    teTeX-texmf<=3.0nb13
 DEPENDS+=      tex-avantgar-[0-9]*:../../fonts/tex-avantgar
 DEPENDS+=      tex-bookman-[0-9]*:../../fonts/tex-bookman
 DEPENDS+=      tex-charter-[0-9]*:../../fonts/tex-charter

Index: pkgsrc/fonts/tex-psnfss-doc/Makefile
diff -u pkgsrc/fonts/tex-psnfss-doc/Makefile:1.5 pkgsrc/fonts/tex-psnfss-doc/Makefile:1.6
--- pkgsrc/fonts/tex-psnfss-doc/Makefile:1.5    Sat Jan 30 04:56:44 2016
+++ pkgsrc/fonts/tex-psnfss-doc/Makefile        Wed Sep  6 16:49:26 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2016/01/30 04:56:44 markd Exp $
+# $NetBSD: Makefile,v 1.6 2017/09/06 16:49:26 wiz Exp $
 
 DISTNAME=      psnfss.doc
 PKGNAME=       tex-${DISTNAME:S/./-/}-9.2a.33946
@@ -8,7 +8,5 @@ MAINTAINER=     minskim%NetBSD.org@localhost
 COMMENT=       Documentation for tex-psnfss
 LICENSE=       lppl-1.3c
 
-CONFLICTS+=    teTeX-texmf<=3.0nb13
-
 .include "../../print/texlive/package.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/fonts/tex-pxfonts/Makefile
diff -u pkgsrc/fonts/tex-pxfonts/Makefile:1.3 pkgsrc/fonts/tex-pxfonts/Makefile:1.4
--- pkgsrc/fonts/tex-pxfonts/Makefile:1.3       Sat Jan 30 04:56:44 2016
+++ pkgsrc/fonts/tex-pxfonts/Makefile   Wed Sep  6 16:49:26 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2016/01/30 04:56:44 markd Exp $
+# $NetBSD: Makefile,v 1.4 2017/09/06 16:49:26 wiz Exp $
 
 DISTNAME=      pxfonts
 PKGNAME=       tex-${DISTNAME}-2010
@@ -9,8 +9,6 @@ MAINTAINER=     minskim%NetBSD.org@localhost
 COMMENT=       Palatino-like fonts in support of mathematics
 LICENSE=       lppl-1.3c
 
-CONFLICTS=     teTeX-texmf<=3.0nb29
-
 TEX_MAP_FILES+=        pxfonts.map
 
 .include "../../print/texlive/package.mk"

Index: pkgsrc/fonts/tex-pxfonts-doc/Makefile
diff -u pkgsrc/fonts/tex-pxfonts-doc/Makefile:1.2 pkgsrc/fonts/tex-pxfonts-doc/Makefile:1.3
--- pkgsrc/fonts/tex-pxfonts-doc/Makefile:1.2   Sat Jan 30 04:56:44 2016
+++ pkgsrc/fonts/tex-pxfonts-doc/Makefile       Wed Sep  6 16:49:26 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2016/01/30 04:56:44 markd Exp $
+# $NetBSD: Makefile,v 1.3 2017/09/06 16:49:26 wiz Exp $
 
 DISTNAME=      pxfonts.doc
 PKGNAME=       tex-${DISTNAME:S/./-/}-2010
@@ -8,7 +8,5 @@ MAINTAINER=     minskim%NetBSD.org@localhost
 COMMENT=       Documentation for tex-pxfonts
 LICENSE=       lppl-1.3c
 
-CONFLICTS=     teTeX-texmf<=3.0nb29
-
 .include "../../print/texlive/package.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/fonts/tex-rsfs/Makefile
diff -u pkgsrc/fonts/tex-rsfs/Makefile:1.4 pkgsrc/fonts/tex-rsfs/Makefile:1.5
--- pkgsrc/fonts/tex-rsfs/Makefile:1.4  Sun Nov  6 08:43:32 2011
+++ pkgsrc/fonts/tex-rsfs/Makefile      Wed Sep  6 16:49:26 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2011/11/06 08:43:32 minskim Exp $
+# $NetBSD: Makefile,v 1.5 2017/09/06 16:49:26 wiz Exp $
 
 DISTNAME=      rsfs
 PKGNAME=       tex-${DISTNAME}-2009
@@ -9,8 +9,6 @@ DIST_SUBDIR=    ${PKGBASE}-${TEXLIVE_REV}.2
 MAINTAINER=    minskim%NetBSD.org@localhost
 COMMENT=       Ralph Smith's Formal Script font
 
-CONFLICTS+=    teTeX-texmf<=3.0nb15
-
 TEX_MIXEDMAP_FILES+=   rsfs.map
 
 .include "../../print/texlive/package.mk"

Index: pkgsrc/fonts/tex-rsfs-doc/Makefile
diff -u pkgsrc/fonts/tex-rsfs-doc/Makefile:1.3 pkgsrc/fonts/tex-rsfs-doc/Makefile:1.4
--- pkgsrc/fonts/tex-rsfs-doc/Makefile:1.3      Tue Sep 14 00:24:39 2010
+++ pkgsrc/fonts/tex-rsfs-doc/Makefile  Wed Sep  6 16:49:26 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2010/09/14 00:24:39 minskim Exp $
+# $NetBSD: Makefile,v 1.4 2017/09/06 16:49:26 wiz Exp $
 
 DISTNAME=      rsfs.doc
 PKGNAME=       tex-${DISTNAME:S/./-/}-2009
@@ -8,8 +8,5 @@ DIST_SUBDIR=    ${PKGBASE:S/-doc//}-${TEXLI
 MAINTAINER=    minskim%NetBSD.org@localhost
 COMMENT=       Documentation for tex-rsfs
 
-CONFLICTS+=    teTeX-texmf<=3.0nb15
-
-
 .include "../../print/texlive/package.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/fonts/tex-stmaryrd/Makefile
diff -u pkgsrc/fonts/tex-stmaryrd/Makefile:1.6 pkgsrc/fonts/tex-stmaryrd/Makefile:1.7
--- pkgsrc/fonts/tex-stmaryrd/Makefile:1.6      Sat Jan 30 04:56:44 2016
+++ pkgsrc/fonts/tex-stmaryrd/Makefile  Wed Sep  6 16:49:26 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2016/01/30 04:56:44 markd Exp $
+# $NetBSD: Makefile,v 1.7 2017/09/06 16:49:26 wiz Exp $
 
 DISTNAME=      stmaryrd
 PKGNAME=       tex-${DISTNAME}-2010
@@ -9,8 +9,6 @@ MAINTAINER=     minskim%NetBSD.org@localhost
 COMMENT=       St Mary Road symbols for theoretical computer science
 LICENSE=       lppl-1.3c
 
-CONFLICTS+=    teTeX-texmf<=3.0nb15
-
 TEX_MIXEDMAP_FILES+=   stmaryrd.map
 
 .include "../../print/texlive/package.mk"

Index: pkgsrc/fonts/tex-stmaryrd-doc/Makefile
diff -u pkgsrc/fonts/tex-stmaryrd-doc/Makefile:1.4 pkgsrc/fonts/tex-stmaryrd-doc/Makefile:1.5
--- pkgsrc/fonts/tex-stmaryrd-doc/Makefile:1.4  Sat Jan 30 04:56:44 2016
+++ pkgsrc/fonts/tex-stmaryrd-doc/Makefile      Wed Sep  6 16:49:26 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2016/01/30 04:56:44 markd Exp $
+# $NetBSD: Makefile,v 1.5 2017/09/06 16:49:26 wiz Exp $
 
 DISTNAME=      stmaryrd.doc
 PKGNAME=       tex-${DISTNAME:S/./-/}-2010
@@ -8,7 +8,5 @@ MAINTAINER=     minskim%NetBSD.org@localhost
 COMMENT=       Documentation for tex-stmaryrd
 LICENSE=       lppl-1.3c
 
-CONFLICTS+=    teTeX-texmf<=3.0nb15
-
 .include "../../print/texlive/package.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/fonts/tex-symbol/Makefile
diff -u pkgsrc/fonts/tex-symbol/Makefile:1.6 pkgsrc/fonts/tex-symbol/Makefile:1.7
--- pkgsrc/fonts/tex-symbol/Makefile:1.6        Sat Jan 30 04:56:44 2016
+++ pkgsrc/fonts/tex-symbol/Makefile    Wed Sep  6 16:49:26 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2016/01/30 04:56:44 markd Exp $
+# $NetBSD: Makefile,v 1.7 2017/09/06 16:49:26 wiz Exp $
 
 DISTNAME=      symbol
 PKGNAME=       tex-${DISTNAME}-2014
@@ -8,8 +8,6 @@ MAINTAINER=     minskim%NetBSD.org@localhost
 COMMENT=       Symbol fonts for TeX
 LICENSE=       lppl-1.3c
 
-CONFLICTS+=    teTeX-texmf<=3.0nb14
-
 TEX_MAP_FILES+=        usy.map
 
 .include "../../print/texlive/package.mk"

Index: pkgsrc/fonts/tex-times/Makefile
diff -u pkgsrc/fonts/tex-times/Makefile:1.8 pkgsrc/fonts/tex-times/Makefile:1.9
--- pkgsrc/fonts/tex-times/Makefile:1.8 Sat Jan 30 04:56:44 2016
+++ pkgsrc/fonts/tex-times/Makefile     Wed Sep  6 16:49:26 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2016/01/30 04:56:44 markd Exp $
+# $NetBSD: Makefile,v 1.9 2017/09/06 16:49:26 wiz Exp $
 
 DISTNAME=      times
 PKGNAME=       tex-${DISTNAME}-2014
@@ -8,8 +8,6 @@ MAINTAINER=     minskim%NetBSD.org@localhost
 COMMENT=       Select Adobe Times Roman (or equivalent) as default font
 LICENSE=       gnu-gpl-v2
 
-CONFLICTS+=    teTeX-texmf<=3.0nb16
-
 TEX_MAP_FILES+=        utm.map
 
 .include "../../print/texlive/package.mk"

Index: pkgsrc/fonts/tex-txfonts/Makefile
diff -u pkgsrc/fonts/tex-txfonts/Makefile:1.5 pkgsrc/fonts/tex-txfonts/Makefile:1.6
--- pkgsrc/fonts/tex-txfonts/Makefile:1.5       Sat Jan 30 04:56:44 2016
+++ pkgsrc/fonts/tex-txfonts/Makefile   Wed Sep  6 16:49:26 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2016/01/30 04:56:44 markd Exp $
+# $NetBSD: Makefile,v 1.6 2017/09/06 16:49:26 wiz Exp $
 
 DISTNAME=      txfonts
 PKGNAME=       tex-${DISTNAME}-2009
@@ -9,8 +9,6 @@ MAINTAINER=     minskim%NetBSD.org@localhost
 COMMENT=       Times-like fonts in support of mathematics
 LICENSE=       gnu-gpl-v2
 
-CONFLICTS+=    teTeX-texmf<=3.0nb19
-
 TEX_MAP_FILES+=        txfonts.map
 
 .include "../../print/texlive/package.mk"

Index: pkgsrc/fonts/tex-txfonts-doc/Makefile
diff -u pkgsrc/fonts/tex-txfonts-doc/Makefile:1.4 pkgsrc/fonts/tex-txfonts-doc/Makefile:1.5
--- pkgsrc/fonts/tex-txfonts-doc/Makefile:1.4   Sat Jan 30 04:56:44 2016
+++ pkgsrc/fonts/tex-txfonts-doc/Makefile       Wed Sep  6 16:49:26 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2016/01/30 04:56:44 markd Exp $
+# $NetBSD: Makefile,v 1.5 2017/09/06 16:49:26 wiz Exp $
 
 DISTNAME=      txfonts.doc
 PKGNAME=       tex-${DISTNAME:S/./-/}-2009
@@ -8,7 +8,5 @@ MAINTAINER=     minskim%NetBSD.org@localhost
 COMMENT=       Documentation for tex-txfonts
 LICENSE=       gnu-gpl-v2
 
-CONFLICTS+=    teTeX-texmf<=3.0nb19
-
 .include "../../print/texlive/package.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/fonts/tex-wasy/Makefile
diff -u pkgsrc/fonts/tex-wasy/Makefile:1.6 pkgsrc/fonts/tex-wasy/Makefile:1.7
--- pkgsrc/fonts/tex-wasy/Makefile:1.6  Sat Jan 30 04:56:45 2016
+++ pkgsrc/fonts/tex-wasy/Makefile      Wed Sep  6 16:49:26 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2016/01/30 04:56:45 markd Exp $
+# $NetBSD: Makefile,v 1.7 2017/09/06 16:49:26 wiz Exp $
 
 DISTNAME=      wasy
 PKGNAME=       tex-${DISTNAME}-2014
@@ -8,7 +8,5 @@ MAINTAINER=     minskim%NetBSD.org@localhost
 COMMENT=       Waldi's symbol fonts
 LICENSE=       public-domain
 
-CONFLICTS+=    teTeX-texmf<=3.0nb15
-
 .include "../../print/texlive/package.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/fonts/tex-wasysym/Makefile
diff -u pkgsrc/fonts/tex-wasysym/Makefile:1.3 pkgsrc/fonts/tex-wasysym/Makefile:1.4
--- pkgsrc/fonts/tex-wasysym/Makefile:1.3       Sat Jan 30 04:56:45 2016
+++ pkgsrc/fonts/tex-wasysym/Makefile   Wed Sep  6 16:49:26 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2016/01/30 04:56:45 markd Exp $
+# $NetBSD: Makefile,v 1.4 2017/09/06 16:49:26 wiz Exp $
 
 DISTNAME=      wasysym
 PKGNAME=       tex-${DISTNAME}-2.0
@@ -9,7 +9,6 @@ MAINTAINER=     minskim%NetBSD.org@localhost
 COMMENT=       LaTeX support file to use the WASY2 fonts
 LICENSE=       lppl-1.3c
 
-CONFLICTS=     teTeX-texmf<=3.0nb29
 DEPENDS+=      tex-latex-bin-[0-9]*:../../print/tex-latex-bin
 DEPENDS+=      tex-wasy-[0-9]*:../../fonts/tex-wasy
 DEPENDS+=      tex-wasy2-ps-[0-9]*:../../fonts/tex-wasy2-ps

Index: pkgsrc/fonts/tex-zapfchan/Makefile
diff -u pkgsrc/fonts/tex-zapfchan/Makefile:1.4 pkgsrc/fonts/tex-zapfchan/Makefile:1.5
--- pkgsrc/fonts/tex-zapfchan/Makefile:1.4      Sat Jan 30 04:56:45 2016
+++ pkgsrc/fonts/tex-zapfchan/Makefile  Wed Sep  6 16:49:27 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2016/01/30 04:56:45 markd Exp $
+# $NetBSD: Makefile,v 1.5 2017/09/06 16:49:27 wiz Exp $
 
 DISTNAME=      zapfchan
 PKGNAME=       tex-${DISTNAME}-2014
@@ -8,8 +8,6 @@ MAINTAINER=     minskim%NetBSD.org@localhost
 COMMENT=       Zapf Chancery fonts
 LICENSE=       gnu-gpl-v2
 
-CONFLICTS=     teTeX-texmf<=3.0nb29
-
 TEX_MAP_FILES+=        uzc.map
 
 .include "../../print/texlive/package.mk"

Index: pkgsrc/fonts/tex-zapfding/Makefile
diff -u pkgsrc/fonts/tex-zapfding/Makefile:1.6 pkgsrc/fonts/tex-zapfding/Makefile:1.7
--- pkgsrc/fonts/tex-zapfding/Makefile:1.6      Sat Jan 30 04:56:45 2016
+++ pkgsrc/fonts/tex-zapfding/Makefile  Wed Sep  6 16:49:27 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2016/01/30 04:56:45 markd Exp $
+# $NetBSD: Makefile,v 1.7 2017/09/06 16:49:27 wiz Exp $
 
 DISTNAME=      zapfding
 PKGNAME=       tex-${DISTNAME}-2014
@@ -8,8 +8,6 @@ MAINTAINER=     minskim%NetBSD.org@localhost
 COMMENT=       Dingbat typeface designed by Hermann Zapf
 LICENSE=       gnu-gpl-v2
 
-CONFLICTS+=    teTeX-texmf<=3.0nb14
-
 TEX_MAP_FILES+=        uzd.map
 
 .include "../../print/texlive/package.mk"

Index: pkgsrc/graphics/tex-a2ping/Makefile
diff -u pkgsrc/graphics/tex-a2ping/Makefile:1.10 pkgsrc/graphics/tex-a2ping/Makefile:1.11
--- pkgsrc/graphics/tex-a2ping/Makefile:1.10    Sat Jul  9 06:38:22 2016
+++ pkgsrc/graphics/tex-a2ping/Makefile Wed Sep  6 16:49:27 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2016/07/09 06:38:22 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2017/09/06 16:49:27 wiz Exp $
 
 DISTNAME=      a2ping
 PKGNAME=       tex-${DISTNAME}-2.77p
@@ -9,8 +9,6 @@ MAINTAINER=     minskim%NetBSD.org@localhost
 COMMENT=       Advanced PS, PDF, EPS converter
 LICENSE=       gnu-gpl-v2
 
-CONFLICTS+=    teTeX-bin<=3.0nb34
-
 USE_TOOLS+=    perl:run sh:run
 
 REPLACE_SH=    bin/a2ping

Index: pkgsrc/graphics/tex-eepic/Makefile
diff -u pkgsrc/graphics/tex-eepic/Makefile:1.2 pkgsrc/graphics/tex-eepic/Makefile:1.3
--- pkgsrc/graphics/tex-eepic/Makefile:1.2      Sat Jan 30 04:05:50 2016
+++ pkgsrc/graphics/tex-eepic/Makefile  Wed Sep  6 16:49:27 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2016/01/30 04:05:50 markd Exp $
+# $NetBSD: Makefile,v 1.3 2017/09/06 16:49:27 wiz Exp $
 
 DISTNAME=      eepic
 PKGNAME=       tex-${DISTNAME}-1.1e
@@ -8,7 +8,5 @@ MAINTAINER=     minskim%NetBSD.org@localhost
 COMMENT=       Extensions to epic and the LaTeX drawing tools
 LICENSE=       public-domain
 
-CONFLICTS+=    teTeX-texmf<=3.0nb25
-
 .include "../../print/texlive/package.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/graphics/tex-eepic-doc/Makefile
diff -u pkgsrc/graphics/tex-eepic-doc/Makefile:1.2 pkgsrc/graphics/tex-eepic-doc/Makefile:1.3
--- pkgsrc/graphics/tex-eepic-doc/Makefile:1.2  Sat Jan 30 04:05:50 2016
+++ pkgsrc/graphics/tex-eepic-doc/Makefile      Wed Sep  6 16:49:27 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2016/01/30 04:05:50 markd Exp $
+# $NetBSD: Makefile,v 1.3 2017/09/06 16:49:27 wiz Exp $
 
 DISTNAME=      eepic.doc
 PKGNAME=       tex-${DISTNAME:S/./-/}-1.1e
@@ -8,7 +8,5 @@ MAINTAINER=     minskim%NetBSD.org@localhost
 COMMENT=       Documentation for tex-eepic
 LICENSE=       public-domain
 
-CONFLICTS+=    teTeX-texmf<=3.0nb25
-
 .include "../../print/texlive/package.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/graphics/tex-graphics-pln/Makefile
diff -u pkgsrc/graphics/tex-graphics-pln/Makefile:1.2 pkgsrc/graphics/tex-graphics-pln/Makefile:1.3
--- pkgsrc/graphics/tex-graphics-pln/Makefile:1.2       Wed Jun 21 07:24:06 2017
+++ pkgsrc/graphics/tex-graphics-pln/Makefile   Wed Sep  6 16:49:27 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2017/06/21 07:24:06 markd Exp $
+# $NetBSD: Makefile,v 1.3 2017/09/06 16:49:27 wiz Exp $
 
 DISTNAME=      graphics-pln
 PKGNAME=       tex-${DISTNAME}-2017
@@ -9,7 +9,5 @@ HOMEPAGE=       http://ctan.org/pkg/graphics-p
 COMMENT=       LaTeX-style graphics for Plain TeX users
 LICENSE=       lppl-1.0
 
-CONFLICTS+=    teTeX-texmf<=3.0nb47
-
 .include "../../print/texlive/package.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/graphics/tex-metapost/Makefile
diff -u pkgsrc/graphics/tex-metapost/Makefile:1.7 pkgsrc/graphics/tex-metapost/Makefile:1.8
--- pkgsrc/graphics/tex-metapost/Makefile:1.7   Sat Jan 30 04:05:50 2016
+++ pkgsrc/graphics/tex-metapost/Makefile       Wed Sep  6 16:49:27 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2016/01/30 04:05:50 markd Exp $
+# $NetBSD: Makefile,v 1.8 2017/09/06 16:49:27 wiz Exp $
 
 DISTNAME=      metapost
 PKGNAME=       tex-${DISTNAME}-1.803pl34194
@@ -8,7 +8,6 @@ MAINTAINER=     minskim%NetBSD.org@localhost
 COMMENT=       Development of MetaFont for creating graphics
 LICENSE=       gnu-lgpl-v2
 
-CONFLICTS+=    teTeX-texmf<=3.0nb25
 DEPENDS+=      tex-kpathsea>=2009.16044:../../print/tex-kpathsea
 DEPENDS+=      web2c>=2011:../../print/web2c
 

Index: pkgsrc/graphics/tex-metapost-doc/Makefile
diff -u pkgsrc/graphics/tex-metapost-doc/Makefile:1.5 pkgsrc/graphics/tex-metapost-doc/Makefile:1.6
--- pkgsrc/graphics/tex-metapost-doc/Makefile:1.5       Sat Jan 30 04:05:50 2016
+++ pkgsrc/graphics/tex-metapost-doc/Makefile   Wed Sep  6 16:49:27 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2016/01/30 04:05:50 markd Exp $
+# $NetBSD: Makefile,v 1.6 2017/09/06 16:49:27 wiz Exp $
 
 DISTNAME=      metapost.doc
 PKGNAME=       tex-${DISTNAME:S/./-/}-1.803pl34194
@@ -8,8 +8,6 @@ MAINTAINER=     minskim%NetBSD.org@localhost
 COMMENT=       Documentation for tex-metapost
 LICENSE=       gnu-lgpl-v2
 
-CONFLICTS+=    teTeX-texmf<=3.0nb25
-
 TEXLIVE_IGNORE_PATTERNS=       texmf-dist/doc/man
 
 .include "../../print/texlive/package.mk"

Index: pkgsrc/graphics/tex-pdfcrop/Makefile
diff -u pkgsrc/graphics/tex-pdfcrop/Makefile:1.9 pkgsrc/graphics/tex-pdfcrop/Makefile:1.10
--- pkgsrc/graphics/tex-pdfcrop/Makefile:1.9    Sat Jul  9 06:38:22 2016
+++ pkgsrc/graphics/tex-pdfcrop/Makefile        Wed Sep  6 16:49:27 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2016/07/09 06:38:22 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2017/09/06 16:49:27 wiz Exp $
 
 DISTNAME=      pdfcrop
 PKGNAME=       tex-${DISTNAME}-1.37
@@ -9,8 +9,6 @@ MAINTAINER=     minskim%NetBSD.org@localhost
 COMMENT=       Crop PDF graphics
 LICENSE=       lppl-1.3c
 
-CONFLICTS=     teTeX-bin<3.0nb49
-
 USE_TOOLS+=    gs:run perl:run
 
 REPLACE_PERL=  bin/pdfcrop

Index: pkgsrc/graphics/tex-pst-plot/Makefile
diff -u pkgsrc/graphics/tex-pst-plot/Makefile:1.5 pkgsrc/graphics/tex-pst-plot/Makefile:1.6
--- pkgsrc/graphics/tex-pst-plot/Makefile:1.5   Wed Jun 21 11:45:59 2017
+++ pkgsrc/graphics/tex-pst-plot/Makefile       Wed Sep  6 16:49:27 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2017/06/21 11:45:59 markd Exp $
+# $NetBSD: Makefile,v 1.6 2017/09/06 16:49:27 wiz Exp $
 
 DISTNAME=      pst-plot
 PKGNAME=       tex-${DISTNAME}-1.79
@@ -9,7 +9,6 @@ HOMEPAGE=       http://ctan.org/pkg/pst-plot
 COMMENT=       Plot data using PSTricks
 LICENSE=       lppl-1.3c
 
-CONFLICTS=     teTeX-texmf<=3.0nb29
 DEPENDS+=      tex-multido-[0-9]*:../../devel/tex-multido
 DEPENDS+=      tex-pstricks-[0-9]*:../../graphics/tex-pstricks
 DEPENDS+=      tex-xkeyval-[0-9]*:../../print/tex-xkeyval

Index: pkgsrc/graphics/tex-pstricks/Makefile
diff -u pkgsrc/graphics/tex-pstricks/Makefile:1.9 pkgsrc/graphics/tex-pstricks/Makefile:1.10
--- pkgsrc/graphics/tex-pstricks/Makefile:1.9   Thu Aug 17 01:33:43 2017
+++ pkgsrc/graphics/tex-pstricks/Makefile       Wed Sep  6 16:49:27 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2017/08/17 01:33:43 markd Exp $
+# $NetBSD: Makefile,v 1.10 2017/09/06 16:49:27 wiz Exp $
 
 DISTNAME=      pstricks
 PKGNAME=       tex-${DISTNAME}-2.74
@@ -9,7 +9,6 @@ HOMEPAGE=       http://ctan.org/pkg/pstricks-b
 COMMENT=       PostScript macros for TeX
 LICENSE=       lppl-1.3c
 
-CONFLICTS=     teTeX-texmf<=3.0nb29
 DEPENDS+=      tex-auto-pst-pdf-[0-9]*:../../graphics/tex-auto-pst-pdf
 DEPENDS+=      tex-latex-bin-[0-9]*:../../print/tex-latex-bin
 DEPENDS+=      tex-xkeyval-[0-9]*:../../print/tex-xkeyval

Index: pkgsrc/graphics/tex-pstricks-doc/Makefile
diff -u pkgsrc/graphics/tex-pstricks-doc/Makefile:1.9 pkgsrc/graphics/tex-pstricks-doc/Makefile:1.10
--- pkgsrc/graphics/tex-pstricks-doc/Makefile:1.9       Thu Aug 17 01:33:44 2017
+++ pkgsrc/graphics/tex-pstricks-doc/Makefile   Wed Sep  6 16:49:27 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2017/08/17 01:33:44 markd Exp $
+# $NetBSD: Makefile,v 1.10 2017/09/06 16:49:27 wiz Exp $
 
 DISTNAME=      pstricks.doc
 PKGNAME=       tex-${DISTNAME:S/./-/}-2.74
@@ -9,7 +9,5 @@ HOMEPAGE=       http://ctan.org/pkg/pstricks-b
 COMMENT=       Documentation for tex-pstricks
 LICENSE=       lppl-1.3c
 
-CONFLICTS=     teTeX-texmf<=3.0nb29
-
 .include "../../print/texlive/package.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/graphics/tex-tex-ps/Makefile
diff -u pkgsrc/graphics/tex-tex-ps/Makefile:1.2 pkgsrc/graphics/tex-tex-ps/Makefile:1.3
--- pkgsrc/graphics/tex-tex-ps/Makefile:1.2     Sat Jan 30 04:05:54 2016
+++ pkgsrc/graphics/tex-tex-ps/Makefile Wed Sep  6 16:49:28 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2016/01/30 04:05:54 markd Exp $
+# $NetBSD: Makefile,v 1.3 2017/09/06 16:49:28 wiz Exp $
 
 DISTNAME=      tex-ps
 PKGNAME=       tex-${DISTNAME}-2010
@@ -8,7 +8,6 @@ MAINTAINER=     minskim%NetBSD.org@localhost
 COMMENT=       TeX to PostScript generic macros and add-ons
 LICENSE=       public-domain
 
-CONFLICTS=     teTeX-texmf<=3.0nb29
 DEPENDS+=      tex-epsf-[0-9]*:../../print/tex-epsf
 
 .include "../../print/texlive/package.mk"

Index: pkgsrc/graphics/tex-tex-ps-doc/Makefile
diff -u pkgsrc/graphics/tex-tex-ps-doc/Makefile:1.2 pkgsrc/graphics/tex-tex-ps-doc/Makefile:1.3
--- pkgsrc/graphics/tex-tex-ps-doc/Makefile:1.2 Sat Jan 30 04:05:54 2016
+++ pkgsrc/graphics/tex-tex-ps-doc/Makefile     Wed Sep  6 16:49:28 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2016/01/30 04:05:54 markd Exp $
+# $NetBSD: Makefile,v 1.3 2017/09/06 16:49:28 wiz Exp $
 
 DISTNAME=      tex-ps.doc
 PKGNAME=       tex-${DISTNAME:S/./-/}-2010
@@ -8,7 +8,5 @@ MAINTAINER=     minskim%NetBSD.org@localhost
 COMMENT=       Documentation for tex-tex-ps
 LICENSE=       public-domain
 
-CONFLICTS=     teTeX-texmf<=3.0nb29
-
 .include "../../print/texlive/package.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/graphics/tex-texdraw/Makefile
diff -u pkgsrc/graphics/tex-texdraw/Makefile:1.1 pkgsrc/graphics/tex-texdraw/Makefile:1.2
--- pkgsrc/graphics/tex-texdraw/Makefile:1.1    Tue Sep 20 12:37:25 2016
+++ pkgsrc/graphics/tex-texdraw/Makefile        Wed Sep  6 16:49:28 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2016/09/20 12:37:25 markd Exp $
+# $NetBSD: Makefile,v 1.2 2017/09/06 16:49:28 wiz Exp $
 
 DISTNAME=      texdraw
 PKGNAME=       tex-${DISTNAME}-2.0
@@ -9,7 +9,5 @@ HOMEPAGE=       http://ctan.org/pkg/texdraw
 COMMENT=       Graphical macros, using embedded PostScript
 #LICENSE=      other-free
 
-CONFLICTS+=    teTeX-texmf<=3.0nb56
-
 .include "../../print/texlive/package.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/graphics/tex-xypic/Makefile
diff -u pkgsrc/graphics/tex-xypic/Makefile:1.4 pkgsrc/graphics/tex-xypic/Makefile:1.5
--- pkgsrc/graphics/tex-xypic/Makefile:1.4      Sat Jan 30 04:05:54 2016
+++ pkgsrc/graphics/tex-xypic/Makefile  Wed Sep  6 16:49:28 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2016/01/30 04:05:54 markd Exp $
+# $NetBSD: Makefile,v 1.5 2017/09/06 16:49:28 wiz Exp $
 
 DISTNAME=      xypic
 PKGNAME=       tex-${DISTNAME}-3.8.9
@@ -8,8 +8,6 @@ MAINTAINER=     minskim%NetBSD.org@localhost
 COMMENT=       Flexible diagramming macros
 LICENSE=       gnu-gpl-v2
 
-CONFLICTS=     teTeX-texmf<=3.0nb29
-
 TEX_MIXEDMAP_FILES+=   xypic.map
 
 .include "../../print/texlive/package.mk"

Index: pkgsrc/graphics/tex-xypic-doc/Makefile
diff -u pkgsrc/graphics/tex-xypic-doc/Makefile:1.3 pkgsrc/graphics/tex-xypic-doc/Makefile:1.4
--- pkgsrc/graphics/tex-xypic-doc/Makefile:1.3  Sat Jan 30 04:05:54 2016
+++ pkgsrc/graphics/tex-xypic-doc/Makefile      Wed Sep  6 16:49:28 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2016/01/30 04:05:54 markd Exp $
+# $NetBSD: Makefile,v 1.4 2017/09/06 16:49:28 wiz Exp $
 
 DISTNAME=      xypic.doc
 PKGNAME=       tex-${DISTNAME:S/./-/}-3.8.9
@@ -8,7 +8,5 @@ MAINTAINER=     minskim%NetBSD.org@localhost
 COMMENT=       Documentation for tex-xypic
 LICENSE=       gnu-gpl-v2
 
-CONFLICTS=     teTeX-texmf<=3.0nb29
-
 .include "../../print/texlive/package.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/math/tex-fp/Makefile
diff -u pkgsrc/math/tex-fp/Makefile:1.2 pkgsrc/math/tex-fp/Makefile:1.3
--- pkgsrc/math/tex-fp/Makefile:1.2     Sat Jan 30 04:12:56 2016
+++ pkgsrc/math/tex-fp/Makefile Wed Sep  6 16:49:28 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2016/01/30 04:12:56 markd Exp $
+# $NetBSD: Makefile,v 1.3 2017/09/06 16:49:28 wiz Exp $
 
 DISTNAME=      fp
 PKGNAME=       tex-${DISTNAME}-2010
@@ -8,7 +8,6 @@ MAINTAINER=     minskim%NetBSD.org@localhost
 COMMENT=       Fixed point arithmetic
 LICENSE=       lppl-1.3c
 
-CONFLICTS=     teTeX-texmf<=3.0nb29
 DEPENDS+=      tex-latex-bin-[0-9]*:../../print/tex-latex-bin
 
 .include "../../print/texlive/package.mk"

Index: pkgsrc/meta-pkgs/bulk-large/Makefile
diff -u pkgsrc/meta-pkgs/bulk-large/Makefile:1.31 pkgsrc/meta-pkgs/bulk-large/Makefile:1.32
--- pkgsrc/meta-pkgs/bulk-large/Makefile:1.31   Thu Jun 22 21:00:05 2017
+++ pkgsrc/meta-pkgs/bulk-large/Makefile        Wed Sep  6 16:49:28 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2017/06/22 21:00:05 markd Exp $
+# $NetBSD: Makefile,v 1.32 2017/09/06 16:49:28 wiz Exp $
 
 DISTNAME=      bulk-large-20170622
 CATEGORIES=    meta-pkgs
@@ -116,9 +116,6 @@ BUILD_DEPENDS+=     mit-krb5-[0-9]*:../../se
 #
 BUILD_DEPENDS+=        texlive-collection-fontsrecommended-[0-9]*:../../meta-pkgs/texlive-collection-fontsrecommended
 BUILD_DEPENDS+=        texlive-collection-fontsrecommended-doc-[0-9]*:../../meta-pkgs/texlive-collection-fontsrecommended-doc
-BUILD_DEPENDS+=        teTeX-[0-9]*:../../print/teTeX
-BUILD_DEPENDS+=        teTeX-bin>=3:../../print/teTeX3-bin
-BUILD_DEPENDS+=        teTeX-texmf>=3:../../print/teTeX3-texmf
 BUILD_DEPENDS+=        texlive-collection-basic-[0-9]*:../../meta-pkgs/texlive-collection-basic
 BUILD_DEPENDS+=        texlive-collection-basic-doc-[0-9]*:../../meta-pkgs/texlive-collection-basic-doc
 BUILD_DEPENDS+=        texlive-collection-plaingeneric-[0-9]*:../../meta-pkgs/texlive-collection-plaingeneric

Index: pkgsrc/meta-pkgs/netbsd-doc-print/DESCR
diff -u pkgsrc/meta-pkgs/netbsd-doc-print/DESCR:1.3 pkgsrc/meta-pkgs/netbsd-doc-print/DESCR:1.4
--- pkgsrc/meta-pkgs/netbsd-doc-print/DESCR:1.3 Sat Jan 31 23:44:02 2004
+++ pkgsrc/meta-pkgs/netbsd-doc-print/DESCR     Wed Sep  6 16:49:28 2017
@@ -2,7 +2,7 @@ Meta-package that includes all packages 
 Documentation project to convert SGML/DocBook to PDF/PS.
 
 Excluded from netbsd-doc into a separate package because it wants
-teTeX, which is rather large in size.
+texlive, which is rather large in size.
 
 Nevertheless you'll need external PostScript and PDF previewers,
 e.g. Acrobat Reader, xpdf, gv, etc.

Index: pkgsrc/mk/defaults/mk.conf
diff -u pkgsrc/mk/defaults/mk.conf:1.281 pkgsrc/mk/defaults/mk.conf:1.282
--- pkgsrc/mk/defaults/mk.conf:1.281    Thu Aug 10 09:34:05 2017
+++ pkgsrc/mk/defaults/mk.conf  Wed Sep  6 16:49:28 2017
@@ -1,4 +1,4 @@
-# $NetBSD: mk.conf,v 1.281 2017/08/10 09:34:05 hauke Exp $
+# $NetBSD: mk.conf,v 1.282 2017/09/06 16:49:28 wiz Exp $
 #
 
 # This file provides default values for variables that may be overridden
@@ -1691,11 +1691,6 @@ SSYNC_PAWD?= pwd
 # Possible: 13.1, 12.1, 10.0
 # Default: depends on operating system version
 
-TEX_DEFAULT?=  teTeX3
-# Specify the user's favorite latex implementation
-# Possible: teTeX3
-# Default: teTeX3
-
 #TEXMFSITE=
 # Used in TeXfamily package which depends on teTeX package to specify
 # site-local texmf configuration.

Index: pkgsrc/pkgtools/pkglint/files/vardefs.go
diff -u pkgsrc/pkgtools/pkglint/files/vardefs.go:1.27 pkgsrc/pkgtools/pkglint/files/vardefs.go:1.28
--- pkgsrc/pkgtools/pkglint/files/vardefs.go:1.27       Thu Jul 27 11:21:25 2017
+++ pkgsrc/pkgtools/pkglint/files/vardefs.go    Wed Sep  6 16:49:28 2017
@@ -308,7 +308,6 @@ func (gd *GlobalData) InitVartypes() {
                usr("SSH_SUID", lkNone, BtYesNo)
                usr("SSYNC_PAWD", lkNone, enum("pawd pwd"))
                usr("SUSE_PREFER", lkNone, enum("13.1 12.1 10.0"))
-               usr("TEX_DEFAULT", lkNone, enum("teTeX3"))
                usr("TEXMFSITE", lkNone, BtPathname)
                usr("THTTPD_LOG_FACILITY", lkNone, BtIdentifier)
                usr("UNPRIVILEGED", lkNone, BtYesNo)
@@ -922,8 +921,6 @@ func (gd *GlobalData) InitVartypes() {
        pkglist("TEST_DIRS", lkShell, BtWrksrcSubdirectory)
        pkglist("TEST_ENV", lkShell, BtShellWord)
        acl("TEST_TARGET", lkShell, BtIdentifier, "Makefile: set; Makefile.common: default, set; options.mk: set, append")
-       acl("TEX_ACCEPTED", lkShell, enum("teTeX1 teTeX2 teTeX3"), "Makefile, Makefile.common: set")
-       acl("TEX_DEPMETHOD", lkNone, enum("build run"), "Makefile, Makefile.common: set")
        pkglist("TEXINFO_REQD", lkShell, BtVersion)
        acl("TOOL_DEPENDS", lkSpace, BtDependencyWithPath, "Makefile, Makefile.common, *.mk: append")
        sys("TOOLS_ALIASES", lkShell, BtFilename)

Index: pkgsrc/pkgtools/pkglint4/files/makevars.map
diff -u pkgsrc/pkgtools/pkglint4/files/makevars.map:1.5 pkgsrc/pkgtools/pkglint4/files/makevars.map:1.6
--- pkgsrc/pkgtools/pkglint4/files/makevars.map:1.5     Wed Jun 14 16:23:09 2017
+++ pkgsrc/pkgtools/pkglint4/files/makevars.map Wed Sep  6 16:49:28 2017
@@ -1,4 +1,4 @@
-# $NetBSD: makevars.map,v 1.5 2017/06/14 16:23:09 prlw1 Exp $
+# $NetBSD: makevars.map,v 1.6 2017/09/06 16:49:28 wiz Exp $
 #
 
 # This file contains the guessed type of some variables, according to
@@ -717,8 +717,6 @@ SUPERSEDES          InternalList of Dependency [
 TEST_DIRS              List of WrksrcSubdirectory [$package_list]
 TEST_ENV               List of ShellWord [$package_list]
 TEST_TARGET            List of Identifier [m:s,c:ds,o:as]
-TEX_ACCEPTED           List of { teTeX1 teTeX2 teTeX3 } [m:s,c:s]
-TEX_DEPMETHOD          { build run } [m:s,c:s]
 TEXINFO_REQD           List of Version [$package_list]
 TOOL_DEPENDS           InternalList of DependencyWithPath [c:a,m:a,o:a,*.mk:a]
 TOOLS_ALIASES          List of Filename [$system]

Index: pkgsrc/print/Makefile
diff -u pkgsrc/print/Makefile:1.694 pkgsrc/print/Makefile:1.695
--- pkgsrc/print/Makefile:1.694 Wed Sep  6 12:54:56 2017
+++ pkgsrc/print/Makefile       Wed Sep  6 16:49:28 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.694 2017/09/06 12:54:56 markd Exp $
+# $NetBSD: Makefile,v 1.695 2017/09/06 16:49:28 wiz Exp $
 #
 
 COMMENT=       Desktop publishing
@@ -158,9 +158,6 @@ SUBDIR+=    scribus-qt4
 SUBDIR+=       seetexk
 SUBDIR+=       stylewriter
 SUBDIR+=       tcl-pdflib
-SUBDIR+=       teTeX
-SUBDIR+=       teTeX3-bin
-SUBDIR+=       teTeX3-texmf
 SUBDIR+=       tex-2up
 SUBDIR+=       tex-2up-doc
 SUBDIR+=       tex-FAQ-en-doc

Index: pkgsrc/print/dviljk/Makefile
diff -u pkgsrc/print/dviljk/Makefile:1.12 pkgsrc/print/dviljk/Makefile:1.13
--- pkgsrc/print/dviljk/Makefile:1.12   Tue Jun 20 20:50:49 2017
+++ pkgsrc/print/dviljk/Makefile        Wed Sep  6 16:49:29 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2017/06/20 20:50:49 markd Exp $
+# $NetBSD: Makefile,v 1.13 2017/09/06 16:49:29 wiz Exp $
 
 DISTNAME=      texlive-20170524-source
 PKGNAME=       dviljk-2.6.5
@@ -11,8 +11,6 @@ MAINTAINER=   minskim%NetBSD.org@localhost
 HOMEPAGE=      http://www.tug.org/texlive/
 COMMENT=       DVI driver for the LaserJet printers using kpathsea
 
-CONFLICTS+=    teTeX-bin<=3.0nb32
-
 EXTRACT_ELEMENTS=      ${DISTNAME}/build-aux \
                        ${DISTNAME}/texk/dviljk
 

Index: pkgsrc/print/dvipsk/Makefile
diff -u pkgsrc/print/dvipsk/Makefile:1.16 pkgsrc/print/dvipsk/Makefile:1.17
--- pkgsrc/print/dvipsk/Makefile:1.16   Tue Jun 20 20:50:50 2017
+++ pkgsrc/print/dvipsk/Makefile        Wed Sep  6 16:49:29 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2017/06/20 20:50:50 markd Exp $
+# $NetBSD: Makefile,v 1.17 2017/09/06 16:49:29 wiz Exp $
 
 DISTNAME=      texlive-20170524-source
 PKGNAME=       dvipsk-5.997
@@ -10,8 +10,6 @@ MAINTAINER=   minskim%NetBSD.org@localhost
 HOMEPAGE=      http://www.radicaleye.com/dvips.html
 COMMENT=       DVI-to-PostScript translator
 
-CONFLICTS+=    teTeX-bin<3.0nb24
-CONFLICTS+=    teTeX-texmf<3.0nb9
 BUILD_DEPENDS+=        tex-texconfig-[0-9]*:../../print/tex-texconfig
 DEPENDS+=      tex-dvips>=2013:../../print/tex-dvips
 

Index: pkgsrc/print/kpathsea/Makefile
diff -u pkgsrc/print/kpathsea/Makefile:1.28 pkgsrc/print/kpathsea/Makefile:1.29
--- pkgsrc/print/kpathsea/Makefile:1.28 Tue Jun 20 20:50:50 2017
+++ pkgsrc/print/kpathsea/Makefile      Wed Sep  6 16:49:29 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2017/06/20 20:50:50 markd Exp $
+# $NetBSD: Makefile,v 1.29 2017/09/06 16:49:29 wiz Exp $
 
 DISTNAME=      texlive-20170524-source
 PKGNAME=       kpathsea-6.2.3
@@ -11,10 +11,6 @@ HOMEPAGE=    http://ctan.org/pkg/kpathsea
 COMMENT=       Path searching library for TeX-related files
 LICENSE=       gnu-lgpl-v2.1
 
-CONFLICTS+=    teTeX-bin<=3.0nb46
-CONFLICTS+=    teTeX-texmf<=3.0nb5
-CONFLICTS+=    texlive-tetex<2010
-
 EXTRACT_ELEMENTS=      ${DISTNAME}/build-aux \
                        ${DISTNAME}/texk/kpathsea
 

Index: pkgsrc/print/tex-SIunits/Makefile
diff -u pkgsrc/print/tex-SIunits/Makefile:1.2 pkgsrc/print/tex-SIunits/Makefile:1.3
--- pkgsrc/print/tex-SIunits/Makefile:1.2       Tue Jan 26 11:16:33 2016
+++ pkgsrc/print/tex-SIunits/Makefile   Wed Sep  6 16:49:29 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2016/01/26 11:16:33 markd Exp $
+# $NetBSD: Makefile,v 1.3 2017/09/06 16:49:29 wiz Exp $
 
 DISTNAME=      SIunits
 PKGNAME=       tex-${DISTNAME}-1.36
@@ -8,7 +8,5 @@ MAINTAINER=     pkgsrc-users%NetBSD.org@localhost
 COMMENT=       International System of Units
 LICENSE=       lppl-1.3c
 
-CONFLICTS+=    teTeX-texmf<=3.0nb42
-
 .include "../../print/texlive/package.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/print/tex-abstract/Makefile
diff -u pkgsrc/print/tex-abstract/Makefile:1.2 pkgsrc/print/tex-abstract/Makefile:1.3
--- pkgsrc/print/tex-abstract/Makefile:1.2      Sat Jan 30 03:26:05 2016
+++ pkgsrc/print/tex-abstract/Makefile  Wed Sep  6 16:49:29 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2016/01/30 03:26:05 markd Exp $
+# $NetBSD: Makefile,v 1.3 2017/09/06 16:49:29 wiz Exp $
 
 DISTNAME=      abstract
 PKGNAME=       tex-${DISTNAME}-1.2a
@@ -8,7 +8,5 @@ MAINTAINER=     pkgsrc-users%NetBSD.org@localhost
 COMMENT=       Control the typesetting of the abstract environment.
 LICENSE=       lppl-1.3c
 
-CONFLICTS+=    teTeX-texmf<=3.0nb42
-
 .include "../../print/texlive/package.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/print/tex-acronym/Makefile
diff -u pkgsrc/print/tex-acronym/Makefile:1.3 pkgsrc/print/tex-acronym/Makefile:1.4
--- pkgsrc/print/tex-acronym/Makefile:1.3       Sat Jan 30 03:26:05 2016
+++ pkgsrc/print/tex-acronym/Makefile   Wed Sep  6 16:49:29 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2016/01/30 03:26:05 markd Exp $
+# $NetBSD: Makefile,v 1.4 2017/09/06 16:49:29 wiz Exp $
 
 DISTNAME=      acronym
 PKGNAME=       tex-${DISTNAME}-1.41
@@ -8,7 +8,5 @@ MAINTAINER=     pkgsrc-users%NetBSD.org@localhost
 COMMENT=       Expand acronyms at least once
 LICENSE=       lppl-1.3c
 
-CONFLICTS+=    teTeX-texmf<=3.0nb42
-
 .include "../../print/texlive/package.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/print/tex-adrconv/Makefile
diff -u pkgsrc/print/tex-adrconv/Makefile:1.2 pkgsrc/print/tex-adrconv/Makefile:1.3
--- pkgsrc/print/tex-adrconv/Makefile:1.2       Sat Jan 30 03:26:06 2016
+++ pkgsrc/print/tex-adrconv/Makefile   Wed Sep  6 16:49:29 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2016/01/30 03:26:06 markd Exp $
+# $NetBSD: Makefile,v 1.3 2017/09/06 16:49:29 wiz Exp $
 
 DISTNAME=      adrconv
 PKGNAME=       tex-${DISTNAME}-1.3
@@ -8,7 +8,5 @@ MAINTAINER=     pkgsrc-users%NetBSD.org@localhost
 COMMENT=       BibTeX styles to implement an address database
 LICENSE=       lppl-1.3c
 
-CONFLICTS+=    teTeX-texmf<=3.0nb42
-
 .include "../../print/texlive/package.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/print/tex-aeguill/Makefile
diff -u pkgsrc/print/tex-aeguill/Makefile:1.2 pkgsrc/print/tex-aeguill/Makefile:1.3
--- pkgsrc/print/tex-aeguill/Makefile:1.2       Sat Jan 30 03:26:06 2016
+++ pkgsrc/print/tex-aeguill/Makefile   Wed Sep  6 16:49:29 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2016/01/30 03:26:06 markd Exp $
+# $NetBSD: Makefile,v 1.3 2017/09/06 16:49:29 wiz Exp $
 
 DISTNAME=      aeguill
 PKGNAME=       tex-${DISTNAME}-15878
@@ -8,7 +8,5 @@ MAINTAINER=     pkgsrc-users%NetBSD.org@localhost
 COMMENT=       Add several kinds of guillemets to the ae fonts
 LICENSE=       lppl-1.3c
 
-CONFLICTS+=    teTeX-texmf<=3.0nb42
-
 .include "../../print/texlive/package.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/print/tex-aleph/Makefile
diff -u pkgsrc/print/tex-aleph/Makefile:1.3 pkgsrc/print/tex-aleph/Makefile:1.4
--- pkgsrc/print/tex-aleph/Makefile:1.3 Thu Jun 16 04:05:59 2016
+++ pkgsrc/print/tex-aleph/Makefile     Wed Sep  6 16:49:29 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2016/06/16 04:05:59 markd Exp $
+# $NetBSD: Makefile,v 1.4 2017/09/06 16:49:29 wiz Exp $
 
 DISTNAME=      aleph
 PKGNAME=       tex-${DISTNAME}-0.2.40768
@@ -8,7 +8,6 @@ MAINTAINER=     pkgsrc-users%NetBSD.org@localhost
 COMMENT=       Extended TeX
 LICENSE=       gnu-gpl-v2
 
-CONFLICTS+=    teTeX-bin<=3.0nb57
 DEPENDS+=      tex-latex>=2010:../../print/tex-latex
 DEPENDS+=      tex-plain>=3.141592653nb2:../../print/tex-plain
 DEPENDS+=      tex-lambda>=2014:../../print/tex-lambda

Index: pkgsrc/print/tex-algorithms/Makefile
diff -u pkgsrc/print/tex-algorithms/Makefile:1.5 pkgsrc/print/tex-algorithms/Makefile:1.6
--- pkgsrc/print/tex-algorithms/Makefile:1.5    Thu Jun 16 04:05:59 2016
+++ pkgsrc/print/tex-algorithms/Makefile        Wed Sep  6 16:49:30 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2016/06/16 04:05:59 markd Exp $
+# $NetBSD: Makefile,v 1.6 2017/09/06 16:49:30 wiz Exp $
 
 DISTNAME=      algorithms
 PKGNAME=       tex-${DISTNAME}-0.1
@@ -8,7 +8,6 @@ MAINTAINER=     minskim%NetBSD.org@localhost
 COMMENT=       Suite of tools for typesetting algorithms in pseudo-code
 LICENSE=       gnu-lgpl-v2
 
-CONFLICTS+=    teTeX-texmf<=3.0nb19
 DEPENDS+=      tex-float-[0-9]*:../../print/tex-float
 DEPENDS+=      tex-graphics-[0-9]*:../../print/tex-graphics
 DEPENDS+=      tex-latex-[0-9]*:../../print/tex-latex

Index: pkgsrc/print/tex-algorithms-doc/Makefile
diff -u pkgsrc/print/tex-algorithms-doc/Makefile:1.5 pkgsrc/print/tex-algorithms-doc/Makefile:1.6
--- pkgsrc/print/tex-algorithms-doc/Makefile:1.5        Thu Jun 16 04:05:59 2016
+++ pkgsrc/print/tex-algorithms-doc/Makefile    Wed Sep  6 16:49:30 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2016/06/16 04:05:59 markd Exp $
+# $NetBSD: Makefile,v 1.6 2017/09/06 16:49:30 wiz Exp $
 
 DISTNAME=      algorithms.doc
 PKGNAME=       tex-${DISTNAME:S/./-/}-0.1
@@ -8,7 +8,5 @@ MAINTAINER=     minskim%NetBSD.org@localhost
 COMMENT=       Documentation for tex-algorithms
 LICENSE=       gnu-lgpl-v2
 
-CONFLICTS+=    teTeX-texmf<=3.0nb19
-
 .include "../../print/texlive/package.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/print/tex-amscls/Makefile
diff -u pkgsrc/print/tex-amscls/Makefile:1.8 pkgsrc/print/tex-amscls/Makefile:1.9
--- pkgsrc/print/tex-amscls/Makefile:1.8        Sun Jun 14 12:50:01 2015
+++ pkgsrc/print/tex-amscls/Makefile    Wed Sep  6 16:49:30 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2015/06/14 12:50:01 markd Exp $
+# $NetBSD: Makefile,v 1.9 2017/09/06 16:49:30 wiz Exp $
 
 DISTNAME=      amscls
 PKGNAME=       tex-${DISTNAME}-2015
@@ -9,7 +9,6 @@ HOMEPAGE=       http://ctan.org/pkg/amscls
 COMMENT=       AMS document classes for LaTeX
 LICENSE=       lppl-1.3c
 
-CONFLICTS+=    teTeX-texmf<=3.0nb18
 DEPENDS+=      tex-amsmath-[0-9]*:../../print/tex-amsmath
 DEPENDS+=      tex-amsfonts-[0-9]*:../../fonts/tex-amsfonts
 DEPENDS+=      tex-latex-[0-9]*:../../print/tex-latex

Index: pkgsrc/print/tex-amscls-doc/Makefile
diff -u pkgsrc/print/tex-amscls-doc/Makefile:1.6 pkgsrc/print/tex-amscls-doc/Makefile:1.7
--- pkgsrc/print/tex-amscls-doc/Makefile:1.6    Sun Jun 14 12:50:01 2015
+++ pkgsrc/print/tex-amscls-doc/Makefile        Wed Sep  6 16:49:30 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2015/06/14 12:50:01 markd Exp $
+# $NetBSD: Makefile,v 1.7 2017/09/06 16:49:30 wiz Exp $
 
 DISTNAME=      amscls.doc
 PKGNAME=       tex-${DISTNAME:S/./-/}-2015
@@ -8,7 +8,5 @@ MAINTAINER=     minskim%NetBSD.org@localhost
 COMMENT=       Documentation for tex-amscls
 LICENSE=       lppl-1.3c
 
-CONFLICTS+=    teTeX-texmf<=3.0nb18
-
 .include "../../print/texlive/package.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/print/tex-amsmath/Makefile
diff -u pkgsrc/print/tex-amsmath/Makefile:1.10 pkgsrc/print/tex-amsmath/Makefile:1.11
--- pkgsrc/print/tex-amsmath/Makefile:1.10      Tue Jun 20 20:56:52 2017
+++ pkgsrc/print/tex-amsmath/Makefile   Wed Sep  6 16:49:30 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2017/06/20 20:56:52 markd Exp $
+# $NetBSD: Makefile,v 1.11 2017/09/06 16:49:30 wiz Exp $
 
 DISTNAME=      amsmath
 PKGNAME=       tex-${DISTNAME}-2.16a
@@ -9,7 +9,6 @@ HOMEPAGE=       http://ctan.org/pkg/latex-amsm
 COMMENT=       AMS mathematical facilities for LaTeX
 LICENSE=       lppl-1.3c
 
-CONFLICTS+=    teTeX-texmf<=3.0nb13
 DEPENDS+=      tex-latex-bin-[0-9]*:../../print/tex-latex-bin
 
 .include "../../print/texlive/package.mk"

Index: pkgsrc/print/tex-amsmath-doc/Makefile
diff -u pkgsrc/print/tex-amsmath-doc/Makefile:1.9 pkgsrc/print/tex-amsmath-doc/Makefile:1.10
--- pkgsrc/print/tex-amsmath-doc/Makefile:1.9   Tue Jun 20 20:56:52 2017
+++ pkgsrc/print/tex-amsmath-doc/Makefile       Wed Sep  6 16:49:30 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2017/06/20 20:56:52 markd Exp $
+# $NetBSD: Makefile,v 1.10 2017/09/06 16:49:30 wiz Exp $
 
 DISTNAME=      amsmath.doc
 PKGNAME=       tex-${DISTNAME:S/./-/}-2.16a
@@ -9,7 +9,5 @@ HOMEPAGE=       http://ctan.org/pkg/latex-amsm
 COMMENT=       Documentation for tex-amsmath
 LICENSE=       lppl-1.3c
 
-CONFLICTS+=    teTeX-texmf<=3.0nb13
-
 .include "../../print/texlive/package.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/print/tex-anysize/Makefile
diff -u pkgsrc/print/tex-anysize/Makefile:1.2 pkgsrc/print/tex-anysize/Makefile:1.3
--- pkgsrc/print/tex-anysize/Makefile:1.2       Sat Jan 30 03:26:07 2016
+++ pkgsrc/print/tex-anysize/Makefile   Wed Sep  6 16:49:30 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2016/01/30 03:26:07 markd Exp $
+# $NetBSD: Makefile,v 1.3 2017/09/06 16:49:30 wiz Exp $
 
 DISTNAME=      anysize
 PKGNAME=       tex-${DISTNAME}-15878
@@ -8,7 +8,5 @@ MAINTAINER=     pkgsrc-users%NetBSD.org@localhost
 COMMENT=       A simple package to set up document margins
 LICENSE=       public-domain
 
-CONFLICTS+=    teTeX-texmf<=3.0nb42
-
 .include "../../print/texlive/package.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/print/tex-appendix/Makefile
diff -u pkgsrc/print/tex-appendix/Makefile:1.2 pkgsrc/print/tex-appendix/Makefile:1.3
--- pkgsrc/print/tex-appendix/Makefile:1.2      Sat Jan 30 03:26:07 2016
+++ pkgsrc/print/tex-appendix/Makefile  Wed Sep  6 16:49:30 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2016/01/30 03:26:07 markd Exp $
+# $NetBSD: Makefile,v 1.3 2017/09/06 16:49:30 wiz Exp $
 
 DISTNAME=      appendix
 PKGNAME=       tex-${DISTNAME}-1.2b
@@ -8,7 +8,5 @@ MAINTAINER=     pkgsrc-users%NetBSD.org@localhost
 COMMENT=       Extra control of appendices
 LICENSE=       lppl-1.3c
 
-CONFLICTS+=    teTeX-texmf<=3.0nb42
-
 .include "../../print/texlive/package.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/print/tex-babel/Makefile
diff -u pkgsrc/print/tex-babel/Makefile:1.7 pkgsrc/print/tex-babel/Makefile:1.8
--- pkgsrc/print/tex-babel/Makefile:1.7 Thu Aug 17 03:05:36 2017
+++ pkgsrc/print/tex-babel/Makefile     Wed Sep  6 16:49:30 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2017/08/17 03:05:36 markd Exp $
+# $NetBSD: Makefile,v 1.8 2017/09/06 16:49:30 wiz Exp $
 
 DISTNAME=      babel
 PKGNAME=       tex-${DISTNAME}-3.12
@@ -9,7 +9,6 @@ HOMEPAGE=       http://ctan.org/pkg/babel
 COMMENT=       Multilingual support for Plain TeX or LaTeX
 LICENSE=       lppl-1.3c
 
-CONFLICTS+=    teTeX-texmf<=3.0nb13
 DEPENDS+=      tex-carlisle>=2010:../../print/tex-carlisle
 DEPENDS+=      tex-graphics>=1.0onb1:../../print/tex-graphics
 DEPENDS+=      tex-latex>=2009:../../print/tex-latex

Index: pkgsrc/print/tex-babel-doc/Makefile
diff -u pkgsrc/print/tex-babel-doc/Makefile:1.8 pkgsrc/print/tex-babel-doc/Makefile:1.9
--- pkgsrc/print/tex-babel-doc/Makefile:1.8     Thu Aug 17 03:05:36 2017
+++ pkgsrc/print/tex-babel-doc/Makefile Wed Sep  6 16:49:30 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2017/08/17 03:05:36 markd Exp $
+# $NetBSD: Makefile,v 1.9 2017/09/06 16:49:30 wiz Exp $
 
 DISTNAME=      babel.doc
 PKGNAME=       tex-${DISTNAME:S/./-/}-3.12
@@ -9,7 +9,5 @@ HOMEPAGE=       http://ctan.org/pkg/babel
 COMMENT=       Documentation for tex-babel
 LICENSE=       lppl-1.3c
 
-CONFLICTS+=    teTeX-texmf<=3.0nb13
-
 .include "../../print/texlive/package.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/print/tex-beamer/Makefile
diff -u pkgsrc/print/tex-beamer/Makefile:1.6 pkgsrc/print/tex-beamer/Makefile:1.7
--- pkgsrc/print/tex-beamer/Makefile:1.6        Wed Aug 23 23:34:54 2017
+++ pkgsrc/print/tex-beamer/Makefile    Wed Sep  6 16:49:30 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2017/08/23 23:34:54 markd Exp $
+# $NetBSD: Makefile,v 1.7 2017/09/06 16:49:30 wiz Exp $
 
 DISTNAME=      beamer
 PKGNAME=       tex-${DISTNAME}-3.42
@@ -9,7 +9,6 @@ HOMEPAGE=       http://ctan.org/pkg/beamer
 COMMENT=       LaTeX class for producing presentations and slides
 LICENSE=       lppl-1.3c OR gnu-gpl-v2
 
-CONFLICTS+=    teTeX-texmf<=3.0nb22
 DEPENDS+=      tex-pgf-[0-9]*:../../print/tex-pgf
 DEPENDS+=      tex-xcolor-[0-9]*:../../print/tex-xcolor
 

Index: pkgsrc/print/tex-beton/Makefile
diff -u pkgsrc/print/tex-beton/Makefile:1.2 pkgsrc/print/tex-beton/Makefile:1.3
--- pkgsrc/print/tex-beton/Makefile:1.2 Sat Jan 30 03:26:08 2016
+++ pkgsrc/print/tex-beton/Makefile     Wed Sep  6 16:49:30 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2016/01/30 03:26:08 markd Exp $
+# $NetBSD: Makefile,v 1.3 2017/09/06 16:49:30 wiz Exp $
 
 DISTNAME=      beton
 PKGNAME=       tex-${DISTNAME}-2010
@@ -8,7 +8,6 @@ MAINTAINER=     minskim%NetBSD.org@localhost
 COMMENT=       Use Concrete fonts
 LICENSE=       lppl-1.3c
 
-CONFLICTS+=    teTeX-texmf<3.0nb29
 DEPENDS+=      tex-latex-bin>=2010:../../print/tex-latex-bin
 
 .include "../../print/texlive/package.mk"

Index: pkgsrc/print/tex-bezos/Makefile
diff -u pkgsrc/print/tex-bezos/Makefile:1.3 pkgsrc/print/tex-bezos/Makefile:1.4
--- pkgsrc/print/tex-bezos/Makefile:1.3 Sat Jan 30 03:26:08 2016
+++ pkgsrc/print/tex-bezos/Makefile     Wed Sep  6 16:49:31 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2016/01/30 03:26:08 markd Exp $
+# $NetBSD: Makefile,v 1.4 2017/09/06 16:49:31 wiz Exp $
 
 DISTNAME=      bezos
 PKGNAME=       tex-${DISTNAME}-25507
@@ -8,7 +8,6 @@ MAINTAINER=     minskim%NetBSD.org@localhost
 COMMENT=       Packages by Javier Bezos
 LICENSE=       lppl-1.3c
 
-CONFLICTS=     teTeX-texmf<=3.0nb29
 DEPENDS+=      tex-graphics-[0-9]*:../../print/tex-graphics
 
 .include "../../print/texlive/package.mk"

Index: pkgsrc/print/tex-bezos-doc/Makefile
diff -u pkgsrc/print/tex-bezos-doc/Makefile:1.3 pkgsrc/print/tex-bezos-doc/Makefile:1.4
--- pkgsrc/print/tex-bezos-doc/Makefile:1.3     Sat Jan 30 03:26:08 2016
+++ pkgsrc/print/tex-bezos-doc/Makefile Wed Sep  6 16:49:31 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2016/01/30 03:26:08 markd Exp $
+# $NetBSD: Makefile,v 1.4 2017/09/06 16:49:31 wiz Exp $
 
 DISTNAME=      bezos.doc
 PKGNAME=       tex-${DISTNAME:S/./-/}-25507
@@ -8,7 +8,5 @@ MAINTAINER=     minskim%NetBSD.org@localhost
 COMMENT=       Documentation for tex-bezos
 LICENSE=       lppl-1.3c
 
-CONFLICTS=     teTeX-texmf<=3.0nb29
-
 .include "../../print/texlive/package.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/print/tex-bibtex/Makefile
diff -u pkgsrc/print/tex-bibtex/Makefile:1.7 pkgsrc/print/tex-bibtex/Makefile:1.8
--- pkgsrc/print/tex-bibtex/Makefile:1.7        Tue May  5 16:33:49 2015
+++ pkgsrc/print/tex-bibtex/Makefile    Wed Sep  6 16:49:31 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2015/05/05 16:33:49 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2017/09/06 16:49:31 wiz Exp $
 
 DISTNAME=      bibtex
 PKGNAME=       tex-${DISTNAME}-0.99d
@@ -10,7 +10,6 @@ HOMEPAGE=     http://ctan.org/pkg/bibtex
 COMMENT=       Reference management software for LaTeX
 #LICENSE=      knuth
 
-CONFLICTS+=    teTeX-texmf<=3.0nb15
 DEPENDS+=      web2c>=2013:../../print/web2c
 DEPENDS+=      tex-kpathsea-[0-9]*:../../print/tex-kpathsea
 

Index: pkgsrc/print/tex-bibtex-doc/Makefile
diff -u pkgsrc/print/tex-bibtex-doc/Makefile:1.8 pkgsrc/print/tex-bibtex-doc/Makefile:1.9
--- pkgsrc/print/tex-bibtex-doc/Makefile:1.8    Tue May  5 16:41:25 2015
+++ pkgsrc/print/tex-bibtex-doc/Makefile        Wed Sep  6 16:49:31 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2015/05/05 16:41:25 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2017/09/06 16:49:31 wiz Exp $
 
 DISTNAME=      bibtex.doc
 PKGNAME=       tex-${DISTNAME:S/./-/}-0.99d
@@ -10,8 +10,6 @@ HOMEPAGE=     http://ctan.org/pkg/bibtex
 COMMENT=       Documentation for tex-bibtex
 #LICENSE=      knuth
 
-CONFLICTS+=    teTeX-texmf<=3.0nb15
-
 TEXLIVE_IGNORE_PATTERNS=       texmf-dist/doc/man
 
 .include "../../print/texlive/package.mk"

Index: pkgsrc/print/tex-bibtopic/Makefile
diff -u pkgsrc/print/tex-bibtopic/Makefile:1.2 pkgsrc/print/tex-bibtopic/Makefile:1.3
--- pkgsrc/print/tex-bibtopic/Makefile:1.2      Sat Jan 30 03:26:08 2016
+++ pkgsrc/print/tex-bibtopic/Makefile  Wed Sep  6 16:49:31 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2016/01/30 03:26:08 markd Exp $
+# $NetBSD: Makefile,v 1.3 2017/09/06 16:49:31 wiz Exp $
 
 DISTNAME=      bibtopic
 PKGNAME=       tex-${DISTNAME}-1.1a
@@ -8,7 +8,6 @@ MAINTAINER=     minskim%NetBSD.org@localhost
 COMMENT=       Include multiple bibliographies in a document
 LICENSE=       gnu-gpl-v2
 
-CONFLICTS=     teTeX-texmf<=3.0nb29
 DEPENDS+=      tex-latex-[0-9]*:../../print/tex-latex
 DEPENDS+=      tex-latex-bin-[0-9]*:../../print/tex-latex-bin
 

Index: pkgsrc/print/tex-bibtopic-doc/Makefile
diff -u pkgsrc/print/tex-bibtopic-doc/Makefile:1.2 pkgsrc/print/tex-bibtopic-doc/Makefile:1.3
--- pkgsrc/print/tex-bibtopic-doc/Makefile:1.2  Sat Jan 30 03:26:08 2016
+++ pkgsrc/print/tex-bibtopic-doc/Makefile      Wed Sep  6 16:49:31 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2016/01/30 03:26:08 markd Exp $
+# $NetBSD: Makefile,v 1.3 2017/09/06 16:49:31 wiz Exp $
 
 DISTNAME=      bibtopic.doc
 PKGNAME=       tex-${DISTNAME:S/./-/}-1.1a
@@ -8,7 +8,5 @@ MAINTAINER=     minskim%NetBSD.org@localhost
 COMMENT=       Documentation for tex-bibtopic
 LICENSE=       gnu-gpl-v2
 
-CONFLICTS=     teTeX-texmf<=3.0nb29
-
 .include "../../print/texlive/package.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/print/tex-bibunits/Makefile
diff -u pkgsrc/print/tex-bibunits/Makefile:1.2 pkgsrc/print/tex-bibunits/Makefile:1.3
--- pkgsrc/print/tex-bibunits/Makefile:1.2      Sat Jan 30 03:26:08 2016
+++ pkgsrc/print/tex-bibunits/Makefile  Wed Sep  6 16:49:31 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2016/01/30 03:26:08 markd Exp $
+# $NetBSD: Makefile,v 1.3 2017/09/06 16:49:31 wiz Exp $
 
 DISTNAME=      bibunits
 PKGNAME=       tex-${DISTNAME}-2.2
@@ -8,7 +8,5 @@ MAINTAINER=     pkgsrc-users%NetBSD.org@localhost
 COMMENT=       Multiple bibliographies in one document
 LICENSE=       lppl-1.3c
 
-CONFLICTS+=    teTeX-texmf<=3.0nb42
-
 .include "../../print/texlive/package.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/print/tex-booktabs/Makefile
diff -u pkgsrc/print/tex-booktabs/Makefile:1.3 pkgsrc/print/tex-booktabs/Makefile:1.4
--- pkgsrc/print/tex-booktabs/Makefile:1.3      Thu Jun 16 04:06:00 2016
+++ pkgsrc/print/tex-booktabs/Makefile  Wed Sep  6 16:49:31 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2016/06/16 04:06:00 markd Exp $
+# $NetBSD: Makefile,v 1.4 2017/09/06 16:49:31 wiz Exp $
 
 DISTNAME=      booktabs
 PKGNAME=       tex-${DISTNAME}-1.618033
@@ -8,7 +8,6 @@ MAINTAINER=     minskim%NetBSD.org@localhost
 COMMENT=       Publication quality tables in LaTeX
 LICENSE=       gnu-gpl-v2
 
-CONFLICTS=     teTeX-texmf<3.0nb33
 DEPENDS+=      tex-latex-bin-[0-9]*:../../print/tex-latex-bin
 
 .include "../../print/texlive/package.mk"

Index: pkgsrc/print/tex-booktabs-doc/Makefile
diff -u pkgsrc/print/tex-booktabs-doc/Makefile:1.3 pkgsrc/print/tex-booktabs-doc/Makefile:1.4
--- pkgsrc/print/tex-booktabs-doc/Makefile:1.3  Thu Jun 16 04:06:01 2016
+++ pkgsrc/print/tex-booktabs-doc/Makefile      Wed Sep  6 16:49:31 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2016/06/16 04:06:01 markd Exp $
+# $NetBSD: Makefile,v 1.4 2017/09/06 16:49:31 wiz Exp $
 
 DISTNAME=      booktabs.doc
 PKGNAME=       tex-${DISTNAME:S/./-/}-1.618033
@@ -8,7 +8,5 @@ MAINTAINER=     minskim%NetBSD.org@localhost
 COMMENT=       Documentation for tex-booktabs
 LICENSE=       gnu-gpl-v2
 
-CONFLICTS=     teTeX-texmf<3.0nb33
-
 .include "../../print/texlive/package.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/print/tex-caption/Makefile
diff -u pkgsrc/print/tex-caption/Makefile:1.5 pkgsrc/print/tex-caption/Makefile:1.6
--- pkgsrc/print/tex-caption/Makefile:1.5       Sun Aug  7 09:09:37 2016
+++ pkgsrc/print/tex-caption/Makefile   Wed Sep  6 16:49:31 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2016/08/07 09:09:37 markd Exp $
+# $NetBSD: Makefile,v 1.6 2017/09/06 16:49:31 wiz Exp $
 
 DISTNAME=      caption
 PKGNAME=       tex-${DISTNAME}-20160522
@@ -9,7 +9,6 @@ HOMEPAGE=       http://ctan.org/pkg/caption
 COMMENT=       Customising captions in floating environments
 LICENSE=       lppl-1.3c
 
-CONFLICTS+=    teTeX-texmf<=3.0nb19
 DEPENDS+=      tex-graphics-[0-9]*:../../print/tex-graphics
 DEPENDS+=      tex-ms-[0-9]*:../../print/tex-ms
 

Index: pkgsrc/print/tex-carlisle/Makefile
diff -u pkgsrc/print/tex-carlisle/Makefile:1.6 pkgsrc/print/tex-carlisle/Makefile:1.7
--- pkgsrc/print/tex-carlisle/Makefile:1.6      Sat Jan 30 03:26:10 2016
+++ pkgsrc/print/tex-carlisle/Makefile  Wed Sep  6 16:49:31 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2016/01/30 03:26:10 markd Exp $
+# $NetBSD: Makefile,v 1.7 2017/09/06 16:49:31 wiz Exp $
 
 DISTNAME=      carlisle
 PKGNAME=       tex-${DISTNAME}-2010
@@ -8,7 +8,6 @@ MAINTAINER=     minskim%NetBSD.org@localhost
 COMMENT=       LaTeX packages created by David Carlisle
 LICENSE=       lppl-1.3c
 
-CONFLICTS+=    teTeX-texmf<=3.0nb13
 DEPENDS+=      tex-latex-bin-[0-9]*:../../print/tex-latex-bin
 DEPENDS+=      tex-cm-[0-9]*:../../fonts/tex-cm
 DEPENDS+=      tex-graphics-[0-9]*:../../print/tex-graphics

Index: pkgsrc/print/tex-carlisle-doc/Makefile
diff -u pkgsrc/print/tex-carlisle-doc/Makefile:1.5 pkgsrc/print/tex-carlisle-doc/Makefile:1.6
--- pkgsrc/print/tex-carlisle-doc/Makefile:1.5  Sat Jan 30 03:26:10 2016
+++ pkgsrc/print/tex-carlisle-doc/Makefile      Wed Sep  6 16:49:31 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2016/01/30 03:26:10 markd Exp $
+# $NetBSD: Makefile,v 1.6 2017/09/06 16:49:31 wiz Exp $
 
 DISTNAME=      carlisle.doc
 PKGNAME=       tex-${DISTNAME:S/./-/}-2010
@@ -8,7 +8,5 @@ MAINTAINER=     minskim%NetBSD.org@localhost
 COMMENT=       Documentation for tex-carlisle
 LICENSE=       lppl-1.3c
 
-CONFLICTS+=    teTeX-texmf<=3.0nb13
-
 .include "../../print/texlive/package.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/print/tex-changebar/Makefile
diff -u pkgsrc/print/tex-changebar/Makefile:1.2 pkgsrc/print/tex-changebar/Makefile:1.3
--- pkgsrc/print/tex-changebar/Makefile:1.2     Sat Jan 30 03:26:10 2016
+++ pkgsrc/print/tex-changebar/Makefile Wed Sep  6 16:49:31 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2016/01/30 03:26:10 markd Exp $
+# $NetBSD: Makefile,v 1.3 2017/09/06 16:49:31 wiz Exp $
 
 DISTNAME=      changebar
 PKGNAME=       tex-${DISTNAME}-3.5c
@@ -8,7 +8,6 @@ MAINTAINER=     minskim%NetBSD.org@localhost
 COMMENT=       Generate changebars in LaTeX documents
 LICENSE=       lppl-1.3c
 
-CONFLICTS+=    teTeX-texmf<=3.0nb28
 DEPENDS+=      tex-graphics-[0-9]*:../../print/tex-graphics
 DEPENDS+=      tex-latex-bin>=2010:../../print/tex-latex-bin
 DEPENDS+=      tex-xcolor-[0-9]*:../../print/tex-xcolor

Index: pkgsrc/print/tex-changebar-doc/Makefile
diff -u pkgsrc/print/tex-changebar-doc/Makefile:1.2 pkgsrc/print/tex-changebar-doc/Makefile:1.3
--- pkgsrc/print/tex-changebar-doc/Makefile:1.2 Sat Jan 30 03:26:10 2016
+++ pkgsrc/print/tex-changebar-doc/Makefile     Wed Sep  6 16:49:32 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2016/01/30 03:26:10 markd Exp $
+# $NetBSD: Makefile,v 1.3 2017/09/06 16:49:32 wiz Exp $
 
 DISTNAME=      changebar.doc
 PKGNAME=       tex-${DISTNAME:S/./-/}-3.5c
@@ -8,7 +8,5 @@ MAINTAINER=     minskim%NetBSD.org@localhost
 COMMENT=       Documentation for tex-changebar
 LICENSE=       lppl-1.3c
 
-CONFLICTS+=    teTeX-texmf<=3.0nb28
-
 .include "../../print/texlive/package.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/print/tex-cite/Makefile
diff -u pkgsrc/print/tex-cite/Makefile:1.4 pkgsrc/print/tex-cite/Makefile:1.5
--- pkgsrc/print/tex-cite/Makefile:1.4  Wed Apr 22 10:24:17 2015
+++ pkgsrc/print/tex-cite/Makefile      Wed Sep  6 16:49:32 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2015/04/22 10:24:17 markd Exp $
+# $NetBSD: Makefile,v 1.5 2017/09/06 16:49:32 wiz Exp $
 
 DISTNAME=      cite
 PKGNAME=       tex-${DISTNAME}-5.5
@@ -7,7 +7,5 @@ TEXLIVE_REV=    36428
 MAINTAINER=    minskim%NetBSD.org@localhost
 COMMENT=       Improved citation handling in LaTeX
 
-CONFLICTS+=    teTeX-texmf<=3.0nb20
-
 .include "../../print/texlive/package.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/print/tex-cmap/Makefile
diff -u pkgsrc/print/tex-cmap/Makefile:1.2 pkgsrc/print/tex-cmap/Makefile:1.3
--- pkgsrc/print/tex-cmap/Makefile:1.2  Tue Apr 28 20:08:34 2015
+++ pkgsrc/print/tex-cmap/Makefile      Wed Sep  6 16:49:32 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2015/04/28 20:08:34 markd Exp $
+# $NetBSD: Makefile,v 1.3 2017/09/06 16:49:32 wiz Exp $
 
 DISTNAME=      cmap
 PKGNAME=       tex-${DISTNAME}-1.0h
@@ -8,7 +8,5 @@ MAINTAINER=     pkgsrc-users%NetBSD.org@localhost
 COMMENT=       Make PDF files searchable and copyable
 LICENSE=       lppl-1.3c
 
-CONFLICTS+=    teTeX-texmf<=3.0nb43
-
 .include "../../print/texlive/package.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/print/tex-comment/Makefile
diff -u pkgsrc/print/tex-comment/Makefile:1.3 pkgsrc/print/tex-comment/Makefile:1.4
--- pkgsrc/print/tex-comment/Makefile:1.3       Tue Jun 20 22:07:24 2017
+++ pkgsrc/print/tex-comment/Makefile   Wed Sep  6 16:49:32 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2017/06/20 22:07:24 markd Exp $
+# $NetBSD: Makefile,v 1.4 2017/09/06 16:49:32 wiz Exp $
 
 DISTNAME=      comment
 PKGNAME=       tex-${DISTNAME}-3.8
@@ -9,7 +9,5 @@ HOMEPAGE=       http://ctan.org/pkg/comment
 COMMENT=       Allows selected environments to be included/excluded
 LICENSE=       gnu-gpl-v2
 
-CONFLICTS+=    teTeX-texmf<=3.0nb38
-
 .include "../../print/texlive/package.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/print/tex-context/Makefile
diff -u pkgsrc/print/tex-context/Makefile:1.13 pkgsrc/print/tex-context/Makefile:1.14
--- pkgsrc/print/tex-context/Makefile:1.13      Tue Jun 20 22:07:25 2017
+++ pkgsrc/print/tex-context/Makefile   Wed Sep  6 16:49:32 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2017/06/20 22:07:25 markd Exp $
+# $NetBSD: Makefile,v 1.14 2017/09/06 16:49:32 wiz Exp $
 
 DISTNAME=      context
 PKGNAME=       tex-${DISTNAME}-2017
@@ -8,7 +8,6 @@ MAINTAINER=     minskim%NetBSD.org@localhost
 HOMEPAGE=      http://ctan.org/pkg/context
 COMMENT=       The ConTeXt macro package
 
-CONFLICTS+=    teTeX-bin<=3.0nb44
 DEPENDS+=      tex-lm>=2.004nb1:../../fonts/tex-lm
 DEPENDS+=      tex-manfnt-font>=2014:../../fonts/tex-manfnt-font
 DEPENDS+=      tex-mflogo-font>=1.002:../../fonts/tex-mflogo-font

Index: pkgsrc/print/tex-context-doc/Makefile
diff -u pkgsrc/print/tex-context-doc/Makefile:1.8 pkgsrc/print/tex-context-doc/Makefile:1.9
--- pkgsrc/print/tex-context-doc/Makefile:1.8   Tue Jun 20 22:07:25 2017
+++ pkgsrc/print/tex-context-doc/Makefile       Wed Sep  6 16:49:32 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2017/06/20 22:07:25 markd Exp $
+# $NetBSD: Makefile,v 1.9 2017/09/06 16:49:32 wiz Exp $
 
 DISTNAME=      context.doc
 PKGNAME=       tex-${DISTNAME:S/./-/}-2017
@@ -8,8 +8,5 @@ MAINTAINER=     minskim%NetBSD.org@localhost
 HOMEPAGE=      http://ctan.org/pkg/context
 COMMENT=       Documentation for tex-context
 
-CONFLICTS+=    teTeX-texmf<=3.0nb29
-CONFLICTS+=    texlive-tetex<=2009
-
 .include "../../print/texlive/package.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/print/tex-crop/Makefile
diff -u pkgsrc/print/tex-crop/Makefile:1.2 pkgsrc/print/tex-crop/Makefile:1.3
--- pkgsrc/print/tex-crop/Makefile:1.2  Tue Apr 28 20:08:34 2015
+++ pkgsrc/print/tex-crop/Makefile      Wed Sep  6 16:49:32 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2015/04/28 20:08:34 markd Exp $
+# $NetBSD: Makefile,v 1.3 2017/09/06 16:49:32 wiz Exp $
 
 DISTNAME=      crop
 PKGNAME=       tex-${DISTNAME}-1.5
@@ -8,7 +8,6 @@ MAINTAINER=     pkgsrc-users%NetBSD.org@localhost
 COMMENT=       Support for cropmarks
 LICENSE=       lppl-1.3c
 
-CONFLICTS+=    teTeX-texmf<=3.0nb43
 DEPENDS+=      tex-graphics-[0-9]*:../../print/tex-graphics
 
 .include "../../print/texlive/package.mk"

Index: pkgsrc/print/tex-currvita/Makefile
diff -u pkgsrc/print/tex-currvita/Makefile:1.1 pkgsrc/print/tex-currvita/Makefile:1.2
--- pkgsrc/print/tex-currvita/Makefile:1.1      Tue Sep 20 12:53:51 2016
+++ pkgsrc/print/tex-currvita/Makefile  Wed Sep  6 16:49:32 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2016/09/20 12:53:51 markd Exp $
+# $NetBSD: Makefile,v 1.2 2017/09/06 16:49:32 wiz Exp $
 
 DISTNAME=      currvita
 PKGNAME=       tex-${DISTNAME}-2016
@@ -9,7 +9,5 @@ HOMEPAGE=       http://ctan.org/pkg/currvita
 COMMENT=       Typeset a curriculum vitae
 LICENSE=       gnu-gpl-v2
 
-CONFLICTS+=    teTeX-texmf<=3.0nb56
-
 .include "../../print/texlive/package.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/print/tex-cyrillic/Makefile
diff -u pkgsrc/print/tex-cyrillic/Makefile:1.5 pkgsrc/print/tex-cyrillic/Makefile:1.6
--- pkgsrc/print/tex-cyrillic/Makefile:1.5      Sun Jun 14 12:50:02 2015
+++ pkgsrc/print/tex-cyrillic/Makefile  Wed Sep  6 16:49:32 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2015/06/14 12:50:02 markd Exp $
+# $NetBSD: Makefile,v 1.6 2017/09/06 16:49:32 wiz Exp $
 
 DISTNAME=      cyrillic
 PKGNAME=       tex-${DISTNAME}-2015
@@ -9,7 +9,5 @@ HOMEPAGE=       http://ctan.org/pkg/cyrillic
 COMMENT=       Support for Cyrillic fonts in LaTeX
 LICENSE=       lppl-1.3c
 
-CONFLICTS+=    teTeX-texmf<=3.0nb24
-
 .include "../../print/texlive/package.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/print/tex-cyrillic-doc/Makefile
diff -u pkgsrc/print/tex-cyrillic-doc/Makefile:1.5 pkgsrc/print/tex-cyrillic-doc/Makefile:1.6
--- pkgsrc/print/tex-cyrillic-doc/Makefile:1.5  Sun Jun 14 12:50:02 2015
+++ pkgsrc/print/tex-cyrillic-doc/Makefile      Wed Sep  6 16:49:32 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2015/06/14 12:50:02 markd Exp $
+# $NetBSD: Makefile,v 1.6 2017/09/06 16:49:32 wiz Exp $
 
 DISTNAME=      cyrillic.doc
 PKGNAME=       tex-${DISTNAME:S/./-/}-2015
@@ -9,7 +9,5 @@ HOMEPAGE=       http://ctan.org/pkg/cyrillic
 COMMENT=       Documentation for tex-cyrillic
 LICENSE=       lppl-1.3c
 
-CONFLICTS+=    teTeX-texmf<=3.0nb24
-
 .include "../../print/texlive/package.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/print/tex-dehyph-exptl/Makefile
diff -u pkgsrc/print/tex-dehyph-exptl/Makefile:1.8 pkgsrc/print/tex-dehyph-exptl/Makefile:1.9
--- pkgsrc/print/tex-dehyph-exptl/Makefile:1.8  Wed Jun 21 06:13:14 2017
+++ pkgsrc/print/tex-dehyph-exptl/Makefile      Wed Sep  6 16:49:32 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2017/06/21 06:13:14 markd Exp $
+# $NetBSD: Makefile,v 1.9 2017/09/06 16:49:32 wiz Exp $
 
 DISTNAME=      dehyph-exptl
 PKGNAME=       tex-${DISTNAME}-0.41
@@ -9,8 +9,6 @@ HOMEPAGE=       http://ctan.org/pkg/dehyph-exp
 COMMENT=       Experimental hyphenation patterns for the German language
 LICENSE=       lppl-1.3c
 
-CONFLICTS+=    teTeX-texmf<=3.0nb12
-
 TEX_HYPHEN_DAT+=       german-x-2017-03-31 dehypht-x-2017-03-31.tex
 TEX_HYPHEN_DAT+=       = german-x-latest
 TEX_HYPHEN_DAT+=       ngerman-x-2017-03-31 dehyphn-x-2017-03-31.tex

Index: pkgsrc/print/tex-dk-bib/Makefile
diff -u pkgsrc/print/tex-dk-bib/Makefile:1.1 pkgsrc/print/tex-dk-bib/Makefile:1.2
--- pkgsrc/print/tex-dk-bib/Makefile:1.1        Sun May  3 10:25:09 2015
+++ pkgsrc/print/tex-dk-bib/Makefile    Wed Sep  6 16:49:32 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2015/05/03 10:25:09 markd Exp $
+# $NetBSD: Makefile,v 1.2 2017/09/06 16:49:32 wiz Exp $
 
 DISTNAME=      dk-bib
 PKGNAME=       tex-${DISTNAME}-0.6
@@ -8,7 +8,5 @@ MAINTAINER=     pkgsrc-users%NetBSD.org@localhost
 COMMENT=       Danish variants of standard BibTeX styles
 # LICENSE=     other-free
 
-CONFLICTS+=    teTeX-texmf<=3.0nb47
-
 .include "../../print/texlive/package.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/print/tex-dvips/Makefile
diff -u pkgsrc/print/tex-dvips/Makefile:1.21 pkgsrc/print/tex-dvips/Makefile:1.22
--- pkgsrc/print/tex-dvips/Makefile:1.21        Wed Jun 21 06:13:14 2017
+++ pkgsrc/print/tex-dvips/Makefile     Wed Sep  6 16:49:33 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2017/06/21 06:13:14 markd Exp $
+# $NetBSD: Makefile,v 1.22 2017/09/06 16:49:33 wiz Exp $
 
 DISTNAME=      dvips
 PKGNAME=       tex-${DISTNAME}-2017
@@ -9,7 +9,6 @@ HOMEPAGE=       http://ctan.org/pkg/dvips
 COMMENT=       Files for a DVI to PostScript driver
 LICENSE=       gnu-gpl-v2
 
-CONFLICTS+=    teTeX-texmf<=3.0nb15
 CONFLICTS+=    tex-bin-dvipsk<=2008.12898
 
 TEXLIVE_IGNORE_PATTERNS=       texmf-dist/dvips/base

Index: pkgsrc/print/tex-eijkhout/Makefile
diff -u pkgsrc/print/tex-eijkhout/Makefile:1.1 pkgsrc/print/tex-eijkhout/Makefile:1.2
--- pkgsrc/print/tex-eijkhout/Makefile:1.1      Tue Sep 20 12:44:27 2016
+++ pkgsrc/print/tex-eijkhout/Makefile  Wed Sep  6 16:49:33 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2016/09/20 12:44:27 markd Exp $
+# $NetBSD: Makefile,v 1.2 2017/09/06 16:49:33 wiz Exp $
 
 DISTNAME=      eijkhout
 PKGNAME=       tex-${DISTNAME}-2016
@@ -9,7 +9,5 @@ HOMEPAGE=       http://ctan.org/pkg/eijkhout
 COMMENT=       Victor Eijkhout's packages
 LICENSE=       gnu-gpl-v2
 
-CONFLICTS+=    teTeX-texmf<=3.0nb56
-
 .include "../../print/texlive/package.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/print/tex-enctex/Makefile
diff -u pkgsrc/print/tex-enctex/Makefile:1.6 pkgsrc/print/tex-enctex/Makefile:1.7
--- pkgsrc/print/tex-enctex/Makefile:1.6        Tue May  5 17:01:08 2015
+++ pkgsrc/print/tex-enctex/Makefile    Wed Sep  6 16:49:33 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2015/05/05 17:01:08 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2017/09/06 16:49:33 wiz Exp $
 
 DISTNAME=      enctex
 PKGNAME=       tex-${DISTNAME}-2014
@@ -9,7 +9,5 @@ HOMEPAGE=       http://ctan.org/pkg/enctex
 COMMENT=       TeX extension for flexible input/output reencoding
 LICENSE=       gnu-gpl-v2
 
-CONFLICTS+=    teTeX-texmf<=3.0nb15
-
 .include "../../print/texlive/package.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/print/tex-enctex-doc/Makefile
diff -u pkgsrc/print/tex-enctex-doc/Makefile:1.6 pkgsrc/print/tex-enctex-doc/Makefile:1.7
--- pkgsrc/print/tex-enctex-doc/Makefile:1.6    Tue May  5 17:02:21 2015
+++ pkgsrc/print/tex-enctex-doc/Makefile        Wed Sep  6 16:49:33 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2015/05/05 17:02:21 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2017/09/06 16:49:33 wiz Exp $
 
 DISTNAME=      enctex.doc
 PKGNAME=       tex-${DISTNAME:S/./-/}-2014
@@ -9,7 +9,5 @@ HOMEPAGE=       http://ctan.org/pkg/enctex
 COMMENT=       Documentation for tex-enctex
 LICENSE=       gnu-gpl-v2
 
-CONFLICTS+=    teTeX-texmf<=3.0nb15
-
 .include "../../print/texlive/package.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/print/tex-endfloat/Makefile
diff -u pkgsrc/print/tex-endfloat/Makefile:1.2 pkgsrc/print/tex-endfloat/Makefile:1.3
--- pkgsrc/print/tex-endfloat/Makefile:1.2      Wed Apr 22 22:13:28 2015
+++ pkgsrc/print/tex-endfloat/Makefile  Wed Sep  6 16:49:33 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2015/04/22 22:13:28 markd Exp $
+# $NetBSD: Makefile,v 1.3 2017/09/06 16:49:33 wiz Exp $
 
 DISTNAME=      endfloat
 PKGNAME=       tex-${DISTNAME}-2.5d
@@ -8,7 +8,6 @@ MAINTAINER=     minskim%NetBSD.org@localhost
 COMMENT=       Move floats to the end with markers where they belong
 LICENSE=       gnu-gpl-v2
 
-CONFLICTS+=    teTeX-texmf<=3.0nb27
 DEPENDS+=      tex-latex-bin-[0-9]*:../../print/tex-latex-bin
 
 .include "../../print/texlive/package.mk"

Index: pkgsrc/print/tex-enumitem/Makefile
diff -u pkgsrc/print/tex-enumitem/Makefile:1.5 pkgsrc/print/tex-enumitem/Makefile:1.6
--- pkgsrc/print/tex-enumitem/Makefile:1.5      Wed Jan 27 10:53:21 2016
+++ pkgsrc/print/tex-enumitem/Makefile  Wed Sep  6 16:49:33 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2016/01/27 10:53:21 markd Exp $
+# $NetBSD: Makefile,v 1.6 2017/09/06 16:49:33 wiz Exp $
 
 DISTNAME=      enumitem
 PKGNAME=       tex-${DISTNAME}-3.5.2
@@ -8,7 +8,6 @@ MAINTAINER=     minskim%NetBSD.org@localhost
 COMMENT=       Control layout of itemize, enumerate, and description
 LICENSE=       lppl-1.3c
 
-CONFLICTS+=    teTeX-texmf<=3.0nb17
 DEPENDS+=      tex-graphics>=1.0onb1:../../print/tex-graphics
 
 .include "../../print/texlive/package.mk"

Index: pkgsrc/print/tex-enumitem-doc/Makefile
diff -u pkgsrc/print/tex-enumitem-doc/Makefile:1.5 pkgsrc/print/tex-enumitem-doc/Makefile:1.6
--- pkgsrc/print/tex-enumitem-doc/Makefile:1.5  Wed Jan 27 10:53:21 2016
+++ pkgsrc/print/tex-enumitem-doc/Makefile      Wed Sep  6 16:49:33 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2016/01/27 10:53:21 markd Exp $
+# $NetBSD: Makefile,v 1.6 2017/09/06 16:49:33 wiz Exp $
 
 DISTNAME=      enumitem.doc
 PKGNAME=       tex-${DISTNAME:S/./-/}-3.5.2
@@ -8,7 +8,5 @@ MAINTAINER=     minskim%NetBSD.org@localhost
 COMMENT=       Documentation for tex-enumitem
 LICENSE=       lppl-1.3c
 
-CONFLICTS+=    teTeX-texmf<=3.0nb17
-
 .include "../../print/texlive/package.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/print/tex-eplain/Makefile
diff -u pkgsrc/print/tex-eplain/Makefile:1.3 pkgsrc/print/tex-eplain/Makefile:1.4
--- pkgsrc/print/tex-eplain/Makefile:1.3        Thu Jun 16 04:06:03 2016
+++ pkgsrc/print/tex-eplain/Makefile    Wed Sep  6 16:49:33 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2016/06/16 04:06:03 markd Exp $
+# $NetBSD: Makefile,v 1.4 2017/09/06 16:49:33 wiz Exp $
 
 DISTNAME=      eplain
 PKGNAME=       tex-${DISTNAME}-3.8
@@ -9,7 +9,6 @@ HOMEPAGE=       http://ctan.org/pkg/eplain
 COMMENT=       Extended plain TeX macros
 LICENSE=       gnu-gpl-v2
 
-CONFLICTS+=    teTeX-texmf<=3.0nb55
 DEPENDS+=      tex-knuth-lib-[0-9]*:../../fonts/tex-knuth-lib
 DEPENDS+=      tex-babel-[0-9]*:../../print/tex-babel
 DEPENDS+=      tex-pdftex-[0-9]*:../../print/tex-pdftex

Index: pkgsrc/print/tex-epsf/Makefile
diff -u pkgsrc/print/tex-epsf/Makefile:1.3 pkgsrc/print/tex-epsf/Makefile:1.4
--- pkgsrc/print/tex-epsf/Makefile:1.3  Wed Jan 27 10:53:21 2016
+++ pkgsrc/print/tex-epsf/Makefile      Wed Sep  6 16:49:33 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2016/01/27 10:53:21 markd Exp $
+# $NetBSD: Makefile,v 1.4 2017/09/06 16:49:33 wiz Exp $
 
 DISTNAME=      epsf
 PKGNAME=       tex-${DISTNAME}-2.7.4
@@ -8,7 +8,5 @@ MAINTAINER=     minskim%NetBSD.org@localhost
 COMMENT=       Simple macros for EPS inclusion
 LICENSE=       public-domain
 
-CONFLICTS+=    teTeX-texmf<=3.0nb25
-
 .include "../../print/texlive/package.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/print/tex-epsf-doc/Makefile
diff -u pkgsrc/print/tex-epsf-doc/Makefile:1.3 pkgsrc/print/tex-epsf-doc/Makefile:1.4
--- pkgsrc/print/tex-epsf-doc/Makefile:1.3      Wed Jan 27 10:53:21 2016
+++ pkgsrc/print/tex-epsf-doc/Makefile  Wed Sep  6 16:49:33 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2016/01/27 10:53:21 markd Exp $
+# $NetBSD: Makefile,v 1.4 2017/09/06 16:49:33 wiz Exp $
 
 DISTNAME=      epsf.doc
 PKGNAME=       tex-${DISTNAME:S/./-/}-2.7.4
@@ -8,7 +8,5 @@ MAINTAINER=     minskim%NetBSD.org@localhost
 COMMENT=       Documentation for tex-epsf
 LICENSE=       public-domain
 
-CONFLICTS+=    teTeX-texmf<=3.0nb25
-
 .include "../../print/texlive/package.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/print/tex-eso-pic/Makefile
diff -u pkgsrc/print/tex-eso-pic/Makefile:1.5 pkgsrc/print/tex-eso-pic/Makefile:1.6
--- pkgsrc/print/tex-eso-pic/Makefile:1.5       Sun Aug  2 12:09:44 2015
+++ pkgsrc/print/tex-eso-pic/Makefile   Wed Sep  6 16:49:33 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2015/08/02 12:09:44 markd Exp $
+# $NetBSD: Makefile,v 1.6 2017/09/06 16:49:33 wiz Exp $
 
 DISTNAME=      eso-pic
 PKGNAME=       tex-${DISTNAME}-2.0g
@@ -9,7 +9,6 @@ HOMEPAGE=       http://ctan.org/pkg/eso-pic
 COMMENT=       Add picture commands (or backgrounds) to every page
 LICENSE=       lppl-1.2
 
-CONFLICTS=     teTeX-texmf<=3.0nb29
 DEPENDS+=      tex-graphics-[0-9]*:../../print/tex-graphics
 DEPENDS+=      tex-latex-bin-[0-9]*:../../print/tex-latex-bin
 DEPENDS+=      tex-oberdiek-[0-9]*:../../print/tex-oberdiek

Index: pkgsrc/print/tex-eso-pic-doc/Makefile
diff -u pkgsrc/print/tex-eso-pic-doc/Makefile:1.5 pkgsrc/print/tex-eso-pic-doc/Makefile:1.6
--- pkgsrc/print/tex-eso-pic-doc/Makefile:1.5   Sun Aug  2 12:09:44 2015
+++ pkgsrc/print/tex-eso-pic-doc/Makefile       Wed Sep  6 16:49:33 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2015/08/02 12:09:44 markd Exp $
+# $NetBSD: Makefile,v 1.6 2017/09/06 16:49:33 wiz Exp $
 
 DISTNAME=      eso-pic.doc
 PKGNAME=       tex-${DISTNAME:S/./-/}-2.0g
@@ -9,7 +9,5 @@ HOMEPAGE=       http://ctan.org/pkg/eso-pic
 COMMENT=       Documentation for tex-eso-pic
 LICENSE=       lppl-1.2
 
-CONFLICTS=     teTeX-texmf<=3.0nb29
-
 .include "../../print/texlive/package.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/print/tex-etex/Makefile
diff -u pkgsrc/print/tex-etex/Makefile:1.7 pkgsrc/print/tex-etex/Makefile:1.8
--- pkgsrc/print/tex-etex/Makefile:1.7  Tue May  5 17:05:03 2015
+++ pkgsrc/print/tex-etex/Makefile      Wed Sep  6 16:49:34 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2015/05/05 17:05:03 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2017/09/06 16:49:34 wiz Exp $
 
 DISTNAME=      etex
 PKGNAME=       tex-${DISTNAME}-2.1.31600
@@ -9,7 +9,6 @@ HOMEPAGE=       http://ctan.org/pkg/etex
 COMMENT=       TeX implementation filling the gap between TeX3 and NTS
 #LICENSE=      knuth
 
-CONFLICTS+=    teTeX-texmf<=3.0nb11
 DEPENDS+=      tex-plain-[0-9]*:../../print/tex-plain
 
 .include "../../print/texlive/package.mk"

Index: pkgsrc/print/tex-etex-pkg/Makefile
diff -u pkgsrc/print/tex-etex-pkg/Makefile:1.8 pkgsrc/print/tex-etex-pkg/Makefile:1.9
--- pkgsrc/print/tex-etex-pkg/Makefile:1.8      Sun Aug  7 09:09:38 2016
+++ pkgsrc/print/tex-etex-pkg/Makefile  Wed Sep  6 16:49:34 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2016/08/07 09:09:38 markd Exp $
+# $NetBSD: Makefile,v 1.9 2017/09/06 16:49:34 wiz Exp $
 
 DISTNAME=      etex-pkg
 PKGNAME=       tex-${DISTNAME}-2.7
@@ -9,7 +9,6 @@ HOMEPAGE=       http://ctan.org/pkg/etex-pkg
 COMMENT=       E-TeX support package
 LICENSE=       lppl-1.3c
 
-CONFLICTS+=    teTeX-texmf<=3.0nb13
 DEPENDS+=      tex-pdftex-[0-9]*:../../print/tex-pdftex
 
 .include "../../print/texlive/package.mk"

Index: pkgsrc/print/tex-euler/Makefile
diff -u pkgsrc/print/tex-euler/Makefile:1.2 pkgsrc/print/tex-euler/Makefile:1.3
--- pkgsrc/print/tex-euler/Makefile:1.2 Wed Jan 27 10:53:21 2016
+++ pkgsrc/print/tex-euler/Makefile     Wed Sep  6 16:49:34 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2016/01/27 10:53:21 markd Exp $
+# $NetBSD: Makefile,v 1.3 2017/09/06 16:49:34 wiz Exp $
 
 DISTNAME=      euler
 PKGNAME=       tex-${DISTNAME}-2.5
@@ -8,7 +8,6 @@ MAINTAINER=     minskim%NetBSD.org@localhost
 COMMENT=       Use AMS Euler fonts for math
 LICENSE=       lppl-1.3c
 
-CONFLICTS+=    teTeX-texmf<3.0nb29
 DEPENDS+=      tex-latex-bin>=2010:../../print/tex-latex-bin
 
 .include "../../print/texlive/package.mk"

Index: pkgsrc/print/tex-exam/Makefile
diff -u pkgsrc/print/tex-exam/Makefile:1.6 pkgsrc/print/tex-exam/Makefile:1.7
--- pkgsrc/print/tex-exam/Makefile:1.6  Sun Jun 14 12:50:02 2015
+++ pkgsrc/print/tex-exam/Makefile      Wed Sep  6 16:49:34 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2015/06/14 12:50:02 markd Exp $
+# $NetBSD: Makefile,v 1.7 2017/09/06 16:49:34 wiz Exp $
 
 DISTNAME=      exam
 PKGNAME=       tex-${DISTNAME}-2.5
@@ -9,7 +9,6 @@ HOMEPAGE=       http://ctan.org/pkg/exam
 COMMENT=       Package for typesetting exam scripts
 LICENSE=       lppl-1.3c
 
-CONFLICTS+=    teTeX-texmf<=3.0nb13
 DEPENDS+=      tex-latex-bin-[0-9]*:../../print/tex-latex-bin
 DEPENDS+=      tex-latex-[0-9]*:../../print/tex-latex
 

Index: pkgsrc/print/tex-fancybox/Makefile
diff -u pkgsrc/print/tex-fancybox/Makefile:1.2 pkgsrc/print/tex-fancybox/Makefile:1.3
--- pkgsrc/print/tex-fancybox/Makefile:1.2      Wed Jan 27 10:42:25 2016
+++ pkgsrc/print/tex-fancybox/Makefile  Wed Sep  6 16:49:34 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2016/01/27 10:42:25 markd Exp $
+# $NetBSD: Makefile,v 1.3 2017/09/06 16:49:34 wiz Exp $
 
 DISTNAME=      fancybox
 PKGNAME=       tex-${DISTNAME}-1.4
@@ -8,7 +8,5 @@ MAINTAINER=     nico%orgrim.net@localhost
 COMMENT=       Variants of \fbox and other games with boxes
 LICENSE=       lppl-1.2
 
-CONFLICTS+=    teTeX-texmf<=3.0nb27
-
 .include "../../print/texlive/package.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/print/tex-fancybox-doc/Makefile
diff -u pkgsrc/print/tex-fancybox-doc/Makefile:1.2 pkgsrc/print/tex-fancybox-doc/Makefile:1.3
--- pkgsrc/print/tex-fancybox-doc/Makefile:1.2  Wed Jan 27 10:42:25 2016
+++ pkgsrc/print/tex-fancybox-doc/Makefile      Wed Sep  6 16:49:34 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2016/01/27 10:42:25 markd Exp $
+# $NetBSD: Makefile,v 1.3 2017/09/06 16:49:34 wiz Exp $
 
 DISTNAME=      fancybox.doc
 PKGNAME=       tex-${DISTNAME:S/./-/}-1.4
@@ -8,7 +8,5 @@ MAINTAINER=     nico%orgrim.net@localhost
 COMMENT=       Documentation for tex-fancybox
 LICENSE=       lppl-1.2
 
-CONFLICTS+=    teTeX-texmf<=3.0nb27
-
 .include "../../print/texlive/package.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/print/tex-fancyhdr/Makefile
diff -u pkgsrc/print/tex-fancyhdr/Makefile:1.7 pkgsrc/print/tex-fancyhdr/Makefile:1.8
--- pkgsrc/print/tex-fancyhdr/Makefile:1.7      Thu Aug 17 03:14:22 2017
+++ pkgsrc/print/tex-fancyhdr/Makefile  Wed Sep  6 16:49:34 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2017/08/17 03:14:22 markd Exp $
+# $NetBSD: Makefile,v 1.8 2017/09/06 16:49:34 wiz Exp $
 
 DISTNAME=      fancyhdr
 PKGNAME=       tex-${DISTNAME}-3.9a
@@ -9,7 +9,6 @@ HOMEPAGE=       http://ctan.org/pkg/fancyhdr
 COMMENT=       Extensive control of page headers and footers in LaTeX2e
 LICENSE=       lppl-1.3c
 
-CONFLICTS+=    teTeX-texmf<=3.0nb13
 DEPENDS+=      tex-latex-bin-[0-9]*:../../print/tex-latex-bin
 
 .include "../../print/texlive/package.mk"

Index: pkgsrc/print/tex-fancyhdr-doc/Makefile
diff -u pkgsrc/print/tex-fancyhdr-doc/Makefile:1.6 pkgsrc/print/tex-fancyhdr-doc/Makefile:1.7
--- pkgsrc/print/tex-fancyhdr-doc/Makefile:1.6  Thu Aug 17 03:14:22 2017
+++ pkgsrc/print/tex-fancyhdr-doc/Makefile      Wed Sep  6 16:49:34 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2017/08/17 03:14:22 markd Exp $
+# $NetBSD: Makefile,v 1.7 2017/09/06 16:49:34 wiz Exp $
 
 DISTNAME=      fancyhdr.doc
 PKGNAME=       tex-${DISTNAME:S/./-/}-3.9a
@@ -9,7 +9,5 @@ HOMEPAGE=       http://ctan.org/pkg/fancyhdr
 COMMENT=       Documentation for tex-fancyhdr
 LICENSE=       lppl-1.3c
 
-CONFLICTS+=    teTeX-texmf<=3.0nb13
-
 .include "../../print/texlive/package.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/print/tex-fancyvrb/Makefile
diff -u pkgsrc/print/tex-fancyvrb/Makefile:1.4 pkgsrc/print/tex-fancyvrb/Makefile:1.5
--- pkgsrc/print/tex-fancyvrb/Makefile:1.4      Wed Jan 27 10:42:26 2016
+++ pkgsrc/print/tex-fancyvrb/Makefile  Wed Sep  6 16:49:34 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2016/01/27 10:42:26 markd Exp $
+# $NetBSD: Makefile,v 1.5 2017/09/06 16:49:34 wiz Exp $
 
 DISTNAME=      fancyvrb
 PKGNAME=       tex-${DISTNAME}-2.8
@@ -8,7 +8,6 @@ MAINTAINER=     minskim%NetBSD.org@localhost
 COMMENT=       Sophisticated verbatim text
 LICENSE=       lppl-1.3c
 
-CONFLICTS+=    teTeX-texmf<=3.0nb20
 DEPENDS+=      tex-graphics-[0-9]*:../../print/tex-graphics
 
 .include "../../print/texlive/package.mk"

Index: pkgsrc/print/tex-float/Makefile
diff -u pkgsrc/print/tex-float/Makefile:1.4 pkgsrc/print/tex-float/Makefile:1.5
--- pkgsrc/print/tex-float/Makefile:1.4 Wed Jan 27 10:42:26 2016
+++ pkgsrc/print/tex-float/Makefile     Wed Sep  6 16:49:34 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2016/01/27 10:42:26 markd Exp $
+# $NetBSD: Makefile,v 1.5 2017/09/06 16:49:34 wiz Exp $
 
 DISTNAME=      float
 PKGNAME=       tex-${DISTNAME}-1.3d
@@ -9,7 +9,5 @@ MAINTAINER=     minskim%NetBSD.org@localhost
 COMMENT=       Improved interface for floating objects
 LICENSE=       lppl-1.3c
 
-CONFLICTS+=    teTeX-texmf<=3.0nb19
-
 .include "../../print/texlive/package.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/print/tex-footmisc/Makefile
diff -u pkgsrc/print/tex-footmisc/Makefile:1.4 pkgsrc/print/tex-footmisc/Makefile:1.5
--- pkgsrc/print/tex-footmisc/Makefile:1.4      Wed Apr 22 22:31:29 2015
+++ pkgsrc/print/tex-footmisc/Makefile  Wed Sep  6 16:49:34 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2015/04/22 22:31:29 markd Exp $
+# $NetBSD: Makefile,v 1.5 2017/09/06 16:49:34 wiz Exp $
 
 DISTNAME=      footmisc
 PKGNAME=       tex-${DISTNAME}-5.5b
@@ -8,7 +8,5 @@ MAINTAINER=     minskim%NetBSD.org@localhost
 COMMENT=       Range of footnote options
 LICENSE=       lppl-1.3c
 
-CONFLICTS+=    teTeX-texmf<=3.0nb17
-
 .include "../../print/texlive/package.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/print/tex-footmisc-doc/Makefile
diff -u pkgsrc/print/tex-footmisc-doc/Makefile:1.4 pkgsrc/print/tex-footmisc-doc/Makefile:1.5
--- pkgsrc/print/tex-footmisc-doc/Makefile:1.4  Wed Apr 22 22:31:29 2015
+++ pkgsrc/print/tex-footmisc-doc/Makefile      Wed Sep  6 16:49:34 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2015/04/22 22:31:29 markd Exp $
+# $NetBSD: Makefile,v 1.5 2017/09/06 16:49:34 wiz Exp $
 
 DISTNAME=      footmisc.doc
 PKGNAME=       tex-${DISTNAME:S/./-/}-5.5b
@@ -8,7 +8,5 @@ MAINTAINER=     minskim%NetBSD.org@localhost
 COMMENT=       Documentation for tex-footmisc
 LICENSE=       lppl-1.3c
 
-CONFLICTS+=    teTeX-texmf<=3.0nb17
-
 .include "../../print/texlive/package.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/print/tex-geometry/Makefile
diff -u pkgsrc/print/tex-geometry/Makefile:1.4 pkgsrc/print/tex-geometry/Makefile:1.5
--- pkgsrc/print/tex-geometry/Makefile:1.4      Wed Jan 27 10:32:34 2016
+++ pkgsrc/print/tex-geometry/Makefile  Wed Sep  6 16:49:34 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2016/01/27 10:32:34 markd Exp $
+# $NetBSD: Makefile,v 1.5 2017/09/06 16:49:34 wiz Exp $
 
 DISTNAME=      geometry
 PKGNAME=       tex-${DISTNAME}-5.6
@@ -8,7 +8,6 @@ MAINTAINER=     minskim%NetBSD.org@localhost
 COMMENT=       Flexible and complete interface to document dimensions
 LICENSE=       lppl-1.3c
 
-CONFLICTS+=    teTeX-texmf<=3.0nb18
 DEPENDS+=      tex-graphics-[0-9]*:../../print/tex-graphics
 DEPENDS+=      tex-oberdiek-[0-9]*:../../print/tex-oberdiek
 

Index: pkgsrc/print/tex-geometry-doc/Makefile
diff -u pkgsrc/print/tex-geometry-doc/Makefile:1.4 pkgsrc/print/tex-geometry-doc/Makefile:1.5
--- pkgsrc/print/tex-geometry-doc/Makefile:1.4  Wed Jan 27 10:32:34 2016
+++ pkgsrc/print/tex-geometry-doc/Makefile      Wed Sep  6 16:49:35 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2016/01/27 10:32:34 markd Exp $
+# $NetBSD: Makefile,v 1.5 2017/09/06 16:49:35 wiz Exp $
 
 DISTNAME=      geometry.doc
 PKGNAME=       tex-${DISTNAME:S/./-/}-5.6
@@ -8,7 +8,5 @@ MAINTAINER=     minskim%NetBSD.org@localhost
 COMMENT=       Documentation for tex-geometry
 LICENSE=       lppl-1.3c
 
-CONFLICTS+=    teTeX-texmf<=3.0nb18
-
 .include "../../print/texlive/package.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/print/tex-german/Makefile
diff -u pkgsrc/print/tex-german/Makefile:1.4 pkgsrc/print/tex-german/Makefile:1.5
--- pkgsrc/print/tex-german/Makefile:1.4        Wed Jan 27 10:32:34 2016
+++ pkgsrc/print/tex-german/Makefile    Wed Sep  6 16:49:35 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2016/01/27 10:32:34 markd Exp $
+# $NetBSD: Makefile,v 1.5 2017/09/06 16:49:35 wiz Exp $
 
 DISTNAME=      german
 PKGNAME=       tex-${DISTNAME}-2.5e
@@ -8,7 +8,5 @@ MAINTAINER=     pkgsrc-users%NetBSD.org@localhost
 COMMENT=       LaTeX styles for German typography
 LICENSE=       lppl-1.3c
 
-CONFLICTS+=    teTeX-texmfsrc-[0-9]*
-
 .include "../../print/texlive/package.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/print/tex-germbib/Makefile
diff -u pkgsrc/print/tex-germbib/Makefile:1.1 pkgsrc/print/tex-germbib/Makefile:1.2
--- pkgsrc/print/tex-germbib/Makefile:1.1       Sun May  3 10:27:20 2015
+++ pkgsrc/print/tex-germbib/Makefile   Wed Sep  6 16:49:35 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2015/05/03 10:27:20 markd Exp $
+# $NetBSD: Makefile,v 1.2 2017/09/06 16:49:35 wiz Exp $
 
 DISTNAME=      germbib
 PKGNAME=       tex-${DISTNAME}-2014
@@ -6,9 +6,7 @@ TEXLIVE_REV=    15878
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 COMMENT=       German variants of standard BibTeX styles
-# LICENSE=     other-free
-
-CONFLICTS+=    teTeX-texmf<=3.0nb47
+#LICENSE=      other-free
 
 .include "../../print/texlive/package.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/print/tex-graphics/Makefile
diff -u pkgsrc/print/tex-graphics/Makefile:1.13 pkgsrc/print/tex-graphics/Makefile:1.14
--- pkgsrc/print/tex-graphics/Makefile:1.13     Wed Aug 23 23:59:34 2017
+++ pkgsrc/print/tex-graphics/Makefile  Wed Sep  6 16:49:35 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2017/08/23 23:59:34 markd Exp $
+# $NetBSD: Makefile,v 1.14 2017/09/06 16:49:35 wiz Exp $
 
 DISTNAME=      graphics
 PKGNAME=       tex-${DISTNAME}-1.2c
@@ -9,7 +9,6 @@ HOMEPAGE=       http://ctan.org/pkg/latex-grap
 COMMENT=       Standard LaTeX graphics
 LICENSE=       lppl-1.3c
 
-CONFLICTS+=    teTeX-texmf<=3.0nb13
 DEPENDS+=      tex-graphics-cfg-[0-9]*:../../print/tex-graphics-cfg
 DEPENDS+=      tex-graphics-def-[0-9]*:../../print/tex-graphics-def
 

Index: pkgsrc/print/tex-here/Makefile
diff -u pkgsrc/print/tex-here/Makefile:1.1.1.1 pkgsrc/print/tex-here/Makefile:1.2
--- pkgsrc/print/tex-here/Makefile:1.1.1.1      Sat Jan 22 22:06:30 2011
+++ pkgsrc/print/tex-here/Makefile      Wed Sep  6 16:49:35 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2011/01/22 22:06:30 minskim Exp $
+# $NetBSD: Makefile,v 1.2 2017/09/06 16:49:35 wiz Exp $
 
 DISTNAME=      here
 PKGNAME=       tex-${DISTNAME}-2010
@@ -7,7 +7,6 @@ TEXLIVE_REV=    16135
 MAINTAINER=    minskim%NetBSD.org@localhost
 COMMENT=       Emulation of obsolete package for "here" floats
 
-CONFLICTS+=    teTeX-texmf<3.0nb29
 DEPENDS+=      tex-float>=1.3d:../../print/tex-float
 
 .include "../../print/texlive/package.mk"

Index: pkgsrc/print/tex-hyperref/Makefile
diff -u pkgsrc/print/tex-hyperref/Makefile:1.15 pkgsrc/print/tex-hyperref/Makefile:1.16
--- pkgsrc/print/tex-hyperref/Makefile:1.15     Wed Jun 21 07:24:07 2017
+++ pkgsrc/print/tex-hyperref/Makefile  Wed Sep  6 16:49:35 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2017/06/21 07:24:07 markd Exp $
+# $NetBSD: Makefile,v 1.16 2017/09/06 16:49:35 wiz Exp $
 
 DISTNAME=      hyperref
 PKGNAME=       tex-${DISTNAME}-6.85a
@@ -9,7 +9,6 @@ HOMEPAGE=       http://ctan.org/pkg/hyperref
 COMMENT=       Extensive support for hypertext in LaTeX
 LICENSE=       lppl-1.3c
 
-CONFLICTS+=    teTeX-texmf<=3.0nb13
 DEPENDS+=      tex-graphics>=1.0onb1:../../print/tex-graphics
 DEPENDS+=      tex-ifxetex>=0.6:../../print/tex-ifxetex
 DEPENDS+=      tex-latex-bin>=2009nb1:../../print/tex-latex-bin

Index: pkgsrc/print/tex-hyperref-doc/Makefile
diff -u pkgsrc/print/tex-hyperref-doc/Makefile:1.11 pkgsrc/print/tex-hyperref-doc/Makefile:1.12
--- pkgsrc/print/tex-hyperref-doc/Makefile:1.11 Wed Jun 21 07:24:07 2017
+++ pkgsrc/print/tex-hyperref-doc/Makefile      Wed Sep  6 16:49:35 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2017/06/21 07:24:07 markd Exp $
+# $NetBSD: Makefile,v 1.12 2017/09/06 16:49:35 wiz Exp $
 
 DISTNAME=      hyperref.doc
 PKGNAME=       tex-${DISTNAME:S/./-/}-6.85a
@@ -9,7 +9,5 @@ HOMEPAGE=       http://ctan.org/pkg/hyperref
 COMMENT=       Documentation for tex-hyperref
 LICENSE=       lppl-1.3c
 
-CONFLICTS+=    teTeX-texmf<=3.0nb15
-
 .include "../../print/texlive/package.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/print/tex-hyphen-ancientgreek/Makefile
diff -u pkgsrc/print/tex-hyphen-ancientgreek/Makefile:1.8 pkgsrc/print/tex-hyphen-ancientgreek/Makefile:1.9
--- pkgsrc/print/tex-hyphen-ancientgreek/Makefile:1.8   Thu Jun 16 04:06:04 2016
+++ pkgsrc/print/tex-hyphen-ancientgreek/Makefile       Wed Sep  6 16:49:35 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2016/06/16 04:06:04 markd Exp $
+# $NetBSD: Makefile,v 1.9 2017/09/06 16:49:35 wiz Exp $
 
 DISTNAME=      hyphen-ancientgreek
 PKGNAME=       tex-${DISTNAME}-2016
@@ -8,7 +8,6 @@ MAINTAINER=     minskim%NetBSD.org@localhost
 COMMENT=       Hyphenation patterns for ancient Greek
 LICENSE=       lppl-1.3c
 
-CONFLICTS+=    teTeX-texmf<=3.0nb12
 DEPENDS+=      tex-hyphen-base-[0-9]*:../../print/tex-hyphen-base
 DEPENDS+=      tex-hyph-utf8-[0-9]*:../../print/tex-hyph-utf8
 

Index: pkgsrc/print/tex-hyphen-arabic/Makefile
diff -u pkgsrc/print/tex-hyphen-arabic/Makefile:1.7 pkgsrc/print/tex-hyphen-arabic/Makefile:1.8
--- pkgsrc/print/tex-hyphen-arabic/Makefile:1.7 Thu Jun 16 04:06:04 2016
+++ pkgsrc/print/tex-hyphen-arabic/Makefile     Wed Sep  6 16:49:35 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2016/06/16 04:06:04 markd Exp $
+# $NetBSD: Makefile,v 1.8 2017/09/06 16:49:35 wiz Exp $
 
 DISTNAME=      hyphen-arabic
 PKGNAME=       tex-${DISTNAME}-2016
@@ -8,7 +8,6 @@ MAINTAINER=     minskim%NetBSD.org@localhost
 COMMENT=       Hyphenation patterns for Arabic
 LICENSE=       lppl-1.3c
 
-CONFLICTS+=    teTeX-texmf<=3.0nb12
 DEPENDS+=      tex-hyphen-base-[0-9]*:../../print/tex-hyphen-base
 DEPENDS+=      tex-hyph-utf8-[0-9]*:../../print/tex-hyph-utf8
 

Index: pkgsrc/print/tex-hyphen-basque/Makefile
diff -u pkgsrc/print/tex-hyphen-basque/Makefile:1.6 pkgsrc/print/tex-hyphen-basque/Makefile:1.7
--- pkgsrc/print/tex-hyphen-basque/Makefile:1.6 Thu Jun 16 04:06:05 2016
+++ pkgsrc/print/tex-hyphen-basque/Makefile     Wed Sep  6 16:49:35 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2016/06/16 04:06:05 markd Exp $
+# $NetBSD: Makefile,v 1.7 2017/09/06 16:49:35 wiz Exp $
 
 DISTNAME=      hyphen-basque
 PKGNAME=       tex-${DISTNAME}-2016
@@ -8,7 +8,6 @@ MAINTAINER=     minskim%NetBSD.org@localhost
 COMMENT=       Hyphenation for Basque
 LICENSE=       lppl-1.3c
 
-CONFLICTS+=    teTeX-texmf<=3.0nb12
 DEPENDS+=      tex-hyphen-base-[0-9]*:../../print/tex-hyphen-base
 DEPENDS+=      tex-hyph-utf8-[0-9]*:../../print/tex-hyph-utf8
 

Index: pkgsrc/print/tex-hyphen-bulgarian/Makefile
diff -u pkgsrc/print/tex-hyphen-bulgarian/Makefile:1.6 pkgsrc/print/tex-hyphen-bulgarian/Makefile:1.7
--- pkgsrc/print/tex-hyphen-bulgarian/Makefile:1.6      Thu Jun 16 04:06:05 2016
+++ pkgsrc/print/tex-hyphen-bulgarian/Makefile  Wed Sep  6 16:49:35 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2016/06/16 04:06:05 markd Exp $
+# $NetBSD: Makefile,v 1.7 2017/09/06 16:49:35 wiz Exp $
 
 DISTNAME=      hyphen-bulgarian
 PKGNAME=       tex-${DISTNAME}-2016
@@ -8,7 +8,6 @@ MAINTAINER=     minskim%NetBSD.org@localhost
 COMMENT=       Hyphenation patterns for Bulgarian
 LICENSE=       lppl-1.3c
 
-CONFLICTS+=    teTeX-texmf<=3.0nb12
 DEPENDS+=      tex-hyphen-base-[0-9]*:../../print/tex-hyphen-base
 DEPENDS+=      tex-hyph-utf8-[0-9]*:../../print/tex-hyph-utf8
 

Index: pkgsrc/print/tex-hyphen-catalan/Makefile
diff -u pkgsrc/print/tex-hyphen-catalan/Makefile:1.6 pkgsrc/print/tex-hyphen-catalan/Makefile:1.7
--- pkgsrc/print/tex-hyphen-catalan/Makefile:1.6        Thu Jun 16 04:06:05 2016
+++ pkgsrc/print/tex-hyphen-catalan/Makefile    Wed Sep  6 16:49:35 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2016/06/16 04:06:05 markd Exp $
+# $NetBSD: Makefile,v 1.7 2017/09/06 16:49:35 wiz Exp $
 
 DISTNAME=      hyphen-catalan
 PKGNAME=       tex-${DISTNAME}-2016
@@ -8,7 +8,6 @@ MAINTAINER=     minskim%NetBSD.org@localhost
 COMMENT=       Hyphenation patterns for Catalan
 LICENSE=       lppl-1.3c
 
-CONFLICTS+=    teTeX-texmf<=3.0nb12
 DEPENDS+=      tex-hyphen-base-[0-9]*:../../print/tex-hyphen-base
 DEPENDS+=      tex-hyph-utf8-[0-9]*:../../print/tex-hyph-utf8
 

Index: pkgsrc/print/tex-hyphen-chinese/Makefile
diff -u pkgsrc/print/tex-hyphen-chinese/Makefile:1.7 pkgsrc/print/tex-hyphen-chinese/Makefile:1.8
--- pkgsrc/print/tex-hyphen-chinese/Makefile:1.7        Thu Jun 16 04:06:05 2016
+++ pkgsrc/print/tex-hyphen-chinese/Makefile    Wed Sep  6 16:49:36 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2016/06/16 04:06:05 markd Exp $
+# $NetBSD: Makefile,v 1.8 2017/09/06 16:49:36 wiz Exp $
 
 DISTNAME=      hyphen-chinese
 PKGNAME=       tex-${DISTNAME}-2016
@@ -8,7 +8,6 @@ MAINTAINER=     minskim%NetBSD.org@localhost
 COMMENT=       Hyphenation patterns for Chinese
 LICENSE=       lppl-1.3c
 
-CONFLICTS+=    teTeX-texmf<=3.0nb12
 DEPENDS+=      tex-hyphen-base-[0-9]*:../../print/tex-hyphen-base
 DEPENDS+=      tex-hyph-utf8-[0-9]*:../../print/tex-hyph-utf8
 

Index: pkgsrc/print/tex-hyphen-coptic/Makefile
diff -u pkgsrc/print/tex-hyphen-coptic/Makefile:1.8 pkgsrc/print/tex-hyphen-coptic/Makefile:1.9
--- pkgsrc/print/tex-hyphen-coptic/Makefile:1.8 Thu Jun 16 04:06:05 2016
+++ pkgsrc/print/tex-hyphen-coptic/Makefile     Wed Sep  6 16:49:36 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2016/06/16 04:06:05 markd Exp $
+# $NetBSD: Makefile,v 1.9 2017/09/06 16:49:36 wiz Exp $
 
 DISTNAME=      hyphen-coptic
 PKGNAME=       tex-${DISTNAME}-2016
@@ -8,7 +8,6 @@ MAINTAINER=     minskim%NetBSD.org@localhost
 COMMENT=       Hyphenation patterns for Coptic
 LICENSE=       lppl-1.3c
 
-CONFLICTS+=    teTeX-texmf<=3.0nb12
 DEPENDS+=      tex-hyphen-base-[0-9]*:../../print/tex-hyphen-base
 DEPENDS+=      tex-hyph-utf8-[0-9]*:../../print/tex-hyph-utf8
 

Index: pkgsrc/print/tex-hyphen-croatian/Makefile
diff -u pkgsrc/print/tex-hyphen-croatian/Makefile:1.6 pkgsrc/print/tex-hyphen-croatian/Makefile:1.7
--- pkgsrc/print/tex-hyphen-croatian/Makefile:1.6       Thu Jun 16 04:06:05 2016
+++ pkgsrc/print/tex-hyphen-croatian/Makefile   Wed Sep  6 16:49:36 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2016/06/16 04:06:05 markd Exp $
+# $NetBSD: Makefile,v 1.7 2017/09/06 16:49:36 wiz Exp $
 
 DISTNAME=      hyphen-croatian
 PKGNAME=       tex-${DISTNAME}-2016
@@ -8,7 +8,6 @@ MAINTAINER=     minskim%NetBSD.org@localhost
 COMMENT=       Croatian hyphenation
 LICENSE=       lppl-1.3c
 
-CONFLICTS+=    teTeX-texmf<=3.0nb12
 DEPENDS+=      tex-hyphen-base-[0-9]*:../../print/tex-hyphen-base
 DEPENDS+=      tex-hyph-utf8-[0-9]*:../../print/tex-hyph-utf8
 

Index: pkgsrc/print/tex-hyphen-czech/Makefile
diff -u pkgsrc/print/tex-hyphen-czech/Makefile:1.6 pkgsrc/print/tex-hyphen-czech/Makefile:1.7
--- pkgsrc/print/tex-hyphen-czech/Makefile:1.6  Thu Jun 16 04:06:05 2016
+++ pkgsrc/print/tex-hyphen-czech/Makefile      Wed Sep  6 16:49:36 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2016/06/16 04:06:05 markd Exp $
+# $NetBSD: Makefile,v 1.7 2017/09/06 16:49:36 wiz Exp $
 
 DISTNAME=      hyphen-czech
 PKGNAME=       tex-${DISTNAME}-2016
@@ -8,7 +8,6 @@ MAINTAINER=     minskim%NetBSD.org@localhost
 COMMENT=       Hyphenation patterns for Czech
 LICENSE=       lppl-1.3c
 
-CONFLICTS+=    teTeX-texmf<=3.0nb12
 DEPENDS+=      tex-hyphen-base-[0-9]*:../../print/tex-hyphen-base
 DEPENDS+=      tex-hyph-utf8-[0-9]*:../../print/tex-hyph-utf8
 

Index: pkgsrc/print/tex-hyphen-danish/Makefile
diff -u pkgsrc/print/tex-hyphen-danish/Makefile:1.6 pkgsrc/print/tex-hyphen-danish/Makefile:1.7
--- pkgsrc/print/tex-hyphen-danish/Makefile:1.6 Thu Jun 16 04:06:05 2016
+++ pkgsrc/print/tex-hyphen-danish/Makefile     Wed Sep  6 16:49:36 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2016/06/16 04:06:05 markd Exp $
+# $NetBSD: Makefile,v 1.7 2017/09/06 16:49:36 wiz Exp $
 
 DISTNAME=      hyphen-danish
 PKGNAME=       tex-${DISTNAME}-2016
@@ -8,7 +8,6 @@ MAINTAINER=     minskim%NetBSD.org@localhost
 COMMENT=       Danish hyphenation patterns
 LICENSE=       lppl-1.3c
 
-CONFLICTS+=    teTeX-texmf<=3.0nb12
 DEPENDS+=      tex-hyphen-base-[0-9]*:../../print/tex-hyphen-base
 DEPENDS+=      tex-hyph-utf8-[0-9]*:../../print/tex-hyph-utf8
 

Index: pkgsrc/print/tex-hyphen-dutch/Makefile
diff -u pkgsrc/print/tex-hyphen-dutch/Makefile:1.6 pkgsrc/print/tex-hyphen-dutch/Makefile:1.7
--- pkgsrc/print/tex-hyphen-dutch/Makefile:1.6  Thu Jun 16 04:06:05 2016
+++ pkgsrc/print/tex-hyphen-dutch/Makefile      Wed Sep  6 16:49:36 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2016/06/16 04:06:05 markd Exp $
+# $NetBSD: Makefile,v 1.7 2017/09/06 16:49:36 wiz Exp $
 
 DISTNAME=      hyphen-dutch
 PKGNAME=       tex-${DISTNAME}-2016
@@ -8,7 +8,6 @@ MAINTAINER=     minskim%NetBSD.org@localhost
 COMMENT=       Hyphenation patterns for Dutch
 LICENSE=       lppl-1.3c
 
-CONFLICTS+=    teTeX-texmf<=3.0nb12
 DEPENDS+=      tex-hyphen-base-[0-9]*:../../print/tex-hyphen-base
 DEPENDS+=      tex-hyph-utf8-[0-9]*:../../print/tex-hyph-utf8
 

Index: pkgsrc/print/tex-hyphen-english/Makefile
diff -u pkgsrc/print/tex-hyphen-english/Makefile:1.3 pkgsrc/print/tex-hyphen-english/Makefile:1.4
--- pkgsrc/print/tex-hyphen-english/Makefile:1.3        Thu Jun 16 04:06:06 2016
+++ pkgsrc/print/tex-hyphen-english/Makefile    Wed Sep  6 16:49:36 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2016/06/16 04:06:06 markd Exp $
+# $NetBSD: Makefile,v 1.4 2017/09/06 16:49:36 wiz Exp $
 
 DISTNAME=      hyphen-english
 PKGNAME=       tex-${DISTNAME}-2016
@@ -8,7 +8,6 @@ MAINTAINER=     pkgsrc-users%NetBSD.org@localhost
 COMMENT=       English hyphenation patterns
 LICENSE=       lppl-1.3c
 
-CONFLICTS+=    teTeX-texmf<=3.0nb12
 DEPENDS+=      tex-hyphen-base-[0-9]*:../../print/tex-hyphen-base
 DEPENDS+=      tex-hyph-utf8-[0-9]*:../../print/tex-hyph-utf8
 

Index: pkgsrc/print/tex-hyphen-esperanto/Makefile
diff -u pkgsrc/print/tex-hyphen-esperanto/Makefile:1.6 pkgsrc/print/tex-hyphen-esperanto/Makefile:1.7
--- pkgsrc/print/tex-hyphen-esperanto/Makefile:1.6      Thu Jun 16 04:06:06 2016
+++ pkgsrc/print/tex-hyphen-esperanto/Makefile  Wed Sep  6 16:49:36 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2016/06/16 04:06:06 markd Exp $
+# $NetBSD: Makefile,v 1.7 2017/09/06 16:49:36 wiz Exp $
 
 DISTNAME=      hyphen-esperanto
 PKGNAME=       tex-${DISTNAME}-2016
@@ -8,7 +8,6 @@ MAINTAINER=     minskim%NetBSD.org@localhost
 COMMENT=       Hyphenation patterns for Esperanto
 LICENSE=       lppl-1.3c
 
-CONFLICTS+=    teTeX-texmf<=3.0nb12
 DEPENDS+=      tex-hyphen-base-[0-9]*:../../print/tex-hyphen-base
 DEPENDS+=      tex-hyph-utf8-[0-9]*:../../print/tex-hyph-utf8
 

Index: pkgsrc/print/tex-hyphen-estonian/Makefile
diff -u pkgsrc/print/tex-hyphen-estonian/Makefile:1.6 pkgsrc/print/tex-hyphen-estonian/Makefile:1.7
--- pkgsrc/print/tex-hyphen-estonian/Makefile:1.6       Thu Jun 16 04:06:06 2016
+++ pkgsrc/print/tex-hyphen-estonian/Makefile   Wed Sep  6 16:49:36 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2016/06/16 04:06:06 markd Exp $
+# $NetBSD: Makefile,v 1.7 2017/09/06 16:49:36 wiz Exp $
 
 DISTNAME=      hyphen-estonian
 PKGNAME=       tex-${DISTNAME}-2016
@@ -8,7 +8,6 @@ MAINTAINER=     minskim%NetBSD.org@localhost
 COMMENT=       Hyphenation patterns for Estonian
 LICENSE=       lppl-1.3c
 
-CONFLICTS+=    teTeX-texmf<=3.0nb12
 DEPENDS+=      tex-hyphen-base-[0-9]*:../../print/tex-hyphen-base
 DEPENDS+=      tex-hyph-utf8-[0-9]*:../../print/tex-hyph-utf8
 

Index: pkgsrc/print/tex-hyphen-farsi/Makefile
diff -u pkgsrc/print/tex-hyphen-farsi/Makefile:1.7 pkgsrc/print/tex-hyphen-farsi/Makefile:1.8
--- pkgsrc/print/tex-hyphen-farsi/Makefile:1.7  Thu Jun 16 04:06:06 2016
+++ pkgsrc/print/tex-hyphen-farsi/Makefile      Wed Sep  6 16:49:36 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2016/06/16 04:06:06 markd Exp $
+# $NetBSD: Makefile,v 1.8 2017/09/06 16:49:36 wiz Exp $
 
 DISTNAME=      hyphen-farsi
 PKGNAME=       tex-${DISTNAME}-2016
@@ -8,7 +8,6 @@ MAINTAINER=     minskim%NetBSD.org@localhost
 COMMENT=       Hyphenation patterns for Farsi
 LICENSE=       lppl-1.3c
 
-CONFLICTS+=    teTeX-texmf<=3.0nb12
 DEPENDS+=      tex-hyphen-base-[0-9]*:../../print/tex-hyphen-base
 DEPENDS+=      tex-hyph-utf8-[0-9]*:../../print/tex-hyph-utf8
 

Index: pkgsrc/print/tex-hyphen-finnish/Makefile
diff -u pkgsrc/print/tex-hyphen-finnish/Makefile:1.6 pkgsrc/print/tex-hyphen-finnish/Makefile:1.7
--- pkgsrc/print/tex-hyphen-finnish/Makefile:1.6        Thu Jun 16 04:06:06 2016
+++ pkgsrc/print/tex-hyphen-finnish/Makefile    Wed Sep  6 16:49:36 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2016/06/16 04:06:06 markd Exp $
+# $NetBSD: Makefile,v 1.7 2017/09/06 16:49:36 wiz Exp $
 
 DISTNAME=      hyphen-finnish
 PKGNAME=       tex-${DISTNAME}-2016
@@ -8,7 +8,6 @@ MAINTAINER=     minskim%NetBSD.org@localhost
 COMMENT=       Hyphenation patterns for Finnish language
 LICENSE=       lppl-1.3c
 
-CONFLICTS+=    teTeX-texmf<=3.0nb12
 DEPENDS+=      tex-hyphen-base-[0-9]*:../../print/tex-hyphen-base
 DEPENDS+=      tex-hyph-utf8-[0-9]*:../../print/tex-hyph-utf8
 

Index: pkgsrc/print/tex-hyphen-french/Makefile
diff -u pkgsrc/print/tex-hyphen-french/Makefile:1.6 pkgsrc/print/tex-hyphen-french/Makefile:1.7
--- pkgsrc/print/tex-hyphen-french/Makefile:1.6 Thu Jun 16 04:06:06 2016
+++ pkgsrc/print/tex-hyphen-french/Makefile     Wed Sep  6 16:49:36 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2016/06/16 04:06:06 markd Exp $
+# $NetBSD: Makefile,v 1.7 2017/09/06 16:49:36 wiz Exp $
 
 DISTNAME=      hyphen-french
 PKGNAME=       tex-${DISTNAME}-2016
@@ -8,7 +8,6 @@ MAINTAINER=     minskim%NetBSD.org@localhost
 COMMENT=       Hyphenation patterns for French
 LICENSE=       lppl-1.3c
 
-CONFLICTS+=    teTeX-texmf<=3.0nb12
 DEPENDS+=      tex-hyphen-base-[0-9]*:../../print/tex-hyphen-base
 DEPENDS+=      tex-hyph-utf8-[0-9]*:../../print/tex-hyph-utf8
 

Index: pkgsrc/print/tex-hyphen-galician/Makefile
diff -u pkgsrc/print/tex-hyphen-galician/Makefile:1.6 pkgsrc/print/tex-hyphen-galician/Makefile:1.7
--- pkgsrc/print/tex-hyphen-galician/Makefile:1.6       Thu Jun 16 04:06:06 2016
+++ pkgsrc/print/tex-hyphen-galician/Makefile   Wed Sep  6 16:49:37 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2016/06/16 04:06:06 markd Exp $
+# $NetBSD: Makefile,v 1.7 2017/09/06 16:49:37 wiz Exp $
 
 DISTNAME=      hyphen-galician
 PKGNAME=       tex-${DISTNAME}-2016
@@ -8,7 +8,6 @@ MAINTAINER=     minskim%NetBSD.org@localhost
 COMMENT=       Hyphenation patterns for Galician
 LICENSE=       lppl-1.3c
 
-CONFLICTS+=    teTeX-texmf<=3.0nb12
 DEPENDS+=      tex-hyphen-base-[0-9]*:../../print/tex-hyphen-base
 DEPENDS+=      tex-hyph-utf8-[0-9]*:../../print/tex-hyph-utf8
 

Index: pkgsrc/print/tex-hyphen-german/Makefile
diff -u pkgsrc/print/tex-hyphen-german/Makefile:1.8 pkgsrc/print/tex-hyphen-german/Makefile:1.9
--- pkgsrc/print/tex-hyphen-german/Makefile:1.8 Wed Sep  6 10:40:32 2017
+++ pkgsrc/print/tex-hyphen-german/Makefile     Wed Sep  6 16:49:37 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2017/09/06 10:40:32 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2017/09/06 16:49:37 wiz Exp $
 
 DISTNAME=      hyphen-german
 PKGNAME=       tex-${DISTNAME}-2017
@@ -9,7 +9,6 @@ MAINTAINER=     minskim%NetBSD.org@localhost
 COMMENT=       Hyphenation patterns for German
 LICENSE=       lppl-1.3c
 
-CONFLICTS+=    teTeX-texmf<=3.0nb12
 DEPENDS+=      tex-hyphen-base-[0-9]*:../../print/tex-hyphen-base
 DEPENDS+=      tex-hyph-utf8-[0-9]*:../../print/tex-hyph-utf8
 

Index: pkgsrc/print/tex-hyphen-greek/Makefile
diff -u pkgsrc/print/tex-hyphen-greek/Makefile:1.8 pkgsrc/print/tex-hyphen-greek/Makefile:1.9
--- pkgsrc/print/tex-hyphen-greek/Makefile:1.8  Thu Jun 16 04:06:06 2016
+++ pkgsrc/print/tex-hyphen-greek/Makefile      Wed Sep  6 16:49:37 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2016/06/16 04:06:06 markd Exp $
+# $NetBSD: Makefile,v 1.9 2017/09/06 16:49:37 wiz Exp $
 
 DISTNAME=      hyphen-greek
 PKGNAME=       tex-${DISTNAME}-2016
@@ -8,7 +8,6 @@ MAINTAINER=     minskim%NetBSD.org@localhost
 COMMENT=       Hyphenation for Greek text
 LICENSE=       lppl-1.3c
 
-CONFLICTS+=    teTeX-texmf<=3.0nb12
 DEPENDS+=      tex-hyphen-base-[0-9]*:../../print/tex-hyphen-base
 DEPENDS+=      tex-hyph-utf8-[0-9]*:../../print/tex-hyph-utf8
 

Index: pkgsrc/print/tex-hyphen-hungarian/Makefile
diff -u pkgsrc/print/tex-hyphen-hungarian/Makefile:1.7 pkgsrc/print/tex-hyphen-hungarian/Makefile:1.8
--- pkgsrc/print/tex-hyphen-hungarian/Makefile:1.7      Thu Jun 16 04:06:07 2016
+++ pkgsrc/print/tex-hyphen-hungarian/Makefile  Wed Sep  6 16:49:37 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2016/06/16 04:06:07 markd Exp $
+# $NetBSD: Makefile,v 1.8 2017/09/06 16:49:37 wiz Exp $
 
 DISTNAME=      hyphen-hungarian
 PKGNAME=       tex-${DISTNAME}-2016
@@ -8,7 +8,6 @@ MAINTAINER=     minskim%NetBSD.org@localhost
 COMMENT=       New Hungarian hyphenation patterns
 LICENSE=       lppl-1.3c
 
-CONFLICTS+=    teTeX-texmf<=3.0nb12
 DEPENDS+=      tex-hyphen-base-[0-9]*:../../print/tex-hyphen-base
 DEPENDS+=      tex-hyph-utf8-[0-9]*:../../print/tex-hyph-utf8
 

Index: pkgsrc/print/tex-hyphen-icelandic/Makefile
diff -u pkgsrc/print/tex-hyphen-icelandic/Makefile:1.6 pkgsrc/print/tex-hyphen-icelandic/Makefile:1.7
--- pkgsrc/print/tex-hyphen-icelandic/Makefile:1.6      Thu Jun 16 04:06:07 2016
+++ pkgsrc/print/tex-hyphen-icelandic/Makefile  Wed Sep  6 16:49:37 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2016/06/16 04:06:07 markd Exp $
+# $NetBSD: Makefile,v 1.7 2017/09/06 16:49:37 wiz Exp $
 
 DISTNAME=      hyphen-icelandic
 PKGNAME=       tex-${DISTNAME}-2016
@@ -8,7 +8,6 @@ MAINTAINER=     minskim%NetBSD.org@localhost
 COMMENT=       Icelandic hyphenation patterns
 LICENSE=       lppl-1.3c
 
-CONFLICTS+=    teTeX-texmf<=3.0nb12
 DEPENDS+=      tex-hyphen-base-[0-9]*:../../print/tex-hyphen-base
 DEPENDS+=      tex-hyph-utf8-[0-9]*:../../print/tex-hyph-utf8
 

Index: pkgsrc/print/tex-hyphen-indonesian/Makefile
diff -u pkgsrc/print/tex-hyphen-indonesian/Makefile:1.6 pkgsrc/print/tex-hyphen-indonesian/Makefile:1.7
--- pkgsrc/print/tex-hyphen-indonesian/Makefile:1.6     Thu Jun 16 04:06:07 2016
+++ pkgsrc/print/tex-hyphen-indonesian/Makefile Wed Sep  6 16:49:37 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2016/06/16 04:06:07 markd Exp $
+# $NetBSD: Makefile,v 1.7 2017/09/06 16:49:37 wiz Exp $
 
 DISTNAME=      hyphen-indonesian
 PKGNAME=       tex-${DISTNAME}-2016
@@ -8,7 +8,6 @@ MAINTAINER=     minskim%NetBSD.org@localhost
 COMMENT=       Hyphenation patterns for Indonesian
 LICENSE=       lppl-1.3c
 
-CONFLICTS+=    teTeX-texmf<=3.0nb12
 DEPENDS+=      tex-hyphen-base-[0-9]*:../../print/tex-hyphen-base
 DEPENDS+=      tex-hyph-utf8-[0-9]*:../../print/tex-hyph-utf8
 

Index: pkgsrc/print/tex-hyphen-interlingua/Makefile
diff -u pkgsrc/print/tex-hyphen-interlingua/Makefile:1.6 pkgsrc/print/tex-hyphen-interlingua/Makefile:1.7
--- pkgsrc/print/tex-hyphen-interlingua/Makefile:1.6    Thu Jun 16 04:06:07 2016
+++ pkgsrc/print/tex-hyphen-interlingua/Makefile        Wed Sep  6 16:49:37 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2016/06/16 04:06:07 markd Exp $
+# $NetBSD: Makefile,v 1.7 2017/09/06 16:49:37 wiz Exp $
 
 DISTNAME=      hyphen-interlingua
 PKGNAME=       tex-${DISTNAME}-2016
@@ -8,7 +8,6 @@ MAINTAINER=     minskim%NetBSD.org@localhost
 COMMENT=       Hyphenation patterns for Interlingua
 LICENSE=       lppl-1.3c
 
-CONFLICTS+=    teTeX-texmf<=3.0nb12
 DEPENDS+=      tex-hyphen-base-[0-9]*:../../print/tex-hyphen-base
 DEPENDS+=      tex-hyph-utf8-[0-9]*:../../print/tex-hyph-utf8
 

Index: pkgsrc/print/tex-hyphen-irish/Makefile
diff -u pkgsrc/print/tex-hyphen-irish/Makefile:1.6 pkgsrc/print/tex-hyphen-irish/Makefile:1.7
--- pkgsrc/print/tex-hyphen-irish/Makefile:1.6  Thu Jun 16 04:06:07 2016
+++ pkgsrc/print/tex-hyphen-irish/Makefile      Wed Sep  6 16:49:37 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2016/06/16 04:06:07 markd Exp $
+# $NetBSD: Makefile,v 1.7 2017/09/06 16:49:37 wiz Exp $
 
 DISTNAME=      hyphen-irish
 PKGNAME=       tex-${DISTNAME}-2016
@@ -8,7 +8,6 @@ MAINTAINER=     minskim%NetBSD.org@localhost
 COMMENT=       Hyphenation patterns for Irish
 LICENSE=       lppl-1.3c
 
-CONFLICTS+=    teTeX-texmf<=3.0nb12
 DEPENDS+=      tex-hyphen-base-[0-9]*:../../print/tex-hyphen-base
 DEPENDS+=      tex-hyph-utf8-[0-9]*:../../print/tex-hyph-utf8
 

Index: pkgsrc/print/tex-hyphen-italian/Makefile
diff -u pkgsrc/print/tex-hyphen-italian/Makefile:1.6 pkgsrc/print/tex-hyphen-italian/Makefile:1.7
--- pkgsrc/print/tex-hyphen-italian/Makefile:1.6        Thu Jun 16 04:06:07 2016
+++ pkgsrc/print/tex-hyphen-italian/Makefile    Wed Sep  6 16:49:37 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2016/06/16 04:06:07 markd Exp $
+# $NetBSD: Makefile,v 1.7 2017/09/06 16:49:37 wiz Exp $
 
 DISTNAME=      hyphen-italian
 PKGNAME=       tex-${DISTNAME}-2016
@@ -8,7 +8,6 @@ MAINTAINER=     minskim%NetBSD.org@localhost
 COMMENT=       Hyphenation patterns for the Italian language
 LICENSE=       gnu-lgpl-v2
 
-CONFLICTS+=    teTeX-texmf<=3.0nb12
 DEPENDS+=      tex-hyphen-base-[0-9]*:../../print/tex-hyphen-base
 DEPENDS+=      tex-hyph-utf8-[0-9]*:../../print/tex-hyph-utf8
 

Index: pkgsrc/print/tex-hyphen-latin/Makefile
diff -u pkgsrc/print/tex-hyphen-latin/Makefile:1.7 pkgsrc/print/tex-hyphen-latin/Makefile:1.8
--- pkgsrc/print/tex-hyphen-latin/Makefile:1.7  Wed Jun 21 07:24:07 2017
+++ pkgsrc/print/tex-hyphen-latin/Makefile      Wed Sep  6 16:49:37 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2017/06/21 07:24:07 markd Exp $
+# $NetBSD: Makefile,v 1.8 2017/09/06 16:49:37 wiz Exp $
 
 DISTNAME=      hyphen-latin
 PKGNAME=       tex-${DISTNAME}-3.1.2017
@@ -9,7 +9,6 @@ HOMEPAGE=       http://ctan.org/pkg/lahyph
 COMMENT=       Liturgical Latin hyphenation patterns
 LICENSE=       lppl-1.3c
 
-CONFLICTS+=    teTeX-texmf<=3.0nb12
 DEPENDS+=      tex-hyphen-base-[0-9]*:../../print/tex-hyphen-base
 DEPENDS+=      tex-hyph-utf8-[0-9]*:../../print/tex-hyph-utf8
 

Index: pkgsrc/print/tex-hyphen-lithuanian/Makefile
diff -u pkgsrc/print/tex-hyphen-lithuanian/Makefile:1.6 pkgsrc/print/tex-hyphen-lithuanian/Makefile:1.7
--- pkgsrc/print/tex-hyphen-lithuanian/Makefile:1.6     Thu Jun 16 04:06:07 2016
+++ pkgsrc/print/tex-hyphen-lithuanian/Makefile Wed Sep  6 16:49:37 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2016/06/16 04:06:07 markd Exp $
+# $NetBSD: Makefile,v 1.7 2017/09/06 16:49:37 wiz Exp $
 
 DISTNAME=      hyphen-lithuanian
 PKGNAME=       tex-${DISTNAME}-2016
@@ -8,7 +8,6 @@ MAINTAINER=     minskim%NetBSD.org@localhost
 COMMENT=       Hyphenation patterns for Lithuanian
 LICENSE=       lppl-1.3c
 
-CONFLICTS+=    teTeX-texmf<=3.0nb12
 DEPENDS+=      tex-hyphen-base-[0-9]*:../../print/tex-hyphen-base
 DEPENDS+=      tex-hyph-utf8-[0-9]*:../../print/tex-hyph-utf8
 

Index: pkgsrc/print/tex-hyphen-mongolian/Makefile
diff -u pkgsrc/print/tex-hyphen-mongolian/Makefile:1.6 pkgsrc/print/tex-hyphen-mongolian/Makefile:1.7
--- pkgsrc/print/tex-hyphen-mongolian/Makefile:1.6      Thu Jun 16 04:06:08 2016
+++ pkgsrc/print/tex-hyphen-mongolian/Makefile  Wed Sep  6 16:49:37 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2016/06/16 04:06:08 markd Exp $
+# $NetBSD: Makefile,v 1.7 2017/09/06 16:49:37 wiz Exp $
 
 DISTNAME=      hyphen-mongolian
 PKGNAME=       tex-${DISTNAME}-2016
@@ -8,7 +8,6 @@ MAINTAINER=     minskim%NetBSD.org@localhost
 COMMENT=       Hyphenation patterns for Mongolian
 LICENSE=       lppl-1.3c
 
-CONFLICTS+=    teTeX-texmf<=3.0nb12
 DEPENDS+=      tex-hyphen-base-[0-9]*:../../print/tex-hyphen-base
 DEPENDS+=      tex-hyph-utf8-[0-9]*:../../print/tex-hyph-utf8
 

Index: pkgsrc/print/tex-hyphen-norwegian/Makefile
diff -u pkgsrc/print/tex-hyphen-norwegian/Makefile:1.6 pkgsrc/print/tex-hyphen-norwegian/Makefile:1.7
--- pkgsrc/print/tex-hyphen-norwegian/Makefile:1.6      Thu Jun 16 04:06:08 2016
+++ pkgsrc/print/tex-hyphen-norwegian/Makefile  Wed Sep  6 16:49:37 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2016/06/16 04:06:08 markd Exp $
+# $NetBSD: Makefile,v 1.7 2017/09/06 16:49:37 wiz Exp $
 
 DISTNAME=      hyphen-norwegian
 PKGNAME=       tex-${DISTNAME}-2016
@@ -8,7 +8,6 @@ MAINTAINER=     minskim%NetBSD.org@localhost
 COMMENT=       Hyphenation patterns for Norwegian
 LICENSE=       lppl-1.3c
 
-CONFLICTS+=    teTeX-texmf<=3.0nb12
 DEPENDS+=      tex-hyphen-base-[0-9]*:../../print/tex-hyphen-base
 DEPENDS+=      tex-hyph-utf8-[0-9]*:../../print/tex-hyph-utf8
 

Index: pkgsrc/print/tex-hyphen-polish/Makefile
diff -u pkgsrc/print/tex-hyphen-polish/Makefile:1.6 pkgsrc/print/tex-hyphen-polish/Makefile:1.7
--- pkgsrc/print/tex-hyphen-polish/Makefile:1.6 Thu Jun 16 04:06:08 2016
+++ pkgsrc/print/tex-hyphen-polish/Makefile     Wed Sep  6 16:49:38 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2016/06/16 04:06:08 markd Exp $
+# $NetBSD: Makefile,v 1.7 2017/09/06 16:49:38 wiz Exp $
 
 DISTNAME=      hyphen-polish
 PKGNAME=       tex-${DISTNAME}-3.0a.2016
@@ -8,7 +8,6 @@ MAINTAINER=     minskim%NetBSD.org@localhost
 COMMENT=       Hyphenation for Polish
 LICENSE=       lppl-1.3c
 
-CONFLICTS+=    teTeX-texmf<=3.0nb12
 DEPENDS+=      tex-hyphen-base-[0-9]*:../../print/tex-hyphen-base
 DEPENDS+=      tex-hyph-utf8-[0-9]*:../../print/tex-hyph-utf8
 

Index: pkgsrc/print/tex-hyphen-portuguese/Makefile
diff -u pkgsrc/print/tex-hyphen-portuguese/Makefile:1.6 pkgsrc/print/tex-hyphen-portuguese/Makefile:1.7
--- pkgsrc/print/tex-hyphen-portuguese/Makefile:1.6     Thu Jun 16 04:06:08 2016
+++ pkgsrc/print/tex-hyphen-portuguese/Makefile Wed Sep  6 16:49:38 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2016/06/16 04:06:08 markd Exp $
+# $NetBSD: Makefile,v 1.7 2017/09/06 16:49:38 wiz Exp $
 
 DISTNAME=      hyphen-portuguese
 PKGNAME=       tex-${DISTNAME}-2016
@@ -8,7 +8,6 @@ MAINTAINER=     minskim%NetBSD.org@localhost
 COMMENT=       Hyphenation patterns for Portuguese
 LICENSE=       lppl-1.3c
 
-CONFLICTS+=    teTeX-texmf<=3.0nb24
 DEPENDS+=      tex-hyphen-base-[0-9]*:../../print/tex-hyphen-base
 DEPENDS+=      tex-hyph-utf8-[0-9]*:../../print/tex-hyph-utf8
 

Index: pkgsrc/print/tex-hyphen-romanian/Makefile
diff -u pkgsrc/print/tex-hyphen-romanian/Makefile:1.6 pkgsrc/print/tex-hyphen-romanian/Makefile:1.7
--- pkgsrc/print/tex-hyphen-romanian/Makefile:1.6       Thu Jun 16 04:06:08 2016
+++ pkgsrc/print/tex-hyphen-romanian/Makefile   Wed Sep  6 16:49:38 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2016/06/16 04:06:08 markd Exp $
+# $NetBSD: Makefile,v 1.7 2017/09/06 16:49:38 wiz Exp $
 
 DISTNAME=      hyphen-romanian
 PKGNAME=       tex-${DISTNAME}-2016
@@ -8,7 +8,6 @@ MAINTAINER=     minskim%NetBSD.org@localhost
 COMMENT=       Hyphenation patterns for Romanian
 LICENSE=       lppl-1.3c
 
-CONFLICTS+=    teTeX-texmf<=3.0nb12
 DEPENDS+=      tex-hyphen-base-[0-9]*:../../print/tex-hyphen-base
 DEPENDS+=      tex-hyph-utf8-[0-9]*:../../print/tex-hyph-utf8
 

Index: pkgsrc/print/tex-hyphen-russian/Makefile
diff -u pkgsrc/print/tex-hyphen-russian/Makefile:1.7 pkgsrc/print/tex-hyphen-russian/Makefile:1.8
--- pkgsrc/print/tex-hyphen-russian/Makefile:1.7        Thu Jun 16 04:06:08 2016
+++ pkgsrc/print/tex-hyphen-russian/Makefile    Wed Sep  6 16:49:38 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2016/06/16 04:06:08 markd Exp $
+# $NetBSD: Makefile,v 1.8 2017/09/06 16:49:38 wiz Exp $
 
 DISTNAME=      hyphen-russian
 PKGNAME=       tex-${DISTNAME}-2016
@@ -8,7 +8,6 @@ MAINTAINER=     minskim%NetBSD.org@localhost
 COMMENT=       Hyphenation patterns for Russian
 LICENSE=       lppl-1.3c
 
-CONFLICTS+=    teTeX-texmf<=3.0nb12
 DEPENDS+=      tex-hyphen-base-[0-9]*:../../print/tex-hyphen-base
 DEPENDS+=      tex-hyph-utf8-[0-9]*:../../print/tex-hyph-utf8
 DEPENDS+=      tex-ruhyphen>=1.6:../../print/tex-ruhyphen

Index: pkgsrc/print/tex-hyphen-sanskrit/Makefile
diff -u pkgsrc/print/tex-hyphen-sanskrit/Makefile:1.6 pkgsrc/print/tex-hyphen-sanskrit/Makefile:1.7
--- pkgsrc/print/tex-hyphen-sanskrit/Makefile:1.6       Thu Jun 16 04:06:08 2016
+++ pkgsrc/print/tex-hyphen-sanskrit/Makefile   Wed Sep  6 16:49:38 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2016/06/16 04:06:08 markd Exp $
+# $NetBSD: Makefile,v 1.7 2017/09/06 16:49:38 wiz Exp $
 
 DISTNAME=      hyphen-sanskrit
 PKGNAME=       tex-${DISTNAME}-2016
@@ -8,7 +8,6 @@ MAINTAINER=     minskim%NetBSD.org@localhost
 COMMENT=       Hyphenation patterns for Sanskrit
 LICENSE=       lppl-1.3c
 
-CONFLICTS+=    teTeX-texmf<=3.0nb12
 DEPENDS+=      tex-hyphen-base-[0-9]*:../../print/tex-hyphen-base
 DEPENDS+=      tex-hyph-utf8-[0-9]*:../../print/tex-hyph-utf8
 

Index: pkgsrc/print/tex-hyphen-serbian/Makefile
diff -u pkgsrc/print/tex-hyphen-serbian/Makefile:1.6 pkgsrc/print/tex-hyphen-serbian/Makefile:1.7
--- pkgsrc/print/tex-hyphen-serbian/Makefile:1.6        Thu Jun 16 04:06:08 2016
+++ pkgsrc/print/tex-hyphen-serbian/Makefile    Wed Sep  6 16:49:38 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2016/06/16 04:06:08 markd Exp $
+# $NetBSD: Makefile,v 1.7 2017/09/06 16:49:38 wiz Exp $
 
 DISTNAME=      hyphen-serbian
 PKGNAME=       tex-${DISTNAME}-1.0a.2016
@@ -8,7 +8,6 @@ MAINTAINER=     minskim%NetBSD.org@localhost
 COMMENT=       Hyphenation patterns for Serbian Cyrillic
 LICENSE=       gnu-gpl-v2
 
-CONFLICTS+=    teTeX-texmf<=3.0nb12
 DEPENDS+=      tex-hyphen-base-[0-9]*:../../print/tex-hyphen-base
 DEPENDS+=      tex-hyph-utf8-[0-9]*:../../print/tex-hyph-utf8
 

Index: pkgsrc/print/tex-hyphen-slovak/Makefile
diff -u pkgsrc/print/tex-hyphen-slovak/Makefile:1.6 pkgsrc/print/tex-hyphen-slovak/Makefile:1.7
--- pkgsrc/print/tex-hyphen-slovak/Makefile:1.6 Thu Jun 16 04:06:08 2016
+++ pkgsrc/print/tex-hyphen-slovak/Makefile     Wed Sep  6 16:49:38 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2016/06/16 04:06:08 markd Exp $
+# $NetBSD: Makefile,v 1.7 2017/09/06 16:49:38 wiz Exp $
 
 DISTNAME=      hyphen-slovak
 PKGNAME=       tex-${DISTNAME}-2016
@@ -8,7 +8,6 @@ MAINTAINER=     minskim%NetBSD.org@localhost
 COMMENT=       Hyphenation patterns for Slovak
 LICENSE=       lppl-1.3c
 
-CONFLICTS+=    teTeX-texmf<=3.0nb12
 DEPENDS+=      tex-hyphen-base-[0-9]*:../../print/tex-hyphen-base
 DEPENDS+=      tex-hyph-utf8-[0-9]*:../../print/tex-hyph-utf8
 

Index: pkgsrc/print/tex-hyphen-slovenian/Makefile
diff -u pkgsrc/print/tex-hyphen-slovenian/Makefile:1.6 pkgsrc/print/tex-hyphen-slovenian/Makefile:1.7
--- pkgsrc/print/tex-hyphen-slovenian/Makefile:1.6      Thu Jun 16 04:06:08 2016
+++ pkgsrc/print/tex-hyphen-slovenian/Makefile  Wed Sep  6 16:49:38 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2016/06/16 04:06:08 markd Exp $
+# $NetBSD: Makefile,v 1.7 2017/09/06 16:49:38 wiz Exp $
 
 DISTNAME=      hyphen-slovenian
 PKGNAME=       tex-${DISTNAME}-2016
@@ -8,7 +8,6 @@ MAINTAINER=     minskim%NetBSD.org@localhost
 COMMENT=       Hyphenation patterns for Slovenian
 LICENSE=       lppl-1.3c
 
-CONFLICTS+=    teTeX-texmf<=3.0nb12
 DEPENDS+=      tex-hyphen-base-[0-9]*:../../print/tex-hyphen-base
 DEPENDS+=      tex-hyph-utf8-[0-9]*:../../print/tex-hyph-utf8
 

Index: pkgsrc/print/tex-hyphen-spanish/Makefile
diff -u pkgsrc/print/tex-hyphen-spanish/Makefile:1.4 pkgsrc/print/tex-hyphen-spanish/Makefile:1.5
--- pkgsrc/print/tex-hyphen-spanish/Makefile:1.4        Thu Jun 16 04:06:09 2016
+++ pkgsrc/print/tex-hyphen-spanish/Makefile    Wed Sep  6 16:49:38 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2016/06/16 04:06:09 markd Exp $
+# $NetBSD: Makefile,v 1.5 2017/09/06 16:49:38 wiz Exp $
 
 DISTNAME=      hyphen-spanish
 PKGNAME=       tex-${DISTNAME}-4.5.2016
@@ -8,7 +8,6 @@ MAINTAINER=     minskim%NetBSD.org@localhost
 COMMENT=       Hyphenation patterns for Spanish
 LICENSE=       lppl-1.3c
 
-CONFLICTS+=    teTeX-texmf<=3.0nb12
 DEPENDS+=      tex-hyphen-base-[0-9]*:../../print/tex-hyphen-base
 DEPENDS+=      tex-hyph-utf8-[0-9]*:../../print/tex-hyph-utf8
 

Index: pkgsrc/print/tex-hyphen-swedish/Makefile
diff -u pkgsrc/print/tex-hyphen-swedish/Makefile:1.6 pkgsrc/print/tex-hyphen-swedish/Makefile:1.7
--- pkgsrc/print/tex-hyphen-swedish/Makefile:1.6        Thu Jun 16 04:06:09 2016
+++ pkgsrc/print/tex-hyphen-swedish/Makefile    Wed Sep  6 16:49:38 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2016/06/16 04:06:09 markd Exp $
+# $NetBSD: Makefile,v 1.7 2017/09/06 16:49:38 wiz Exp $
 
 DISTNAME=      hyphen-swedish
 PKGNAME=       tex-${DISTNAME}-2016
@@ -8,7 +8,6 @@ MAINTAINER=     minskim%NetBSD.org@localhost
 COMMENT=       Hyphenation patterns for Swedish
 LICENSE=       lppl-1.3c
 
-CONFLICTS+=    teTeX-texmf<=3.0nb12
 DEPENDS+=      tex-hyphen-base-[0-9]*:../../print/tex-hyphen-base
 DEPENDS+=      tex-hyph-utf8-[0-9]*:../../print/tex-hyph-utf8
 

Index: pkgsrc/print/tex-hyphen-turkish/Makefile
diff -u pkgsrc/print/tex-hyphen-turkish/Makefile:1.6 pkgsrc/print/tex-hyphen-turkish/Makefile:1.7
--- pkgsrc/print/tex-hyphen-turkish/Makefile:1.6        Thu Jun 16 04:06:09 2016
+++ pkgsrc/print/tex-hyphen-turkish/Makefile    Wed Sep  6 16:49:38 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2016/06/16 04:06:09 markd Exp $
+# $NetBSD: Makefile,v 1.7 2017/09/06 16:49:38 wiz Exp $
 
 DISTNAME=      hyphen-turkish
 PKGNAME=       tex-${DISTNAME}-2016
@@ -8,7 +8,6 @@ MAINTAINER=     minskim%NetBSD.org@localhost
 COMMENT=       Hyphenation patterns for Turkish
 LICENSE=       lppl-1.3c
 
-CONFLICTS+=    teTeX-texmf<=3.0nb12
 DEPENDS+=      tex-hyphen-base-[0-9]*:../../print/tex-hyphen-base
 DEPENDS+=      tex-hyph-utf8-[0-9]*:../../print/tex-hyph-utf8
 

Index: pkgsrc/print/tex-hyphen-ukrainian/Makefile
diff -u pkgsrc/print/tex-hyphen-ukrainian/Makefile:1.7 pkgsrc/print/tex-hyphen-ukrainian/Makefile:1.8
--- pkgsrc/print/tex-hyphen-ukrainian/Makefile:1.7      Thu Jun 16 04:06:09 2016
+++ pkgsrc/print/tex-hyphen-ukrainian/Makefile  Wed Sep  6 16:49:38 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2016/06/16 04:06:09 markd Exp $
+# $NetBSD: Makefile,v 1.8 2017/09/06 16:49:38 wiz Exp $
 
 DISTNAME=      hyphen-ukrainian
 PKGNAME=       tex-${DISTNAME}-2016
@@ -8,7 +8,6 @@ MAINTAINER=     minskim%NetBSD.org@localhost
 COMMENT=       Hyphenation patterns for Ukrainian
 LICENSE=       lppl-1.3c
 
-CONFLICTS+=    teTeX-texmf<=3.0nb12
 DEPENDS+=      tex-hyphen-base-[0-9]*:../../print/tex-hyphen-base
 DEPENDS+=      tex-hyph-utf8-[0-9]*:../../print/tex-hyph-utf8
 DEPENDS+=      tex-ukrhyph>=2009:../../print/tex-ukrhyph

Index: pkgsrc/print/tex-hyphen-uppersorbian/Makefile
diff -u pkgsrc/print/tex-hyphen-uppersorbian/Makefile:1.7 pkgsrc/print/tex-hyphen-uppersorbian/Makefile:1.8
--- pkgsrc/print/tex-hyphen-uppersorbian/Makefile:1.7   Thu Jun 16 04:06:09 2016
+++ pkgsrc/print/tex-hyphen-uppersorbian/Makefile       Wed Sep  6 16:49:39 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2016/06/16 04:06:09 markd Exp $
+# $NetBSD: Makefile,v 1.8 2017/09/06 16:49:39 wiz Exp $
 
 DISTNAME=      hyphen-uppersorbian
 PKGNAME=       tex-${DISTNAME}-2016
@@ -8,7 +8,6 @@ MAINTAINER=     minskim%NetBSD.org@localhost
 COMMENT=       Hyphenation patterns for Upper Sorbian
 LICENSE=       lppl-1.3c
 
-CONFLICTS+=    teTeX-texmf<=3.0nb12
 DEPENDS+=      tex-hyphen-base-[0-9]*:../../print/tex-hyphen-base
 DEPENDS+=      tex-hyph-utf8-[0-9]*:../../print/tex-hyph-utf8
 

Index: pkgsrc/print/tex-hyphen-welsh/Makefile
diff -u pkgsrc/print/tex-hyphen-welsh/Makefile:1.6 pkgsrc/print/tex-hyphen-welsh/Makefile:1.7
--- pkgsrc/print/tex-hyphen-welsh/Makefile:1.6  Thu Jun 16 04:06:09 2016
+++ pkgsrc/print/tex-hyphen-welsh/Makefile      Wed Sep  6 16:49:39 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2016/06/16 04:06:09 markd Exp $
+# $NetBSD: Makefile,v 1.7 2017/09/06 16:49:39 wiz Exp $
 
 DISTNAME=      hyphen-welsh
 PKGNAME=       tex-${DISTNAME}-2016
@@ -8,7 +8,6 @@ MAINTAINER=     minskim%NetBSD.org@localhost
 COMMENT=       Hyphenation patterns for Welsh
 LICENSE=       lppl-1.3c
 
-CONFLICTS+=    teTeX-texmf<=3.0nb12
 DEPENDS+=      tex-hyphen-base-[0-9]*:../../print/tex-hyphen-base
 DEPENDS+=      tex-hyph-utf8-[0-9]*:../../print/tex-hyph-utf8
 

Index: pkgsrc/print/tex-hyphenat/Makefile
diff -u pkgsrc/print/tex-hyphenat/Makefile:1.2 pkgsrc/print/tex-hyphenat/Makefile:1.3
--- pkgsrc/print/tex-hyphenat/Makefile:1.2      Wed Mar  7 04:03:13 2012
+++ pkgsrc/print/tex-hyphenat/Makefile  Wed Sep  6 16:49:39 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2012/03/07 04:03:13 minskim Exp $
+# $NetBSD: Makefile,v 1.3 2017/09/06 16:49:39 wiz Exp $
 
 DISTNAME=      hyphenat
 PKGNAME=       tex-${DISTNAME}-2.3c
@@ -7,7 +7,6 @@ TEXLIVE_REV=    15878
 MAINTAINER=    minskim%NetBSD.org@localhost
 COMMENT=       Disable/enable hypenation in LaTeX
 
-CONFLICTS=     teTeX-texmf<=3.0nb29
 DEPENDS+=      tex-latex-bin-[0-9]*:../../print/tex-latex-bin
 
 .include "../../print/texlive/package.mk"

Index: pkgsrc/print/tex-index/Makefile
diff -u pkgsrc/print/tex-index/Makefile:1.1 pkgsrc/print/tex-index/Makefile:1.2
--- pkgsrc/print/tex-index/Makefile:1.1 Fri Nov 16 14:36:27 2012
+++ pkgsrc/print/tex-index/Makefile     Wed Sep  6 16:49:39 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2012/11/16 14:36:27 jaapb Exp $
+# $NetBSD: Makefile,v 1.2 2017/09/06 16:49:39 wiz Exp $
 
 DISTNAME=      index
 PKGNAME=       tex-${DISTNAME}-4.1beta
@@ -7,7 +7,5 @@ TEXLIVE_REV=    24099
 MAINTAINER=    jaapb%NetBSD.org@localhost
 COMMENT=       Reimplementation of LaTeX's indexing macros
 
-CONFLICTS+=    teTeX-texmf<=3.0nb38
-
 .include "../../print/texlive/package.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/print/tex-jurabib/Makefile
diff -u pkgsrc/print/tex-jurabib/Makefile:1.2 pkgsrc/print/tex-jurabib/Makefile:1.3
--- pkgsrc/print/tex-jurabib/Makefile:1.2       Wed Jan 27 10:28:32 2016
+++ pkgsrc/print/tex-jurabib/Makefile   Wed Sep  6 16:49:39 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2016/01/27 10:28:32 markd Exp $
+# $NetBSD: Makefile,v 1.3 2017/09/06 16:49:39 wiz Exp $
 
 DISTNAME=      jurabib
 PKGNAME=       tex-${DISTNAME}-0.6
@@ -8,7 +8,6 @@ MAINTAINER=     minskim%NetBSD.org@localhost
 COMMENT=       BibTeX citation support for the humanities and legal texts
 LICENSE=       gnu-gpl-v2
 
-CONFLICTS=     teTeX-texmf<=3.0nb29
 DEPENDS+=      tex-graphics-[0-9]*:../../print/tex-graphics
 DEPENDS+=      tex-latex-[0-9]*:../../print/tex-latex
 DEPENDS+=      tex-latex-bin-[0-9]*:../../print/tex-latex-bin

Index: pkgsrc/print/tex-koma-script/Makefile
diff -u pkgsrc/print/tex-koma-script/Makefile:1.13 pkgsrc/print/tex-koma-script/Makefile:1.14
--- pkgsrc/print/tex-koma-script/Makefile:1.13  Wed Jun 21 08:28:41 2017
+++ pkgsrc/print/tex-koma-script/Makefile       Wed Sep  6 16:49:39 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2017/06/21 08:28:41 markd Exp $
+# $NetBSD: Makefile,v 1.14 2017/09/06 16:49:39 wiz Exp $
 
 DISTNAME=      koma-script
 PKGNAME=       tex-${DISTNAME}-3.23
@@ -9,7 +9,6 @@ HOMEPAGE=       http://ctan.org/pkg/koma-scrip
 COMMENT=       Bundle of versatile classes and packages
 LICENSE=       lppl-1.3c
 
-CONFLICTS+=    teTeX-texmf<=3.0nb17
 DEPENDS+=      tex-graphics-[0-9]*:../../print/tex-graphics
 
 .include "../../print/texlive/package.mk"

Index: pkgsrc/print/tex-lambda/Makefile
diff -u pkgsrc/print/tex-lambda/Makefile:1.4 pkgsrc/print/tex-lambda/Makefile:1.5
--- pkgsrc/print/tex-lambda/Makefile:1.4        Thu Apr 30 06:56:23 2015
+++ pkgsrc/print/tex-lambda/Makefile    Wed Sep  6 16:49:39 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2015/04/30 06:56:23 markd Exp $
+# $NetBSD: Makefile,v 1.5 2017/09/06 16:49:39 wiz Exp $
 
 DISTNAME=      lambda
 PKGNAME=       tex-${DISTNAME}-2014
@@ -7,7 +7,5 @@ TEXLIVE_REV=    28669
 MAINTAINER=    minskim%NetBSD.org@localhost
 COMMENT=       LaTeX for Omega
 
-CONFLICTS+=    teTeX-texmf<=3.0nb13
-
 .include "../../print/texlive/package.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/print/tex-lastpage/Makefile
diff -u pkgsrc/print/tex-lastpage/Makefile:1.3 pkgsrc/print/tex-lastpage/Makefile:1.4
--- pkgsrc/print/tex-lastpage/Makefile:1.3      Thu Apr 23 11:52:29 2015
+++ pkgsrc/print/tex-lastpage/Makefile  Wed Sep  6 16:49:39 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2015/04/23 11:52:29 markd Exp $
+# $NetBSD: Makefile,v 1.4 2017/09/06 16:49:39 wiz Exp $
 
 DISTNAME=      lastpage
 PKGNAME=       tex-${DISTNAME}-1.2m
@@ -8,7 +8,6 @@ MAINTAINER=     minskim%NetBSD.org@localhost
 COMMENT=       Reference last page for Page N of M type footers
 LICENSE=       lppl-1.3c
 
-CONFLICTS+=    teTeX-texmf<=3.0nb28
 DEPENDS+=      tex-latex-bin>=2009nb1:../../print/tex-latex-bin
 
 .include "../../print/texlive/package.mk"

Index: pkgsrc/print/tex-latex/Makefile
diff -u pkgsrc/print/tex-latex/Makefile:1.13 pkgsrc/print/tex-latex/Makefile:1.14
--- pkgsrc/print/tex-latex/Makefile:1.13        Wed Jun 21 08:28:42 2017
+++ pkgsrc/print/tex-latex/Makefile     Wed Sep  6 16:49:39 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2017/06/21 08:28:42 markd Exp $
+# $NetBSD: Makefile,v 1.14 2017/09/06 16:49:39 wiz Exp $
 
 DISTNAME=      latex
 PKGNAME=       tex-${DISTNAME}-20170101.1
@@ -9,7 +9,6 @@ HOMEPAGE=       http://ctan.org/pkg/latex
 COMMENT=       TeX macro package that defines LaTeX
 LICENSE=       lppl-1.3c
 
-CONFLICTS+=    teTeX-texmf<=3.0nb12
 DEPENDS+=      tex-latexconfig>=2011:../../print/tex-latexconfig
 DEPENDS+=      tex-latex-fonts-[0-9]*:../../fonts/tex-latex-fonts
 DEPENDS+=      tex-luatex-[0-9]*:../../print/tex-luatex

Index: pkgsrc/print/tex-latex-bin/Makefile
diff -u pkgsrc/print/tex-latex-bin/Makefile:1.7 pkgsrc/print/tex-latex-bin/Makefile:1.8
--- pkgsrc/print/tex-latex-bin/Makefile:1.7     Thu Jun 16 04:06:11 2016
+++ pkgsrc/print/tex-latex-bin/Makefile Wed Sep  6 16:49:39 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2016/06/16 04:06:11 markd Exp $
+# $NetBSD: Makefile,v 1.8 2017/09/06 16:49:39 wiz Exp $
 
 DISTNAME=      latex-bin
 PKGNAME=       tex-${DISTNAME}-2016
@@ -7,7 +7,6 @@ TEXLIVE_REV=    40963
 MAINTAINER=    minskim%NetBSD.org@localhost
 COMMENT=       LaTeX executables
 
-CONFLICTS+=    teTeX-texmf<=3.0nb21
 CONFLICTS+=    tex-bin-latex<2009
 DEPENDS+=      tex-latex>=2012:../../print/tex-latex
 DEPENDS+=      tex-tex-ini-files-[0-9]*:../../print/tex-tex-ini-files

Index: pkgsrc/print/tex-latex-doc/Makefile
diff -u pkgsrc/print/tex-latex-doc/Makefile:1.11 pkgsrc/print/tex-latex-doc/Makefile:1.12
--- pkgsrc/print/tex-latex-doc/Makefile:1.11    Wed Jun 21 08:28:42 2017
+++ pkgsrc/print/tex-latex-doc/Makefile Wed Sep  6 16:49:39 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2017/06/21 08:28:42 markd Exp $
+# $NetBSD: Makefile,v 1.12 2017/09/06 16:49:39 wiz Exp $
 
 DISTNAME=      latex.doc
 PKGNAME=       tex-${DISTNAME:S/./-/}-20170101.1
@@ -9,7 +9,5 @@ HOMEPAGE=       http://ctan.org/pkg/latex
 COMMENT=       Documentation for tex-latex
 LICENSE=       lppl-1.3c
 
-CONFLICTS+=    teTeX-texmf<=3.0nb22
-
 .include "../../print/texlive/package.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/print/tex-latexconfig/Makefile
diff -u pkgsrc/print/tex-latexconfig/Makefile:1.12 pkgsrc/print/tex-latexconfig/Makefile:1.13
--- pkgsrc/print/tex-latexconfig/Makefile:1.12  Thu Jun 16 04:06:11 2016
+++ pkgsrc/print/tex-latexconfig/Makefile       Wed Sep  6 16:49:39 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2016/06/16 04:06:11 markd Exp $
+# $NetBSD: Makefile,v 1.13 2017/09/06 16:49:39 wiz Exp $
 
 DISTNAME=      latexconfig
 PKGNAME=       tex-${DISTNAME}-2016
@@ -7,7 +7,6 @@ TEXLIVE_REV=    40274
 MAINTAINER=    minskim%NetBSD.org@localhost
 COMMENT=       Files used to generate LaTeX formats
 
-CONFLICTS+=    teTeX-texmf<=3.0nb12
 CONFLICTS+=    tex-bin-latex<2008.12778nb5
 
 .include "../../print/texlive/package.mk"

Index: pkgsrc/print/tex-lineno/Makefile
diff -u pkgsrc/print/tex-lineno/Makefile:1.2 pkgsrc/print/tex-lineno/Makefile:1.3
--- pkgsrc/print/tex-lineno/Makefile:1.2        Tue Apr 28 20:08:35 2015
+++ pkgsrc/print/tex-lineno/Makefile    Wed Sep  6 16:49:40 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2015/04/28 20:08:35 markd Exp $
+# $NetBSD: Makefile,v 1.3 2017/09/06 16:49:40 wiz Exp $
 
 DISTNAME=      lineno
 PKGNAME=       tex-${DISTNAME}-4.41
@@ -8,7 +8,5 @@ MAINTAINER=     pkgsrc-users%NetBSD.org@localhost
 COMMENT=       Line numbers on paragraphs
 LICENSE=       lppl-1.3c
 
-CONFLICTS+=    teTeX-texmf<=3.0nb43
-
 .include "../../print/texlive/package.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/print/tex-listings/Makefile
diff -u pkgsrc/print/tex-listings/Makefile:1.6 pkgsrc/print/tex-listings/Makefile:1.7
--- pkgsrc/print/tex-listings/Makefile:1.6      Sun Aug  2 11:19:20 2015
+++ pkgsrc/print/tex-listings/Makefile  Wed Sep  6 16:49:40 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2015/08/02 11:19:20 markd Exp $
+# $NetBSD: Makefile,v 1.7 2017/09/06 16:49:40 wiz Exp $
 
 DISTNAME=      listings
 PKGNAME=       tex-${DISTNAME}-1.6
@@ -9,7 +9,6 @@ HOMEPAGE=       http://ctan.org/pkg/listings
 COMMENT=       Typeset source code listings using LaTeX
 LICENSE=       lppl-1.3c
 
-CONFLICTS+=    teTeX-texmf<=3.0nb20
 DEPENDS+=      tex-algorithms-[0-9]*:../../print/tex-algorithms
 DEPENDS+=      tex-fancyvrb-[0-9]*:../../print/tex-fancyvrb
 DEPENDS+=      tex-graphics-[0-9]*:../../print/tex-graphics

Index: pkgsrc/print/tex-listings-doc/Makefile
diff -u pkgsrc/print/tex-listings-doc/Makefile:1.6 pkgsrc/print/tex-listings-doc/Makefile:1.7
--- pkgsrc/print/tex-listings-doc/Makefile:1.6  Sun Aug  2 11:19:20 2015
+++ pkgsrc/print/tex-listings-doc/Makefile      Wed Sep  6 16:49:40 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2015/08/02 11:19:20 markd Exp $
+# $NetBSD: Makefile,v 1.7 2017/09/06 16:49:40 wiz Exp $
 
 DISTNAME=      listings.doc
 PKGNAME=       tex-${DISTNAME:S/./-/}-1.6
@@ -9,7 +9,5 @@ HOMEPAGE=       http://ctan.org/pkg/listings
 COMMENT=       Documentation for tex-listings
 LICENSE=       lppl-1.3c
 
-CONFLICTS+=    teTeX-texmf<=3.0nb20
-
 .include "../../print/texlive/package.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/print/tex-mdwtools/Makefile
diff -u pkgsrc/print/tex-mdwtools/Makefile:1.1.1.1 pkgsrc/print/tex-mdwtools/Makefile:1.2
--- pkgsrc/print/tex-mdwtools/Makefile:1.1.1.1  Wed Apr 18 19:31:47 2012
+++ pkgsrc/print/tex-mdwtools/Makefile  Wed Sep  6 16:49:40 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2012/04/18 19:31:47 minskim Exp $
+# $NetBSD: Makefile,v 1.2 2017/09/06 16:49:40 wiz Exp $
 
 DISTNAME=      mdwtools
 PKGNAME=       tex-${DISTNAME}-1.05.4
@@ -8,7 +8,6 @@ MAINTAINER=     pkgsrc-users%NetBSD.org@localhost
 COMMENT=       Miscellaneous LaTeX tools by Mark Wooding
 LICENSE=       gnu-gpl-v2
 
-CONFLICTS=     teTeX-texmf<3.0nb35
 DEPENDS+=      tex-latex-bin-[0-9]*:../../print/tex-latex-bin
 
 .include "../../print/texlive/package.mk"

Index: pkgsrc/print/tex-memoir/Makefile
diff -u pkgsrc/print/tex-memoir/Makefile:1.10 pkgsrc/print/tex-memoir/Makefile:1.11
--- pkgsrc/print/tex-memoir/Makefile:1.10       Thu Jun 16 04:06:12 2016
+++ pkgsrc/print/tex-memoir/Makefile    Wed Sep  6 16:49:40 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2016/06/16 04:06:12 markd Exp $
+# $NetBSD: Makefile,v 1.11 2017/09/06 16:49:40 wiz Exp $
 
 DISTNAME=      memoir
 PKGNAME=       tex-${DISTNAME}-3.7f
@@ -9,7 +9,6 @@ HOMEPAGE=       http://ctan.org/pkg/memoir
 COMMENT=       Typeset fiction, non-fiction and mathematical books
 LICENSE=       lppl-1.3c
 
-CONFLICTS+=    teTeX-texmf<=3.0nb17
 DEPENDS+=      tex-ifxetex>=0.6:../../print/tex-ifxetex
 DEPENDS+=      tex-oberdiek>=2009nb1:../../print/tex-oberdiek
 

Index: pkgsrc/print/tex-memoir-doc/Makefile
diff -u pkgsrc/print/tex-memoir-doc/Makefile:1.9 pkgsrc/print/tex-memoir-doc/Makefile:1.10
--- pkgsrc/print/tex-memoir-doc/Makefile:1.9    Thu Jun 16 04:06:12 2016
+++ pkgsrc/print/tex-memoir-doc/Makefile        Wed Sep  6 16:49:40 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2016/06/16 04:06:12 markd Exp $
+# $NetBSD: Makefile,v 1.10 2017/09/06 16:49:40 wiz Exp $
 
 DISTNAME=      memoir.doc
 PKGNAME=       tex-${DISTNAME:S/./-/}-3.7f
@@ -9,7 +9,5 @@ HOMEPAGE=       http://ctan.org/pkg/memoir
 COMMENT=       Documentation for tex-memoir
 LICENSE=       lppl-1.3c
 
-CONFLICTS+=    teTeX-texmf<=3.0nb17
-
 .include "../../print/texlive/package.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/print/tex-mex/Makefile
diff -u pkgsrc/print/tex-mex/Makefile:1.1 pkgsrc/print/tex-mex/Makefile:1.2
--- pkgsrc/print/tex-mex/Makefile:1.1   Tue Sep 20 13:08:17 2016
+++ pkgsrc/print/tex-mex/Makefile       Wed Sep  6 16:49:40 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2016/09/20 13:08:17 markd Exp $
+# $NetBSD: Makefile,v 1.2 2017/09/06 16:49:40 wiz Exp $
 
 DISTNAME=      mex
 PKGNAME=       tex-${DISTNAME}-1.05
@@ -15,8 +15,6 @@ DEPENDS+=     tex-pdftex-[0-9]*:../../print/
 DEPENDS+=      tex-tex-[0-9]*:../../print/tex-tex
 #DEPENDS+=     tex-utf8mex-[0-9]*:../../print/tex-utf8mex
 
-CONFLICTS+=    teTeX-texmf<=3.0nb56
-
 INSTALLATION_DIRS+=    bin
 
 TEX_FORMATS+=  "mex pdftex mexconf.tex -translate-file=cp227.tcx *mex.ini\\npdfmex pdftex mexconf.tex -translate-file=cp227.tcx *pdfmex.ini\\n"

Index: pkgsrc/print/tex-mfnfss/Makefile
diff -u pkgsrc/print/tex-mfnfss/Makefile:1.3 pkgsrc/print/tex-mfnfss/Makefile:1.4
--- pkgsrc/print/tex-mfnfss/Makefile:1.3        Wed Jan 27 10:13:20 2016
+++ pkgsrc/print/tex-mfnfss/Makefile    Wed Sep  6 16:49:40 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2016/01/27 10:13:20 markd Exp $
+# $NetBSD: Makefile,v 1.4 2017/09/06 16:49:40 wiz Exp $
 
 DISTNAME=      mfnfss
 PKGNAME=       tex-${DISTNAME}-2009
@@ -8,7 +8,5 @@ MAINTAINER=     minskim%NetBSD.org@localhost
 COMMENT=       Packages to typeset oldgerman and pandora fonts in LaTeX
 LICENSE=       lppl-1.3c
 
-CONFLICTS+=    teTeX-texmf<=3.0nb24
-
 .include "../../print/texlive/package.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/print/tex-mfnfss-doc/Makefile
diff -u pkgsrc/print/tex-mfnfss-doc/Makefile:1.3 pkgsrc/print/tex-mfnfss-doc/Makefile:1.4
--- pkgsrc/print/tex-mfnfss-doc/Makefile:1.3    Wed Jan 27 10:13:20 2016
+++ pkgsrc/print/tex-mfnfss-doc/Makefile        Wed Sep  6 16:49:40 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2016/01/27 10:13:20 markd Exp $
+# $NetBSD: Makefile,v 1.4 2017/09/06 16:49:40 wiz Exp $
 
 DISTNAME=      mfnfss.doc
 PKGNAME=       tex-${DISTNAME:S/./-/}-2009
@@ -8,7 +8,5 @@ MAINTAINER=     minskim%NetBSD.org@localhost
 COMMENT=       Documentation for tex-mfnfss
 LICENSE=       lppl-1.3c
 
-CONFLICTS+=    teTeX-texmf<=3.0nb24
-
 .include "../../print/texlive/package.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/print/tex-microtype/Makefile
diff -u pkgsrc/print/tex-microtype/Makefile:1.6 pkgsrc/print/tex-microtype/Makefile:1.7
--- pkgsrc/print/tex-microtype/Makefile:1.6     Thu Aug 17 03:50:19 2017
+++ pkgsrc/print/tex-microtype/Makefile Wed Sep  6 16:49:40 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2017/08/17 03:50:19 markd Exp $
+# $NetBSD: Makefile,v 1.7 2017/09/06 16:49:40 wiz Exp $
 
 DISTNAME=      microtype
 PKGNAME=       tex-${DISTNAME}-2.7
@@ -9,7 +9,6 @@ HOMEPAGE=       http://ctan.org/pkg/microtype
 COMMENT=       Interface to the micro-typographic features of pdfTeX
 LICENSE=       lppl-1.3c
 
-CONFLICTS+=    teTeX-texmf<=3.0nb17
 DEPENDS+=      tex-graphics-[0-9]*:../../print/tex-graphics
 DEPENDS+=      tex-pdftex>=1.30:../../print/tex-pdftex
 

Index: pkgsrc/print/tex-microtype-doc/Makefile
diff -u pkgsrc/print/tex-microtype-doc/Makefile:1.6 pkgsrc/print/tex-microtype-doc/Makefile:1.7
--- pkgsrc/print/tex-microtype-doc/Makefile:1.6 Thu Aug 17 03:50:19 2017
+++ pkgsrc/print/tex-microtype-doc/Makefile     Wed Sep  6 16:49:40 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2017/08/17 03:50:19 markd Exp $
+# $NetBSD: Makefile,v 1.7 2017/09/06 16:49:40 wiz Exp $
 
 DISTNAME=      microtype.doc
 PKGNAME=       tex-${DISTNAME:S/./-/}-2.7
@@ -9,7 +9,5 @@ HOMEPAGE=       http://ctan.org/pkg/microtype
 COMMENT=       Documentation for tex-microtype
 LICENSE=       lppl-1.3c
 
-CONFLICTS+=    teTeX-texmf<=3.0nb17
-
 .include "../../print/texlive/package.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/print/tex-minitoc/Makefile
diff -u pkgsrc/print/tex-minitoc/Makefile:1.2 pkgsrc/print/tex-minitoc/Makefile:1.3
--- pkgsrc/print/tex-minitoc/Makefile:1.2       Sun Aug  2 12:21:43 2015
+++ pkgsrc/print/tex-minitoc/Makefile   Wed Sep  6 16:49:40 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2015/08/02 12:21:43 markd Exp $
+# $NetBSD: Makefile,v 1.3 2017/09/06 16:49:40 wiz Exp $
 
 DISTNAME=      minitoc
 PKGNAME=       tex-${DISTNAME}-61
@@ -9,7 +9,6 @@ HOMEPAGE=       http://ctan.org/pkg/minitoc
 COMMENT=       Produce a table of contents for each chapter, part or section
 LICENSE=       lppl-1.3c
 
-CONFLICTS+=    teTeX-texmf<3.0nb29
 DEPENDS+=      tex-cmsd>=2010:../../fonts/tex-cmsd
 DEPENDS+=      tex-latex>=2010:../../print/tex-latex
 DEPENDS+=      tex-latex-bin>=2010:../../print/tex-latex-bin

Index: pkgsrc/print/tex-minitoc-doc/Makefile
diff -u pkgsrc/print/tex-minitoc-doc/Makefile:1.2 pkgsrc/print/tex-minitoc-doc/Makefile:1.3
--- pkgsrc/print/tex-minitoc-doc/Makefile:1.2   Sun Aug  2 12:21:43 2015
+++ pkgsrc/print/tex-minitoc-doc/Makefile       Wed Sep  6 16:49:40 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2015/08/02 12:21:43 markd Exp $
+# $NetBSD: Makefile,v 1.3 2017/09/06 16:49:40 wiz Exp $
 
 DISTNAME=      minitoc.doc
 PKGNAME=       tex-${DISTNAME:S/./-/}-61
@@ -9,7 +9,5 @@ HOMEPAGE=       http://ctan.org/pkg/minitoc
 COMMENT=       Documentation for tex-minitoc
 LICENSE=       lppl-1.3c
 
-CONFLICTS+=    teTeX-texmf<3.0nb29
-
 .include "../../print/texlive/package.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/print/tex-misc209/Makefile
diff -u pkgsrc/print/tex-misc209/Makefile:1.1 pkgsrc/print/tex-misc209/Makefile:1.2
--- pkgsrc/print/tex-misc209/Makefile:1.1       Sat Oct 19 20:43:39 2013
+++ pkgsrc/print/tex-misc209/Makefile   Wed Sep  6 16:49:41 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2013/10/19 20:43:39 markd Exp $
+# $NetBSD: Makefile,v 1.2 2017/09/06 16:49:41 wiz Exp $
 
 DISTNAME=      misc209
 PKGNAME=       tex-${DISTNAME}-18001
@@ -7,7 +7,5 @@ TEXLIVE_REV=    18001
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 COMMENT=       miscellaneous TeX .sty files
 
-CONFLICTS+=    teTeX-texmf<=3.0nb42
-
 .include "../../print/texlive/package.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/print/tex-mltex/Makefile
diff -u pkgsrc/print/tex-mltex/Makefile:1.1 pkgsrc/print/tex-mltex/Makefile:1.2
--- pkgsrc/print/tex-mltex/Makefile:1.1 Sat Oct 19 20:43:39 2013
+++ pkgsrc/print/tex-mltex/Makefile     Wed Sep  6 16:49:41 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2013/10/19 20:43:39 markd Exp $
+# $NetBSD: Makefile,v 1.2 2017/09/06 16:49:41 wiz Exp $
 
 DISTNAME=      mltex
 PKGNAME=       tex-${DISTNAME}-2.2
@@ -7,7 +7,6 @@ TEXLIVE_REV=    30214
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 COMMENT=       The MLTeX system
 
-CONFLICTS+=    teTeX-texmf<=3.0nb42
 DEPENDS+=      tex-latex>=2012:../../print/tex-latex
 
 INSTALLATION_DIRS=     bin

Index: pkgsrc/print/tex-moreverb/Makefile
diff -u pkgsrc/print/tex-moreverb/Makefile:1.5 pkgsrc/print/tex-moreverb/Makefile:1.6
--- pkgsrc/print/tex-moreverb/Makefile:1.5      Wed Jan 27 10:13:21 2016
+++ pkgsrc/print/tex-moreverb/Makefile  Wed Sep  6 16:49:41 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2016/01/27 10:13:21 markd Exp $
+# $NetBSD: Makefile,v 1.6 2017/09/06 16:49:41 wiz Exp $
 
 DISTNAME=      moreverb
 PKGNAME=       tex-${DISTNAME}-2.3a
@@ -8,7 +8,6 @@ MAINTAINER=     minskim%NetBSD.org@localhost
 COMMENT=       Extended verbatim
 LICENSE=       lppl-1.3c
 
-CONFLICTS+=    teTeX-texmf<=3.0nb17
 DEPENDS+=      tex-tools-[0-9]*:../../print/tex-tools
 
 .include "../../print/texlive/package.mk"

Index: pkgsrc/print/tex-ms/Makefile
diff -u pkgsrc/print/tex-ms/Makefile:1.5 pkgsrc/print/tex-ms/Makefile:1.6
--- pkgsrc/print/tex-ms/Makefile:1.5    Wed Jan 27 10:13:21 2016
+++ pkgsrc/print/tex-ms/Makefile        Wed Sep  6 16:49:41 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2016/01/27 10:13:21 markd Exp $
+# $NetBSD: Makefile,v 1.6 2017/09/06 16:49:41 wiz Exp $
 
 DISTNAME=      ms
 PKGNAME=       tex-${DISTNAME}-2014
@@ -8,7 +8,6 @@ MAINTAINER=     minskim%NetBSD.org@localhost
 COMMENT=       Various LaTeX packages by Martin Schroeder
 LICENSE=       lppl-1.3c
 
-CONFLICTS+=    teTeX-texmf<=3.0nb17
 DEPENDS+=      tex-footmisc-[0-9]*:../../print/tex-footmisc
 DEPENDS+=      tex-koma-script-[0-9]*:../../print/tex-koma-script
 DEPENDS+=      tex-latex-[0-9]*:../../print/tex-latex

Index: pkgsrc/print/tex-ms-doc/Makefile
diff -u pkgsrc/print/tex-ms-doc/Makefile:1.5 pkgsrc/print/tex-ms-doc/Makefile:1.6
--- pkgsrc/print/tex-ms-doc/Makefile:1.5        Wed Jan 27 10:13:21 2016
+++ pkgsrc/print/tex-ms-doc/Makefile    Wed Sep  6 16:49:41 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2016/01/27 10:13:21 markd Exp $
+# $NetBSD: Makefile,v 1.6 2017/09/06 16:49:41 wiz Exp $
 
 DISTNAME=      ms.doc
 PKGNAME=       tex-${DISTNAME:S/./-/}-2014
@@ -8,7 +8,5 @@ MAINTAINER=     minskim%NetBSD.org@localhost
 COMMENT=       Documentation for tex-ms
 LICENSE=       lppl-1.3c
 
-CONFLICTS+=    teTeX-texmf<=3.0nb17
-
 .include "../../print/texlive/package.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/print/tex-multirow/Makefile
diff -u pkgsrc/print/tex-multirow/Makefile:1.5 pkgsrc/print/tex-multirow/Makefile:1.6
--- pkgsrc/print/tex-multirow/Makefile:1.5      Wed Jun 21 10:14:20 2017
+++ pkgsrc/print/tex-multirow/Makefile  Wed Sep  6 16:49:41 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2017/06/21 10:14:20 markd Exp $
+# $NetBSD: Makefile,v 1.6 2017/09/06 16:49:41 wiz Exp $
 
 DISTNAME=      multirow
 PKGNAME=       tex-${DISTNAME}-2.2
@@ -9,7 +9,5 @@ HOMEPAGE=       http://ctan.org/pkg/multirow
 COMMENT=       Create tabular cells spanning multiple rows
 LICENSE=       lppl-1.3c
 
-CONFLICTS+=    teTeX-texmf<=3.0nb16
-
 .include "../../print/texlive/package.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/print/tex-multirow-doc/Makefile
diff -u pkgsrc/print/tex-multirow-doc/Makefile:1.5 pkgsrc/print/tex-multirow-doc/Makefile:1.6
--- pkgsrc/print/tex-multirow-doc/Makefile:1.5  Wed Jun 21 10:14:20 2017
+++ pkgsrc/print/tex-multirow-doc/Makefile      Wed Sep  6 16:49:41 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2017/06/21 10:14:20 markd Exp $
+# $NetBSD: Makefile,v 1.6 2017/09/06 16:49:41 wiz Exp $
 
 DISTNAME=      multirow.doc
 PKGNAME=       tex-${DISTNAME:S/./-/}-2.2
@@ -9,7 +9,5 @@ HOMEPAGE=       http://ctan.org/pkg/multirow
 COMMENT=       Documentation for tex-multirow
 LICENSE=       lppl-1.3c
 
-CONFLICTS+=    teTeX-texmf<=3.0nb16
-
 .include "../../print/texlive/package.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/print/tex-mwcls/Makefile
diff -u pkgsrc/print/tex-mwcls/Makefile:1.2 pkgsrc/print/tex-mwcls/Makefile:1.3
--- pkgsrc/print/tex-mwcls/Makefile:1.2 Wed Jun 21 10:14:20 2017
+++ pkgsrc/print/tex-mwcls/Makefile     Wed Sep  6 16:49:41 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2017/06/21 10:14:20 markd Exp $
+# $NetBSD: Makefile,v 1.3 2017/09/06 16:49:41 wiz Exp $
 
 DISTNAME=      mwcls
 PKGNAME=       tex-${DISTNAME}-0.75
@@ -9,7 +9,5 @@ HOMEPAGE=       http://ctan.org/pkg/mwcls
 COMMENT=       Polish-oriented document classes
 LICENSE=       lppl-1.2
 
-CONFLICTS+=    teTeX-texmf<=3.0nb56
-
 .include "../../print/texlive/package.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/print/tex-natbib/Makefile
diff -u pkgsrc/print/tex-natbib/Makefile:1.5 pkgsrc/print/tex-natbib/Makefile:1.6
--- pkgsrc/print/tex-natbib/Makefile:1.5        Wed Jan 27 10:00:25 2016
+++ pkgsrc/print/tex-natbib/Makefile    Wed Sep  6 16:49:41 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2016/01/27 10:00:25 markd Exp $
+# $NetBSD: Makefile,v 1.6 2017/09/06 16:49:41 wiz Exp $
 
 DISTNAME=      natbib
 PKGNAME=       tex-${DISTNAME}-8.31b
@@ -8,7 +8,6 @@ MAINTAINER=     minskim%NetBSD.org@localhost
 COMMENT=       Flexible bibliography support for BibTeX
 LICENSE=       lppl-1.3c
 
-CONFLICTS+=    teTeX-texmf<=3.0nb13
 DEPENDS+=      tex-latex-bin-[0-9]*:../../print/tex-latex-bin
 DEPENDS+=      web2c-[0-9]*:../../print/web2c
 

Index: pkgsrc/print/tex-natbib-doc/Makefile
diff -u pkgsrc/print/tex-natbib-doc/Makefile:1.4 pkgsrc/print/tex-natbib-doc/Makefile:1.5
--- pkgsrc/print/tex-natbib-doc/Makefile:1.4    Wed Jan 27 10:00:25 2016
+++ pkgsrc/print/tex-natbib-doc/Makefile        Wed Sep  6 16:49:41 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2016/01/27 10:00:25 markd Exp $
+# $NetBSD: Makefile,v 1.5 2017/09/06 16:49:41 wiz Exp $
 
 DISTNAME=      natbib.doc
 PKGNAME=       tex-${DISTNAME:S/./-/}-8.31b
@@ -8,7 +8,5 @@ MAINTAINER=     minskim%NetBSD.org@localhost
 COMMENT=       Documentation for tex-natbib
 LICENSE=       lppl-1.3c
 
-CONFLICTS+=    teTeX-texmf<=3.0nb13
-
 .include "../../print/texlive/package.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/print/tex-nomencl/Makefile
diff -u pkgsrc/print/tex-nomencl/Makefile:1.4 pkgsrc/print/tex-nomencl/Makefile:1.5
--- pkgsrc/print/tex-nomencl/Makefile:1.4       Wed Jan 27 10:00:26 2016
+++ pkgsrc/print/tex-nomencl/Makefile   Wed Sep  6 16:49:41 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2016/01/27 10:00:26 markd Exp $
+# $NetBSD: Makefile,v 1.5 2017/09/06 16:49:41 wiz Exp $
 
 DISTNAME=      nomencl
 PKGNAME=       tex-${DISTNAME}-3.1a
@@ -9,7 +9,5 @@ MAINTAINER=     minskim%NetBSD.org@localhost
 COMMENT=       Produce lists of symbols as in nomenclature
 LICENSE=       lppl-1.3c
 
-CONFLICTS+=    teTeX-texmf<=3.0nb20
-
 .include "../../print/texlive/package.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/print/tex-nomencl-doc/Makefile
diff -u pkgsrc/print/tex-nomencl-doc/Makefile:1.4 pkgsrc/print/tex-nomencl-doc/Makefile:1.5
--- pkgsrc/print/tex-nomencl-doc/Makefile:1.4   Wed Jan 27 10:00:26 2016
+++ pkgsrc/print/tex-nomencl-doc/Makefile       Wed Sep  6 16:49:41 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2016/01/27 10:00:26 markd Exp $
+# $NetBSD: Makefile,v 1.5 2017/09/06 16:49:41 wiz Exp $
 
 DISTNAME=      nomencl.doc
 PKGNAME=       tex-${DISTNAME:S/./-/}-3.1a
@@ -9,7 +9,5 @@ MAINTAINER=     minskim%NetBSD.org@localhost
 COMMENT=       Documentation for tex-nomencl
 LICENSE=       lppl-1.3c
 
-CONFLICTS+=    teTeX-texmf<=3.0nb20
-
 .include "../../print/texlive/package.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/print/tex-ntgclass/Makefile
diff -u pkgsrc/print/tex-ntgclass/Makefile:1.2 pkgsrc/print/tex-ntgclass/Makefile:1.3
--- pkgsrc/print/tex-ntgclass/Makefile:1.2      Wed Jan 27 10:00:26 2016
+++ pkgsrc/print/tex-ntgclass/Makefile  Wed Sep  6 16:49:42 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2016/01/27 10:00:26 markd Exp $
+# $NetBSD: Makefile,v 1.3 2017/09/06 16:49:42 wiz Exp $
 
 DISTNAME=      ntgclass
 PKGNAME=       tex-${DISTNAME}-2010
@@ -8,7 +8,6 @@ MAINTAINER=     minskim%NetBSD.org@localhost
 COMMENT=       European versions of standard classes
 LICENSE=       lppl-1.3c
 
-CONFLICTS=     teTeX-texmf<=3.0nb29
 DEPENDS+=      tex-latex-[0-9]*:../../print/tex-latex
 DEPENDS+=      tex-latex-bin-[0-9]*:../../print/tex-latex-bin
 

Index: pkgsrc/print/tex-ntgclass-doc/Makefile
diff -u pkgsrc/print/tex-ntgclass-doc/Makefile:1.2 pkgsrc/print/tex-ntgclass-doc/Makefile:1.3
--- pkgsrc/print/tex-ntgclass-doc/Makefile:1.2  Wed Jan 27 10:00:26 2016
+++ pkgsrc/print/tex-ntgclass-doc/Makefile      Wed Sep  6 16:49:42 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2016/01/27 10:00:26 markd Exp $
+# $NetBSD: Makefile,v 1.3 2017/09/06 16:49:42 wiz Exp $
 
 DISTNAME=      ntgclass.doc
 PKGNAME=       tex-${DISTNAME:S/./-/}-2010
@@ -8,7 +8,5 @@ MAINTAINER=     minskim%NetBSD.org@localhost
 COMMENT=       Documentation for tex-ntgclass
 LICENSE=       lppl-1.3c
 
-CONFLICTS=     teTeX-texmf<=3.0nb29
-
 .include "../../print/texlive/package.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/print/tex-ntheorem/Makefile
diff -u pkgsrc/print/tex-ntheorem/Makefile:1.1 pkgsrc/print/tex-ntheorem/Makefile:1.2
--- pkgsrc/print/tex-ntheorem/Makefile:1.1      Sat Aug 24 10:57:01 2013
+++ pkgsrc/print/tex-ntheorem/Makefile  Wed Sep  6 16:49:42 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2013/08/24 10:57:01 jaapb Exp $
+# $NetBSD: Makefile,v 1.2 2017/09/06 16:49:42 wiz Exp $
 
 DISTNAME=      ntheorem
 PKGNAME=       tex-${DISTNAME}-1.31
@@ -7,10 +7,7 @@ TEXLIVE_USE_CTAN=      yes
 
 MAINTAINER=    jaapb%NetBSD.org@localhost
 COMMENT=       Enhanced theorem environment for LaTeX
-
 LICENSE=       lppl-1.3c
 
-CONFLICTS+=    teTeX-texmf<3.0nb40
-
 .include "../../print/texlive/package.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/print/tex-ntheorem-doc/Makefile
diff -u pkgsrc/print/tex-ntheorem-doc/Makefile:1.1 pkgsrc/print/tex-ntheorem-doc/Makefile:1.2
--- pkgsrc/print/tex-ntheorem-doc/Makefile:1.1  Sat Aug 24 10:58:18 2013
+++ pkgsrc/print/tex-ntheorem-doc/Makefile      Wed Sep  6 16:49:42 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2013/08/24 10:58:18 jaapb Exp $
+# $NetBSD: Makefile,v 1.2 2017/09/06 16:49:42 wiz Exp $
 
 DISTNAME=      ntheorem.doc
 PKGNAME=       tex-${DISTNAME}-1.31
@@ -7,10 +7,7 @@ TEXLIVE_USE_CTAN=      yes
 
 MAINTAINER=    jaapb%NetBSD.org@localhost
 COMMENT=       Documentation for tex-ntheorem
-
 LICENSE=       lppl-1.3c
 
-CONFLICTS+=    teTeX-texmf<3.0nb40
-
 .include "../../print/texlive/package.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/print/tex-oberdiek/Makefile
diff -u pkgsrc/print/tex-oberdiek/Makefile:1.19 pkgsrc/print/tex-oberdiek/Makefile:1.20
--- pkgsrc/print/tex-oberdiek/Makefile:1.19     Wed Jun 21 10:14:21 2017
+++ pkgsrc/print/tex-oberdiek/Makefile  Wed Sep  6 16:49:42 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2017/06/21 10:14:21 markd Exp $
+# $NetBSD: Makefile,v 1.20 2017/09/06 16:49:42 wiz Exp $
 
 DISTNAME=      oberdiek
 PKGNAME=       tex-${DISTNAME}-2017
@@ -9,8 +9,6 @@ HOMEPAGE=       http://ctan.org/pkg/oberdiek
 COMMENT=       Bundle of packages submitted by Heiko Oberdiek
 LICENSE=       lppl-1.3c
 
-CONFLICTS+=    teTeX-texmf<=3.0nb13
-CONFLICTS+=    texlive-pdftools<2011
 DEPENDS+=      tex-amsmath-[0-9]*:../../print/tex-amsmath
 DEPENDS+=      tex-latex-bin-[0-9]*:../../print/tex-latex-bin
 DEPENDS+=      tex-etex-pkg-[0-9]*:../../print/tex-etex-pkg

Index: pkgsrc/print/tex-oberdiek-doc/Makefile
diff -u pkgsrc/print/tex-oberdiek-doc/Makefile:1.11 pkgsrc/print/tex-oberdiek-doc/Makefile:1.12
--- pkgsrc/print/tex-oberdiek-doc/Makefile:1.11 Wed Jun 21 10:14:21 2017
+++ pkgsrc/print/tex-oberdiek-doc/Makefile      Wed Sep  6 16:49:42 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2017/06/21 10:14:21 markd Exp $
+# $NetBSD: Makefile,v 1.12 2017/09/06 16:49:42 wiz Exp $
 
 DISTNAME=      oberdiek.doc
 PKGNAME=       tex-${DISTNAME:S/./-/}-2017
@@ -9,7 +9,5 @@ HOMEPAGE=       http://ctan.org/pkg/oberdiek
 COMMENT=       Documentation for tex-oberdiek
 LICENSE=       lppl-1.3c
 
-CONFLICTS+=    teTeX-texmf<=3.0nb13
-
 .include "../../print/texlive/package.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/print/tex-overpic/Makefile
diff -u pkgsrc/print/tex-overpic/Makefile:1.2 pkgsrc/print/tex-overpic/Makefile:1.3
--- pkgsrc/print/tex-overpic/Makefile:1.2       Tue Apr 28 17:13:59 2015
+++ pkgsrc/print/tex-overpic/Makefile   Wed Sep  6 16:49:42 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2015/04/28 17:13:59 nros Exp $
+# $NetBSD: Makefile,v 1.3 2017/09/06 16:49:42 wiz Exp $
 
 DISTNAME=      overpic
 PKGNAME=       tex-${DISTNAME}-0.53
@@ -8,7 +8,6 @@ MAINTAINER=     pkgsrc-users%NetBSD.org@localhost
 COMMENT=       Combine LaTeX commands over included graphics
 LICENSE=       lppl-1.3c
 
-CONFLICTS+=    teTeX-texmf<=3.0nb44
 DEPENDS+=      tex-graphics-[0-9]*:../../print/tex-graphics
 
 .include "../../print/texlive/package.mk"

Index: pkgsrc/print/tex-paralist/Makefile
diff -u pkgsrc/print/tex-paralist/Makefile:1.7 pkgsrc/print/tex-paralist/Makefile:1.8
--- pkgsrc/print/tex-paralist/Makefile:1.7      Wed Jun 21 11:45:57 2017
+++ pkgsrc/print/tex-paralist/Makefile  Wed Sep  6 16:49:42 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2017/06/21 11:45:57 markd Exp $
+# $NetBSD: Makefile,v 1.8 2017/09/06 16:49:42 wiz Exp $
 
 DISTNAME=      paralist
 PKGNAME=       tex-${DISTNAME}-2.7
@@ -9,7 +9,5 @@ HOMEPAGE=       http://ctan.org/pkg/paralist
 COMMENT=       Enumerate and itemize within paragraphs
 LICENSE=       lppl-1.3c
 
-CONFLICTS+=    teTeX-texmf<=3.0nb17
-
 .include "../../print/texlive/package.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/print/tex-pdfpages/Makefile
diff -u pkgsrc/print/tex-pdfpages/Makefile:1.9 pkgsrc/print/tex-pdfpages/Makefile:1.10
--- pkgsrc/print/tex-pdfpages/Makefile:1.9      Thu Aug 17 03:58:16 2017
+++ pkgsrc/print/tex-pdfpages/Makefile  Wed Sep  6 16:49:42 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2017/08/17 03:58:16 markd Exp $
+# $NetBSD: Makefile,v 1.10 2017/09/06 16:49:42 wiz Exp $
 
 DISTNAME=      pdfpages
 PKGNAME=       tex-${DISTNAME}-0.5j
@@ -9,7 +9,6 @@ HOMEPAGE=       http://ctan.org/pkg/pdfpages
 COMMENT=       Include PDF documents in LaTeX
 LICENSE=       lppl-1.3c
 
-CONFLICTS=     teTeX-texmf<=3.0nb29
 DEPENDS+=      tex-eso-pic-[0-9]*:../../print/tex-eso-pic
 DEPENDS+=      tex-graphics-[0-9]*:../../print/tex-graphics
 DEPENDS+=      tex-latex-[0-9]*:../../print/tex-latex

Index: pkgsrc/print/tex-pdfpages-doc/Makefile
diff -u pkgsrc/print/tex-pdfpages-doc/Makefile:1.8 pkgsrc/print/tex-pdfpages-doc/Makefile:1.9
--- pkgsrc/print/tex-pdfpages-doc/Makefile:1.8  Thu Aug 17 03:58:16 2017
+++ pkgsrc/print/tex-pdfpages-doc/Makefile      Wed Sep  6 16:49:42 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2017/08/17 03:58:16 markd Exp $
+# $NetBSD: Makefile,v 1.9 2017/09/06 16:49:42 wiz Exp $
 
 DISTNAME=      pdfpages.doc
 PKGNAME=       tex-${DISTNAME:S/./-/}-0.5j
@@ -9,7 +9,5 @@ HOMEPAGE=       http://ctan.org/pkg/pdfpages
 COMMENT=       Documentation for tex-pdfpages
 LICENSE=       lppl-1.3c
 
-CONFLICTS=     teTeX-texmf<=3.0nb29
-
 .include "../../print/texlive/package.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/print/tex-pdftex/Makefile
diff -u pkgsrc/print/tex-pdftex/Makefile:1.22 pkgsrc/print/tex-pdftex/Makefile:1.23
--- pkgsrc/print/tex-pdftex/Makefile:1.22       Thu Jun 16 04:06:14 2016
+++ pkgsrc/print/tex-pdftex/Makefile    Wed Sep  6 16:49:42 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2016/06/16 04:06:14 markd Exp $
+# $NetBSD: Makefile,v 1.23 2017/09/06 16:49:42 wiz Exp $
 
 DISTNAME=      pdftex
 PKGNAME=       tex-${DISTNAME}-2016
@@ -9,7 +9,6 @@ HOMEPAGE=       http://ctan.org/pkg/pdftex
 COMMENT=       TeX extension for direct creation of PDF
 LICENSE=       gnu-gpl-v2
 
-CONFLICTS+=    teTeX-bin<=3.0nb29
 DEPENDS+=      tex-dvips-[0-9]*:../../print/tex-dvips
 DEPENDS+=      tex-etex-[0-9]*:../../print/tex-etex
 DEPENDS+=      tex-hyphen-base-[0-9]*:../../print/tex-hyphen-base

Index: pkgsrc/print/tex-picinpar/Makefile
diff -u pkgsrc/print/tex-picinpar/Makefile:1.2 pkgsrc/print/tex-picinpar/Makefile:1.3
--- pkgsrc/print/tex-picinpar/Makefile:1.2      Wed Jan 27 09:46:17 2016
+++ pkgsrc/print/tex-picinpar/Makefile  Wed Sep  6 16:49:42 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2016/01/27 09:46:17 markd Exp $
+# $NetBSD: Makefile,v 1.3 2017/09/06 16:49:42 wiz Exp $
 
 DISTNAME=      picinpar
 PKGNAME=       tex-${DISTNAME}-1.2a
@@ -8,7 +8,5 @@ MAINTAINER=     minskim%NetBSD.org@localhost
 COMMENT=       Insert pictures into paragraphs
 LICENSE=       gnu-gpl-v2
 
-CONFLICTS=     teTeX-texmf<=3.0nb29
-
 .include "../../print/texlive/package.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/print/tex-placeins/Makefile
diff -u pkgsrc/print/tex-placeins/Makefile:1.5 pkgsrc/print/tex-placeins/Makefile:1.6
--- pkgsrc/print/tex-placeins/Makefile:1.5      Wed Jan 27 09:46:17 2016
+++ pkgsrc/print/tex-placeins/Makefile  Wed Sep  6 16:49:42 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2016/01/27 09:46:17 markd Exp $
+# $NetBSD: Makefile,v 1.6 2017/09/06 16:49:42 wiz Exp $
 
 DISTNAME=      placeins
 PKGNAME=       tex-${DISTNAME}-2.2
@@ -8,7 +8,5 @@ MAINTAINER=     minskim%NetBSD.org@localhost
 COMMENT=       TeX command to control float placement
 LICENSE=       public-domain
 
-CONFLICTS+=    teTeX-texmf<=3.0nb13
-
 .include "../../print/texlive/package.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/print/tex-placeins-doc/Makefile
diff -u pkgsrc/print/tex-placeins-doc/Makefile:1.5 pkgsrc/print/tex-placeins-doc/Makefile:1.6
--- pkgsrc/print/tex-placeins-doc/Makefile:1.5  Wed Jan 27 09:46:17 2016
+++ pkgsrc/print/tex-placeins-doc/Makefile      Wed Sep  6 16:49:43 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2016/01/27 09:46:17 markd Exp $
+# $NetBSD: Makefile,v 1.6 2017/09/06 16:49:43 wiz Exp $
 
 DISTNAME=      placeins.doc
 PKGNAME=       tex-${DISTNAME:S/./-/}-2.2
@@ -9,7 +9,5 @@ MAINTAINER=     minskim%NetBSD.org@localhost
 COMMENT=       Documentation for tex-placeins
 LICENSE=       public-domain
 
-CONFLICTS+=    teTeX-texmf<=3.0nb13
-
 .include "../../print/texlive/package.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/print/tex-preprint/Makefile
diff -u pkgsrc/print/tex-preprint/Makefile:1.4 pkgsrc/print/tex-preprint/Makefile:1.5
--- pkgsrc/print/tex-preprint/Makefile:1.4      Sat Apr 25 04:21:21 2015
+++ pkgsrc/print/tex-preprint/Makefile  Wed Sep  6 16:49:43 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2015/04/25 04:21:21 markd Exp $
+# $NetBSD: Makefile,v 1.5 2017/09/06 16:49:43 wiz Exp $
 
 DISTNAME=      preprint
 PKGNAME=       tex-${DISTNAME}-2011
@@ -7,7 +7,5 @@ TEXLIVE_REV=    30447
 MAINTAINER=    minskim%NetBSD.org@localhost
 COMMENT=       Bundle of LaTeX packages provided as-is
 
-CONFLICTS+=    teTeX-texmf<=3.0nb16
-
 .include "../../print/texlive/package.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/print/tex-preprint-doc/Makefile
diff -u pkgsrc/print/tex-preprint-doc/Makefile:1.3 pkgsrc/print/tex-preprint-doc/Makefile:1.4
--- pkgsrc/print/tex-preprint-doc/Makefile:1.3  Sat Apr 25 04:21:21 2015
+++ pkgsrc/print/tex-preprint-doc/Makefile      Wed Sep  6 16:49:43 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2015/04/25 04:21:21 markd Exp $
+# $NetBSD: Makefile,v 1.4 2017/09/06 16:49:43 wiz Exp $
 
 DISTNAME=      preprint.doc
 PKGNAME=       tex-${DISTNAME:S/./-/}-2011
@@ -7,7 +7,5 @@ TEXLIVE_REV=    30447
 MAINTAINER=    minskim%NetBSD.org@localhost
 COMMENT=       Documentation for tex-preprint
 
-CONFLICTS+=    teTeX-texmf<=3.0nb16
-
 .include "../../print/texlive/package.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/print/tex-preview/Makefile
diff -u pkgsrc/print/tex-preview/Makefile:1.6 pkgsrc/print/tex-preview/Makefile:1.7
--- pkgsrc/print/tex-preview/Makefile:1.6       Wed Aug 23 22:37:59 2017
+++ pkgsrc/print/tex-preview/Makefile   Wed Sep  6 16:49:43 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2017/08/23 22:37:59 markd Exp $
+# $NetBSD: Makefile,v 1.7 2017/09/06 16:49:43 wiz Exp $
 
 DISTNAME=      preview
 PKGNAME=       tex-${DISTNAME}-11.91
@@ -9,7 +9,6 @@ HOMEPAGE=       http://ctan.org/pkg/preview
 COMMENT=       Extract bits of a LaTeX source for output
 LICENSE=       gnu-gpl-v3
 
-CONFLICTS=     teTeX-texmf<3.0nb32
 DEPENDS+=      tex-latex-bin-[0-9]*:../../print/tex-latex-bin
 
 .include "../../print/texlive/package.mk"

Index: pkgsrc/print/tex-preview-doc/Makefile
diff -u pkgsrc/print/tex-preview-doc/Makefile:1.6 pkgsrc/print/tex-preview-doc/Makefile:1.7
--- pkgsrc/print/tex-preview-doc/Makefile:1.6   Wed Aug 23 22:37:59 2017
+++ pkgsrc/print/tex-preview-doc/Makefile       Wed Sep  6 16:49:43 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2017/08/23 22:37:59 markd Exp $
+# $NetBSD: Makefile,v 1.7 2017/09/06 16:49:43 wiz Exp $
 
 DISTNAME=      preview.doc
 PKGNAME=       tex-${DISTNAME:S/./-/}-11.91
@@ -9,7 +9,5 @@ HOMEPAGE=       http://ctan.org/pkg/preview
 COMMENT=       Documentation for tex-preview
 LICENSE=       gnu-gpl-v3
 
-CONFLICTS=     teTeX-texmf<3.0nb32
-
 .include "../../print/texlive/package.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/print/tex-psfrag/Makefile
diff -u pkgsrc/print/tex-psfrag/Makefile:1.1 pkgsrc/print/tex-psfrag/Makefile:1.2
--- pkgsrc/print/tex-psfrag/Makefile:1.1        Sun Oct 21 17:54:51 2012
+++ pkgsrc/print/tex-psfrag/Makefile    Wed Sep  6 16:49:43 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2012/10/21 17:54:51 minskim Exp $
+# $NetBSD: Makefile,v 1.2 2017/09/06 16:49:43 wiz Exp $
 
 DISTNAME=      psfrag
 PKGNAME=       tex-${DISTNAME}-3.04
@@ -7,7 +7,6 @@ TEXLIVE_REV=    15878
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 COMMENT=       Replace strings in encapsulated PostScript figures
 
-CONFLICTS+=    teTeX-texmf<=3.0nb37
 DEPENDS+=      tex-graphics-[0-9]*:../../print/tex-graphics
 DEPENDS+=      tex-latex-bin-[0-9]*:../../print/tex-latex-bin
 

Index: pkgsrc/print/tex-pslatex/Makefile
diff -u pkgsrc/print/tex-pslatex/Makefile:1.3 pkgsrc/print/tex-pslatex/Makefile:1.4
--- pkgsrc/print/tex-pslatex/Makefile:1.3       Wed Jan 27 09:46:18 2016
+++ pkgsrc/print/tex-pslatex/Makefile   Wed Sep  6 16:49:43 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2016/01/27 09:46:18 markd Exp $
+# $NetBSD: Makefile,v 1.4 2017/09/06 16:49:43 wiz Exp $
 
 DISTNAME=      pslatex
 PKGNAME=       tex-${DISTNAME}-2009
@@ -9,7 +9,5 @@ MAINTAINER=     minskim%NetBSD.org@localhost
 COMMENT=       Use PostScript fonts by default
 LICENSE=       lppl-1.3c
 
-CONFLICTS+=    teTeX-texmf<=3.0nb24
-
 .include "../../print/texlive/package.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/print/tex-revtex4/Makefile
diff -u pkgsrc/print/tex-revtex4/Makefile:1.1 pkgsrc/print/tex-revtex4/Makefile:1.2
--- pkgsrc/print/tex-revtex4/Makefile:1.1       Sun May  3 10:31:57 2015
+++ pkgsrc/print/tex-revtex4/Makefile   Wed Sep  6 16:49:43 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2015/05/03 10:31:57 markd Exp $
+# $NetBSD: Makefile,v 1.2 2017/09/06 16:49:43 wiz Exp $
 
 DISTNAME=      revtex4
 PKGNAME=       tex-${DISTNAME}-4.0
@@ -7,7 +7,6 @@ TEXLIVE_REV=    16488
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 COMMENT=       style for APS and AIP manuscripts
 
-CONFLICTS+=    teTeX-texmf<=3.0nb47
 DEPENDS+=      tex-amsmath-[0-9]*:../../print/tex-amsmath
 DEPENDS+=      tex-natbib-[0-9]*:../../print/tex-natbib
 DEPENDS+=      tex-url-[0-9]*:../../print/tex-url

Index: pkgsrc/print/tex-rotating/Makefile
diff -u pkgsrc/print/tex-rotating/Makefile:1.4 pkgsrc/print/tex-rotating/Makefile:1.5
--- pkgsrc/print/tex-rotating/Makefile:1.4      Wed Jan 27 09:27:48 2016
+++ pkgsrc/print/tex-rotating/Makefile  Wed Sep  6 16:49:43 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2016/01/27 09:27:48 markd Exp $
+# $NetBSD: Makefile,v 1.5 2017/09/06 16:49:43 wiz Exp $
 
 DISTNAME=      rotating
 PKGNAME=       tex-${DISTNAME}-2.16b
@@ -8,7 +8,6 @@ MAINTAINER=     minskim%NetBSD.org@localhost
 COMMENT=       Rotation tools including rotated full-page floats
 LICENSE=       lppl-1.3c
 
-CONFLICTS+=    teTeX-texmf<=3.0nb13
 DEPENDS+=      tex-latex-bin-[0-9]*:../../print/tex-latex-bin
 DEPENDS+=      tex-graphics-[0-9]*:../../print/tex-graphics
 DEPENDS+=      tex-latex-[0-9]*:../../print/tex-latex

Index: pkgsrc/print/tex-rotating-doc/Makefile
diff -u pkgsrc/print/tex-rotating-doc/Makefile:1.3 pkgsrc/print/tex-rotating-doc/Makefile:1.4
--- pkgsrc/print/tex-rotating-doc/Makefile:1.3  Wed Jan 27 09:27:48 2016
+++ pkgsrc/print/tex-rotating-doc/Makefile      Wed Sep  6 16:49:43 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2016/01/27 09:27:48 markd Exp $
+# $NetBSD: Makefile,v 1.4 2017/09/06 16:49:43 wiz Exp $
 
 DISTNAME=      rotating.doc
 PKGNAME=       tex-${DISTNAME:S/./-/}-2.16b
@@ -8,7 +8,5 @@ MAINTAINER=     minskim%NetBSD.org@localhost
 COMMENT=       Documentation for tex-rotating
 LICENSE=       lppl-1.3c
 
-CONFLICTS+=    teTeX-texmf<=3.0nb13
-
 .include "../../print/texlive/package.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/print/tex-ruhyphen/Makefile
diff -u pkgsrc/print/tex-ruhyphen/Makefile:1.4 pkgsrc/print/tex-ruhyphen/Makefile:1.5
--- pkgsrc/print/tex-ruhyphen/Makefile:1.4      Thu Jan 20 16:27:15 2011
+++ pkgsrc/print/tex-ruhyphen/Makefile  Wed Sep  6 16:49:43 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2011/01/20 16:27:15 minskim Exp $
+# $NetBSD: Makefile,v 1.5 2017/09/06 16:49:43 wiz Exp $
 
 DISTNAME=      ruhyphen
 PKGNAME=       tex-${DISTNAME}-1.6
@@ -7,7 +7,5 @@ TEXLIVE_REV=    21081
 MAINTAINER=    minskim%NetBSD.org@localhost
 COMMENT=       Russian hyphenation
 
-CONFLICTS+=    teTeX-texmf<=3.0nb12
-
 .include "../../print/texlive/package.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/print/tex-sectsty/Makefile
diff -u pkgsrc/print/tex-sectsty/Makefile:1.4 pkgsrc/print/tex-sectsty/Makefile:1.5
--- pkgsrc/print/tex-sectsty/Makefile:1.4       Tue Jan 26 11:25:35 2016
+++ pkgsrc/print/tex-sectsty/Makefile   Wed Sep  6 16:49:43 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2016/01/26 11:25:35 markd Exp $
+# $NetBSD: Makefile,v 1.5 2017/09/06 16:49:43 wiz Exp $
 
 DISTNAME=      sectsty
 PKGNAME=       tex-${DISTNAME}-2.0.2
@@ -9,7 +9,5 @@ MAINTAINER=     minskim%NetBSD.org@localhost
 COMMENT=       Control sectional headers
 LICENSE=       lppl-1.3c
 
-CONFLICTS+=    teTeX-texmf<=3.0nb17
-
 .include "../../print/texlive/package.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/print/tex-seminar/Makefile
diff -u pkgsrc/print/tex-seminar/Makefile:1.3 pkgsrc/print/tex-seminar/Makefile:1.4
--- pkgsrc/print/tex-seminar/Makefile:1.3       Tue Jan 26 11:23:05 2016
+++ pkgsrc/print/tex-seminar/Makefile   Wed Sep  6 16:49:44 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2016/01/26 11:23:05 markd Exp $
+# $NetBSD: Makefile,v 1.4 2017/09/06 16:49:44 wiz Exp $
 
 DISTNAME=      seminar
 PKGNAME=       tex-${DISTNAME}-1.61
@@ -8,7 +8,6 @@ MAINTAINER=     minskim%NetBSD.org@localhost
 COMMENT=       Make overhead slides
 LICENSE=       lppl-1.2
 
-CONFLICTS+=    teTeX-texmf<=3.0nb30
 DEPENDS+=      tex-2up-[0-9]*:../../print/tex-2up
 DEPENDS+=      tex-latex-[0-9]*:../../print/tex-latex
 DEPENDS+=      tex-latex-bin-[0-9]*:../../print/tex-latex-bin

Index: pkgsrc/print/tex-seminar-doc/Makefile
diff -u pkgsrc/print/tex-seminar-doc/Makefile:1.4 pkgsrc/print/tex-seminar-doc/Makefile:1.5
--- pkgsrc/print/tex-seminar-doc/Makefile:1.4   Tue Jan 26 11:23:04 2016
+++ pkgsrc/print/tex-seminar-doc/Makefile       Wed Sep  6 16:49:44 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2016/01/26 11:23:04 markd Exp $
+# $NetBSD: Makefile,v 1.5 2017/09/06 16:49:44 wiz Exp $
 
 DISTNAME=      seminar.doc
 PKGNAME=       tex-${DISTNAME:S/./-/}-1.61
@@ -8,8 +8,6 @@ MAINTAINER=     minskim%NetBSD.org@localhost
 COMMENT=       Documentation for tex-seminar
 LICENSE=       lppl-1.2
 
-CONFLICTS+=    teTeX-texmf<=3.0nb30
-
 REPLACE_SH+=   doc/latex/seminar/run.sh
 
 .include "../../print/texlive/package.mk"

Index: pkgsrc/print/tex-setspace/Makefile
diff -u pkgsrc/print/tex-setspace/Makefile:1.5 pkgsrc/print/tex-setspace/Makefile:1.6
--- pkgsrc/print/tex-setspace/Makefile:1.5      Sat Apr 25 04:36:05 2015
+++ pkgsrc/print/tex-setspace/Makefile  Wed Sep  6 16:49:44 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2015/04/25 04:36:05 markd Exp $
+# $NetBSD: Makefile,v 1.6 2017/09/06 16:49:44 wiz Exp $
 
 DISTNAME=      setspace
 PKGNAME=       tex-${DISTNAME}-6.7a
@@ -8,7 +8,5 @@ MAINTAINER=     minskim%NetBSD.org@localhost
 COMMENT=       Set space between lines
 LICENSE=       lppl-1.3c
 
-CONFLICTS+=    teTeX-texmf<=3.0nb17
-
 .include "../../print/texlive/package.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/print/tex-soul/Makefile
diff -u pkgsrc/print/tex-soul/Makefile:1.2 pkgsrc/print/tex-soul/Makefile:1.3
--- pkgsrc/print/tex-soul/Makefile:1.2  Tue Jan 26 11:15:18 2016
+++ pkgsrc/print/tex-soul/Makefile      Wed Sep  6 16:49:44 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2016/01/26 11:15:18 markd Exp $
+# $NetBSD: Makefile,v 1.3 2017/09/06 16:49:44 wiz Exp $
 
 DISTNAME=      soul
 PKGNAME=       tex-${DISTNAME}-2.4
@@ -8,7 +8,6 @@ MAINTAINER=     minskim%NetBSD.org@localhost
 COMMENT=       Hyphenation for letterspacing, underlining, and more
 LICENSE=       lppl-1.3c
 
-CONFLICTS=     teTeX-texmf<=3.0nb29
 DEPENDS+=      tex-latex-bin-[0-9]*:../../print/tex-latex-bin
 
 .include "../../print/texlive/package.mk"

Index: pkgsrc/print/tex-subfig/Makefile
diff -u pkgsrc/print/tex-subfig/Makefile:1.3 pkgsrc/print/tex-subfig/Makefile:1.4
--- pkgsrc/print/tex-subfig/Makefile:1.3        Tue Jan 26 11:08:59 2016
+++ pkgsrc/print/tex-subfig/Makefile    Wed Sep  6 16:49:44 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2016/01/26 11:08:59 markd Exp $
+# $NetBSD: Makefile,v 1.4 2017/09/06 16:49:44 wiz Exp $
 
 DISTNAME=      subfig
 PKGNAME=       tex-${DISTNAME}-1.3
@@ -8,7 +8,6 @@ MAINTAINER=     minskim%NetBSD.org@localhost
 COMMENT=       Figures broken into subfigures
 LICENSE=       lppl-1.3c
 
-CONFLICTS+=    teTeX-texmf<=3.0nb19
 DEPENDS+=      tex-caption-[0-9]*:../../print/tex-caption
 DEPENDS+=      tex-graphics-[0-9]*:../../print/tex-graphics
 

Index: pkgsrc/print/tex-subfig-doc/Makefile
diff -u pkgsrc/print/tex-subfig-doc/Makefile:1.3 pkgsrc/print/tex-subfig-doc/Makefile:1.4
--- pkgsrc/print/tex-subfig-doc/Makefile:1.3    Tue Jan 26 11:08:59 2016
+++ pkgsrc/print/tex-subfig-doc/Makefile        Wed Sep  6 16:49:44 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2016/01/26 11:08:59 markd Exp $
+# $NetBSD: Makefile,v 1.4 2017/09/06 16:49:44 wiz Exp $
 
 DISTNAME=      subfig.doc
 PKGNAME=       tex-${DISTNAME:S/./-/}-1.3
@@ -8,7 +8,5 @@ MAINTAINER=     minskim%NetBSD.org@localhost
 COMMENT=       Documentation for tex-subfig
 LICENSE=       lppl-1.3c
 
-CONFLICTS+=    teTeX-texmf<=3.0nb19
-
 .include "../../print/texlive/package.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/print/tex-subfigure/Makefile
diff -u pkgsrc/print/tex-subfigure/Makefile:1.4 pkgsrc/print/tex-subfigure/Makefile:1.5
--- pkgsrc/print/tex-subfigure/Makefile:1.4     Tue Jan 26 11:06:05 2016
+++ pkgsrc/print/tex-subfigure/Makefile Wed Sep  6 16:49:44 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2016/01/26 11:06:05 markd Exp $
+# $NetBSD: Makefile,v 1.5 2017/09/06 16:49:44 wiz Exp $
 
 DISTNAME=      subfigure
 PKGNAME=       tex-${DISTNAME}-2.1.5
@@ -8,7 +8,5 @@ MAINTAINER=     minskim%NetBSD.org@localhost
 COMMENT=       Figures divided into subfigures (obsoleted by tex-subfig)
 LICENSE=       lppl-1.3c
 
-CONFLICTS+=    teTeX-texmf<=3.0nb19
-
 .include "../../print/texlive/package.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/print/tex-subfigure-doc/Makefile
diff -u pkgsrc/print/tex-subfigure-doc/Makefile:1.5 pkgsrc/print/tex-subfigure-doc/Makefile:1.6
--- pkgsrc/print/tex-subfigure-doc/Makefile:1.5 Tue Jan 26 11:06:04 2016
+++ pkgsrc/print/tex-subfigure-doc/Makefile     Wed Sep  6 16:49:44 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2016/01/26 11:06:04 markd Exp $
+# $NetBSD: Makefile,v 1.6 2017/09/06 16:49:44 wiz Exp $
 
 DISTNAME=      subfigure.doc
 PKGNAME=       tex-${DISTNAME:S/./-/}-2.1.5
@@ -8,7 +8,5 @@ MAINTAINER=     minskim%NetBSD.org@localhost
 COMMENT=       Documentation for tex-subfigure
 LICENSE=       lppl-1.3c
 
-CONFLICTS+=    teTeX-texmf<=3.0nb19
-
 .include "../../print/texlive/package.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/print/tex-supertabular/Makefile
diff -u pkgsrc/print/tex-supertabular/Makefile:1.2 pkgsrc/print/tex-supertabular/Makefile:1.3
--- pkgsrc/print/tex-supertabular/Makefile:1.2  Tue Jan 26 11:02:32 2016
+++ pkgsrc/print/tex-supertabular/Makefile      Wed Sep  6 16:49:44 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2016/01/26 11:02:32 markd Exp $
+# $NetBSD: Makefile,v 1.3 2017/09/06 16:49:44 wiz Exp $
 
 DISTNAME=      supertabular
 PKGNAME=       tex-${DISTNAME}-4.1a
@@ -8,7 +8,6 @@ MAINTAINER=     minskim%NetBSD.org@localhost
 COMMENT=       Multi-page tables package
 LICENSE=       lppl-1.3c
 
-CONFLICTS=     teTeX-texmf<3.0nb33
 DEPENDS+=      tex-latex-bin-[0-9]*:../../print/tex-latex-bin
 
 .include "../../print/texlive/package.mk"

Index: pkgsrc/print/tex-t2/Makefile
diff -u pkgsrc/print/tex-t2/Makefile:1.2 pkgsrc/print/tex-t2/Makefile:1.3
--- pkgsrc/print/tex-t2/Makefile:1.2    Tue Jan 26 11:01:33 2016
+++ pkgsrc/print/tex-t2/Makefile        Wed Sep  6 16:49:45 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2016/01/26 11:01:33 markd Exp $
+# $NetBSD: Makefile,v 1.3 2017/09/06 16:49:45 wiz Exp $
 
 DISTNAME=      t2
 PKGNAME=       tex-${DISTNAME}-2010
@@ -8,7 +8,6 @@ MAINTAINER=     minskim%NetBSD.org@localhost
 COMMENT=       Support for using T2 encoding
 LICENSE=       lppl-1.3c
 
-CONFLICTS=     teTeX-texmf<=3.0nb29
 DEPENDS+=      tex-amsfonts-[0-9]*:../../fonts/tex-amsfonts
 DEPENDS+=      tex-tools-[0-9]*:../../print/tex-tools
 

Index: pkgsrc/print/tex-tap/Makefile
diff -u pkgsrc/print/tex-tap/Makefile:1.1 pkgsrc/print/tex-tap/Makefile:1.2
--- pkgsrc/print/tex-tap/Makefile:1.1   Tue Sep 20 12:50:00 2016
+++ pkgsrc/print/tex-tap/Makefile       Wed Sep  6 16:49:45 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2016/09/20 12:50:00 markd Exp $
+# $NetBSD: Makefile,v 1.2 2017/09/06 16:49:45 wiz Exp $
 
 DISTNAME=      tap
 PKGNAME=       tex-${DISTNAME}-0.77
@@ -9,7 +9,5 @@ HOMEPAGE=       http://ctan.org/pkg/tap
 COMMENT=       TeX macros for typesetting complex tables
 LICENSE=       public-domain
 
-CONFLICTS+=    teTeX-texmf<=3.0nb56
-
 .include "../../print/texlive/package.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/print/tex-tetex-doc/Makefile
diff -u pkgsrc/print/tex-tetex-doc/Makefile:1.18 pkgsrc/print/tex-tetex-doc/Makefile:1.19
--- pkgsrc/print/tex-tetex-doc/Makefile:1.18    Wed Jun 21 13:25:33 2017
+++ pkgsrc/print/tex-tetex-doc/Makefile Wed Sep  6 16:49:45 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2017/06/21 13:25:33 markd Exp $
+# $NetBSD: Makefile,v 1.19 2017/09/06 16:49:45 wiz Exp $
 
 DISTNAME=      tetex.doc
 PKGNAME=       tex-${DISTNAME:S/./-/}-3.0.44331
@@ -7,8 +7,5 @@ TEXLIVE_REV=    44331
 MAINTAINER=    minskim%NetBSD.org@localhost
 COMMENT=       Documentation for tex-tetex
 
-CONFLICTS+=    teTeX-bin<=3.0nb42
-CONFLICTS+=    texlive-tetex<=2011nb1
-
 .include "../../print/texlive/package.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/print/tex-tex/Makefile
diff -u pkgsrc/print/tex-tex/Makefile:1.9 pkgsrc/print/tex-tex/Makefile:1.10
--- pkgsrc/print/tex-tex/Makefile:1.9   Tue May  5 19:02:28 2015
+++ pkgsrc/print/tex-tex/Makefile       Wed Sep  6 16:49:45 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2015/05/05 19:02:28 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2017/09/06 16:49:45 wiz Exp $
 
 DISTNAME=      tex
 PKGNAME=       tex-${DISTNAME}-3.14159265
@@ -9,8 +9,6 @@ HOMEPAGE=       http://ctan.org/pkg/tex
 COMMENT=       Plain TeX format
 #LICENSE=      knuth
 
-CONFLICTS+=    teTeX-texmf<=3.0nb20
-CONFLICTS+=    tex-bin-tex-[0-9]*
 DEPENDS+=      tex-plain-[0-9]*:../../print/tex-plain
 DEPENDS+=      web2c-[0-9]*:../../print/web2c
 SUPERSEDES=    tex-bin-tex<2009

Index: pkgsrc/print/tex-texdoc/Makefile
diff -u pkgsrc/print/tex-texdoc/Makefile:1.8 pkgsrc/print/tex-texdoc/Makefile:1.9
--- pkgsrc/print/tex-texdoc/Makefile:1.8        Wed Jun 21 13:25:34 2017
+++ pkgsrc/print/tex-texdoc/Makefile    Wed Sep  6 16:49:45 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2017/06/21 13:25:34 markd Exp $
+# $NetBSD: Makefile,v 1.9 2017/09/06 16:49:45 wiz Exp $
 
 DISTNAME=      texdoc
 PKGNAME=       tex-${DISTNAME:S/./-/}-2017
@@ -8,8 +8,6 @@ MAINTAINER=     minskim%NetBSD.org@localhost
 COMMENT=       Documentation access for TeX distributions
 LICENSE=       gnu-gpl-v3
 
-CONFLICTS+=    teTeX-bin<3.0nb50
-
 REPLACE_TEXLUA=                bin/texdoc
 
 .include "../../print/texlive/package.mk"

Index: pkgsrc/print/tex-texinfo/Makefile
diff -u pkgsrc/print/tex-texinfo/Makefile:1.7 pkgsrc/print/tex-texinfo/Makefile:1.8
--- pkgsrc/print/tex-texinfo/Makefile:1.7       Thu Aug 17 02:33:44 2017
+++ pkgsrc/print/tex-texinfo/Makefile   Wed Sep  6 16:49:45 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2017/08/17 02:33:44 markd Exp $
+# $NetBSD: Makefile,v 1.8 2017/09/06 16:49:45 wiz Exp $
 
 DISTNAME=      texinfo
 PKGNAME=       tex-${DISTNAME}-5.1.44706
@@ -9,7 +9,6 @@ HOMEPAGE=       http://ctan.org/pkg/texinfo
 COMMENT=       Texinfo documentation system
 LICENSE=       gnu-gpl-v2
 
-CONFLICTS+=    teTeX-texmf<=3.0nb46
 DEPENDS+=      tex-tex-[0-9]*:../../print/tex-tex
 
 .include "../../print/texlive/package.mk"

Index: pkgsrc/print/tex-thumbpdf/Makefile
diff -u pkgsrc/print/tex-thumbpdf/Makefile:1.4 pkgsrc/print/tex-thumbpdf/Makefile:1.5
--- pkgsrc/print/tex-thumbpdf/Makefile:1.4      Sat Jul  9 06:38:53 2016
+++ pkgsrc/print/tex-thumbpdf/Makefile  Wed Sep  6 16:49:45 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2016/07/09 06:38:53 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2017/09/06 16:49:45 wiz Exp $
 
 DISTNAME=      thumbpdf
 PKGNAME=       tex-${DISTNAME}-3.16
@@ -12,9 +12,6 @@ LICENSE=      lppl-1.3c
 USE_TOOLS+=    perl:run
 REPLACE_PERL=   bin/thumbpdf
 
-CONFLICTS+=    teTeX-bin<=3.0nb56
-CONFLICTS+=    teTeX-texmf<=3.0nb43
-
 INSTALLATION_DIRS+=    bin
 
 .include "../../print/texlive/package.mk"

Index: pkgsrc/print/tex-titlesec/Makefile
diff -u pkgsrc/print/tex-titlesec/Makefile:1.6 pkgsrc/print/tex-titlesec/Makefile:1.7
--- pkgsrc/print/tex-titlesec/Makefile:1.6      Thu Jun 16 04:06:17 2016
+++ pkgsrc/print/tex-titlesec/Makefile  Wed Sep  6 16:49:45 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2016/06/16 04:06:17 markd Exp $
+# $NetBSD: Makefile,v 1.7 2017/09/06 16:49:45 wiz Exp $
 
 DISTNAME=      titlesec
 PKGNAME=       tex-${DISTNAME}-2.10.2
@@ -8,7 +8,6 @@ MAINTAINER=     minskim%NetBSD.org@localhost
 COMMENT=       Select alternative section titles
 LICENSE=       lppl-1.3c
 
-CONFLICTS+=    teTeX-texmf<=3.0nb18
 DEPENDS+=      tex-graphics-[0-9]*:../../print/tex-graphics
 
 .include "../../print/texlive/package.mk"

Index: pkgsrc/print/tex-tocbibind/Makefile
diff -u pkgsrc/print/tex-tocbibind/Makefile:1.3 pkgsrc/print/tex-tocbibind/Makefile:1.4
--- pkgsrc/print/tex-tocbibind/Makefile:1.3     Tue Jan 26 10:51:41 2016
+++ pkgsrc/print/tex-tocbibind/Makefile Wed Sep  6 16:49:45 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2016/01/26 10:51:41 markd Exp $
+# $NetBSD: Makefile,v 1.4 2017/09/06 16:49:45 wiz Exp $
 
 DISTNAME=      tocbibind
 PKGNAME=       tex-${DISTNAME}-1.5k
@@ -8,7 +8,6 @@ MAINTAINER=     minskim%NetBSD.org@localhost
 COMMENT=       Add bibliography/index/contents to Table of Contents
 LICENSE=       lppl-1.3c
 
-CONFLICTS+=    teTeX-texmf<=3.0nb27
 DEPENDS+=      tex-latex-bin-[0-9]*:../../print/tex-latex-bin
 
 .include "../../print/texlive/package.mk"

Index: pkgsrc/print/tex-tocbibind-doc/Makefile
diff -u pkgsrc/print/tex-tocbibind-doc/Makefile:1.3 pkgsrc/print/tex-tocbibind-doc/Makefile:1.4
--- pkgsrc/print/tex-tocbibind-doc/Makefile:1.3 Tue Jan 26 10:51:40 2016
+++ pkgsrc/print/tex-tocbibind-doc/Makefile     Wed Sep  6 16:49:45 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2016/01/26 10:51:40 markd Exp $
+# $NetBSD: Makefile,v 1.4 2017/09/06 16:49:45 wiz Exp $
 
 DISTNAME=      tocbibind.doc
 PKGNAME=       tex-${DISTNAME:S/./-/}-1.5k
@@ -8,7 +8,5 @@ MAINTAINER=     minskim%NetBSD.org@localhost
 COMMENT=       Documentation for tex-tocbibind
 LICENSE=       lppl-1.3c
 
-CONFLICTS+=    teTeX-texmf<=3.0nb27
-
 .include "../../print/texlive/package.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/print/tex-tocloft/Makefile
diff -u pkgsrc/print/tex-tocloft/Makefile:1.2 pkgsrc/print/tex-tocloft/Makefile:1.3
--- pkgsrc/print/tex-tocloft/Makefile:1.2       Sat Apr 25 05:11:25 2015
+++ pkgsrc/print/tex-tocloft/Makefile   Wed Sep  6 16:49:45 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2015/04/25 05:11:25 markd Exp $
+# $NetBSD: Makefile,v 1.3 2017/09/06 16:49:45 wiz Exp $
 
 DISTNAME=      tocloft
 PKGNAME=       tex-${DISTNAME}-2.3f
@@ -8,7 +8,6 @@ MAINTAINER=     minskim%NetBSD.org@localhost
 COMMENT=       Control table of contents, figures, etc. for LaTeX
 LICENSE=       lppl-1.3c
 
-CONFLICTS=     teTeX-texmf<=3.0nb9
 DEPENDS+=      tex-latex-bin-[0-9]*:../../print/tex-latex-bin
 
 .include "../../print/texlive/package.mk"

Index: pkgsrc/print/tex-tools/Makefile
diff -u pkgsrc/print/tex-tools/Makefile:1.10 pkgsrc/print/tex-tools/Makefile:1.11
--- pkgsrc/print/tex-tools/Makefile:1.10        Wed Jun 21 13:25:34 2017
+++ pkgsrc/print/tex-tools/Makefile     Wed Sep  6 16:49:45 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2017/06/21 13:25:34 markd Exp $
+# $NetBSD: Makefile,v 1.11 2017/09/06 16:49:45 wiz Exp $
 
 DISTNAME=      tools
 PKGNAME=       tex-${DISTNAME}-2017
@@ -9,7 +9,6 @@ HOMEPAGE=       http://ctan.org/pkg/latex-tool
 COMMENT=       The LaTeX standard tools bundle
 LICENSE=       lppl-1.3c
 
-CONFLICTS+=    teTeX-texmf<=3.0nb13
 DEPENDS+=      tex-graphics>=1.0onb1:../../print/tex-graphics
 
 .include "../../print/texlive/package.mk"

Index: pkgsrc/print/tex-tools-doc/Makefile
diff -u pkgsrc/print/tex-tools-doc/Makefile:1.10 pkgsrc/print/tex-tools-doc/Makefile:1.11
--- pkgsrc/print/tex-tools-doc/Makefile:1.10    Wed Jun 21 13:25:35 2017
+++ pkgsrc/print/tex-tools-doc/Makefile Wed Sep  6 16:49:45 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2017/06/21 13:25:35 markd Exp $
+# $NetBSD: Makefile,v 1.11 2017/09/06 16:49:45 wiz Exp $
 
 DISTNAME=      tools.doc
 PKGNAME=       tex-${DISTNAME:S/./-/}-2017
@@ -9,7 +9,5 @@ HOMEPAGE=       http://ctan.org/pkg/latex-tool
 COMMENT=       Documentation for tex-tools
 LICENSE=       lppl-1.3c
 
-CONFLICTS+=    teTeX-texmf<=3.0nb13
-
 .include "../../print/texlive/package.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/print/tex-type1cm/Makefile
diff -u pkgsrc/print/tex-type1cm/Makefile:1.5 pkgsrc/print/tex-type1cm/Makefile:1.6
--- pkgsrc/print/tex-type1cm/Makefile:1.5       Tue Jan 26 10:47:27 2016
+++ pkgsrc/print/tex-type1cm/Makefile   Wed Sep  6 16:49:46 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2016/01/26 10:47:27 markd Exp $
+# $NetBSD: Makefile,v 1.6 2017/09/06 16:49:46 wiz Exp $
 
 DISTNAME=      type1cm
 PKGNAME=       tex-${DISTNAME}-0.03
@@ -8,7 +8,5 @@ MAINTAINER=     minskim%NetBSD.org@localhost
 COMMENT=       Arbitrary size font selection in LaTeX
 LICENSE=       lppl-1.3c
 
-CONFLICTS+=    teTeX-texmf<=3.0nb17
-
 .include "../../print/texlive/package.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/print/tex-type1cm-doc/Makefile
diff -u pkgsrc/print/tex-type1cm-doc/Makefile:1.5 pkgsrc/print/tex-type1cm-doc/Makefile:1.6
--- pkgsrc/print/tex-type1cm-doc/Makefile:1.5   Tue Jan 26 10:47:27 2016
+++ pkgsrc/print/tex-type1cm-doc/Makefile       Wed Sep  6 16:49:46 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2016/01/26 10:47:27 markd Exp $
+# $NetBSD: Makefile,v 1.6 2017/09/06 16:49:46 wiz Exp $
 
 DISTNAME=      type1cm.doc
 PKGNAME=       tex-${DISTNAME:S/./-/}-0.03
@@ -9,7 +9,5 @@ MAINTAINER=     minskim%NetBSD.org@localhost
 COMMENT=       Documentation for tex-type1cm
 LICENSE=       lppl-1.3c
 
-CONFLICTS+=    teTeX-texmf<=3.0nb17
-
 .include "../../print/texlive/package.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/print/tex-ukrhyph/Makefile
diff -u pkgsrc/print/tex-ukrhyph/Makefile:1.6 pkgsrc/print/tex-ukrhyph/Makefile:1.7
--- pkgsrc/print/tex-ukrhyph/Makefile:1.6       Tue Jan 26 10:44:43 2016
+++ pkgsrc/print/tex-ukrhyph/Makefile   Wed Sep  6 16:49:46 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2016/01/26 10:44:43 markd Exp $
+# $NetBSD: Makefile,v 1.7 2017/09/06 16:49:46 wiz Exp $
 
 DISTNAME=      ukrhyph
 PKGNAME=       tex-${DISTNAME}-2010
@@ -8,7 +8,6 @@ MAINTAINER=     minskim%NetBSD.org@localhost
 COMMENT=       Hyphenation pattern files for Ukrainian
 LICENSE=       lppl-1.3c
 
-CONFLICTS+=    teTeX-texmf<=3.0nb12
 DEPENDS+=      tex-ruhyphen>=1.6:../../print/tex-ruhyphen
 
 .include "../../print/texlive/package.mk"

Index: pkgsrc/print/tex-umlaute/Makefile
diff -u pkgsrc/print/tex-umlaute/Makefile:1.2 pkgsrc/print/tex-umlaute/Makefile:1.3
--- pkgsrc/print/tex-umlaute/Makefile:1.2       Sun Oct 21 18:07:08 2012
+++ pkgsrc/print/tex-umlaute/Makefile   Wed Sep  6 16:49:46 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2012/10/21 18:07:08 minskim Exp $
+# $NetBSD: Makefile,v 1.3 2017/09/06 16:49:46 wiz Exp $
 
 DISTNAME=      umlaute
 PKGNAME=       tex-${DISTNAME}-2.1
@@ -8,7 +8,6 @@ MAINTAINER=     pkgsrc-users%NetBSD.org@localhost
 COMMENT=       German input encodings in LaTeX
 LICENSE=       lppl-1.3c
 
-CONFLICTS+=    teTeX-texmf<=3.0nb37
 DEPENDS+=      tex-latex-[0-9]*:../../print/tex-latex
 DEPENDS+=      tex-latex-bin-[0-9]*:../../print/tex-latex-bin
 

Index: pkgsrc/print/tex-units/Makefile
diff -u pkgsrc/print/tex-units/Makefile:1.2 pkgsrc/print/tex-units/Makefile:1.3
--- pkgsrc/print/tex-units/Makefile:1.2 Tue Jan 26 10:41:00 2016
+++ pkgsrc/print/tex-units/Makefile     Wed Sep  6 16:49:46 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2016/01/26 10:41:00 markd Exp $
+# $NetBSD: Makefile,v 1.3 2017/09/06 16:49:46 wiz Exp $
 
 DISTNAME=      units
 PKGNAME=       tex-${DISTNAME}-0.9b
@@ -8,7 +8,5 @@ MAINTAINER=     pkgsrc-users%NetBSD.org@localhost
 COMMENT=       Typeset units
 LICENSE=       gnu-gpl-v2
 
-CONFLICTS+=    teTeX-texmf<=3.0nb42
-
 .include "../../print/texlive/package.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/print/tex-upquote/Makefile
diff -u pkgsrc/print/tex-upquote/Makefile:1.2 pkgsrc/print/tex-upquote/Makefile:1.3
--- pkgsrc/print/tex-upquote/Makefile:1.2       Tue Jan 26 10:39:31 2016
+++ pkgsrc/print/tex-upquote/Makefile   Wed Sep  6 16:49:46 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2016/01/26 10:39:31 markd Exp $
+# $NetBSD: Makefile,v 1.3 2017/09/06 16:49:46 wiz Exp $
 
 DISTNAME=      upquote
 PKGNAME=       tex-${DISTNAME}-1.3
@@ -8,7 +8,5 @@ MAINTAINER=     pkgsrc-users%NetBSD.org@localhost
 COMMENT=       Show "realistic" quotes in verbatim
 LICENSE=       lppl-1.2
 
-CONFLICTS+=    teTeX-texmf<=3.0nb42
-
 .include "../../print/texlive/package.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/print/tex-utf8mex/Makefile
diff -u pkgsrc/print/tex-utf8mex/Makefile:1.1 pkgsrc/print/tex-utf8mex/Makefile:1.2
--- pkgsrc/print/tex-utf8mex/Makefile:1.1       Tue Sep 20 13:05:41 2016
+++ pkgsrc/print/tex-utf8mex/Makefile   Wed Sep  6 16:49:46 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2016/09/20 13:05:41 markd Exp $
+# $NetBSD: Makefile,v 1.2 2017/09/06 16:49:46 wiz Exp $
 
 DISTNAME=      utf8mex
 PKGNAME=       tex-${DISTNAME}-2016
@@ -9,7 +9,5 @@ HOMEPAGE=       http://ctan.org/pkg/utf8mex
 COMMENT=       Tools to produce formats that read Polish language input
 LICENSE=       public-domain
 
-CONFLICTS+=    teTeX-texmf<=3.0nb56
-
 .include "../../print/texlive/package.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/print/tex-wrapfig/Makefile
diff -u pkgsrc/print/tex-wrapfig/Makefile:1.3 pkgsrc/print/tex-wrapfig/Makefile:1.4
--- pkgsrc/print/tex-wrapfig/Makefile:1.3       Tue Jan 26 10:28:11 2016
+++ pkgsrc/print/tex-wrapfig/Makefile   Wed Sep  6 16:49:46 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2016/01/26 10:28:11 markd Exp $
+# $NetBSD: Makefile,v 1.4 2017/09/06 16:49:46 wiz Exp $
 
 DISTNAME=      wrapfig
 PKGNAME=       tex-${DISTNAME}-3.6
@@ -9,7 +9,5 @@ MAINTAINER=     minskim%NetBSD.org@localhost
 COMMENT=       LaTeX package to produce figures which text can flow around
 LICENSE=       lppl-1.3c
 
-CONFLICTS=     teTeX-texmf<=3.0nb29
-
 .include "../../print/texlive/package.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/print/tex-wrapfig-doc/Makefile
diff -u pkgsrc/print/tex-wrapfig-doc/Makefile:1.3 pkgsrc/print/tex-wrapfig-doc/Makefile:1.4
--- pkgsrc/print/tex-wrapfig-doc/Makefile:1.3   Tue Jan 26 10:28:11 2016
+++ pkgsrc/print/tex-wrapfig-doc/Makefile       Wed Sep  6 16:49:46 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2016/01/26 10:28:11 markd Exp $
+# $NetBSD: Makefile,v 1.4 2017/09/06 16:49:46 wiz Exp $
 
 DISTNAME=      wrapfig.doc
 PKGNAME=       tex-${DISTNAME:S/./-/}-3.6
@@ -9,7 +9,5 @@ MAINTAINER=     minskim%NetBSD.org@localhost
 COMMENT=       Documentation for tex-wrapfig
 LICENSE=       lppl-1.3c
 
-CONFLICTS=     teTeX-texmf<=3.0nb29
-
 .include "../../print/texlive/package.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/print/tex-xcolor/Makefile
diff -u pkgsrc/print/tex-xcolor/Makefile:1.5 pkgsrc/print/tex-xcolor/Makefile:1.6
--- pkgsrc/print/tex-xcolor/Makefile:1.5        Sun Jun 19 21:14:35 2016
+++ pkgsrc/print/tex-xcolor/Makefile    Wed Sep  6 16:49:46 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2016/06/19 21:14:35 markd Exp $
+# $NetBSD: Makefile,v 1.6 2017/09/06 16:49:46 wiz Exp $
 
 DISTNAME=      xcolor
 PKGNAME=       tex-${DISTNAME}-2.12
@@ -9,7 +9,6 @@ MAINTAINER=     pkgsrc-users%NetBSD.org@localhost
 COMMENT=       Driver-independent color extensions for LaTeX and pdfLaTeX
 LICENSE=       lppl-1.2
 
-CONFLICTS+=    teTeX-texmf<=3.0nb22
 DEPENDS+=      tex-graphics-cfg-[0-9]*:../../print/tex-graphics-cfg
 
 .include "../../print/texlive/package.mk"

Index: pkgsrc/print/tex-xcomment/Makefile
diff -u pkgsrc/print/tex-xcomment/Makefile:1.2 pkgsrc/print/tex-xcomment/Makefile:1.3
--- pkgsrc/print/tex-xcomment/Makefile:1.2      Tue Jan 26 10:24:34 2016
+++ pkgsrc/print/tex-xcomment/Makefile  Wed Sep  6 16:49:46 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2016/01/26 10:24:34 markd Exp $
+# $NetBSD: Makefile,v 1.3 2017/09/06 16:49:46 wiz Exp $
 
 DISTNAME=      xcomment
 PKGNAME=       tex-${DISTNAME}-1.3
@@ -8,7 +8,5 @@ MAINTAINER=     minskim%NetBSD.org@localhost
 COMMENT=       Allows selected environments to be included/excluded
 LICENSE=       lppl-1.3c
 
-CONFLICTS+=    teTeX-texmf<=3.0nb30
-
 .include "../../print/texlive/package.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/print/tex-xdvi/Makefile
diff -u pkgsrc/print/tex-xdvi/Makefile:1.7 pkgsrc/print/tex-xdvi/Makefile:1.8
--- pkgsrc/print/tex-xdvi/Makefile:1.7  Wed Jun 21 13:25:35 2017
+++ pkgsrc/print/tex-xdvi/Makefile      Wed Sep  6 16:49:46 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2017/06/21 13:25:35 markd Exp $
+# $NetBSD: Makefile,v 1.8 2017/09/06 16:49:46 wiz Exp $
 
 DISTNAME=      xdvi
 PKGNAME=       tex-${DISTNAME}-22.87.03
@@ -8,9 +8,6 @@ MAINTAINER=     minskim%NetBSD.org@localhost
 HOMEPAGE=      http://ctan.org/pkg/xdvi
 COMMENT=       Configuration file for xdvik
 
-CONFLICTS+=    teTeX-bin<3.0nb25
-SUPERSEDES=    tex-bin-xdvi<=22.84.14.12778nb1
-
 TEXLIVE_IGNORE_PATTERNS=       texmf-dist/xdvi/pixmap texmf-dist/dvips/xdvi
 
 .include "../../print/texlive/package.mk"

Index: pkgsrc/print/tex-xkeyval/Makefile
diff -u pkgsrc/print/tex-xkeyval/Makefile:1.6 pkgsrc/print/tex-xkeyval/Makefile:1.7
--- pkgsrc/print/tex-xkeyval/Makefile:1.6       Sat Apr 25 05:28:37 2015
+++ pkgsrc/print/tex-xkeyval/Makefile   Wed Sep  6 16:49:47 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2015/04/25 05:28:37 markd Exp $
+# $NetBSD: Makefile,v 1.7 2017/09/06 16:49:47 wiz Exp $
 
 DISTNAME=      xkeyval
 PKGNAME=       tex-${DISTNAME}-2.7a
@@ -8,7 +8,6 @@ MAINTAINER=     pkgsrc-users%NetBSD.org@localhost
 COMMENT=       Macros for setting keys and class or package options
 LICENSE=       lppl-1.3c
 
-CONFLICTS+=    teTeX-texmf<=3.0nb17
 DEPENDS+=      tex-tools-[0-9]*:../../print/tex-tools
 
 .include "../../print/texlive/package.mk"

Index: pkgsrc/print/tex-xtab/Makefile
diff -u pkgsrc/print/tex-xtab/Makefile:1.1 pkgsrc/print/tex-xtab/Makefile:1.2
--- pkgsrc/print/tex-xtab/Makefile:1.1  Wed Jul 11 12:57:27 2012
+++ pkgsrc/print/tex-xtab/Makefile      Wed Sep  6 16:49:47 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2012/07/11 12:57:27 minskim Exp $
+# $NetBSD: Makefile,v 1.2 2017/09/06 16:49:47 wiz Exp $
 
 DISTNAME=      xtab
 PKGNAME=       tex-${DISTNAME}-2.3f
@@ -8,7 +8,5 @@ MAINTAINER=     pkgsrc-users%NetBSD.org@localhost
 COMMENT=       Break tables across pages
 LICENSE=       lppl-1.3c
 
-CONFLICTS=     teTeX-texmf<=3.0nb36
-
 .include "../../print/texlive/package.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/print/tex-xtab-doc/Makefile
diff -u pkgsrc/print/tex-xtab-doc/Makefile:1.1 pkgsrc/print/tex-xtab-doc/Makefile:1.2
--- pkgsrc/print/tex-xtab-doc/Makefile:1.1      Wed Jul 11 12:58:02 2012
+++ pkgsrc/print/tex-xtab-doc/Makefile  Wed Sep  6 16:49:47 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2012/07/11 12:58:02 minskim Exp $
+# $NetBSD: Makefile,v 1.2 2017/09/06 16:49:47 wiz Exp $
 
 DISTNAME=      xtab.doc
 PKGNAME=       tex-${DISTNAME:S/./-/}-2.3f
@@ -8,7 +8,5 @@ MAINTAINER=     pkgsrc-users%NetBSD.org@localhost
 COMMENT=       Documentation for tex-xtab
 LICENSE=       lppl-1.3c
 
-CONFLICTS=     teTeX-texmf<=3.0nb36
-
 .include "../../print/texlive/package.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/print/tex-yfonts/Makefile
diff -u pkgsrc/print/tex-yfonts/Makefile:1.2 pkgsrc/print/tex-yfonts/Makefile:1.3
--- pkgsrc/print/tex-yfonts/Makefile:1.2        Tue Jan 26 10:16:47 2016
+++ pkgsrc/print/tex-yfonts/Makefile    Wed Sep  6 16:49:47 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2016/01/26 10:16:47 markd Exp $
+# $NetBSD: Makefile,v 1.3 2017/09/06 16:49:47 wiz Exp $
 
 DISTNAME=      yfonts
 PKGNAME=       tex-${DISTNAME}-1.3
@@ -8,7 +8,5 @@ MAINTAINER=     pkgsrc-users%NetBSD.org@localhost
 COMMENT=       Support for old German fonts
 LICENSE=       lppl-1.3c
 
-CONFLICTS+=    teTeX-texmf<=3.0nb42
-
 .include "../../print/texlive/package.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/print/tex4ht/Makefile
diff -u pkgsrc/print/tex4ht/Makefile:1.6 pkgsrc/print/tex4ht/Makefile:1.7
--- pkgsrc/print/tex4ht/Makefile:1.6    Tue Jun 20 20:50:50 2017
+++ pkgsrc/print/tex4ht/Makefile        Wed Sep  6 16:49:47 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2017/06/20 20:50:50 markd Exp $
+# $NetBSD: Makefile,v 1.7 2017/09/06 16:49:47 wiz Exp $
 
 DISTNAME=      texlive-20170524-source
 PKGNAME=       tex4ht-0.0.20170523
@@ -11,8 +11,6 @@ HOMEPAGE=     http://www.tug.org/texlive/
 COMMENT=       Converter from *TeX to HTML, XML, and similar formats
 LICENSE=       lppl-1.3c
 
-CONFLICTS+=    teTeX-bin<=3.0nb32
-
 EXTRACT_ELEMENTS=      ${DISTNAME}/build-aux \
                        ${DISTNAME}/texk/tex4htk
 

Index: pkgsrc/print/web2c/Makefile
diff -u pkgsrc/print/web2c/Makefile:1.62 pkgsrc/print/web2c/Makefile:1.63
--- pkgsrc/print/web2c/Makefile:1.62    Mon Sep  4 20:20:56 2017
+++ pkgsrc/print/web2c/Makefile Wed Sep  6 16:49:47 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.62 2017/09/04 20:20:56 ryoon Exp $
+# $NetBSD: Makefile,v 1.63 2017/09/06 16:49:47 wiz Exp $
 
 DISTNAME=      texlive-20170524-source
 PKGNAME=       web2c-2017
@@ -11,9 +11,6 @@ MAINTAINER=   minskim%NetBSD.org@localhost
 HOMEPAGE=      http://www.tug.org/web2c/
 COMMENT=       TeX implementation translating WEB to C
 
-CONFLICTS+=    ja-ptex-bin-[0-9]*
-CONFLICTS+=    teTeX-bin<=3.0nb28
-CONFLICTS+=    texlive-tetex<2010
 DEPENDS+=      kpathsea>=6.2.1:../../print/kpathsea
 DEPENDS+=      ptexenc>=1.3.4:../../print/ptexenc
 

Index: pkgsrc/print/xdvik/Makefile
diff -u pkgsrc/print/xdvik/Makefile:1.22 pkgsrc/print/xdvik/Makefile:1.23
--- pkgsrc/print/xdvik/Makefile:1.22    Tue Jun 20 20:50:50 2017
+++ pkgsrc/print/xdvik/Makefile Wed Sep  6 16:49:47 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2017/06/20 20:50:50 markd Exp $
+# $NetBSD: Makefile,v 1.23 2017/09/06 16:49:47 wiz Exp $
 
 DISTNAME=      texlive-20170524-source
 PKGNAME=       xdvik-22.87.03
@@ -11,7 +11,6 @@ MAINTAINER=   minskim%NetBSD.org@localhost
 HOMEPAGE=      http://xdvi.sourceforge.net/
 COMMENT=       Previewer for DVI files
 
-CONFLICTS+=    teTeX-bin<3.0nb25
 BUILD_DEPENDS+=        tex-texconfig-[0-9]*:../../print/tex-texconfig
 BUILD_DEPENDS+=        tex-xdvi-[0-9]*:../../print/tex-xdvi
 DEPENDS+=      dvipsk-[0-9]*:../../print/dvipsk

Index: pkgsrc/print/xdvik/distinfo
diff -u pkgsrc/print/xdvik/distinfo:1.12 pkgsrc/print/xdvik/distinfo:1.13
--- pkgsrc/print/xdvik/distinfo:1.12    Tue Jun 20 20:50:50 2017
+++ pkgsrc/print/xdvik/distinfo Wed Sep  6 16:49:47 2017
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.12 2017/06/20 20:50:50 markd Exp $
+$NetBSD: distinfo,v 1.13 2017/09/06 16:49:47 wiz Exp $
 
 SHA1 (texlive-20170524-source.tar.xz) = 1c1383ddb1b871c6b8ce49a4ae3c1a33d454a7b6
 RMD160 (texlive-20170524-source.tar.xz) = a8430c19fe1727cf308fe03e5838105260c0d71e
 SHA512 (texlive-20170524-source.tar.xz) = 18c18940992ab94ce22e22ccd4ad798253ea14ac2ab296a10ea5e9a8da9f33989f2e2641b42b564d1d5fb53bd371da3e68726b676d706b469016ad146cd19daa
 Size (texlive-20170524-source.tar.xz) = 63483372 bytes
 SHA1 (patch-aa) = 08bc8e8a7a2cd7a65c0a176f02fdd2930d1d9ae2
-SHA1 (patch-ab) = bbbeb011aa888f2ee7dab84c1602fb3e1127cdb1
+SHA1 (patch-ab) = 09dbadaa8fb4575e4a437f3a3df266ae808e3278
 SHA1 (patch-configure) = bd3b6309a60ea8173cb020335f7337abbda07103

Index: pkgsrc/print/xdvik/patches/patch-ab
diff -u pkgsrc/print/xdvik/patches/patch-ab:1.1.1.1 pkgsrc/print/xdvik/patches/patch-ab:1.2
--- pkgsrc/print/xdvik/patches/patch-ab:1.1.1.1 Mon Feb 23 19:32:01 2009
+++ pkgsrc/print/xdvik/patches/patch-ab Wed Sep  6 16:49:47 2017
@@ -1,6 +1,6 @@
-$NetBSD: patch-ab,v 1.1.1.1 2009/02/23 19:32:01 minskim Exp $
+$NetBSD: patch-ab,v 1.2 2017/09/06 16:49:47 wiz Exp $
 
-Make sure teTeX3 compiles even if floor is defined by the OS (which is
+Make sure xdvik compiles even if floor is defined by the OS (which is
 the case on Mac OS 10.4 at least)
 
 --- special.c.orig     2008-05-03 12:45:10.000000000 -0700

Index: pkgsrc/print/xpdfopen/Makefile
diff -u pkgsrc/print/xpdfopen/Makefile:1.7 pkgsrc/print/xpdfopen/Makefile:1.8
--- pkgsrc/print/xpdfopen/Makefile:1.7  Tue Jun 20 20:50:51 2017
+++ pkgsrc/print/xpdfopen/Makefile      Wed Sep  6 16:49:47 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2017/06/20 20:50:51 markd Exp $
+# $NetBSD: Makefile,v 1.8 2017/09/06 16:49:47 wiz Exp $
 
 DISTNAME=      texlive-20170524-source
 PKGNAME=       xpdfopen-0.86
@@ -11,8 +11,6 @@ MAINTAINER=   minskim%NetBSD.org@localhost
 HOMEPAGE=      http://www.tug.org/texlive/
 COMMENT=       Commands to control Acrobat Reader, xpdf, and evince
 
-CONFLICTS+=    teTeX-bin<=3.0nb34
-CONFLICTS+=    texlive-pdftools<2011
 DEPENDS+=      web2c-[0-9]*:../../print/web2c
 
 EXTRACT_ELEMENTS=      ${DISTNAME}/build-aux \

Index: pkgsrc/textproc/latex2html/distinfo
diff -u pkgsrc/textproc/latex2html/distinfo:1.15 pkgsrc/textproc/latex2html/distinfo:1.16
--- pkgsrc/textproc/latex2html/distinfo:1.15    Sun Jun 18 09:08:22 2017
+++ pkgsrc/textproc/latex2html/distinfo Wed Sep  6 16:49:47 2017
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.15 2017/06/18 09:08:22 dholland Exp $
+$NetBSD: distinfo,v 1.16 2017/09/06 16:49:47 wiz Exp $
 
 SHA1 (latex2html-2016.tar.gz) = 667308a050a071106acc573f4b88f919bb0809c9
 RMD160 (latex2html-2016.tar.gz) = 1e400a65753ee8520acf1d3c4f9356d1e58fa033
 SHA512 (latex2html-2016.tar.gz) = 2a7d12bda145101c4099cd0efba7ccfd18eaa858c9ffe5223d0bc25eb57d298b94961289a6a79443000116a358ea8513d8054933f902aad21a67a2c0c2e41445
 Size (latex2html-2016.tar.gz) = 1149971 bytes
 SHA1 (patch-Makefile.in) = b9b94d3a0f561c67fd0f644c8632bfb540b749ec
-SHA1 (patch-ab) = 33cc684907be6dc0744c751cfd104cbdfe7b0308
+SHA1 (patch-ab) = 6d23f6bda65caff3fb0a5bfd67df44ee57a1ac43
 SHA1 (patch-configure) = a3b2d77020045b2b8f732f03d0d4d8045311efb9

Index: pkgsrc/textproc/latex2html/patches/patch-ab
diff -u pkgsrc/textproc/latex2html/patches/patch-ab:1.3 pkgsrc/textproc/latex2html/patches/patch-ab:1.4
--- pkgsrc/textproc/latex2html/patches/patch-ab:1.3     Thu Aug 11 00:15:53 2016
+++ pkgsrc/textproc/latex2html/patches/patch-ab Wed Sep  6 16:49:47 2017
@@ -1,12 +1,12 @@
-$NetBSD: patch-ab,v 1.3 2016/08/11 00:15:53 mef Exp $
+$NetBSD: patch-ab,v 1.4 2017/09/06 16:49:47 wiz Exp $
 
 (the first half)
 date: 2006-04-07 11:23:19 +0900;  author: minskim;  state: Exp;
-Use teTeX/module.mk to run mktexlsr for texmf-local only.
+Use tex infrastructure to run mktexlsr for texmf-local only.
 
 (second half)
 date: 2011-07-09 23:19:30 +0900;  author: bsiegert;  state: Exp;  lines: +18 -3;
-Add user-destdir support. Almost trivial except for one bug inthe install
+Add user-destdir support. Almost trivial except for one bug in the install
 script.
 
 --- config/install.pl.orig     2002-11-29 11:49:01.000000000 +0000

Index: pkgsrc/textproc/makeindexk/Makefile
diff -u pkgsrc/textproc/makeindexk/Makefile:1.12 pkgsrc/textproc/makeindexk/Makefile:1.13
--- pkgsrc/textproc/makeindexk/Makefile:1.12    Tue Jun 20 20:50:51 2017
+++ pkgsrc/textproc/makeindexk/Makefile Wed Sep  6 16:49:47 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2017/06/20 20:50:51 markd Exp $
+# $NetBSD: Makefile,v 1.13 2017/09/06 16:49:47 wiz Exp $
 
 DISTNAME=      texlive-20170524-source
 PKGNAME=       makeindexk-2.15
@@ -11,8 +11,6 @@ MAINTAINER=   minskim%NetBSD.org@localhost
 HOMEPAGE=      http://www.tug.org/texlive/
 COMMENT=       General purpose hierarchical index generator
 
-CONFLICTS+=    teTeX-bin<=3.0nb32
-
 EXTRACT_ELEMENTS=      ${DISTNAME}/build-aux \
                        ${DISTNAME}/texk/makeindexk
 

Index: pkgsrc/textproc/texi2html/Makefile
diff -u pkgsrc/textproc/texi2html/Makefile:1.42 pkgsrc/textproc/texi2html/Makefile:1.43
--- pkgsrc/textproc/texi2html/Makefile:1.42     Thu Dec  1 14:48:02 2016
+++ pkgsrc/textproc/texi2html/Makefile  Wed Sep  6 16:49:48 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.42 2016/12/01 14:48:02 wiz Exp $
+# $NetBSD: Makefile,v 1.43 2017/09/06 16:49:48 wiz Exp $
 
 DISTNAME=      texi2html-5.0
 PKGREVISION=   6
@@ -13,8 +13,6 @@ LICENSE=      gnu-gpl-v2
 
 DEPENDS+=      p5-Locale-libintl-[0-9]*:../../misc/p5-Locale-libintl
 
-CONFLICTS=     teTeX-bin-1.*
-
 USE_TOOLS+=            gmake perl:run
 GNU_CONFIGURE=         yes
 CONFIGURE_ARGS+=       --sysconfdir=${PKG_SYSCONFDIR}



Home | Main Index | Thread Index | Old Index