git: 2c2787637219 - main - security/vlock: Remove CACASAVER option
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sat, 01 Mar 2025 09:04:40 UTC
The branch main has been updated by martymac: URL: https://cgit.FreeBSD.org/ports/commit/?id=2c2787637219ae5583d550a00639892593043a90 commit 2c2787637219ae5583d550a00639892593043a90 Author: Ganael LAPLANCHE <martymac@FreeBSD.org> AuthorDate: 2025-03-01 09:01:41 +0000 Commit: Ganael LAPLANCHE <martymac@FreeBSD.org> CommitDate: 2025-03-01 09:04:32 +0000 security/vlock: Remove CACASAVER option Caca module does not build with new libcaca anymore (and fixing build leads to a crashing module). Also, simplify MASTER_SITES as upstream is not available anymore. --- security/vlock/Makefile | 18 ++++-------------- security/vlock/pkg-plist | 1 - 2 files changed, 4 insertions(+), 15 deletions(-) diff --git a/security/vlock/Makefile b/security/vlock/Makefile index 2e7d93fd683b..482cad0075aa 100644 --- a/security/vlock/Makefile +++ b/security/vlock/Makefile @@ -2,8 +2,7 @@ PORTNAME= vlock PORTVERSION= 2.2.3 PORTREVISION= 5 CATEGORIES= security -MASTER_SITES= http://cthulhu.c3d2.de/~toidinamai/vlock/archive/ \ - LOCAL/martymac +MASTER_SITES= LOCAL/martymac MAINTAINER= martymac@FreeBSD.org COMMENT= Locks a terminal @@ -15,26 +14,21 @@ HAS_CONFIGURE= yes CONFIGURE_ARGS= --enable-plugins --enable-pam \ --prefix=${PREFIX} \ --mandir=${PREFIX}/share/man \ - --with-modules="${VLOCKMODULES}" \ + --with-modules="all.so new.so" \ --with-scripts="${VLOCKSCRIPTS}" \ - VLOCK_GROUP="nobody" \ - EXTRA_CFLAGS="-I${LOCALBASE}/include" \ - EXTRA_LDFLAGS="-L${LOCALBASE}/lib" + VLOCK_GROUP="nobody" USES= gmake USE_CSTD= gnu99 -OPTIONS_DEFINE= ROOTPWD VLOCKSCRIPTS CACASAVER DOCS +OPTIONS_DEFINE= ROOTPWD VLOCKSCRIPTS DOCS OPTIONS_DEFAULT= ROOTPWD OPTIONS_SUB= yes ROOTPWD_DESC= Enable unlock using root password ROOTPWD_CONFIGURE_ENABLE= root-password VLOCKSCRIPTS_DESC= Install sample hook scripts -CACASAVER_DESC= Enable libcaca screensaver -CACASAVER_LIB_DEPENDS= libcaca.so:graphics/libcaca # Default scripts/modules VLOCKSCRIPTS= -VLOCKMODULES= all.so new.so # Vlock special group VLOCK_GRP= vlock @@ -49,10 +43,6 @@ PORTDOCS= ChangeLog PLUGINS README README.X11 SECURITY TODO VLOCKSCRIPTS+= amarok.sh example_script.sh mplayer.sh .endif -.if ${PORT_OPTIONS:MCACASAVER} -VLOCKMODULES+= caca.so -.endif - post-install: ${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR} diff --git a/security/vlock/pkg-plist b/security/vlock/pkg-plist index 8164bf5ccdca..b925c3847d4f 100644 --- a/security/vlock/pkg-plist +++ b/security/vlock/pkg-plist @@ -6,7 +6,6 @@ share/man/man8/vlock-main.8.gz %%VLOCKSCRIPTS%%lib/vlock/scripts/example_script %%VLOCKSCRIPTS%%lib/vlock/scripts/mplayer lib/vlock/modules/all.so -%%CACASAVER%%lib/vlock/modules/caca.so @mode 4711 sbin/vlock-main @mode