From f32d6877bf4a070d54aac18cc28fc7a924bcc02d Mon Sep 17 00:00:00 2001 From: Alex Kozlov Date: Thu, 18 May 2017 20:07:30 +0000 Subject: [PATCH] - Fix build with bmake - Remove SF from MASTER_SITES, upstream moved to github, but there is no distfile for 1.24.1 on it PR: 218831 Approved by: zi (maintainer) --- net/hsflowd/Makefile | 4 +-- net/hsflowd/files/patch-src_FreeBSD_Makefile | 38 ++++++++++++++++++++ 2 files changed, 39 insertions(+), 3 deletions(-) create mode 100644 net/hsflowd/files/patch-src_FreeBSD_Makefile diff --git a/net/hsflowd/Makefile b/net/hsflowd/Makefile index 607af78c0bfe..233b875365c3 100644 --- a/net/hsflowd/Makefile +++ b/net/hsflowd/Makefile @@ -4,13 +4,11 @@ PORTNAME= hsflowd PORTVERSION= 1.24.1 CATEGORIES= net -MASTER_SITES= SF/host-sflow/Latest/ \ - http://mirrors.rit.edu/zi/ +MASTER_SITES= http://mirrors.rit.edu/zi/ MAINTAINER= zi@FreeBSD.org COMMENT= Agent that exports metrics using the sFlow protocol -USES= fmake SUB_FILES= pkg-message USE_RC_SUBR= ${PORTNAME} MAKE_ENV= BINDIR=${PREFIX}/sbin INITDIR=${PREFIX}/etc/rc.d \ diff --git a/net/hsflowd/files/patch-src_FreeBSD_Makefile b/net/hsflowd/files/patch-src_FreeBSD_Makefile new file mode 100644 index 000000000000..7db06ec2c9bf --- /dev/null +++ b/net/hsflowd/files/patch-src_FreeBSD_Makefile @@ -0,0 +1,38 @@ +--- src/FreeBSD/Makefile.orig 2017-03-13 18:07:09 UTC ++++ src/FreeBSD/Makefile +@@ -1,22 +1,22 @@ + # This software is distributed under the following license: + # http://host-sflow.sourceforge.net/license.html + +-.if empty $(BINDIR) ++.if empty(BINDIR) + BINDIR=/usr/sbin + .endif + +-.if empty $(INITDIR) ++.if empty(INITDIR) + INITDIR=/etc/rc.d + .endif + +-.if empty $(CONFDIR) ++.if empty(CONFDIR) + CONFDIR=/etc + .endif + + INSTALL=install + + # INSTROOT may be passed in, e.g. RPM_BUILD_ROOT +-.if empty $(INSTROOT) ++.if empty(INSTROOT) + BIN_D=$(BINDIR) + INIT_D=$(INITDIR) + CONF_D=$(CONFDIR) +@@ -36,7 +36,7 @@ CC= gcc -std=gnu99 + OPT_FULL = -O3 -DNDEBUG + OPT_DEBUG = -g -ggdb + +-.if empty $(OPT) ++.if empty(OPT) + OPT=$(OPT_FULL) + .endif +