Index: dns/dsc/Makefile =================================================================== --- dns/dsc/Makefile +++ dns/dsc/Makefile @@ -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 @@ 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 Index: dns/dsc/distinfo =================================================================== --- dns/dsc/distinfo +++ dns/dsc/distinfo @@ -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 Index: dns/dsc/files/dsc.in =================================================================== --- /dev/null +++ dns/dsc/files/dsc.in @@ -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" Index: dns/dsc/files/patch-cron_upload-prep.pl =================================================================== --- dns/dsc/files/patch-cron_upload-prep.pl +++ dns/dsc/files/patch-cron_upload-prep.pl @@ -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 () { ++foreach my $conf () { + next unless open (CONF, $conf); + my $rundir = undef; + while () {