diff --git a/multimedia/subrip/Makefile b/multimedia/subrip/Makefile
index 0e5a85def34..9769c5b6d19 100644
--- a/multimedia/subrip/Makefile
+++ b/multimedia/subrip/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.9 2011/09/16 10:31:24 espie Exp $
+# $OpenBSD: Makefile,v 1.10 2012/03/21 23:50:19 fgsch Exp $
 
 COMMENT=	extract subtitles from dvds
 DISTNAME=	ogmrip-0.10.0
 PKGNAME=	subrip-0.10.0
-REVISION=	1
+REVISION=	2
 CATEGORIES=	multimedia converters
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=ogmrip/}
 
diff --git a/multimedia/subrip/files/Makefile b/multimedia/subrip/files/Makefile
index e196d7aa5fc..cfedb2153e9 100644
--- a/multimedia/subrip/files/Makefile
+++ b/multimedia/subrip/files/Makefile
@@ -28,4 +28,4 @@ sub2pgm: ${OBJ_SUB}
 .SUFFIXES: .c .o
 
 .c.o:
-	${CC} -c ${CFLAGS} -I. $*.c
+	${CC} -c -DHAVE_GETLINE ${CFLAGS} -I. $*.c
diff --git a/multimedia/subrip/patches/patch-vobsub_c b/multimedia/subrip/patches/patch-vobsub_c
new file mode 100644
index 00000000000..fb2bcff8208
--- /dev/null
+++ b/multimedia/subrip/patches/patch-vobsub_c
@@ -0,0 +1,19 @@
+$OpenBSD: patch-vobsub_c,v 1.1 2012/03/21 23:50:19 fgsch Exp $
+--- vobsub.c.orig	Fri Mar 16 23:54:43 2012
++++ vobsub.c	Fri Mar 16 23:54:53 2012
+@@ -25,6 +25,7 @@ extern int vobsub_id;
+ 
+ /**********************************************************************/
+ 
++#ifndef HAVE_GETLINE
+ static ssize_t
+ getline (char **lineptr, size_t * n, FILE * stream)
+ {
+@@ -70,6 +71,7 @@ getline (char **lineptr, size_t * n, FILE * stream)
+   (*lineptr)[res] = 0;
+   return res;
+ }
++#endif
+ 
+ /**********************************************************************
+  * MPEG parsing
diff --git a/multimedia/subtitleripper/Makefile b/multimedia/subtitleripper/Makefile
index ba98e9b628b..68f1b53496c 100644
--- a/multimedia/subtitleripper/Makefile
+++ b/multimedia/subtitleripper/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.4 2010/11/19 07:23:15 espie Exp $
+# $OpenBSD: Makefile,v 1.5 2012/03/21 23:52:16 fgsch Exp $
 
 COMMENT=	subtitle ripper, used with transcode
 
 DISTNAME=	subtitleripper-0.3-4
 PKGNAME=	subtitleripper-0.3.4
-REVISION=	0
+REVISION=	1
 EXTRACT_SUFX=	.tgz
 CATEGORIES=	multimedia
 
diff --git a/multimedia/subtitleripper/patches/patch-Makefile b/multimedia/subtitleripper/patches/patch-Makefile
index 642d947d16e..5c8ed572f62 100644
--- a/multimedia/subtitleripper/patches/patch-Makefile
+++ b/multimedia/subtitleripper/patches/patch-Makefile
@@ -1,12 +1,14 @@
-$OpenBSD: patch-Makefile,v 1.1.1.1 2007/07/29 17:07:49 ajacoutot Exp $
---- Makefile.orig	Mon Dec  8 10:28:02 2003
-+++ Makefile	Sun Jul 29 19:04:51 2007
-@@ -4,12 +4,12 @@
+$OpenBSD: patch-Makefile,v 1.2 2012/03/21 23:52:16 fgsch Exp $
+--- Makefile.orig	Mon Dec  8 09:28:02 2003
++++ Makefile	Fri Mar 16 23:46:57 2012
+@@ -3,13 +3,13 @@
+ #
  
  # use always:
- DEFINES :=  
+-DEFINES :=  
 -LIBS    := -lm 
 -INCLUDES :=
++DEFINES := -DHAVE_GETLINE
 +LIBS    := -lm -L!!LOCALBASE!!/lib
 +INCLUDES := -I!!LOCALBASE!!/include -I!!LOCALBASE!!/include/libpng
  
diff --git a/security/vpnc/Makefile b/security/vpnc/Makefile
index dbbed7ed965..ace76a4c98d 100644
--- a/security/vpnc/Makefile
+++ b/security/vpnc/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.18 2011/07/06 21:09:55 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.19 2012/03/21 23:49:02 fgsch Exp $
 
 COMMENT=		client for Cisco 3000 VPN concentrators
 
 DISTNAME=		vpnc-0.5.3
-REVISION=		0
+REVISION=		1
 CATEGORIES=		security net
 
 HOMEPAGE=		http://www.unix-ag.uni-kl.de/~massar/vpnc/
diff --git a/security/vpnc/patches/patch-sysdep_h b/security/vpnc/patches/patch-sysdep_h
new file mode 100644
index 00000000000..900d9e66d63
--- /dev/null
+++ b/security/vpnc/patches/patch-sysdep_h
@@ -0,0 +1,11 @@
+$OpenBSD: patch-sysdep_h,v 1.1 2012/03/21 23:49:02 fgsch Exp $
+--- sysdep.h.orig	Fri Mar 16 23:30:41 2012
++++ sysdep.h	Fri Mar 16 23:31:10 2012
+@@ -67,6 +67,7 @@ int tun_get_hwaddr(int fd, char *dev, uint8_t *hwaddr)
+ 
+ #define HAVE_VASPRINTF 1
+ #define HAVE_ASPRINTF  1
++#define HAVE_GETLINE   1
+ #define HAVE_FGETLN    1
+ #define HAVE_UNSETENV  1
+ #define HAVE_SETENV    1