[packages/9base.git] / 9base-rename.patch

diff -Nur 9base-2/config.mk 9base-2.new/config.mk
--- 9base-2/config.mk	2006-01-25 14:21:14.000000000 +0000
+++ 9base-2.new/config.mk	2006-01-27 15:38:26.000000000 +0000
@@ -1,14 +1,14 @@
 # Customize to fit your system
 
 # paths
-PREFIX      = /usr/local/9
+PREFIX      = /usr
 MANPREFIX   = ${PREFIX}/share/man
 
 VERSION     = 2
 
 # Linux/BSD
-CFLAGS      = -Wall -Wno-missing-braces -Wno-parentheses -Wno-switch -c -I. -DPREFIX="\"${PREFIX}\""
-LDFLAGS     = -static
+CFLAGS      = $(OPTCFLAGS) -Wall -Wno-missing-braces -Wno-parentheses -Wno-switch -c -I. -DPREFIX="\"${PREFIX}\""
+LDFLAGS     =
 
 # Solaris
 #CFLAGS      = -fast -xtarget=ultra -D__sun__ -c -I. -DPREFIX="\"${PREFIX}\""
diff -Nur 9base-2/lib9/Makefile 9base-2.new/lib9/Makefile
--- 9base-2/lib9/Makefile	2006-01-25 14:21:14.000000000 +0000
+++ 9base-2.new/lib9/Makefile	2006-01-27 15:40:18.000000000 +0000
@@ -191,8 +191,7 @@
 
 install:
 	@mkdir -p ${DESTDIR}${MANPREFIX}/man7
-	@cp -f regexp.7 ${DESTDIR}${MANPREFIX}/man7
-	@chmod 444 ${DESTDIR}${MANPREFIX}/man7/regexp.7
+	@cp -f regexp.7 ${DESTDIR}${MANPREFIX}/man7/9regexp.7
 
 uninstall:
 	rm -f ${DESTDIR}${MANPREFIX}/man7/regexp.7
diff -Nur 9base-2/mk/Makefile 9base-2.new/mk/Makefile
--- 9base-2/mk/Makefile	2006-01-25 14:21:14.000000000 +0000
+++ 9base-2.new/mk/Makefile	2006-01-27 15:39:32.000000000 +0000
@@ -15,11 +15,10 @@
 
 install: ${TARG}
 	@mkdir -p ${DESTDIR}${PREFIX}/bin
-	@cp -f ${TARG} ${DESTDIR}${PREFIX}/bin/
-	@chmod 755 ${DESTDIR}${PREFIX}/bin/${TARG}
+	@cp -f ${TARG} ${DESTDIR}${PREFIX}/bin/9${TARG}
+	@chmod 755 ${DESTDIR}${PREFIX}/bin/9${TARG}
 	@mkdir -p ${DESTDIR}${MANPREFIX}/man1
-	@cp -f ${MANFILES} ${DESTDIR}${MANPREFIX}/man1
-	@chmod 444 ${DESTDIR}${MANPREFIX}/man1/${MANFILES}
+	@cp -f ${MANFILES} ${DESTDIR}${MANPREFIX}/man1/9${MANFILES}
 
 uninstall:
 	rm -f ${DESTDIR}${PREFIX}/bin/${TARG}
diff -Nur 9base-2/rc/Makefile 9base-2.new/rc/Makefile
--- 9base-2/rc/Makefile	2006-01-25 14:21:14.000000000 +0000
+++ 9base-2.new/rc/Makefile	2006-01-27 15:39:07.000000000 +0000
@@ -26,14 +26,12 @@
 
 install: ${TARG}
 	@mkdir -p ${DESTDIR}${PREFIX}/bin
-	@cp -f ${TARG} ${DESTDIR}${PREFIX}/bin/
-	@chmod 755 ${DESTDIR}${PREFIX}/bin/${TARG}
+	@cp -f ${TARG} ${DESTDIR}${PREFIX}/bin/9${TARG}
+	@chmod 755 ${DESTDIR}${PREFIX}/bin/9${TARG}
 	@mkdir -p ${DESTDIR}${MANPREFIX}/man1
-	@cp -f ${MANFILES} ${DESTDIR}${MANPREFIX}/man1
-	@chmod 444 ${DESTDIR}${MANPREFIX}/man1/${MANFILES}
-	@mkdir -p ${DESTDIR}${PREFIX}/etc
-	@cp -f rcmain ${DESTDIR}${PREFIX}/etc
-	@chmod 755 ${DESTDIR}${PREFIX}/etc/rcmain
+	@cp -f ${MANFILES} ${DESTDIR}${MANPREFIX}/man1/9${MANFILES}
+	@mkdir -p ${DESTDIR}/etc
+	@cp -f rcmain ${DESTDIR}/etc/9rcmain
 
 uninstall:
 	rm -f ${DESTDIR}${PREFIX}/bin/${TARG}
diff -Nur 9base-2/rc/plan9ish.c 9base-2.new/rc/plan9ish.c
--- 9base-2/rc/plan9ish.c	2006-01-25 14:21:14.000000000 +0000
+++ 9base-2.new/rc/plan9ish.c	2006-01-27 15:05:25.000000000 +0000
@@ -27,7 +27,7 @@
 char*
 Rcmain(void)
 {
-    static char Rcmain[] = PREFIX"/etc/rcmain";
+    static char Rcmain[] = "/etc/9rcmain";
     char *rcmain = getenv("RCMAIN");
     return rcmain ? rcmain : Rcmain;
 }
diff -Nur 9base-2/std.mk 9base-2.new/std.mk
--- 9base-2/std.mk	2006-01-25 14:21:14.000000000 +0000
+++ 9base-2.new/std.mk	2006-01-27 15:07:45.000000000 +0000
@@ -10,11 +10,10 @@
 
 install: ${TARG}
 	@mkdir -p ${DESTDIR}${PREFIX}/bin
-	@cp -f ${TARG} ${DESTDIR}${PREFIX}/bin/
-	@chmod 755 ${DESTDIR}${PREFIX}/bin/${TARG}
+	@cp -f ${TARG} ${DESTDIR}${PREFIX}/bin/9${TARG}
+	@chmod 755 ${DESTDIR}${PREFIX}/bin/9${TARG}
 	@mkdir -p ${DESTDIR}${MANPREFIX}/man1
-	@cp -f ${MANFILES} ${DESTDIR}${MANPREFIX}/man1
-	@chmod 444 ${DESTDIR}${MANPREFIX}/man1/${MANFILES}
+	@cp -f ${MANFILES} ${DESTDIR}${MANPREFIX}/man1/9${MANFILES}
 
 uninstall:
 	rm -f ${DESTDIR}${PREFIX}/bin/${TARG}
diff -Nur 9base-2/yacc.mk 9base-2.new/yacc.mk
--- 9base-2/yacc.mk	2006-01-25 14:21:14.000000000 +0000
+++ 9base-2.new/yacc.mk	2006-01-27 15:08:50.000000000 +0000
@@ -16,11 +16,10 @@
 
 install: ${TARG}
 	@mkdir -p ${DESTDIR}${PREFIX}/bin
-	@cp -f ${TARG} ${DESTDIR}${PREFIX}/bin/
-	@chmod 755 ${DESTDIR}${PREFIX}/bin/${TARG}
+	@cp -f ${TARG} ${DESTDIR}${PREFIX}/bin/9${TARG}
+	@chmod 755 ${DESTDIR}${PREFIX}/bin/9${TARG}
 	@mkdir -p ${DESTDIR}${MANPREFIX}/man1
-	@cp -f ${MANFILES} ${DESTDIR}${MANPREFIX}/man1
-	@chmod 444 ${DESTDIR}${MANPREFIX}/man1/${MANFILES}
+	@cp -f ${MANFILES} ${DESTDIR}${MANPREFIX}/man1/9${MANFILES}
 
 uninstall:
 	rm -f ${DESTDIR}${PREFIX}/bin/${TARG}
Commit	Line	Data
6717ac9b	1	diff -Nur 9base-2/config.mk 9base-2.new/config.mk
	2	--- 9base-2/config.mk 2006-01-25 14:21:14.000000000 +0000
	3	+++ 9base-2.new/config.mk 2006-01-27 15:38:26.000000000 +0000
	4	@@ -1,14 +1,14 @@
	5	# Customize to fit your system
	6
	7	# paths
	8	-PREFIX = /usr/local/9
	9	+PREFIX = /usr
	10	MANPREFIX = ${PREFIX}/share/man
	11
	12	VERSION = 2
	13
	14	# Linux/BSD
	15	-CFLAGS = -Wall -Wno-missing-braces -Wno-parentheses -Wno-switch -c -I. -DPREFIX="\"${PREFIX}\""
	16	-LDFLAGS = -static
	17	+CFLAGS = $(OPTCFLAGS) -Wall -Wno-missing-braces -Wno-parentheses -Wno-switch -c -I. -DPREFIX="\"${PREFIX}\""
	18	+LDFLAGS =
	19
	20	# Solaris
	21	#CFLAGS = -fast -xtarget=ultra -D__sun__ -c -I. -DPREFIX="\"${PREFIX}\""
	22	diff -Nur 9base-2/lib9/Makefile 9base-2.new/lib9/Makefile
	23	--- 9base-2/lib9/Makefile 2006-01-25 14:21:14.000000000 +0000
	24	+++ 9base-2.new/lib9/Makefile 2006-01-27 15:40:18.000000000 +0000
	25	@@ -191,8 +191,7 @@
	26
	27	install:
	28	@mkdir -p ${DESTDIR}${MANPREFIX}/man7
	29	- @cp -f regexp.7 ${DESTDIR}${MANPREFIX}/man7
	30	- @chmod 444 ${DESTDIR}${MANPREFIX}/man7/regexp.7
	31	+ @cp -f regexp.7 ${DESTDIR}${MANPREFIX}/man7/9regexp.7
	32
	33	uninstall:
	34	rm -f ${DESTDIR}${MANPREFIX}/man7/regexp.7
	35	diff -Nur 9base-2/mk/Makefile 9base-2.new/mk/Makefile
	36	--- 9base-2/mk/Makefile 2006-01-25 14:21:14.000000000 +0000
	37	+++ 9base-2.new/mk/Makefile 2006-01-27 15:39:32.000000000 +0000
	38	@@ -15,11 +15,10 @@
	39
	40	install: ${TARG}
	41	@mkdir -p ${DESTDIR}${PREFIX}/bin
	42	- @cp -f ${TARG} ${DESTDIR}${PREFIX}/bin/
	43	- @chmod 755 ${DESTDIR}${PREFIX}/bin/${TARG}
	44	+ @cp -f ${TARG} ${DESTDIR}${PREFIX}/bin/9${TARG}
	45	+ @chmod 755 ${DESTDIR}${PREFIX}/bin/9${TARG}
	46	@mkdir -p ${DESTDIR}${MANPREFIX}/man1
	47	- @cp -f ${MANFILES} ${DESTDIR}${MANPREFIX}/man1
	48	- @chmod 444 ${DESTDIR}${MANPREFIX}/man1/${MANFILES}
	49	+ @cp -f ${MANFILES} ${DESTDIR}${MANPREFIX}/man1/9${MANFILES}
	50
	51	uninstall:
	52	rm -f ${DESTDIR}${PREFIX}/bin/${TARG}
	53	diff -Nur 9base-2/rc/Makefile 9base-2.new/rc/Makefile
	54	--- 9base-2/rc/Makefile 2006-01-25 14:21:14.000000000 +0000
	55	+++ 9base-2.new/rc/Makefile 2006-01-27 15:39:07.000000000 +0000
	56	@@ -26,14 +26,12 @@
	57
	58	install: ${TARG}
	59	@mkdir -p ${DESTDIR}${PREFIX}/bin
	60	- @cp -f ${TARG} ${DESTDIR}${PREFIX}/bin/
	61	- @chmod 755 ${DESTDIR}${PREFIX}/bin/${TARG}
	62	+ @cp -f ${TARG} ${DESTDIR}${PREFIX}/bin/9${TARG}
	63	+ @chmod 755 ${DESTDIR}${PREFIX}/bin/9${TARG}
	64	@mkdir -p ${DESTDIR}${MANPREFIX}/man1
65	- @cp -f ${MANFILES} ${DESTDIR}${MANPREFIX}/man1
66	- @chmod 444 ${DESTDIR}${MANPREFIX}/man1/${MANFILES}
67	- @mkdir -p ${DESTDIR}${PREFIX}/etc
68	- @cp -f rcmain ${DESTDIR}${PREFIX}/etc
69	- @chmod 755 ${DESTDIR}${PREFIX}/etc/rcmain
70	+ @cp -f ${MANFILES} ${DESTDIR}${MANPREFIX}/man1/9${MANFILES}
71	+ @mkdir -p ${DESTDIR}/etc
72	+ @cp -f rcmain ${DESTDIR}/etc/9rcmain
73
74	uninstall:
75	rm -f ${DESTDIR}${PREFIX}/bin/${TARG}
76	diff -Nur 9base-2/rc/plan9ish.c 9base-2.new/rc/plan9ish.c
77	--- 9base-2/rc/plan9ish.c 2006-01-25 14:21:14.000000000 +0000
78	+++ 9base-2.new/rc/plan9ish.c 2006-01-27 15:05:25.000000000 +0000
79	@@ -27,7 +27,7 @@
80	char*
81	Rcmain(void)
82	{
83	- static char Rcmain[] = PREFIX"/etc/rcmain";
84	+ static char Rcmain[] = "/etc/9rcmain";
85	char *rcmain = getenv("RCMAIN");
86	return rcmain ? rcmain : Rcmain;
87	}
88	diff -Nur 9base-2/std.mk 9base-2.new/std.mk
89	--- 9base-2/std.mk 2006-01-25 14:21:14.000000000 +0000
90	+++ 9base-2.new/std.mk 2006-01-27 15:07:45.000000000 +0000
91	@@ -10,11 +10,10 @@
92
93	install: ${TARG}
94	@mkdir -p ${DESTDIR}${PREFIX}/bin
95	- @cp -f ${TARG} ${DESTDIR}${PREFIX}/bin/
96	- @chmod 755 ${DESTDIR}${PREFIX}/bin/${TARG}
97	+ @cp -f ${TARG} ${DESTDIR}${PREFIX}/bin/9${TARG}
98	+ @chmod 755 ${DESTDIR}${PREFIX}/bin/9${TARG}
99	@mkdir -p ${DESTDIR}${MANPREFIX}/man1
100	- @cp -f ${MANFILES} ${DESTDIR}${MANPREFIX}/man1
101	- @chmod 444 ${DESTDIR}${MANPREFIX}/man1/${MANFILES}
102	+ @cp -f ${MANFILES} ${DESTDIR}${MANPREFIX}/man1/9${MANFILES}
103
104	uninstall:
105	rm -f ${DESTDIR}${PREFIX}/bin/${TARG}
106	diff -Nur 9base-2/yacc.mk 9base-2.new/yacc.mk
107	--- 9base-2/yacc.mk 2006-01-25 14:21:14.000000000 +0000
108	+++ 9base-2.new/yacc.mk 2006-01-27 15:08:50.000000000 +0000
109	@@ -16,11 +16,10 @@
110
111	install: ${TARG}
112	@mkdir -p ${DESTDIR}${PREFIX}/bin
113	- @cp -f ${TARG} ${DESTDIR}${PREFIX}/bin/
114	- @chmod 755 ${DESTDIR}${PREFIX}/bin/${TARG}
115	+ @cp -f ${TARG} ${DESTDIR}${PREFIX}/bin/9${TARG}
116	+ @chmod 755 ${DESTDIR}${PREFIX}/bin/9${TARG}
117	@mkdir -p ${DESTDIR}${MANPREFIX}/man1
118	- @cp -f ${MANFILES} ${DESTDIR}${MANPREFIX}/man1
119	- @chmod 444 ${DESTDIR}${MANPREFIX}/man1/${MANFILES}
120	+ @cp -f ${MANFILES} ${DESTDIR}${MANPREFIX}/man1/9${MANFILES}
121
122	uninstall:
123	rm -f ${DESTDIR}${PREFIX}/bin/${TARG}