freevrrpd: More cleanup Also, conditionalize linking in FreeBSD netgraph support

[Hauke Fath <hauke%NetBSD.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Hauke Fath <hauke%NetBSD.org@localhost>
Pushed By:	hauke
Date:		Wed Mar 15 12:27:56 2017 +0100
Changeset:	2e7127804503e83e84240f4732ea43ec37746140

Modified Files:
	freevrrpd/distinfo
	freevrrpd/patches/patch-Makefile

Log Message:
freevrrpd: More cleanup
Also,  conditionalize linking in FreeBSD netgraph support

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=2e7127804503e83e84240f4732ea43ec37746140

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 freevrrpd/distinfo               |  2 +-
 freevrrpd/patches/patch-Makefile | 30 +++++++++++++++++++++++++-----
 2 files changed, 26 insertions(+), 6 deletions(-)

diffs:
diff --git a/freevrrpd/distinfo b/freevrrpd/distinfo
index 6cfa71a06b..13a95f76a0 100644
--- a/freevrrpd/distinfo
+++ b/freevrrpd/distinfo
@@ -4,7 +4,7 @@ SHA1 (freevrrpd-1.1.tar.gz) = 182d665bb5513b2b78d53dbf782f28f76a54e9db
 RMD160 (freevrrpd-1.1.tar.gz) = 899bd069e08aa7958d5c1e8f045037a27ea9bbd7
 SHA512 (freevrrpd-1.1.tar.gz) = 342203c766678aca6b211c7f7ca4fa1189efec4fa7bd26fdf1999b8f824274ec0302cb2b2570a24ea1a3ed561f152fb1c886ecb16fa794b5dcd29799906e4f05
 Size (freevrrpd-1.1.tar.gz) = 41852 bytes
-SHA1 (patch-Makefile) = 77b814b71ef6a6e10a8655e5dc6401caf2ab1b0b
+SHA1 (patch-Makefile) = e4a0bcdacaa874dca97da6d8698bff6dc0ab8223
 SHA1 (patch-vrrp_ah.h) = 976f5e210d35afbfe80714f1988a4e4a8e11124e
 SHA1 (patch-vrrp_conf.c) = 191f41ad809e8ec34429a0721780e4458279a1c2
 SHA1 (patch-vrrp_interface.c) = a0eabdc0a30ab5b6249740a0efddc7410dc9cd84
diff --git a/freevrrpd/patches/patch-Makefile b/freevrrpd/patches/patch-Makefile
index be00eedbae..f7dc1c90bb 100644
--- a/freevrrpd/patches/patch-Makefile
+++ b/freevrrpd/patches/patch-Makefile
@@ -4,7 +4,7 @@ Clean up and make usable for NetBSD - maybe we should just use a separate Makefi
 
 --- Makefile.orig	2015-02-04 00:39:49.000000000 +0000
 +++ Makefile
-@@ -2,13 +2,14 @@
+@@ -2,30 +2,19 @@
  
  PROG=		freevrrpd
 -SRCS=		vrrp_misc.c vrrp_multicast.c vrrp_main.c vrrp_thread.c vrrp_state.c vrrp_network.c vrrp_interface.c vrrp_conf.c vrrp_signal.c vrrp_list.c vrrp_vlanlist.c vrrp_moncircuit.c md5.c vrrp_ah.c vrrp_netgraph.c
@@ -22,8 +22,28 @@ Clean up and make usable for NetBSD - maybe we should just use a separate Makefi
 -#LDADD=		-fomit-frame-pointer -ansi -lm -pthread -lipsec
 -# end of AH
 -LDADD=		-static -lm -pthread -lutil -lnetgraph
-+CFLAGS=		-O2 -Wall -pedantic -D_REENTRANT -ggdb -DENABLE_VRRP_AH
-+
+-WARNS=		0
+-BINDIR=		/usr/local/sbin
+-MANDIR=		/usr/local/man/man
++CFLAGS=		-O2 -Wall -pedantic -D_REENTRANT -DENABLE_VRRP_AH
+ 
+-# Must write a man page
+-MAN=	freevrrpd.8
+-MAN8=	freevrrpd.8
 +LDADD=		-lm -pthread -lutil
- WARNS=		0
- BINDIR=		/usr/local/sbin
++.if defined(__FreeBSD__)
++LDADD+=		-lnetgraph
++.endif
+ 
+-beforeinstall:
+-	@echo "Installing files..."
+-	install -c -o root -g wheel -m 644 freevrrpd.conf.sample /usr/local/etc
+-	install -c -o root -g wheel -m 755 freevrrpd.sh.sample /usr/local/etc/rc.d
+-	@echo "#####################################################################"
+-	@echo "# !! WARNING !! You must copy /usr/local/etc/vrrpd.conf.sample to   #"
+-	@echo "# /usr/local/etc/vrrpd.conf and configure /usr/local/etc/vrrpd.conf #"
+-	@echo "# before running vrrpd. to run vrrpd type /usr/local/sbin/vrrpd  #"
+-	@echo "#####################################################################"
++MAN=	freevrrpd.8
+ 
+ .include <bsd.prog.mk>