Don't call libtool --mode=finish without argument. Fix a sign cast to

avoid a clang warning made fatal by -Werror.

3 files changed, 29 insertions, 10 deletions

diff --git a/net/openvpn-nagios/distinfo b/net/openvpn-nagios/distinfo
index 47a61d08d35..6cf8cc276b5 100644
--- a/net/openvpn-nagios/distinfo
+++ b/net/openvpn-nagios/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.1 2013/02/10 05:57:41 manu Exp $
+$NetBSD: distinfo,v 1.2 2013/03/26 23:32:49 joerg Exp $
 
 SHA1 (openvpn-2.3.0.tar.gz) = 18b51f7ba0b9e18939451d7787c00e04165efe90
 RMD160 (openvpn-2.3.0.tar.gz) = f24ac128fcd874bf40e8ffd5161065e84170d69f
@@ -6,4 +6,5 @@ Size (openvpn-2.3.0.tar.gz) = 1130659 bytes
 SHA1 (openvpn-nagios-20130210.tgz) = 8a0fd4e3eba27584aa53c5589c13d4b38af43ba2
 RMD160 (openvpn-nagios-20130210.tgz) = 2a47893ec2db2c280adc7b9fbbea97794ec1a6f4
 Size (openvpn-nagios-20130210.tgz) = 3034 bytes
-SHA1 (patch-aa) = 272401960c17de892dc7783a4133b80dec5e909e
+SHA1 (patch-aa) = fe38ed54931c34903a1b25f387d59dc1b5e042f6
+SHA1 (patch-openvpn-nagios.c) = e1700e4f648eaca87fdcedc9d9490c9badd6c33b
diff --git a/net/openvpn-nagios/patches/patch-aa b/net/openvpn-nagios/patches/patch-aa
index e130deeb178..e297423fd1d 100644
--- a/net/openvpn-nagios/patches/patch-aa
+++ b/net/openvpn-nagios/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.1 2013/02/10 05:57:42 manu Exp $
+$NetBSD: patch-aa,v 1.2 2013/03/26 23:32:50 joerg Exp $
 
---- Makefile.orig	2013-02-09 06:44:43.000000000 +0100
-+++ Makefile	2013-02-09 18:41:18.000000000 +0100
-@@ -1,9 +1,9 @@
+--- Makefile.orig	2013-02-09 05:44:43.000000000 +0000
++++ Makefile
+@@ -1,8 +1,8 @@
 -prefix=/usr/pkg
 -PLUGINDIR=$(prefix)/lib/openvpn
 -bindir=/usr/local/bin
@@ -15,14 +15,13 @@ $NetBSD: patch-aa,v 1.1 2013/02/10 05:57:42 manu Exp $
  CFLAGS= -Wall -Werror -ansi -g -I$(OPENVPN_SRC)/include -DBINDIR=\"$(bindir)\"
  OPENVPN_GROUP=nobody
  
- LIBTOOL=libtool
-@@ -19,8 +19,9 @@
- 	$(LIBTOOL) --mode=link --tag CC  $(CC) -version-info 0:0:0 \
+@@ -20,8 +20,8 @@ openvpn-nagios.la:  openvpn-nagios.lo
  		   -rpath $(PLUGINDIR) -module -o $@ $? -lc -lutil
  
  install:	openvpn-nagios.la
 +	$(INSTALL) -d -m 0755 $(PLUGINDIR)
  	$(LIBTOOL) --mode=install cp openvpn-nagios.la $(PLUGINDIR)/
- 	$(LIBTOOL) --mode=finish
+-	$(LIBTOOL) --mode=finish
  
  clean:
+ 	rm -rf *.o *.so *.la *.lo .libs
diff --git a/net/openvpn-nagios/patches/patch-openvpn-nagios.c b/net/openvpn-nagios/patches/patch-openvpn-nagios.c
new file mode 100644
index 00000000000..53cfde6afb0
--- /dev/null
+++ b/net/openvpn-nagios/patches/patch-openvpn-nagios.c
@@ -0,0 +1,19 @@
+$NetBSD: patch-openvpn-nagios.c,v 1.1 2013/03/26 23:32:50 joerg Exp $
+
+--- openvpn-nagios.c.orig	2013-03-25 15:45:11.000000000 +0000
++++ openvpn-nagios.c
+@@ -87,12 +87,11 @@ strmatch(s, match)
+ #endif
+ 
+ static time_t
+-date_strtots(strdate)
+-	char *strdate;
++date_strtots(unsigned char *strdate)
+ {
+ 	struct tm tm;
+ 
+-	(void)strptime(strdate, "%y%m%d%H%M%SZ", &tm);
++	(void)strptime((char *)strdate, "%y%m%d%H%M%SZ", &tm);
+ 	return mktime(&tm);
+ }
+