[Midnightbsd-cvs] mports [21256] trunk/security/vlock: update vlock port to actually compile on midnightbsd
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Fri Mar 25 21:20:35 EDT 2016
Revision: 21256
http://svnweb.midnightbsd.org/mports/?rev=21256
Author: laffer1
Date: 2016-03-25 21:20:34 -0400 (Fri, 25 Mar 2016)
Log Message:
-----------
update vlock port to actually compile on midnightbsd
Modified Paths:
--------------
trunk/security/vlock/Makefile
trunk/security/vlock/files/patch-configure
trunk/security/vlock/pkg-plist
Added Paths:
-----------
trunk/security/vlock/files/patch-Makefile
trunk/security/vlock/files/patch-modules-Makefile
trunk/security/vlock/files/patch-modules-caca.c
trunk/security/vlock/files/patch-scripts-Makefile
Modified: trunk/security/vlock/Makefile
===================================================================
--- trunk/security/vlock/Makefile 2016-03-26 01:13:51 UTC (rev 21255)
+++ trunk/security/vlock/Makefile 2016-03-26 01:20:34 UTC (rev 21256)
@@ -1,17 +1,15 @@
-# New ports collection makefile for: vlock
-# Date created: 08 Oct 2000
-# Whom: George Reid <services at nevernet.net>
-#
# $MidnightBSD$
# $FreeBSD: ports/security/vlock/Makefile,v 1.9 2008/06/19 19:35:54 pav Exp $
PORTNAME= vlock
PORTVERSION= 2.2.3
+PORTREVISION= 1
CATEGORIES= security
MASTER_SITES= http://cthulhu.c3d2.de/~toidinamai/vlock/archive/
MAINTAINER= ports at MidnightBSD.org
COMMENT= Locks a terminal
+
LICENSE= gpl2
USE_GMAKE= yes
@@ -21,67 +19,47 @@
--mandir=${MANPREFIX}/man \
--with-modules="${VLOCKMODULES}" \
--with-scripts="${VLOCKSCRIPTS}" \
- VLOCK_GROUP="${VLOCKGRP}" \
- VLOCK_MODE="0750" \
+ VLOCK_GROUP="nobody" \
EXTRA_CFLAGS="-I${LOCALBASE}/include" \
EXTRA_LDFLAGS="-L${LOCALBASE}/lib"
+USES= gmake
+USE_CSTD= gnu99
-OPTIONS= ROOTPWD "Enable unlock using root password" on \
- VLOCKSCRIPTS "Install sample hook scripts" off \
- CACASAVER "Enable libcaca screensaver" off
+OPTIONS_DEFINE= ROOTPWD VLOCKSCRIPTS CACASAVER
+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_BUILD_DEPENDS= ${LOCALBASE}/lib/libcaca.a:${PORTSDIR}/graphics/libcaca
-MANLANG= ""
-MAN1= vlock.1
-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
+# Vlock special group
+VLOCK_GRP= vlock
+GROUPS= ${VLOCK_GRP}
+PLIST_SUB+= VLOCK_GRP=${VLOCK_GRP}
-.include <bsd.port.pre.mk>
+PORTDOCS= ChangeLog PLUGINS README README.X11 SECURITY TODO
-.if !defined(WITHOUT_ROOTPWD)
-CONFIGURE_ARGS+= --enable-root-password
-.else
-CONFIGURE_ARGS+= --disable-root-password
-.endif
+.include <bsd.mport.options.mk>
-.if !defined(WITHOUT_VLOCKSCRIPTS)
+.if ${PORT_OPTIONS:MVLOCKSCRIPTS}
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
+.if ${PORT_OPTIONS:MCACASAVER}
VLOCKMODULES+= caca.so
-PLIST_SUB+= PL_CACASAVER=""
-.else
-PLIST_SUB+= PL_CACASAVER="@comment "
.endif
-post-patch:
- @${REINPLACE_CMD} -e 's|-lncurses|-lm|' ${WRKSRC}/modules/Makefile
+pre-patch:
+ ${REINPLACE_CMD} -e 's/FreeBSD/MidnightBSD/g' ${WRKSRC}/configure
-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
+ ${MKDIR} ${STAGEDIR}${DOCSDIR}
+ ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Added: trunk/security/vlock/files/patch-Makefile
===================================================================
--- trunk/security/vlock/files/patch-Makefile (rev 0)
+++ trunk/security/vlock/files/patch-Makefile 2016-03-26 01:20:34 UTC (rev 21256)
@@ -0,0 +1,29 @@
+--- Makefile.orig 2011-09-18 15:22:35 UTC
++++ Makefile
+@@ -57,9 +57,9 @@
+ .PHONY: install-programs
+ install-programs: $(PROGRAMS)
+ $(MKDIR_P) -m 755 $(DESTDIR)$(PREFIX)/bin
+- $(INSTALL) -m 755 -o root -g $(ROOT_GROUP) vlock $(DESTDIR)$(BINDIR)/vlock
++ $(BSD_INSTALL_SCRIPT) vlock $(DESTDIR)$(BINDIR)/vlock
+ $(MKDIR_P) -m 755 $(DESTDIR)$(PREFIX)/sbin
+- $(INSTALL) -m 4711 -o root -g $(ROOT_GROUP) vlock-main $(DESTDIR)$(SBINDIR)/vlock-main
++ $(BSD_INSTALL_PROGRAM) vlock-main $(DESTDIR)$(SBINDIR)/vlock-main
+
+ .PHONY: install-plugins
+ install-plugins: install-modules install-scripts
+@@ -75,11 +75,11 @@
+ .PHONY: install-man
+ install-man:
+ $(MKDIR_P) -m 755 $(DESTDIR)$(MANDIR)/man1
+- $(INSTALL) -m 644 -o root -g $(ROOT_GROUP) man/vlock.1 $(DESTDIR)$(MANDIR)/man1/vlock.1
++ $(BSD_INSTALL_MAN) man/vlock.1 $(DESTDIR)$(MANDIR)/man1/vlock.1
+ $(MKDIR_P) -m 755 $(DESTDIR)$(MANDIR)/man8
+- $(INSTALL) -m 644 -o root -g $(ROOT_GROUP) man/vlock-main.8 $(DESTDIR)$(MANDIR)/man8/vlock-main.8
++ $(BSD_INSTALL_MAN) man/vlock-main.8 $(DESTDIR)$(MANDIR)/man8/vlock-main.8
+ $(MKDIR_P) -m 755 $(DESTDIR)$(MANDIR)/man5
+- $(INSTALL) -m 644 -o root -g $(ROOT_GROUP) man/vlock-plugins.5 $(DESTDIR)$(MANDIR)/man5/vlock-plugins.5
++ $(BSD_INSTALL_MAN) man/vlock-plugins.5 $(DESTDIR)$(MANDIR)/man5/vlock-plugins.5
+
+
+ ### build rules ###
Property changes on: trunk/security/vlock/files/patch-Makefile
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Modified: trunk/security/vlock/files/patch-configure
===================================================================
--- trunk/security/vlock/files/patch-configure 2016-03-26 01:13:51 UTC (rev 21255)
+++ trunk/security/vlock/files/patch-configure 2016-03-26 01:20:34 UTC (rev 21256)
@@ -1,25 +1,19 @@
---- configure.orig 2008-05-18 05:10:54 -0400
-+++ configure 2009-01-01 20:16:02 -0500
-@@ -220,7 +220,8 @@
+--- configure.orig 2008-05-18 11:10:54.000000000 +0200
++++ configure 2011-06-23 08:20:00.811018722 +0200
+@@ -219,12 +219,12 @@
+ SCRIPTDIR="\$(LIBDIR)/vlock/scripts"
MODULEDIR="\$(LIBDIR)/vlock/modules"
- CC=gcc
-- DEFAULT_CFLAGS="-O2 -Wall -W -pedantic -std=gnu99"
-+ #DEFAULT_CFLAGS="-O2 -Wall -W -pedantic -std=gnu99"
-+ DEFAULT_CFLAGS="-pedantic -std=gnu99"
+- CC=gcc
++ #CC=gcc
+ DEFAULT_CFLAGS="-O2 -Wall -W -pedantic -std=gnu99"
DEBUG_CFLAGS="-O0 -g -Wall -W -pedantic -std=gnu99"
- CFLAGS="${DEFAULT_CFLAGS}"
- LD=ld
-@@ -266,6 +267,12 @@
- CRYPT_LIB=''
- MODULES="all.so new.so"
- ;;
-+ MidnightBSD)
-+ PAM_LIBS='-lpam'
-+ DL_LIB=''
-+ CRYPT_LIB=''
-+ MODULES="all.so new.so"
-+ ;;
- esac
- }
-
+- CFLAGS="${DEFAULT_CFLAGS}"
+- LD=ld
+- LDFLAGS=""
++ #CFLAGS="${DEFAULT_CFLAGS}"
++ #LD=ld
++ #LDFLAGS=""
+ AUTH_METHOD="pam"
+ ENABLE_ROOT_PASSWORD="yes"
+ ENABLE_PLUGINS="yes"
Added: trunk/security/vlock/files/patch-modules-Makefile
===================================================================
--- trunk/security/vlock/files/patch-modules-Makefile (rev 0)
+++ trunk/security/vlock/files/patch-modules-Makefile 2016-03-26 01:20:34 UTC (rev 21256)
@@ -0,0 +1,20 @@
+--- modules/Makefile.orig 2011-09-18 15:22:35 UTC
++++ modules/Makefile
+@@ -15,7 +15,7 @@
+
+ #special build rules
+
+-caca.so : override LDLIBS += -lcaca -lncurses
++caca.so : override LDLIBS += -lcaca -lm
+
+ all.o: all.c ../src/console_switch.h
+
+@@ -37,7 +37,7 @@
+ .PHONY: install-%.so
+ install-%.so: %.so
+ $(MKDIR_P) -m 755 $(DESTDIR)$(MODULEDIR)
+- $(INSTALL) -m $(MODULE_MODE) -o root -g $(MODULE_GROUP) $< $(DESTDIR)$(MODULEDIR)/$<
++ $(BSD_INSTALL_LIB) $< $(DESTDIR)$(MODULEDIR)/$<
+
+ .PHONY: clean
+ clean:
Property changes on: trunk/security/vlock/files/patch-modules-Makefile
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/security/vlock/files/patch-modules-caca.c
===================================================================
--- trunk/security/vlock/files/patch-modules-caca.c (rev 0)
+++ trunk/security/vlock/files/patch-modules-caca.c 2016-03-26 01:20:34 UTC (rev 21256)
@@ -0,0 +1,12 @@
+Remove legacy header as libcucul has now been merged into libcaca.
+
+--- ./modules/caca.c.orig 2015-07-21 20:34:23.876845709 +0200
++++ ./modules/caca.c 2015-07-21 20:34:33.937820107 +0200
+@@ -37,7 +37,6 @@
+
+ #include <ncurses.h>
+
+-#include <cucul.h>
+ #include <caca.h>
+
+ #include "process.h"
Property changes on: trunk/security/vlock/files/patch-modules-caca.c
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/security/vlock/files/patch-scripts-Makefile
===================================================================
--- trunk/security/vlock/files/patch-scripts-Makefile (rev 0)
+++ trunk/security/vlock/files/patch-scripts-Makefile 2016-03-26 01:20:34 UTC (rev 21256)
@@ -0,0 +1,11 @@
+--- scripts/Makefile.orig 2011-09-18 15:22:35 UTC
++++ scripts/Makefile
+@@ -12,7 +12,7 @@
+ install-%.sh : SCRIPT_TARGET=$(<:.sh=)
+ install-%: %
+ $(MKDIR_P) -m 755 $(DESTDIR)$(SCRIPTDIR)
+- $(INSTALL) -m $(SCRIPT_MODE) -o root -g $(SCRIPT_GROUP) $< $(DESTDIR)$(SCRIPTDIR)/$(SCRIPT_TARGET)
++ $(BSD_INSTALL_SCRIPT) $< $(DESTDIR)$(SCRIPTDIR)/$(SCRIPT_TARGET)
+
+ .PHONY: clean
+ clean:
Property changes on: trunk/security/vlock/files/patch-scripts-Makefile
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Modified: trunk/security/vlock/pkg-plist
===================================================================
--- trunk/security/vlock/pkg-plist 2016-03-26 01:13:51 UTC (rev 21255)
+++ trunk/security/vlock/pkg-plist 2016-03-26 01:20:34 UTC (rev 21256)
@@ -1,20 +1,15 @@
bin/vlock
+man/man1/vlock.1.gz
+man/man5/vlock-plugins.5.gz
+man/man8/vlock-main.8.gz
+%%VLOCKSCRIPTS%%lib/vlock/scripts/amarok
+%%VLOCKSCRIPTS%%lib/vlock/scripts/example_script
+%%VLOCKSCRIPTS%%lib/vlock/scripts/mplayer
+lib/vlock/modules/all.so
+%%CACASAVER%%lib/vlock/modules/caca.so
+ at mode 4711
sbin/vlock-main
-lib/vlock/modules/all.so
+ at mode
+ at group %%VLOCK_GRP%%
lib/vlock/modules/new.so
-%%PL_CACASAVER%%lib/vlock/modules/caca.so
- at 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
- at 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%%
- at exec if ! pw groupshow vlock 2>/dev/null; then pw groupadd vlock -g 129; fi
+ at group wheel
More information about the Midnightbsd-cvs
mailing list