ports/74547: [PATCH] news/nn: Fix build on FreeBSD 5.3

[Sean Farley]

>Number:         74547
>Category:       ports
>Synopsis:       [PATCH] news/nn: Fix build on FreeBSD 5.3
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Tue Nov 30 05:30:28 GMT 2004
>Closed-Date:
>Last-Modified:
>Originator:     Sean Farley
>Release:        FreeBSD 5.3-RELEASE i386
>Organization:
>Environment:
System: FreeBSD thor.farley.org 5.3-RELEASE FreeBSD 5.3-RELEASE #0: Fri Nov  5 04:19:18 UTC
>Description:
Two changes to fix build on FreeBSD 5:
1. gcc (used to build ymakefile) v3.4 on FreeBSD 5 strips tabs and spaces.
   Changed sed script in nn's Makefile to compensate.
2. Changed port's Makefile to add -Iconf to CFLAGS.

I believe this should work with FreeBSD 4, but I no longer have a v4 system to
test with.

Port maintainer (jooji at nickelkid.com) is cc'd.

Generated with FreeBSD Port Tools 0.63
>How-To-Repeat:
>Fix:

--- nn-6.6.5.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/news/nn.orig/Makefile /usr/ports/news/nn/Makefile
--- /usr/ports/news/nn.orig/Makefile	Sat Sep 18 20:32:00 2004
+++ /usr/ports/news/nn/Makefile	Mon Nov 29 23:17:01 2004
@@ -15,17 +15,13 @@
 MAINTAINER=	jooji at nickelkid.com
 COMMENT=	Newsreader
 
-MAKE_ARGS=	CC="${CC}" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS} -s"
+MAKE_ARGS=	CC="${CC}" CFLAGS="${CFLAGS} -Iconf" LDFLAGS="${LDFLAGS} -s"
 
 MAN1=		nn.1 nncheck.1 nngoback.1 nngrab.1  nngrep.1 nnpost.1 \
 		nntidy.1 nnview.1 nnacct.1m nnadmin.1m nnstats.1m nnusage.1m
 MAN8=		nnmaster.8 nnspew.8
 
 .include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 502126
-BROKEN=		"Does not build on FreeBSD >= 5.x"
-.endif
 
 pre-patch:
 	@${CP} ${WRKSRC}/config.h-dist ${WRKSRC}/config.h.unparsed
diff -ruN --exclude=CVS /usr/ports/news/nn.orig/files/patch-ag /usr/ports/news/nn/files/patch-ag
--- /usr/ports/news/nn.orig/files/patch-ag	Fri May  7 09:38:46 2004
+++ /usr/ports/news/nn/files/patch-ag	Mon Nov 29 23:16:24 2004
@@ -1,14 +1,15 @@
 --- Makefile.orig	Thu Feb  7 22:14:41 2002
-+++ Makefile	Wed Apr 28 17:47:59 2004
-@@ -63,6 +64,7 @@
- 	    -e 's/^        /	/' \
++++ Makefile	Mon Nov 29 23:15:59 2004
+@@ -60,7 +60,7 @@
+ 	       -DCDEBUG="$(CFLAGS)" -Iconf MF.c | \
+ 	sed -e '1,/MAKE WILL CUT HERE/d' \
+ 	    -e '/^#/d' \
+-	    -e 's/^        /	/' \
++	    -e 's/^ /	/' \
  	    -e '/^[ \f	]$$/d' \
  	    -e '/^[ \/]*[*]/d' | \
-+	    unexpand | \
  	sed -n -e '/^..*$$/p' > ymakefile
- 	rm -f MF.c
- 
-@@ -97,3 +99,5 @@
+@@ -97,3 +97,5 @@
  man/nn.1.D: man/nn.1
  	sh SPLITNN1
  
--- nn-6.6.5.patch ends here ---

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