summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sys-freebsd/freebsd-mk-defs/ChangeLog9
-rw-r--r--sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-6.0-gnu.patch105
-rw-r--r--sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-6.2-2-gentoo.patch288
-rw-r--r--sys-freebsd/freebsd-mk-defs/freebsd-mk-defs-6.2.ebuild40
-rw-r--r--sys-freebsd/freebsd-mk-defs/freebsd-mk-defs-7.1.ebuild41
5 files changed, 7 insertions, 476 deletions
diff --git a/sys-freebsd/freebsd-mk-defs/ChangeLog b/sys-freebsd/freebsd-mk-defs/ChangeLog
index a5c028d9de37..231c9ae2dfc6 100644
--- a/sys-freebsd/freebsd-mk-defs/ChangeLog
+++ b/sys-freebsd/freebsd-mk-defs/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for sys-freebsd/freebsd-mk-defs
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-mk-defs/ChangeLog,v 1.33 2009/05/22 13:37:30 aballier Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-mk-defs/ChangeLog,v 1.34 2010/03/11 11:22:52 aballier Exp $
+
+ 11 Mar 2010; Alexis Ballier <aballier@gentoo.org>
+ -files/freebsd-mk-defs-6.0-gnu.patch, -freebsd-mk-defs-6.2.ebuild,
+ -files/freebsd-mk-defs-6.2-2-gentoo.patch, -freebsd-mk-defs-7.1.ebuild:
+ remove old
*freebsd-mk-defs-7.2 (22 May 2009)
diff --git a/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-6.0-gnu.patch b/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-6.0-gnu.patch
deleted file mode 100644
index 76c94e1b5934..000000000000
--- a/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-6.0-gnu.patch
+++ /dev/null
@@ -1,105 +0,0 @@
-Index: mk/bsd.incs.mk
-===================================================================
---- mk.orig/bsd.incs.mk
-+++ mk/bsd.incs.mk
-@@ -43,7 +43,7 @@ _${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}} \
-+ ${INSTALL} -o ${${group}OWN_${.ALLSRC:T}} \
- -g ${${group}GRP_${.ALLSRC:T}} -m ${${group}MODE_${.ALLSRC:T}} \
- ${.ALLSRC} \
- ${DESTDIR}${${group}DIR_${.ALLSRC:T}}/${${group}NAME_${.ALLSRC:T}}
-@@ -56,11 +56,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} \
-+ ${INSTALL} -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} \
-+ ${INSTALL} -o ${${group}OWN} -g ${${group}GRP} -m ${${group}MODE} \
- ${.ALLSRC} ${DESTDIR}${${group}DIR}
- .endif
- .endif
-Index: mk/bsd.lib.mk
-===================================================================
---- mk.orig/bsd.lib.mk
-+++ mk/bsd.lib.mk
-@@ -105,7 +105,7 @@ _LIBS= lib${LIB}.a
- lib${LIB}.a: ${OBJS} ${STATICOBJS}
- @${ECHO} building static ${LIB} library
- @rm -f ${.TARGET}
-- @${AR} cq ${.TARGET} `lorder ${OBJS} ${STATICOBJS} | tsort -q` ${ARADD}
-+ @${AR} cq ${.TARGET} ${OBJS} ${STATICOBJS} ${ARADD}
- ${RANLIB} ${.TARGET}
- .endif
-
-@@ -118,7 +118,7 @@ POBJS+= ${OBJS:.o=.po} ${STATICOBJS:.o=
- lib${LIB}_p.a: ${POBJS}
- @${ECHO} building profiled ${LIB} library
- @rm -f ${.TARGET}
-- @${AR} cq ${.TARGET} `lorder ${POBJS} | tsort -q` ${ARADD}
-+ @${AR} cq ${.TARGET} ${POBJS} ${ARADD}
- ${RANLIB} ${.TARGET}
- .endif
-
-@@ -138,7 +138,7 @@ ${SHLIB_NAME}: ${SOBJS}
- .endif
- @${CC} ${LDFLAGS} -shared -Wl,-x \
- -o ${.TARGET} -Wl,-soname,${SONAME} \
-- `lorder ${SOBJS} | tsort -q` ${LDADD}
-+ `echo ${SOBJS} | xargs -n 1 echo | sort -u` ${LDADD}
- .endif
-
- .if defined(INSTALL_PIC_ARCHIVE) && defined(LIB) && !empty(LIB)
-@@ -183,13 +183,6 @@ _EXTRADEPEND:
-
- .if !target(install)
-
--.if defined(PRECIOUSLIB)
--.if !defined(NO_FSCHG)
--SHLINSTALLFLAGS+= -fschg
--.endif
--SHLINSTALLFLAGS+= -S
--.endif
--
- _INSTALLFLAGS:= ${INSTALLFLAGS}
- .for ie in ${INSTALLFLAGS_EDIT}
- _INSTALLFLAGS:= ${_INSTALLFLAGS${ie}}
-@@ -205,12 +198,12 @@ realinstall: _libinstall
- _libinstall:
- .if defined(LIB) && !empty(LIB) && !defined(NO_INSTALLLIB)
- ${INSTALL} -d ${DESTDIR}${LIBDIR}
-- ${INSTALL} -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
-+ ${INSTALL} -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} \
-+ ${INSTALL} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
- ${_INSTALLFLAGS} lib${LIB}_p.a ${DESTDIR}${LIBDIR}
- .endif
- .if defined(SHLIB_NAME)
-Index: mk/bsd.prog.mk
-===================================================================
---- mk.orig/bsd.prog.mk
-+++ mk/bsd.prog.mk
-@@ -111,13 +111,6 @@ _EXTRADEPEND:
-
- .if !target(install)
-
--.if defined(PRECIOUSPROG)
--.if !defined(NO_FSCHG)
--INSTALLFLAGS+= -fschg
--.endif
--INSTALLFLAGS+= -S
--.endif
--
- _INSTALLFLAGS:= ${INSTALLFLAGS}
- .for ie in ${INSTALLFLAGS_EDIT}
- _INSTALLFLAGS:= ${_INSTALLFLAGS${ie}}
diff --git a/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-6.2-2-gentoo.patch b/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-6.2-2-gentoo.patch
deleted file mode 100644
index c09633b575b0..000000000000
--- a/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-6.2-2-gentoo.patch
+++ /dev/null
@@ -1,288 +0,0 @@
-Index: fbsd-6.2b3/share/mk/bsd.doc.mk
-===================================================================
---- fbsd-6.2b3.orig/share/mk/bsd.doc.mk
-+++ fbsd-6.2b3/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.2b3/share/mk/bsd.files.mk
-===================================================================
---- fbsd-6.2b3.orig/share/mk/bsd.files.mk
-+++ fbsd-6.2b3/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.2b3/share/mk/bsd.incs.mk
-===================================================================
---- fbsd-6.2b3.orig/share/mk/bsd.incs.mk
-+++ fbsd-6.2b3/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.2b3/share/mk/bsd.info.mk
-===================================================================
---- fbsd-6.2b3.orig/share/mk/bsd.info.mk
-+++ fbsd-6.2b3/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
-
-@@ -146,12 +147,14 @@ ${x:S/$/${ICOMPRESS_EXT}/}: ${x}
- INSTALLINFODIRS+= ${x:S/$/-install/}
- ${x:S/$/-install/}:
- .if !empty(.MAKEFLAGS:M-j)
-+ ${INSTALL} -d ${DESTDIR}${INFODIR}/${INFODIRFILE}
- lockf -k ${DESTDIR}${INFODIR}/${INFODIRFILE} \
- ${INSTALLINFO} ${INSTALLINFOFLAGS} \
- --defsection=${INFOSECTION} \
- --defentry=${INFOENTRY_${x}} \
- ${x}.info ${DESTDIR}${INFODIR}/${INFODIRFILE}
- .else
-+ ${INSTALL} -d ${DESTDIR}${INFODIR}/${INFODIRFILE}
- ${INSTALLINFO} ${INSTALLINFOFLAGS} \
- --defsection=${INFOSECTION} \
- --defentry=${INFOENTRY_${x}} \
-Index: fbsd-6.2b3/share/mk/bsd.lib.mk
-===================================================================
---- fbsd-6.2b3.orig/share/mk/bsd.lib.mk
-+++ fbsd-6.2b3/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.2b3/share/mk/bsd.man.mk
-===================================================================
---- fbsd-6.2b3.orig/share/mk/bsd.man.mk
-+++ fbsd-6.2b3/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.2b3/share/mk/bsd.prog.mk
-===================================================================
---- fbsd-6.2b3.orig/share/mk/bsd.prog.mk
-+++ fbsd-6.2b3/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.2b3/share/mk/sys.mk
-===================================================================
---- fbsd-6.2b3.orig/share/mk/sys.mk
-+++ fbsd-6.2b3/share/mk/sys.mk
-@@ -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.2b3/share/mk/bsd.libnames.mk
-===================================================================
---- fbsd-6.2b3.orig/share/mk/bsd.libnames.mk
-+++ fbsd-6.2b3/share/mk/bsd.libnames.mk
-@@ -41,7 +41,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
-@@ -66,7 +66,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.2b3/share/mk/bsd.sys.mk
-===================================================================
---- fbsd-6.2b3.orig/share/mk/bsd.sys.mk
-+++ fbsd-6.2b3/share/mk/bsd.sys.mk
-@@ -27,9 +27,6 @@ CFLAGS += -std=${CSTD}
- . 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
-@@ -60,9 +57,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
diff --git a/sys-freebsd/freebsd-mk-defs/freebsd-mk-defs-6.2.ebuild b/sys-freebsd/freebsd-mk-defs/freebsd-mk-defs-6.2.ebuild
deleted file mode 100644
index 35adfd3785f4..000000000000
--- a/sys-freebsd/freebsd-mk-defs/freebsd-mk-defs-6.2.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-mk-defs/freebsd-mk-defs-6.2.ebuild,v 1.2 2007/07/02 15:31:54 peper Exp $
-
-inherit bsdmk freebsd
-
-DESCRIPTION="Makefiles definitions used for building and installing libraries and system files"
-SLOT="0"
-KEYWORDS="~amd64 ~sparc-fbsd ~x86 ~x86-fbsd"
-
-IUSE=""
-
-SRC_URI="mirror://gentoo/${SHARE}.tar.bz2"
-
-RDEPEND=""
-DEPEND=""
-
-RESTRICT="strip"
-
-S="${WORKDIR}/share/mk"
-
-src_unpack() {
- unpack ${A}
- cd ${WORKDIR}/share
- epatch "${FILESDIR}/${PN}-6.2-2-gentoo.patch"
-
- [[ ${CHOST} != *-*bsd* || ${CHOST} == *-gnu ]] && \
- epatch "${FILESDIR}/${PN}-6.0-gnu.patch"
-}
-
-src_compile() { :; }
-
-src_install() {
- if [[ ${CHOST} != *-freebsd* ]]; then
- insinto /usr/share/mk/freebsd
- else
- insinto /usr/share/mk
- fi
- doins *.mk
-}
diff --git a/sys-freebsd/freebsd-mk-defs/freebsd-mk-defs-7.1.ebuild b/sys-freebsd/freebsd-mk-defs/freebsd-mk-defs-7.1.ebuild
deleted file mode 100644
index 550cdd2ca9d4..000000000000
--- a/sys-freebsd/freebsd-mk-defs/freebsd-mk-defs-7.1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-mk-defs/freebsd-mk-defs-7.1.ebuild,v 1.2 2009/01/23 02:18:16 mr_bones_ Exp $
-
-inherit bsdmk freebsd
-
-DESCRIPTION="Makefiles definitions used for building and installing libraries and system files"
-SLOT="0"
-KEYWORDS="~amd64 ~sparc-fbsd ~x86 ~x86-fbsd"
-
-IUSE=""
-
-SRC_URI="mirror://gentoo/${SHARE}.tar.bz2"
-
-RDEPEND=""
-DEPEND=""
-
-RESTRICT="strip"
-
-S="${WORKDIR}/share/mk"
-
-src_unpack() {
- unpack ${A}
-
- cd "${S}"
- epatch "${FILESDIR}/${PN}-7.1-gentoo.patch"
-
- [[ ${CHOST} != *-*bsd* || ${CHOST} == *-gnu ]] && \
- epatch "${FILESDIR}/${PN}-7.1-gnu.patch"
-}
-
-src_compile() { :; }
-
-src_install() {
- if [[ ${CHOST} != *-freebsd* ]]; then
- insinto /usr/share/mk/freebsd
- else
- insinto /usr/share/mk
- fi
- doins *.mk *.awk
-}