aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--security/vlock/Makefile60
-rw-r--r--security/vlock/distinfo6
-rw-r--r--security/vlock/files/patch-Makefile36
-rw-r--r--security/vlock/files/patch-config.mk32
4 files changed, 59 insertions, 75 deletions
diff --git a/security/vlock/Makefile b/security/vlock/Makefile
index e3b039257250..559fad7f07ba 100644
--- a/security/vlock/Makefile
+++ b/security/vlock/Makefile
@@ -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,62 @@ MAINTAINER= ganael.laplanche@martymac.com
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"
+CONFIGURE_ENV= LOCALBASE=${LOCALBASE}
+
+OPTIONS= VLOCKSCRIPTS "Install sample hook scripts" off \
+ 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 --git a/security/vlock/distinfo b/security/vlock/distinfo
index 056d2a711246..09f399206a11 100644
--- a/security/vlock/distinfo
+++ b/security/vlock/distinfo
@@ -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 --git a/security/vlock/files/patch-Makefile b/security/vlock/files/patch-Makefile
deleted file mode 100644
index b9557e95b7ed..000000000000
--- a/security/vlock/files/patch-Makefile
+++ /dev/null
@@ -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 --git a/security/vlock/files/patch-config.mk b/security/vlock/files/patch-config.mk
deleted file mode 100644
index db0812d21b9c..000000000000
--- a/security/vlock/files/patch-config.mk
+++ /dev/null
@@ -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