Update to 3.54

* Use distfile's install target.
* Add comments to patches.

Changelog:
    3.54: A bug with hash_fold() regarding incoming IPv4 and IPv6 source addresses has been fixed. The "hash" group mechanism is now working as expected.
    3.52: Buffering has been disabled for interactive shell IO. A new "assign" command has been added to allow changing of the host:port assignment of a channel (only if disabled). A locking bug has been fixed.
    3.50: A new option -6 has been added to force IPv6 bind.
    3.49: A patch has been applied due to a problem with ftok() on Solaris.
    3.48: Problems with setting IPV6_V6ONLY socket option are now handled more nicely with a syslog warning message.
    3.42: Balance now compiles also on systems where IPV6_V6ONLY is undefined (like some Solaris systems).
    3.40: IPv6 support on the listening side has been added. MAXCHANNELS in balance.h has been increased to 64.
    3.35: A bug in the autodisable functionality has been fixed.
    3.34: -a option added (enables "autodisable" option: A channel needs to be manually re-enabled after a failure). Syslog logging added for reporting this event.
    3.33: -M option added (use MMAP instead of SHM for IPC)
    3.32: Bugfix: /var/run/balance may now already exist.
    3.31: Bugfix: TCP_NODELAY properly set.
    3.30: Code cleanups and fixes.

4 files changed, 61 insertions, 45 deletions

diff --git a/net/balance/Makefile b/net/balance/Makefile
index 44d6c05de37..8886da51aca 100644
--- a/net/balance/Makefile
+++ b/net/balance/Makefile
@@ -1,20 +1,19 @@
-# $NetBSD: Makefile,v 1.5 2012/10/23 17:18:10 asau Exp $
+# $NetBSD: Makefile,v 1.6 2013/06/16 08:09:11 ryoon Exp $
 #
 
-DISTNAME=	balance-3.15
+DISTNAME=	balance-3.54
 CATEGORIES=	net
 MASTER_SITES=	http://www.inlab.de/
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.inlab.de/balance.html
 COMMENT=	TCP loadbalancer with roundrobin and failover
+LICENSE=	gnu-gpl-v2
 
-BUILD_TARGET=	balance
+BUILD_DEFS+=	VARBASE
+MAKE_ENV+=	VARBASE=${VARBASE}
 
-INSTALLATION_DIRS=	sbin ${PKGMANDIR}/man1
-
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/balance ${DESTDIR}${PREFIX}/sbin/
-	${INSTALL_MAN} ${WRKSRC}/balance.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/
+OWN_DIRS_PERMS=	${VARBASE}/run/balance \
+		${ROOT_USER} ${ROOT_GROUP} 0750
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/balance/distinfo b/net/balance/distinfo
index 5c427717646..3d2ba59777d 100644
--- a/net/balance/distinfo
+++ b/net/balance/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.4 2006/03/14 02:06:28 joerg Exp $
+$NetBSD: distinfo,v 1.5 2013/06/16 08:09:11 ryoon Exp $
 
-SHA1 (balance-3.15.tar.gz) = fe9a9999c97faced30b2b23c416f68d69877cea2
-RMD160 (balance-3.15.tar.gz) = 73c8be6273fb14373661b73c6235426fa7c29ed3
-Size (balance-3.15.tar.gz) = 21022 bytes
-SHA1 (patch-aa) = 45aeeeec91c2f4b7beaa1cf9dba45ae87f1896b1
-SHA1 (patch-ab) = f24922148ef2d84b914d832749dbc9959f856fe3
+SHA1 (balance-3.54.tar.gz) = 978ddb395909438a31288f0fad4d163ae997a51b
+RMD160 (balance-3.54.tar.gz) = 8b97da7dc0e8da0af38280671f586aae4f754a2d
+Size (balance-3.54.tar.gz) = 35166 bytes
+SHA1 (patch-aa) = f518008dd5d6e5088197ccfc4135029a797f578b
+SHA1 (patch-ab) = b06c77231c223250f9dc20789d972f8e63dca9fa
diff --git a/net/balance/patches/patch-aa b/net/balance/patches/patch-aa
index 145acac97a8..89907328725 100644
--- a/net/balance/patches/patch-aa
+++ b/net/balance/patches/patch-aa
@@ -1,40 +1,55 @@
-$NetBSD: patch-aa,v 1.1.1.1 2005/10/28 20:46:26 minskim Exp $
+$NetBSD: patch-aa,v 1.2 2013/06/16 08:09:11 ryoon Exp $
 
---- Makefile.orig	2004-05-27 07:24:30.000000000 -0500
+* Adjust for pkgsrc installation.
+
+--- Makefile.orig	2010-12-03 12:50:22.000000000 +0000
 +++ Makefile
 @@ -2,5 +2,5 @@
  
  #CFLAGS=-g -I.
--CFLAGS=-O2 -Wall
-+#CFLAGS=-O2 -Wall
- 
- # uncomment for Solaris:
-@@ -16,12 +16,12 @@ ROOT=root
+-CFLAGS=-O2 -Wall -Wstrict-prototypes -Wuninitialized
++#CFLAGS=-O2 -Wall -Wstrict-prototypes -Wuninitialized
+ 
+ # uncomment for any OS other than Cygwin
+@@ -8,5 +8,5 @@ BALANCE=balance
+ ROOT=root
+ INSTALL=install
+-BINDIR=/usr/sbin
++BINDIR=${PREFIX}/sbin
+ MANDIR=${BINDIR}/../man/man1
+ 
+@@ -21,5 +21,5 @@ MANDIR=${BINDIR}/../man/man1
  # ROOT=Administrators
  
 -CC=gcc
 +#CC=gcc
- RELEASE=3.15
+ RELEASE=3.54
+ 
+@@ -27,8 +27,8 @@ all: balance 
  
- balance:	balance.c butils.o balance.h
--		$(CC) $(CFLAGS) -I. -o balance balance.c butils.o $(LIBRARIES)
-+		$(CC) ${CPPFLAGS} $(CFLAGS) -I. -o balance balance.c butils.o $(LIBRARIES)
+ balance: balance.o butils.o
+-	$(CC) $(CFLAGS) -I. -o balance balance.o butils.o $(LIBRARIES)
++	$(CC) ${CPPFLAGS} $(CFLAGS) -I. -o balance balance.o butils.o $(LIBRARIES)
  
- butils.o:	butils.c balance.h
--		$(CC) $(CFLAGS) -I. -c butils.c
-+		$(CC) ${CPPFLAGS} $(CFLAGS) -I. -c butils.c
+ balance.o: balance.c balance.h
+-	$(CC) $(CFLAGS) -I. -c balance.c
++	$(CC) ${CPPFLAGS} $(CFLAGS) -I. -c balance.c
  
- ci:		
-@@ -34,8 +34,8 @@ clean:
+ butils.o: butils.c balance.h
+@@ -49,10 +49,12 @@ clean:
  
  install:
--		install -o $(ROOT) -g $(ROOT) -m 755  $(BALANCE) $(DESTIDIR)/usr/sbin/$(BALANCE) 
--		install -o $(ROOT) -g $(ROOT) -m 755  balance.1 $(DESTIDIR)/usr/man/man1 
--		mkdir -p $(DESTIDIR)/var/run/balance
--		chmod 1777 $(DESTIDIR)/var/run/balance
-+		${BSD_INSTALL_PROGRAM} $(BALANCE) $(DESTIDIR)/usr/sbin/$(BALANCE) 
-+		${BSD_INSTALL_MAN} balance.1 $(DESTIDIR)/usr/man/man1 
-+		mkdir -p ${VARBASE}/run/balance
-+		chmod 1777 ${VARBASE}/run/balance
- 
- release:
+-	$(INSTALL) -o $(ROOT) -g $(ROOT) -m 755  $(BALANCE) \
++	${BSD_INSTALL_PROGRAM_DIR} $(DESTDIR)$(BINDIR)
++	${BSD_INSTALL_PROGRAM} $(BALANCE) \
+ 		$(DESTDIR)$(BINDIR)/$(BALANCE) 
+-	$(INSTALL) -o $(ROOT) -g $(ROOT) -m 755  balance.1 \
++	${BSD_INSTALL_MAN_DIR} $(DESTDIR)$(MANDIR)
++	${BSD_INSTALL_MAN} balance.1 \
+ 		$(DESTDIR)$(MANDIR) 
+-	mkdir -p $(DESTDIR)/var/run/balance
+-	chmod 1777 $(DESTDIR)/var/run/balance
++	mkdir -p $(DESTDIR)${VARBASE}/run/balance
++	chmod 1777 $(DESTDIR)${VARBASE}/run/balance
+ 
+ release: balance.pdf
diff --git a/net/balance/patches/patch-ab b/net/balance/patches/patch-ab
index 7c25d8674c9..298c7f7b090 100644
--- a/net/balance/patches/patch-ab
+++ b/net/balance/patches/patch-ab
@@ -1,10 +1,12 @@
-$NetBSD: patch-ab,v 1.4 2006/03/14 02:06:28 joerg Exp $
+$NetBSD: patch-ab,v 1.5 2013/06/16 08:09:11 ryoon Exp $
 
---- balance.h.orig	2004-05-27 12:24:30.000000000 +0000
+* Treat *BSD as BSD.
+
+--- balance.h.orig	2010-12-03 12:50:22.000000000 +0000
 +++ balance.h
-@@ -6,7 +6,7 @@
- #include <signal.h>
- #include <stdlib.h>
+@@ -20,7 +20,7 @@
+ #include <sys/mman.h>
+ #endif
  
 -#ifdef __FreeBSD__
 +#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__APPLE__) || defined(__INTERIX) || defined(__DragonFly__)