Import sys-freebsd into main portage.

(Portage version: 2.1_pre7-r3)

6 files changed, 501 insertions, 0 deletions

diff --git a/sys-freebsd/freebsd-mk-defs/files/digest-freebsd-mk-defs-6.0 b/sys-freebsd/freebsd-mk-defs/files/digest-freebsd-mk-defs-6.0
new file mode 100644
index 000000000000..e6a72be686f1
--- /dev/null
+++ b/sys-freebsd/freebsd-mk-defs/files/digest-freebsd-mk-defs-6.0
@@ -0,0 +1 @@
+MD5 e6da34bbe65a9cb2031e0613ab46108c freebsd-share-6.0.tar.bz2 3719732
diff --git a/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-6.0-gentoo.patch b/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-6.0-gentoo.patch
new file mode 100644
index 000000000000..43eb745e67db
--- /dev/null
+++ b/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-6.0-gentoo.patch
@@ -0,0 +1,215 @@
+Index: freebsd-6.0/share/mk/bsd.doc.mk
+===================================================================
+--- freebsd-6.0.orig/share/mk/bsd.doc.mk
++++ freebsd-6.0/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: freebsd-6.0/share/mk/bsd.files.mk
+===================================================================
+--- freebsd-6.0.orig/share/mk/bsd.files.mk
++++ freebsd-6.0/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: freebsd-6.0/share/mk/bsd.incs.mk
+===================================================================
+--- freebsd-6.0.orig/share/mk/bsd.incs.mk
++++ freebsd-6.0/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: freebsd-6.0/share/mk/bsd.info.mk
+===================================================================
+--- freebsd-6.0.orig/share/mk/bsd.info.mk
++++ freebsd-6.0/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}
+ 	${INSTALLINFO} ${INSTALLINFOFLAGS} \
+ 	    --defsection=${INFOSECTION} \
+ 	    --defentry=${INFOENTRY_${x}} \
+Index: freebsd-6.0/share/mk/bsd.lib.mk
+===================================================================
+--- freebsd-6.0.orig/share/mk/bsd.lib.mk
++++ freebsd-6.0/share/mk/bsd.lib.mk
+@@ -208,14 +208,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: freebsd-6.0/share/mk/bsd.man.mk
+===================================================================
+--- freebsd-6.0.orig/share/mk/bsd.man.mk
++++ freebsd-6.0/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
+@@ -186,6 +188,7 @@ _maninstall: ${MAN}
+ 	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 +196,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: freebsd-6.0/share/mk/bsd.prog.mk
+===================================================================
+--- freebsd-6.0.orig/share/mk/bsd.prog.mk
++++ freebsd-6.0/share/mk/bsd.prog.mk
+@@ -133,9 +133,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 +165,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: freebsd-6.0/share/mk/sys.mk
+===================================================================
+--- freebsd-6.0.orig/share/mk/sys.mk
++++ freebsd-6.0/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
+@@ -259,12 +259,6 @@ MACHINE_ARCH	?=	i386
+ 	${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
diff --git a/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-6.0-strip.patch b/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-6.0-strip.patch
new file mode 100644
index 000000000000..2ed1b138730b
--- /dev/null
+++ b/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-6.0-strip.patch
@@ -0,0 +1,47 @@
+Index: fbsd-6/share/mk/bsd.lib.mk
+===================================================================
+--- fbsd-6.orig/share/mk/bsd.lib.mk
++++ fbsd-6/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
+Index: fbsd-6/share/mk/bsd.own.mk
+===================================================================
+--- fbsd-6.orig/share/mk/bsd.own.mk
++++ fbsd-6/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/share/mk/bsd.prog.mk
+===================================================================
+--- fbsd-6.orig/share/mk/bsd.prog.mk
++++ fbsd-6/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
diff --git a/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-flex.patch b/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-flex.patch
new file mode 100644
index 000000000000..2ca4d038bd3e
--- /dev/null
+++ b/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-flex.patch
@@ -0,0 +1,21 @@
+diff -ur -x '*~' share/mk/bsd.libnames.mk share-flex/mk/bsd.libnames.mk
+--- share/mk/bsd.libnames.mk	2004-11-28 15:10:18.000000000 +0100
++++ share-flex/mk/bsd.libnames.mk	2005-07-10 01:45:38.009094320 +0200
+@@ -39,7 +39,7 @@
+ 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
+@@ -64,7 +64,7 @@
+ 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
diff --git a/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-gentoo.patch b/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-gentoo.patch
new file mode 100644
index 000000000000..5d5235eb0097
--- /dev/null
+++ b/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-gentoo.patch
@@ -0,0 +1,189 @@
+diff -ur share.orig/mk/bsd.doc.mk share/mk/bsd.doc.mk
+--- share.orig/mk/bsd.doc.mk	Thu Apr  7 12:01:25 2005
++++ share/mk/bsd.doc.mk	Thu Apr  7 12:00:13 2005
+@@ -137,10 +137,12 @@
+ 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
+diff -ur share.orig/mk/bsd.files.mk share/mk/bsd.files.mk
+--- share.orig/mk/bsd.files.mk	Thu Apr  7 12:01:25 2005
++++ share/mk/bsd.files.mk	Thu Apr  7 12:00:34 2005
+@@ -39,6 +39,7 @@
+ .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 @@
+ 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
+diff -ur share.orig/mk/bsd.incs.mk share/mk/bsd.incs.mk
+--- share.orig/mk/bsd.incs.mk	Thu Apr  7 12:01:25 2005
++++ share/mk/bsd.incs.mk	Thu Apr  7 12:00:40 2005
+@@ -39,6 +39,10 @@
+ .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 @@
+ 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
+diff -ur share.orig/mk/bsd.info.mk share/mk/bsd.info.mk
+--- share.orig/mk/bsd.info.mk	Thu Apr  7 12:01:25 2005
++++ share/mk/bsd.info.mk	Thu Apr  7 12:00:44 2005
+@@ -85,6 +85,7 @@
+ TEX?=		tex
+ DVIPS?=		dvips
+ DVIPS2ASCII?=	dvips2ascii
++INSTALL?=	install
+ 
+ .SUFFIXES: ${ICOMPRESS_EXT} .info .texi .texinfo .dvi .ps .latin1 .html
+ 
+@@ -145,6 +146,7 @@
+ .for x in ${INFO}
+ INSTALLINFODIRS+= ${x:S/$/-install/}
+ ${x:S/$/-install/}:
++	${INSTALL} -d ${DESTDIR}${INFODIR}
+ 	${INSTALLINFO} ${INSTALLINFOFLAGS} \
+ 	    --defsection=${INFOSECTION} \
+ 	    --defentry=${INFOENTRY_${x}} \
+diff -ur share.orig/mk/bsd.lib.mk share/mk/bsd.lib.mk
+--- share.orig/mk/bsd.lib.mk	Thu Apr  7 12:01:25 2005
++++ share/mk/bsd.lib.mk	Thu Apr  7 12:00:49 2005
+@@ -208,14 +208,17 @@
+ .ORDER: beforeinstall _libinstall
+ _libinstall:
+ .if defined(LIB) && !empty(LIB) && !defined(NOINSTALLLIB)
++	${INSTALL} -d ${DESTDIR}${LIBDIR}
+ 	${INSTALL} -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
+ 	    ${_INSTALLFLAGS} lib${LIB}.a ${DESTDIR}${LIBDIR}
+ .endif
+ .if !defined(NOPROFILE) && 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}
+diff -ur share.orig/mk/bsd.man.mk share/mk/bsd.man.mk
+--- share.orig/mk/bsd.man.mk	Thu Apr  7 12:01:25 2005
++++ share/mk/bsd.man.mk	Thu Apr  7 12:00:52 2005
+@@ -165,9 +165,11 @@
+ .if defined(NOMANCOMPRESS)
+ .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
+@@ -186,6 +188,7 @@
+ 	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 +196,11 @@
+ .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
+diff -ur share.orig/mk/bsd.prog.mk share/mk/bsd.prog.mk
+--- share.orig/mk/bsd.prog.mk	Thu Apr  7 12:01:25 2005
++++ share/mk/bsd.prog.mk	Thu Apr  7 12:00:55 2005
+@@ -126,9 +126,11 @@
+ _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
+@@ -156,6 +158,7 @@
+ 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} \
+diff -ur share.orig/mk/sys.mk share/mk/sys.mk
+--- share.orig/mk/sys.mk	Thu Apr  7 12:01:25 2005
++++ share/mk/sys.mk	Thu Apr  7 12:02:06 2005
+@@ -37,7 +37,7 @@
+ CFLAGS		?=	-O
+ .else
+ CC		?=	cc
+-CFLAGS		?=	-O -pipe
++CFLAGS		+=	-pipe
+ .endif
+ 
+ CXX		?=	c++
+@@ -258,12 +258,6 @@
+ 	${LEX} -t ${LFLAGS} ${.IMPSRC} > ${.PREFIX}.tmp.c
+ 	${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
diff --git a/sys-freebsd/freebsd-mk-defs/files/sys.patch b/sys-freebsd/freebsd-mk-defs/files/sys.patch
new file mode 100644
index 000000000000..051d7c40eed4
--- /dev/null
+++ b/sys-freebsd/freebsd-mk-defs/files/sys.patch
@@ -0,0 +1,28 @@
+--- sys.mk.orig	Wed Oct 20 15:05:43 2004
++++ sys.mk	Wed Oct 20 16:45:42 2004
+@@ -253,17 +253,17 @@
+ 
+ .endif
+ 
+-__MAKE_CONF?=/etc/make.conf
+-.if exists(${__MAKE_CONF})
+-.include "${__MAKE_CONF}"
+-.endif
++#__MAKE_CONF?=/etc/make.conf
++#.if exists(${__MAKE_CONF})
++#.include "${__MAKE_CONF}"
++#.endif
+ 
+ .include <bsd.cpu.mk>
+ 
+-.if exists(/etc/make.conf.local)
+-.error Error, /etc/make.conf.local should be renamed to /etc/make.conf.
+-.include </etc/make.conf.local>
+-.endif
++#.if exists(/etc/make.conf.local)
++#.error Error, /etc/make.conf.local should be renamed to /etc/make.conf.
++#.include </etc/make.conf.local>
++#.endif
+ 
+ # Default executable format
+ # XXX hint for bsd.port.mk