Update QT2 to 2.2.4: Re-add USE_MESA, remove antialiasing patch, remove

default -j2 (but keep MAKE_JOBS var), restore old perl REs as soon as I'd
learned how to do multiple ones, remove QPL license file from packaging,
sync with newest KOI8-U/R stuff (not tested).  The biggest bonus:  split
QT Designer into its own port, and make the qt22/qt-designer pair a member
of the master-slave ports legion, hopefully to reduce redundancy as much
as possible.  This should also save roughly 20 minutes of compile time on
a dual PIII-600 for those that don't need or want QT Designer.  UIC is,
however, still installed/compiled by the default Qt 2.2.4 (as it _is_
required for other things e.g. KDE2).

USE_MESA may break KDE2.  Hopefully, now that the port does install both
the threaded and non-threaded versions of QT, it won't.  But until the
next release of KDE2, I'm not gonna bother testing to see.

USE_MESA repeatedly requested by:	sobomax

1 files changed, 60 insertions, 0 deletions

diff --git a/devel/qt-designer/files/patch-aa b/devel/qt-designer/files/patch-aa
new file mode 100644
index 000000000000..119251bcb772
--- /dev/null
+++ b/devel/qt-designer/files/patch-aa
@@ -0,0 +1,60 @@
+--- configs/freebsd-g++-shared	Sun Dec 24 02:41:35 2000
++++ configs/freebsd-g++-shared.new	Sun Dec 24 02:42:49 2000
+@@ -6,7 +6,7 @@
+ 
+ # Compiling with support libraries
+ SYSCONF_CXXFLAGS_X11	= -I/usr/X11R6/include
+-SYSCONF_CXXFLAGS_QT	= -I$(QTDIR)/include
++SYSCONF_CXXFLAGS_QT= -I$(QTDIR)/include -I/usr/X11R6/include/qt2 $(SYSCONF_CXXFLAGS_THREAD)
+ SYSCONF_CXXFLAGS_OPENGL	= -I/usr/X11R6/include
+ 
+ # Compiling YACC output
+@@ -23,7 +23,7 @@
+ SYSCONF_LIBS_X11	= -lXext -lX11 -lm
+ # Qt, Qt+OpenGL
+ SYSCONF_LFLAGS_QT	= -L$(QTDIR)/lib
+-SYSCONF_LIBS_QT		= -lqt$(QT_THREAD_SUFFIX)
++SYSCONF_LIBS_QT		= -lqt2$(QT_THREAD_SUFFIX) $(SYSCONF_LFLAGS_THREAD)
+ SYSCONF_LIBS_QT_OPENGL	= 
+ # OpenGL
+ SYSCONF_LFLAGS_OPENGL	= -L/usr/X11R6/lib
+@@ -46,7 +46,7 @@
+ SYSCONF_LIBS_THREAD	= 
+ 
+ # Meta-object compiler
+-SYSCONF_MOC		= $(QTDIR)/bin/moc
++SYSCONF_MOC		= $(QTDIR)/bin/moc2
+ 
+ # UI compiler
+ SYSCONF_UIC		= $(QTDIR)/bin/uic
+@@ -57,16 +57,14 @@
+ #   - Usually needs to incorporate $(VER_MAJ), $(VER_MIN) and $(VER_PATCH)
+ #
+ SYSCONF_LINK_SHLIB	= g++
+-SYSCONF_LINK_TARGET_SHARED	= lib$(TARGET).so.$(VER_MAJ).$(VER_MIN).$(VER_PATCH)
++SYSCONF_LINK_TARGET_SHARED	= lib$(TARGET).so.$(VER_MAJ)
+ 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 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).$(VER_MIN)
++				 rm -f lib$(TARGET).so;\
++				 ln -s $(SYSCONF_LINK_TARGET_SHARED) lib$(TARGET).so
+ 
+ # Linking static libraries
+ #   - Build the $(TARGET) library, eg. lib$(TARGET).a
+@@ -77,8 +75,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)