Update to Qt Free Edition version 2.1.0 Beta 2.

1) Bump lib's version, since qt-2.1.0 loses lower compatibility
   with qt-2.0.2 but has only upper compatibility. (new qt binary
   does not work with old qt library)

2) Install libqgl.a (it works with its examples) in addition to libqt,
   so added LIB_DEPENDS to MesaGL.

3) JPEG support from extension had been included to the main library.

4) 'examples' and 'tutorials' are no longer built with port building,
   since they are never installed. If you want them, set
   QTDIR=/usr/ports/x11-toolkits/qt21/work and just type 'gmake' in each
   directories.

Some ideas obtained from qt145. :)

2 files changed, 34 insertions, 51 deletions

diff --git a/x11-toolkits/qt23/files/manpages b/x11-toolkits/qt23/files/manpages
index 6b77b5e..de362d1 100644
--- a/x11-toolkits/qt23/files/manpages
+++ b/x11-toolkits/qt23/files/manpages
@@ -1,4 +1,3 @@
-MAN1=	moc2.1
 MAN3=	\
 qaccel.3qt \
 qapplication.3qt \
@@ -16,10 +15,12 @@ qbrush.3qt \
 qbuffer.3qt \
 qbutton.3qt \
 qbuttongroup.3qt \
+qbytearray.3qt \
 qcache.3qt \
 qcacheiterator.3qt \
 qcdestyle.3qt \
 qchar.3qt \
+qcharref.3qt \
 qcheckbox.3qt \
 qchecklistitem.3qt \
 qchildevent.3qt \
@@ -28,14 +29,15 @@ qcloseevent.3qt \
 qcollection.3qt \
 qcolor.3qt \
 qcolordialog.3qt \
+qcolordrag.3qt \
 qcolorgroup.3qt \
 qcombobox.3qt \
 qcommonstyle.3qt \
-qconnection.3qt \
 qconststring.3qt \
 qcstring.3qt \
 qcursor.3qt \
 qcustomevent.3qt \
+qcustommenuitem.3qt \
 qdatapump.3qt \
 qdatasink.3qt \
 qdatasource.3qt \
@@ -53,6 +55,7 @@ qdragmoveevent.3qt \
 qdragobject.3qt \
 qdropevent.3qt \
 qdropsite.3qt \
+qeucjpcodec.3qt \
 qevent.3qt \
 qfile.3qt \
 qfiledialog.3qt \
@@ -61,11 +64,13 @@ qfileinfo.3qt \
 qfocusdata.3qt \
 qfocusevent.3qt \
 qfont.3qt \
+qfontdatabase.3qt \
 qfontdialog.3qt \
 qfontinfo.3qt \
 qfontmetrics.3qt \
 qframe.3qt \
 qgarray.3qt \
+qgbkcodec.3qt \
 qgcache.3qt \
 qgcacheiterator.3qt \
 qgdict.3qt \
@@ -80,13 +85,19 @@ qglwidget.3qt \
 qgrid.3qt \
 qgridlayout.3qt \
 qgroupbox.3qt \
+qguardedptr.3qt \
+qgvector.3qt \
 qhbox.3qt \
 qhboxlayout.3qt \
 qhbuttongroup.3qt \
 qheader.3qt \
 qhgroupbox.3qt \
 qhideevent.3qt \
+qicondrag.3qt \
+qicondragitem.3qt \
 qiconset.3qt \
+qiconview.3qt \
+qiconviewitem.3qt \
 qimage.3qt \
 qimageconsumer.3qt \
 qimagedecoder.3qt \
@@ -94,6 +105,7 @@ qimagedrag.3qt \
 qimageformat.3qt \
 qimageformattype.3qt \
 qimageio.3qt \
+qinputdialog.3qt \
 qintcache.3qt \
 qintcacheiterator.3qt \
 qintdict.3qt \
@@ -101,6 +113,8 @@ qintdictiterator.3qt \
 qintvalidator.3qt \
 qiodevice.3qt \
 qiodevicesource.3qt \
+qjiscodec.3qt \
+qjpunicodeconv.3qt \
 qkeyevent.3qt \
 qlabel.3qt \
 qlayout.3qt \
@@ -118,6 +132,7 @@ qlistview.3qt \
 qlistviewitem.3qt \
 qlistviewitemiterator.3qt \
 qlnode.3qt \
+qlocalfs.3qt \
 qmainwindow.3qt \
 qmap.3qt \
 qmapconstiterator.3qt \
@@ -125,6 +140,8 @@ qmapiterator.3qt \
 qmenubar.3qt \
 qmenudata.3qt \
 qmessagebox.3qt \
+qmetaobject.3qt \
+qmetaproperty.3qt \
 qmimesource.3qt \
 qmimesourcefactory.3qt \
 qmotifstyle.3qt \
@@ -132,6 +149,8 @@ qmouseevent.3qt \
 qmoveevent.3qt \
 qmovie.3qt \
 qmultilineedit.3qt \
+qnetworkoperation.3qt \
+qnetworkprotocol.3qt \
 qnpinstance.3qt \
 qnplugin.3qt \
 qnpstream.3qt \
@@ -167,7 +186,6 @@ qresizeevent.3qt \
 qscrollbar.3qt \
 qscrollview.3qt \
 qsemimodal.3qt \
-qserversocket.3qt \
 qsessionmanager.3qt \
 qshared.3qt \
 qshowevent.3qt \
@@ -178,8 +196,6 @@ qsize.3qt \
 qsizegrip.3qt \
 qsizepolicy.3qt \
 qslider.3qt \
-qsocket.3qt \
-qsocketaddress.3qt \
 qsocketnotifier.3qt \
 qsortedlist.3qt \
 qspaceritem.3qt \
@@ -192,6 +208,7 @@ qstrilist.3qt \
 qstring.3qt \
 qstringlist.3qt \
 qstrlist.3qt \
+qstrlistiterator.3qt \
 qstyle.3qt \
 qstylesheet.3qt \
 qstylesheetitem.3qt \
@@ -219,13 +236,17 @@ qtooltip.3qt \
 qtooltipgroup.3qt \
 qtranslator.3qt \
 quridrag.3qt \
+qurl.3qt \
+qurloperator.3qt \
 qvalidator.3qt \
 qvaluelist.3qt \
 qvaluelistconstiterator.3qt \
 qvaluelistiterator.3qt \
+qvaluestack.3qt \
 qvbox.3qt \
 qvboxlayout.3qt \
 qvbuttongroup.3qt \
+qvector.3qt \
 qvgroupbox.3qt \
 qwhatsthis.3qt \
 qwheelevent.3qt \
diff --git a/x11-toolkits/qt23/files/patch-aa b/x11-toolkits/qt23/files/patch-aa
index 4adebbf..a18a37d 100644
--- a/x11-toolkits/qt23/files/patch-aa
+++ b/x11-toolkits/qt23/files/patch-aa
@@ -1,26 +1,6 @@
---- configs/freebsd-g++-shared.orig	Fri Sep 24 18:21:55 1999
-+++ configs/freebsd-g++-shared	Fri Oct  1 22:07:46 1999
-@@ -1,33 +1,33 @@
- # Compiling
--SYSCONF_CXX		= g++
--SYSCONF_CC		= gcc
-+SYSCONF_CXX		= $(SYS_CXX)
-+SYSCONF_CC		= $(SYS_CC)
- 
- # Compiling with support libraries
--SYSCONF_CXXFLAGS_X11	= -I/usr/X11R6/include
-+SYSCONF_CXXFLAGS_X11	= -I$(X11BASE)/include
- SYSCONF_CXXFLAGS_QT	= -I$(QTDIR)/include
--SYSCONF_CXXFLAGS_OPENGL	= -I/usr/X11R6/include
-+SYSCONF_CXXFLAGS_OPENGL	= -I$(X11BASE)/include
- 
- # Compiline YACC output
- SYSCONF_CXXFLAGS_YACC     = -Wno-unused -Wno-parentheses
- 
- # Linking with support libraries
- # X11
--SYSCONF_LFLAGS_X11	= -L/usr/X11R6/lib
-+SYSCONF_LFLAGS_X11	= -L$(X11BASE)/lib
+--- configs/freebsd-g++-shared.orig	Thu Feb 17 01:55:56 2000
++++ configs/freebsd-g++-shared	Sat Feb 26 20:25:51 2000
+@@ -16,7 +16,7 @@
  SYSCONF_LIBS_X11	= -lXext -lX11 -lm
  # Qt, Qt+OpenGL
  SYSCONF_LFLAGS_QT	= -L$(QTDIR)/lib
@@ -28,28 +8,21 @@
 +SYSCONF_LIBS_QT		= -lqt2
  SYSCONF_LIBS_QT_OPENGL	= -lqgl
  # OpenGL
--SYSCONF_LFLAGS_OPENGL	= -L/usr/X11R6/lib
-+SYSCONF_LFLAGS_OPENGL	= -L$(X11BASE)/lib
- SYSCONF_LIBS_OPENGL	= -lMesaGL -lMesaGLU -lXmu
- # Yacc
- SYSCONF_LIBS_YACC	= 
- 
+ SYSCONF_LFLAGS_OPENGL	= -L/usr/X11R6/lib
+@@ -27,7 +27,7 @@
  # Linking applications
--SYSCONF_LINK		= g++
-+SYSCONF_LINK		= $(SYS_CXX)
+ SYSCONF_LINK		= g++
  SYSCONF_LFLAGS		= 
 -SYSCONF_LIBS		= 
 +SYSCONF_LIBS		= -lxpg4
  
  # Link flags shared objects
  SYSCONF_LFLAGS_SHOBJ	= -shared
-@@ -40,17 +40,27 @@
- #   - Place target in $(DESTDIR) - which has a trailing /
+@@ -41,16 +41,26 @@
  #   - Usually needs to incorporate $(VER_MAJ), $(VER_MIN) and $(VER_PATCH)
  #
--SYSCONF_LINK_SHLIB	= g++
+ SYSCONF_LINK_SHLIB	= g++
 -SYSCONF_LINK_TARGET_SHARED	= lib$(TARGET).so.$(VER_MAJ).$(VER_MIN).$(VER_PATCH)
-+SYSCONF_LINK_SHLIB	= $(SYS_CXX)
 +ifeq ($(PORTOBJFORMAT),elf)
 +SYSCONF_LINK_TARGET_SHARED	= lib$(TARGET).so.$(VER_MAJ)
  SYSCONF_LINK_LIB_SHARED	=  $(SYSCONF_LINK_SHLIB) -shared  \
@@ -77,14 +50,3 @@
  
  # Linking static libraries
  #   - Build the $(TARGET) library, eg. lib$(TARGET).a
-@@ -61,8 +71,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	= $(SYS_CXXFLAGS)
-+SYSCONF_CFLAGS		= $(SYS_CXXFLAGS)
- # Compiling library source
- SYSCONF_CXXFLAGS_LIB	= -fPIC
- SYSCONF_CFLAGS_LIB	= -fPIC