ports/63581: [Patch] multimedia/libmatroska textproc -- Does not build and USE_GCC does not work right on 4.x

[michael johnson]

>Number:         63581
>Category:       ports
>Synopsis:       [Patch] multimedia/libmatroska textproc -- Does not build and USE_GCC does not work right on 4.x
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Mon Mar 01 02:10:15 PST 2004
>Closed-Date:
>Last-Modified:
>Originator:     michael johnson
>Release:        5.2-CURRENT
>Organization:
>Environment:

>Description:
USE_GCC= for FreeBSD 4.x was using USE_GCC=3.2 because FreeBSD 4.x is less than 501103

I could not get multimedia/libmatroska to compile with out -I${LOCALBASE}/include
>How-To-Repeat:
      
>Fix:
--- Begin  libmatroska ---
diff -ruN multimedia/libmatroska.orig/Makefile multimedia/libmatroska/Makefile
--- multimedia/libmatroska.orig/Makefile	Mon Mar  1 04:03:01 2004
+++ multimedia/libmatroska/Makefile	Mon Mar  1 04:49:13 2004
@@ -46,10 +46,7 @@
 
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} < 500000
-# this is gcc 2.x
-CFLAGS+= -DNO_WSTRING
-.endif
+CFLAGS+= -I${LOCALBASE}/include
 
 # gcc 3.2 was available on 5.x before this OSVERSION
 # do not build gcc 3.3 unless necessary
@@ -59,6 +56,11 @@
 .else
 # default for 5.x series
 USE_GCC=3.3
+.endif
+
+.if ${OSVERSION} < 500000
+CFLAGS+= -DNO_WSTRING
+USE_GCC=2.95
 .endif
 
 .include <bsd.port.post.mk>
--- End  libmatroska ---

--- Begin libebml ---
diff -ruN textproc/libebml.orig/Makefile textproc/libebml/Makefile
--- textproc/libebml.orig/Makefile	Mon Mar  1 04:05:45 2004
+++ textproc/libebml/Makefile	Mon Mar  1 04:06:39 2004
@@ -35,11 +35,6 @@
 
 .include <bsd.port.pre.mk>
 
-.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
@@ -48,6 +43,12 @@
 .else
 # default for 5.x series
 USE_GCC=3.3
+.endif
+
+.if ${OSVERSION} < 500000
+# this is gcc 2.x
+CFLAGS+= -DNO_WSTRING
+USE_GCC=2.95
 .endif
 
 .include <bsd.port.post.mk>
--- End libebml ---
>Release-Note:
>Audit-Trail:
>Unformatted: