Date: Sun, 2 Jun 2002 21:43:08 -0400 (EDT) From: Alan Eldridge <ports@geeksrus.net> To: FreeBSD-gnats-submit@FreeBSD.org Cc: bsdport@ddm.wox.org, will@csociety.org, lauri@kde.org Subject: ports/38841: devel/doxygen: upgrade to qt30 (allow WITH_QT2 for qt23) Message-ID: <200206030143.g531h8sG023222@wwweasel.geeksrus.net>
next in thread | raw e-mail | index | archive | help
>Number: 38841
>Category: ports
>Synopsis: devel/doxygen: upgrade to qt30 (allow WITH_QT2 for qt23)
>Confidential: no
>Severity: serious
>Priority: high
>Responsible: freebsd-ports
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Sun Jun 02 18:50:00 PDT 2002
>Closed-Date:
>Last-Modified:
>Originator: Alan Eldridge
>Release: FreeBSD 4.6-RC i386
>Organization:
Geeksrus.NET
>Environment:
System: FreeBSD wwweasel.geeksrus.net 4.6-RC FreeBSD 4.6-RC #1: Sun May 26 13:08:49 EDT 2002 root@wwweasel.geeksrus.net:/usr/obj/usr/src/sys/WWWEASEL i386
>Description:
KDE3 depends on doxygen to generate API docs. This patch upgrades doxygen to
build against qt30. You can still build against qt23 by adding -DWITH_QT2 to
the make command line.
>How-To-Repeat:
>Fix:
==8<====8<====8<====8<====8<====8<====8<====8<====8<====8<==
Index: devel/doxygen/Makefile
===================================================================
RCS file: /home/ncvs/ports/devel/doxygen/Makefile,v
retrieving revision 1.20
diff -u -3 -r1.20 Makefile
--- devel/doxygen/Makefile 25 May 2002 17:02:40 -0000 1.20
+++ devel/doxygen/Makefile 2 Jun 2002 13:54:36 -0000
@@ -21,7 +21,20 @@
.endif
.endif
+.if defined(WITH_QT2)
USE_QT_VER= 2
+QT_INC= ${X11BASE}/include/qt2
+QT_OPENGL= -lqtgl
+THREADLIBS=
+.else
+USE_QT_VER= 3
+QT_INC= ${X11BASE}/include
+QTNAME= qt-mt
+QT_OPENGL=
+THREADLIBS= ${PTHREAD_LIBS}
+CFLAGS+= ${PTHREAD_CFLAGS}
+#CXXFLAGS+= ${PTHREAD_CFLAGS}
+.endif
USE_PERL5= yes
HAS_CONFIGURE= yes
USE_GMAKE= yes
@@ -59,8 +72,10 @@
@${PERL} -pi -e "s:gcc:${CC}:g ; s:g\+\+:${CXX}:g ; \
s:%%LIBQT%%:-l${QTNAME}:g ; \
s:%%MOC%%:${MOC}:g ; \
- s:%%QT_INC%%:${X11BASE}/include/qt2:g ; \
+ s:%%QT_INC%%:${QT_INC}:g ; \
s:%%QT_LIB%%:${X11BASE}/lib:g ; \
+ s:%%QT_OPENGL%%:${QT_OPENGL}:g ; \
+ s:%%THREADLIBS%%:${THREADLIBS}:g ; \
s:%%CFLAGS%%:${CFLAGS}:g ; \
s:%%CXXFLAGS%%:${CXXFLAGS}:g" ${WRKSRC}/tmake/lib/freebsd-g++/tmake.conf
Index: devel/doxygen/files/patch-af
===================================================================
RCS file: /home/ncvs/ports/devel/doxygen/files/patch-af,v
retrieving revision 1.2
diff -u -3 -r1.2 patch-af
--- devel/doxygen/files/patch-af 25 Sep 2001 14:50:04 -0000 1.2
+++ devel/doxygen/files/patch-af 2 Jun 2002 13:50:56 -0000
@@ -1,5 +1,5 @@
---- tmake/lib/freebsd-g++/tmake.conf.orig Thu Jul 29 00:21:38 1999
-+++ tmake/lib/freebsd-g++/tmake.conf Tue Sep 25 23:14:36 2001
+--- tmake/lib/freebsd-g++/tmake.conf.orig Wed Jul 28 11:21:38 1999
++++ tmake/lib/freebsd-g++/tmake.conf Sun Jun 2 09:46:54 2002
@@ -8,16 +8,16 @@
CONFIG = qt warn_on release
@@ -40,14 +40,17 @@
TMAKE_LINK = g++
TMAKE_LINK_SHLIB = g++
-@@ -46,11 +46,11 @@
+@@ -44,13 +44,13 @@
+ # soname does not work on fbsd 2.x
+ #TMAKE_LFLAGS_SONAME = -Wl,-soname
- TMAKE_LIBS =
+-TMAKE_LIBS =
++TMAKE_LIBS = %%THREADLIBS%%
TMAKE_LIBS_X11 = -lXext -lX11 -lm
-TMAKE_LIBS_QT = -lqt
-TMAKE_LIBS_QT_OPENGL = -lqgl
+TMAKE_LIBS_QT = %%LIBQT%%
-+TMAKE_LIBS_QT_OPENGL = -lqtgl
++TMAKE_LIBS_QT_OPENGL = %%QT_OPENGL%%
TMAKE_LIBS_OPENGL = -lMesaGL -lMesaGLU -lXmu
-TMAKE_MOC = moc
==8<====8<====8<====8<====8<====8<====8<====8<====8<====8<==
>Release-Note:
>Audit-Trail:
>Unformatted:
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200206030143.g531h8sG023222>