Bring in my fixes for KDE2 for users of XFree86 4.0.x. Basically, what

this involves is this:  Cull GL from Qt by default, but still provide a
Qt+GL library that may or may not have threads.  Then also provide a Qt
library that has threads but not GL.  This allows us to make KDE2 depend
on a library that will *not* have threads, ever.  Threads will be
revisited at a later date.  Ports that require GL support need to be
updated to use the hacked library, libqtgl.so.4.  The net result is that
we bloat our qt2 package by 1.5-2.5MB for compatability.  Also, static
qt will not have GL support.

Introduce bsd.kde.mk, which will be tested on bento before becoming
fully activated.

Replace qt22-static with qt2-static, since it's just a proxy.  Update
qt-designer to depend on qt23.  Also make the old hack to package the
correct lib obsolete by using PLIST_SUB instead.

Miscellaneous changes:  remove LIBQTFILE from CONFIGURE_ENV, it's not
used anymore.  Solve namespace pollution problems with the devel/pth and
devel/libgnugetopt ports.  Hopefully.

Suggested by:	ade, asami, sobomax (bsd.kde.mk)
Repocopied by:	asami (qt22-static --> qt2-static)

2 files changed, 30 insertions, 19 deletions

diff --git a/x11-toolkits/qt31/Makefile b/x11-toolkits/qt31/Makefile
index 66cd3c4c58bd..6561c7ba1809 100644
--- a/x11-toolkits/qt31/Makefile
+++ b/x11-toolkits/qt31/Makefile
@@ -24,7 +24,7 @@ USE_X_PREFIX=	yes
 USE_NEWGCC=	yes
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	-system-zlib -system-libpng -system-jpeg -sm -gif \
-		-system-libmng -thread \
+		-system-libmng -thread -no-opengl \
 		-I${LOCALBASE}/include -L${LOCALBASE}/lib
 CONFIGURE_ENV=	${ECHO} yes | QTDIR=${WRKSRC}
 .if defined(MAKE_JOBS)
@@ -43,9 +43,11 @@ CONFIG=		${WRKSRC}/configs/freebsd-g++-${STATIC}
 .if defined(WANT_STATIC)
 STATIC=static
 CONFIGURE_ARGS+=-static
+PLIST_SUB+=	STATIC="@comment " SHARED=""
 .else
 STATIC=shared
 INSTALLS_SHLIB=yes
+PLIST_SUB+=	STATIC="" STATIC="@comment "
 .endif
 
 .include <bsd.port.pre.mk>
@@ -69,7 +71,7 @@ pre-fetch:
 pre-configure:
 	${PERL} -pi -e "s,gcc,${CC},g; s,g\+\+,${CXX},g; \
 			s,/usr/X11R6,${X11BASE},g; \
-			s,-pipe -O2,${CXXFLAGS} -frerun-cse-after-loop,g" ${CONFIG}
+			s,-fno-exceptions,-fno-exceptions ${CXXFLAGS} -I/usr/include -D_PTH_H_ -D_PTH_PTHREAD_H_ -frerun-cse-after-loop,g" ${CONFIG}
 	${PERL} -pi -e "s,VER_MAJ = 2,VER_MAJ = 4,g; \
 			s,TARGET	= qt,TARGET = qt2,g" ${WRKSRC}/src/Makefile.in
 	${PERL} -pi -e "s@TARGET\t= moc@TARGET = moc2@g" ${WRKSRC}/src/moc/Makefile.in
@@ -81,6 +83,21 @@ pre-configure:
 post-configure:
 	@(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${GMAKE} symlinks)
 
+# Add hack to bring in support for GL.  The last line is necessary to ensure that
+# one can rebuild with the same tree and get the same results.
+do-build:
+	(cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${ALL_TARGET})
+.if !defined(WANT_STATIC)
+	(cd ${WRKSRC}/src && ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} opengl/qgl.o opengl/qgl_x11.o opengl/moc_qgl.o)
+	${MV} ${WRKSRC}/lib/libqt2.so.4 ${WRKSRC}/lib/libqt2-real.so.4
+	${PERL} -pi.orig -e "s@		xml/qdom.o@xml/qdom.o opengl/qgl.o opengl/qgl_x11.o opengl/moc_qgl.o@g; \
+			     s@SYSCONF_LIBS_OPENGL =@SYSCONF_LIBS_OPENGL= -pthread -lGL -lGLU -lXmu@g" ${WRKSRC}/src/Makefile
+	(cd ${WRKSRC}/src && ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} all)
+	${CP} ${WRKSRC}/lib/libqt2.so.4 ${WRKSRC}/lib/libqtgl.so.4
+	${CP} ${WRKSRC}/lib/libqt2-real.so.4 ${WRKSRC}/lib/libqt2.so.4
+	${CP} ${WRKSRC}/src/Makefile.orig ${WRKSRC}/src/Makefile
+.endif
+
 # XXX: This target looks like crap now.
 do-install:
 .if (${PORTNAME} == "qt")
@@ -93,7 +110,7 @@ do-install:
 .endfor
 	${INSTALL_DATA} ${WRKSRC}/include/*.h ${PREFIX}/include/qt2
 .if !defined(WANT_STATIC)
-.for LIB in qt2 qt2-mt
+.for LIB in qt2 qt2-mt qtgl
 	${INSTALL_PROGRAM} ${WRKSRC}/lib/lib${LIB}.so.4 ${PREFIX}/lib
 	${LN} -sf ${PREFIX}/lib/lib${LIB}.so.4 ${PREFIX}/lib/lib${LIB}.so
 .endfor
@@ -120,14 +137,4 @@ do-install:
 .endif
 .endif
 
-.if defined(WANT_STATIC)
-.if (${PORTNAME} == "qt")
-post-install:
-	${CP} ${TMPPLIST} ${TMPPLIST}.new
-	${SED} -e "s/libqt2\/.so/libqt2\.a/" -e "s/.*libqt2\.a\.\d\n//" \
-		-e "s/libqutil\.so/libqutil.a/" -e "s/.*libqutil\.a\.\d\n//" \
-			${TMPPLIST}.new > ${TMPPLIST}
-.endif
-.endif
-
 .include <bsd.port.post.mk>
diff --git a/x11-toolkits/qt31/pkg-plist b/x11-toolkits/qt31/pkg-plist
index d5546993e41f..2b57cd177e28 100644
--- a/x11-toolkits/qt31/pkg-plist
+++ b/x11-toolkits/qt31/pkg-plist
@@ -284,12 +284,16 @@ include/qt2/qwmatrix.h
 include/qt2/qworkspace.h
 include/qt2/qxml.h
 include/qt2/qxt.h
-lib/libqt2-mt.so
-lib/libqt2-mt.so.4
-lib/libqt2.so
-lib/libqt2.so.4
-lib/libqutil.so
-lib/libqutil.so.1
+%%SHARED%%lib/libqtgl.so
+%%SHARED%%lib/libqtgl.so.4
+%%SHARED%%lib/libqt2-mt.so
+%%SHARED%%lib/libqt2-mt.so.4
+%%STATIC%%lib/libqt2.a
+%%SHARED%%lib/libqt2.so
+%%SHARED%%lib/libqt2.so.4
+%%STATIC%%lib/libqutil.a
+%%SHARED%%lib/libqutil.so
+%%SHARED%%lib/libqutil.so.1
 share/doc/qt2/ANNOUNCE
 share/doc/qt2/FAQ
 share/doc/qt2/PORTING