ports/59487: Fix news/newsfetch for FreeBSD 5.X

[Samy Al Bahra]

>Number:         59487
>Category:       ports
>Synopsis:       Fix news/newsfetch for FreeBSD 5.X
>Confidential:   no
>Severity:       critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Wed Nov 19 14:40:15 PST 2003
>Closed-Date:
>Last-Modified:
>Originator:     Samy Al Bahra
>Release:        FreeBSD 5.1-CURRENT i386
>Organization:
Kerneled 
>Environment:


System: FreeBSD beastie.freebsd.local 5.1-CURRENT FreeBSD 5.1-CURRENT #0: Wed Aug 20 18:35:24 AST 2003     samy at beastie.freebsd.local:/usr/src/sys/i386/compile/KERNELED i386  


>Description:


news/newsfetch does not build on 5.X
machines because it uses multistring literals
which is depreciated in gcc 3.X. The following
patch fixes this.


>How-To-Repeat:


Build with gcc 3.X.


>Fix:


diff -ruN newsfetch/Makefile /home/samy/tmp/newsfetch/Makefile
--- newsfetch/Makefile	Wed Nov 19 19:03:39 2003
+++ /home/samy/tmp/newsfetch/Makefile	Wed Nov 19 19:03:21 2003
@@ -20,12 +20,6 @@
 MAN1=		newsfetch.1
 MANCOMPRESSED=	maybe
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 501000
-BROKEN=		"Does not compile"
-.endif
-
 do-configure:
 	cd ${WRKSRC} && ( \
 	${ECHO_CMD} "PROG= newsfetch"; \
@@ -33,4 +27,4 @@
 	${ECHO_CMD} ".include <bsd.prog.mk>"; \
 	) > Makefile
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff -ruN newsfetch/files/patch-opt.c /home/samy/tmp/newsfetch/files/patch-opt.c
--- newsfetch/files/patch-opt.c	Thu Jan  1 03:00:00 1970
+++ /home/samy/tmp/newsfetch/files/patch-opt.c	Wed Nov 19 19:02:37 2003
@@ -0,0 +1,13 @@
+--- opt.c.orig	Wed Nov 19 19:01:47 2003
++++ opt.c	Wed Nov 19 19:01:47 2003
+@@ -192,8 +192,8 @@
+ {
+ 
+ char *options=
+-"	[-clsyvV] [-d dirname] [-f rcfile] [-t N] 
+-	[-T timeout] [-w M ] [-pPY filter] [-x command]
++"	[-clsyvV] [-d dirname] [-f rcfile] [-t N]\n\
++	[-T timeout] [-w M ] [-pPY filter] [-x command]\n\
+ ";	
+ 		fprintf(stderr,"Usage: %s nntp_server [options]\n", prog_name);
+ 		fprintf(stderr,"Options:\n%s\n",options);
diff -ruN newsfetch/files/patch-util.c /home/samy/tmp/newsfetch/files/patch-util.c
--- newsfetch/files/patch-util.c	Thu Jan  1 03:00:00 1970
+++ /home/samy/tmp/newsfetch/files/patch-util.c	Wed Nov 19 19:03:04 2003
@@ -0,0 +1,27 @@
+--- util.c.orig	Wed Nov 19 19:01:47 2003
++++ util.c	Wed Nov 19 19:01:47 2003
+@@ -61,15 +61,15 @@
+ FILE *fp, *fp1, *fp2;
+ char *tmp, buf[200], group[180], filterfile[100], procmailrcfile[100];
+ int i,j;
+-char *title="
+-
+-############### Generated by  Newsfetch ##############################
+-# New version of Newsfetch is available from                         #
+-#                                                                    #
+-#        http://ulf.wep.net/newsfetch.html                           #
+-# Feedback and Comments to Yusuf Motiwala <yusuf at scientist.com>      #
+-######################################################################
+-
++char *title="\n\
++\n\
++############### Generated by  Newsfetch ##############################\n\
++# New version of Newsfetch is available from                         #\n\
++#                                                                    #\n\
++#        http://ulf.wep.net/newsfetch.html                           #\n\
++# Feedback and Comments to Yusuf Motiwala <yusuf at scientist.com>      #\n\
++######################################################################\n\
++\n\
+ ";								     
+ 
+        	strcpy(filterfile,homedir);



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