summaryrefslogtreecommitdiff
blob: 7b0cb346917b3e964868976d4298a71e32f4259a (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
diff -ur usr.bin.orig/calendar/Makefile usr.bin/calendar/Makefile
--- usr.bin.orig/calendar/Makefile	Thu Apr  7 20:52:57 2005
+++ usr.bin/calendar/Makefile	Thu Apr  7 20:56:53 2005
@@ -10,6 +10,7 @@
 TEXTMODE?=	444
 
 beforeinstall:
+	${INSTALL} -d ${DESTDIR}${SHAREDIR}/calendar
 	${INSTALL} -o ${BINOWN} -g ${BINGRP} -m ${TEXTMODE} \
 	    ${.CURDIR}/calendars/calendar.* ${DESTDIR}${SHAREDIR}/calendar
 .for lang in ${INTER}
Only in usr.bin/calendar: Makefile.orig
diff -ur usr.bin.orig/ee/Makefile usr.bin/ee/Makefile
--- usr.bin.orig/ee/Makefile	Thu Apr  7 20:52:57 2005
+++ usr.bin/ee/Makefile	Thu Apr  7 20:57:14 2005
@@ -12,12 +12,12 @@
 NLS=	en_US.US-ASCII fr_FR.ISO8859-1 de_DE.ISO8859-1 pl_PL.ISO8859-2 \
 	uk_UA.KOI8-U ru_RU.KOI8-R
 
-NLSLINKS_en_US.US-ASCII= en_US.ISO8859-1 en_US.ISO8859-15
-NLSLINKS_fr_FR.ISO8859-1= fr_BE.ISO8859-1 fr_BE.ISO8859-15 \
-        fr_CA.ISO8859-1 fr_CA.ISO8859-15 fr_CH.ISO8859-1 fr_CH.ISO8859-15 \
-	fr_FR.ISO8859-15
-NLSLINKS_de_DE.ISO8859-1= de_AT.ISO8859-1 de_AT.ISO8859-15 de_CH.ISO8859-1 \
-        de_CH.ISO8859-15 de_DE.ISO8859-15
+#NLSLINKS_en_US.US-ASCII= en_US.ISO8859-1 en_US.ISO8859-15
+#NLSLINKS_fr_FR.ISO8859-1= fr_BE.ISO8859-1 fr_BE.ISO8859-15 \
+#        fr_CA.ISO8859-1 fr_CA.ISO8859-15 fr_CH.ISO8859-1 fr_CH.ISO8859-15 \
+#	fr_FR.ISO8859-15
+#NLSLINKS_de_DE.ISO8859-1= de_AT.ISO8859-1 de_AT.ISO8859-15 de_CH.ISO8859-1 \
+#        de_CH.ISO8859-15 de_DE.ISO8859-15
 
 NLSSRCFILES=ee.msg
 .for lang in ${NLS}
Only in usr.bin/ee: Makefile.orig
diff -ur usr.bin.orig/kdump/Makefile usr.bin/kdump/Makefile
--- usr.bin.orig/kdump/Makefile	Thu Apr  7 20:52:57 2005
+++ usr.bin/kdump/Makefile	Thu Apr  7 20:57:20 2005
@@ -5,7 +5,7 @@
 
 PROG=		kdump
 SRCS=		kdump.c ioctl.c subr.c
-CFLAGS+=	-I${.CURDIR}/../ktrace -I${.CURDIR}/../..
+CFLAGS+=	-I${.CURDIR}/../ktrace -I/usr/src
 
 CLEANFILES=	ioctl.c
 
Only in usr.bin/kdump: Makefile.orig
diff -ur usr.bin.orig/truss/Makefile usr.bin/truss/Makefile
--- usr.bin.orig/truss/Makefile	Thu Apr  7 20:52:59 2005
+++ usr.bin/truss/Makefile	Thu Apr  7 20:57:29 2005
@@ -14,18 +14,18 @@
 
 .SUFFIXES: .master
 
-i386l-syscalls.master:	${.CURDIR}/../../sys/i386/linux/syscalls.master
+i386l-syscalls.master:	/usr/src/sys/i386/linux/syscalls.master
 	cat ${.ALLSRC} > i386l-syscalls.master
 
 linux_syscalls.h:	i386l-syscalls.master
-	/bin/sh ${.CURDIR}/../../sys/kern/makesyscalls.sh i386l-syscalls.master \
+	/bin/sh /usr/src/sys/kern/makesyscalls.sh i386l-syscalls.master \
 		${.CURDIR}/i386linux.conf
 
-syscalls.master:	${.CURDIR}/../../sys/kern/syscalls.master
+syscalls.master:	/usr/src/sys/kern/syscalls.master
 	cat ${.ALLSRC} > syscalls.master
 
 syscalls.h:	syscalls.master
-	/bin/sh ${.CURDIR}/../../sys/kern/makesyscalls.sh syscalls.master \
+	/bin/sh /usr/src/sys/kern/makesyscalls.sh syscalls.master \
 		${.CURDIR}/i386.conf
 
 ioctl.c: ${.CURDIR}/../kdump/mkioctls
Only in usr.bin/truss: Makefile.orig
diff -ur usr.bin.orig/vi/Makefile usr.bin/vi/Makefile
--- usr.bin.orig/vi/Makefile	Thu Apr  7 20:52:59 2005
+++ usr.bin/vi/Makefile	Thu Apr  7 20:57:37 2005
@@ -74,6 +74,7 @@
 SRCS+=	vs_line.c vs_msg.c vs_refresh.c vs_relative.c vs_smap.c vs_split.c
 
 afterinstall:
+	${INSTALL} -d ${DESTDIR}/usr/share/vi/catalog
 	${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 444 \
 		${CATALOGS:S;^;${SRCDIR}/catalog/;} \
 		${DESTDIR}/usr/share/vi/catalog
Only in usr.bin/vi: Makefile.orig