From b78cb396beeb2acb0fac6ccb13e438b43677297b Mon Sep 17 00:00:00 2001
From: espie <espie@openbsd.org>
Date: Sun, 6 Mar 2005 14:17:45 +0000
Subject: [PATCH] clean-up

---
 x11/qt/pkg/PLIST       | 3 +--
 x11/qt/pkg/PLIST-html  | 3 ++-
 x11/qt2/Makefile       | 8 +++++---
 x11/qt2/pkg/PLIST      | 5 +++--
 x11/qt2/pkg/PLIST-html | 7 +++----
 5 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/x11/qt/pkg/PLIST b/x11/qt/pkg/PLIST
index 3503b589f0e..beb5091ec3d 100644
--- a/x11/qt/pkg/PLIST
+++ b/x11/qt/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.19 2004/09/25 13:01:47 espie Exp $
+@comment $OpenBSD: PLIST,v 1.20 2005/03/06 14:17:45 espie Exp $
 bin/moc
 include/X11/qt/
 include/X11/qt/jri.h
@@ -564,6 +564,5 @@ share/doc/qt/changes-1.42
 share/doc/qt/changes-1.43
 share/doc/qt/changes-1.44
 share/doc/qt/changes-1.45
-@unexec echo "Please remove %D/lib/qt/man from /etc/man.conf manually if needed"
 %%SHARED%%
 !%%SHARED%%
diff --git a/x11/qt/pkg/PLIST-html b/x11/qt/pkg/PLIST-html
index ed3c737fe53..db6128ef992 100644
--- a/x11/qt/pkg/PLIST-html
+++ b/x11/qt/pkg/PLIST-html
@@ -1,4 +1,5 @@
-@comment $OpenBSD: PLIST-html,v 1.2 2004/09/15 19:26:31 espie Exp $
+@comment $OpenBSD: PLIST-html,v 1.3 2005/03/06 14:17:45 espie Exp $
+share/doc/qt/
 share/doc/qt/html/
 share/doc/qt/html/abstractwidgets.html
 share/doc/qt/html/aclock-aclock-cpp.html
diff --git a/x11/qt2/Makefile b/x11/qt2/Makefile
index 73e029a2e38..b7821ac5417 100644
--- a/x11/qt2/Makefile
+++ b/x11/qt2/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.46 2004/12/19 14:01:17 alek Exp $
+# $OpenBSD: Makefile,v 1.47 2005/03/06 14:17:45 espie Exp $
 # $FreeBSD: Makefile,v 1.33 1999/02/27 03:09:57 andreas Exp $
 COMMENT=		"C++ X11 GUI toolkit"
 COMMENT-examples=	"examples and tutorial for qt2"
@@ -146,10 +146,12 @@ do-install:
 	fi; done
 	cd ${WRKSRC}; ${INSTALL_DATA} ${DOCS} ${QT_DOC}
 	cp -R ${WRKSRC}/doc/html/* ${QT_DOC}/html
+	${INSTALL_DATA_DIR} ${QT_LIBDIR}/doc
+	ln -s ${TRUEPREFIX}/share/doc/qt2/html ${QT_LIBDIR}/doc/html
 
-PKGNAME=		qt2-${VERSION}
+PKGNAME=		qt2-${VERSION}p0
 PKGNAME-examples=	qt2-examples-${VERSION}
-PKGNAME-html=		qt2-html-${VERSION}
+PKGNAME-html=		qt2-html-${VERSION}p0
 
 .include <bsd.port.mk>
 
diff --git a/x11/qt2/pkg/PLIST b/x11/qt2/pkg/PLIST
index cfec6b6449a..bb9ca5e5363 100644
--- a/x11/qt2/pkg/PLIST
+++ b/x11/qt2/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.17 2004/09/25 13:01:48 espie Exp $
+@comment $OpenBSD: PLIST,v 1.18 2005/03/06 14:17:45 espie Exp $
 bin/findtr
 bin/moc2
 bin/qt20fix
@@ -286,6 +286,7 @@ include/X11/qt2/qwmatrix.h
 include/X11/qt2/qworkspace.h
 include/X11/qt2/qxml.h
 include/X11/qt2/qxt.h
+lib/qt2/
 lib/qt2/bin/
 lib/qt2/bin/moc
 @mandir lib/qt2/man/
@@ -958,6 +959,7 @@ lib/qt2/man/man3/
 @man lib/qt2/man/man3/qxmlsimplereader.3
 @man lib/qt2/man/man3/qxtapplication.3
 @man lib/qt2/man/man3/qxtwidget.3
+share/doc/qt2/
 share/doc/qt2/ANNOUNCE
 share/doc/qt2/FAQ
 share/doc/qt2/LICENSE.GPL
@@ -966,6 +968,5 @@ share/doc/qt2/README.QT
 share/doc/qt2/changes-2.3.0
 share/doc/qt2/changes-2.3.1
 share/doc/qt2/changes-2.${VERSION}
-@unexec echo "Please remove %D/lib/qt2/man from /etc/man.conf manually if needed"
 %%SHARED%%
 !%%SHARED%%
diff --git a/x11/qt2/pkg/PLIST-html b/x11/qt2/pkg/PLIST-html
index 1c00d2d931c..c48a5a0f4a9 100644
--- a/x11/qt2/pkg/PLIST-html
+++ b/x11/qt2/pkg/PLIST-html
@@ -1,5 +1,7 @@
-@comment $OpenBSD: PLIST-html,v 1.12 2004/09/15 19:26:31 espie Exp $
+@comment $OpenBSD: PLIST-html,v 1.13 2005/03/06 14:17:45 espie Exp $
 lib/qt2/
+lib/qt2/doc/
+lib/qt2/doc/html
 share/doc/qt2/
 share/doc/qt2/html/
 share/doc/qt2/html/HOWTO-framebuffer.html
@@ -1425,6 +1427,3 @@ share/doc/qt2/html/xml-tagreader-with-features-tagreader-cpp.html
 share/doc/qt2/html/xml.html
 share/doc/qt2/html/xt.html
 share/doc/qt2/html/y2k.html
-@exec mkdir -p %D/lib/qt2/doc
-@exec ln -s %D/share/doc/qt2/html %D/lib/qt2/doc/html
-@unexec rm %D/lib/qt2/doc/html