From 8b04c891a8bd416fc8214ee79c86c13bbdf61ee7 Mon Sep 17 00:00:00 2001 From: Mario Sergio Fujikawa Ferreira Date: Sun, 14 Mar 2004 10:22:53 +0000 Subject: [PATCH] o Play nice in FreeBSD series before 5.x, defaulting on all mkvtoolnix dependencies (them and it at the same time) to USE_GCC=2.95 is enough o The requirement on gcc 3.x on one of the dependencies was removed and I forgot to check yet another variation PR: 63581 Submitted by: michael johnson --- multimedia/libmatroska/Makefile | 11 ++++++----- multimedia/mkvtoolnix/Makefile | 11 ++++++----- textproc/libebml/Makefile | 11 ++++++----- 3 files changed, 18 insertions(+), 15 deletions(-) diff --git a/multimedia/libmatroska/Makefile b/multimedia/libmatroska/Makefile index ae4ce1c95086..59ee450fa4df 100644 --- a/multimedia/libmatroska/Makefile +++ b/multimedia/libmatroska/Makefile @@ -46,11 +46,6 @@ do-configure: .include -.if ${OSVERSION} < 500000 -# this is gcc 2.x -CFLAGS+= -DNO_WSTRING -.endif - # gcc 3.2 was available on 5.x before this OSVERSION # do not build gcc 3.3 unless necessary .if ${OSVERSION} < 501103 @@ -61,4 +56,10 @@ USE_GCC=3.2 USE_GCC=3.3 .endif +.if ${OSVERSION} < 500000 +USE_GCC=2.95 +# this is gcc 2.x +CFLAGS+= -DNO_WSTRING -I${LOCALBASE}/include +.endif + .include diff --git a/multimedia/mkvtoolnix/Makefile b/multimedia/mkvtoolnix/Makefile index 13e3be6c78ee..27921ad3eb57 100644 --- a/multimedia/mkvtoolnix/Makefile +++ b/multimedia/mkvtoolnix/Makefile @@ -37,11 +37,6 @@ post-patch: .include -.if ${OSVERSION} < 500000 -# this is gcc 2.x -CFLAGS+= -DNO_WSTRING -.endif - # gcc 3.2 was available on 5.x before this OSVERSION # do not build gcc 3.3 unless necessary .if ${OSVERSION} < 501103 @@ -52,4 +47,10 @@ USE_GCC=3.2 USE_GCC=3.3 .endif +.if ${OSVERSION} < 500000 +USE_GCC=2.95 +# this is gcc 2.x +CFLAGS+= -DNO_WSTRING +.endif + .include diff --git a/textproc/libebml/Makefile b/textproc/libebml/Makefile index 9bf1c60ac655..6dc9a972e07f 100644 --- a/textproc/libebml/Makefile +++ b/textproc/libebml/Makefile @@ -35,11 +35,6 @@ do-configure: .include -.if ${OSVERSION} < 500000 -# this is gcc 2.x -CFLAGS+= -DNO_WSTRING -.endif - # gcc 3.2 was available on 5.x before this OSVERSION # do not build gcc 3.3 unless necessary .if ${OSVERSION} < 501103 @@ -50,4 +45,10 @@ USE_GCC=3.2 USE_GCC=3.3 .endif +.if ${OSVERSION} < 500000 +USE_GCC=2.95 +# this is gcc 2.x +CFLAGS+= -DNO_WSTRING +.endif + .include