6 files changed, 36 insertions, 14 deletions
diff --git a/editors/lyx-qt/Makefile b/editors/lyx-qt/Makefile
index 56f0c3017e2..49c42f0fd6e 100644
--- a/editors/lyx-qt/Makefile
+++ b/editors/lyx-qt/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.20 2005/11/16 18:06:13 reed Exp $
+# $NetBSD: Makefile,v 1.21 2005/11/18 16:47:35 reed Exp $
 #
 
 .include "./Makefile.common"
 
 PKGNAME=	${DISTNAME:S/lyx-/lyx-qt-/}
-PKGREVISION=	1
+PKGREVISION=	2
 
 COMMENT+=	(QT version)
 
diff --git a/editors/lyx-qt/Makefile.common b/editors/lyx-qt/Makefile.common
index 622567789d0..ac6f2d7eb4e 100644
--- a/editors/lyx-qt/Makefile.common
+++ b/editors/lyx-qt/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.30 2005/11/11 18:50:24 tonio Exp $
+# $NetBSD: Makefile.common,v 1.31 2005/11/18 16:47:35 reed Exp $
 #
 
 DISTNAME=		lyx-1.3.6
@@ -75,11 +75,18 @@ PYTHON_PATCH_SCRIPTS=	lib/lyx2lyx/lyx2lyx \
 			lib/scripts/pic2ascii.py \
 			lib/scripts/pic2png_eps.py
 
+# using INSTALL_DATA_DIR instead of INSTALLATION_DIRS because PREFIX is included
+post-install:
+	${INSTALL_DATA_DIR} ${PKG_TEXMFPREFIX}/tex/latex/lyx &&	\
+	for i in ${WRKSRC}/lib/tex/* ; do \
+		${INSTALL_DATA} $$i ${PKG_TEXMFPREFIX}/tex/latex/lyx/ ; \
+	done
+
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../lang/python/application.mk"
+.include "../../print/teTeX/module.mk"
 .include "../../textproc/aiksaurus/buildlink3.mk"
 .include "../../textproc/aspell/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/x11.buildlink3.mk"
-.include "../../mk/tex.buildlink3.mk"
diff --git a/editors/lyx-qt/PLIST.common b/editors/lyx-qt/PLIST.common
index 657b37dc20d..6d007e5f791 100644
--- a/editors/lyx-qt/PLIST.common
+++ b/editors/lyx-qt/PLIST.common
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.common,v 1.6 2005/07/19 17:49:33 drochner Exp $
+@comment $NetBSD: PLIST.common,v 1.7 2005/11/18 16:47:35 reed Exp $
 ${PKGLOCALEDIR}/locale/da/LC_MESSAGES/lyx.mo
 ${PKGLOCALEDIR}/locale/de/LC_MESSAGES/lyx.mo
 ${PKGLOCALEDIR}/locale/es/LC_MESSAGES/lyx.mo
@@ -906,12 +906,12 @@ 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/lyxchess.sty
-share/lyx/tex/lyxskak.sty
-share/lyx/tex/revtex.cls
+${PKG_TEXMFPREFIX}/tex/latex/lyx/broadway.cls
+${PKG_TEXMFPREFIX}/tex/latex/lyx/cv.cls
+${PKG_TEXMFPREFIX}/tex/latex/lyx/hollywood.cls
+${PKG_TEXMFPREFIX}/tex/latex/lyx/lyxchess.sty
+${PKG_TEXMFPREFIX}/tex/latex/lyx/lyxskak.sty
+${PKG_TEXMFPREFIX}/tex/latex/lyx/revtex.cls
 share/lyx/textclass.lst
 share/lyx/ui/default.ui
 share/lyx/xfonts/PSres.upr
@@ -927,7 +927,7 @@ share/lyx/xfonts/msbm10.pfb
 share/lyx/xfonts/wasy10.pfb
 @dirrm share/lyx/xfonts
 @dirrm share/lyx/ui
-@dirrm share/lyx/tex
+@dirrm ${PKG_TEXMFPREFIX}/tex/latex/lyx
 @dirrm share/lyx/templates
 @dirrm share/lyx/scripts
 @dirrm share/lyx/reLyX/Text
diff --git a/editors/lyx-qt/distinfo b/editors/lyx-qt/distinfo
index 9258f7e4078..dabddbbccb1 100644
--- a/editors/lyx-qt/distinfo
+++ b/editors/lyx-qt/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.11 2005/11/18 06:23:09 reed Exp $
+$NetBSD: distinfo,v 1.12 2005/11/18 16:47:35 reed Exp $
 
 SHA1 (lyx-1.3.6.tar.gz) = 9a0045bf007e4ebc4ca024536e03b3d95acb5ace
 RMD160 (lyx-1.3.6.tar.gz) = c05c106fdf4159fbde70747eced9b3685121ac5f
@@ -8,6 +8,7 @@ SHA1 (patch-ab) = e46def6f52b4c1c3c5197795454867c6bc2dbed6
 SHA1 (patch-ac) = 12a986d76f16bb2a12a723337cc37d3cd268a68b
 SHA1 (patch-ad) = c8d30b0929d38f1723f92b64af2f81f8cb97a6f4
 SHA1 (patch-ae) = fa71cf0fdc5a98a13285858b54f890cef1078a81
+SHA1 (patch-af) = 033fbf114994b4c9dcbf91c50f5972ba8260d1a8
 SHA1 (patch-ah) = 278f5deaf94c1082b755af3cb9511bc2f68231ba
 SHA1 (patch-ai) = ddd905f335293fa510745c5fe4f8011a5b3a1d9e
 SHA1 (patch-aj) = bfbd7b6f0a512a5034009c221b4851309ca6fb56
diff --git a/editors/lyx-qt/patches/patch-af b/editors/lyx-qt/patches/patch-af
new file mode 100644
index 00000000000..777d308325c
--- /dev/null
+++ b/editors/lyx-qt/patches/patch-af
@@ -0,0 +1,13 @@
+$NetBSD: patch-af,v 1.3 2005/11/18 16:47:35 reed Exp $
+
+--- lib/Makefile.in.orig	2005-11-17 12:27:24.000000000 -0800
++++ lib/Makefile.in	2005-11-17 12:27:58.000000000 -0800
+@@ -211,7 +211,7 @@
+ UI = ui/*.ui
+ 
+ LIBINSTFILES = $(BIND) $(CLIPART) $(DOCINST) $(EXAMPLES) $(HELP) $(IMAGES) \
+-	$(KBD) $(LAYOUT) $(TEMPL) $(TEXSUPPORT) $(UI)
++	$(KBD) $(LAYOUT) $(TEMPL) $(UI)
+ 
+ 
+ LIBDISTFILES = $(BIND) $(CLIPART) $(DOCDIST) $(EXAMPLES) $(HELP) $(IMAGES) \
diff --git a/editors/lyx-xforms/Makefile b/editors/lyx-xforms/Makefile
index 6c8f17f001e..86c0a7c0e30 100644
--- a/editors/lyx-xforms/Makefile
+++ b/editors/lyx-xforms/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.15 2005/07/19 17:49:33 drochner Exp $
+# $NetBSD: Makefile,v 1.16 2005/11/18 16:47:35 reed Exp $
 #
 
 .include "../lyx-qt/Makefile.common"
 
 PKGNAME=	${DISTNAME:S/lyx-/lyx-xforms-/}
+PKGREVISION=	1
 
 COMMENT+=	(xforms version)