2 files changed, 285 insertions, 45 deletions

diff --git a/x11-toolkits/qt23/files/manpages b/x11-toolkits/qt23/files/manpages
new file mode 100644
index 000000000000..8af672302e06
--- /dev/null
+++ b/x11-toolkits/qt23/files/manpages
@@ -0,0 +1,236 @@
+MAN1=	moc2.1
+MAN3=	\
+qaccel.3qt \
+qapplication.3qt \
+qarray.3qt \
+qasciicache.3qt \
+qasciicacheiterator.3qt \
+qasciidict.3qt \
+qasciidictiterator.3qt \
+qasyncio.3qt \
+qbitarray.3qt \
+qbitmap.3qt \
+qbitval.3qt \
+qboxlayout.3qt \
+qbrush.3qt \
+qbuffer.3qt \
+qbutton.3qt \
+qbuttongroup.3qt \
+qcache.3qt \
+qcacheiterator.3qt \
+qcdestyle.3qt \
+qchar.3qt \
+qcheckbox.3qt \
+qchecklistitem.3qt \
+qchildevent.3qt \
+qclipboard.3qt \
+qcloseevent.3qt \
+qcollection.3qt \
+qcolor.3qt \
+qcolordialog.3qt \
+qcolorgroup.3qt \
+qcombobox.3qt \
+qcommonstyle.3qt \
+qconnection.3qt \
+qconststring.3qt \
+qcstring.3qt \
+qcursor.3qt \
+qcustomevent.3qt \
+qdatapump.3qt \
+qdatasink.3qt \
+qdatasource.3qt \
+qdatastream.3qt \
+qdate.3qt \
+qdatetime.3qt \
+qdialog.3qt \
+qdict.3qt \
+qdictiterator.3qt \
+qdir.3qt \
+qdoublevalidator.3qt \
+qdragenterevent.3qt \
+qdragleaveevent.3qt \
+qdragmoveevent.3qt \
+qdragobject.3qt \
+qdropevent.3qt \
+qdropsite.3qt \
+qevent.3qt \
+qfile.3qt \
+qfiledialog.3qt \
+qfileiconprovider.3qt \
+qfileinfo.3qt \
+qfocusdata.3qt \
+qfocusevent.3qt \
+qfont.3qt \
+qfontdialog.3qt \
+qfontinfo.3qt \
+qfontmetrics.3qt \
+qframe.3qt \
+qgarray.3qt \
+qgcache.3qt \
+qgcacheiterator.3qt \
+qgdict.3qt \
+qgdictiterator.3qt \
+qgl.3qt \
+qglayoutiterator.3qt \
+qglcontext.3qt \
+qglformat.3qt \
+qglist.3qt \
+qglistiterator.3qt \
+qglwidget.3qt \
+qgrid.3qt \
+qgridlayout.3qt \
+qgroupbox.3qt \
+qhbox.3qt \
+qhboxlayout.3qt \
+qhbuttongroup.3qt \
+qheader.3qt \
+qhgroupbox.3qt \
+qhideevent.3qt \
+qiconset.3qt \
+qimage.3qt \
+qimageconsumer.3qt \
+qimagedecoder.3qt \
+qimagedrag.3qt \
+qimageformat.3qt \
+qimageformattype.3qt \
+qimageio.3qt \
+qintcache.3qt \
+qintcacheiterator.3qt \
+qintdict.3qt \
+qintdictiterator.3qt \
+qintvalidator.3qt \
+qiodevice.3qt \
+qiodevicesource.3qt \
+qkeyevent.3qt \
+qlabel.3qt \
+qlayout.3qt \
+qlayoutitem.3qt \
+qlayoutiterator.3qt \
+qlcdnumber.3qt \
+qlineedit.3qt \
+qlist.3qt \
+qlistbox.3qt \
+qlistboxitem.3qt \
+qlistboxpixmap.3qt \
+qlistboxtext.3qt \
+qlistiterator.3qt \
+qlistview.3qt \
+qlistviewitem.3qt \
+qlistviewitemiterator.3qt \
+qlnode.3qt \
+qmainwindow.3qt \
+qmap.3qt \
+qmapconstiterator.3qt \
+qmapiterator.3qt \
+qmenubar.3qt \
+qmenudata.3qt \
+qmessagebox.3qt \
+qmimesource.3qt \
+qmimesourcefactory.3qt \
+qmotifstyle.3qt \
+qmouseevent.3qt \
+qmoveevent.3qt \
+qmovie.3qt \
+qmultilineedit.3qt \
+qnpinstance.3qt \
+qnplugin.3qt \
+qnpstream.3qt \
+qnpwidget.3qt \
+qobject.3qt \
+qpaintdevice.3qt \
+qpaintdevicemetrics.3qt \
+qpainter.3qt \
+qpaintevent.3qt \
+qpalette.3qt \
+qpen.3qt \
+qpicture.3qt \
+qpixmap.3qt \
+qpixmapcache.3qt \
+qplatinumstyle.3qt \
+qpngimagepacker.3qt \
+qpoint.3qt \
+qpointarray.3qt \
+qpopupmenu.3qt \
+qprinter.3qt \
+qprogressbar.3qt \
+qprogressdialog.3qt \
+qptrdict.3qt \
+qptrdictiterator.3qt \
+qpushbutton.3qt \
+qqueue.3qt \
+qradiobutton.3qt \
+qrangecontrol.3qt \
+qrect.3qt \
+qregexp.3qt \
+qregion.3qt \
+qresizeevent.3qt \
+qscrollbar.3qt \
+qscrollview.3qt \
+qsemimodal.3qt \
+qsessionmanager.3qt \
+qshared.3qt \
+qshowevent.3qt \
+qsignal.3qt \
+qsignalmapper.3qt \
+qsimplerichtext.3qt \
+qsize.3qt \
+qsizegrip.3qt \
+qsizepolicy.3qt \
+qslider.3qt \
+qsocketnotifier.3qt \
+qsortedlist.3qt \
+qspaceritem.3qt \
+qspinbox.3qt \
+qsplitter.3qt \
+qstack.3qt \
+qstatusbar.3qt \
+qstoreddrag.3qt \
+qstrilist.3qt \
+qstring.3qt \
+qstringlist.3qt \
+qstrlist.3qt \
+qstyle.3qt \
+qstylesheet.3qt \
+qstylesheetitem.3qt \
+qt.3qt \
+qtab.3qt \
+qtabbar.3qt \
+qtabdialog.3qt \
+qtableview.3qt \
+qtabwidget.3qt \
+qtextbrowser.3qt \
+qtextcodec.3qt \
+qtextdecoder.3qt \
+qtextdrag.3qt \
+qtextencoder.3qt \
+qtextistream.3qt \
+qtextostream.3qt \
+qtextstream.3qt \
+qtextview.3qt \
+qtime.3qt \
+qtimer.3qt \
+qtimerevent.3qt \
+qtoolbar.3qt \
+qtoolbutton.3qt \
+qtooltip.3qt \
+qtooltipgroup.3qt \
+qtranslator.3qt \
+quridrag.3qt \
+qvalidator.3qt \
+qvaluelist.3qt \
+qvaluelistconstiterator.3qt \
+qvaluelistiterator.3qt \
+qvbox.3qt \
+qvboxlayout.3qt \
+qvbuttongroup.3qt \
+qvgroupbox.3qt \
+qwhatsthis.3qt \
+qwheelevent.3qt \
+qwidget.3qt \
+qwidgetitem.3qt \
+qwidgetstack.3qt \
+qwindowsstyle.3qt \
+qwizard.3qt \
+qwmatrix.3qt \
+qxtapplication.3qt \
+qxtwidget.3qt
diff --git a/x11-toolkits/qt23/files/patch-aa b/x11-toolkits/qt23/files/patch-aa
index bfe1af96de47..6b46648a61aa 100644
--- a/x11-toolkits/qt23/files/patch-aa
+++ b/x11-toolkits/qt23/files/patch-aa
@@ -1,86 +1,90 @@
---- configs/freebsd-g++-shared.orig	Tue Nov 17 15:19:01 1998
-+++ configs/freebsd-g++-shared	Thu Feb 25 09:03:29 1999
-@@ -1,30 +1,30 @@
+--- configs/freebsd-g++-shared.orig	Tue Jul 20 11:45:01 1999
++++ configs/freebsd-g++-shared	Thu Aug 12 21:26:28 1999
+@@ -1,33 +1,33 @@
  # Compiling
--SYSCONF_CC		= g++
-+SYSCONF_CC		= $(CXX)
+-SYSCONF_CXX		= g++
+-SYSCONF_CC		= gcc
++SYSCONF_CXX		= $(SYS_CXX)
++SYSCONF_CC		= $(SYS_CC)
  
  # Compiling with support libraries
--SYSCONF_CFLAGS_X11	= -I/usr/X11R6/include
-+SYSCONF_CFLAGS_X11	= -I$(X11BASE)/include
- SYSCONF_CFLAGS_QT	= -I$(QTDIR)/include
--SYSCONF_CFLAGS_OPENGL	= -I/usr/X11R6/include
-+SYSCONF_CFLAGS_OPENGL	= -I$(X11BASE)/include
+-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_CFLAGS_YACC     = -Wno-unused -Wno-parentheses
+ 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
- SYSCONF_LIBS_X11	= -lX11 -lXext
+ SYSCONF_LIBS_X11	= -lXext -lX11 -lm
  # Qt, Qt+OpenGL
  SYSCONF_LFLAGS_QT	= -L$(QTDIR)/lib
- SYSCONF_LIBS_QT		= -lqt
+-SYSCONF_LIBS_QT		= -lqt
++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 -lXext -lm
+ SYSCONF_LIBS_OPENGL	= -lMesaGL -lMesaGLU -lXmu
  # Yacc
  SYSCONF_LIBS_YACC	= 
  
  # Linking applications
 -SYSCONF_LINK		= g++
-+SYSCONF_LINK		= $(CXX)
++SYSCONF_LINK		= $(SYS_CXX)
  SYSCONF_LFLAGS		= 
- SYSCONF_LIBS		= 
+-SYSCONF_LIBS		= 
++SYSCONF_LIBS		= -lxpg4
  
-@@ -39,16 +39,27 @@
+ # Link flags shared objects
+ SYSCONF_LFLAGS_SHOBJ	= -shared
+@@ -40,17 +40,27 @@
  #   - Place target in $(DESTDIR) - which has a trailing /
- #   - Usually needs to incorporate $(VER_MAJ) and $(VER_MIN)
+ #   - Usually needs to incorporate $(VER_MAJ), $(VER_MIN) and $(VER_PATCH)
  #
 -SYSCONF_LINK_SHLIB	= g++
-+SYSCONF_LINK_SHLIB	= $(CXX)
+-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  \
-+				     $(LFLAGS) -o $(SYSCONF_LINK_TARGET_SHARED) \
-+				     -Wl,-soname,$(SYSCONF_LINK_TARGET_SHARED) \
-+				     $(OBJECTS) $(OBJMOC) $(LIBS); \
-+				 mv $(SYSCONF_LINK_TARGET_SHARED) $(DESTDIR); \
-+				 cd $(DESTDIR); \
-+				 rm -f lib$(TARGET).so; \
-+				 ln -s $(SYSCONF_LINK_TARGET_SHARED) lib$(TARGET).so
-+else
- SYSCONF_LINK_TARGET_SHARED	= lib$(TARGET).so.$(VER_MAJ).$(VER_MIN)
  SYSCONF_LINK_LIB_SHARED	=  $(SYSCONF_LINK_SHLIB) -shared  \
  				     $(LFLAGS) -o $(SYSCONF_LINK_TARGET_SHARED) \
- 				     $(OBJECTS) $(OBJMOC) $(LIBS); \
++				     -Wl,-soname,$(SYSCONF_LINK_TARGET_SHARED) \
+ 				     $(OBJECTS) $(OBJMOC) $(LIBS) && \
  				 mv $(SYSCONF_LINK_TARGET_SHARED) $(DESTDIR); \
- 				 cd $(DESTDIR); \
--				 rm -f lib$(TARGET).so lib$(TARGET).so.$(VER_MAJ); \
+ 				 cd $(DESTDIR) && \
+-				 rm -f lib$(TARGET).so lib$(TARGET).so.$(VER_MAJ) lib$(TARGET).so.$(VER_MAJ).$(VER_MIN); \
 -				 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); \
+-				 ln -s $(SYSCONF_LINK_TARGET_SHARED) lib$(TARGET).so.$(VER_MAJ).$(VER_MIN)
++				 rm -f lib$(TARGET).so; \
++				 ln -s $(SYSCONF_LINK_TARGET_SHARED) lib$(TARGET).so
++else
++SYSCONF_LINK_TARGET_SHARED	= lib$(TARGET).so.$(VER_MAJ).$(VER_MIN)$(VER_PATCH)
++SYSCONF_LINK_LIB_SHARED	=  $(SYSCONF_LINK_SHLIB) -shared  \
++				     $(LFLAGS) -o $(SYSCONF_LINK_TARGET_SHARED) \
++				     $(OBJECTS) $(OBJMOC) $(LIBS) && \
++				 mv $(SYSCONF_LINK_TARGET_SHARED) $(DESTDIR); \
++				 cd $(DESTDIR) && \
 +				 rm -f lib$(TARGET).so; \
 +				 ln -s $(SYSCONF_LINK_TARGET_SHARED) lib$(TARGET).so
 +endif
  
  # Linking static libraries
  #   - Build the $(TARGET) library, eg. lib$(TARGET).a
-@@ -59,11 +70,11 @@
+@@ -61,8 +71,8 @@
  SYSCONF_LINK_LIB_STATIC	= rm -f $(DESTDIR)$(SYSCONF_LINK_TARGET_STATIC) ; \
- 				 $(SYSCONF_AR) $(DESTDIR)$(SYSCONF_LINK_TARGET_STATIC) $(OBJECTS) $(OBJMOC)
+ 				 $(SYSCONF_AR) $(DESTDIR)$(SYSCONF_LINK_TARGET_STATIC) $(OBJECTS) $(OBJMOC) 
  # Compiling application source
--SYSCONF_CFLAGS		= -pipe -O2 -fno-strength-reduce
-+SYSCONF_CFLAGS		= $(CXXFLAGS) -fno-strength-reduce
+-SYSCONF_CXXFLAGS	= -pipe -DNO_DEBUG -O2
+-SYSCONF_CFLAGS		= -pipe -DNO_DEBUG -O2
++SYSCONF_CXXFLAGS	= $(SYS_CXXFLAGS) -DNO_DEBUG
++SYSCONF_CFLAGS		= $(SYS_CXXFLAGS) -DNO_DEBUG
  # Compiling library source
--SYSCONF_CFLAGS_LIB	= -O2 -fno-strength-reduce -fPIC
-+SYSCONF_CFLAGS_LIB	= $(CXXFLAGS) -fno-strength-reduce -fPIC
- # Compiling shared-object source
--SYSCONF_CFLAGS_SHOBJ	= -O2 -fno-strength-reduce -fPIC
-+SYSCONF_CFLAGS_SHOBJ	= $(CXXFLAGS) -fno-strength-reduce -fPIC
- # Default link type (stati linking is still be used where required)
- SYSCONF_LINK_LIB	= $(SYSCONF_LINK_LIB_SHARED)
- SYSCONF_LINK_TARGET	= $(SYSCONF_LINK_TARGET_SHARED)
+ SYSCONF_CXXFLAGS_LIB	= -fPIC
+ SYSCONF_CFLAGS_LIB	= -fPIC