Attachment #85467 for bug #121678

Lines 16-22 Link Here

(-)vlock/Makefile (-1 lines)
16	USE_GMAKE= yes	16	USE_GMAKE= yes
17		17
18	MANLANG= ""	18	MANLANG= ""
19	MANCOMPRESSED= no
20	MAN1= vlock.1	19	MAN1= vlock.1
21	MAN8= vlock-current.8 vlock-all.8 vlock-new.8 vlock-nosysrq.8	20	MAN8= vlock-current.8 vlock-all.8 vlock-new.8 vlock-nosysrq.8
22	PLIST_FILES= bin/vlock sbin/vlock-current sbin/vlock-all sbin/vlock-nosysrq sbin/vlock-new	21	PLIST_FILES= bin/vlock sbin/vlock-current sbin/vlock-all sbin/vlock-nosysrq sbin/vlock-new




--- Makefile.orig	2007-09-08 20:04:25.000000000 +0200
+++ Makefile	2008-03-14 08:07:56.000000000 +0100
@@ -62,19 +62,19 @@
 
 .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 -m 755 -o root -g $(ROOT_GROUP) vlock $(PREFIX)/bin/vlock
+	$(INSTALL) -D -m 4711 -o root -g $(ROOT_GROUP) vlock-current $(PREFIX)/sbin/vlock-current
+	$(INSTALL) -D -m 755 -o root -g $(ROOT_GROUP) vlock-all $(PREFIX)/sbin/vlock-all
+	$(INSTALL) -D -m $(VLOCK_MODE) -o root -g $(VLOCK_GROUP) vlock-nosysrq $(PREFIX)/sbin/vlock-nosysrq
+	$(INSTALL) -D -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-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 -m 644 -o root -g $(ROOT_GROUP) man/vlock.1 $(MANPREFIX)/man/man1/vlock.1
+	$(INSTALL) -D -m 644 -o root -g $(ROOT_GROUP) man/vlock-current.8 $(MANPREFIX)/man/man8/vlock-current.8
+	$(INSTALL) -D -m 644 -o root -g $(ROOT_GROUP) man/vlock-all.8 $(MANPREFIX)/man/man8/vlock-all.8
+	$(INSTALL) -D -m 644 -o root -g $(ROOT_GROUP) man/vlock-new.8 $(MANPREFIX)/man/man8/vlock-new.8
+	$(INSTALL) -D -m 644 -o root -g $(ROOT_GROUP) man/vlock-nosysrq.8 $(MANPREFIX)/man/man8/vlock-nosysrq.8
 
 .PHONY: clean
 clean:




--- config.mk.orig	2007-09-08 20:04:25.000000000 +0200
+++ config.mk	2008-03-14 06:56:23.000000000 +0100
@@ -9,18 +9,13 @@
 
 # group to install vlock-all and vlock-nosysrq as
 # defaults to 'root')

 
 # 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

Return to bug 121678

Lines 1-6 Link Here

(-)vlock/files/patch-Makefile (-8 / +21 lines)
1	--- Makefile.orig 2008-03-13 21:54:55.000000000 +0100	1	--- Makefile.orig 2007-09-08 20:04:25.000000000 +0200
2	+++ Makefile 2008-03-13 22:02:01.000000000 +0100	2	+++ Makefile 2008-03-14 08:07:56.000000000 +0100
3	@@ -70,11 +70,11 @@	3	@@ -62,19 +62,19 @@
		4
		5	.PHONY: install-programs
		6	install-programs: $(PROGRAMS)
		7	- $(INSTALL) -D -m 755 -o root -g $(ROOT_GROUP) vlock $(DESTDIR)$(PREFIX)/bin/vlock
		8	- $(INSTALL) -D -m 4711 -o root -g $(ROOT_GROUP) vlock-current $(DESTDIR)$(PREFIX)/sbin/vlock-current
		9	- $(INSTALL) -D -m 755 -o root -g $(ROOT_GROUP) vlock-all $(DESTDIR)$(PREFIX)/sbin/vlock-all
		10	- $(INSTALL) -D -m $(VLOCK_MODE) -o root -g $(VLOCK_GROUP) vlock-nosysrq $(DESTDIR)$(PREFIX)/sbin/vlock-nosysrq
		11	- $(INSTALL) -D -m $(VLOCK_MODE) -o root -g $(VLOCK_GROUP) vlock-new $(DESTDIR)$(PREFIX)/sbin/vlock-new
		12	+ $(INSTALL) -D -m 755 -o root -g $(ROOT_GROUP) vlock $(PREFIX)/bin/vlock
		13	+ $(INSTALL) -D -m 4711 -o root -g $(ROOT_GROUP) vlock-current $(PREFIX)/sbin/vlock-current
		14	+ $(INSTALL) -D -m 755 -o root -g $(ROOT_GROUP) vlock-all $(PREFIX)/sbin/vlock-all
		15	+ $(INSTALL) -D -m $(VLOCK_MODE) -o root -g $(VLOCK_GROUP) vlock-nosysrq $(PREFIX)/sbin/vlock-nosysrq
		16	+ $(INSTALL) -D -m $(VLOCK_MODE) -o root -g $(VLOCK_GROUP) vlock-new $(PREFIX)/sbin/vlock-new
4		17
5	.PHONY: install-man	18	.PHONY: install-man
6	install-man:	19	install-man:
Lines 9-19 Link Here
9	- $(INSTALL) -D -m 644 -o root -g $(ROOT_GROUP) man/vlock-all.8 $(DESTDIR)$(PREFIX)/share/man/man8/vlock-all.8	22	- $(INSTALL) -D -m 644 -o root -g $(ROOT_GROUP) man/vlock-all.8 $(DESTDIR)$(PREFIX)/share/man/man8/vlock-all.8
10	- $(INSTALL) -D -m 644 -o root -g $(ROOT_GROUP) man/vlock-new.8 $(DESTDIR)$(PREFIX)/share/man/man8/vlock-new.8	23	- $(INSTALL) -D -m 644 -o root -g $(ROOT_GROUP) man/vlock-new.8 $(DESTDIR)$(PREFIX)/share/man/man8/vlock-new.8
11	- $(INSTALL) -D -m 644 -o root -g $(ROOT_GROUP) man/vlock-nosysrq.8 $(DESTDIR)$(PREFIX)/share/man/man8/vlock-nosysrq.8	24	- $(INSTALL) -D -m 644 -o root -g $(ROOT_GROUP) man/vlock-nosysrq.8 $(DESTDIR)$(PREFIX)/share/man/man8/vlock-nosysrq.8
12	+ $(INSTALL) -D -m 644 -o root -g $(ROOT_GROUP) man/vlock.1 $(DESTDIR)$(PREFIX)/man/man1/vlock.1	25	+ $(INSTALL) -D -m 644 -o root -g $(ROOT_GROUP) man/vlock.1 $(MANPREFIX)/man/man1/vlock.1
13	+ $(INSTALL) -D -m 644 -o root -g $(ROOT_GROUP) man/vlock-current.8 $(DESTDIR)$(PREFIX)/man/man8/vlock-current.8	26	+ $(INSTALL) -D -m 644 -o root -g $(ROOT_GROUP) man/vlock-current.8 $(MANPREFIX)/man/man8/vlock-current.8
14	+ $(INSTALL) -D -m 644 -o root -g $(ROOT_GROUP) man/vlock-all.8 $(DESTDIR)$(PREFIX)/man/man8/vlock-all.8	27	+ $(INSTALL) -D -m 644 -o root -g $(ROOT_GROUP) man/vlock-all.8 $(MANPREFIX)/man/man8/vlock-all.8
15	+ $(INSTALL) -D -m 644 -o root -g $(ROOT_GROUP) man/vlock-new.8 $(DESTDIR)$(PREFIX)/man/man8/vlock-new.8	28	+ $(INSTALL) -D -m 644 -o root -g $(ROOT_GROUP) man/vlock-new.8 $(MANPREFIX)/man/man8/vlock-new.8
16	+ $(INSTALL) -D -m 644 -o root -g $(ROOT_GROUP) man/vlock-nosysrq.8 $(DESTDIR)$(PREFIX)/man/man8/vlock-nosysrq.8	29	+ $(INSTALL) -D -m 644 -o root -g $(ROOT_GROUP) man/vlock-nosysrq.8 $(MANPREFIX)/man/man8/vlock-nosysrq.8
17		30
18	.PHONY: clean	31	.PHONY: clean
19	clean:	32	clean:

Lines 1-6 Link Here

(-)vlock/files/patch-config.mk (-6 / +11 lines)
1	--- config.mk.orig 2008-03-13 21:59:42.000000000 +0100	1	--- config.mk.orig 2007-09-08 20:04:25.000000000 +0200
2	+++ config.mk 2008-03-13 22:00:44.000000000 +0100	2	+++ config.mk 2008-03-14 06:56:23.000000000 +0100
3	@@ -9,13 +9,13 @@	3	@@ -9,18 +9,13 @@
4		4
5	# group to install vlock-all and vlock-nosysrq as	5	# group to install vlock-all and vlock-nosysrq as
6	# defaults to 'root')	6	# defaults to 'root')
Lines 12-22 Link Here
12		12
13	# root's group	13	# root's group
14	-ROOT_GROUP = root	14	-ROOT_GROUP = root
		15	-
		16	-# installation prefix
		17	-PREFIX = /usr/local
		18	-# installation root
		19	-DESTDIR =
15	+ROOT_GROUP = wheel	20	+ROOT_GROUP = wheel
16		21
17	# installation prefix	22	# c compiler
18	PREFIX = /usr/local	23	CC = gcc
19	@@ -30,7 +30,7 @@	24	@@ -30,7 +25,7 @@
20	LDFLAGS =	25	LDFLAGS =
21		26
22	# linker flags needed for pam	27	# linker flags needed for pam