diff -auNr vlock.orig/Makefile vlock/Makefile
--- vlock.orig/Makefile	2008-03-29 10:32:30.766301983 +0100
+++ vlock/Makefile	2008-03-29 10:34:51.238937751 +0100
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	vlock
-PORTVERSION=	2.1
+PORTVERSION=	2.2.1
 CATEGORIES=	security
 MASTER_SITES=	http://cthulhu.c3d2.de/~toidinamai/vlock/archive/
 
@@ -14,10 +14,61 @@
 COMMENT=	Locks a terminal
 
 USE_GMAKE=	yes
+HAS_CONFIGURE=	yes
+CONFIGURE_ARGS=	--enable-plugins --enable-pam \
+				--prefix=${PREFIX} \
+				--mandir=${MANPREFIX}/man \
+				--with-modules="${VLOCKMODULES}" \
+				--with-scripts="${VLOCKSCRIPTS}" \
+				VLOCK_GROUP="${VLOCKGRP}" \
+				VLOCK_MODE="0750"
+
+OPTIONS=		VLOCKSCRIPTS "Install sample hook scripts" on \
+				CACASAVER	"Enable libcaca screensaver" off
 
 MANLANG=	""
 MAN1=		vlock.1
-MAN8=		vlock-current.8 vlock-all.8 vlock-new.8 vlock-nosysrq.8
-PLIST_FILES=	bin/vlock sbin/vlock-current sbin/vlock-all sbin/vlock-nosysrq sbin/vlock-new
+MAN5=		vlock-plugins.5
+MAN8=		vlock-main.8
+
+# Default scripts/modules
+VLOCKSCRIPTS=
+VLOCKMODULES=	all.so new.so
+
+# Vlock group = vlock:*:129:
+VLOCKGRP=	vlock
+VLOCKGID=	129
+
+.include <bsd.port.pre.mk>
+
+.if !defined(WITHOUT_VLOCKSCRIPTS)
+VLOCKSCRIPTS+=	amarok.sh example_script.sh mplayer.sh
+PLIST_SUB+=	PL_VLOCKSCRIPTS=""
+.else
+PLIST_SUB+=	PL_VLOCKSCRIPTS="@comment "
+.endif
+
+.if !defined(WITHOUT_CACASAVER)
+BUILD_DEPENDS+=	${LOCALBASE}/lib/libcaca.a:${PORTSDIR}/graphics/libcaca
+VLOCKMODULES+=	caca.so
+PLIST_SUB+=	PL_CACASAVER=""
+.else
+PLIST_SUB+=	PL_CACASAVER="@comment "
+.endif
+
+pre-install:
+	if ! pw groupshow ${VLOCKGRP}; then pw groupadd ${VLOCKGRP} -g ${VLOCKGID}; fi
+
+post-install:
+.if !defined(NOPORTDOCS)
+	@${MKDIR} ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/COPYING ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/ChangeLog ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/PLUGINS ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/README.X11 ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/SECURITY ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/TODO ${DOCSDIR}
+.endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff -auNr vlock.orig/distinfo vlock/distinfo
--- vlock.orig/distinfo	2008-03-29 10:32:30.766301983 +0100
+++ vlock/distinfo	2008-03-29 10:34:55.440927110 +0100
@@ -1,3 +1,3 @@
-MD5 (vlock-2.1.tar.gz) = a365a8fdde9379417ef2adc1c1230c4d
-SHA256 (vlock-2.1.tar.gz) = 9d733ab0d8643ca71ee2c8bb22e8bc97a3d87b4f48582999d009855df402bace
-SIZE (vlock-2.1.tar.gz) = 21045
+MD5 (vlock-2.2.1.tar.gz) = 5a8f7bb07b9f6107f1d06acb3aaa5578
+SHA256 (vlock-2.2.1.tar.gz) = 11fa31b0cdc9e936cd114384db09b36981c412af7e23db83368d7c40677a031c
+SIZE (vlock-2.2.1.tar.gz) = 54381
diff -auNr vlock.orig/files/patch-Makefile vlock/files/patch-Makefile
--- vlock.orig/files/patch-Makefile	2008-03-29 10:32:30.766301983 +0100
+++ vlock/files/patch-Makefile	1970-01-01 01:00:00.000000000 +0100
@@ -1,36 +0,0 @@
---- Makefile.orig	2007-09-08 20:04:25.000000000 +0200
-+++ Makefile	2008-03-15 11:04:38.067938121 +0100
-@@ -62,19 +62,23 @@
- 
- .PHONY: install-programs
- install-programs: $(PROGRAMS)
--	$(INSTALL) -D -m 755 -o root -g $(ROOT_GROUP) vlock $(DESTDIR)$(PREFIX)/bin/vlock
--	$(INSTALL) -D -m 4711 -o root -g $(ROOT_GROUP) vlock-current $(DESTDIR)$(PREFIX)/sbin/vlock-current
--	$(INSTALL) -D -m 755 -o root -g $(ROOT_GROUP) vlock-all $(DESTDIR)$(PREFIX)/sbin/vlock-all
--	$(INSTALL) -D -m $(VLOCK_MODE) -o root -g $(VLOCK_GROUP) vlock-nosysrq $(DESTDIR)$(PREFIX)/sbin/vlock-nosysrq
--	$(INSTALL) -D -m $(VLOCK_MODE) -o root -g $(VLOCK_GROUP) vlock-new $(DESTDIR)$(PREFIX)/sbin/vlock-new
-+	$(INSTALL) -d $(PREFIX)/bin
-+	$(INSTALL) -m 755 -o root -g $(ROOT_GROUP) vlock $(PREFIX)/bin/vlock
-+	$(INSTALL) -d $(PREFIX)/sbin
-+	$(INSTALL) -m 4711 -o root -g $(ROOT_GROUP) vlock-current $(PREFIX)/sbin/vlock-current
-+	$(INSTALL) -m 755 -o root -g $(ROOT_GROUP) vlock-all $(PREFIX)/sbin/vlock-all
-+	$(INSTALL) -m $(VLOCK_MODE) -o root -g $(VLOCK_GROUP) vlock-nosysrq $(PREFIX)/sbin/vlock-nosysrq
-+	$(INSTALL) -m $(VLOCK_MODE) -o root -g $(VLOCK_GROUP) vlock-new $(PREFIX)/sbin/vlock-new
- 
- .PHONY: install-man
- install-man:
--	$(INSTALL) -D -m 644 -o root -g $(ROOT_GROUP) man/vlock.1 $(DESTDIR)$(PREFIX)/share/man/man1/vlock.1
--	$(INSTALL) -D -m 644 -o root -g $(ROOT_GROUP) man/vlock-current.8 $(DESTDIR)$(PREFIX)/share/man/man8/vlock-current.8
--	$(INSTALL) -D -m 644 -o root -g $(ROOT_GROUP) man/vlock-all.8 $(DESTDIR)$(PREFIX)/share/man/man8/vlock-all.8
--	$(INSTALL) -D -m 644 -o root -g $(ROOT_GROUP) man/vlock-new.8 $(DESTDIR)$(PREFIX)/share/man/man8/vlock-new.8
--	$(INSTALL) -D -m 644 -o root -g $(ROOT_GROUP) man/vlock-nosysrq.8 $(DESTDIR)$(PREFIX)/share/man/man8/vlock-nosysrq.8
-+	$(INSTALL) -d $(MANPREFIX)/man/man1
-+	$(INSTALL) -m 644 -o root -g $(ROOT_GROUP) man/vlock.1 $(MANPREFIX)/man/man1/vlock.1
-+	$(INSTALL) -d $(MANPREFIX)/man/man8
-+	$(INSTALL) -m 644 -o root -g $(ROOT_GROUP) man/vlock-current.8 $(MANPREFIX)/man/man8/vlock-current.8
-+	$(INSTALL) -m 644 -o root -g $(ROOT_GROUP) man/vlock-all.8 $(MANPREFIX)/man/man8/vlock-all.8
-+	$(INSTALL) -m 644 -o root -g $(ROOT_GROUP) man/vlock-new.8 $(MANPREFIX)/man/man8/vlock-new.8
-+	$(INSTALL) -m 644 -o root -g $(ROOT_GROUP) man/vlock-nosysrq.8 $(MANPREFIX)/man/man8/vlock-nosysrq.8
- 
- .PHONY: clean
- clean:
diff -auNr vlock.orig/files/patch-config.mk vlock/files/patch-config.mk
--- vlock.orig/files/patch-config.mk	2008-03-29 10:32:30.766301983 +0100
+++ vlock/files/patch-config.mk	1970-01-01 01:00:00.000000000 +0100
@@ -1,32 +0,0 @@
---- config.mk.orig	2007-09-08 20:04:25.000000000 +0200
-+++ config.mk	2008-03-15 10:57:43.866012457 +0100
-@@ -9,18 +9,13 @@
- 
- # group to install vlock-all and vlock-nosysrq as
- # defaults to 'root')
--VLOCK_GROUP =
-+VLOCK_GROUP = wheel
- # mode to install vlock-all and vlock-nosysrq as
- # defaults to 4711 if group is unset and 4710 otherwise
- VLOCK_MODE =
- 
- # root's group
--ROOT_GROUP = root
--
--# installation prefix
--PREFIX = /usr/local
--# installation root
--DESTDIR =
-+ROOT_GROUP = wheel
- 
- # c compiler
- CC = gcc
-@@ -30,7 +25,7 @@
- LDFLAGS = 
- 
- # linker flags needed for pam
--PAM_LIBS = -ldl -lpam
-+PAM_LIBS = -lpam
- 
- # gnu install
- INSTALL = install
diff -auNr vlock.orig/files/patch-configure vlock/files/patch-configure
--- vlock.orig/files/patch-configure	1970-01-01 01:00:00.000000000 +0100
+++ vlock/files/patch-configure	2008-03-29 10:32:51.548248012 +0100
@@ -0,0 +1,11 @@
+--- configure.orig	2008-03-24 14:03:53.148931378 +0100
++++ configure	2008-03-24 14:06:02.748596139 +0100
+@@ -255,6 +255,8 @@
+       DL_LIB=''
+       CRYPT_LIB=''
+       MODULES="all.so new.so"
++      CFLAGS="${CFLAGS} -I/usr/local/include"
++      LDFLAGS="${LDFLAGS} -L/usr/local/lib"
+     ;;
+   esac
+ }
diff -auNr vlock.orig/pkg-plist vlock/pkg-plist
--- vlock.orig/pkg-plist	1970-01-01 01:00:00.000000000 +0100
+++ vlock/pkg-plist	2008-03-29 10:32:51.549248139 +0100
@@ -0,0 +1,20 @@
+bin/vlock
+sbin/vlock-main
+lib/vlock/modules/all.so
+lib/vlock/modules/new.so
+%%PL_CACASAVER%%lib/vlock/modules/caca.so
+@dirrm lib/vlock/modules
+%%PL_VLOCKSCRIPTS%%lib/vlock/scripts/amarok
+%%PL_VLOCKSCRIPTS%%lib/vlock/scripts/example_script
+%%PL_VLOCKSCRIPTS%%lib/vlock/scripts/mplayer
+%%PL_VLOCKSCRIPTS%%@dirrm lib/vlock/scripts
+@dirrm lib/vlock
+%%PORTDOCS%%%%DOCSDIR%%/COPYING
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
+%%PORTDOCS%%%%DOCSDIR%%/PLUGINS
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/README.X11
+%%PORTDOCS%%%%DOCSDIR%%/SECURITY
+%%PORTDOCS%%%%DOCSDIR%%/TODO
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
+@exec if ! pw groupshow vlock 2>/dev/null; then pw groupadd vlock -g 129; fi