o Fix PLIST issue for now with exec/unexec trick

o Deal with following issue: (weird)

"The following target is necessary if qt30 is installed at the time
 the port build is started; it is related to the Makefiles having
 dependencies on these (installed) .prl files." --AlanE

o Bump PORTREVISION

Submitted by:	Alan E <alane@geeksrus.net>
Requested by:	too many
Approved by:	will

2 files changed, 24 insertions, 172 deletions

diff --git a/x11-toolkits/qt30/Makefile b/x11-toolkits/qt30/Makefile
index dc35457e7824..a81719e1678c 100644
--- a/x11-toolkits/qt30/Makefile
+++ b/x11-toolkits/qt30/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME?=	qt
 PORTVERSION?=	3.0.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES?=	x11-toolkits
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/3.0/src
@@ -48,4 +48,16 @@ ALL_TARGET=	symlinks sub-src sub-tools
 CFLAGS+=	-O0
 .endif
 
+# The following target is necessary if qt30 is installed at the
+# time the port build is started; it is related to the Makefiles
+# having dependencies on these (installed) .prl files. --AlanE
+pre-install:
+	@${INSTALL_DATA} ${WRKSRC}/lib/*.prl ${PREFIX}/lib
+
+# no reason to install CVS dirs
+post-install:
+	@-${RM} -fr ${PREFIX}/doc/html/CVS
+	@-${RM} -fr ${PREFIX}/templates/CVS
+	@-${RM} -fr ${PREFIX}/mkspecs/CVS ${PREFIX}/mkspecs/*/CVS
+
 .include <bsd.port.post.mk>
diff --git a/x11-toolkits/qt30/pkg-plist b/x11-toolkits/qt30/pkg-plist
index 02373ff480cc..0c2048548f36 100644
--- a/x11-toolkits/qt30/pkg-plist
+++ b/x11-toolkits/qt30/pkg-plist
@@ -8,9 +8,6 @@ bin/qm2ts
 bin/qmake
 bin/qtconfig
 bin/uic
-doc/html/CVS/Entries
-doc/html/CVS/Repository
-doc/html/CVS/Root
 doc/html/aboutqt.html
 doc/html/abstract-connections.png
 doc/html/abstractwidgets.html
@@ -2120,285 +2117,131 @@ include/qxt.h
 lib/libeditor.prl
 lib/libeditor.so
 lib/libeditor.so.1
-lib/libeditor.so.1.0
 lib/libeditor.so.1.0.0
+@exec rm -f %D/lib/libeditor.so.1.0 || true
+@exec ln -s libeditor.so.1.0.0 %D/lib/libeditor.so.1.0 || true
+@unexec rm -f %D/lib/libeditor.so.1.0 || true
+lib/libqnp.prl
 lib/libqt-mt.prl
 lib/libqt-mt.so
 lib/libqt-mt.so.3
-lib/libqt-mt.so.3.0
 lib/libqt-mt.so.3.0.3
+@exec rm -f %D/lib/libqt-mt.so.3.0 || true
+@exec ln -s libqt-mt.so.3.0.0 %D/lib/libqt-mt.so.3.0 || true
+@unexec rm -f  %D/lib/libqt-mt.so.3.0 || true
 lib/libqui.prl
 lib/libqui.so
 lib/libqui.so.1
-lib/libqui.so.1.0
 lib/libqui.so.1.0.0
-mkspecs/CVS/Entries
-mkspecs/CVS/Repository
-mkspecs/CVS/Root
-mkspecs/aix-64/CVS/Entries
-mkspecs/aix-64/CVS/Repository
-mkspecs/aix-64/CVS/Root
+@exec rm -f %D/lib/libqui.so.1.0 || true
+@exec ln -s libqui.so.1.0.0 %D/lib/libqui.so.1.0 || true
+@unexec rm -f  %D/lib/libqui.so.1.0 || true
+lib/libqxt.prl
 mkspecs/aix-64/qmake.conf
 mkspecs/aix-64/qplatformdefs.h
-mkspecs/aix-g++/CVS/Entries
-mkspecs/aix-g++/CVS/Repository
-mkspecs/aix-g++/CVS/Root
 mkspecs/aix-g++/qmake.conf
 mkspecs/aix-g++/qplatformdefs.h
-mkspecs/aix-xlc/CVS/Entries
-mkspecs/aix-xlc/CVS/Repository
-mkspecs/aix-xlc/CVS/Root
 mkspecs/aix-xlc/qmake.conf
 mkspecs/aix-xlc/qplatformdefs.h
-mkspecs/bsdi-g++/CVS/Entries
-mkspecs/bsdi-g++/CVS/Repository
-mkspecs/bsdi-g++/CVS/Root
 mkspecs/bsdi-g++/qmake.conf
 mkspecs/bsdi-g++/qplatformdefs.h
-mkspecs/default/CVS/Entries
-mkspecs/default/CVS/Repository
-mkspecs/default/CVS/Root
 mkspecs/default/qmake.conf
 mkspecs/default/qplatformdefs.h
-mkspecs/dgux-g++/CVS/Entries
-mkspecs/dgux-g++/CVS/Repository
-mkspecs/dgux-g++/CVS/Root
 mkspecs/dgux-g++/qmake.conf
-mkspecs/freebsd-g++-objprelink/CVS/Entries
-mkspecs/freebsd-g++-objprelink/CVS/Repository
-mkspecs/freebsd-g++-objprelink/CVS/Root
 mkspecs/freebsd-g++-objprelink/qmake.conf
 mkspecs/freebsd-g++-objprelink/qplatformdefs.h
-mkspecs/freebsd-g++/CVS/Entries
-mkspecs/freebsd-g++/CVS/Repository
-mkspecs/freebsd-g++/CVS/Root
 mkspecs/freebsd-g++/qmake.conf
 mkspecs/freebsd-g++/qplatformdefs.h
-mkspecs/hpux-acc/CVS/Entries
-mkspecs/hpux-acc/CVS/Repository
-mkspecs/hpux-acc/CVS/Root
 mkspecs/hpux-acc/qmake.conf
 mkspecs/hpux-acc/qplatformdefs.h
-mkspecs/hpux-cc/CVS/Entries
-mkspecs/hpux-cc/CVS/Repository
-mkspecs/hpux-cc/CVS/Root
 mkspecs/hpux-cc/qmake.conf
 mkspecs/hpux-cc/qplatformdefs.h
-mkspecs/hpux-g++/CVS/Entries
-mkspecs/hpux-g++/CVS/Repository
-mkspecs/hpux-g++/CVS/Root
 mkspecs/hpux-g++/qmake.conf
 mkspecs/hpux-g++/qplatformdefs.h
-mkspecs/hpux-n64/CVS/Entries
-mkspecs/hpux-n64/CVS/Repository
-mkspecs/hpux-n64/CVS/Root
 mkspecs/hpux-n64/qmake.conf
 mkspecs/hpux-n64/qplatformdefs.h
-mkspecs/hpux-o64/CVS/Entries
-mkspecs/hpux-o64/CVS/Repository
-mkspecs/hpux-o64/CVS/Root
 mkspecs/hpux-o64/qmake.conf
 mkspecs/hpux-o64/qplatformdefs.h
-mkspecs/hurd-g++/CVS/Entries
-mkspecs/hurd-g++/CVS/Repository
-mkspecs/hurd-g++/CVS/Root
 mkspecs/hurd-g++/qmake.conf
 mkspecs/hurd-g++/qplatformdefs.h
-mkspecs/irix-64/CVS/Entries
-mkspecs/irix-64/CVS/Repository
-mkspecs/irix-64/CVS/Root
 mkspecs/irix-64/qmake.conf
 mkspecs/irix-64/qplatformdefs.h
-mkspecs/irix-g++/CVS/Entries
-mkspecs/irix-g++/CVS/Repository
-mkspecs/irix-g++/CVS/Root
 mkspecs/irix-g++/qmake.conf
 mkspecs/irix-g++/qplatformdefs.h
-mkspecs/irix-n32/CVS/Entries
-mkspecs/irix-n32/CVS/Repository
-mkspecs/irix-n32/CVS/Root
 mkspecs/irix-n32/qmake.conf
 mkspecs/irix-n32/qplatformdefs.h
-mkspecs/irix-o32/CVS/Entries
-mkspecs/irix-o32/CVS/Repository
-mkspecs/irix-o32/CVS/Root
 mkspecs/irix-o32/qmake.conf
 mkspecs/irix-o32/qplatformdefs.h
-mkspecs/linux-cxx/CVS/Entries
-mkspecs/linux-cxx/CVS/Repository
-mkspecs/linux-cxx/CVS/Root
 mkspecs/linux-cxx/qmake.conf
 mkspecs/linux-cxx/qplatformdefs.h
-mkspecs/linux-g++-objprelink/CVS/Entries
-mkspecs/linux-g++-objprelink/CVS/Repository
-mkspecs/linux-g++-objprelink/CVS/Root
 mkspecs/linux-g++-objprelink/qmake.conf
 mkspecs/linux-g++-objprelink/qplatformdefs.h
-mkspecs/linux-g++/CVS/Entries
-mkspecs/linux-g++/CVS/Repository
-mkspecs/linux-g++/CVS/Root
 mkspecs/linux-g++/qmake.conf
 mkspecs/linux-g++/qplatformdefs.h
-mkspecs/linux-icc/CVS/Entries
-mkspecs/linux-icc/CVS/Repository
-mkspecs/linux-icc/CVS/Root
 mkspecs/linux-icc/qmake.conf
 mkspecs/linux-icc/qplatformdefs.h
-mkspecs/linux-kcc/CVS/Entries
-mkspecs/linux-kcc/CVS/Repository
-mkspecs/linux-kcc/CVS/Root
 mkspecs/linux-kcc/qmake.conf
 mkspecs/linux-kcc/qplatformdefs.h
-mkspecs/linux-pgcc/CVS/Entries
-mkspecs/linux-pgcc/CVS/Repository
-mkspecs/linux-pgcc/CVS/Root
 mkspecs/linux-pgcc/qmake.conf
 mkspecs/linux-pgcc/qplatformdefs.h
-mkspecs/mac9-mwerks/CVS/Entries
-mkspecs/mac9-mwerks/CVS/Repository
-mkspecs/mac9-mwerks/CVS/Root
 mkspecs/mac9-mwerks/mwerksapp.xml
 mkspecs/mac9-mwerks/mwerkslib.xml
 mkspecs/mac9-mwerks/qmake.conf
 mkspecs/mac9-mwerks/qplatformdefs.h
-mkspecs/macx-g++/CVS/Entries
-mkspecs/macx-g++/CVS/Repository
-mkspecs/macx-g++/CVS/Root
 mkspecs/macx-g++/Info.plist.app
 mkspecs/macx-g++/qmake.conf
 mkspecs/macx-g++/qplatformdefs.h
-mkspecs/macx-mwerks/CVS/Entries
-mkspecs/macx-mwerks/CVS/Repository
-mkspecs/macx-mwerks/CVS/Root
 mkspecs/macx-mwerks/mwerkstmpl.xml
 mkspecs/macx-mwerks/qmake.conf
 mkspecs/macx-mwerks/qplatformdefs.h
-mkspecs/macx-pbuilder/CVS/Entries
-mkspecs/macx-pbuilder/CVS/Repository
-mkspecs/macx-pbuilder/CVS/Root
 mkspecs/macx-pbuilder/Info.plist.app
 mkspecs/macx-pbuilder/qmake.conf
 mkspecs/macx-pbuilder/qplatformdefs.h
-mkspecs/netbsd-g++/CVS/Entries
-mkspecs/netbsd-g++/CVS/Repository
-mkspecs/netbsd-g++/CVS/Root
 mkspecs/netbsd-g++/qmake.conf
 mkspecs/netbsd-g++/qplatformdefs.h
-mkspecs/openbsd-g++/CVS/Entries
-mkspecs/openbsd-g++/CVS/Repository
-mkspecs/openbsd-g++/CVS/Root
 mkspecs/openbsd-g++/qmake.conf
 mkspecs/openbsd-g++/qplatformdefs.h
-mkspecs/openunix-cc/CVS/Entries
-mkspecs/openunix-cc/CVS/Repository
-mkspecs/openunix-cc/CVS/Root
 mkspecs/openunix-cc/qmake.conf
 mkspecs/openunix-cc/qplatformdefs.h
-mkspecs/openunix-g++/CVS/Entries
-mkspecs/openunix-g++/CVS/Repository
-mkspecs/openunix-g++/CVS/Root
 mkspecs/openunix-g++/qmake.conf
 mkspecs/openunix-g++/qplatformdefs.h
-mkspecs/qnx-g++/CVS/Entries
-mkspecs/qnx-g++/CVS/Repository
-mkspecs/qnx-g++/CVS/Root
 mkspecs/qnx-g++/qmake.conf
-mkspecs/reliant-64/CVS/Entries
-mkspecs/reliant-64/CVS/Repository
-mkspecs/reliant-64/CVS/Root
 mkspecs/reliant-64/qmake.conf
 mkspecs/reliant-64/qplatformdefs.h
-mkspecs/reliant-cds/CVS/Entries
-mkspecs/reliant-cds/CVS/Repository
-mkspecs/reliant-cds/CVS/Root
 mkspecs/reliant-cds/qmake.conf
 mkspecs/reliant-cds/qplatformdefs.h
-mkspecs/sco-cc/CVS/Entries
-mkspecs/sco-cc/CVS/Repository
-mkspecs/sco-cc/CVS/Root
 mkspecs/sco-cc/qmake.conf
 mkspecs/sco-cc/qplatformdefs.h
-mkspecs/sco-g++/CVS/Entries
-mkspecs/sco-g++/CVS/Repository
-mkspecs/sco-g++/CVS/Root
 mkspecs/sco-g++/qmake.conf
 mkspecs/sco-g++/qplatformdefs.h
-mkspecs/solaris-64/CVS/Entries
-mkspecs/solaris-64/CVS/Repository
-mkspecs/solaris-64/CVS/Root
 mkspecs/solaris-64/qmake.conf
 mkspecs/solaris-64/qplatformdefs.h
-mkspecs/solaris-cc/CVS/Entries
-mkspecs/solaris-cc/CVS/Repository
-mkspecs/solaris-cc/CVS/Root
 mkspecs/solaris-cc/qmake.conf
 mkspecs/solaris-cc/qplatformdefs.h
-mkspecs/solaris-g++/CVS/Entries
-mkspecs/solaris-g++/CVS/Repository
-mkspecs/solaris-g++/CVS/Root
 mkspecs/solaris-g++/qmake.conf
 mkspecs/solaris-g++/qplatformdefs.h
-mkspecs/solaris-kcc/CVS/Entries
-mkspecs/solaris-kcc/CVS/Repository
-mkspecs/solaris-kcc/CVS/Root
 mkspecs/solaris-kcc/qmake.conf
 mkspecs/solaris-kcc/qplatformdefs.h
-mkspecs/sunos-g++/CVS/Entries
-mkspecs/sunos-g++/CVS/Repository
-mkspecs/sunos-g++/CVS/Root
 mkspecs/sunos-g++/qmake.conf
-mkspecs/tru64-cxx/CVS/Entries
-mkspecs/tru64-cxx/CVS/Repository
-mkspecs/tru64-cxx/CVS/Root
 mkspecs/tru64-cxx/qmake.conf
 mkspecs/tru64-cxx/qplatformdefs.h
-mkspecs/tru64-g++/CVS/Entries
-mkspecs/tru64-g++/CVS/Repository
-mkspecs/tru64-g++/CVS/Root
 mkspecs/tru64-g++/qmake.conf
 mkspecs/tru64-g++/qplatformdefs.h
-mkspecs/ultrix-g++/CVS/Entries
-mkspecs/ultrix-g++/CVS/Repository
-mkspecs/ultrix-g++/CVS/Root
 mkspecs/ultrix-g++/qmake.conf
-mkspecs/unixware-g++/CVS/Entries
-mkspecs/unixware-g++/CVS/Repository
-mkspecs/unixware-g++/CVS/Root
 mkspecs/unixware-g++/qmake.conf
-mkspecs/unixware7-cc/CVS/Entries
-mkspecs/unixware7-cc/CVS/Repository
-mkspecs/unixware7-cc/CVS/Root
 mkspecs/unixware7-cc/qmake.conf
 mkspecs/unixware7-cc/qplatformdefs.h
-mkspecs/unixware7-g++/CVS/Entries
-mkspecs/unixware7-g++/CVS/Repository
-mkspecs/unixware7-g++/CVS/Root
 mkspecs/unixware7-g++/qmake.conf
 mkspecs/unixware7-g++/qplatformdefs.h
-mkspecs/win32-borland/CVS/Entries
-mkspecs/win32-borland/CVS/Repository
-mkspecs/win32-borland/CVS/Root
 mkspecs/win32-borland/qmake.conf
 mkspecs/win32-borland/qplatformdefs.h
-mkspecs/win32-g++/CVS/Entries
-mkspecs/win32-g++/CVS/Repository
-mkspecs/win32-g++/CVS/Root
 mkspecs/win32-g++/qmake.conf
-mkspecs/win32-msvc/CVS/Entries
-mkspecs/win32-msvc/CVS/Repository
-mkspecs/win32-msvc/CVS/Root
 mkspecs/win32-msvc/qmake.conf
 mkspecs/win32-msvc/qplatformdefs.h
 mkspecs/win32-msvc/win32app.dsp
 mkspecs/win32-msvc/win32dll.dsp
 mkspecs/win32-msvc/win32lib.dsp
-mkspecs/win32-visage/CVS/Entries
-mkspecs/win32-visage/CVS/Repository
-mkspecs/win32-visage/CVS/Root
 mkspecs/win32-visage/qmake.conf
-mkspecs/win32-watcom/CVS/Entries
-mkspecs/win32-watcom/CVS/Repository
-mkspecs/win32-watcom/CVS/Root
 mkspecs/win32-watcom/qmake.conf
 plugins/designer/libcppeditor.so
 plugins/designer/libdlgplugin.so
@@ -2406,9 +2249,6 @@ plugins/designer/librcplugin.so
 plugins/designer/libwizards.so
 plugins/imageformats/libqjpeg.so
 plugins/imageformats/libqmng.so
-templates/CVS/Entries
-templates/CVS/Repository
-templates/CVS/Root
 templates/Configuration_Dialog.ui
 templates/Dialog_with_Buttons_(Bottom).ui
 templates/Dialog_with_Buttons_(Right).ui