diff options
| author | Alan Eldridge <alane@FreeBSD.org> | 2002-06-23 20:00:42 +0000 |
|---|---|---|
| committer | Alan Eldridge <alane@FreeBSD.org> | 2002-06-23 20:00:42 +0000 |
| commit | a6cf2fb8b5134f6d996c75f61caf21297eece5c8 (patch) | |
| tree | 449ac72b34cc73d521e527be00986f02e2455229 /devel | |
| parent | f599714e2af4b0a672e565a7f4d89b701b92f51d (diff) | |
| download | ports-a6cf2fb8b5134f6d996c75f61caf21297eece5c8.tar.gz ports-a6cf2fb8b5134f6d996c75f61caf21297eece5c8.zip | |
Update to use qt30. added WITH_QT2 knob for old behavior.
committed becaused maintainer did not respond in three weeks and has an
invalid address in ports Makefile.
Notes
Notes:
svn path=/head/; revision=61834
Diffstat (limited to 'devel')
| -rw-r--r-- | devel/doxygen/Makefile | 17 | ||||
| -rw-r--r-- | devel/doxygen/files/patch-af | 13 |
2 files changed, 24 insertions, 6 deletions
diff --git a/devel/doxygen/Makefile b/devel/doxygen/Makefile index aacfb3613270..8416c5d961a2 100644 --- a/devel/doxygen/Makefile +++ b/devel/doxygen/Makefile @@ -21,7 +21,20 @@ BUILD_DEPENDS+= latex:${PORTSDIR}/print/teTeX \ .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 @@ pre-configure: @${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 diff --git a/devel/doxygen/files/patch-af b/devel/doxygen/files/patch-af index 639794693aa3..9af698a21165 100644 --- a/devel/doxygen/files/patch-af +++ b/devel/doxygen/files/patch-af @@ -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 |