ports/58285: Fix sysutils/prips build on 5.X

[Samy Al Bahra]

>Number:         58285
>Category:       ports
>Synopsis:       Fix sysutils/prips build on 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:   Mon Oct 20 08:20:18 PDT 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:


sysutils/prips does not build on
5.X due to unterminated literals
(depreciated in gcc 3.X). The patch
included fixes this.


>How-To-Repeat:


Build on 5.X.


>Fix:


diff -ruN prips/Makefile /tmp/prips/Makefile
--- prips/Makefile	Mon Oct 20 18:07:19 2003
+++ /tmp/prips/Makefile	Mon Oct 20 18:10:49 2003
@@ -18,10 +18,6 @@
 
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} >= 501000
-BROKEN=		"Does not compile"
-.endif
-
 do-install:
 	@${INSTALL_PROGRAM} ${WRKSRC}/prips ${PREFIX}/bin
 
diff -ruN prips/files/patch-ab /tmp/prips/files/patch-ab
--- prips/files/patch-ab	Mon Oct 20 18:09:58 2003
+++ /tmp/prips/files/patch-ab	Thu Jan  1 03:00:00 1970
@@ -1,12 +0,0 @@
---- prips.c.orig	Tue Jan 11 20:26:36 2000
-+++ prips.c	Tue Jan 11 20:26:38 2000
-@@ -1,8 +1,8 @@
-+#include "prips.h"
- #include <stdio.h>
- #include <stdlib.h>
- #include <math.h>
- #include <arpa/inet.h>
--#include "prips.h"
- 
- #if !defined(INET_ADDRSTRLEN)
- #define INET_ADDRSTRLEN 16
diff -ruN prips/files/patch-main.c /tmp/prips/files/patch-main.c
--- prips/files/patch-main.c	Thu Jan  1 03:00:00 1970
+++ /tmp/prips/files/patch-main.c	Mon Oct 20 18:04:48 2003
@@ -0,0 +1,52 @@
+--- main.c.orig	Mon Oct 20 17:59:26 2003
++++ main.c	Mon Oct 20 18:02:56 2003
+@@ -1,9 +1,9 @@
+ /* program that prints IP address ranges */
++#include "prips.h"
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
+ #include <unistd.h>
+-#include "prips.h"
+ #include "except.h"
+ 
+ typedef enum {
+@@ -16,11 +16,11 @@
+ 
+ const char *MAINTAINER = "dan at vertekcorp.com";
+ const char *VERSION =
+-	"\rprips 0.9.4
+-	\rThis program comes with NO WARRANTY,
+-	\rto the extent permitted by law.
+-	\rYou may redistribute copies under 
+-	\rthe terms of the GNU General Public License.\n";
++	"\rprips 0.9.4\n"\
++"	\rThis program comes with NO WARRANTY,\n"\
++"	\rto the extent permitted by law.\n"\
++"	\rYou may redistribute copies under\n"\
++"	\rthe terms of the GNU General Public License.\n";
+ 
+ void usage(char *prog);
+ AddrFormat get_format(char *format);
+@@ -166,14 +166,13 @@
+ 
+ void usage(char *prog)
+ {
+-	fprintf(stderr, "usage: %s [options] <start end | CIDR block>
+-	-c		print range in CIDR notation
+-	-d <x>		set the delimeter 'x' where 0 =< x =< 255 
+-	-f <x> 		set the format of addresses (hex, dec, or dot)
+-	-i <x>		set the increment to 'x'
+-	-e <x.x.x,x.x>	e.g. -e ..4. will not print 192.168.4.[0-255]
+-	
+-	\rReport bugs to %s\n",
++	fprintf(stderr, "usage: %s [options] <start end | CIDR block>\n"\
++"	-c		print range in CIDR notation\n"\
++"	-d <x>		set the delimeter 'x' where 0 =< x =< 255\n"\
++"	-f <x> 		set the format of addresses (hex, dec, or dot)\n"\
++"	-i <x>		set the increment to 'x'\n"\
++"	-e <x.x.x,x.x>	e.g. -e ..4. will not print 192.168.4.[0-255]\n\n"\
++"	\rReport bugs to %s\n",
+ 			prog, MAINTAINER);
+ }
+ 



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