Update to 3.2. From the changelog:

- Updated for bglibs v2.
- Fixed the authenticated test when used with Courier IMAP.
- Tweaked relay-ctrl-allow to only try to save a handle to the current
  working directory if it's going to execute another command later.
- Added support for logging environment settings in relay-ctrl-check.

4 files changed, 8 insertions, 55 deletions

diff --git a/mail/relay-ctrl/Makefile b/mail/relay-ctrl/Makefile
index 2fb1f5d54fb..d9ff1d58a62 100644
--- a/mail/relay-ctrl/Makefile
+++ b/mail/relay-ctrl/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.4 2016/12/31 16:58:46 schmonz Exp $
+# $NetBSD: Makefile,v 1.5 2017/01/02 02:19:02 schmonz Exp $
 #
 
-DISTNAME=	relay-ctrl-3.1.1
-PKGREVISION=	1
+DISTNAME=	relay-ctrl-3.2
 CATEGORIES=	mail
 MASTER_SITES=	${HOMEPAGE}
 
@@ -12,8 +11,6 @@ COMMENT=	Allows relaying via POP/IMAP-before-SMTP
 
 PKG_DESTDIR_SUPPORT=	destdir
 
-BUILD_DEPENDS+=		bglibs-[0-9]*:../../devel/bglibs
-
 DJB_RESTRICTED=		NO
 DJB_MAKE_TARGETS=	NO
 
@@ -55,5 +52,6 @@ post-install:
 			${DESTDIR}${PREFIX}/bin;			\
 	done
 
+.include "../../devel/bglibs/buildlink3.mk"
 .include "../../mk/djbware.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/relay-ctrl/distinfo b/mail/relay-ctrl/distinfo
index de1cf12f92b..b7af3db8c77 100644
--- a/mail/relay-ctrl/distinfo
+++ b/mail/relay-ctrl/distinfo
@@ -1,8 +1,6 @@
-$NetBSD: distinfo,v 1.3 2015/11/03 23:27:19 agc Exp $
+$NetBSD: distinfo,v 1.4 2017/01/02 02:19:02 schmonz Exp $
 
-SHA1 (relay-ctrl-3.1.1.tar.gz) = 01ae6eba6fff3b93761ce0bdd5ca7059a999d2d1
-RMD160 (relay-ctrl-3.1.1.tar.gz) = 48fa830f08b1ea3b37ca07d62cde05dc35388287
-SHA512 (relay-ctrl-3.1.1.tar.gz) = 738a001f6a058809955f04664919f261ff1a0bfc280ec5e805b870baf448b27664e1b376dd078100a2847e38248eb16651e23812f00609a437893e7b1dc9102c
-Size (relay-ctrl-3.1.1.tar.gz) = 35046 bytes
-SHA1 (patch-aa) = 0f1e7c51ad5a36d42d3abbeb82a160f337cd61bb
-SHA1 (patch-ab) = 8ba3ab5acb4a3493a56a4f26e56b2dac6c391378
+SHA1 (relay-ctrl-3.2.tar.gz) = 36379d81131d81446729e5b9ee94843b0bdf3410
+RMD160 (relay-ctrl-3.2.tar.gz) = 7e64c946432103ec25709585c8b2208ffc9d95ec
+SHA512 (relay-ctrl-3.2.tar.gz) = aa2c7516e330ba3c4f466848e59b60cf5649393c3f9c87a3a5e5dfa170f96b9b1ad519098dfa153f9e06f9e02bd48d2a22118e1e8ccfe3e2585250e8feb4e5af
+Size (relay-ctrl-3.2.tar.gz) = 23119 bytes
diff --git a/mail/relay-ctrl/patches/patch-aa b/mail/relay-ctrl/patches/patch-aa
deleted file mode 100644
index 598828b2514..00000000000
--- a/mail/relay-ctrl/patches/patch-aa
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2010/03/15 04:34:05 schmonz Exp $
-
---- INSTHIER.orig	2010-03-15 04:21:36.000000000 +0000
-+++ INSTHIER
-@@ -0,0 +1,14 @@
-+>bin
-+c:::755::relay-ctrl-allow
-+c:::755::relay-ctrl-age
-+c:::755::relay-ctrl-chdir
-+c:::755::relay-ctrl-check
-+c:::755::relay-ctrl-send
-+c:::755::relay-ctrl-udp
-+
-+>man
-+c:::644:man8:relay-ctrl-allow.8
-+c:::644:man8:relay-ctrl-age.8
-+c:::644:man8:relay-ctrl-check.8
-+c:::644:man8:relay-ctrl-send.8
-+c:::644:man8:relay-ctrl-udp.8
diff --git a/mail/relay-ctrl/patches/patch-ab b/mail/relay-ctrl/patches/patch-ab
deleted file mode 100644
index fce22ed4ad4..00000000000
--- a/mail/relay-ctrl/patches/patch-ab
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2010/03/15 04:34:05 schmonz Exp $
-
---- Makefile.orig	2002-04-26 16:07:38.000000000 +0000
-+++ Makefile
-@@ -6,7 +6,7 @@ SHELL=/bin/sh
- 
- DEFAULT: all
- 
--all: programs installer instcheck instshow
-+all: programs
- 
- authenticated.o: compile authenticated.c relay-ctrl.h net/socket.h net/ipv4.h
- 	./compile authenticated.c
-@@ -54,6 +54,10 @@ fork.h: compile load fork.h1 fork.h2 try
- 	  && cat fork.h2 || cat fork.h1 ) > fork.h
- 	rm -f tryvfork.o tryvfork
- 
-+install: INSTHIER conf-bin conf-man
-+	bg-installer -v <INSTHIER
-+	bg-installer -c <INSTHIER
-+
- installer: load installer.o insthier.o
- 	./load installer insthier.o
-