5 files changed, 101 insertions, 82 deletions

diff --git a/x11-toolkits/qt31/Makefile b/x11-toolkits/qt31/Makefile
index 3fdceaa569b5..37da249651f1 100644
--- a/x11-toolkits/qt31/Makefile
+++ b/x11-toolkits/qt31/Makefile
@@ -6,17 +6,18 @@
 #
 
 PORTNAME=	qt
-PORTVERSION=	20000829A
+PORTVERSION=	2.2.0
 CATEGORIES=	x11-toolkits
-MASTER_SITES=	http://www.physics.purdue.edu/~will/
+MASTER_SITES=	ftp://ftp.trolltech.com/qt/source/
+DISTNAME=	qt-x11-2.2.0
 
 MAINTAINER=	will@FreeBSD.org
 
 LIB_DEPENDS=	png.4:${PORTSDIR}/graphics/png \
 		jpeg.9:${PORTSDIR}/graphics/jpeg
 
+WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 USE_MESA=	yes
-USE_BZIP2=	yes
 NO_LATEST_LINK=	yes
 USE_GMAKE=	yes
 USE_X_PREFIX=	yes
@@ -54,17 +55,15 @@ pre-configure:
 		${SED} -e "s,/usr/X11R6,${X11BASE},g" | ${SED} -e "s,-pipe -O2,${CXXFLAGS},g" > ${CONFIG}
 	${PERL} -pi -e "s@VER_MAJ = 2@VER_MAJ = 4@g" ${WRKSRC}/src/Makefile.in
 	${PERL} -pi -e "s@TARGET	= qt@TARGET = qt2@g" ${WRKSRC}/src/Makefile.in
-	${PERL} -pi -e "s@TARGET  = moc@TARGET = moc2@g" ${WRKSRC}/src/moc/Makefile.in
-	${PERL} -pi -e "s@cp src/moc/moc bin/moc@cp src/moc/moc  bin/moc2@g" ${WRKSRC}/Makefile
-	${PERL} -pi -e "s@symlinks  moc src-mt src tools tutorial examples@symlinks moc src-mt src tools@g" ${WRKSRC}/Makefile
+	${PERL} -pi -e "s@TARGET\t= moc@TARGET = moc2@g" ${WRKSRC}/src/moc/Makefile.in
+	${PERL} -pi -e "s@rm -f bin/moc@rm -f bin/moc2@g" ${WRKSRC}/Makefile
+	${PERL} -pi -e "s@cp src/moc/moc bin/moc@cp src/moc/moc2  bin/moc2@g" ${WRKSRC}/Makefile
+	${PERL} -pi -e "s@symlinks  src-moc src-mt sub-src sub-tools sub-tutorial sub-examples@symlinks src-moc src-mt sub-src sub-tools@g" ${WRKSRC}/Makefile
 	${PERL} -pi -e "s@-L../lib@-L${WRKSRC}/lib@g" ${WRKSRC}/tools/designer/uic/Makefile.in
 
 post-configure:
 	@(cd ${WRKSRC} ; ${GMAKE} symlinks)
 
-pre-install:
-	@(find ${WRKSRC} -name CVS | xargs rm -rf)
-
 do-install:
 	${MKDIR} ${PREFIX}/include/qt2
 .for BIN in designer moc2 uic
@@ -87,9 +86,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 doc/html/*.jpg ${PREFIX}/share/doc/qt2/html ; \
+	${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/stylesheet-images/* ${PREFIX}/share/doc/qt2/html/designer/stylesheet-images ; \
 	${INSTALL_DATA} doc/html/designer/figures/* ${PREFIX}/share/doc/qt2/html/designer/figures ; \
 	${INSTALL_MAN} doc/man/man3/q* ${PREFIX}/man/man3 )
 .endif
diff --git a/x11-toolkits/qt31/distinfo b/x11-toolkits/qt31/distinfo
index fd457316a45d..b9d619b47258 100644
--- a/x11-toolkits/qt31/distinfo
+++ b/x11-toolkits/qt31/distinfo
@@ -1 +1 @@
-MD5 (qt-20000829A.tar.bz2) = 273445b4aaa4eef58acb908b20794e2f
+MD5 (qt-x11-2.2.0.tar.gz) = dd0a736e44a6a2229ade3822e94b86ef
diff --git a/x11-toolkits/qt31/files/manpages b/x11-toolkits/qt31/files/manpages
index e29522f6b5cb..27329053a55a 100644
--- a/x11-toolkits/qt31/files/manpages
+++ b/x11-toolkits/qt31/files/manpages
@@ -47,7 +47,6 @@ qcolordrag.3qt \
 qcolorgroup.3qt \
 qcombobox.3qt \
 qcommonstyle.3qt \
-qcondition.3qt \
 qconststring.3qt \
 qcstring.3qt \
 qcursor.3qt \
@@ -289,6 +288,7 @@ qtranslator.3qt \
 qtsciicodec.3qt \
 quridrag.3qt \
 qurl.3qt \
+qtranslatormessage.3qt \
 qurloperator.3qt \
 qvalidator.3qt \
 qvaluelist.3qt \
@@ -303,6 +303,7 @@ qvector.3qt \
 qvgroupbox.3qt \
 qwhatsthis.3qt \
 qwheelevent.3qt \
+qwaitcondition.3qt \
 qwidget.3qt \
 qwidgetitem.3qt \
 qwidgetstack.3qt \
diff --git a/x11-toolkits/qt31/files/patch-aa b/x11-toolkits/qt31/files/patch-aa
index 3fa5dacea8c5..b95cbe905e2e 100644
--- a/x11-toolkits/qt31/files/patch-aa
+++ b/x11-toolkits/qt31/files/patch-aa
@@ -1,5 +1,5 @@
---- configs/freebsd-g++-shared	Tue Aug 22 03:11:09 2000
-+++ configs/freebsd-g++-shared.new	Sat Aug 26 09:50:52 2000
+--- 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 @@
  SYSCONF_LIBS_X11	= -lXext -lX11 -lm
  # Qt, Qt+OpenGL
@@ -18,7 +18,7 @@
  
  # UI compiler
  SYSCONF_UIC		= $(QTDIR)/bin/uic
-@@ -55,16 +55,15 @@
+@@ -55,16 +55,14 @@
  #   - Usually needs to incorporate $(VER_MAJ), $(VER_MIN) and $(VER_PATCH)
  #
  SYSCONF_LINK_SHLIB	= g++
@@ -26,7 +26,6 @@
 +SYSCONF_LINK_TARGET_SHARED	= lib$(TARGET).so.$(VER_MAJ)
  SYSCONF_LINK_LIB_SHARED	=  $(SYSCONF_LINK_SHLIB) -shared  \
  				     $(LFLAGS) -o $(SYSCONF_LINK_TARGET_SHARED) \
-+				     -Wl,-soname,$(SYSCONF_LINK_TARGET_SHARED) \
  				     $(OBJECTS) $(OBJMOC) $(LIBS) && \
  				 mv $(SYSCONF_LINK_TARGET_SHARED) $(DESTDIR); \
  				 cd $(DESTDIR) && \
@@ -34,7 +33,7 @@
 -				 ln -s $(SYSCONF_LINK_TARGET_SHARED) lib$(TARGET).so; \
 -				 ln -s $(SYSCONF_LINK_TARGET_SHARED) lib$(TARGET).so.$(VER_MAJ); \
 -				 ln -s $(SYSCONF_LINK_TARGET_SHARED) lib$(TARGET).so.$(VER_MAJ).$(VER_MIN)
-+				 rm -f lib$(TARGET).so; \
++				 rm -f lib$(TARGET).so;\
 +				 ln -s $(SYSCONF_LINK_TARGET_SHARED) lib$(TARGET).so
  
  # Linking static libraries
diff --git a/x11-toolkits/qt31/pkg-plist b/x11-toolkits/qt31/pkg-plist
index e19c6deda73b..389dc2fa1fd6 100644
--- a/x11-toolkits/qt31/pkg-plist
+++ b/x11-toolkits/qt31/pkg-plist
@@ -4,6 +4,10 @@ bin/moc2
 bin/qt20fix
 bin/qtrename140
 bin/uic
+include/qt2/jri.h
+include/qt2/jritypes.h
+include/qt2/npapi.h
+include/qt2/npupp.h
 include/qt2/q1xcompatibility.h
 include/qt2/qabstractlayout.h
 include/qt2/qaccel.h
@@ -145,6 +149,7 @@ include/qt2/qmultilineedit.h
 include/qt2/qnamespace.h
 include/qt2/qnetwork.h
 include/qt2/qnetworkprotocol.h
+include/qt2/qnp.h
 include/qt2/qobjcoll.h
 include/qt2/qobjdefs.h
 include/qt2/qobject.h
@@ -287,8 +292,6 @@ share/doc/qt2/PORTING
 share/doc/qt2/README
 share/doc/qt2/README.QT
 share/doc/qt2/html/HOWTO-framebuffer.html
-share/doc/qt2/html/XML-SAX.html
-share/doc/qt2/html/XML.html
 share/doc/qt2/html/aboutqt.html
 share/doc/qt2/html/abstractwidgets.html
 share/doc/qt2/html/accelerators.html
@@ -333,52 +336,95 @@ share/doc/qt2/html/design.html
 share/doc/qt2/html/designer.html
 share/doc/qt2/html/designer.png
 share/doc/qt2/html/designer/book1.html
-share/doc/qt2/html/designer/c23.html
-share/doc/qt2/html/designer/c289.html
-share/doc/qt2/html/designer/c291.html
-share/doc/qt2/html/designer/c33.html
-share/doc/qt2/html/designer/c498.html
-share/doc/qt2/html/designer/c502.html
-share/doc/qt2/html/designer/c638.html
-share/doc/qt2/html/designer/c645.html
-share/doc/qt2/html/designer/c654.html
-share/doc/qt2/html/designer/c657.html
-share/doc/qt2/html/designer/c660.html
-share/doc/qt2/html/designer/c663.html
-share/doc/qt2/html/designer/c906.html
-share/doc/qt2/html/designer/c909.html
-share/doc/qt2/html/designer/c912.html
-share/doc/qt2/html/designer/c915.html
-share/doc/qt2/html/designer/c918.html
-share/doc/qt2/html/designer/f2.html
+share/doc/qt2/html/designer/chap10_1.html
+share/doc/qt2/html/designer/chap1_1.html
+share/doc/qt2/html/designer/chap2_1.html
+share/doc/qt2/html/designer/chap2_2.html
+share/doc/qt2/html/designer/chap2_3.html
+share/doc/qt2/html/designer/chap2_4.html
+share/doc/qt2/html/designer/chap3_1.html
+share/doc/qt2/html/designer/chap3_2.html
+share/doc/qt2/html/designer/chap3_3.html
+share/doc/qt2/html/designer/chap3_4.html
+share/doc/qt2/html/designer/chap4_1.html
+share/doc/qt2/html/designer/chap4_2.html
+share/doc/qt2/html/designer/chap5_1.html
+share/doc/qt2/html/designer/chap5_2.html
+share/doc/qt2/html/designer/chap5_3.html
+share/doc/qt2/html/designer/chap5_4.html
+share/doc/qt2/html/designer/chap5_5.html
+share/doc/qt2/html/designer/chap5_6.html
+share/doc/qt2/html/designer/chap6_1.html
+share/doc/qt2/html/designer/chap6_2.html
+share/doc/qt2/html/designer/chap6_3.html
+share/doc/qt2/html/designer/chap6_4.html
+share/doc/qt2/html/designer/chap6_5.html
+share/doc/qt2/html/designer/chap6_6.html
+share/doc/qt2/html/designer/chap6_7.html
+share/doc/qt2/html/designer/chap7_1.html
+share/doc/qt2/html/designer/chap7_10.html
+share/doc/qt2/html/designer/chap7_11.html
+share/doc/qt2/html/designer/chap7_12.html
+share/doc/qt2/html/designer/chap7_13.html
+share/doc/qt2/html/designer/chap7_14.html
+share/doc/qt2/html/designer/chap7_15.html
+share/doc/qt2/html/designer/chap7_16.html
+share/doc/qt2/html/designer/chap7_2.html
+share/doc/qt2/html/designer/chap7_3.html
+share/doc/qt2/html/designer/chap7_4.html
+share/doc/qt2/html/designer/chap7_5.html
+share/doc/qt2/html/designer/chap7_6.html
+share/doc/qt2/html/designer/chap7_7.html
+share/doc/qt2/html/designer/chap7_8.html
+share/doc/qt2/html/designer/chap7_9.html
+share/doc/qt2/html/designer/chap8_1.html
+share/doc/qt2/html/designer/chap9_1.html
+share/doc/qt2/html/designer/chap9_2.html
+share/doc/qt2/html/designer/chap9_3.html
+share/doc/qt2/html/designer/chap9_4.html
+share/doc/qt2/html/designer/chap9_5.html
+share/doc/qt2/html/designer/chap9_6.html
+share/doc/qt2/html/designer/colophon.html
+share/doc/qt2/html/designer/feedback.html
+share/doc/qt2/html/designer/figures/aboutdialog.png
 share/doc/qt2/html/designer/figures/adjustsize.png
 share/doc/qt2/html/designer/figures/breaklayout.png
 share/doc/qt2/html/designer/figures/buttongroup.png
 share/doc/qt2/html/designer/figures/buttongroupovercheckboxes.png
 share/doc/qt2/html/designer/figures/checkbox.png
 share/doc/qt2/html/designer/figures/combobox.png
+share/doc/qt2/html/designer/figures/connectionedit.png
 share/doc/qt2/html/designer/figures/connections.png
+share/doc/qt2/html/designer/figures/connectionviewer.png
 share/doc/qt2/html/designer/figures/connecttool.png
 share/doc/qt2/html/designer/figures/customwidget.png
+share/doc/qt2/html/designer/figures/customwidgets.png
 share/doc/qt2/html/designer/figures/editcopy.png
 share/doc/qt2/html/designer/figures/editcustomwidgets.png
 share/doc/qt2/html/designer/figures/editcut.png
 share/doc/qt2/html/designer/figures/editdelete.png
 share/doc/qt2/html/designer/figures/editgrid.png
 share/doc/qt2/html/designer/figures/edithlayout.png
+share/doc/qt2/html/designer/figures/editiconview.png
+share/doc/qt2/html/designer/figures/editlistbox.png
+share/doc/qt2/html/designer/figures/editlistview.png
 share/doc/qt2/html/designer/figures/editlower.png
+share/doc/qt2/html/designer/figures/editmultiline.png
 share/doc/qt2/html/designer/figures/editpaste.png
 share/doc/qt2/html/designer/figures/editraise.png
 share/doc/qt2/html/designer/figures/editslots.png
 share/doc/qt2/html/designer/figures/emptydialog.png
+share/doc/qt2/html/designer/figures/f001.png
 share/doc/qt2/html/designer/figures/filenew.png
 share/doc/qt2/html/designer/figures/filesave.png
 share/doc/qt2/html/designer/figures/firstdialog.png
 share/doc/qt2/html/designer/figures/form.png
+share/doc/qt2/html/designer/figures/formsettings.png
 share/doc/qt2/html/designer/figures/fourcheckboxes.png
 share/doc/qt2/html/designer/figures/frame.png
 share/doc/qt2/html/designer/figures/groupbox.png
 share/doc/qt2/html/designer/figures/help.png
+share/doc/qt2/html/designer/figures/helpdialog.png
 share/doc/qt2/html/designer/figures/home.png
 share/doc/qt2/html/designer/figures/iconview.png
 share/doc/qt2/html/designer/figures/image.png
@@ -407,11 +453,15 @@ share/doc/qt2/html/designer/figures/newformdialog.png
 share/doc/qt2/html/designer/figures/objecthierarchy.png
 share/doc/qt2/html/designer/figures/onecheckbox.png
 share/doc/qt2/html/designer/figures/ordertool.png
+share/doc/qt2/html/designer/figures/paletteeditor.png
 share/doc/qt2/html/designer/figures/pixlabel.png
+share/doc/qt2/html/designer/figures/pizza1screenshot.png
 share/doc/qt2/html/designer/figures/pointer.png
+share/doc/qt2/html/designer/figures/preferences.png
 share/doc/qt2/html/designer/figures/print.png
 share/doc/qt2/html/designer/figures/progress.png
 share/doc/qt2/html/designer/figures/pushbutton.png
+share/doc/qt2/html/designer/figures/qtlogo.png
 share/doc/qt2/html/designer/figures/radiobutton.png
 share/doc/qt2/html/designer/figures/redo.png
 share/doc/qt2/html/designer/figures/right.png
@@ -425,49 +475,15 @@ share/doc/qt2/html/designer/figures/tabwidget.png
 share/doc/qt2/html/designer/figures/testmode.png
 share/doc/qt2/html/designer/figures/textbrowser.png
 share/doc/qt2/html/designer/figures/textview.png
+share/doc/qt2/html/designer/figures/title.png
 share/doc/qt2/html/designer/figures/toolbutton.png
+share/doc/qt2/html/designer/figures/topicchooser.png
 share/doc/qt2/html/designer/figures/undo.png
 share/doc/qt2/html/designer/figures/vlayout.png
-share/doc/qt2/html/designer/i666.html
-share/doc/qt2/html/designer/i921.html
-share/doc/qt2/html/designer/p21.html
-share/doc/qt2/html/designer/p652.html
-share/doc/qt2/html/designer/p904.html
-share/doc/qt2/html/designer/qt-designer-sec-layoutmanagement.html
-share/doc/qt2/html/designer/stylesheet-images/caution.gif
-share/doc/qt2/html/designer/stylesheet-images/home.gif
-share/doc/qt2/html/designer/stylesheet-images/important.gif
-share/doc/qt2/html/designer/stylesheet-images/next.gif
-share/doc/qt2/html/designer/stylesheet-images/note.gif
-share/doc/qt2/html/designer/stylesheet-images/prev.gif
-share/doc/qt2/html/designer/stylesheet-images/tip.gif
-share/doc/qt2/html/designer/stylesheet-images/toc-blank.gif
-share/doc/qt2/html/designer/stylesheet-images/toc-minus.gif
-share/doc/qt2/html/designer/stylesheet-images/toc-plus.gif
-share/doc/qt2/html/designer/stylesheet-images/up.gif
-share/doc/qt2/html/designer/stylesheet-images/warning.gif
-share/doc/qt2/html/designer/x12.html
-share/doc/qt2/html/designer/x17.html
-share/doc/qt2/html/designer/x180.html
-share/doc/qt2/html/designer/x182.html
-share/doc/qt2/html/designer/x233.html
-share/doc/qt2/html/designer/x235.html
-share/doc/qt2/html/designer/x270.html
-share/doc/qt2/html/designer/x272.html
-share/doc/qt2/html/designer/x324.html
-share/doc/qt2/html/designer/x326.html
-share/doc/qt2/html/designer/x438.html
-share/doc/qt2/html/designer/x442.html
-share/doc/qt2/html/designer/x479.html
-share/doc/qt2/html/designer/x483.html
-share/doc/qt2/html/designer/x604.html
-share/doc/qt2/html/designer/x608.html
-share/doc/qt2/html/designer/x643.html
-share/doc/qt2/html/designer/x649.html
-share/doc/qt2/html/designer/x701.html
-share/doc/qt2/html/designer/x778.html
-share/doc/qt2/html/designer/x851.html
-share/doc/qt2/html/designer/x869.html
+share/doc/qt2/html/designer/figures/whatsthis.png
+share/doc/qt2/html/designer/part1index.html
+share/doc/qt2/html/designer/part2index.html
+share/doc/qt2/html/designer/preface.html
 share/doc/qt2/html/desktop-desktop-cpp.html
 share/doc/qt2/html/dialogs.html
 share/doc/qt2/html/dirview-main-cpp.html
@@ -511,6 +527,8 @@ share/doc/qt2/html/imageio.html
 share/doc/qt2/html/images.html
 share/doc/qt2/html/index.html
 share/doc/qt2/html/install-qws.html
+share/doc/qt2/html/install-win.html
+share/doc/qt2/html/install-x11.html
 share/doc/qt2/html/installation.html
 share/doc/qt2/html/io.html
 share/doc/qt2/html/keyfeatures21.html
@@ -694,8 +712,6 @@ share/doc/qt2/html/qcombobox.html
 share/doc/qt2/html/qcommonstyle-h.html
 share/doc/qt2/html/qcommonstyle-members.html
 share/doc/qt2/html/qcommonstyle.html
-share/doc/qt2/html/qcondition-members.html
-share/doc/qt2/html/qcondition.html
 share/doc/qt2/html/qconnection-h.html
 share/doc/qt2/html/qconnection-members.html
 share/doc/qt2/html/qconnection.html
@@ -1408,6 +1424,8 @@ share/doc/qt2/html/qtooltipgroup.html
 share/doc/qt2/html/qtranslator-h.html
 share/doc/qt2/html/qtranslator-members.html
 share/doc/qt2/html/qtranslator.html
+share/doc/qt2/html/qtranslatormessage-members.html
+share/doc/qt2/html/qtranslatormessage.html
 share/doc/qt2/html/qtsciicodec-h.html
 share/doc/qt2/html/qtsciicodec-members.html
 share/doc/qt2/html/qtsciicodec.html
@@ -1456,6 +1474,8 @@ share/doc/qt2/html/qvfb-qws.html
 share/doc/qt2/html/qvgroupbox-h.html
 share/doc/qt2/html/qvgroupbox-members.html
 share/doc/qt2/html/qvgroupbox.html
+share/doc/qt2/html/qwaitcondition-members.html
+share/doc/qt2/html/qwaitcondition.html
 share/doc/qt2/html/qwerty-main-cpp.html
 share/doc/qt2/html/qwhatsthis-h.html
 share/doc/qt2/html/qwhatsthis-members.html
@@ -1627,6 +1647,7 @@ share/doc/qt2/html/table.html
 share/doc/qt2/html/test.png
 share/doc/qt2/html/tetrix-tetrix-cpp.html
 share/doc/qt2/html/themes-main-cpp.html
+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
@@ -1635,8 +1656,6 @@ share/doc/qt2/html/tooltip-main-cpp.html
 share/doc/qt2/html/topicals.html
 share/doc/qt2/html/trivial-trivial-cpp.html
 share/doc/qt2/html/troll.html
-share/doc/qt2/html/ttlogo-small.jpg
-share/doc/qt2/html/ttlogo-small.png
 share/doc/qt2/html/tutorial.html
 share/doc/qt2/html/tutorial.png
 share/doc/qt2/html/unicode.html
@@ -1647,6 +1666,8 @@ share/doc/qt2/html/winsystem.html
 share/doc/qt2/html/wizard-main-cpp.html
 share/doc/qt2/html/workspace.html
 share/doc/qt2/html/xform-xform-cpp.html
+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