Delete cjk-lyx, which has been merged with editors/lyx.

27 files changed, 1 insertions, 1147 deletions

diff --git a/print/Makefile b/print/Makefile
index df8513bcb65..18ee78c16e8 100644
--- a/print/Makefile
+++ b/print/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.523 2012/03/05 16:22:08 minskim Exp $
+# $NetBSD: Makefile,v 1.524 2012/03/07 03:21:27 minskim Exp $
 #
 
 COMMENT=	Desktop publishing
@@ -21,7 +21,6 @@ SUBDIR+=	bg5ps
 SUBDIR+=	bibtool
 SUBDIR+=	bww2tex
 SUBDIR+=	chktex
-SUBDIR+=	cjk-lyx
 SUBDIR+=	cjkutils
 SUBDIR+=	cnprint
 SUBDIR+=	cups
diff --git a/print/cjk-lyx/DESCR b/print/cjk-lyx/DESCR
deleted file mode 100644
index 334357be8ef..00000000000
--- a/print/cjk-lyx/DESCR
+++ /dev/null
@@ -1,6 +0,0 @@
-CJK-LyX is a multibyte version of LyX, the text processing document processor,
-or simply a new and advanced kind of word processors. More specifically,
-CJK-LyX is the patched version of LyX for Chinese, Japanese and Korean
-language users. CJK-LyX is based on the earlier patch against lyx-1.0.3
-by Masahiko Kawakami and critical contributions from Chideok Hwang, who
-is also the author of the Korean input method Ami.
diff --git a/print/cjk-lyx/Makefile b/print/cjk-lyx/Makefile
deleted file mode 100644
index 71ae0f081d1..00000000000
--- a/print/cjk-lyx/Makefile
+++ /dev/null
@@ -1,43 +0,0 @@
-# $NetBSD: Makefile,v 1.34 2012/02/06 12:41:19 wiz Exp $
-
-DISTNAME=	lyx-${LYX_VERS}
-PKGNAME=	cjk-${DISTNAME}
-PKGREVISION=	13
-CATEGORIES=	print
-MASTER_SITES=	ftp://ftp.lyx.org/pub/lyx/stable/ \
-		ftp://gd.tuwien.ac.at/publishing/tex/lyx/stable/
-
-PATCH_SITES=	ftp://stone.phys.pusan.ac.kr/pub/CJK-LyX/
-PATCHFILES=	CJK-LyX-${LYX_VERS}-patch
-PATCH_DIST_ARGS=-d ${WRKSRC}/.. --forward --quiet -p0
-
-MAINTAINER=	rxg@NetBSD.org
-HOMEPAGE=	http://cellular.phys.pusan.ac.kr/cjk.html
-COMMENT=	Multibyte version of LyX
-
-PKG_DESTDIR_SUPPORT=	user-destdir
-
-LYX_VERS=	1.2.0
-
-CONFLICTS=	lyx-[0-9]*
-
-DEPENDS+=	ispell-base-[0-9]*:../../textproc/ispell-base
-
-TEX_ACCEPTED=		teTeX3
-USE_LANGUAGES=		c c++
-USE_PKGLOCALEDIR=	yes
-USE_TOOLS+=		perl:run msgfmt
-GNU_CONFIGURE=		yes
-USE_LIBTOOL=		yes
-
-REPLACE_PERL+=		lib/reLyX/reLyXmain.pl
-REPLACE_PYTHON+=	lib/scripts/*.py lib/scripts/listerrors
-
-.include "../../lang/python/application.mk"
-.include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../mk/jpeg.buildlink3.mk"
-.include "../../x11/libXpm/buildlink3.mk"
-.include "../../x11/xforms/buildlink3.mk"
-.include "../../mk/tex.buildlink3.mk"
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/print/cjk-lyx/PLIST b/print/cjk-lyx/PLIST
deleted file mode 100644
index 2355326bfab..00000000000
--- a/print/cjk-lyx/PLIST
+++ /dev/null
@@ -1,424 +0,0 @@
-@comment $NetBSD: PLIST,v 1.3 2009/06/14 18:11:54 joerg Exp $
-bin/lyx
-bin/noweb2lyx
-bin/reLyX
-man/man1/lyx.1
-man/man1/reLyX.1
-share/locale/bg/LC_MESSAGES/lyx.mo
-share/locale/ca/LC_MESSAGES/lyx.mo
-share/locale/cs/LC_MESSAGES/lyx.mo
-share/locale/da/LC_MESSAGES/lyx.mo
-share/locale/de/LC_MESSAGES/lyx.mo
-share/locale/es/LC_MESSAGES/lyx.mo
-share/locale/eu/LC_MESSAGES/lyx.mo
-share/locale/fi/LC_MESSAGES/lyx.mo
-share/locale/fr/LC_MESSAGES/lyx.mo
-share/locale/he/LC_MESSAGES/lyx.mo
-share/locale/hu/LC_MESSAGES/lyx.mo
-share/locale/it/LC_MESSAGES/lyx.mo
-share/locale/nl/LC_MESSAGES/lyx.mo
-share/locale/no/LC_MESSAGES/lyx.mo
-share/locale/pl/LC_MESSAGES/lyx.mo
-share/locale/pt/LC_MESSAGES/lyx.mo
-share/locale/ro/LC_MESSAGES/lyx.mo
-share/locale/ru/LC_MESSAGES/lyx.mo
-share/locale/sk/LC_MESSAGES/lyx.mo
-share/locale/sl/LC_MESSAGES/lyx.mo
-share/locale/sv/LC_MESSAGES/lyx.mo
-share/locale/tr/LC_MESSAGES/lyx.mo
-share/locale/wa/LC_MESSAGES/lyx.mo
-share/lyx/CREDITS
-share/lyx/bind/broadway.bind
-share/lyx/bind/cua.bind
-share/lyx/bind/de_menus.bind
-share/lyx/bind/emacs.bind
-share/lyx/bind/fi_menus.bind
-share/lyx/bind/hollywood.bind
-share/lyx/bind/latinkeys.bind
-share/lyx/bind/math.bind
-share/lyx/bind/menus.bind
-share/lyx/bind/pt_menus.bind
-share/lyx/bind/sciword.bind
-share/lyx/bind/sv_menus.bind
-share/lyx/bind/xemacs.bind
-share/lyx/chkconfig.ltx
-share/lyx/clipart/platypus.eps
-share/lyx/configure
-share/lyx/configure.cmd
-share/lyx/doc/Customization.lyx
-share/lyx/doc/DocStyle.lyx
-share/lyx/doc/Extended.lyx
-share/lyx/doc/FAQ.lyx
-share/lyx/doc/Intro.lyx
-share/lyx/doc/LaTeXConfig.lyx
-share/lyx/doc/LaTeXConfig.lyx.in
-share/lyx/doc/LyXConfig.lyx.in
-share/lyx/doc/Reference.lyx
-share/lyx/doc/TOC.lyx
-share/lyx/doc/Tutorial.lyx
-share/lyx/doc/UserGuide.lyx
-share/lyx/doc/cs_TOC.lyx
-share/lyx/doc/cs_Tutorial.lyx
-share/lyx/doc/da_Intro.lyx
-share/lyx/doc/da_TOC.lyx
-share/lyx/doc/de_Customization.lyx
-share/lyx/doc/de_Extended.lyx
-share/lyx/doc/de_FAQ.lyx
-share/lyx/doc/de_Intro.lyx
-share/lyx/doc/de_TOC.lyx
-share/lyx/doc/de_Tutorial.lyx
-share/lyx/doc/de_UserGuide.lyx
-share/lyx/doc/es_Intro.lyx
-share/lyx/doc/es_TOC.lyx
-share/lyx/doc/es_Tutorial.lyx
-share/lyx/doc/escher-lsd.eps
-share/lyx/doc/eu_Intro.lyx
-share/lyx/doc/eu_TOC.lyx
-share/lyx/doc/eu_Tutorial.lyx
-share/lyx/doc/fr_Customization.lyx
-share/lyx/doc/fr_Extended.lyx
-share/lyx/doc/fr_FAQ.lyx
-share/lyx/doc/fr_Intro.lyx
-share/lyx/doc/fr_TOC.lyx
-share/lyx/doc/fr_Tutorial.lyx
-share/lyx/doc/fr_UserGuide.lyx
-share/lyx/doc/hu_Intro.lyx
-share/lyx/doc/hu_TOC.lyx
-share/lyx/doc/it_Customization.lyx
-share/lyx/doc/it_Intro.lyx
-share/lyx/doc/it_TOC.lyx
-share/lyx/doc/it_Tutorial.lyx
-share/lyx/doc/it_UserGuide.lyx
-share/lyx/doc/mobius.eps
-share/lyx/doc/nl_Intro.lyx
-share/lyx/doc/nl_TOC.lyx
-share/lyx/doc/nl_Tutorial.lyx
-share/lyx/doc/pl_Intro.lyx
-share/lyx/doc/pl_TOC.lyx
-share/lyx/doc/pl_Tutorial.lyx
-share/lyx/doc/platypus.eps
-share/lyx/doc/pt_Intro.lyx
-share/lyx/doc/pt_TOC.lyx
-share/lyx/doc/pt_Tutorial.lyx
-share/lyx/doc/ro_Intro.lyx
-share/lyx/doc/ro_TOC.lyx
-share/lyx/doc/ro_splash.lyx
-share/lyx/doc/ru_Intro.lyx
-share/lyx/doc/ru_TOC.lyx
-share/lyx/doc/ru_Tutorial.lyx
-share/lyx/doc/sk_TOC.lyx
-share/lyx/doc/sk_Tutorial.lyx
-share/lyx/doc/sk_UserGuide.lyx
-share/lyx/doc/sl_Intro.lyx
-share/lyx/doc/sl_TOC.lyx
-share/lyx/doc/sl_Tutorial.lyx
-share/lyx/doc/sv_Intro.lyx
-share/lyx/doc/sv_TOC.lyx
-share/lyx/doc/sv_Tutorial.lyx
-share/lyx/encodings
-share/lyx/examples/Foils.lyx
-share/lyx/examples/ItemizeBullets.lyx
-share/lyx/examples/Literate.lyx
-share/lyx/examples/Minipage.lyx
-share/lyx/examples/TableExamples.lyx
-share/lyx/examples/aa_sample.lyx
-share/lyx/examples/aas_sample.lyx
-share/lyx/examples/amsart-test.lyx
-share/lyx/examples/amsbook-test.lyx
-share/lyx/examples/ca_splash.lyx
-share/lyx/examples/chess-article.lyx
-share/lyx/examples/chessgame.lyx
-share/lyx/examples/currency.lyx
-share/lyx/examples/cv.lyx
-share/lyx/examples/da_splash.lyx
-share/lyx/examples/de_beispiel_gelyxt.lyx
-share/lyx/examples/de_beispiel_roh.lyx
-share/lyx/examples/de_splash.lyx
-share/lyx/examples/decimal.lyx
-share/lyx/examples/docbook_article.lyx
-share/lyx/examples/es_ejemplo_con_lyx.lyx
-share/lyx/examples/es_ejemplo_sin_lyx.lyx
-share/lyx/examples/es_splash.lyx
-share/lyx/examples/eu_adibide_gordina.lyx
-share/lyx/examples/eu_adibide_lyx-atua.lyx
-share/lyx/examples/eu_splash.lyx
-share/lyx/examples/example_lyxified.lyx
-share/lyx/examples/example_raw.lyx
-share/lyx/examples/fr_AlignementDecimal.lyx
-share/lyx/examples/fr_ExemplesTableaux.lyx
-share/lyx/examples/fr_ListesPuces.lyx
-share/lyx/examples/fr_Minipage.lyx
-share/lyx/examples/fr_MultiColonnes.lyx
-share/lyx/examples/fr_exemple_brut.lyx
-share/lyx/examples/fr_exemple_lyxifie.lyx
-share/lyx/examples/fr_splash.lyx
-share/lyx/examples/hu_splash.lyx
-share/lyx/examples/iecc05.fen
-share/lyx/examples/iecc07.fen
-share/lyx/examples/iecc12.fen
-share/lyx/examples/it_ItemizeBullets.lyx
-share/lyx/examples/it_splash.lyx
-share/lyx/examples/landslide.lyx
-share/lyx/examples/linuxdoc_manpage.lyx
-share/lyx/examples/listerrors.lyx
-share/lyx/examples/mathed.lyx
-share/lyx/examples/multicol.lyx
-share/lyx/examples/nl_multicol.lyx
-share/lyx/examples/nl_opsommingstekens.lyx
-share/lyx/examples/nl_splash.lyx
-share/lyx/examples/nl_voorbeeld_ruw.lyx
-share/lyx/examples/nl_voorbeeld_verlyxt.lyx
-share/lyx/examples/noweb2lyx.lyx
-share/lyx/examples/pl_splash.lyx
-share/lyx/examples/pt_splash.lyx
-share/lyx/examples/ru_splash.lyx
-share/lyx/examples/script_form.lyx
-share/lyx/examples/sl_primer_lyxan.lyx
-share/lyx/examples/sl_primer_surov.lyx
-share/lyx/examples/sl_splash.lyx
-share/lyx/examples/splash.lyx
-share/lyx/external_templates
-share/lyx/help/Bibtex.hlp
-share/lyx/help/Texinfo.hlp
-share/lyx/images/amssymb.xpm
-share/lyx/images/banner.xpm
-share/lyx/images/buffer-close.xpm
-share/lyx/images/buffer-export_ascii.xpm
-share/lyx/images/buffer-export_latex.xpm
-share/lyx/images/buffer-print.xpm
-share/lyx/images/buffer-update_dvi.xpm
-share/lyx/images/buffer-update_ps.xpm
-share/lyx/images/buffer-view_dvi.xpm
-share/lyx/images/buffer-view_ps.xpm
-share/lyx/images/buffer-write.xpm
-share/lyx/images/build-program.xpm
-share/lyx/images/citation-insert.xpm
-share/lyx/images/copy.xpm
-share/lyx/images/cut.xpm
-share/lyx/images/depth-decrement.xpm
-share/lyx/images/depth-increment.xpm
-share/lyx/images/dialog-tabular-insert.xpm
-share/lyx/images/ert-insert.xpm
-share/lyx/images/file-open.xpm
-share/lyx/images/font-bold.xpm
-share/lyx/images/font-emph.xpm
-share/lyx/images/font-free.xpm
-share/lyx/images/font-noun.xpm
-share/lyx/images/font-sans.xpm
-share/lyx/images/footnote-insert.xpm
-share/lyx/images/graphics-insert.xpm
-share/lyx/images/index-insert.xpm
-share/lyx/images/label-insert.xpm
-share/lyx/images/layout.xpm
-share/lyx/images/layout_LaTeX.xpm
-share/lyx/images/layout_LyX-Code.xpm
-share/lyx/images/layout_Scrap.xpm
-share/lyx/images/layout_Section.xpm
-share/lyx/images/lyx-quit.xpm
-share/lyx/images/lyx.xpm
-share/lyx/images/marginalnote-insert.xpm
-share/lyx/images/math-mode.xpm
-share/lyx/images/math-panel.xpm
-share/lyx/images/melt.xpm
-share/lyx/images/paste.xpm
-share/lyx/images/psnfss1.xpm
-share/lyx/images/psnfss2.xpm
-share/lyx/images/psnfss3.xpm
-share/lyx/images/psnfss4.xpm
-share/lyx/images/redo.xpm
-share/lyx/images/standard.xpm
-share/lyx/images/tabular-insert.xpm
-share/lyx/images/undo.xpm
-share/lyx/images/unknown.xpm
-share/lyx/kbd/american-2.kmap
-share/lyx/kbd/american.kmap
-share/lyx/kbd/arabic.kmap
-share/lyx/kbd/bg-bds-1251.kmap
-share/lyx/kbd/brazil.kmap
-share/lyx/kbd/brazil2.kmap
-share/lyx/kbd/czech-prg.kmap
-share/lyx/kbd/czech.kmap
-share/lyx/kbd/european.kmap
-share/lyx/kbd/francais.kmap
-share/lyx/kbd/french.kmap
-share/lyx/kbd/german-2.kmap
-share/lyx/kbd/german-3.kmap
-share/lyx/kbd/german.kmap
-share/lyx/kbd/greek.kmap
-share/lyx/kbd/hebrew.kmap
-share/lyx/kbd/iso8859-1.cdef
-share/lyx/kbd/iso8859-15.cdef
-share/lyx/kbd/iso8859-2.cdef
-share/lyx/kbd/iso8859-3.cdef
-share/lyx/kbd/iso8859-4.cdef
-share/lyx/kbd/iso8859-7.cdef
-share/lyx/kbd/iso8859-8.cdef
-share/lyx/kbd/iso8859-9.cdef
-share/lyx/kbd/koi8-r.kmap
-share/lyx/kbd/koi8-u.kmap
-share/lyx/kbd/latvian.kmap
-share/lyx/kbd/magyar-2.kmap
-share/lyx/kbd/magyar-3.kmap
-share/lyx/kbd/magyar.kmap
-share/lyx/kbd/null.kmap
-share/lyx/kbd/polish.kmap
-share/lyx/kbd/portuges.kmap
-share/lyx/kbd/romanian.kmap
-share/lyx/kbd/serbian.kmap
-share/lyx/kbd/serbocroatian.kmap
-share/lyx/kbd/sf.kmap
-share/lyx/kbd/sg.kmap
-share/lyx/kbd/slovak.kmap
-share/lyx/kbd/slovene.kmap
-share/lyx/kbd/thai-kedmanee.kmap
-share/lyx/kbd/tis620-0.cdef
-share/lyx/kbd/transilvanian.kmap
-share/lyx/kbd/turkish-f.kmap
-share/lyx/kbd/turkish.kmap
-share/lyx/languages
-share/lyx/layouts/IEEEtran.layout
-share/lyx/layouts/aa.layout
-share/lyx/layouts/aapaper.inc
-share/lyx/layouts/aapaper.layout
-share/lyx/layouts/aastex.layout
-share/lyx/layouts/amsart-plain.layout
-share/lyx/layouts/amsart-seq.layout
-share/lyx/layouts/amsart.layout
-share/lyx/layouts/amsbook.layout
-share/lyx/layouts/amsdefs.inc
-share/lyx/layouts/amsmaths-plain.inc
-share/lyx/layouts/amsmaths-seq.inc
-share/lyx/layouts/amsmaths.inc
-share/lyx/layouts/apa.layout
-share/lyx/layouts/article.layout
-share/lyx/layouts/book.layout
-share/lyx/layouts/broadway.layout
-share/lyx/layouts/chess.layout
-share/lyx/layouts/cv.layout
-share/lyx/layouts/db_lyxmacros.inc
-share/lyx/layouts/db_stdclass.inc
-share/lyx/layouts/db_stdlayouts.inc
-share/lyx/layouts/db_stdlists.inc
-share/lyx/layouts/db_stdsections.inc
-share/lyx/layouts/db_stdstarsections.inc
-share/lyx/layouts/db_stdstruct.inc
-share/lyx/layouts/db_stdtitle.inc
-share/lyx/layouts/dinbrief.layout
-share/lyx/layouts/docbook-book.layout
-share/lyx/layouts/docbook-chapter.layout
-share/lyx/layouts/docbook-section.layout
-share/lyx/layouts/docbook.layout
-share/lyx/layouts/dtk.layout
-share/lyx/layouts/egs.layout
-share/lyx/layouts/entcs.layout
-share/lyx/layouts/extarticle.layout
-share/lyx/layouts/extbook.layout
-share/lyx/layouts/extletter.layout
-share/lyx/layouts/extreport.layout
-share/lyx/layouts/foils.layout
-share/lyx/layouts/g-brief-de.layout
-share/lyx/layouts/g-brief-en.layout
-share/lyx/layouts/heb-article.layout
-share/lyx/layouts/heb-letter.layout
-share/lyx/layouts/hollywood.layout
-share/lyx/layouts/iletter.layout
-share/lyx/layouts/kluwer.layout
-share/lyx/layouts/latex8.layout
-share/lyx/layouts/letter.layout
-share/lyx/layouts/linuxdoc.layout
-share/lyx/layouts/literate-article.layout
-share/lyx/layouts/literate-book.layout
-share/lyx/layouts/literate-report.layout
-share/lyx/layouts/literate-scrap.inc
-share/lyx/layouts/llncs.layout
-share/lyx/layouts/ltugboat.layout
-share/lyx/layouts/lyxmacros.inc
-share/lyx/layouts/manpage.layout
-share/lyx/layouts/obsolete.inc
-share/lyx/layouts/paper.layout
-share/lyx/layouts/report.layout
-share/lyx/layouts/revtex.layout
-share/lyx/layouts/revtex4.layout
-share/lyx/layouts/scrartcl.layout
-share/lyx/layouts/scrbook.layout
-share/lyx/layouts/scrclass.inc
-share/lyx/layouts/scrlettr.layout
-share/lyx/layouts/scrmacros.inc
-share/lyx/layouts/scrreprt.layout
-share/lyx/layouts/seminar.layout
-share/lyx/layouts/siamltex.layout
-share/lyx/layouts/slides.layout
-share/lyx/layouts/spie.layout
-share/lyx/layouts/stdclass.inc
-share/lyx/layouts/stdlayouts.inc
-share/lyx/layouts/stdletter.inc
-share/lyx/layouts/stdlists.inc
-share/lyx/layouts/stdsections.inc
-share/lyx/layouts/stdstarsections.inc
-share/lyx/layouts/stdstruct.inc
-share/lyx/layouts/stdtitle.inc
-share/lyx/layouts/svjog.layout
-share/lyx/layouts/svjour.inc
-share/lyx/layouts/svprobth.layout
-share/lyx/lyxrc.defaults
-share/lyx/lyxrc.example
-share/lyx/packages.lst
-share/lyx/reLyX/BUGS
-share/lyx/reLyX/BasicLyX.pm
-share/lyx/reLyX/CHANGES
-share/lyx/reLyX/CleanTeX.pm
-share/lyx/reLyX/LastLyX.pm
-share/lyx/reLyX/MakePreamble.pm
-share/lyx/reLyX/README
-share/lyx/reLyX/ReadCommands.pm
-share/lyx/reLyX/RelyxFigure.pm
-share/lyx/reLyX/RelyxTable.pm
-share/lyx/reLyX/Text/TeX.pm
-share/lyx/reLyX/Verbatim.pm
-share/lyx/reLyX/reLyX.pod
-share/lyx/reLyX/reLyXmain.pl
-share/lyx/reLyX/syntax.default
-share/lyx/scripts/TeXFiles.sh
-share/lyx/scripts/fen2ascii.py
-share/lyx/scripts/fig2pstex.py
-share/lyx/scripts/general_command_wrapper.py
-share/lyx/scripts/listerrors
-share/lyx/scripts/pic2ascii.py
-share/lyx/scripts/pic2png_eps.py
-share/lyx/scripts/pic2png_eps.sh
-share/lyx/symbols
-share/lyx/templates/IEEEtran.lyx
-share/lyx/templates/aa.lyx
-share/lyx/templates/aastex.lyx
-share/lyx/templates/dinbrief.lyx
-share/lyx/templates/docbook_article.lyx
-share/lyx/templates/g-brief-de.lyx
-share/lyx/templates/g-brief-en.lyx
-share/lyx/templates/hollywood.lyx
-share/lyx/templates/iletter.lyx
-share/lyx/templates/kluwer.lyx
-share/lyx/templates/latex8.lyx
-share/lyx/templates/letter.lyx
-share/lyx/templates/linuxdoc_article.lyx
-share/lyx/templates/revtex.lyx
-share/lyx/templates/revtex4.lyx
-share/lyx/templates/slides.lyx
-share/lyx/tex/broadway.cls
-share/lyx/tex/cv.cls
-share/lyx/tex/hollywood.cls
-share/lyx/tex/iletter.cls
-share/lyx/tex/lyxchess.sty
-share/lyx/tex/lyxskak.sty
-share/lyx/tex/revtex.cls
-share/lyx/textclass.lst
-share/lyx/ui/default.ui
-share/lyx/ui/old-default.ui
-share/lyx/xfonts/cmex10.pfb
-share/lyx/xfonts/cmmi10.pfb
-share/lyx/xfonts/cmr10.pfb
-share/lyx/xfonts/cmsy10.pfb
-share/lyx/xfonts/eufm10.pfb
-share/lyx/xfonts/fonts.dir
-share/lyx/xfonts/fonts.scale
-share/lyx/xfonts/msam10.pfb
-share/lyx/xfonts/msbm10.pfb
diff --git a/print/cjk-lyx/distinfo b/print/cjk-lyx/distinfo
deleted file mode 100644
index c4e539f1dc2..00000000000
--- a/print/cjk-lyx/distinfo
+++ /dev/null
@@ -1,30 +0,0 @@
-$NetBSD: distinfo,v 1.10 2011/12/29 16:35:41 joerg Exp $
-
-SHA1 (lyx-1.2.0.tar.gz) = 56db850f316c18e00c4b10946216b6eb25107dab
-RMD160 (lyx-1.2.0.tar.gz) = e21eeb53517bf994938f2d89e7be585da9ff8cd3
-Size (lyx-1.2.0.tar.gz) = 6418424 bytes
-SHA1 (CJK-LyX-1.2.0-patch) = d84540cd832f68d79fadf7f4527f84b55660adee
-RMD160 (CJK-LyX-1.2.0-patch) = 05e2ec70ab5d4d7dbac0c117e606e51fb0cba601
-Size (CJK-LyX-1.2.0-patch) = 126189 bytes
-SHA1 (patch-aa) = 3c020c72d8ac850ebb76c5ff65d546e8cfd9b587
-SHA1 (patch-ab) = 48faac82be2a99d7801e751e13a602622817fbc6
-SHA1 (patch-ac) = a7770d4a60e3c634f37fd283b43de9bbdb8f05b6
-SHA1 (patch-ad) = 48cb4ee6bfee21ee981db52d20e34c8e23316928
-SHA1 (patch-ae) = 5b744b75ac59a4f47fd3d02fe0a4b9ce551a39b7
-SHA1 (patch-af) = f09bdf2b9e8da14e9b58b683ab40e89775344ec3
-SHA1 (patch-ag) = b1f3e8e12d667f2761206bcd4d9d0d5c450fac09
-SHA1 (patch-ah) = 100b2b3d4f823a472e7c69dbd3130c830a1a6cba
-SHA1 (patch-ai) = 3e694cf156a527bba9155de49c3a6a9fb66af014
-SHA1 (patch-aj) = 8a8e5750fe67093e748791da7b11141fcf3a0795
-SHA1 (patch-ak) = beb9e230d33a3d6bc25212aa9ef8841d9b17d7ac
-SHA1 (patch-al) = a441f0925619fcc674d83c24e90d041047a71ad7
-SHA1 (patch-am) = abf7427e2fbf918bb30006f9a524dc16fc12e08f
-SHA1 (patch-an) = b39ef6b367a1e47e072d48181aa29a0b8cbcec13
-SHA1 (patch-ao) = 663016706d09b7ac8d34efab2c71d4c46e2757cd
-SHA1 (patch-src_frontends_controllers_ControlInset.h) = f2f8eab52fbbf871ad7518e607b85255839bd965
-SHA1 (patch-src_frontends_controllers_helper__funcs.h) = 03b1f40d5ad9c686dd58b2170aa50bc18a7dedae
-SHA1 (patch-src_frontends_xforms_FormMathsMatrix.C) = 63e1003ebc15be07556ff2f0fcc6aa26ee207fd6
-SHA1 (patch-src_mathed_math__xdata.C) = e0d51e11a5fa2c2a29e5ce95ed0b4dd11abd5c0a
-SHA1 (patch-src_support_LSubstring.C) = 51d8d547681c26fbee6f6f04a10e4b4ff8864417
-SHA1 (patch-src_support_forkedcontr.C) = d2068c100e7e068fc21f51a4789beb735cf2332b
-SHA1 (patch-src_support_lstrings.h) = 846087a2c5e6759ee3086d295ba3bb93e56df3ad
diff --git a/print/cjk-lyx/patches/patch-aa b/print/cjk-lyx/patches/patch-aa
deleted file mode 100644
index d56be7d8cf2..00000000000
--- a/print/cjk-lyx/patches/patch-aa
+++ /dev/null
@@ -1,57 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2002/07/19 12:32:32 agc Exp $
-
---- configure.orig	Fri May  3 22:53:34 2002
-+++ configure	Tue May 21 12:15:00 2002
-@@ -9743,7 +9743,7 @@
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   ac_save_LIBS="$LIBS"
--LIBS="-lforms  $LIBS"
-+LIBS="-lforms -ljpeg -lXpm $LIBS"
- cat > conftest.$ac_ext <<EOF
- #line 9749 "configure"
- #include "confdefs.h"
-@@ -9774,7 +9774,7 @@
- fi
- if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-   echo "$ac_t""yes" 1>&6
--  XFORMS_LIB="-lforms"
-+  XFORMS_LIB="-lforms -ljpeg -lXpm"
- else
-   echo "$ac_t""no" 1>&6
- echo $ac_n "checking for fl_initialize in -lxforms""... $ac_c" 1>&6
-@@ -9954,6 +9954,7 @@
- "
- lyx_warning=yes ;;
-     0.89*) ;;
-+    0.9*) ;;
-        *) 
- lyx_warning_txt="$lyx_warning_txt
- == Version $lyx_cv_xfversion of xforms might not be compatible with LyX,
-@@ -10159,7 +10160,7 @@
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   ac_save_LIBS="$LIBS"
--LIBS="-lforms  $LIBS"
-+LIBS="-lforms -ljpeg -lXpm $LIBS"
- cat > conftest.$ac_ext <<EOF
- #line 10165 "configure"
- #include "confdefs.h"
-@@ -10190,7 +10191,7 @@
- fi
- if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-   echo "$ac_t""yes" 1>&6
--  XFORMS_LIB="-lforms"
-+  XFORMS_LIB="-lforms -ljpeg -lXpm"
- else
-   echo "$ac_t""no" 1>&6
- echo $ac_n "checking for fl_initialize in -lxforms""... $ac_c" 1>&6
-@@ -11603,7 +11603,7 @@
- 
- trap 'rm -f $CONFIG_STATUS conftest*; exit 1' 1 2 15
- 
--DEFS=-DHAVE_CONFIG_H
-+DEFS="-DHAVE_CONFIG_H -DI18N"
- 
- # Without the "./", some shells look in PATH for config.status.
- : ${CONFIG_STATUS=./config.status}
diff --git a/print/cjk-lyx/patches/patch-ab b/print/cjk-lyx/patches/patch-ab
deleted file mode 100644
index e6d0235d332..00000000000
--- a/print/cjk-lyx/patches/patch-ab
+++ /dev/null
@@ -1,96 +0,0 @@
-$NetBSD: patch-ab,v 1.2 2002/08/16 10:36:26 dmcmahill Exp $
-
---- src/Makefile.in.orig	Thu May 23 20:05:19 2002
-+++ src/Makefile.in
-@@ -370,6 +370,8 @@
- 	lyx_main.h \
- 	lyx_sty.C \
- 	lyx_sty.h \
-+	lyxcodeconv.C \
-+	lyxcodeconv.h \
- 	lyxcursor.C \
- 	lyxcursor.h \
- 	lyxfont.C \
-@@ -380,6 +382,8 @@
- 	lyxfunc.h \
- 	lyxgluelength.C \
- 	lyxgluelength.h \
-+	lyxim.C \
-+	lyxim.h \
- 	lyxlayout.C \
- 	lyxlayout.h \
- 	lyxlength.C \
-@@ -476,6 +480,7 @@
- 	kbsequence.$(OBJEXT) language.$(OBJEXT) lastfiles.$(OBJEXT) \
- 	lengthcommon.$(OBJEXT) lyx_cb.$(OBJEXT) lyx_gui.$(OBJEXT) \
- 	lyx_main.$(OBJEXT) lyx_sty.$(OBJEXT) lyxcursor.$(OBJEXT) \
-+	lyxcodeconv.$(OBJEXT) lyxim.$(OBJEXT) \
- 	lyxfont.$(OBJEXT) lyxfind.$(OBJEXT) lyxfunc.$(OBJEXT) \
- 	lyxgluelength.$(OBJEXT) lyxlayout.$(OBJEXT) lyxlength.$(OBJEXT) \
- 	lyxlex.$(OBJEXT) lyxlex_pimpl.$(OBJEXT) lyxlookup.$(OBJEXT) \
-@@ -548,6 +548,11 @@ depcomp = $(SHELL) $(top_srcdir)/config/
- @AMDEP_TRUE@	$(DEPDIR)/undo_funcs.Po $(DEPDIR)/undostack.Po \
- @AMDEP_TRUE@	$(DEPDIR)/vc-backend.Po $(DEPDIR)/version.Po \
- @AMDEP_TRUE@	$(DEPDIR)/vspace.Po
-+CXXCOMPILE_NOOPT = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-+	$(AM_CPPFLAGS) $(CPPFLAGS_NOOPT) $(AM_CXXFLAGS) $(CXXFLAGS_NOOPT)
-+LTCXXCOMPILE_NOOPT = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
-+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS_NOOPT) \
-+	$(AM_CXXFLAGS) $(CXXFLAGS_NOOPT)
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
-@@ -558,6 +563,8 @@ CXXLINK = $(LIBTOOL) --mode=link $(CXXLD
- 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
- CXXFLAGS = @CXXFLAGS@
- CFLAGS = @CFLAGS@
-+CPPFLAGS_NOOPT = $(CPPFLAGS:C/-O[0-9]*//)
-+CXXFLAGS_NOOPT = $(CXXFLAGS:C/-O[0-9]*//)
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
- LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
-@@ -579,8 +586,15 @@ SOURCES = $(lyx_SOURCES)
- all: $(BUILT_SOURCES) config.h
- 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
- 
-+buffer.o: buffer.cc
-+buffer.lo: buffer.cc
-+lyxfunc.o: lyxfunc.cc
-+lyxfunc.lo: lyxfunc.cc
-+tex-accent.o: tex-accent.cc
-+tex-accent.lo: tex-accent.cc
-+
- .SUFFIXES:
--.SUFFIXES: .C .lo .o .obj
-+.SUFFIXES: .C .cc .lo .o .obj
- 
- mostlyclean-libtool:
- 	-rm -f *.lo
-@@ -752,6 +766,14 @@ distclean-compile:
- 
- distclean-depend:
- 	-rm -rf $(DEPDIR)
-+.C.cc:
-+	cp -f $< $@
-+
-+.cc.o:
-+@AMDEP_TRUE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-+@AMDEP_TRUE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+@AMDEP_TRUE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+	$(CXXCOMPILE_NOOPT) -c -o $@ `test -f $< || echo '$(srcdir)/'`$<
- 
- .C.o:
- @AMDEP_TRUE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@@ -764,6 +786,12 @@ distclean-depend:
- @AMDEP_TRUE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
- @AMDEP_TRUE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- 	$(CXXCOMPILE) -c -o $@ `cygpath -w $<`
-+
-+.cc.lo:
-+@AMDEP_TRUE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-+@AMDEP_TRUE@	depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-+@AMDEP_TRUE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+	$(LTCXXCOMPILE_NOOPT) -c -o $@ `test -f $< || echo '$(srcdir)/'`$<
- 
- .C.lo:
- @AMDEP_TRUE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
diff --git a/print/cjk-lyx/patches/patch-ac b/print/cjk-lyx/patches/patch-ac
deleted file mode 100644
index 6fb4582c176..00000000000
--- a/print/cjk-lyx/patches/patch-ac
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ac,v 1.1.1.1 2002/07/19 12:32:32 agc Exp $
-
---- src/WorkArea.C.porig	Fri Jul 19 13:22:01 2002
-+++ src/WorkArea.C
-@@ -420,7 +420,11 @@
- 		LyXLookupString(ev, dummy, 1, &keysym);
- #endif
- #else
-+#ifdef I18N
-+		int num_bytes = XLookupString(xke, s_r, 256, &keysym, 0);
-+#else
- 		XLookupString(xke, dummy, 1, &keysym, 0);
-+#endif
- //		int num_keys = XLookupString(xke, dummy, 10, &keysym, &xcs);
- //		lyxerr << "We have " << num_keys << " keys in the returned buffer" << endl;
- //		lyxerr << "Our dummy string is " << dummy << endl;
diff --git a/print/cjk-lyx/patches/patch-ad b/print/cjk-lyx/patches/patch-ad
deleted file mode 100644
index 07771cbe12d..00000000000
--- a/print/cjk-lyx/patches/patch-ad
+++ /dev/null
@@ -1,41 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2002/08/16 10:36:26 dmcmahill Exp $
-
---- src/insets/Makefile.in.orig	Thu May 23 08:05:22 2002
-+++ src/insets/Makefile.in
-@@ -352,10 +352,17 @@ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_IN
- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- 	$(AM_CXXFLAGS) $(CXXFLAGS)
-+CXXCOMPILE_NOOPT = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-+	$(AM_CPPFLAGS) $(CPPFLAGS_NOOPT) $(AM_CXXFLAGS) $(CXXFLAGS_NOOPT)
-+LTCXXCOMPILE_NOOPT = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
-+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS_NOOPT) \
-+	$(AM_CXXFLAGS) $(CXXFLAGS_NOOPT)
- CXXLD = $(CXX)
- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
- 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
- CXXFLAGS = @CXXFLAGS@
-+CPPFLAGS_NOOPT = $(CPPFLAGS:C/-O[1-9]*//)
-+CXXFLAGS_NOOPT = $(CXXFLAGS:C/-O[1-9]*//)
- CFLAGS = @CFLAGS@
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-@@ -369,6 +376,18 @@ DIST_COMMON = ChangeLog Makefile.am Make
- SOURCES = $(libinsets_la_SOURCES)
- 
- all: all-am
-+
-+insetlatexaccent.o: insetlatexaccent.C
-+@AMDEP_TRUE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ 
-+@AMDEP_TRUE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+@AMDEP_TRUE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+	$(CXXCOMPILE_NOOPT) -c -o $@ `test -f $< || echo '$(srcdir)/'`$<
-+
-+insetlatexaccent.lo: insetlatexaccent.C
-+@AMDEP_TRUE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-+@AMDEP_TRUE@	depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-+@AMDEP_TRUE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+	$(LTCXXCOMPILE_NOOPT) -c -o $@ `test -f $< || echo '$(srcdir)/'`$<
- 
- .SUFFIXES:
- .SUFFIXES: .C .lo .o .obj
diff --git a/print/cjk-lyx/patches/patch-ae b/print/cjk-lyx/patches/patch-ae
deleted file mode 100644
index c70b5a99945..00000000000
--- a/print/cjk-lyx/patches/patch-ae
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD: patch-ae,v 1.1 2002/08/16 10:36:26 dmcmahill Exp $
-
---- boost/boost/detail/limits.hpp.orig	Wed Aug 29 18:33:34 2001
-+++ boost/boost/detail/limits.hpp
-@@ -38,12 +38,21 @@
- #include <cwchar>             // for WCHAR_MIN and WCHAR_MAX
- #include <boost/config.hpp>
- 
-+#ifdef __NetBSD__
-+#include <machine/endian.h>
-+#if BYTE_ORDER == BIG_ENDIAN
-+#define BOOST_BIG_ENDIAN
-+#else
-+#define BOOST_LITTLE_ENDIAN
-+#endif
-+#else
- #if defined(__sparc) || defined(__sparc__) || defined(__powerpc__) || defined(__ppc__) || defined(__hppa) || defined(_MIPSEB)
- #define BOOST_BIG_ENDIAN
- #elif defined(__i386__)
- #define BOOST_LITTLE_ENDIAN
- #else
- #error The file boost/detail/limits.hpp needs to be set up for your CPU type.
-+#endif
- #endif
- 
- namespace std {
diff --git a/print/cjk-lyx/patches/patch-af b/print/cjk-lyx/patches/patch-af
deleted file mode 100644
index 60a8b54d2f8..00000000000
--- a/print/cjk-lyx/patches/patch-af
+++ /dev/null
@@ -1,68 +0,0 @@
-$NetBSD: patch-af,v 1.1 2002/08/16 10:36:27 dmcmahill Exp $
-
---- src/frontends/xforms/Makefile.in.orig	Sat Aug 10 00:22:18 2002
-+++ src/frontends/xforms/Makefile.in
-@@ -656,10 +656,17 @@ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_IN
- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- 	$(AM_CXXFLAGS) $(CXXFLAGS)
-+CXXCOMPILE_NOOPT = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-+	$(AM_CPPFLAGS) $(CPPFLAGS_NOOPT) $(AM_CXXFLAGS) $(CXXFLAGS_NOOPT)
-+LTCXXCOMPILE_NOOPT = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
-+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS_NOOPT) \
-+	$(AM_CXXFLAGS) $(CXXFLAGS_NOOPT)
- CXXLD = $(CXX)
- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
- 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
- CXXFLAGS = @CXXFLAGS@
-+CPPFLAGS_NOOPT = $(CPPFLAGS:C/-O[1-9]*//)
-+CXXFLAGS_NOOPT = $(CXXFLAGS:C/-O[1-9]*//)
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
- LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
-@@ -678,10 +685,15 @@ DIST_COMMON = ChangeLog Makefile.am Make
- DIST_SUBDIRS = $(SUBDIRS)
- SOURCES = $(libxforms_la_SOURCES)
- 
-+FormForks.o: FormForks.cc
-+FormForks.lo: FormForks.cc
-+FormPreferences.o: FormPreferences.cc
-+FormPreferences.lo: FormPreferences.cc
-+
- all: all-recursive
- 
- .SUFFIXES:
--.SUFFIXES: .C .c .lo .o .obj
-+.SUFFIXES: .C .c .cc .lo .o .obj
- 
- mostlyclean-libtool:
- 	-rm -f *.lo
-@@ -813,6 +825,15 @@ distclean-compile:
- distclean-depend:
- 	-rm -rf $(DEPDIR)
- 
-+.C.cc:
-+	cp -f $< $@
-+
-+.cc.o:
-+@AMDEP_TRUE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-+@AMDEP_TRUE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+@AMDEP_TRUE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+	$(CXXCOMPILE_NOOPT) -c -o $@ `test -f $< || echo '$(srcdir)/'`$<
-+
- .C.o:
- @AMDEP_TRUE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@@ -824,6 +845,12 @@ distclean-depend:
- @AMDEP_TRUE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
- @AMDEP_TRUE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- 	$(CXXCOMPILE) -c -o $@ `cygpath -w $<`
-+
-+.cc.lo:
-+@AMDEP_TRUE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-+@AMDEP_TRUE@	depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-+@AMDEP_TRUE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+	$(LTCXXCOMPILE_NOOPT) -c -o $@ `test -f $< || echo '$(srcdir)/'`$<
- 
- .C.lo:
- @AMDEP_TRUE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
diff --git a/print/cjk-lyx/patches/patch-ag b/print/cjk-lyx/patches/patch-ag
deleted file mode 100644
index 8872091d617..00000000000
--- a/print/cjk-lyx/patches/patch-ag
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-ag,v 1.1 2003/01/13 15:49:18 jschauma Exp $
-
---- src/frontends/xforms/GUIRunTime.C.orig	Mon Jan 13 10:41:04 2003
-+++ src/frontends/xforms/GUIRunTime.C	Mon Jan 13 10:41:28 2003
-@@ -26,10 +26,12 @@
- 
- // I keep these here so that it will be processed as early in
- // the compilation process as possible.
-+#if 0
- #if !defined(FL_REVISION) || FL_REVISION < 88 || FL_VERSION != 0
- #error LyX will not compile with this version of XForms.\
-        Please get version 0.89.\
-        If you want to try to compile anyway, delete this test in src/frontends/xforms/GUIRunTime.C.
-+#endif
- #endif
- 
- 
diff --git a/print/cjk-lyx/patches/patch-ah b/print/cjk-lyx/patches/patch-ah
deleted file mode 100644
index fcf709928a2..00000000000
--- a/print/cjk-lyx/patches/patch-ah
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ah,v 1.1 2004/11/18 00:14:04 hubertf Exp $
-
---- src/lyxcodeconv.h.orig	2004-11-17 19:56:50.000000000 +0000
-+++ src/lyxcodeconv.h
-@@ -14,6 +14,7 @@ using std::ifstream;
- using std::fstream;
- using std::ios;
- using std::setw;
-+using namespace std;
- 
- #include "support/lyxstring.h"
- #include "LString.h"
diff --git a/print/cjk-lyx/patches/patch-ai b/print/cjk-lyx/patches/patch-ai
deleted file mode 100644
index c28270d0c2f..00000000000
--- a/print/cjk-lyx/patches/patch-ai
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ai,v 1.1 2004/11/18 00:14:04 hubertf Exp $
-
---- src/lyxim.C.orig	2004-11-17 20:11:34.000000000 +0000
-+++ src/lyxim.C
-@@ -17,6 +17,8 @@
- #include "WorkArea.h"
- #include "BufferView_pimpl.h"
- 
-+using namespace std;
-+
- #define DUMMY_FONT_NAME       "-*-*-*-R-Normal--14-130-75-75-*-*"
- 
- //extern FD_form_main *fd_form_main;
diff --git a/print/cjk-lyx/patches/patch-aj b/print/cjk-lyx/patches/patch-aj
deleted file mode 100644
index 479fa10d95e..00000000000
--- a/print/cjk-lyx/patches/patch-aj
+++ /dev/null
@@ -1,42 +0,0 @@
-$NetBSD: patch-aj,v 1.1 2005/01/16 19:49:29 markd Exp $
-
---- lib/reLyX/configure.orig	2002-05-24 00:05:26.000000000 +1200
-+++ lib/reLyX/configure
-@@ -1032,37 +1032,6 @@ OS/2)
-   PATH_IFS=':'
-   ;;
- esac
--for ac_prog in perl perl5 perl5.6.1  perl5.6.0 perl5.005 perl5.004 perl5.003 perl5.002 ; do
--# Extract the first word of "$ac_prog", so it can be a program name with
--# args.
--  set dummy $ac_prog ; ac_word=$2
--  if test ! -n "$PERL"; then
--    IFS="${IFS=         }"; ac_save_ifs="$IFS"; IFS="${IFS}$PATH_IFS"
--    for ac_dir in $PATH; do
--      test -z "$ac_dir" && ac_dir=.
--      if test -f $ac_dir/$ac_word -o -f $ac_dir/$ac_word$ac_exeext; then
--        PERL="$ac_prog"
--        break
--      fi
--    done
--    IFS="$ac_save_ifs"
--  fi
--
--  if test -n "$PERL"; then
--    ac_result=yes
--  else
--    ac_result=no
--  fi
--  
--if echo 'require 5.002;exit' | $ac_dir/$ac_prog 2>&5
--then
--  PERL=$ac_dir/$ac_prog
--else
--  PERL=
--fi
--
--  test -n "$PERL" && break
--done
- 
- if test -n "$PERL" ; then
-   echo "$ac_t""$PERL" 1>&6
diff --git a/print/cjk-lyx/patches/patch-ak b/print/cjk-lyx/patches/patch-ak
deleted file mode 100644
index ba971a2df35..00000000000
--- a/print/cjk-lyx/patches/patch-ak
+++ /dev/null
@@ -1,33 +0,0 @@
-$NetBSD: patch-ak,v 1.2 2007/10/13 18:12:40 rillig Exp $
-
---- src/graphics/GraphicsConverter.h.orig	2002-03-11 22:58:05.000000000 +0000
-+++ src/graphics/GraphicsConverter.h	2007-10-13 15:28:42.000000000 +0000
-@@ -33,6 +33,8 @@
- 
- namespace grfx {
- 
-+class ConvProcess;
-+
- class GConverter : boost::noncopyable {
- public:
- 
-@@ -60,7 +62,7 @@ private:
- 	/** Make the c-tor private so we can control how many objects
- 	 *  are instantiated.
- 	 */
--	GConverter() {}
-+	GConverter();
- 
- 	/** Build the conversion script, returning true if able to build it.
- 	 *  The script is output to the ostringstream 'script'.
-@@ -117,6 +119,10 @@ struct ConvProcess : public SigC::Object
- 	SignalTypePtr on_finish_;
- };
- 
-+inline GConverter::GConverter()
-+{
-+}
-+
- } // namespace grfx
- 
- #endif // GRAPHICSCONVERTER_H
diff --git a/print/cjk-lyx/patches/patch-al b/print/cjk-lyx/patches/patch-al
deleted file mode 100644
index 3b4ba6710b7..00000000000
--- a/print/cjk-lyx/patches/patch-al
+++ /dev/null
@@ -1,67 +0,0 @@
-$NetBSD: patch-al,v 1.1 2006/09/19 23:35:07 joerg Exp $
-
---- src/frontends/controllers/ControlDialog.tmpl.orig	2006-09-20 01:06:59.000000000 +0000
-+++ src/frontends/controllers/ControlDialog.tmpl
-@@ -27,49 +27,49 @@ ControlDialog<Base>::ControlDialog(LyXVi
- template <class Base>
- void ControlDialog<Base>::show()
- {
--	if (isBufferDependent() && !lv_.view()->available())
-+	if (this->isBufferDependent() && !this->lv_.view()->available())
- 		return;
- 
--	connect();
-+	this->connect();
- 
- 	setParams();
--	if (emergency_exit_) {
-+	if (this->emergency_exit_) {
- 		hide();
- 		return;
- 	}
- 
- 	if (!dialog_built_) {
--		view().build();
-+		this->view().build();
- 		dialog_built_ = true;
- 	}
- 
--	bc().readOnly(isReadonly());
--	view().show();
-+	this->bc().readOnly(this->isReadonly());
-+	this->view().show();
- }
- 
- template <class Base>
- void ControlDialog<Base>::update()
- {
--	if (isBufferDependent() && !lv_.view()->available())
-+	if (this->isBufferDependent() && !this->lv_.view()->available())
- 		return;
- 
- 	setParams();
--	if (emergency_exit_) {
-+	if (this->emergency_exit_) {
- 		hide();
- 		return;
- 	}
- 
--	bc().readOnly(isReadonly());
--	view().update();
-+	this->bc().readOnly(this->isReadonly());
-+	this->view().update();
- }
- 
- template <class Base>
- void ControlDialog<Base>::hide()
- {
--	emergency_exit_ = false;
-+	this->emergency_exit_ = false;
- 	clearParams();
- 
--	disconnect();
--	view().hide();
-+	this->disconnect();
-+	this->view().hide();
- }
- 
diff --git a/print/cjk-lyx/patches/patch-am b/print/cjk-lyx/patches/patch-am
deleted file mode 100644
index ec1a9099b51..00000000000
--- a/print/cjk-lyx/patches/patch-am
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD: patch-am,v 1.3 2011/12/29 16:35:42 joerg Exp $
-
---- src/frontends/controllers/ControlInset.tmpl.orig	2002-01-16 14:47:57.000000000 +0000
-+++ src/frontends/controllers/ControlInset.tmpl	2007-10-13 16:02:27.000000000 +0000
-@@ -10,9 +10,14 @@
-  * instantiated if this file is #included in the derived classes' .C file.
-  */
- 
-+#ifndef CONTROLINSET_TMPL
-+#define CONTROLINSET_TMPL
-+
-+#include "LyXView.h"
- #include "ControlInset.h"
- #include "support/LAssert.h"
- #include "debug.h" 
-+#include "buffer.h"
- 
- 
- template <class Inset, class Params>
-@@ -183,3 +188,5 @@ void ControlInset<Inset, Params>::connec
- 	}
- 	connect();
- }
-+
-+#endif
diff --git a/print/cjk-lyx/patches/patch-an b/print/cjk-lyx/patches/patch-an
deleted file mode 100644
index 91333a486d8..00000000000
--- a/print/cjk-lyx/patches/patch-an
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-an,v 1.1 2006/09/19 23:35:07 joerg Exp $
-
---- src/frontends/xforms/FormBase.h.orig	2006-09-20 01:13:31.000000000 +0000
-+++ src/frontends/xforms/FormBase.h
-@@ -133,7 +133,7 @@ FormCB<Controller, Base>::FormCB(Control
- template <class Controller, class Base>
- Controller & FormCB<Controller, Base>::controller() const
- {
--	return static_cast<Controller &>(controller_);
-+	return static_cast<Controller &>(this->controller_);
- 	//return dynamic_cast<Controller &>(controller_);
- }
- 
diff --git a/print/cjk-lyx/patches/patch-ao b/print/cjk-lyx/patches/patch-ao
deleted file mode 100644
index a551d79709f..00000000000
--- a/print/cjk-lyx/patches/patch-ao
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD: patch-ao,v 1.1 2007/10/13 18:12:40 rillig Exp $
-
-Defining methods is anonymous namespaces is a bad idea.
-
---- src/font.C.orig	2007-10-13 16:02:27.000000000 +0000
-+++ src/font.C	2007-10-13 17:08:41.000000000 +0000
-@@ -30,7 +30,6 @@
- extern LyXCodeConv codeconverter;
- #endif
- 
--namespace {
- #ifdef I18N
-   XFontSet LyXFont::getXFontset() const
-   {
-@@ -50,6 +49,7 @@ XFontStruct * getXFontstruct(LyXFont con
- }
- #endif
- 
-+namespace {
- inline
- XID getFontID(LyXFont const & f)
- {
-@@ -64,7 +64,7 @@ XID getFontID(LyXFont const & f)
-                  return f.getXFontset();
-           }
- #endif
--} // namespace anon
-+}
- 
- int lyxfont::maxAscent(LyXFont const & f)
- {
diff --git a/print/cjk-lyx/patches/patch-src_frontends_controllers_ControlInset.h b/print/cjk-lyx/patches/patch-src_frontends_controllers_ControlInset.h
deleted file mode 100644
index 1de9201934e..00000000000
--- a/print/cjk-lyx/patches/patch-src_frontends_controllers_ControlInset.h
+++ /dev/null
@@ -1,11 +0,0 @@
-$NetBSD: patch-src_frontends_controllers_ControlInset.h,v 1.1 2011/12/29 16:36:37 joerg Exp $
-
---- src/frontends/controllers/ControlInset.h.orig	2011-12-29 13:27:08.000000000 +0000
-+++ src/frontends/controllers/ControlInset.h
-@@ -105,5 +105,6 @@ private:
- 
- };
- 
-+#include "ControlInset.tmpl"
- 
- #endif // CONTROLINSET_H
diff --git a/print/cjk-lyx/patches/patch-src_frontends_controllers_helper__funcs.h b/print/cjk-lyx/patches/patch-src_frontends_controllers_helper__funcs.h
deleted file mode 100644
index f9784cf31db..00000000000
--- a/print/cjk-lyx/patches/patch-src_frontends_controllers_helper__funcs.h
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-src_frontends_controllers_helper__funcs.h,v 1.1 2011/11/25 22:16:26 joerg Exp $
-
---- src/frontends/controllers/helper_funcs.h.orig	2011-11-25 17:08:24.000000000 +0000
-+++ src/frontends/controllers/helper_funcs.h
-@@ -15,6 +15,7 @@
- #ifndef HELPERFUNCS_H
- #define HELPERFUNCS_H
- 
-+#include <algorithm>
- #include <utility> // pair
- 
- #ifdef __GNUG__
diff --git a/print/cjk-lyx/patches/patch-src_frontends_xforms_FormMathsMatrix.C b/print/cjk-lyx/patches/patch-src_frontends_xforms_FormMathsMatrix.C
deleted file mode 100644
index 9e2a220a9ea..00000000000
--- a/print/cjk-lyx/patches/patch-src_frontends_xforms_FormMathsMatrix.C
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-src_frontends_xforms_FormMathsMatrix.C,v 1.1 2011/11/25 22:16:26 joerg Exp $
-
---- src/frontends/xforms/FormMathsMatrix.C.orig	2011-11-25 17:11:16.000000000 +0000
-+++ src/frontends/xforms/FormMathsMatrix.C
-@@ -16,6 +16,7 @@
- #endif
- 
- #include <algorithm>
-+#include <cstring>
- 
- #include "FormMathsMatrix.h"
- #include "form_maths_matrix.h"
diff --git a/print/cjk-lyx/patches/patch-src_mathed_math__xdata.C b/print/cjk-lyx/patches/patch-src_mathed_math__xdata.C
deleted file mode 100644
index 5b91ca2d8c0..00000000000
--- a/print/cjk-lyx/patches/patch-src_mathed_math__xdata.C
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-src_mathed_math__xdata.C,v 1.1 2011/11/25 22:16:26 joerg Exp $
-
---- src/mathed/math_xdata.C.orig	2011-11-25 17:01:56.000000000 +0000
-+++ src/mathed/math_xdata.C
-@@ -9,7 +9,7 @@
- #include "Painter.h"
- #include "textpainter.h"
- #include "debug.h"
--
-+#include <cstdlib>
- 
- using std::max;
- using std::min;
diff --git a/print/cjk-lyx/patches/patch-src_support_LSubstring.C b/print/cjk-lyx/patches/patch-src_support_LSubstring.C
deleted file mode 100644
index 6a40dfbe51f..00000000000
--- a/print/cjk-lyx/patches/patch-src_support_LSubstring.C
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-src_support_LSubstring.C,v 1.1 2011/11/25 22:16:26 joerg Exp $
-
---- src/support/LSubstring.C.orig	2011-11-25 17:05:19.000000000 +0000
-+++ src/support/LSubstring.C
-@@ -16,6 +16,7 @@
- #pragma implementation
- #endif
- 
-+#include <cstring>
- #include "LSubstring.h"
- 
- #ifndef CXX_GLOBAL_CSTD
diff --git a/print/cjk-lyx/patches/patch-src_support_forkedcontr.C b/print/cjk-lyx/patches/patch-src_support_forkedcontr.C
deleted file mode 100644
index 9fac118dbfa..00000000000
--- a/print/cjk-lyx/patches/patch-src_support_forkedcontr.C
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-src_support_forkedcontr.C,v 1.1 2011/11/25 22:16:26 joerg Exp $
-
---- src/support/forkedcontr.C.orig	2011-11-25 17:05:52.000000000 +0000
-+++ src/support/forkedcontr.C
-@@ -24,6 +24,7 @@
- 
- #include <cerrno>
- #include <cstdlib>
-+#include <cstring>
- #include <unistd.h>
- #include <sys/wait.h>
- 
diff --git a/print/cjk-lyx/patches/patch-src_support_lstrings.h b/print/cjk-lyx/patches/patch-src_support_lstrings.h
deleted file mode 100644
index 3aa7fc8f9ff..00000000000
--- a/print/cjk-lyx/patches/patch-src_support_lstrings.h
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-src_support_lstrings.h,v 1.1 2011/11/25 22:16:26 joerg Exp $
-
---- src/support/lstrings.h.orig	2011-11-25 16:59:32.000000000 +0000
-+++ src/support/lstrings.h
-@@ -16,7 +16,7 @@
- #pragma interface
- #endif
- 
--//#include <cstring>
-+#include <cstring>
- //#include <cctype>
- //#include <cctype>
- #include <vector>