Skip site navigation (1)Skip section navigation (2)
Date:      3 Nov 2010 20:00:49 +0300
From:      "Alexey V.Degtyarev" <alexey@renatasystems.org>
To:        FreeBSD-gnats-submit@FreeBSD.org
Subject:   ports/151920: net-mgmt/grepcidr - fix OPTIONS error and make portlint happy.
Message-ID:  <20101103170049.91014.qmail@hs-9.renatasystems.org>
Resent-Message-ID: <201011031710.oA3HA6xp049975@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         151920
>Category:       ports
>Synopsis:       net-mgmt/grepcidr - fix OPTIONS error and make portlint happy.
>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:   Wed Nov 03 17:10:05 UTC 2010
>Closed-Date:
>Last-Modified:
>Originator:     Alexey V. Degtyarev
>Release:        FreeBSD 8.0-RELEASE amd64
>Organization:
>Environment:
System: FreeBSD renatasystems.org 8.0-RELEASE FreeBSD 8.0-RELEASE #0: Sat Nov 21 15:02:08 UTC 2009 root@mason.cse.buffalo.edu:/usr/obj/usr/src/sys/GENERIC amd64


	
>Description:
net-mgmt/grepcidr was broken with ports/141437: the SEARCH option required
EXTRA_PATCH find_anywhere.diff, but the file actually was named as
patch-grepcidr.c. By selecting that option port fails to build. But in other
case, with default option set the patch still applies as it named like all
FreeBSD distribution patches names (patch-***).

So I decide to remove that option, because,

- it is really useful;

- it has been tested for almost one year as it implicitely applied after ports/141437;

- just for simplicity;

Also, portlint complains about unsupported checksum algorithm found in distinfo
(MD5), so I updated checksums with SHA256 and add one more MASTER_SITE
maintained by me.

>How-To-Repeat:
	
>Fix:

	

--- grepcidr-nooptions.patch begins here ---
diff -Nru grepcidr.orig/Makefile grepcidr/Makefile
--- grepcidr.orig/Makefile	2010-01-15 19:16:24.000000000 +0000
+++ grepcidr/Makefile	2010-11-03 16:50:01.000000000 +0000
@@ -9,21 +9,14 @@
 PORTVERSION=	1.3
 PORTREVISION=	1
 CATEGORIES=	net-mgmt textproc
-MASTER_SITES=	http://www.pc-tools.net/files/unix/
+MASTER_SITES=	http://www.pc-tools.net/files/unix/ \
+		ftp://ftp.renatasystems.org/pub/FreeBSD/ports/distfiles/
 
 MAINTAINER=	doug+ports@idmf.net
 COMMENT=	Filter IP addresses matching IPv4 CIDR/network specification
 
-OPTIONS=	SEARCH		"Enable pattern search anywhere in line" off
-
 PLIST_FILES=	bin/grepcidr
 
-.include <bsd.port.pre.mk>
-
-.if defined(WITH_SEARCH)
-EXTRA_PATCHES+=	${FILESDIR}/find_anywhere.diff
-.endif
-
 do-configure:
 	@${REINPLACE_CMD} \
 		-e 's|/usr/local/bin|${PREFIX}/bin|' \
@@ -31,4 +24,4 @@
 		-e 's|gcc|${CC}|' \
 		${WRKSRC}/Makefile
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff -Nru grepcidr.orig/distinfo grepcidr/distinfo
--- grepcidr.orig/distinfo	2006-02-01 01:08:04.000000000 +0000
+++ grepcidr/distinfo	2010-11-03 16:47:45.000000000 +0000
@@ -1,3 +1,2 @@
-MD5 (grepcidr-1.3.tar.gz) = 7ccade25ce9fe6d6a02348ba8e4cf4a3
 SHA256 (grepcidr-1.3.tar.gz) = 2bef080fe2efd9d82326fa41f3b1cca6b7ecbdac7b3c53f3db8fe0da5ab8fb81
 SIZE (grepcidr-1.3.tar.gz) = 21691
--- grepcidr-nooptions.patch ends here ---


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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20101103170049.91014.qmail>