diff options
Diffstat (limited to 'sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-6.1-gentoo.patch')
| -rw-r--r-- | sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-6.1-gentoo.patch | 307 |
1 files changed, 0 insertions, 307 deletions
diff --git a/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-6.1-gentoo.patch b/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-6.1-gentoo.patch deleted file mode 100644 index 689e0e8652ab..000000000000 --- a/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-6.1-gentoo.patch +++ /dev/null @@ -1,307 +0,0 @@ -Index: fbsd-6.1/share/mk/bsd.doc.mk -=================================================================== ---- fbsd-6.1.orig/share/mk/bsd.doc.mk -+++ fbsd-6.1/share/mk/bsd.doc.mk -@@ -137,10 +137,12 @@ CLEANFILES+= ${DOC}.ascii ${DOC}.ascii${ - realinstall: - .for _dev in ${PRINTERDEVICE:Mhtml} - cd ${SRCDIR}; \ -+ ${INSTALL} -d ${DESTDIR}${BINDIR}/${VOLUME} - ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \ - ${DOC}*.html ${DESTDIR}${BINDIR}/${VOLUME} - .endfor - .for _dev in ${PRINTERDEVICE:Nhtml} -+ ${INSTALL} -d ${DESTDIR}${BINDIR}/${VOLUME} - ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \ - ${DFILE.${_dev}} ${DESTDIR}${BINDIR}/${VOLUME} - .endfor -Index: fbsd-6.1/share/mk/bsd.files.mk -=================================================================== ---- fbsd-6.1.orig/share/mk/bsd.files.mk -+++ fbsd-6.1/share/mk/bsd.files.mk -@@ -39,6 +39,7 @@ ${group}NAME_${file:T}?= ${file:T} - .endif - installfiles: _${group}INS_${file:T} - _${group}INS_${file:T}: ${file} -+ ${INSTALL} -d ${DESTDIR}${${group}DIR_${.ALLSRC}}/${${group}NAME_${.ALLSRC:T}:H} - ${INSTALL} -o ${${group}OWN_${.ALLSRC:T}} \ - -g ${${group}GRP_${.ALLSRC:T}} -m ${${group}MODE_${.ALLSRC:T}} \ - ${.ALLSRC} \ -@@ -51,10 +52,12 @@ _${group}FILES+= ${file} - installfiles: _${group}INS - _${group}INS: ${_${group}FILES} - .if defined(${group}NAME) -+ ${INSTALL} -d ${DESTDIR}${${group}DIR}/${${group}NAME} - ${INSTALL} -o ${${group}OWN} -g ${${group}GRP} \ - -m ${${group}MODE} ${.ALLSRC} \ - ${DESTDIR}${${group}DIR}/${${group}NAME} - .else -+ ${INSTALL} -d ${DESTDIR}${${group}DIR} - ${INSTALL} -o ${${group}OWN} -g ${${group}GRP} \ - -m ${${group}MODE} ${.ALLSRC} ${DESTDIR}${${group}DIR} - .endif -Index: fbsd-6.1/share/mk/bsd.incs.mk -=================================================================== ---- fbsd-6.1.orig/share/mk/bsd.incs.mk -+++ fbsd-6.1/share/mk/bsd.incs.mk -@@ -39,6 +39,10 @@ ${group}NAME_${header:T}?= ${header:T} - .endif - installincludes: _${group}INS_${header:T} - _${group}INS_${header:T}: ${header} -+ -+ ${INSTALL} -d -o ${${group}OWN_${.ALLSRC:T}} \ -+ -g ${${group}GRP_${.ALLSRC:T}} -m ${${group}MODE_${.ALLSRC:T}} \ -+ ${DESTDIR}${${group}DIR_${.ALLSRC:T}}/${${group}NAME_${.ALLSRC:T}} - ${INSTALL} -C -o ${${group}OWN_${.ALLSRC:T}} \ - -g ${${group}GRP_${.ALLSRC:T}} -m ${${group}MODE_${.ALLSRC:T}} \ - ${.ALLSRC} \ -@@ -51,9 +55,11 @@ _${group}INCS+= ${header} - installincludes: _${group}INS - _${group}INS: ${_${group}INCS} - .if defined(${group}NAME) -+ ${INSTALL} -d ${DESTDIR}${${group}DIR} - ${INSTALL} -C -o ${${group}OWN} -g ${${group}GRP} -m ${${group}MODE} \ - ${.ALLSRC} ${DESTDIR}${${group}DIR}/${${group}NAME} - .else -+ ${INSTALL} -d ${DESTDIR}${${group}DIR} - ${INSTALL} -C -o ${${group}OWN} -g ${${group}GRP} -m ${${group}MODE} \ - ${.ALLSRC} ${DESTDIR}${${group}DIR} - .endif -Index: fbsd-6.1/share/mk/bsd.info.mk -=================================================================== ---- fbsd-6.1.orig/share/mk/bsd.info.mk -+++ fbsd-6.1/share/mk/bsd.info.mk -@@ -85,6 +85,7 @@ INFO2HTML?= info2html - TEX?= tex - DVIPS?= dvips - DVIPS2ASCII?= dvips2ascii -+INSTALL?= install - - .SUFFIXES: ${ICOMPRESS_EXT} .info .texi .texinfo .dvi .ps .latin1 .html - -@@ -145,6 +146,7 @@ ${x:S/$/${ICOMPRESS_EXT}/}: ${x} - .for x in ${INFO} - INSTALLINFODIRS+= ${x:S/$/-install/} - ${x:S/$/-install/}: -+ ${INSTALL} -d ${DESTDIR}${INFODIR}/${INFODIRFILE} - lockf -k ${DESTDIR}${INFODIR}/${INFODIRFILE} \ - ${INSTALLINFO} ${INSTALLINFOFLAGS} \ - --defsection=${INFOSECTION} \ -Index: fbsd-6.1/share/mk/bsd.lib.mk -=================================================================== ---- fbsd-6.1.orig/share/mk/bsd.lib.mk -+++ fbsd-6.1/share/mk/bsd.lib.mk -@@ -32,10 +32,6 @@ CFLAGS+= ${CRUNCH_CFLAGS} - CFLAGS+= ${DEBUG_FLAGS} - .endif - --.if !defined(DEBUG_FLAGS) --STRIP?= -s --.endif -- - .include <bsd.libnames.mk> - - # prefer .s to a .c, add .po, remove stuff not used in the BSD libraries -@@ -208,14 +204,17 @@ realinstall: _libinstall - .ORDER: beforeinstall _libinstall - _libinstall: - .if defined(LIB) && !empty(LIB) && !defined(NO_INSTALLLIB) -+ ${INSTALL} -d ${DESTDIR}${LIBDIR} - ${INSTALL} -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ - ${_INSTALLFLAGS} lib${LIB}.a ${DESTDIR}${LIBDIR} - .endif - .if !defined(NO_PROFILE) && defined(LIB) && !empty(LIB) -+ ${INSTALL} -d ${DESTDIR}${LIBDIR} - ${INSTALL} -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ - ${_INSTALLFLAGS} lib${LIB}_p.a ${DESTDIR}${LIBDIR} - .endif - .if defined(SHLIB_NAME) -+ ${INSTALL} -d ${DESTDIR}${SHLIBDIR} - ${INSTALL} ${STRIP} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ - ${_INSTALLFLAGS} ${_SHLINSTALLFLAGS} \ - ${SHLIB_NAME} ${DESTDIR}${SHLIBDIR} -Index: fbsd-6.1/share/mk/bsd.man.mk -=================================================================== ---- fbsd-6.1.orig/share/mk/bsd.man.mk -+++ fbsd-6.1/share/mk/bsd.man.mk -@@ -165,9 +165,11 @@ _maninstall: ${MAN} - .if defined(NO_MANCOMPRESS) - .if defined(MANFILTER) - .for page in ${MAN} -+ ${INSTALL} -d ${DESTDIR}${MANDIR}${page:E}${MANSUBDIR}/${page} - ${MINSTALL} ${page:T:S/$/${FILTEXTENSION}/g} \ - ${DESTDIR}${MANDIR}${page:E}${MANSUBDIR}/${page} - .if defined(MANBUILDCAT) && !empty(MANBUILDCAT) -+ ${INSTALL} -d ${DESTDIR}${CATDIR}${page:E}${MANSUBDIR}/${page} - ${MINSTALL} ${page:T:S/$/${CATEXT}${FILTEXTENSION}/g} \ - ${DESTDIR}${CATDIR}${page:E}${MANSUBDIR}/${page} - .endif -@@ -181,11 +183,14 @@ _maninstall: ${MAN} - esac; \ - page=$$1; shift; sect=$$1; shift; \ - d=${DESTDIR}${MANDIR}$${sect}${MANSUBDIR}; \ -+ ${ECHO} ${INSTALL} -d $${d}; \ -+ ${INSTALL} -d $${d}; \ - ${ECHO} ${MINSTALL} $${page} $${d}; \ - ${MINSTALL} $${page} $${d}; \ - done - .if defined(MANBUILDCAT) && !empty(MANBUILDCAT) - .for page in ${MAN} -+ ${INSTALL} -d ${DESTDIR}${CATDIR}${page:E}${MANSUBDIR}/${page:T} - ${MINSTALL} ${page:T:S/$/${CATEXT}/} \ - ${DESTDIR}${CATDIR}${page:E}${MANSUBDIR}/${page:T} - .endfor -@@ -193,9 +198,11 @@ _maninstall: ${MAN} - .endif - .else - .for page in ${MAN} -+ ${INSTALL} -d ${DESTDIR}${MANDIR}${page:E}${MANSUBDIR} - ${MINSTALL} ${page:T:S/$/${MCOMPRESS_EXT}/g} \ - ${DESTDIR}${MANDIR}${page:E}${MANSUBDIR} - .if defined(MANBUILDCAT) && !empty(MANBUILDCAT) -+ ${INSTALL} -d ${DESTDIR}${CATDIR}${page:E}${MANSUBDIR}/${page:T:S/$/${MCOMPRESS_EXT}/} - ${MINSTALL} ${page:T:S/$/${CATEXT}${MCOMPRESS_EXT}/g} \ - ${DESTDIR}${CATDIR}${page:E}${MANSUBDIR}/${page:T:S/$/${MCOMPRESS_EXT}/} - .endif -Index: fbsd-6.1/share/mk/bsd.prog.mk -=================================================================== ---- fbsd-6.1.orig/share/mk/bsd.prog.mk -+++ fbsd-6.1/share/mk/bsd.prog.mk -@@ -18,10 +18,6 @@ CFLAGS+=${DEBUG_FLAGS} - CFLAGS+=${CRUNCH_CFLAGS} - .endif - --.if !defined(DEBUG_FLAGS) --STRIP?= -s --.endif -- - .if defined(NO_SHARED) && (${NO_SHARED} != "no" && ${NO_SHARED} != "NO") - LDFLAGS+= -static - .endif -@@ -133,9 +129,11 @@ realinstall: _proginstall - _proginstall: - .if defined(PROG) - .if defined(PROGNAME) -+ ${INSTALL} -d ${DESTDIR}${BINDIR} - ${INSTALL} ${STRIP} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \ - ${_INSTALLFLAGS} ${PROG} ${DESTDIR}${BINDIR}/${PROGNAME} - .else -+ ${INSTALL} -d ${DESTDIR}${BINDIR} - ${INSTALL} ${STRIP} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \ - ${_INSTALLFLAGS} ${PROG} ${DESTDIR}${BINDIR} - .endif -@@ -163,6 +161,7 @@ SCRIPTSGRP_${script:T}?= ${SCRIPTSGRP} - SCRIPTSMODE_${script:T}?= ${SCRIPTSMODE} - _scriptsinstall: _SCRIPTSINS_${script:T} - _SCRIPTSINS_${script:T}: ${script} -+ ${INSTALL} -d ${DESTDIR}${SCRIPTSDIR_${.ALLSRC:T}} - ${INSTALL} -o ${SCRIPTSOWN_${.ALLSRC:T}} \ - -g ${SCRIPTSGRP_${.ALLSRC:T}} -m ${SCRIPTSMODE_${.ALLSRC:T}} \ - ${.ALLSRC} \ -Index: fbsd-6.1/share/mk/sys.mk -=================================================================== ---- fbsd-6.1.orig/share/mk/sys.mk -+++ fbsd-6.1/share/mk/sys.mk -@@ -19,7 +19,7 @@ unix ?= We run FreeBSD, not UNIX. - .SUFFIXES: .out .a .ln .o .c .cc .cpp .cxx .C .m .F .f .e .r .y .l .S .asm .s .cl .p .h .sh - .endif - --X11BASE ?= /usr/X11R6 -+X11BASE ?= /usr - - AR ?= ar - .if defined(%POSIX) -@@ -34,13 +34,13 @@ AFLAGS ?= - - .if defined(%POSIX) - CC ?= c89 --CFLAGS ?= -O -+CFLAGS ?= - .else --CC ?= cc --CFLAGS ?= -O2 -fno-strict-aliasing -pipe -+CC ?= gcc -+CFLAGS ?= -pipe - .endif - --CXX ?= c++ -+CXX ?= g++ - CXXFLAGS ?= ${CFLAGS:N-std=*:N-Wnested-externs:N-W*-prototypes} - - CPP ?= cpp -@@ -252,12 +252,6 @@ YFLAGS ?= -d - ${CC} ${CFLAGS} ${LDFLAGS} ${.PREFIX}.tmp.c ${LDLIBS} -ll -o ${.TARGET} - rm -f ${.PREFIX}.tmp.c - --# FreeBSD build pollution. Hide it in the non-POSIX part of the ifdef. --__MAKE_CONF?=/etc/make.conf --.if exists(${__MAKE_CONF}) --.include "${__MAKE_CONF}" --.endif -- - # Default executable format - # XXX hint for bsd.port.mk - OBJFORMAT?= elf -Index: fbsd-6.1/share/mk/bsd.libnames.mk -=================================================================== ---- fbsd-6.1.orig/share/mk/bsd.libnames.mk -+++ fbsd-6.1/share/mk/bsd.libnames.mk -@@ -40,7 +40,7 @@ LIBDISK?= ${DESTDIR}${LIBDIR}/libdisk.a - LIBDNS?= ${DESTDIR}${LIBDIR}/libdns.a - LIBEDIT?= ${DESTDIR}${LIBDIR}/libedit.a - LIBFETCH?= ${DESTDIR}${LIBDIR}/libfetch.a --LIBFL?= "don't use LIBFL, use LIBL" -+LIBFL?= ${DESTDIR}${LIBDOR}/libfl.a - LIBFORM?= ${DESTDIR}${LIBDIR}/libform.a - LIBFTPIO?= ${DESTDIR}${LIBDIR}/libftpio.a - LIBG2C?= ${DESTDIR}${LIBDIR}/libg2c.a -@@ -65,7 +65,7 @@ LIBKEYCAP?= ${DESTDIR}${LIBDIR}/libkeyca - LIBKICONV?= ${DESTDIR}${LIBDIR}/libkiconv.a - LIBKRB5?= ${DESTDIR}${LIBDIR}/libkrb5.a - LIBKVM?= ${DESTDIR}${LIBDIR}/libkvm.a --LIBL?= ${DESTDIR}${LIBDIR}/libl.a -+LIBL?= ${DESTDIR}${LIBDOR}/libfl.a - LIBLN?= "don't use LIBLN, use LIBL" - .if !defined(NO_BIND) - LIBLWRES?= ${DESTDIR}${LIBDIR}/liblwres.a -Index: fbsd-6.1/share/mk/bsd.own.mk -=================================================================== ---- fbsd-6.1.orig/share/mk/bsd.own.mk -+++ fbsd-6.1/share/mk/bsd.own.mk -@@ -157,10 +157,8 @@ NLSMODE?= ${NOBINMODE} - - INCLUDEDIR?= /usr/include - --# Common variables --.if !defined(DEBUG_FLAGS) --STRIP?= -s --.endif -+# Don't strip things with install command, leave that to portage -+STRIP= - - COMPRESS_CMD?= gzip -cn - COMPRESS_EXT?= .gz -Index: fbsd-6.1/share/mk/bsd.sys.mk -=================================================================== ---- fbsd-6.1.orig/share/mk/bsd.sys.mk -+++ fbsd-6.1/share/mk/bsd.sys.mk -@@ -12,9 +12,6 @@ - . if defined(WARNS) - . if ${WARNS} >= 1 - CWARNFLAGS += -Wsystem-headers --. if !defined(NO_WERROR) --CWARNFLAGS += -Werror --. endif - . endif - . if ${WARNS} >= 2 - CWARNFLAGS += -Wall -Wno-format-y2k -@@ -45,9 +42,6 @@ WFORMAT = 1 - . if ${WFORMAT} > 0 - #CWARNFLAGS += -Wformat-nonliteral -Wformat-security -Wno-format-extra-args - CWARNFLAGS += -Wformat=2 -Wno-format-extra-args --. if !defined(NO_WERROR) --CWARNFLAGS += -Werror --. endif - . endif - . endif - .endif |