/[gentoo-alt]/trunk/sys-devel/freebsd-mk-defs/files/freebsd-mk-defs-gentoo.patch
Gentoo

Contents of /trunk/sys-devel/freebsd-mk-defs/files/freebsd-mk-defs-gentoo.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 350 - (hide annotations) (download)
Tue May 10 18:18:56 2005 UTC (9 years, 6 months ago) by flameeyes
File size: 7020 byte(s)
Updated to 5.4-RELEASE.

1 flameeyes 350 diff -ur share.orig/mk/bsd.doc.mk share/mk/bsd.doc.mk
2     --- share.orig/mk/bsd.doc.mk Thu Apr 7 12:01:25 2005
3     +++ share/mk/bsd.doc.mk Thu Apr 7 12:00:13 2005
4     @@ -137,10 +137,12 @@
5     realinstall:
6     .for _dev in ${PRINTERDEVICE:Mhtml}
7     cd ${SRCDIR}; \
8     + ${INSTALL} -d ${DESTDIR}${BINDIR}/${VOLUME}
9     ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
10     ${DOC}*.html ${DESTDIR}${BINDIR}/${VOLUME}
11     .endfor
12     .for _dev in ${PRINTERDEVICE:Nhtml}
13     + ${INSTALL} -d ${DESTDIR}${BINDIR}/${VOLUME}
14     ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
15     ${DFILE.${_dev}} ${DESTDIR}${BINDIR}/${VOLUME}
16     .endfor
17     diff -ur share.orig/mk/bsd.files.mk share/mk/bsd.files.mk
18     --- share.orig/mk/bsd.files.mk Thu Apr 7 12:01:25 2005
19     +++ share/mk/bsd.files.mk Thu Apr 7 12:00:34 2005
20     @@ -39,6 +39,7 @@
21     .endif
22     installfiles: _${group}INS_${file:T}
23     _${group}INS_${file:T}: ${file}
24     + ${INSTALL} -d ${DESTDIR}${${group}DIR_${.ALLSRC}}/${${group}NAME_${.ALLSRC:T}:H}
25     ${INSTALL} -o ${${group}OWN_${.ALLSRC:T}} \
26     -g ${${group}GRP_${.ALLSRC:T}} -m ${${group}MODE_${.ALLSRC:T}} \
27     ${.ALLSRC} \
28     @@ -51,10 +52,12 @@
29     installfiles: _${group}INS
30     _${group}INS: ${_${group}FILES}
31     .if defined(${group}NAME)
32     + ${INSTALL} -d ${DESTDIR}${${group}DIR}/${${group}NAME}
33     ${INSTALL} -o ${${group}OWN} -g ${${group}GRP} \
34     -m ${${group}MODE} ${.ALLSRC} \
35     ${DESTDIR}${${group}DIR}/${${group}NAME}
36     .else
37     + ${INSTALL} -d ${DESTDIR}${${group}DIR}
38     ${INSTALL} -o ${${group}OWN} -g ${${group}GRP} \
39     -m ${${group}MODE} ${.ALLSRC} ${DESTDIR}${${group}DIR}
40     .endif
41     diff -ur share.orig/mk/bsd.incs.mk share/mk/bsd.incs.mk
42     --- share.orig/mk/bsd.incs.mk Thu Apr 7 12:01:25 2005
43     +++ share/mk/bsd.incs.mk Thu Apr 7 12:00:40 2005
44     @@ -39,6 +39,10 @@
45     .endif
46     installincludes: _${group}INS_${header:T}
47     _${group}INS_${header:T}: ${header}
48     +
49     + ${INSTALL} -d -o ${${group}OWN_${.ALLSRC:T}} \
50     + -g ${${group}GRP_${.ALLSRC:T}} -m ${${group}MODE_${.ALLSRC:T}} \
51     + ${DESTDIR}${${group}DIR_${.ALLSRC:T}}/${${group}NAME_${.ALLSRC:T}}
52     ${INSTALL} -C -o ${${group}OWN_${.ALLSRC:T}} \
53     -g ${${group}GRP_${.ALLSRC:T}} -m ${${group}MODE_${.ALLSRC:T}} \
54     ${.ALLSRC} \
55     @@ -51,9 +55,11 @@
56     installincludes: _${group}INS
57     _${group}INS: ${_${group}INCS}
58     .if defined(${group}NAME)
59     + ${INSTALL} -d ${DESTDIR}${${group}DIR}
60     ${INSTALL} -C -o ${${group}OWN} -g ${${group}GRP} -m ${${group}MODE} \
61     ${.ALLSRC} ${DESTDIR}${${group}DIR}/${${group}NAME}
62     .else
63     + ${INSTALL} -d ${DESTDIR}${${group}DIR}
64     ${INSTALL} -C -o ${${group}OWN} -g ${${group}GRP} -m ${${group}MODE} \
65     ${.ALLSRC} ${DESTDIR}${${group}DIR}
66     .endif
67     diff -ur share.orig/mk/bsd.info.mk share/mk/bsd.info.mk
68     --- share.orig/mk/bsd.info.mk Thu Apr 7 12:01:25 2005
69     +++ share/mk/bsd.info.mk Thu Apr 7 12:00:44 2005
70     @@ -85,6 +85,7 @@
71     TEX?= tex
72     DVIPS?= dvips
73     DVIPS2ASCII?= dvips2ascii
74     +INSTALL?= install
75    
76     .SUFFIXES: ${ICOMPRESS_EXT} .info .texi .texinfo .dvi .ps .latin1 .html
77    
78     @@ -145,6 +146,7 @@
79     .for x in ${INFO}
80     INSTALLINFODIRS+= ${x:S/$/-install/}
81     ${x:S/$/-install/}:
82     + ${INSTALL} -d ${DESTDIR}${INFODIR}
83     ${INSTALLINFO} ${INSTALLINFOFLAGS} \
84     --defsection=${INFOSECTION} \
85     --defentry=${INFOENTRY_${x}} \
86     diff -ur share.orig/mk/bsd.lib.mk share/mk/bsd.lib.mk
87     --- share.orig/mk/bsd.lib.mk Thu Apr 7 12:01:25 2005
88     +++ share/mk/bsd.lib.mk Thu Apr 7 12:00:49 2005
89     @@ -208,14 +208,17 @@
90     .ORDER: beforeinstall _libinstall
91     _libinstall:
92     .if defined(LIB) && !empty(LIB) && !defined(NOINSTALLLIB)
93     + ${INSTALL} -d ${DESTDIR}${LIBDIR}
94     ${INSTALL} -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
95     ${_INSTALLFLAGS} lib${LIB}.a ${DESTDIR}${LIBDIR}
96     .endif
97     .if !defined(NOPROFILE) && defined(LIB) && !empty(LIB)
98     + ${INSTALL} -d ${DESTDIR}${LIBDIR}
99     ${INSTALL} -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
100     ${_INSTALLFLAGS} lib${LIB}_p.a ${DESTDIR}${LIBDIR}
101     .endif
102     .if defined(SHLIB_NAME)
103     + ${INSTALL} -d ${DESTDIR}${SHLIBDIR}
104     ${INSTALL} ${STRIP} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
105     ${_INSTALLFLAGS} ${_SHLINSTALLFLAGS} \
106     ${SHLIB_NAME} ${DESTDIR}${SHLIBDIR}
107     diff -ur share.orig/mk/bsd.man.mk share/mk/bsd.man.mk
108     --- share.orig/mk/bsd.man.mk Thu Apr 7 12:01:25 2005
109     +++ share/mk/bsd.man.mk Thu Apr 7 12:00:52 2005
110     @@ -165,9 +165,11 @@
111     .if defined(NOMANCOMPRESS)
112     .if defined(MANFILTER)
113     .for page in ${MAN}
114     + ${INSTALL} -d ${DESTDIR}${MANDIR}${page:E}${MANSUBDIR}/${page}
115     ${MINSTALL} ${page:T:S/$/${FILTEXTENSION}/g} \
116     ${DESTDIR}${MANDIR}${page:E}${MANSUBDIR}/${page}
117     .if defined(MANBUILDCAT) && !empty(MANBUILDCAT)
118     + ${INSTALL} -d ${DESTDIR}${CATDIR}${page:E}${MANSUBDIR}/${page}
119     ${MINSTALL} ${page:T:S/$/${CATEXT}${FILTEXTENSION}/g} \
120     ${DESTDIR}${CATDIR}${page:E}${MANSUBDIR}/${page}
121     .endif
122     @@ -186,6 +188,7 @@
123     done
124     .if defined(MANBUILDCAT) && !empty(MANBUILDCAT)
125     .for page in ${MAN}
126     + ${INSTALL} -d ${DESTDIR}${CATDIR}${page:E}${MANSUBDIR}/${page:T}
127     ${MINSTALL} ${page:T:S/$/${CATEXT}/} \
128     ${DESTDIR}${CATDIR}${page:E}${MANSUBDIR}/${page:T}
129     .endfor
130     @@ -193,9 +196,11 @@
131     .endif
132     .else
133     .for page in ${MAN}
134     + ${INSTALL} -d ${DESTDIR}${MANDIR}${page:E}${MANSUBDIR}
135     ${MINSTALL} ${page:T:S/$/${MCOMPRESS_EXT}/g} \
136     ${DESTDIR}${MANDIR}${page:E}${MANSUBDIR}
137     .if defined(MANBUILDCAT) && !empty(MANBUILDCAT)
138     + ${INSTALL} -d ${DESTDIR}${CATDIR}${page:E}${MANSUBDIR}/${page:T:S/$/${MCOMPRESS_EXT}/}
139     ${MINSTALL} ${page:T:S/$/${CATEXT}${MCOMPRESS_EXT}/g} \
140     ${DESTDIR}${CATDIR}${page:E}${MANSUBDIR}/${page:T:S/$/${MCOMPRESS_EXT}/}
141     .endif
142     diff -ur share.orig/mk/bsd.prog.mk share/mk/bsd.prog.mk
143     --- share.orig/mk/bsd.prog.mk Thu Apr 7 12:01:25 2005
144     +++ share/mk/bsd.prog.mk Thu Apr 7 12:00:55 2005
145     @@ -126,9 +126,11 @@
146     _proginstall:
147     .if defined(PROG)
148     .if defined(PROGNAME)
149     + ${INSTALL} -d ${DESTDIR}${BINDIR}
150     ${INSTALL} ${STRIP} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
151     ${_INSTALLFLAGS} ${PROG} ${DESTDIR}${BINDIR}/${PROGNAME}
152     .else
153     + ${INSTALL} -d ${DESTDIR}${BINDIR}
154     ${INSTALL} ${STRIP} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
155     ${_INSTALLFLAGS} ${PROG} ${DESTDIR}${BINDIR}
156     .endif
157     @@ -156,6 +158,7 @@
158     SCRIPTSMODE_${script:T}?= ${SCRIPTSMODE}
159     _scriptsinstall: _SCRIPTSINS_${script:T}
160     _SCRIPTSINS_${script:T}: ${script}
161     + ${INSTALL} -d ${DESTDIR}${SCRIPTSDIR_${.ALLSRC:T}}
162     ${INSTALL} -o ${SCRIPTSOWN_${.ALLSRC:T}} \
163     -g ${SCRIPTSGRP_${.ALLSRC:T}} -m ${SCRIPTSMODE_${.ALLSRC:T}} \
164     ${.ALLSRC} \
165     diff -ur share.orig/mk/sys.mk share/mk/sys.mk
166     --- share.orig/mk/sys.mk Thu Apr 7 12:01:25 2005
167     +++ share/mk/sys.mk Thu Apr 7 12:02:06 2005
168     @@ -37,7 +37,7 @@
169     CFLAGS ?= -O
170     .else
171     CC ?= cc
172     -CFLAGS ?= -O -pipe
173     +CFLAGS += -pipe
174     .endif
175    
176     CXX ?= c++
177     @@ -258,12 +258,6 @@
178     ${LEX} -t ${LFLAGS} ${.IMPSRC} > ${.PREFIX}.tmp.c
179     ${CC} ${CFLAGS} ${LDFLAGS} ${.PREFIX}.tmp.c ${LDLIBS} -ll -o ${.TARGET}
180     rm -f ${.PREFIX}.tmp.c
181     -
182     -# FreeBSD build pollution. Hide it in the non-POSIX part of the ifdef.
183     -__MAKE_CONF?=/etc/make.conf
184     -.if exists(${__MAKE_CONF})
185     -.include "${__MAKE_CONF}"
186     -.endif
187    
188     # Default executable format
189     # XXX hint for bsd.port.mk

Properties

Name Value
svn:eol-style native
svn:keywords Author Date Id Revision

  ViewVC Help
Powered by ViewVC 1.1.20