svn commit: r371296 - head/security/vlock/files

[Antoine Brodin]

Author: antoine
Date: Mon Oct 20 20:08:54 2014
New Revision: 371296
URL: https://svnweb.freebsd.org/changeset/ports/371296
QAT: https://qat.redports.org/buildarchive/r371296/

Log:
  Allow staging as a regular user

Added:
  head/security/vlock/files/patch-scripts-Makefile   (contents, props changed)
Modified:
  head/security/vlock/files/patch-Makefile
  head/security/vlock/files/patch-modules-Makefile

Modified: head/security/vlock/files/patch-Makefile
==============================================================================
--- head/security/vlock/files/patch-Makefile	Mon Oct 20 19:59:28 2014	(r371295)
+++ head/security/vlock/files/patch-Makefile	Mon Oct 20 20:08:54 2014	(r371296)
@@ -1,11 +1,29 @@
---- Makefile.orig	2013-11-20 17:41:38.000000000 +0100
-+++ Makefile	2013-11-20 17:43:12.000000000 +0100
-@@ -59,7 +59,7 @@
+--- 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
+-	$(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
-+	$(INSTALL) -s -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 ###

Modified: head/security/vlock/files/patch-modules-Makefile
==============================================================================
--- head/security/vlock/files/patch-modules-Makefile	Mon Oct 20 19:59:28 2014	(r371295)
+++ head/security/vlock/files/patch-modules-Makefile	Mon Oct 20 20:08:54 2014	(r371296)
@@ -1,5 +1,5 @@
---- modules/Makefile.orig	2013-11-20 17:39:23.000000000 +0100
-+++ modules/Makefile	2013-11-20 17:40:03.000000000 +0100
+--- modules/Makefile.orig	2011-09-18 15:22:35 UTC
++++ modules/Makefile
 @@ -15,7 +15,7 @@
  
  #special build rules
@@ -14,7 +14,7 @@
  install-%.so: %.so
  	$(MKDIR_P) -m 755 $(DESTDIR)$(MODULEDIR)
 -	$(INSTALL) -m $(MODULE_MODE) -o root -g $(MODULE_GROUP) $< $(DESTDIR)$(MODULEDIR)/$<
-+	$(INSTALL) -s -m $(MODULE_MODE) -o root -g $(MODULE_GROUP) $< $(DESTDIR)$(MODULEDIR)/$<
++	$(BSD_INSTALL_LIB) $< $(DESTDIR)$(MODULEDIR)/$<
  
  .PHONY: clean
  clean:

Added: head/security/vlock/files/patch-scripts-Makefile
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/security/vlock/files/patch-scripts-Makefile	Mon Oct 20 20:08:54 2014	(r371296)
@@ -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: