ports/58502: devel/arm-elf-gcc295: fix build on -current

[elvis at sslab.cs.ccu.edu.tw]

>Number:         58502
>Category:       ports
>Synopsis:       devel/arm-elf-gcc295: fix build on -current
>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:   Fri Oct 24 16:40:15 PDT 2003
>Closed-Date:
>Last-Modified:
>Originator:     elvis
>Release:        FreeBSD 5.1-RELEASE-p10 i386
>Organization:
System Software Lab. CSIE CCU Taiwan
>Environment:
System: FreeBSD sslab.cs.ccu.edu.tw 5.1-RELEASE-p10 FreeBSD 5.1-RELEASE-p10 #10: Sat Oct 4 14:23:21 CST 2003 root at sslab.cs.ccu.edu.tw:/ftp/obj/usr/src/sys/SSLAB i386


>Description:
	Fix build problem on 5.x
>How-To-Repeat:
	root sslab:/usr/ports/devel/arm-elf-gcc295> make
	===>  Building for arm-elf-gcc-2.95.3
	test x"no" != xyes ||  cc -c -DHAVE_CONFIG_H -O -pipe -I. -I./../include   strerror.c -o pic/strerror.o
	cc -c -DHAVE_CONFIG_H -O -pipe -I. -I./../include  strerror.c
	strerror.c:465: conflicting types for `sys_nerr'
	/usr/include/stdio.h:350: previous declaration of `sys_nerr'
	*** Error code 1

	Stop in /ftp/obj/usr/ports/devel/arm-elf-gcc295/work/gcc-2.95.3/libiberty.
	*** Error code 1

	Stop in /ftp/obj/usr/ports/devel/arm-elf-gcc295/work/gcc-2.95.3.
	*** Error code 1

	Stop in /usr/ports/devel/arm-elf-gcc295.

	
>Fix:


diff -u -ruN arm-elf-gcc295/Makefile /usr/ports/devel/arm-elf-gcc295/Makefile
--- arm-elf-gcc295/Makefile	Sat Oct 25 07:11:48 2003
+++ /usr/ports/devel/arm-elf-gcc295/Makefile	Tue Sep 23 17:08:06 2003
@@ -17,7 +17,7 @@
 		gcc-g77-${PORTVERSION}${EXTRACT_SUFX}
 
 MAINTAINER=	esk at ira.uka.de
-COMMENT=	GNU cross compiler suite for vanilla ARM targets
+COMMENT=	GNU cross compiler suite for vanilla ARM targets.
 
 BUILD_DEPENDS=	${PKGNAMEPREFIX}as:${PORTSDIR}/devel/${PKGNAMEPREFIX}binutils \
 		${PKGNAMEPREFIX}ld:${PORTSDIR}/devel/${PKGNAMEPREFIX}binutils
@@ -43,18 +43,16 @@
 
 .include <bsd.port.pre.mk>
 
+.if ${OSVERSION} >= 500113
+BROKEN=         "Does not compile"
+.endif
+
 .if !defined(DEFAULT_CPU)
 pre-extract:
 	@${ECHO}
 	@${ECHO} "You can specify a default cpu target for gcc by setting DEFAULT_CPU to the"
 	@${ECHO} "appropriate target (e.g., strongarm1100)."
 	@${ECHO}
-.endif
-
-.if ${OSVERSION} >= 500113
-post-patch:
-	@(cd ${PATCH_WRKSRC} && ${PATCH} < ${PATCHDIR}/libiberty-strerror.c && \
-	${PATCH} < ${PATCHDIR}/libiberty-strsignal.c)
 .endif
 
 post-configure:
diff -u -ruN arm-elf-gcc295/files/libiberty-strerror.c /usr/ports/devel/arm-elf-gcc295/files/libiberty-strerror.c
--- arm-elf-gcc295/files/libiberty-strerror.c	Sat Oct 25 06:19:58 2003
+++ /usr/ports/devel/arm-elf-gcc295/files/libiberty-strerror.c	Thu Jan  1 08:00:00 1970
@@ -1,14 +0,0 @@
---- libiberty/strerror.c.orig	Sat Oct 25 06:08:26 2003
-+++ libiberty/strerror.c	Sat Oct 25 06:08:35 2003
-@@ -460,11 +460,6 @@
- static int sys_nerr;
- static const char **sys_errlist;
- 
--#else
--
--extern int sys_nerr;
--extern char *sys_errlist[];
--
- #endif
- 
- 
diff -u -ruN arm-elf-gcc295/files/libiberty-strsignal.c /usr/ports/devel/arm-elf-gcc295/files/libiberty-strsignal.c
--- arm-elf-gcc295/files/libiberty-strsignal.c	Sat Oct 25 06:20:45 2003
+++ /usr/ports/devel/arm-elf-gcc295/files/libiberty-strsignal.c	Thu Jan  1 08:00:00 1970
@@ -1,11 +0,0 @@
---- libiberty/strsignal.c.orig	Sat Oct 25 06:10:58 2003
-+++ libiberty/strsignal.c	Sat Oct 25 06:13:09 2003
-@@ -244,7 +244,7 @@
- #else
- 
- #ifdef NSIG
--static int sys_nsig = NSIG;
-+static __const int sys_nsig = NSIG;
- #else
- #ifdef _NSIG
- static int sys_nsig = _NSIG;

>Release-Note:
>Audit-Trail:
>Unformatted: