Attachment #22368 for bug #38841

View | Details | Raw Unified | Return to bug 38841
Collapse All | Expand All




.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

	@${PERL} -pi -e "s:gcc:${CC}:g ; s:g\+\+:${CXX}:g ; \
		s:%%LIBQT%%:-l${QTNAME}:g ; \
		s:%%MOC%%:${MOC}: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





--- 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
 

 
 TMAKE_LINK		= g++
 TMAKE_LINK_SHLIB	= g++
@@ -44,13 +44,13 @@
 # soname does not work on fbsd 2.x
 #TMAKE_LFLAGS_SONAME	= -Wl,-soname
 
-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   = %%QT_OPENGL%%
 TMAKE_LIBS_OPENGL	= -lMesaGL -lMesaGLU -lXmu
 
-TMAKE_MOC		= moc

Return to bug 38841

Lines 21-27 Link Here

(-)devel/doxygen/Makefile (-1 / +16 lines)
21	.endif	21	.endif
22	.endif	22	.endif
23		23
		24	.if defined(WITH_QT2)
24	USE_QT_VER= 2	25	USE_QT_VER= 2
		26	QT_INC= ${X11BASE}/include/qt2
		27	QT_OPENGL= -lqtgl
		28	THREADLIBS=
		29	.else
		30	USE_QT_VER= 3
		31	QT_INC= ${X11BASE}/include
		32	QTNAME= qt-mt
		33	QT_OPENGL=
		34	THREADLIBS= ${PTHREAD_LIBS}
		35	CFLAGS+= ${PTHREAD_CFLAGS}
		36	#CXXFLAGS+= ${PTHREAD_CFLAGS}
		37	.endif
25	USE_PERL5= yes	38	USE_PERL5= yes
26	HAS_CONFIGURE= yes	39	HAS_CONFIGURE= yes
27	USE_GMAKE= yes	40	USE_GMAKE= yes
Lines 59-66 Link Here
59	@${PERL} -pi -e "s:gcc:${CC}:g ; s:g\+\+:${CXX}:g ; \	72	@${PERL} -pi -e "s:gcc:${CC}:g ; s:g\+\+:${CXX}:g ; \
60	s:%%LIBQT%%:-l${QTNAME}:g ; \	73	s:%%LIBQT%%:-l${QTNAME}:g ; \
61	s:%%MOC%%:${MOC}:g ; \	74	s:%%MOC%%:${MOC}:g ; \
62	s:%%QT_INC%%:${X11BASE}/include/qt2:g ; \	75	s:%%QT_INC%%:${QT_INC}:g ; \
63	s:%%QT_LIB%%:${X11BASE}/lib:g ; \	76	s:%%QT_LIB%%:${X11BASE}/lib:g ; \
		77	s:%%QT_OPENGL%%:${QT_OPENGL}:g ; \
		78	s:%%THREADLIBS%%:${THREADLIBS}:g ; \
64	s:%%CFLAGS%%:${CFLAGS}:g ; \	79	s:%%CFLAGS%%:${CFLAGS}:g ; \
65	s:%%CXXFLAGS%%:${CXXFLAGS}:g" ${WRKSRC}/tmake/lib/freebsd-g++/tmake.conf	80	s:%%CXXFLAGS%%:${CXXFLAGS}:g" ${WRKSRC}/tmake/lib/freebsd-g++/tmake.conf
66		81

Lines 1-5 Link Here

(-)devel/doxygen/files/patch-af (-5 / +8 lines)
1	--- tmake/lib/freebsd-g++/tmake.conf.orig Thu Jul 29 00:21:38 1999	1	--- tmake/lib/freebsd-g++/tmake.conf.orig Wed Jul 28 11:21:38 1999
2	+++ tmake/lib/freebsd-g++/tmake.conf Tue Sep 25 23:14:36 2001	2	+++ tmake/lib/freebsd-g++/tmake.conf Sun Jun 2 09:46:54 2002
3	@@ -8,16 +8,16 @@	3	@@ -8,16 +8,16 @@
4	CONFIG = qt warn_on release	4	CONFIG = qt warn_on release
5		5
Lines 40-53 Link Here
40		40
41	TMAKE_LINK = g++	41	TMAKE_LINK = g++
42	TMAKE_LINK_SHLIB = g++	42	TMAKE_LINK_SHLIB = g++
43	@@ -46,11 +46,11 @@	43	@@ -44,13 +44,13 @@
		44	# soname does not work on fbsd 2.x
		45	#TMAKE_LFLAGS_SONAME = -Wl,-soname
44		46
45	TMAKE_LIBS =	47	-TMAKE_LIBS =
		48	+TMAKE_LIBS = %%THREADLIBS%%
46	TMAKE_LIBS_X11 = -lXext -lX11 -lm	49	TMAKE_LIBS_X11 = -lXext -lX11 -lm
47	-TMAKE_LIBS_QT = -lqt	50	-TMAKE_LIBS_QT = -lqt
48	-TMAKE_LIBS_QT_OPENGL = -lqgl	51	-TMAKE_LIBS_QT_OPENGL = -lqgl
49	+TMAKE_LIBS_QT = %%LIBQT%%	52	+TMAKE_LIBS_QT = %%LIBQT%%
50	+TMAKE_LIBS_QT_OPENGL = -lqtgl	53	+TMAKE_LIBS_QT_OPENGL = %%QT_OPENGL%%
51	TMAKE_LIBS_OPENGL = -lMesaGL -lMesaGLU -lXmu	54	TMAKE_LIBS_OPENGL = -lMesaGL -lMesaGLU -lXmu
52		55
53	-TMAKE_MOC = moc	56	-TMAKE_MOC = moc