Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 13 Feb 2019 01:01:13 +0000 (UTC)
From:      Craig Leres <leres@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r492818 - in head/dns/dsc: . files
Message-ID:  <201902130101.x1D11Dmm012234@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: leres
Date: Wed Feb 13 01:01:13 2019
New Revision: 492818
URL: https://svnweb.freebsd.org/changeset/ports/492818

Log:
  Undeprecate and retain GeoIP support by switching from net/GeoIP
  to net/libmaxminddb. Update pkg-message to document updating via
  net/geoipupdate. Remove pkg-descr whitespace flagged by portlint.
  
  PR:		234950
  Reviewed by:	ler (mentor)
  Approved by:	freebsd@dns.company (maintainer), ler (mentor)
  Differential Revision:	https://reviews.freebsd.org/D19173

Modified:
  head/dns/dsc/Makefile
  head/dns/dsc/files/pkg-message.in
  head/dns/dsc/pkg-descr

Modified: head/dns/dsc/Makefile
==============================================================================
--- head/dns/dsc/Makefile	Wed Feb 13 00:22:59 2019	(r492817)
+++ head/dns/dsc/Makefile	Wed Feb 13 01:01:13 2019	(r492818)
@@ -3,6 +3,7 @@
 
 PORTNAME=	dsc
 PORTVERSION=	2.7.0
+PORTREVISION=	1
 CATEGORIES=	dns
 MASTER_SITES=	https://www.dns-oarc.net/files/dsc/ \
 		https://dns.company/files/dsc/
@@ -13,18 +14,16 @@ COMMENT=	Tool used for collecting and exploring statis
 LICENSE=	BSD3CLAUSE
 
 BUILD_DEPENDS=	${RUN_DEPENDS}
-RUN_DEPENDS=	libpcap>=1.8.1:net/libpcap			\
-		GeoIP>=1.6.12:net/GeoIP				\
-		p5-Proc-PID-File>=1.28:devel/p5-Proc-PID-File	\
-		p5-XML-Simple>=2.24:textproc/p5-XML-Simple	\
+RUN_DEPENDS=	libpcap>=1.8.1:net/libpcap \
+		p5-Proc-PID-File>=1.28:devel/p5-Proc-PID-File \
+		p5-XML-Simple>=2.24:textproc/p5-XML-Simple \
 		dsp>=2.0.0:dns/dsp
+LIB_DEPENDS=	libmaxminddb.so:net/libmaxminddb
 
-DEPRECATED=     Uses legacy GeoIP 1 format which no longer works; switch to GeoIP 2 where possible
-EXPIRATION_DATE=2019-02-15
+USES=		gmake perl5 shebangfix
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-extra-cflags=-I${LOCALBASE}/include
-USES=		gmake perl5 shebangfix
 
 SUB_FILES=	pkg-message
 

Modified: head/dns/dsc/files/pkg-message.in
==============================================================================
--- head/dns/dsc/files/pkg-message.in	Wed Feb 13 00:22:59 2019	(r492817)
+++ head/dns/dsc/files/pkg-message.in	Wed Feb 13 01:01:13 2019	(r492818)
@@ -1,7 +1,7 @@
 ###########################################
 
 Before you configure:
-To obtain MaxMind's GeoIP tables,
-run %%LOCALBASE%%/bin/geoipupdate.sh manually.
+To obtain MaxMind's GeoIP tables, install net/geoipupdate
+and run %%LOCALBASE%%/bin/geoipupdate manually.
 
 ###########################################

Modified: head/dns/dsc/pkg-descr
==============================================================================
--- head/dns/dsc/pkg-descr	Wed Feb 13 00:22:59 2019	(r492817)
+++ head/dns/dsc/pkg-descr	Wed Feb 13 01:01:13 2019	(r492818)
@@ -5,6 +5,6 @@ running on or near nameservers sending their data to o
 central presenters for display and archiving. Collectors use pcap to
 sniff network traffic. They transmit aggregated data to the presenter
 as XML data. dsc is configurable to allow the administrator to capture
-any kind of data that he or she chooses. 
+any kind of data that he or she chooses.
 
 WWW: https://www.dns-oarc.net/tools/dsc/



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