aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormotoyuki <motoyuki@FreeBSD.org>2008-04-26 23:58:10 +0800
committermotoyuki <motoyuki@FreeBSD.org>2008-04-26 23:58:10 +0800
commit721ebe40017780d4e27f5d834e2ed6cbd5533c2c (patch)
treeb3793fcbf80f7068387432182b3c03e6f654f156
parentda920764127bb75cbab516bd92d177302bf5dbdc (diff)
downloadfreebsd-ports-gnome-721ebe40017780d4e27f5d834e2ed6cbd5533c2c.tar.gz
freebsd-ports-gnome-721ebe40017780d4e27f5d834e2ed6cbd5533c2c.tar.zst
freebsd-ports-gnome-721ebe40017780d4e27f5d834e2ed6cbd5533c2c.zip
Fix BROKEN on gcc 4.2.
PR: ports/119679 Submitted by: Tsuyoshi Arai <taraijpn@gmail.com> Reviewed by: nyan Note: I committed only some part of the PR. It's enough to unbreak this port.
-rw-r--r--japanese/mh/Makefile4
-rw-r--r--japanese/mh/files/patch-sbr:concat.c14
2 files changed, 7 insertions, 11 deletions
diff --git a/japanese/mh/Makefile b/japanese/mh/Makefile
index 5a64e4f407b7..98a623ebdd42 100644
--- a/japanese/mh/Makefile
+++ b/japanese/mh/Makefile
@@ -46,10 +46,6 @@ CONFLICTS= nmh-[0-9]*
.include <bsd.port.pre.mk>
-.if ${OSVERSION} >= 700042
-BROKEN= Does not compile with GCC 4.2
-.endif
-
post-install:
.if !defined(NOPORTDOCS)
${MKDIR} ${DOCDIR}
diff --git a/japanese/mh/files/patch-sbr:concat.c b/japanese/mh/files/patch-sbr:concat.c
index 6a436f0f6618..7569dffaf5d1 100644
--- a/japanese/mh/files/patch-sbr:concat.c
+++ b/japanese/mh/files/patch-sbr:concat.c
@@ -1,8 +1,6 @@
-Index: sbr/concat.c
-diff -u sbr/concat.c.orig sbr/concat.c
---- sbr/concat.c.orig Wed Dec 1 13:01:21 1993
-+++ sbr/concat.c Fri Jul 18 14:42:47 2003
-@@ -2,13 +2,12 @@
+--- sbr/concat.c.orig 1993-12-01 13:01:21.000000000 +0900
++++ sbr/concat.c 2008-04-27 00:14:56.000000000 +0900
+@@ -2,34 +2,40 @@
#include "../h/mh.h"
#include <stdio.h>
@@ -18,8 +16,10 @@ diff -u sbr/concat.c.orig sbr/concat.c
{
register char *cp,
*dp,
-@@ -17,19 +16,26 @@
- register va_list list;
+ *sp;
+ register unsigned len;
+- register va_list list;
++ va_list list;
len = 1;
- va_start (list);