Date: Tue, 28 Aug 2018 00:45:53 +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: r478274 - in head/dns/dsc: . files Message-ID: <201808280045.w7S0jrIP048733@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: leres Date: Tue Aug 28 00:45:52 2018 New Revision: 478274 URL: https://svnweb.freebsd.org/changeset/ports/478274 Log: Update to 2.7.0. Add --with-extra-cflags=-I${PREFIX}/include so configure finds pcap/sll.h. Add a rc.d script. Fix the path to the config directory in upload-prep.pl or else it silently exits without doing anything when it doesn't find any configs. PR: 230661 Reviewed by: ler (mentor) Approved by: Leo Vandewoestijn (maintainer), ler (mentor) Differential Revision: https://reviews.freebsd.org/D16925 Added: head/dns/dsc/files/dsc.in (contents, props changed) Modified: head/dns/dsc/Makefile head/dns/dsc/distinfo head/dns/dsc/files/patch-cron_upload-prep.pl Modified: head/dns/dsc/Makefile ============================================================================== --- head/dns/dsc/Makefile Tue Aug 28 00:35:28 2018 (r478273) +++ head/dns/dsc/Makefile Tue Aug 28 00:45:52 2018 (r478274) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= dsc -PORTVERSION= 2.6.1 +PORTVERSION= 2.7.0 CATEGORIES= dns MASTER_SITES= https://www.dns-oarc.net/files/dsc/ \ https://dns.company/files/dsc/ @@ -19,10 +19,12 @@ RUN_DEPENDS= libpcap>=1.8.1:net/libpcap \ p5-XML-Simple>=2.24:textproc/p5-XML-Simple \ dsp>=2.0.0:dns/dsp - GNU_CONFIGURE= yes +CONFIGURE_ARGS+= --with-extra-cflags=-I${PREFIX}/include USES= gmake perl5 shebangfix SUB_FILES= pkg-message + +USE_RC_SUBR= dsc .include <bsd.port.mk> Modified: head/dns/dsc/distinfo ============================================================================== --- head/dns/dsc/distinfo Tue Aug 28 00:35:28 2018 (r478273) +++ head/dns/dsc/distinfo Tue Aug 28 00:45:52 2018 (r478274) @@ -1,3 +1,3 @@ -TIMESTAMP = 1520903828 -SHA256 (dsc-2.6.1.tar.gz) = e11019dc8cebd971bec420bb28dc97acc851dfd328c5d40bbf6b41df467db285 -SIZE (dsc-2.6.1.tar.gz) = 320065 +TIMESTAMP = 1534374842 +SHA256 (dsc-2.7.0.tar.gz) = eab7f79229a800087d96cb8bac39927558f1d512428d7825d5edb5f7064d2c31 +SIZE (dsc-2.7.0.tar.gz) = 325520 Added: head/dns/dsc/files/dsc.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/dns/dsc/files/dsc.in Tue Aug 28 00:45:52 2018 (r478274) @@ -0,0 +1,42 @@ +#!/bin/sh +# +# $FreeBSD$ +# + +# PROVIDE: dsc +# REQUIRE: DAEMON +# KEYWORD: shutdown + +# Add the following lines to +# /etc/rc.conf.d/dsc /etc/rc.conf.local or /etc/rc.conf +# to enable this service: +# +# dsc_enable (bool): Set to NO by default. +# Set it to YES to enable dsc. +# dsc_config (path): Set to %%PREFIX%%/etc/dsc/dsc.conf +# by default. +# dsc_pidfile (path): Set to /var/run/dsc.pid +# by default (must match pid_file setting in dsc.conf). +# dsc_flags (additional arguments): Set to -p (don't use promiscuous mode) +# by default. +# + +. /etc/rc.subr + +name="dsc" +rcvar=dsc_enable + +command=%%PREFIX%%/bin/${name} + +load_rc_config $name + +: ${dsc_enable="NO"} +: ${dsc_config="%%PREFIX%%/etc/${name}/${name}.conf"} +: ${dsc_pidfile="/var/run/${name}.pid"} +: ${dsc_flags="-p"} + +required_files="${dsc_config}" +pidfile="${dsc_pidfile}" +command_args="${dsc_config}" + +run_rc_command "$1" Modified: head/dns/dsc/files/patch-cron_upload-prep.pl ============================================================================== --- head/dns/dsc/files/patch-cron_upload-prep.pl Tue Aug 28 00:35:28 2018 (r478273) +++ head/dns/dsc/files/patch-cron_upload-prep.pl Tue Aug 28 00:45:52 2018 (r478274) @@ -1,4 +1,4 @@ ---- cron/upload-prep.pl.orig 2018-03-13 22:05:23 UTC +--- cron/upload-prep.pl.orig 2017-08-21 08:14:08 UTC +++ cron/upload-prep.pl @@ -1,4 +1,4 @@ -#!/usr/bin/perl @@ -6,3 +6,12 @@ # # Copyright (c) 2016-2017, OARC, Inc. # Copyright (c) 2007, The Measurement Factory, Inc. +@@ -54,7 +54,7 @@ exit 0 if Proc::PID::File->running(dir = + sleep 3; + + +-foreach my $conf (</usr/local/dsc/etc/*.conf>) { ++foreach my $conf (</usr/local/etc/dsc/*.conf>) { + next unless open (CONF, $conf); + my $rundir = undef; + while (<CONF>) {
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201808280045.w7S0jrIP048733>