Attachment 22368 Details for Bug 38841 – file.diff

[patch] file.diff

file.diff (text/plain), 2.31 KB, created by Alan E on 2002-06-03 02:50:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Alan E

Created: 2002-06-03 02:50:00 UTC

Size: 2.31 KB

patch

obsolete

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

Actions: View | Diff

Attachments on bug 38841: 22368