Numerous fixes and improvements:

1.In Designer, don't rely on QTDIR environment being set when searching for documentation and templates. Also correct search paths relatively to QTDIR (/doc/html/... --> /share/doc/qt2/... etc.). 2.Install *all* documentation (previously index files and some pixmaps were left behind, which was rendering help system mostly non-functional and useless). 3.Install Designer's templates. 4.Don't use ${INSTALL_DATA} to install symbolic link to shared library - it leads to the file this link points to being installed and as a result two fully indentical versions of lib{qt2,util} are installed, wasting user's HDD space (approx 8MB) and bloating package file (+3MB). Also use ${INSTALL_PROGRAM} for shared libs to strip unneeded symbols.
author: sobomax <sobomax@FreeBSD.org> 2000-11-20 20:18:17 +0800
committer: sobomax <sobomax@FreeBSD.org> 2000-11-20 20:18:17 +0800
commit: dd9cc6c2f26ed9a52d93caa5aebe36e10622175e (patch)
tree: a061e0ee5ca30a22dbb87713eca0a84052caf38f
parent: 5189ecaede09e87b1e7b92ffd0ec9fee4b34c561 (diff)
download: freebsd-ports-gnome-dd9cc6c2f26ed9a52d93caa5aebe36e10622175e.tar.gz
freebsd-ports-gnome-dd9cc6c2f26ed9a52d93caa5aebe36e10622175e.tar.zst
freebsd-ports-gnome-dd9cc6c2f26ed9a52d93caa5aebe36e10622175e.zip
28 files changed, 446 insertions, 96 deletions
diff --git a/x11-toolkits/qt22/Makefile b/x11-toolkits/qt22/Makefile
index 3b638d903715..7afd742c3a2f 100644
--- a/x11-toolkits/qt22/Makefile
+++ b/x11-toolkits/qt22/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	qt
 PORTVERSION=	2.2.1
+PORTREVISION=	1
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	ftp://ftp.trolltech.com/qt/source/
 DISTNAME=	qt-x11-${PORTVERSION}
@@ -81,6 +82,7 @@ post-configure:
 
 do-install:
 	${MKDIR} ${PREFIX}/include/qt2
+	${MKDIR} ${PREFIX}/share/qt2/designer/templates
 .for BIN in designer moc2 uic
 	${INSTALL_PROGRAM} ${WRKSRC}/bin/${BIN} ${PREFIX}/bin
 .endfor
@@ -88,12 +90,19 @@ do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/bin/${SCRIPT} ${PREFIX}/bin
 .endfor
 	${INSTALL_DATA} ${WRKSRC}/include/*.h ${PREFIX}/include/qt2
+	${INSTALL_PROGRAM} ${WRKSRC}/lib/libqt2.so.4 ${PREFIX}/lib
+	${INSTALL_PROGRAM} ${WRKSRC}/lib/libqutil.so.1 ${PREFIX}/lib
+	${LN} -sf ${PREFIX}/lib/libqt2.so.4 ${PREFIX}/lib/libqt2.so
+	${LN} -sf ${PREFIX}/lib/libqutil.so.1 ${PREFIX}/lib/libqutil.so
+.if defined(WANT_STATIC)
 .for LIB in qt2 qutil
-	${INSTALL_DATA} ${WRKSRC}/lib/lib${LIB}* ${PREFIX}/lib
+	${INSTALL_DATA} ${WRKSRC}/lib/lib${LIB}.a ${PREFIX}/lib
 .endfor
+.endif
+	${INSTALL_DATA} ${WRKSRC}/tools/designer/templates/* \
+		${PREFIX}/share/qt2/designer/templates
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${PREFIX}/share/doc/qt2/html/designer/figures
-	${MKDIR} ${PREFIX}/share/doc/qt2/html/designer/stylesheet-images
+	${MKDIR} ${PREFIX}/share/doc/qt2
 	(cd ${WRKSRC} ; \
 	${INSTALL_DATA} ANNOUNCE ${PREFIX}/share/doc/qt2 ; \
 	${INSTALL_DATA} FAQ ${PREFIX}/share/doc/qt2 ; \
@@ -101,9 +110,8 @@ do-install:
 	${INSTALL_DATA} PORTING ${PREFIX}/share/doc/qt2 ; \
 	${INSTALL_DATA} README ${PREFIX}/share/doc/qt2 ; \
 	${INSTALL_DATA} README.QT ${PREFIX}/share/doc/qt2 ; \
-	${INSTALL_DATA} doc/html/*.html doc/html/*.png ${PREFIX}/share/doc/qt2/html ; \
-	${INSTALL_DATA} doc/html/designer/*.html ${PREFIX}/share/doc/qt2/html/designer ; \
-	${INSTALL_DATA} doc/html/designer/figures/* ${PREFIX}/share/doc/qt2/html/designer/figures ; \
+	( cd ${WRKSRC}/doc &&  ${TAR} -chf - html | \
+		${TAR} --unlink -xf - -C ${PREFIX}/share/doc/qt2 ) ; \
 	${INSTALL_MAN} doc/man/man3/q* ${PREFIX}/man/man3 )
 .endif
 
diff --git a/x11-toolkits/qt22/files/patch-aa b/x11-toolkits/qt22/files/patch-aa
index b95cbe905e2e..3d4d707124a0 100644
--- a/x11-toolkits/qt22/files/patch-aa
+++ b/x11-toolkits/qt22/files/patch-aa
@@ -1,6 +1,6 @@
---- configs/freebsd-g++-shared	Sun Sep 10 18:44:24 2000
-+++ configs/freebsd-g++-shared.new	Sun Sep 10 18:44:53 2000
-@@ -21,7 +21,7 @@
+--- configs/freebsd-g++-shared.orig	Wed Oct  4 12:55:10 2000
++++ configs/freebsd-g++-shared	Sat Nov 18 20:02:27 2000
+@@ -22,7 +22,7 @@
  SYSCONF_LIBS_X11	= -lXext -lX11 -lm
  # Qt, Qt+OpenGL
  SYSCONF_LFLAGS_QT	= -L$(QTDIR)/lib
@@ -9,7 +9,7 @@
  SYSCONF_LIBS_QT_OPENGL	= 
  # OpenGL
  SYSCONF_LFLAGS_OPENGL	= -L/usr/X11R6/lib
-@@ -44,7 +44,7 @@
+@@ -45,7 +45,7 @@
  SYSCONF_LIBS_THREAD	= 
  
  # Meta-object compiler
@@ -18,7 +18,7 @@
  
  # UI compiler
  SYSCONF_UIC		= $(QTDIR)/bin/uic
-@@ -55,16 +55,14 @@
+@@ -56,16 +56,14 @@
  #   - Usually needs to incorporate $(VER_MAJ), $(VER_MIN) and $(VER_PATCH)
  #
  SYSCONF_LINK_SHLIB	= g++
@@ -38,3 +38,14 @@
  
  # Linking static libraries
  #   - Build the $(TARGET) library, eg. lib$(TARGET).a
+@@ -76,8 +74,8 @@
+ SYSCONF_LINK_LIB_STATIC	= rm -f $(DESTDIR)$(SYSCONF_LINK_TARGET_STATIC) ; \
+ 				 $(SYSCONF_AR) $(DESTDIR)$(SYSCONF_LINK_TARGET_STATIC) $(OBJECTS) $(OBJMOC) 
+ # Compiling application source
+-SYSCONF_CXXFLAGS	= -pipe -O2
+-SYSCONF_CFLAGS		= -pipe -O2
++SYSCONF_CXXFLAGS	= -DQT_PREFIX=\"${PREFIX}\" -pipe -O2
++SYSCONF_CFLAGS		= -DQT_PREFIX=\"${PREFIX}\" -pipe -O2
+ # Default link type (static linking is still be used where required)
+ SYSCONF_LINK_LIB	= $(SYSCONF_LINK_LIB_SHARED)
+ SYSCONF_LINK_TARGET	= $(SYSCONF_LINK_TARGET_SHARED)
diff --git a/x11-toolkits/qt22/files/patch-af b/x11-toolkits/qt22/files/patch-af
index b231b8d9f0be..0e02a1aefefc 100644
--- a/x11-toolkits/qt22/files/patch-af
+++ b/x11-toolkits/qt22/files/patch-af
@@ -1,6 +1,6 @@
---- configs/freebsd-g++-static	Sat Sep 16 14:47:56 2000
-+++ configs/freebsd-g++-static.new	Sat Sep 16 14:48:06 2000
-@@ -21,7 +21,7 @@
+--- configs/freebsd-g++-static.orig	Wed Oct  4 12:55:09 2000
++++ configs/freebsd-g++-static	Sat Nov 18 20:02:46 2000
+@@ -22,7 +22,7 @@
  SYSCONF_LIBS_X11	= -lXext -lX11 -lm
  # Qt, Qt+OpenGL
  SYSCONF_LFLAGS_QT	= -L$(QTDIR)/lib
@@ -9,7 +9,7 @@
  SYSCONF_LIBS_QT_OPENGL	= 
  # OpenGL
  SYSCONF_LFLAGS_OPENGL	= -L/usr/X11R6/lib
-@@ -44,7 +44,7 @@
+@@ -45,7 +45,7 @@
  SYSCONF_LIBS_THREAD	= 
  
  # Meta-object compiler
@@ -18,3 +18,14 @@
  
  # UI compiler
  SYSCONF_UIC		= $(QTDIR)/bin/uic
+@@ -76,8 +76,8 @@
+ SYSCONF_LINK_LIB_STATIC	= rm -f $(DESTDIR)$(SYSCONF_LINK_TARGET_STATIC) ; \
+ 				 $(SYSCONF_AR) $(DESTDIR)$(SYSCONF_LINK_TARGET_STATIC) $(OBJECTS) $(OBJMOC) 
+ # Compiling application source
+-SYSCONF_CXXFLAGS	= -pipe -O2
+-SYSCONF_CFLAGS		= -pipe -O2
++SYSCONF_CXXFLAGS	= -DQT_PREFIX=\"${PREFIX}\" -pipe -O2
++SYSCONF_CFLAGS		= -DQT_PREFIX=\"${PREFIX}\" -pipe -O2
+ SYSCONF_LINK_LIB	= $(SYSCONF_LINK_LIB_STATIC)
+ SYSCONF_LINK_TARGET	= $(SYSCONF_LINK_TARGET_STATIC)
+ # Compiling library source
diff --git a/x11-toolkits/qt22/files/patch-ag b/x11-toolkits/qt22/files/patch-ag
new file mode 100644
index 000000000000..0347913d3a31
--- /dev/null
+++ b/x11-toolkits/qt22/files/patch-ag
@@ -0,0 +1,13 @@
+--- tools/designer/designer/help.cpp	2000/11/18 17:43:54	1.1
++++ tools/designer/designer/help.cpp	2000/11/18 17:46:09
+@@ -84,8 +84,8 @@
+     browser = new TextBrowser( this );
+     browser->mimeSourceFactory()->setFilePath( home );
+     browser->setFrameStyle( QFrame::Panel | QFrame::Sunken );
+-    browser->mimeSourceFactory()->addFilePath( QString( getenv( "QTDIR" ) ) + "/tools/designer/manual" );
+-    browser->mimeSourceFactory()->addFilePath( QString( getenv( "QTDIR" ) ) + "/doc/html/designer" );
++    browser->mimeSourceFactory()->addFilePath( QT_PREFIX "/share/qt2/designer/manual" );
++    browser->mimeSourceFactory()->addFilePath( QT_PREFIX "/share/doc/qt2/html/designer" );
+     browser->mimeSourceFactory()->addFilePath( parent->documentationPath() );
+     connect( browser, SIGNAL( textChanged() ),
+ 	     this, SLOT( textChanged() ) );
diff --git a/x11-toolkits/qt22/files/patch-ah b/x11-toolkits/qt22/files/patch-ah
new file mode 100644
index 000000000000..1bf90ba1c6f2
--- /dev/null
+++ b/x11-toolkits/qt22/files/patch-ah
@@ -0,0 +1,14 @@
+--- tools/designer/designer/helpdialogimpl.cpp	2000/11/18 19:37:35	1.1
++++ tools/designer/designer/helpdialogimpl.cpp	2000/11/18 19:38:57
+@@ -569,9 +569,9 @@
+     delete lst;
+ 
+ 
+-    QString manualdir = QString( getenv( "QTDIR" ) ) + "/tools/designer/manual/book1.html";
++    QString manualdir = QT_PREFIX "/share/qt2/designer/manual/book1.html";
+     if ( !QFile::exists( manualdir ) )
+-	manualdir = QString( getenv( "QTDIR" ) ) + "/doc/html/designer/book1.html";
++	manualdir = QT_PREFIX "/share/doc/qt2/html/designer/book1.html";
+     QFile file( manualdir );
+     if ( !file.open( IO_ReadOnly ) )
+ 	return;
diff --git a/x11-toolkits/qt22/files/patch-ai b/x11-toolkits/qt22/files/patch-ai
new file mode 100644
index 000000000000..8ba1cf2ee470
--- /dev/null
+++ b/x11-toolkits/qt22/files/patch-ai
@@ -0,0 +1,15 @@
+--- tools/designer/designer/newformimpl.cpp	2000/11/18 17:43:54	1.1
++++ tools/designer/designer/newformimpl.cpp	2000/11/18 17:48:49
+@@ -33,9 +33,9 @@
+ {
+     if ( QFileInfo( "../templates" ).exists() )
+ 	return "../templates";
+-    QString qtdir = getenv( "QTDIR" );
+-    if ( QFileInfo( qtdir + "/tools/designer/templates" ).exists() )
+-	return qtdir + "/tools/designer/templates";
++    QString qtdir = QT_PREFIX;
++    if ( QFileInfo( qtdir + "/share/qt2/designer/templates" ).exists() )
++	return qtdir + "/share/qt2/designer/templates";
+     return t;
+ }
+ 
diff --git a/x11-toolkits/qt22/files/patch-aj b/x11-toolkits/qt22/files/patch-aj
new file mode 100644
index 000000000000..eddf54f011d9
--- /dev/null
+++ b/x11-toolkits/qt22/files/patch-aj
@@ -0,0 +1,32 @@
+--- tools/designer/designer/mainwindow.cpp	2000/11/18 17:50:58	1.1
++++ tools/designer/designer/mainwindow.cpp	2000/11/18 17:53:21
+@@ -125,7 +125,7 @@
+     : QMainWindow( 0, "mainwindow", WType_TopLevel | WDestructiveClose ),
+ #endif
+       grd( 10, 10 ), sGrid( TRUE ), snGrid( TRUE ), restoreConfig( TRUE ), splashScreen( TRUE ),
+-      docPath( "$QTDIR/doc/html" ), client( asClient )
++      docPath( QT_PREFIX "/share/doc/qt2/html" ), client( asClient )
+ {
+     self = this;
+     setIcon( PixmapChooser::loadPixmap( "logo" ) );
+@@ -3144,7 +3144,7 @@
+ 	QMessageBox::information( this, tr( "Create Template" ), tr( "Couldn't create the template" ) );
+ 	return;
+     }
+-    fn.prepend( QString( getenv( "QTDIR" ) ) + "/tools/designer/templates/" );
++    fn.prepend( QT_PREFIX "/share/qt2/designer/templates/" );
+     fn.append( ".ui" );
+     QFile f( fn );
+     if ( !f.open( IO_WriteOnly ) ) {
+@@ -3236,9 +3236,9 @@
+ 
+ void MainWindow::openHelpForDialog( const QString &dia )
+ {
+-    QString manualdir = QString( getenv( "QTDIR" ) ) + "/tools/designer/manual/book1.html";
++    QString manualdir = QT_PREFIX "/share/qt2/designer/manual/book1.html";
+     if ( !QFile::exists( manualdir ) )
+-	manualdir = QString( getenv( "QTDIR" ) ) + "/doc/html/designer/book1.html";
++	manualdir = QT_PREFIX "/share/doc/qt2/html/designer/book1.html";
+     QFile file( manualdir );
+     if ( !file.open( IO_ReadOnly ) )
+ 	return;
diff --git a/x11-toolkits/qt22/pkg-plist b/x11-toolkits/qt22/pkg-plist
index 6c8919a2de9b..75c2940bfb6b 100644
--- a/x11-toolkits/qt22/pkg-plist
+++ b/x11-toolkits/qt22/pkg-plist
@@ -336,6 +336,10 @@ share/doc/qt2/html/debug.html
 share/doc/qt2/html/design.html
 share/doc/qt2/html/designer.html
 share/doc/qt2/html/designer.png
+share/doc/qt2/html/designer/arrows/home.png
+share/doc/qt2/html/designer/arrows/left.png
+share/doc/qt2/html/designer/arrows/right.png
+share/doc/qt2/html/designer/arrows/up.png
 share/doc/qt2/html/designer/book1.html
 share/doc/qt2/html/designer/chap10_1.html
 share/doc/qt2/html/designer/chap1_1.html
@@ -510,6 +514,7 @@ share/doc/qt2/html/functions.html
 share/doc/qt2/html/geomanagement.html
 share/doc/qt2/html/geometry.html
 share/doc/qt2/html/geometry.png
+share/doc/qt2/html/graph.g1n
 share/doc/qt2/html/grapher-grapher-cpp.html
 share/doc/qt2/html/gridlayout.png
 share/doc/qt2/html/groupbox-m.png
@@ -526,6 +531,7 @@ share/doc/qt2/html/iconview-main-cpp.html
 share/doc/qt2/html/iconview.html
 share/doc/qt2/html/imageio.html
 share/doc/qt2/html/images.html
+share/doc/qt2/html/index
 share/doc/qt2/html/index.html
 share/doc/qt2/html/install-qws.html
 share/doc/qt2/html/install-win.html
@@ -576,6 +582,7 @@ share/doc/qt2/html/primes.html
 share/doc/qt2/html/progress-progress-cpp.html
 share/doc/qt2/html/progressbar-main-cpp.html
 share/doc/qt2/html/properties.html
+share/doc/qt2/html/propertyindex
 share/doc/qt2/html/qabstractlayout-h.html
 share/doc/qt2/html/qaccel-h.html
 share/doc/qt2/html/qaccel-members.html
@@ -1653,6 +1660,7 @@ share/doc/qt2/html/threads.html
 share/doc/qt2/html/tictac-main-cpp.html
 share/doc/qt2/html/time.html
 share/doc/qt2/html/timers.html
+share/doc/qt2/html/titleindex
 share/doc/qt2/html/tools.html
 share/doc/qt2/html/tooltip-main-cpp.html
 share/doc/qt2/html/topicals.html
@@ -1663,6 +1671,7 @@ share/doc/qt2/html/tutorial.png
 share/doc/qt2/html/unicode.html
 share/doc/qt2/html/unsmooth.png
 share/doc/qt2/html/validator-main-cpp.html
+share/doc/qt2/html/whatsthis
 share/doc/qt2/html/whatsthis.png
 share/doc/qt2/html/winsystem.html
 share/doc/qt2/html/wizard-main-cpp.html
@@ -1672,8 +1681,15 @@ share/doc/qt2/html/xml-sax.html
 share/doc/qt2/html/xml.html
 share/doc/qt2/html/xt.html
 share/doc/qt2/html/y2k.html
-@dirrm share/doc/qt2/html/designer/stylesheet-images
+share/qt2/designer/templates/Configuration_Dialog.ui
+share/qt2/designer/templates/Dialog_with_Buttons_(Bottom).ui
+share/qt2/designer/templates/Dialog_with_Buttons_(Right).ui
+share/qt2/designer/templates/Tab-Dialog.ui
+@dirrm share/qt2/designer/templates
+@dirrm share/qt2/designer
+@dirrm share/qt2
 @dirrm share/doc/qt2/html/designer/figures
+@dirrm share/doc/qt2/html/designer/arrows
 @dirrm share/doc/qt2/html/designer
 @dirrm share/doc/qt2/html
 @dirrm share/doc/qt2
diff --git a/x11-toolkits/qt23/Makefile b/x11-toolkits/qt23/Makefile
index 3b638d903715..7afd742c3a2f 100644
--- a/x11-toolkits/qt23/Makefile
+++ b/x11-toolkits/qt23/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	qt
 PORTVERSION=	2.2.1
+PORTREVISION=	1
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	ftp://ftp.trolltech.com/qt/source/
 DISTNAME=	qt-x11-${PORTVERSION}
@@ -81,6 +82,7 @@ post-configure:
 
 do-install:
 	${MKDIR} ${PREFIX}/include/qt2
+	${MKDIR} ${PREFIX}/share/qt2/designer/templates
 .for BIN in designer moc2 uic
 	${INSTALL_PROGRAM} ${WRKSRC}/bin/${BIN} ${PREFIX}/bin
 .endfor
@@ -88,12 +90,19 @@ do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/bin/${SCRIPT} ${PREFIX}/bin
 .endfor
 	${INSTALL_DATA} ${WRKSRC}/include/*.h ${PREFIX}/include/qt2
+	${INSTALL_PROGRAM} ${WRKSRC}/lib/libqt2.so.4 ${PREFIX}/lib
+	${INSTALL_PROGRAM} ${WRKSRC}/lib/libqutil.so.1 ${PREFIX}/lib
+	${LN} -sf ${PREFIX}/lib/libqt2.so.4 ${PREFIX}/lib/libqt2.so
+	${LN} -sf ${PREFIX}/lib/libqutil.so.1 ${PREFIX}/lib/libqutil.so
+.if defined(WANT_STATIC)
 .for LIB in qt2 qutil
-	${INSTALL_DATA} ${WRKSRC}/lib/lib${LIB}* ${PREFIX}/lib
+	${INSTALL_DATA} ${WRKSRC}/lib/lib${LIB}.a ${PREFIX}/lib
 .endfor
+.endif
+	${INSTALL_DATA} ${WRKSRC}/tools/designer/templates/* \
+		${PREFIX}/share/qt2/designer/templates
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${PREFIX}/share/doc/qt2/html/designer/figures
-	${MKDIR} ${PREFIX}/share/doc/qt2/html/designer/stylesheet-images
+	${MKDIR} ${PREFIX}/share/doc/qt2
 	(cd ${WRKSRC} ; \
 	${INSTALL_DATA} ANNOUNCE ${PREFIX}/share/doc/qt2 ; \
 	${INSTALL_DATA} FAQ ${PREFIX}/share/doc/qt2 ; \
@@ -101,9 +110,8 @@ do-install:
 	${INSTALL_DATA} PORTING ${PREFIX}/share/doc/qt2 ; \
 	${INSTALL_DATA} README ${PREFIX}/share/doc/qt2 ; \
 	${INSTALL_DATA} README.QT ${PREFIX}/share/doc/qt2 ; \
-	${INSTALL_DATA} doc/html/*.html doc/html/*.png ${PREFIX}/share/doc/qt2/html ; \
-	${INSTALL_DATA} doc/html/designer/*.html ${PREFIX}/share/doc/qt2/html/designer ; \
-	${INSTALL_DATA} doc/html/designer/figures/* ${PREFIX}/share/doc/qt2/html/designer/figures ; \
+	( cd ${WRKSRC}/doc &&  ${TAR} -chf - html | \
+		${TAR} --unlink -xf - -C ${PREFIX}/share/doc/qt2 ) ; \
 	${INSTALL_MAN} doc/man/man3/q* ${PREFIX}/man/man3 )
 .endif
 
diff --git a/x11-toolkits/qt23/files/patch-aa b/x11-toolkits/qt23/files/patch-aa
index b95cbe905e2e..3d4d707124a0 100644
--- a/x11-toolkits/qt23/files/patch-aa
+++ b/x11-toolkits/qt23/files/patch-aa
@@ -1,6 +1,6 @@
---- configs/freebsd-g++-shared	Sun Sep 10 18:44:24 2000
-+++ configs/freebsd-g++-shared.new	Sun Sep 10 18:44:53 2000
-@@ -21,7 +21,7 @@
+--- configs/freebsd-g++-shared.orig	Wed Oct  4 12:55:10 2000
++++ configs/freebsd-g++-shared	Sat Nov 18 20:02:27 2000
+@@ -22,7 +22,7 @@
  SYSCONF_LIBS_X11	= -lXext -lX11 -lm
  # Qt, Qt+OpenGL
  SYSCONF_LFLAGS_QT	= -L$(QTDIR)/lib
@@ -9,7 +9,7 @@
  SYSCONF_LIBS_QT_OPENGL	= 
  # OpenGL
  SYSCONF_LFLAGS_OPENGL	= -L/usr/X11R6/lib
-@@ -44,7 +44,7 @@
+@@ -45,7 +45,7 @@
  SYSCONF_LIBS_THREAD	= 
  
  # Meta-object compiler
@@ -18,7 +18,7 @@
  
  # UI compiler
  SYSCONF_UIC		= $(QTDIR)/bin/uic
-@@ -55,16 +55,14 @@
+@@ -56,16 +56,14 @@
  #   - Usually needs to incorporate $(VER_MAJ), $(VER_MIN) and $(VER_PATCH)
  #
  SYSCONF_LINK_SHLIB	= g++
@@ -38,3 +38,14 @@
  
  # Linking static libraries
  #   - Build the $(TARGET) library, eg. lib$(TARGET).a
+@@ -76,8 +74,8 @@
+ SYSCONF_LINK_LIB_STATIC	= rm -f $(DESTDIR)$(SYSCONF_LINK_TARGET_STATIC) ; \
+ 				 $(SYSCONF_AR) $(DESTDIR)$(SYSCONF_LINK_TARGET_STATIC) $(OBJECTS) $(OBJMOC) 
+ # Compiling application source
+-SYSCONF_CXXFLAGS	= -pipe -O2
+-SYSCONF_CFLAGS		= -pipe -O2
++SYSCONF_CXXFLAGS	= -DQT_PREFIX=\"${PREFIX}\" -pipe -O2
++SYSCONF_CFLAGS		= -DQT_PREFIX=\"${PREFIX}\" -pipe -O2
+ # Default link type (static linking is still be used where required)
+ SYSCONF_LINK_LIB	= $(SYSCONF_LINK_LIB_SHARED)
+ SYSCONF_LINK_TARGET	= $(SYSCONF_LINK_TARGET_SHARED)
diff --git a/x11-toolkits/qt23/files/patch-af b/x11-toolkits/qt23/files/patch-af
index b231b8d9f0be..0e02a1aefefc 100644
--- a/x11-toolkits/qt23/files/patch-af
+++ b/x11-toolkits/qt23/files/patch-af
@@ -1,6 +1,6 @@
---- configs/freebsd-g++-static	Sat Sep 16 14:47:56 2000
-+++ configs/freebsd-g++-static.new	Sat Sep 16 14:48:06 2000
-@@ -21,7 +21,7 @@
+--- configs/freebsd-g++-static.orig	Wed Oct  4 12:55:09 2000
++++ configs/freebsd-g++-static	Sat Nov 18 20:02:46 2000
+@@ -22,7 +22,7 @@
  SYSCONF_LIBS_X11	= -lXext -lX11 -lm
  # Qt, Qt+OpenGL
  SYSCONF_LFLAGS_QT	= -L$(QTDIR)/lib
@@ -9,7 +9,7 @@
  SYSCONF_LIBS_QT_OPENGL	= 
  # OpenGL
  SYSCONF_LFLAGS_OPENGL	= -L/usr/X11R6/lib
-@@ -44,7 +44,7 @@
+@@ -45,7 +45,7 @@
  SYSCONF_LIBS_THREAD	= 
  
  # Meta-object compiler
@@ -18,3 +18,14 @@
  
  # UI compiler
  SYSCONF_UIC		= $(QTDIR)/bin/uic
+@@ -76,8 +76,8 @@
+ SYSCONF_LINK_LIB_STATIC	= rm -f $(DESTDIR)$(SYSCONF_LINK_TARGET_STATIC) ; \
+ 				 $(SYSCONF_AR) $(DESTDIR)$(SYSCONF_LINK_TARGET_STATIC) $(OBJECTS) $(OBJMOC) 
+ # Compiling application source
+-SYSCONF_CXXFLAGS	= -pipe -O2
+-SYSCONF_CFLAGS		= -pipe -O2
++SYSCONF_CXXFLAGS	= -DQT_PREFIX=\"${PREFIX}\" -pipe -O2
++SYSCONF_CFLAGS		= -DQT_PREFIX=\"${PREFIX}\" -pipe -O2
+ SYSCONF_LINK_LIB	= $(SYSCONF_LINK_LIB_STATIC)
+ SYSCONF_LINK_TARGET	= $(SYSCONF_LINK_TARGET_STATIC)
+ # Compiling library source
diff --git a/x11-toolkits/qt23/pkg-plist b/x11-toolkits/qt23/pkg-plist
index 6c8919a2de9b..75c2940bfb6b 100644
--- a/x11-toolkits/qt23/pkg-plist
+++ b/x11-toolkits/qt23/pkg-plist
@@ -336,6 +336,10 @@ share/doc/qt2/html/debug.html
 share/doc/qt2/html/design.html
 share/doc/qt2/html/designer.html
 share/doc/qt2/html/designer.png
+share/doc/qt2/html/designer/arrows/home.png
+share/doc/qt2/html/designer/arrows/left.png
+share/doc/qt2/html/designer/arrows/right.png
+share/doc/qt2/html/designer/arrows/up.png
 share/doc/qt2/html/designer/book1.html
 share/doc/qt2/html/designer/chap10_1.html
 share/doc/qt2/html/designer/chap1_1.html
@@ -510,6 +514,7 @@ share/doc/qt2/html/functions.html
 share/doc/qt2/html/geomanagement.html
 share/doc/qt2/html/geometry.html
 share/doc/qt2/html/geometry.png
+share/doc/qt2/html/graph.g1n
 share/doc/qt2/html/grapher-grapher-cpp.html
 share/doc/qt2/html/gridlayout.png
 share/doc/qt2/html/groupbox-m.png
@@ -526,6 +531,7 @@ share/doc/qt2/html/iconview-main-cpp.html
 share/doc/qt2/html/iconview.html
 share/doc/qt2/html/imageio.html
 share/doc/qt2/html/images.html
+share/doc/qt2/html/index
 share/doc/qt2/html/index.html
 share/doc/qt2/html/install-qws.html
 share/doc/qt2/html/install-win.html
@@ -576,6 +582,7 @@ share/doc/qt2/html/primes.html
 share/doc/qt2/html/progress-progress-cpp.html
 share/doc/qt2/html/progressbar-main-cpp.html
 share/doc/qt2/html/properties.html
+share/doc/qt2/html/propertyindex
 share/doc/qt2/html/qabstractlayout-h.html
 share/doc/qt2/html/qaccel-h.html
 share/doc/qt2/html/qaccel-members.html
@@ -1653,6 +1660,7 @@ share/doc/qt2/html/threads.html
 share/doc/qt2/html/tictac-main-cpp.html
 share/doc/qt2/html/time.html
 share/doc/qt2/html/timers.html
+share/doc/qt2/html/titleindex
 share/doc/qt2/html/tools.html
 share/doc/qt2/html/tooltip-main-cpp.html
 share/doc/qt2/html/topicals.html
@@ -1663,6 +1671,7 @@ share/doc/qt2/html/tutorial.png
 share/doc/qt2/html/unicode.html
 share/doc/qt2/html/unsmooth.png
 share/doc/qt2/html/validator-main-cpp.html
+share/doc/qt2/html/whatsthis
 share/doc/qt2/html/whatsthis.png
 share/doc/qt2/html/winsystem.html
 share/doc/qt2/html/wizard-main-cpp.html
@@ -1672,8 +1681,15 @@ share/doc/qt2/html/xml-sax.html
 share/doc/qt2/html/xml.html
 share/doc/qt2/html/xt.html
 share/doc/qt2/html/y2k.html
-@dirrm share/doc/qt2/html/designer/stylesheet-images
+share/qt2/designer/templates/Configuration_Dialog.ui
+share/qt2/designer/templates/Dialog_with_Buttons_(Bottom).ui
+share/qt2/designer/templates/Dialog_with_Buttons_(Right).ui
+share/qt2/designer/templates/Tab-Dialog.ui
+@dirrm share/qt2/designer/templates
+@dirrm share/qt2/designer
+@dirrm share/qt2
 @dirrm share/doc/qt2/html/designer/figures
+@dirrm share/doc/qt2/html/designer/arrows
 @dirrm share/doc/qt2/html/designer
 @dirrm share/doc/qt2/html
 @dirrm share/doc/qt2
diff --git a/x11-toolkits/qt30/Makefile b/x11-toolkits/qt30/Makefile
index 3b638d903715..7afd742c3a2f 100644
--- a/x11-toolkits/qt30/Makefile
+++ b/x11-toolkits/qt30/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	qt
 PORTVERSION=	2.2.1
+PORTREVISION=	1
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	ftp://ftp.trolltech.com/qt/source/
 DISTNAME=	qt-x11-${PORTVERSION}
@@ -81,6 +82,7 @@ post-configure:
 
 do-install:
 	${MKDIR} ${PREFIX}/include/qt2
+	${MKDIR} ${PREFIX}/share/qt2/designer/templates
 .for BIN in designer moc2 uic
 	${INSTALL_PROGRAM} ${WRKSRC}/bin/${BIN} ${PREFIX}/bin
 .endfor
@@ -88,12 +90,19 @@ do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/bin/${SCRIPT} ${PREFIX}/bin
 .endfor
 	${INSTALL_DATA} ${WRKSRC}/include/*.h ${PREFIX}/include/qt2
+	${INSTALL_PROGRAM} ${WRKSRC}/lib/libqt2.so.4 ${PREFIX}/lib
+	${INSTALL_PROGRAM} ${WRKSRC}/lib/libqutil.so.1 ${PREFIX}/lib
+	${LN} -sf ${PREFIX}/lib/libqt2.so.4 ${PREFIX}/lib/libqt2.so
+	${LN} -sf ${PREFIX}/lib/libqutil.so.1 ${PREFIX}/lib/libqutil.so
+.if defined(WANT_STATIC)
 .for LIB in qt2 qutil
-	${INSTALL_DATA} ${WRKSRC}/lib/lib${LIB}* ${PREFIX}/lib
+	${INSTALL_DATA} ${WRKSRC}/lib/lib${LIB}.a ${PREFIX}/lib
 .endfor
+.endif
+	${INSTALL_DATA} ${WRKSRC}/tools/designer/templates/* \
+		${PREFIX}/share/qt2/designer/templates
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${PREFIX}/share/doc/qt2/html/designer/figures
-	${MKDIR} ${PREFIX}/share/doc/qt2/html/designer/stylesheet-images
+	${MKDIR} ${PREFIX}/share/doc/qt2
 	(cd ${WRKSRC} ; \
 	${INSTALL_DATA} ANNOUNCE ${PREFIX}/share/doc/qt2 ; \
 	${INSTALL_DATA} FAQ ${PREFIX}/share/doc/qt2 ; \
@@ -101,9 +110,8 @@ do-install:
 	${INSTALL_DATA} PORTING ${PREFIX}/share/doc/qt2 ; \
 	${INSTALL_DATA} README ${PREFIX}/share/doc/qt2 ; \
 	${INSTALL_DATA} README.QT ${PREFIX}/share/doc/qt2 ; \
-	${INSTALL_DATA} doc/html/*.html doc/html/*.png ${PREFIX}/share/doc/qt2/html ; \
-	${INSTALL_DATA} doc/html/designer/*.html ${PREFIX}/share/doc/qt2/html/designer ; \
-	${INSTALL_DATA} doc/html/designer/figures/* ${PREFIX}/share/doc/qt2/html/designer/figures ; \
+	( cd ${WRKSRC}/doc &&  ${TAR} -chf - html | \
+		${TAR} --unlink -xf - -C ${PREFIX}/share/doc/qt2 ) ; \
 	${INSTALL_MAN} doc/man/man3/q* ${PREFIX}/man/man3 )
 .endif
 
diff --git a/x11-toolkits/qt30/files/patch-aa b/x11-toolkits/qt30/files/patch-aa
index b95cbe905e2e..3d4d707124a0 100644
--- a/x11-toolkits/qt30/files/patch-aa
+++ b/x11-toolkits/qt30/files/patch-aa
@@ -1,6 +1,6 @@
---- configs/freebsd-g++-shared	Sun Sep 10 18:44:24 2000
-+++ configs/freebsd-g++-shared.new	Sun Sep 10 18:44:53 2000
-@@ -21,7 +21,7 @@
+--- configs/freebsd-g++-shared.orig	Wed Oct  4 12:55:10 2000
++++ configs/freebsd-g++-shared	Sat Nov 18 20:02:27 2000
+@@ -22,7 +22,7 @@
  SYSCONF_LIBS_X11	= -lXext -lX11 -lm
  # Qt, Qt+OpenGL
  SYSCONF_LFLAGS_QT	= -L$(QTDIR)/lib
@@ -9,7 +9,7 @@
  SYSCONF_LIBS_QT_OPENGL	= 
  # OpenGL
  SYSCONF_LFLAGS_OPENGL	= -L/usr/X11R6/lib
-@@ -44,7 +44,7 @@
+@@ -45,7 +45,7 @@
  SYSCONF_LIBS_THREAD	= 
  
  # Meta-object compiler
@@ -18,7 +18,7 @@
  
  # UI compiler
  SYSCONF_UIC		= $(QTDIR)/bin/uic
-@@ -55,16 +55,14 @@
+@@ -56,16 +56,14 @@
  #   - Usually needs to incorporate $(VER_MAJ), $(VER_MIN) and $(VER_PATCH)
  #
  SYSCONF_LINK_SHLIB	= g++
@@ -38,3 +38,14 @@
  
  # Linking static libraries
  #   - Build the $(TARGET) library, eg. lib$(TARGET).a
+@@ -76,8 +74,8 @@
+ SYSCONF_LINK_LIB_STATIC	= rm -f $(DESTDIR)$(SYSCONF_LINK_TARGET_STATIC) ; \
+ 				 $(SYSCONF_AR) $(DESTDIR)$(SYSCONF_LINK_TARGET_STATIC) $(OBJECTS) $(OBJMOC) 
+ # Compiling application source
+-SYSCONF_CXXFLAGS	= -pipe -O2
+-SYSCONF_CFLAGS		= -pipe -O2
++SYSCONF_CXXFLAGS	= -DQT_PREFIX=\"${PREFIX}\" -pipe -O2
++SYSCONF_CFLAGS		= -DQT_PREFIX=\"${PREFIX}\" -pipe -O2
+ # Default link type (static linking is still be used where required)
+ SYSCONF_LINK_LIB	= $(SYSCONF_LINK_LIB_SHARED)
+ SYSCONF_LINK_TARGET	= $(SYSCONF_LINK_TARGET_SHARED)
diff --git a/x11-toolkits/qt30/files/patch-af b/x11-toolkits/qt30/files/patch-af
index b231b8d9f0be..0e02a1aefefc 100644
--- a/x11-toolkits/qt30/files/patch-af
+++ b/x11-toolkits/qt30/files/patch-af
@@ -1,6 +1,6 @@
---- configs/freebsd-g++-static	Sat Sep 16 14:47:56 2000
-+++ configs/freebsd-g++-static.new	Sat Sep 16 14:48:06 2000
-@@ -21,7 +21,7 @@
+--- configs/freebsd-g++-static.orig	Wed Oct  4 12:55:09 2000
++++ configs/freebsd-g++-static	Sat Nov 18 20:02:46 2000
+@@ -22,7 +22,7 @@
  SYSCONF_LIBS_X11	= -lXext -lX11 -lm
  # Qt, Qt+OpenGL
  SYSCONF_LFLAGS_QT	= -L$(QTDIR)/lib
@@ -9,7 +9,7 @@
  SYSCONF_LIBS_QT_OPENGL	= 
  # OpenGL
  SYSCONF_LFLAGS_OPENGL	= -L/usr/X11R6/lib
-@@ -44,7 +44,7 @@
+@@ -45,7 +45,7 @@
  SYSCONF_LIBS_THREAD	= 
  
  # Meta-object compiler
@@ -18,3 +18,14 @@
  
  # UI compiler
  SYSCONF_UIC		= $(QTDIR)/bin/uic
+@@ -76,8 +76,8 @@
+ SYSCONF_LINK_LIB_STATIC	= rm -f $(DESTDIR)$(SYSCONF_LINK_TARGET_STATIC) ; \
+ 				 $(SYSCONF_AR) $(DESTDIR)$(SYSCONF_LINK_TARGET_STATIC) $(OBJECTS) $(OBJMOC) 
+ # Compiling application source
+-SYSCONF_CXXFLAGS	= -pipe -O2
+-SYSCONF_CFLAGS		= -pipe -O2
++SYSCONF_CXXFLAGS	= -DQT_PREFIX=\"${PREFIX}\" -pipe -O2
++SYSCONF_CFLAGS		= -DQT_PREFIX=\"${PREFIX}\" -pipe -O2
+ SYSCONF_LINK_LIB	= $(SYSCONF_LINK_LIB_STATIC)
+ SYSCONF_LINK_TARGET	= $(SYSCONF_LINK_TARGET_STATIC)
+ # Compiling library source
diff --git a/x11-toolkits/qt30/pkg-plist b/x11-toolkits/qt30/pkg-plist
index 6c8919a2de9b..75c2940bfb6b 100644
--- a/x11-toolkits/qt30/pkg-plist
+++ b/x11-toolkits/qt30/pkg-plist
@@ -336,6 +336,10 @@ share/doc/qt2/html/debug.html
 share/doc/qt2/html/design.html
 share/doc/qt2/html/designer.html
 share/doc/qt2/html/designer.png
+share/doc/qt2/html/designer/arrows/home.png
+share/doc/qt2/html/designer/arrows/left.png
+share/doc/qt2/html/designer/arrows/right.png
+share/doc/qt2/html/designer/arrows/up.png
 share/doc/qt2/html/designer/book1.html
 share/doc/qt2/html/designer/chap10_1.html
 share/doc/qt2/html/designer/chap1_1.html
@@ -510,6 +514,7 @@ share/doc/qt2/html/functions.html
 share/doc/qt2/html/geomanagement.html
 share/doc/qt2/html/geometry.html
 share/doc/qt2/html/geometry.png
+share/doc/qt2/html/graph.g1n
 share/doc/qt2/html/grapher-grapher-cpp.html
 share/doc/qt2/html/gridlayout.png
 share/doc/qt2/html/groupbox-m.png
@@ -526,6 +531,7 @@ share/doc/qt2/html/iconview-main-cpp.html
 share/doc/qt2/html/iconview.html
 share/doc/qt2/html/imageio.html
 share/doc/qt2/html/images.html
+share/doc/qt2/html/index
 share/doc/qt2/html/index.html
 share/doc/qt2/html/install-qws.html
 share/doc/qt2/html/install-win.html
@@ -576,6 +582,7 @@ share/doc/qt2/html/primes.html
 share/doc/qt2/html/progress-progress-cpp.html
 share/doc/qt2/html/progressbar-main-cpp.html
 share/doc/qt2/html/properties.html
+share/doc/qt2/html/propertyindex
 share/doc/qt2/html/qabstractlayout-h.html
 share/doc/qt2/html/qaccel-h.html
 share/doc/qt2/html/qaccel-members.html
@@ -1653,6 +1660,7 @@ share/doc/qt2/html/threads.html
 share/doc/qt2/html/tictac-main-cpp.html
 share/doc/qt2/html/time.html
 share/doc/qt2/html/timers.html
+share/doc/qt2/html/titleindex
 share/doc/qt2/html/tools.html
 share/doc/qt2/html/tooltip-main-cpp.html
 share/doc/qt2/html/topicals.html
@@ -1663,6 +1671,7 @@ share/doc/qt2/html/tutorial.png
 share/doc/qt2/html/unicode.html
 share/doc/qt2/html/unsmooth.png
 share/doc/qt2/html/validator-main-cpp.html
+share/doc/qt2/html/whatsthis
 share/doc/qt2/html/whatsthis.png
 share/doc/qt2/html/winsystem.html
 share/doc/qt2/html/wizard-main-cpp.html
@@ -1672,8 +1681,15 @@ share/doc/qt2/html/xml-sax.html
 share/doc/qt2/html/xml.html
 share/doc/qt2/html/xt.html
 share/doc/qt2/html/y2k.html
-@dirrm share/doc/qt2/html/designer/stylesheet-images
+share/qt2/designer/templates/Configuration_Dialog.ui
+share/qt2/designer/templates/Dialog_with_Buttons_(Bottom).ui
+share/qt2/designer/templates/Dialog_with_Buttons_(Right).ui
+share/qt2/designer/templates/Tab-Dialog.ui
+@dirrm share/qt2/designer/templates
+@dirrm share/qt2/designer
+@dirrm share/qt2
 @dirrm share/doc/qt2/html/designer/figures
+@dirrm share/doc/qt2/html/designer/arrows
 @dirrm share/doc/qt2/html/designer
 @dirrm share/doc/qt2/html
 @dirrm share/doc/qt2
diff --git a/x11-toolkits/qt31/Makefile b/x11-toolkits/qt31/Makefile
index 3b638d903715..7afd742c3a2f 100644
--- a/x11-toolkits/qt31/Makefile
+++ b/x11-toolkits/qt31/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	qt
 PORTVERSION=	2.2.1
+PORTREVISION=	1
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	ftp://ftp.trolltech.com/qt/source/
 DISTNAME=	qt-x11-${PORTVERSION}
@@ -81,6 +82,7 @@ post-configure:
 
 do-install:
 	${MKDIR} ${PREFIX}/include/qt2
+	${MKDIR} ${PREFIX}/share/qt2/designer/templates
 .for BIN in designer moc2 uic
 	${INSTALL_PROGRAM} ${WRKSRC}/bin/${BIN} ${PREFIX}/bin
 .endfor
@@ -88,12 +90,19 @@ do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/bin/${SCRIPT} ${PREFIX}/bin
 .endfor
 	${INSTALL_DATA} ${WRKSRC}/include/*.h ${PREFIX}/include/qt2
+	${INSTALL_PROGRAM} ${WRKSRC}/lib/libqt2.so.4 ${PREFIX}/lib
+	${INSTALL_PROGRAM} ${WRKSRC}/lib/libqutil.so.1 ${PREFIX}/lib
+	${LN} -sf ${PREFIX}/lib/libqt2.so.4 ${PREFIX}/lib/libqt2.so
+	${LN} -sf ${PREFIX}/lib/libqutil.so.1 ${PREFIX}/lib/libqutil.so
+.if defined(WANT_STATIC)
 .for LIB in qt2 qutil
-	${INSTALL_DATA} ${WRKSRC}/lib/lib${LIB}* ${PREFIX}/lib
+	${INSTALL_DATA} ${WRKSRC}/lib/lib${LIB}.a ${PREFIX}/lib
 .endfor
+.endif
+	${INSTALL_DATA} ${WRKSRC}/tools/designer/templates/* \
+		${PREFIX}/share/qt2/designer/templates
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${PREFIX}/share/doc/qt2/html/designer/figures
-	${MKDIR} ${PREFIX}/share/doc/qt2/html/designer/stylesheet-images
+	${MKDIR} ${PREFIX}/share/doc/qt2
 	(cd ${WRKSRC} ; \
 	${INSTALL_DATA} ANNOUNCE ${PREFIX}/share/doc/qt2 ; \
 	${INSTALL_DATA} FAQ ${PREFIX}/share/doc/qt2 ; \
@@ -101,9 +110,8 @@ do-install:
 	${INSTALL_DATA} PORTING ${PREFIX}/share/doc/qt2 ; \
 	${INSTALL_DATA} README ${PREFIX}/share/doc/qt2 ; \
 	${INSTALL_DATA} README.QT ${PREFIX}/share/doc/qt2 ; \
-	${INSTALL_DATA} doc/html/*.html doc/html/*.png ${PREFIX}/share/doc/qt2/html ; \
-	${INSTALL_DATA} doc/html/designer/*.html ${PREFIX}/share/doc/qt2/html/designer ; \
-	${INSTALL_DATA} doc/html/designer/figures/* ${PREFIX}/share/doc/qt2/html/designer/figures ; \
+	( cd ${WRKSRC}/doc &&  ${TAR} -chf - html | \
+		${TAR} --unlink -xf - -C ${PREFIX}/share/doc/qt2 ) ; \
 	${INSTALL_MAN} doc/man/man3/q* ${PREFIX}/man/man3 )
 .endif
 
diff --git a/x11-toolkits/qt31/files/patch-aa b/x11-toolkits/qt31/files/patch-aa
index b95cbe905e2e..3d4d707124a0 100644
--- a/x11-toolkits/qt31/files/patch-aa
+++ b/x11-toolkits/qt31/files/patch-aa
@@ -1,6 +1,6 @@
---- configs/freebsd-g++-shared	Sun Sep 10 18:44:24 2000
-+++ configs/freebsd-g++-shared.new	Sun Sep 10 18:44:53 2000
-@@ -21,7 +21,7 @@
+--- configs/freebsd-g++-shared.orig	Wed Oct  4 12:55:10 2000
++++ configs/freebsd-g++-shared	Sat Nov 18 20:02:27 2000
+@@ -22,7 +22,7 @@
  SYSCONF_LIBS_X11	= -lXext -lX11 -lm
  # Qt, Qt+OpenGL
  SYSCONF_LFLAGS_QT	= -L$(QTDIR)/lib
@@ -9,7 +9,7 @@
  SYSCONF_LIBS_QT_OPENGL	= 
  # OpenGL
  SYSCONF_LFLAGS_OPENGL	= -L/usr/X11R6/lib
-@@ -44,7 +44,7 @@
+@@ -45,7 +45,7 @@
  SYSCONF_LIBS_THREAD	= 
  
  # Meta-object compiler
@@ -18,7 +18,7 @@
  
  # UI compiler
  SYSCONF_UIC		= $(QTDIR)/bin/uic
-@@ -55,16 +55,14 @@
+@@ -56,16 +56,14 @@
  #   - Usually needs to incorporate $(VER_MAJ), $(VER_MIN) and $(VER_PATCH)
  #
  SYSCONF_LINK_SHLIB	= g++
@@ -38,3 +38,14 @@
  
  # Linking static libraries
  #   - Build the $(TARGET) library, eg. lib$(TARGET).a
+@@ -76,8 +74,8 @@
+ SYSCONF_LINK_LIB_STATIC	= rm -f $(DESTDIR)$(SYSCONF_LINK_TARGET_STATIC) ; \
+ 				 $(SYSCONF_AR) $(DESTDIR)$(SYSCONF_LINK_TARGET_STATIC) $(OBJECTS) $(OBJMOC) 
+ # Compiling application source
+-SYSCONF_CXXFLAGS	= -pipe -O2
+-SYSCONF_CFLAGS		= -pipe -O2
++SYSCONF_CXXFLAGS	= -DQT_PREFIX=\"${PREFIX}\" -pipe -O2
++SYSCONF_CFLAGS		= -DQT_PREFIX=\"${PREFIX}\" -pipe -O2
+ # Default link type (static linking is still be used where required)
+ SYSCONF_LINK_LIB	= $(SYSCONF_LINK_LIB_SHARED)
+ SYSCONF_LINK_TARGET	= $(SYSCONF_LINK_TARGET_SHARED)
diff --git a/x11-toolkits/qt31/files/patch-af b/x11-toolkits/qt31/files/patch-af
index b231b8d9f0be..0e02a1aefefc 100644
--- a/x11-toolkits/qt31/files/patch-af
+++ b/x11-toolkits/qt31/files/patch-af
@@ -1,6 +1,6 @@
---- configs/freebsd-g++-static	Sat Sep 16 14:47:56 2000
-+++ configs/freebsd-g++-static.new	Sat Sep 16 14:48:06 2000
-@@ -21,7 +21,7 @@
+--- configs/freebsd-g++-static.orig	Wed Oct  4 12:55:09 2000
++++ configs/freebsd-g++-static	Sat Nov 18 20:02:46 2000
+@@ -22,7 +22,7 @@
  SYSCONF_LIBS_X11	= -lXext -lX11 -lm
  # Qt, Qt+OpenGL
  SYSCONF_LFLAGS_QT	= -L$(QTDIR)/lib
@@ -9,7 +9,7 @@
  SYSCONF_LIBS_QT_OPENGL	= 
  # OpenGL
  SYSCONF_LFLAGS_OPENGL	= -L/usr/X11R6/lib
-@@ -44,7 +44,7 @@
+@@ -45,7 +45,7 @@
  SYSCONF_LIBS_THREAD	= 
  
  # Meta-object compiler
@@ -18,3 +18,14 @@
  
  # UI compiler
  SYSCONF_UIC		= $(QTDIR)/bin/uic
+@@ -76,8 +76,8 @@
+ SYSCONF_LINK_LIB_STATIC	= rm -f $(DESTDIR)$(SYSCONF_LINK_TARGET_STATIC) ; \
+ 				 $(SYSCONF_AR) $(DESTDIR)$(SYSCONF_LINK_TARGET_STATIC) $(OBJECTS) $(OBJMOC) 
+ # Compiling application source
+-SYSCONF_CXXFLAGS	= -pipe -O2
+-SYSCONF_CFLAGS		= -pipe -O2
++SYSCONF_CXXFLAGS	= -DQT_PREFIX=\"${PREFIX}\" -pipe -O2
++SYSCONF_CFLAGS		= -DQT_PREFIX=\"${PREFIX}\" -pipe -O2
+ SYSCONF_LINK_LIB	= $(SYSCONF_LINK_LIB_STATIC)
+ SYSCONF_LINK_TARGET	= $(SYSCONF_LINK_TARGET_STATIC)
+ # Compiling library source
diff --git a/x11-toolkits/qt31/pkg-plist b/x11-toolkits/qt31/pkg-plist
index 6c8919a2de9b..75c2940bfb6b 100644
--- a/x11-toolkits/qt31/pkg-plist
+++ b/x11-toolkits/qt31/pkg-plist
@@ -336,6 +336,10 @@ share/doc/qt2/html/debug.html
 share/doc/qt2/html/design.html
 share/doc/qt2/html/designer.html
 share/doc/qt2/html/designer.png
+share/doc/qt2/html/designer/arrows/home.png
+share/doc/qt2/html/designer/arrows/left.png
+share/doc/qt2/html/designer/arrows/right.png
+share/doc/qt2/html/designer/arrows/up.png
 share/doc/qt2/html/designer/book1.html
 share/doc/qt2/html/designer/chap10_1.html
 share/doc/qt2/html/designer/chap1_1.html
@@ -510,6 +514,7 @@ share/doc/qt2/html/functions.html
 share/doc/qt2/html/geomanagement.html
 share/doc/qt2/html/geometry.html
 share/doc/qt2/html/geometry.png
+share/doc/qt2/html/graph.g1n
 share/doc/qt2/html/grapher-grapher-cpp.html
 share/doc/qt2/html/gridlayout.png
 share/doc/qt2/html/groupbox-m.png
@@ -526,6 +531,7 @@ share/doc/qt2/html/iconview-main-cpp.html
 share/doc/qt2/html/iconview.html
 share/doc/qt2/html/imageio.html
 share/doc/qt2/html/images.html
+share/doc/qt2/html/index
 share/doc/qt2/html/index.html
 share/doc/qt2/html/install-qws.html
 share/doc/qt2/html/install-win.html
@@ -576,6 +582,7 @@ share/doc/qt2/html/primes.html
 share/doc/qt2/html/progress-progress-cpp.html
 share/doc/qt2/html/progressbar-main-cpp.html
 share/doc/qt2/html/properties.html
+share/doc/qt2/html/propertyindex
 share/doc/qt2/html/qabstractlayout-h.html
 share/doc/qt2/html/qaccel-h.html
 share/doc/qt2/html/qaccel-members.html
@@ -1653,6 +1660,7 @@ share/doc/qt2/html/threads.html
 share/doc/qt2/html/tictac-main-cpp.html
 share/doc/qt2/html/time.html
 share/doc/qt2/html/timers.html
+share/doc/qt2/html/titleindex
 share/doc/qt2/html/tools.html
 share/doc/qt2/html/tooltip-main-cpp.html
 share/doc/qt2/html/topicals.html
@@ -1663,6 +1671,7 @@ share/doc/qt2/html/tutorial.png
 share/doc/qt2/html/unicode.html
 share/doc/qt2/html/unsmooth.png
 share/doc/qt2/html/validator-main-cpp.html
+share/doc/qt2/html/whatsthis
 share/doc/qt2/html/whatsthis.png
 share/doc/qt2/html/winsystem.html
 share/doc/qt2/html/wizard-main-cpp.html
@@ -1672,8 +1681,15 @@ share/doc/qt2/html/xml-sax.html
 share/doc/qt2/html/xml.html
 share/doc/qt2/html/xt.html
 share/doc/qt2/html/y2k.html
-@dirrm share/doc/qt2/html/designer/stylesheet-images
+share/qt2/designer/templates/Configuration_Dialog.ui
+share/qt2/designer/templates/Dialog_with_Buttons_(Bottom).ui
+share/qt2/designer/templates/Dialog_with_Buttons_(Right).ui
+share/qt2/designer/templates/Tab-Dialog.ui
+@dirrm share/qt2/designer/templates
+@dirrm share/qt2/designer
+@dirrm share/qt2
 @dirrm share/doc/qt2/html/designer/figures
+@dirrm share/doc/qt2/html/designer/arrows
 @dirrm share/doc/qt2/html/designer
 @dirrm share/doc/qt2/html
 @dirrm share/doc/qt2
diff --git a/x11-toolkits/qt32/Makefile b/x11-toolkits/qt32/Makefile
index 3b638d903715..7afd742c3a2f 100644
--- a/x11-toolkits/qt32/Makefile
+++ b/x11-toolkits/qt32/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	qt
 PORTVERSION=	2.2.1
+PORTREVISION=	1
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	ftp://ftp.trolltech.com/qt/source/
 DISTNAME=	qt-x11-${PORTVERSION}
@@ -81,6 +82,7 @@ post-configure:
 
 do-install:
 	${MKDIR} ${PREFIX}/include/qt2
+	${MKDIR} ${PREFIX}/share/qt2/designer/templates
 .for BIN in designer moc2 uic
 	${INSTALL_PROGRAM} ${WRKSRC}/bin/${BIN} ${PREFIX}/bin
 .endfor
@@ -88,12 +90,19 @@ do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/bin/${SCRIPT} ${PREFIX}/bin
 .endfor
 	${INSTALL_DATA} ${WRKSRC}/include/*.h ${PREFIX}/include/qt2
+	${INSTALL_PROGRAM} ${WRKSRC}/lib/libqt2.so.4 ${PREFIX}/lib
+	${INSTALL_PROGRAM} ${WRKSRC}/lib/libqutil.so.1 ${PREFIX}/lib
+	${LN} -sf ${PREFIX}/lib/libqt2.so.4 ${PREFIX}/lib/libqt2.so
+	${LN} -sf ${PREFIX}/lib/libqutil.so.1 ${PREFIX}/lib/libqutil.so
+.if defined(WANT_STATIC)
 .for LIB in qt2 qutil
-	${INSTALL_DATA} ${WRKSRC}/lib/lib${LIB}* ${PREFIX}/lib
+	${INSTALL_DATA} ${WRKSRC}/lib/lib${LIB}.a ${PREFIX}/lib
 .endfor
+.endif
+	${INSTALL_DATA} ${WRKSRC}/tools/designer/templates/* \
+		${PREFIX}/share/qt2/designer/templates
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${PREFIX}/share/doc/qt2/html/designer/figures
-	${MKDIR} ${PREFIX}/share/doc/qt2/html/designer/stylesheet-images
+	${MKDIR} ${PREFIX}/share/doc/qt2
 	(cd ${WRKSRC} ; \
 	${INSTALL_DATA} ANNOUNCE ${PREFIX}/share/doc/qt2 ; \
 	${INSTALL_DATA} FAQ ${PREFIX}/share/doc/qt2 ; \
@@ -101,9 +110,8 @@ do-install:
 	${INSTALL_DATA} PORTING ${PREFIX}/share/doc/qt2 ; \
 	${INSTALL_DATA} README ${PREFIX}/share/doc/qt2 ; \
 	${INSTALL_DATA} README.QT ${PREFIX}/share/doc/qt2 ; \
-	${INSTALL_DATA} doc/html/*.html doc/html/*.png ${PREFIX}/share/doc/qt2/html ; \
-	${INSTALL_DATA} doc/html/designer/*.html ${PREFIX}/share/doc/qt2/html/designer ; \
-	${INSTALL_DATA} doc/html/designer/figures/* ${PREFIX}/share/doc/qt2/html/designer/figures ; \
+	( cd ${WRKSRC}/doc &&  ${TAR} -chf - html | \
+		${TAR} --unlink -xf - -C ${PREFIX}/share/doc/qt2 ) ; \
 	${INSTALL_MAN} doc/man/man3/q* ${PREFIX}/man/man3 )
 .endif
 
diff --git a/x11-toolkits/qt32/files/patch-aa b/x11-toolkits/qt32/files/patch-aa
index b95cbe905e2e..3d4d707124a0 100644
--- a/x11-toolkits/qt32/files/patch-aa
+++ b/x11-toolkits/qt32/files/patch-aa
@@ -1,6 +1,6 @@
---- configs/freebsd-g++-shared	Sun Sep 10 18:44:24 2000
-+++ configs/freebsd-g++-shared.new	Sun Sep 10 18:44:53 2000
-@@ -21,7 +21,7 @@
+--- configs/freebsd-g++-shared.orig	Wed Oct  4 12:55:10 2000
++++ configs/freebsd-g++-shared	Sat Nov 18 20:02:27 2000
+@@ -22,7 +22,7 @@
  SYSCONF_LIBS_X11	= -lXext -lX11 -lm
  # Qt, Qt+OpenGL
  SYSCONF_LFLAGS_QT	= -L$(QTDIR)/lib
@@ -9,7 +9,7 @@
  SYSCONF_LIBS_QT_OPENGL	= 
  # OpenGL
  SYSCONF_LFLAGS_OPENGL	= -L/usr/X11R6/lib
-@@ -44,7 +44,7 @@
+@@ -45,7 +45,7 @@
  SYSCONF_LIBS_THREAD	= 
  
  # Meta-object compiler
@@ -18,7 +18,7 @@
  
  # UI compiler
  SYSCONF_UIC		= $(QTDIR)/bin/uic
-@@ -55,16 +55,14 @@
+@@ -56,16 +56,14 @@
  #   - Usually needs to incorporate $(VER_MAJ), $(VER_MIN) and $(VER_PATCH)
  #
  SYSCONF_LINK_SHLIB	= g++
@@ -38,3 +38,14 @@
  
  # Linking static libraries
  #   - Build the $(TARGET) library, eg. lib$(TARGET).a
+@@ -76,8 +74,8 @@
+ SYSCONF_LINK_LIB_STATIC	= rm -f $(DESTDIR)$(SYSCONF_LINK_TARGET_STATIC) ; \
+ 				 $(SYSCONF_AR) $(DESTDIR)$(SYSCONF_LINK_TARGET_STATIC) $(OBJECTS) $(OBJMOC) 
+ # Compiling application source
+-SYSCONF_CXXFLAGS	= -pipe -O2
+-SYSCONF_CFLAGS		= -pipe -O2
++SYSCONF_CXXFLAGS	= -DQT_PREFIX=\"${PREFIX}\" -pipe -O2
++SYSCONF_CFLAGS		= -DQT_PREFIX=\"${PREFIX}\" -pipe -O2
+ # Default link type (static linking is still be used where required)
+ SYSCONF_LINK_LIB	= $(SYSCONF_LINK_LIB_SHARED)
+ SYSCONF_LINK_TARGET	= $(SYSCONF_LINK_TARGET_SHARED)
diff --git a/x11-toolkits/qt32/files/patch-af b/x11-toolkits/qt32/files/patch-af
index b231b8d9f0be..0e02a1aefefc 100644
--- a/x11-toolkits/qt32/files/patch-af
+++ b/x11-toolkits/qt32/files/patch-af
@@ -1,6 +1,6 @@
---- configs/freebsd-g++-static	Sat Sep 16 14:47:56 2000
-+++ configs/freebsd-g++-static.new	Sat Sep 16 14:48:06 2000
-@@ -21,7 +21,7 @@
+--- configs/freebsd-g++-static.orig	Wed Oct  4 12:55:09 2000
++++ configs/freebsd-g++-static	Sat Nov 18 20:02:46 2000
+@@ -22,7 +22,7 @@
  SYSCONF_LIBS_X11	= -lXext -lX11 -lm
  # Qt, Qt+OpenGL
  SYSCONF_LFLAGS_QT	= -L$(QTDIR)/lib
@@ -9,7 +9,7 @@
  SYSCONF_LIBS_QT_OPENGL	= 
  # OpenGL
  SYSCONF_LFLAGS_OPENGL	= -L/usr/X11R6/lib
-@@ -44,7 +44,7 @@
+@@ -45,7 +45,7 @@
  SYSCONF_LIBS_THREAD	= 
  
  # Meta-object compiler
@@ -18,3 +18,14 @@
  
  # UI compiler
  SYSCONF_UIC		= $(QTDIR)/bin/uic
+@@ -76,8 +76,8 @@
+ SYSCONF_LINK_LIB_STATIC	= rm -f $(DESTDIR)$(SYSCONF_LINK_TARGET_STATIC) ; \
+ 				 $(SYSCONF_AR) $(DESTDIR)$(SYSCONF_LINK_TARGET_STATIC) $(OBJECTS) $(OBJMOC) 
+ # Compiling application source
+-SYSCONF_CXXFLAGS	= -pipe -O2
+-SYSCONF_CFLAGS		= -pipe -O2
++SYSCONF_CXXFLAGS	= -DQT_PREFIX=\"${PREFIX}\" -pipe -O2
++SYSCONF_CFLAGS		= -DQT_PREFIX=\"${PREFIX}\" -pipe -O2
+ SYSCONF_LINK_LIB	= $(SYSCONF_LINK_LIB_STATIC)
+ SYSCONF_LINK_TARGET	= $(SYSCONF_LINK_TARGET_STATIC)
+ # Compiling library source
diff --git a/x11-toolkits/qt32/pkg-plist b/x11-toolkits/qt32/pkg-plist
index 6c8919a2de9b..75c2940bfb6b 100644
--- a/x11-toolkits/qt32/pkg-plist
+++ b/x11-toolkits/qt32/pkg-plist
@@ -336,6 +336,10 @@ share/doc/qt2/html/debug.html
 share/doc/qt2/html/design.html
 share/doc/qt2/html/designer.html
 share/doc/qt2/html/designer.png
+share/doc/qt2/html/designer/arrows/home.png
+share/doc/qt2/html/designer/arrows/left.png
+share/doc/qt2/html/designer/arrows/right.png
+share/doc/qt2/html/designer/arrows/up.png
 share/doc/qt2/html/designer/book1.html
 share/doc/qt2/html/designer/chap10_1.html
 share/doc/qt2/html/designer/chap1_1.html
@@ -510,6 +514,7 @@ share/doc/qt2/html/functions.html
 share/doc/qt2/html/geomanagement.html
 share/doc/qt2/html/geometry.html
 share/doc/qt2/html/geometry.png
+share/doc/qt2/html/graph.g1n
 share/doc/qt2/html/grapher-grapher-cpp.html
 share/doc/qt2/html/gridlayout.png
 share/doc/qt2/html/groupbox-m.png
@@ -526,6 +531,7 @@ share/doc/qt2/html/iconview-main-cpp.html
 share/doc/qt2/html/iconview.html
 share/doc/qt2/html/imageio.html
 share/doc/qt2/html/images.html
+share/doc/qt2/html/index
 share/doc/qt2/html/index.html
 share/doc/qt2/html/install-qws.html
 share/doc/qt2/html/install-win.html
@@ -576,6 +582,7 @@ share/doc/qt2/html/primes.html
 share/doc/qt2/html/progress-progress-cpp.html
 share/doc/qt2/html/progressbar-main-cpp.html
 share/doc/qt2/html/properties.html
+share/doc/qt2/html/propertyindex
 share/doc/qt2/html/qabstractlayout-h.html
 share/doc/qt2/html/qaccel-h.html
 share/doc/qt2/html/qaccel-members.html
@@ -1653,6 +1660,7 @@ share/doc/qt2/html/threads.html
 share/doc/qt2/html/tictac-main-cpp.html
 share/doc/qt2/html/time.html
 share/doc/qt2/html/timers.html
+share/doc/qt2/html/titleindex
 share/doc/qt2/html/tools.html
 share/doc/qt2/html/tooltip-main-cpp.html
 share/doc/qt2/html/topicals.html
@@ -1663,6 +1671,7 @@ share/doc/qt2/html/tutorial.png
 share/doc/qt2/html/unicode.html
 share/doc/qt2/html/unsmooth.png
 share/doc/qt2/html/validator-main-cpp.html
+share/doc/qt2/html/whatsthis
 share/doc/qt2/html/whatsthis.png
 share/doc/qt2/html/winsystem.html
 share/doc/qt2/html/wizard-main-cpp.html
@@ -1672,8 +1681,15 @@ share/doc/qt2/html/xml-sax.html
 share/doc/qt2/html/xml.html
 share/doc/qt2/html/xt.html
 share/doc/qt2/html/y2k.html
-@dirrm share/doc/qt2/html/designer/stylesheet-images
+share/qt2/designer/templates/Configuration_Dialog.ui
+share/qt2/designer/templates/Dialog_with_Buttons_(Bottom).ui
+share/qt2/designer/templates/Dialog_with_Buttons_(Right).ui
+share/qt2/designer/templates/Tab-Dialog.ui
+@dirrm share/qt2/designer/templates
+@dirrm share/qt2/designer
+@dirrm share/qt2
 @dirrm share/doc/qt2/html/designer/figures
+@dirrm share/doc/qt2/html/designer/arrows
 @dirrm share/doc/qt2/html/designer
 @dirrm share/doc/qt2/html
 @dirrm share/doc/qt2
diff --git a/x11-toolkits/qt33/Makefile b/x11-toolkits/qt33/Makefile
index 3b638d903715..7afd742c3a2f 100644
--- a/x11-toolkits/qt33/Makefile
+++ b/x11-toolkits/qt33/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	qt
 PORTVERSION=	2.2.1
+PORTREVISION=	1
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	ftp://ftp.trolltech.com/qt/source/
 DISTNAME=	qt-x11-${PORTVERSION}
@@ -81,6 +82,7 @@ post-configure:
 
 do-install:
 	${MKDIR} ${PREFIX}/include/qt2
+	${MKDIR} ${PREFIX}/share/qt2/designer/templates
 .for BIN in designer moc2 uic
 	${INSTALL_PROGRAM} ${WRKSRC}/bin/${BIN} ${PREFIX}/bin
 .endfor
@@ -88,12 +90,19 @@ do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/bin/${SCRIPT} ${PREFIX}/bin
 .endfor
 	${INSTALL_DATA} ${WRKSRC}/include/*.h ${PREFIX}/include/qt2
+	${INSTALL_PROGRAM} ${WRKSRC}/lib/libqt2.so.4 ${PREFIX}/lib
+	${INSTALL_PROGRAM} ${WRKSRC}/lib/libqutil.so.1 ${PREFIX}/lib
+	${LN} -sf ${PREFIX}/lib/libqt2.so.4 ${PREFIX}/lib/libqt2.so
+	${LN} -sf ${PREFIX}/lib/libqutil.so.1 ${PREFIX}/lib/libqutil.so
+.if defined(WANT_STATIC)
 .for LIB in qt2 qutil
-	${INSTALL_DATA} ${WRKSRC}/lib/lib${LIB}* ${PREFIX}/lib
+	${INSTALL_DATA} ${WRKSRC}/lib/lib${LIB}.a ${PREFIX}/lib
 .endfor
+.endif
+	${INSTALL_DATA} ${WRKSRC}/tools/designer/templates/* \
+		${PREFIX}/share/qt2/designer/templates
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${PREFIX}/share/doc/qt2/html/designer/figures
-	${MKDIR} ${PREFIX}/share/doc/qt2/html/designer/stylesheet-images
+	${MKDIR} ${PREFIX}/share/doc/qt2
 	(cd ${WRKSRC} ; \
 	${INSTALL_DATA} ANNOUNCE ${PREFIX}/share/doc/qt2 ; \
 	${INSTALL_DATA} FAQ ${PREFIX}/share/doc/qt2 ; \
@@ -101,9 +110,8 @@ do-install:
 	${INSTALL_DATA} PORTING ${PREFIX}/share/doc/qt2 ; \
 	${INSTALL_DATA} README ${PREFIX}/share/doc/qt2 ; \
 	${INSTALL_DATA} README.QT ${PREFIX}/share/doc/qt2 ; \
-	${INSTALL_DATA} doc/html/*.html doc/html/*.png ${PREFIX}/share/doc/qt2/html ; \
-	${INSTALL_DATA} doc/html/designer/*.html ${PREFIX}/share/doc/qt2/html/designer ; \
-	${INSTALL_DATA} doc/html/designer/figures/* ${PREFIX}/share/doc/qt2/html/designer/figures ; \
+	( cd ${WRKSRC}/doc &&  ${TAR} -chf - html | \
+		${TAR} --unlink -xf - -C ${PREFIX}/share/doc/qt2 ) ; \
 	${INSTALL_MAN} doc/man/man3/q* ${PREFIX}/man/man3 )
 .endif
 
diff --git a/x11-toolkits/qt33/files/patch-aa b/x11-toolkits/qt33/files/patch-aa
index b95cbe905e2e..3d4d707124a0 100644
--- a/x11-toolkits/qt33/files/patch-aa
+++ b/x11-toolkits/qt33/files/patch-aa
@@ -1,6 +1,6 @@
---- configs/freebsd-g++-shared	Sun Sep 10 18:44:24 2000
-+++ configs/freebsd-g++-shared.new	Sun Sep 10 18:44:53 2000
-@@ -21,7 +21,7 @@
+--- configs/freebsd-g++-shared.orig	Wed Oct  4 12:55:10 2000
++++ configs/freebsd-g++-shared	Sat Nov 18 20:02:27 2000
+@@ -22,7 +22,7 @@
  SYSCONF_LIBS_X11	= -lXext -lX11 -lm
  # Qt, Qt+OpenGL
  SYSCONF_LFLAGS_QT	= -L$(QTDIR)/lib
@@ -9,7 +9,7 @@
  SYSCONF_LIBS_QT_OPENGL	= 
  # OpenGL
  SYSCONF_LFLAGS_OPENGL	= -L/usr/X11R6/lib
-@@ -44,7 +44,7 @@
+@@ -45,7 +45,7 @@
  SYSCONF_LIBS_THREAD	= 
  
  # Meta-object compiler
@@ -18,7 +18,7 @@
  
  # UI compiler
  SYSCONF_UIC		= $(QTDIR)/bin/uic
-@@ -55,16 +55,14 @@
+@@ -56,16 +56,14 @@
  #   - Usually needs to incorporate $(VER_MAJ), $(VER_MIN) and $(VER_PATCH)
  #
  SYSCONF_LINK_SHLIB	= g++
@@ -38,3 +38,14 @@
  
  # Linking static libraries
  #   - Build the $(TARGET) library, eg. lib$(TARGET).a
+@@ -76,8 +74,8 @@
+ SYSCONF_LINK_LIB_STATIC	= rm -f $(DESTDIR)$(SYSCONF_LINK_TARGET_STATIC) ; \
+ 				 $(SYSCONF_AR) $(DESTDIR)$(SYSCONF_LINK_TARGET_STATIC) $(OBJECTS) $(OBJMOC) 
+ # Compiling application source
+-SYSCONF_CXXFLAGS	= -pipe -O2
+-SYSCONF_CFLAGS		= -pipe -O2
++SYSCONF_CXXFLAGS	= -DQT_PREFIX=\"${PREFIX}\" -pipe -O2
++SYSCONF_CFLAGS		= -DQT_PREFIX=\"${PREFIX}\" -pipe -O2
+ # Default link type (static linking is still be used where required)
+ SYSCONF_LINK_LIB	= $(SYSCONF_LINK_LIB_SHARED)
+ SYSCONF_LINK_TARGET	= $(SYSCONF_LINK_TARGET_SHARED)
diff --git a/x11-toolkits/qt33/files/patch-af b/x11-toolkits/qt33/files/patch-af
index b231b8d9f0be..0e02a1aefefc 100644
--- a/x11-toolkits/qt33/files/patch-af
+++ b/x11-toolkits/qt33/files/patch-af
@@ -1,6 +1,6 @@
---- configs/freebsd-g++-static	Sat Sep 16 14:47:56 2000
-+++ configs/freebsd-g++-static.new	Sat Sep 16 14:48:06 2000
-@@ -21,7 +21,7 @@
+--- configs/freebsd-g++-static.orig	Wed Oct  4 12:55:09 2000
++++ configs/freebsd-g++-static	Sat Nov 18 20:02:46 2000
+@@ -22,7 +22,7 @@
  SYSCONF_LIBS_X11	= -lXext -lX11 -lm
  # Qt, Qt+OpenGL
  SYSCONF_LFLAGS_QT	= -L$(QTDIR)/lib
@@ -9,7 +9,7 @@
  SYSCONF_LIBS_QT_OPENGL	= 
  # OpenGL
  SYSCONF_LFLAGS_OPENGL	= -L/usr/X11R6/lib
-@@ -44,7 +44,7 @@
+@@ -45,7 +45,7 @@
  SYSCONF_LIBS_THREAD	= 
  
  # Meta-object compiler
@@ -18,3 +18,14 @@
  
  # UI compiler
  SYSCONF_UIC		= $(QTDIR)/bin/uic
+@@ -76,8 +76,8 @@
+ SYSCONF_LINK_LIB_STATIC	= rm -f $(DESTDIR)$(SYSCONF_LINK_TARGET_STATIC) ; \
+ 				 $(SYSCONF_AR) $(DESTDIR)$(SYSCONF_LINK_TARGET_STATIC) $(OBJECTS) $(OBJMOC) 
+ # Compiling application source
+-SYSCONF_CXXFLAGS	= -pipe -O2
+-SYSCONF_CFLAGS		= -pipe -O2
++SYSCONF_CXXFLAGS	= -DQT_PREFIX=\"${PREFIX}\" -pipe -O2
++SYSCONF_CFLAGS		= -DQT_PREFIX=\"${PREFIX}\" -pipe -O2
+ SYSCONF_LINK_LIB	= $(SYSCONF_LINK_LIB_STATIC)
+ SYSCONF_LINK_TARGET	= $(SYSCONF_LINK_TARGET_STATIC)
+ # Compiling library source
diff --git a/x11-toolkits/qt33/pkg-plist b/x11-toolkits/qt33/pkg-plist
index 6c8919a2de9b..75c2940bfb6b 100644
--- a/x11-toolkits/qt33/pkg-plist
+++ b/x11-toolkits/qt33/pkg-plist
@@ -336,6 +336,10 @@ share/doc/qt2/html/debug.html
 share/doc/qt2/html/design.html
 share/doc/qt2/html/designer.html
 share/doc/qt2/html/designer.png
+share/doc/qt2/html/designer/arrows/home.png
+share/doc/qt2/html/designer/arrows/left.png
+share/doc/qt2/html/designer/arrows/right.png
+share/doc/qt2/html/designer/arrows/up.png
 share/doc/qt2/html/designer/book1.html
 share/doc/qt2/html/designer/chap10_1.html
 share/doc/qt2/html/designer/chap1_1.html
@@ -510,6 +514,7 @@ share/doc/qt2/html/functions.html
 share/doc/qt2/html/geomanagement.html
 share/doc/qt2/html/geometry.html
 share/doc/qt2/html/geometry.png
+share/doc/qt2/html/graph.g1n
 share/doc/qt2/html/grapher-grapher-cpp.html
 share/doc/qt2/html/gridlayout.png
 share/doc/qt2/html/groupbox-m.png
@@ -526,6 +531,7 @@ share/doc/qt2/html/iconview-main-cpp.html
 share/doc/qt2/html/iconview.html
 share/doc/qt2/html/imageio.html
 share/doc/qt2/html/images.html
+share/doc/qt2/html/index
 share/doc/qt2/html/index.html
 share/doc/qt2/html/install-qws.html
 share/doc/qt2/html/install-win.html
@@ -576,6 +582,7 @@ share/doc/qt2/html/primes.html
 share/doc/qt2/html/progress-progress-cpp.html
 share/doc/qt2/html/progressbar-main-cpp.html
 share/doc/qt2/html/properties.html
+share/doc/qt2/html/propertyindex
 share/doc/qt2/html/qabstractlayout-h.html
 share/doc/qt2/html/qaccel-h.html
 share/doc/qt2/html/qaccel-members.html
@@ -1653,6 +1660,7 @@ share/doc/qt2/html/threads.html
 share/doc/qt2/html/tictac-main-cpp.html
 share/doc/qt2/html/time.html
 share/doc/qt2/html/timers.html
+share/doc/qt2/html/titleindex
 share/doc/qt2/html/tools.html
 share/doc/qt2/html/tooltip-main-cpp.html
 share/doc/qt2/html/topicals.html
@@ -1663,6 +1671,7 @@ share/doc/qt2/html/tutorial.png
 share/doc/qt2/html/unicode.html
 share/doc/qt2/html/unsmooth.png
 share/doc/qt2/html/validator-main-cpp.html
+share/doc/qt2/html/whatsthis
 share/doc/qt2/html/whatsthis.png
 share/doc/qt2/html/winsystem.html
 share/doc/qt2/html/wizard-main-cpp.html
@@ -1672,8 +1681,15 @@ share/doc/qt2/html/xml-sax.html
 share/doc/qt2/html/xml.html
 share/doc/qt2/html/xt.html
 share/doc/qt2/html/y2k.html
-@dirrm share/doc/qt2/html/designer/stylesheet-images
+share/qt2/designer/templates/Configuration_Dialog.ui
+share/qt2/designer/templates/Dialog_with_Buttons_(Bottom).ui
+share/qt2/designer/templates/Dialog_with_Buttons_(Right).ui
+share/qt2/designer/templates/Tab-Dialog.ui
+@dirrm share/qt2/designer/templates
+@dirrm share/qt2/designer
+@dirrm share/qt2
 @dirrm share/doc/qt2/html/designer/figures
+@dirrm share/doc/qt2/html/designer/arrows
 @dirrm share/doc/qt2/html/designer
 @dirrm share/doc/qt2/html
 @dirrm share/doc/qt2
author	sobomax <sobomax@FreeBSD.org>	2000-11-20 20:18:17 +0800
committer	sobomax <sobomax@FreeBSD.org>	2000-11-20 20:18:17 +0800
commit	dd9cc6c2f26ed9a52d93caa5aebe36e10622175e (patch)
tree	a061e0ee5ca30a22dbb87713eca0a84052caf38f
parent	5189ecaede09e87b1e7b92ffd0ec9fee4b34c561 (diff)
download	freebsd-ports-gnome-dd9cc6c2f26ed9a52d93caa5aebe36e10622175e.tar.gz freebsd-ports-gnome-dd9cc6c2f26ed9a52d93caa5aebe36e10622175e.tar.zst freebsd-ports-gnome-dd9cc6c2f26ed9a52d93caa5aebe36e10622175e.zip