ports/118900: [patch] news/grn unbreak fix build with GCC 4.2

[Pietro Cerutti]

>Number:         118900
>Category:       ports
>Synopsis:       [patch] news/grn unbreak fix build with GCC 4.2
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Thu Dec 20 18:50:00 UTC 2007
>Closed-Date:
>Last-Modified:
>Originator:     Pietro Cerutti
>Release:        FreeBSD 8.0-CURRENT i386
>Organization:
>Environment:


System: FreeBSD 8.0-CURRENT #18: Tue Dec 18 12:48:22 CET 2007
    root at gahrtop.localhost:/usr/obj/usr/src/sys/MSI1034



>Description:





>How-To-Repeat:





>Fix:


--- _grn.diff begins here ---
--- Makefile.orig	2007-12-20 19:30:24.000000000 +0100
+++ Makefile	2007-12-20 19:30:50.000000000 +0100
@@ -26,14 +26,8 @@
 		CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 700042
-BROKEN=		Broken with gcc 4.2
-.endif
-
 post-patch:
 	@${REINPLACE_CMD} -e 's|$${CONFIG_SHELL-/bin/sh} $$ac_aux_dir|$$ac_aux_dir|' \
 		${WRKSRC}/configure ${WRKSRC}/libmutt/configure
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
--- /dev/null	2007-12-20 19:44:00.000000000 +0100
+++ files/patch-libmutt_keymap.h	2007-12-20 19:32:22.000000000 +0100
@@ -0,0 +1,11 @@
+--- libmutt/keymap.h.orig	2007-12-20 19:31:26.000000000 +0100
++++ libmutt/keymap.h	2007-12-20 19:32:04.000000000 +0100
+@@ -77,7 +77,7 @@
+ /* dokey() records the last real key pressed  */
+ extern int LastKey;
+ 
+-extern struct mapping_t Menus[];
++extern struct mapping_t *Menus;
+ 
+ struct binding_t
+ {
--- /dev/null	2007-12-20 19:44:00.000000000 +0100
+++ files/patch-libmutt_sort.h	2007-12-20 19:33:14.000000000 +0100
@@ -0,0 +1,8 @@
+--- libmutt/sort.h.orig	2007-12-20 19:32:43.000000000 +0100
++++ libmutt/sort.h	2007-12-20 19:32:55.000000000 +0100
+@@ -45,4 +45,4 @@
+ WHERE short SortAux INITVAL (SORT_DATE); /* auxiallary sorting method */
+ WHERE short SortAlias INITVAL (SORT_ALIAS);
+ 
+-extern const struct mapping_t SortMethods[];
++extern const struct mapping_t *SortMethods;
--- _grn.diff ends here ---



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