From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 24017138010 for ; Tue, 11 Sep 2012 17:12:10 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0CB8DE072E; Tue, 11 Sep 2012 17:10:46 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 75EF0E072E for ; Tue, 11 Sep 2012 17:10:46 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id B3B4733CA02 for ; Tue, 11 Sep 2012 17:10:45 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 6CEECE543C for ; Tue, 11 Sep 2012 17:10:44 +0000 (UTC) From: "Alexis Ballier" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Alexis Ballier" Message-ID: <1347381600.e5abb18586f22a2d71299823608ab4920481183b.aballier@gentoo> Subject: [gentoo-commits] proj/gentoo-bsd:master commit in: sys-freebsd/freebsd-mk-defs/files/, sys-freebsd/freebsd-mk-defs/ X-VCS-Repository: proj/gentoo-bsd X-VCS-Files: sys-freebsd/freebsd-mk-defs/Manifest sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-7.1-gentoo.patch sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-7.1-gnu.patch sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-8.0-gentoo.patch sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-8.0-gnu.patch sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-9.0-gentoo.patch sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-9.0-gnu.patch sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-9.1-gentoo.patch sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-9.1-gnu.patch sys-freebsd/freebsd-mk-defs/freebsd-mk-defs-9.1_rc1.ebuild X-VCS-Directories: sys-freebsd/freebsd-mk-defs/files/ sys-freebsd/freebsd-mk-defs/ X-VCS-Committer: aballier X-VCS-Committer-Name: Alexis Ballier X-VCS-Revision: e5abb18586f22a2d71299823608ab4920481183b X-VCS-Branch: master Date: Tue, 11 Sep 2012 17:10:44 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 617662fc-7323-46da-95f2-f6c47f38c110 X-Archives-Hash: 2c1fa5a41706763ad07b8d9db4add4ed commit: e5abb18586f22a2d71299823608ab4920481183b Author: Alexis Ballier gentoo org> AuthorDate: Tue Sep 11 16:40:00 2012 +0000 Commit: Alexis Ballier gentoo org> CommitDate: Tue Sep 11 16:40:00 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gentoo-bsd.git;a=commit;h=e5abb185 Remove freebsd-mk-defs, merged to the main tree --- sys-freebsd/freebsd-mk-defs/Manifest | 10 - .../files/freebsd-mk-defs-7.1-gentoo.patch | 332 -------------------- .../files/freebsd-mk-defs-7.1-gnu.patch | 121 ------- .../files/freebsd-mk-defs-8.0-gentoo.patch | 332 -------------------- .../files/freebsd-mk-defs-8.0-gnu.patch | 121 ------- .../files/freebsd-mk-defs-9.0-gentoo.patch | 326 ------------------- .../files/freebsd-mk-defs-9.0-gnu.patch | 79 ----- .../files/freebsd-mk-defs-9.1-gentoo.patch | 326 ------------------- .../files/freebsd-mk-defs-9.1-gnu.patch | 77 ----- .../freebsd-mk-defs/freebsd-mk-defs-9.1_rc1.ebuild | 38 --- 10 files changed, 0 insertions(+), 1762 deletions(-) diff --git a/sys-freebsd/freebsd-mk-defs/Manifest b/sys-freebsd/freebsd-mk-defs/Manifest deleted file mode 100644 index 176e762..0000000 --- a/sys-freebsd/freebsd-mk-defs/Manifest +++ /dev/null @@ -1,10 +0,0 @@ -AUX freebsd-mk-defs-7.1-gentoo.patch 11056 RMD160 1c6568153bce5f1193c14cc25e6313ba28dcb990 SHA1 18d859d243fbd21e39d76f0e3b65330ea165b507 SHA256 975c1dcd3bfd4a40410caf3ffa70bdf9707c843c07e9a6fb9281158e0595f336 -AUX freebsd-mk-defs-7.1-gnu.patch 4022 RMD160 cc82950abb0d798e99bbba6fb70b420756af8ff8 SHA1 ca5029934f253b9321f1af6fb9a82cade54a47ef SHA256 d10ac0750d533d42ca792584f393d0c2327e62aaf0fa2bf83636aebb68dc47ea -AUX freebsd-mk-defs-8.0-gentoo.patch 11076 RMD160 96d87a4a2bf07278f7ef2c0b5c5dde73f1dc929d SHA1 f2d46e19d4b2f7d169652ff68c7d078f36185176 SHA256 5510a8e9530c3585374bba26942c46c9bc799da3ae0de9b6fa8bd364088260c5 -AUX freebsd-mk-defs-8.0-gnu.patch 4074 RMD160 a6571210e35ae4abe158b6231cd13aebe0046a0e SHA1 99c97fb846c811d940b59d610fc1db9767312611 SHA256 00034d4d94ec011f595864113d469ec83d11786802b997b2350e955c6d2d64a0 -AUX freebsd-mk-defs-9.0-gentoo.patch 11525 RMD160 4eaecca3d452fce3fcde7cb8ab91dee7794c1601 SHA1 a3e21355b16e815523fbd87c1eef52eb77b3b49b SHA256 da5204dc5f421d918fab06c6a5796282dff28e8b48d728905eaba343dd1d9232 -AUX freebsd-mk-defs-9.0-gnu.patch 2353 RMD160 78f1146fab7134a6e7f54c1433086152f8814c64 SHA1 f73a973e7de1f957f9b13cdc0beb0f43b1b37f4d SHA256 49c84f315d006d443c4cef4123cd02aee72fef93d967c164977d83af8e6f5b6e -AUX freebsd-mk-defs-9.1-gentoo.patch 11769 RMD160 51f1fb0a055c6dd5aba131f615d46d5aaecd8ca4 SHA1 0272a97b63b611b139fdd53524ffab3a7e9370e8 SHA256 d9f0585ecdbaec0483d9443543974f6a2157af2fcbe4554e8b61b6255ce6c818 -AUX freebsd-mk-defs-9.1-gnu.patch 2273 RMD160 ce76f9775c2dfbb494aab4897c12ed9f89f382e2 SHA1 a4da2e11b008e19576f15c8dada76ae70ca7b96c SHA256 6b8ebbfd2ff724099d593a00dc226ca7f2e12020a9afcf0602b3098b95a2bb18 -DIST freebsd-share-9.1_rc1.tar.bz2 6670560 RMD160 d2af901ff0aa70932d9ec2b6a31e9e25d2f560b2 SHA1 b685efb2b6019f7de941aa138eef0f6765674753 SHA256 b7d577784ae21f6e95b1f8e8befbdde4afa1f4e7e8cb209b055eaffabd315c75 -EBUILD freebsd-mk-defs-9.1_rc1.ebuild 734 RMD160 9640fe8f43dd213f4c3cab0ae28ee479309243d4 SHA1 ba54ccfcf3aec78f7cdaed298e04362b1dbe0c51 SHA256 b4775cb0a733151d16d90c43a3fdd9dc14ec661881319605e88ef92dde0320e2 diff --git a/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-7.1-gentoo.patch b/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-7.1-gentoo.patch deleted file mode 100644 index 39f84de..0000000 --- a/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-7.1-gentoo.patch +++ /dev/null @@ -1,332 +0,0 @@ -Index: share/mk/bsd.doc.mk -=================================================================== ---- share.orig/mk/bsd.doc.mk -+++ 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: share/mk/bsd.files.mk -=================================================================== ---- share.orig/mk/bsd.files.mk -+++ 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: share/mk/bsd.incs.mk -=================================================================== ---- share.orig/mk/bsd.incs.mk -+++ share/mk/bsd.incs.mk -@@ -41,6 +41,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} \ -@@ -53,9 +57,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: share/mk/bsd.info.mk -=================================================================== ---- share.orig/mk/bsd.info.mk -+++ share/mk/bsd.info.mk -@@ -83,6 +83,7 @@ INFO2HTML?= info2html - TEX?= tex - DVIPS?= dvips - DVIPS2ASCII?= dvips2ascii -+INSTALL?= install - - .SUFFIXES: ${ICOMPRESS_EXT} .info .texi .texinfo .dvi .ps .latin1 .html - -@@ -144,12 +145,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: share/mk/bsd.lib.mk -=================================================================== ---- share.orig/mk/bsd.lib.mk -+++ share/mk/bsd.lib.mk -@@ -37,10 +37,6 @@ NO_WERROR= - CFLAGS+= ${DEBUG_FLAGS} - .endif - --.if !defined(DEBUG_FLAGS) --STRIP?= -s --.endif -- - .include - - # prefer .s to a .c, add .po, remove stuff not used in the BSD libraries -@@ -236,14 +232,17 @@ realinstall: _libinstall - .ORDER: beforeinstall _libinstall - _libinstall: - .if defined(LIB) && !empty(LIB) && ${MK_INSTALLLIB} != "no" -+ ${INSTALL} -d ${DESTDIR}${LIBDIR} - ${INSTALL} -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ - ${_INSTALLFLAGS} lib${LIB}.a ${DESTDIR}${LIBDIR} - .endif - .if ${MK_PROFILE} != "no" && 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: share/mk/bsd.libnames.mk -=================================================================== ---- share.orig/mk/bsd.libnames.mk -+++ 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 -@@ -68,7 +68,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 ${MK_BIND} != "no" - LIBLWRES?= ${DESTDIR}${LIBDIR}/liblwres.a -Index: share/mk/bsd.man.mk -=================================================================== ---- share.orig/mk/bsd.man.mk -+++ 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}${MANDIR}${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: share/mk/bsd.prog.mk -=================================================================== ---- share.orig/mk/bsd.prog.mk -+++ share/mk/bsd.prog.mk -@@ -23,10 +23,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 -@@ -142,9 +138,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 -@@ -172,6 +170,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: share/mk/bsd.sys.mk -=================================================================== ---- share.orig/mk/bsd.sys.mk -+++ share/mk/bsd.sys.mk -@@ -30,9 +30,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 -@@ -66,9 +63,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 -Index: share/mk/sys.mk -=================================================================== ---- share.orig/mk/sys.mk -+++ share/mk/sys.mk -@@ -34,11 +34,11 @@ - CC ?= c89 - CFLAGS ?= -O - .else --CC ?= cc -+CC ?= gcc - .if ${MACHINE_ARCH} == "arm" --CFLAGS ?= -O -fno-strict-aliasing -pipe -+CFLAGS ?= -pipe - .else --CFLAGS ?= -O2 -fno-strict-aliasing -pipe -+CFLAGS ?= -pipe - .endif - .endif - -@@ -61,7 +61,7 @@ - .endif - .endif - --CXX ?= c++ -+CXX ?= g++ - CXXFLAGS ?= ${CFLAGS:N-std=*:N-Wnested-externs:N-W*-prototypes:N-Wno-pointer-sign} - - CPP ?= cpp -@@ -254,12 +254,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: share/mk/bsd.links.mk -=================================================================== ---- share.orig/mk/bsd.links.mk -+++ share/mk/bsd.links.mk -@@ -15,6 +15,8 @@ _installlinks: - t=${DESTDIR}$$1; \ - shift; \ - ${ECHO} $$t -\> $$l; \ -+ d=`dirname $$t`; \ -+ test -d $$d || mkdir $$d; \ - ln -f $$l $$t; \ - done; true - .endif -@@ -26,6 +28,8 @@ _installlinks: - t=${DESTDIR}$$1; \ - shift; \ - ${ECHO} $$t -\> $$l; \ -+ d=`dirname $$t`; \ -+ test -d $$d || mkdir $$d; \ - ln -fs $$l $$t; \ - done; true - .endif -Index: share/mk/bsd.own.mk -=================================================================== ---- share.orig/mk/bsd.own.mk -+++ share/mk/bsd.own.mk -@@ -166,11 +166,6 @@ DEFAULT_THREAD_LIB?= libthr - - INCLUDEDIR?= /usr/include - --# Common variables --.if !defined(DEBUG_FLAGS) --STRIP?= -s --.endif -- - COMPRESS_CMD?= gzip -cn - COMPRESS_EXT?= .gz - diff --git a/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-7.1-gnu.patch b/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-7.1-gnu.patch deleted file mode 100644 index 54747c8..0000000 --- a/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-7.1-gnu.patch +++ /dev/null @@ -1,121 +0,0 @@ -Index: mk/bsd.incs.mk -=================================================================== ---- mk.orig/bsd.incs.mk -+++ mk/bsd.incs.mk -@@ -45,7 +45,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}} -@@ -58,11 +58,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 -@@ -119,11 +119,7 @@ _LIBS= lib${LIB}.a - lib${LIB}.a: ${OBJS} ${STATICOBJS} - @${ECHO} building static ${LIB} library - @rm -f ${.TARGET} --.if !defined(NM) -- @${AR} cq ${.TARGET} `lorder ${OBJS} ${STATICOBJS} | tsort -q` ${ARADD} --.else -- @${AR} cq ${.TARGET} `NM='${NM}' lorder ${OBJS} ${STATICOBJS} | tsort -q` ${ARADD} --.endif -+ @${AR} cq ${.TARGET} ${OBJS} ${STATICOBJS} ${ARADD} - ${RANLIB} ${.TARGET} - .endif - -@@ -136,11 +132,7 @@ POBJS+= ${OBJS:.o=.po} ${STATICOBJS:.o= - lib${LIB}_p.a: ${POBJS} - @${ECHO} building profiled ${LIB} library - @rm -f ${.TARGET} --.if !defined(NM) -- @${AR} cq ${.TARGET} `lorder ${POBJS} | tsort -q` ${ARADD} --.else -- @${AR} cq ${.TARGET} `NM='${NM}' lorder ${POBJS} | tsort -q` ${ARADD} --.endif -+ @${AR} cq ${.TARGET} ${POBJS} ${ARADD} - ${RANLIB} ${.TARGET} - .endif - -@@ -195,15 +195,9 @@ - .if defined(SHLIB_LINK) - @ln -fs ${.TARGET} ${SHLIB_LINK} - .endif --.if !defined(NM) - @${CC} ${LDFLAGS} -shared -Wl,-x \ - -o ${.TARGET} -Wl,-soname,${SONAME} \ -- `lorder ${SOBJS} | tsort -q` ${LDADD} --.else -- @${CC} ${LDFLAGS} -shared -Wl,-x \ -- -o ${.TARGET} -Wl,-soname,${SONAME} \ -- `NM='${NM}' lorder ${SOBJS} | tsort -q` ${LDADD} --.endif -+ `echo ${SOBJS} | xargs -n 1 echo | sort -u` ${LDADD} - .if defined(CTFMERGE) - ${CTFMERGE} ${CTFFLAGS} -o ${.TARGET} ${SOBJS} - .endif -@@ -211,13 +197,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}} -@@ -233,12 +212,12 @@ realinstall: _libinstall - _libinstall: - .if defined(LIB) && !empty(LIB) && ${MK_INSTALLLIB} != "no" - ${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 ${MK_PROFILE} != "no" && 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 -@@ -120,13 +120,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-8.0-gentoo.patch b/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-8.0-gentoo.patch deleted file mode 100644 index f17f6c4..0000000 --- a/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-8.0-gentoo.patch +++ /dev/null @@ -1,332 +0,0 @@ -Index: share/mk/bsd.doc.mk -=================================================================== ---- share/mk/bsd.doc.mk.orig -+++ 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: share/mk/bsd.files.mk -=================================================================== ---- share/mk/bsd.files.mk.orig -+++ 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: share/mk/bsd.incs.mk -=================================================================== ---- share/mk/bsd.incs.mk.orig -+++ share/mk/bsd.incs.mk -@@ -41,6 +41,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} \ -@@ -53,9 +57,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: share/mk/bsd.info.mk -=================================================================== ---- share/mk/bsd.info.mk.orig -+++ share/mk/bsd.info.mk -@@ -83,6 +83,7 @@ INFO2HTML?= info2html - TEX?= tex - DVIPS?= dvips - DVIPS2ASCII?= dvips2ascii -+INSTALL?= install - - .SUFFIXES: ${ICOMPRESS_EXT} .info .texi .texinfo .dvi .ps .latin1 .html - -@@ -144,12 +145,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: share/mk/bsd.lib.mk -=================================================================== ---- share/mk/bsd.lib.mk.orig -+++ share/mk/bsd.lib.mk -@@ -41,10 +41,6 @@ CTFFLAGS+= -g - .endif - .endif - --.if !defined(DEBUG_FLAGS) --STRIP?= -s --.endif -- - .include - - # prefer .s to a .c, add .po, remove stuff not used in the BSD libraries -@@ -276,14 +272,17 @@ realinstall: _libinstall - .ORDER: beforeinstall _libinstall - _libinstall: - .if defined(LIB) && !empty(LIB) && ${MK_INSTALLLIB} != "no" -+ ${INSTALL} -d ${DESTDIR}${LIBDIR} - ${INSTALL} -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ - ${_INSTALLFLAGS} lib${LIB}.a ${DESTDIR}${LIBDIR} - .endif - .if ${MK_PROFILE} != "no" && 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: share/mk/bsd.libnames.mk -=================================================================== ---- share/mk/bsd.libnames.mk.orig -+++ share/mk/bsd.libnames.mk -@@ -46,7 +46,7 @@ LIBDWARF?= ${DESTDIR}${LIBDIR}/libdwarf. - LIBEDIT?= ${DESTDIR}${LIBDIR}/libedit.a - LIBELF?= ${DESTDIR}${LIBDIR}/libelf.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 -@@ -77,7 +77,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 ${MK_BIND} != "no" - LIBLWRES?= ${DESTDIR}${LIBDIR}/liblwres.a -Index: share/mk/bsd.man.mk -=================================================================== ---- share/mk/bsd.man.mk.orig -+++ 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}${MANDIR}${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: share/mk/bsd.prog.mk -=================================================================== ---- share/mk/bsd.prog.mk.orig -+++ share/mk/bsd.prog.mk -@@ -27,10 +27,6 @@ CTFFLAGS+= -g - CFLAGS+=${CRUNCH_CFLAGS} - .endif - --.if !defined(DEBUG_FLAGS) --STRIP?= -s --.endif -- - .if defined(NO_SHARED) && (${NO_SHARED} != "no" && ${NO_SHARED} != "NO") - LDFLAGS+= -static - .endif -@@ -152,9 +148,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 -@@ -182,6 +180,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: share/mk/bsd.sys.mk -=================================================================== ---- share/mk/bsd.sys.mk.orig -+++ share/mk/bsd.sys.mk -@@ -28,9 +28,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 -@@ -64,9 +61,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 -Index: share/mk/bsd.links.mk -=================================================================== ---- share/mk/bsd.links.mk.orig -+++ share/mk/bsd.links.mk -@@ -15,6 +15,8 @@ _installlinks: - t=${DESTDIR}$$1; \ - shift; \ - ${ECHO} $$t -\> $$l; \ -+ d=`dirname $$t`; \ -+ test -d $$d || mkdir $$d; \ - ln -f $$l $$t; \ - done; true - .endif -@@ -26,6 +28,8 @@ _installlinks: - t=${DESTDIR}$$1; \ - shift; \ - ${ECHO} $$t -\> $$l; \ -+ d=`dirname $$t`; \ -+ test -d $$d || mkdir $$d; \ - ln -fs $$l $$t; \ - done; true - .endif -Index: share/mk/bsd.own.mk -=================================================================== ---- share/mk/bsd.own.mk.orig -+++ share/mk/bsd.own.mk -@@ -164,11 +164,6 @@ NLSMODE?= ${NOBINMODE} - - INCLUDEDIR?= /usr/include - --# Common variables --.if !defined(DEBUG_FLAGS) --STRIP?= -s --.endif -- - COMPRESS_CMD?= gzip -cn - COMPRESS_EXT?= .gz - -Index: share/mk/sys.mk -=================================================================== ---- share/mk/sys.mk.orig -+++ share/mk/sys.mk -@@ -34,11 +34,11 @@ AFLAGS ?= - CC ?= c89 - CFLAGS ?= -O - .else --CC ?= cc -+CC ?= gcc - .if ${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "mips" --CFLAGS ?= -O -pipe -+CFLAGS ?= -pipe - .else --CFLAGS ?= -O2 -pipe -+CFLAGS ?= -pipe - .endif - .if defined(NO_STRICT_ALIASING) - CFLAGS += -fno-strict-aliasing -@@ -64,7 +64,7 @@ CFLAGS += -g - .endif - .endif - --CXX ?= c++ -+CXX ?= g++ - CXXFLAGS ?= ${CFLAGS:N-std=*:N-Wnested-externs:N-W*-prototypes:N-Wno-pointer-sign} - - CPP ?= cpp -@@ -333,12 +333,6 @@ YFLAGS ?= -d - ${CTFCONVERT} ${CTFFLAGS} ${.TARGET} - .endif - --# 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 -- - .if defined(__MAKE_SHELL) && !empty(__MAKE_SHELL) - SHELL= ${__MAKE_SHELL} - .SHELL: path=${__MAKE_SHELL} diff --git a/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-8.0-gnu.patch b/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-8.0-gnu.patch deleted file mode 100644 index 41c4de4..0000000 --- a/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-8.0-gnu.patch +++ /dev/null @@ -1,121 +0,0 @@ -Index: mk/bsd.incs.mk -=================================================================== ---- mk/bsd.incs.mk.orig -+++ mk/bsd.incs.mk -@@ -45,7 +45,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}} -@@ -58,11 +58,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/bsd.lib.mk.orig -+++ mk/bsd.lib.mk -@@ -156,11 +156,7 @@ _LIBS= lib${LIB}.a - lib${LIB}.a: ${OBJS} ${STATICOBJS} - @${ECHO} building static ${LIB} library - @rm -f ${.TARGET} --.if !defined(NM) -- @${AR} cq ${.TARGET} `lorder ${OBJS} ${STATICOBJS} | tsort -q` ${ARADD} --.else -- @${AR} cq ${.TARGET} `NM='${NM}' lorder ${OBJS} ${STATICOBJS} | tsort -q` ${ARADD} --.endif -+ @${AR} cq ${.TARGET} ${OBJS} ${STATICOBJS} ${ARADD} - ${RANLIB} ${.TARGET} - .endif - -@@ -173,11 +169,7 @@ POBJS+= ${OBJS:.o=.po} ${STATICOBJS:.o= - lib${LIB}_p.a: ${POBJS} - @${ECHO} building profiled ${LIB} library - @rm -f ${.TARGET} --.if !defined(NM) -- @${AR} cq ${.TARGET} `lorder ${POBJS} | tsort -q` ${ARADD} --.else -- @${AR} cq ${.TARGET} `NM='${NM}' lorder ${POBJS} | tsort -q` ${ARADD} --.endif -+ @${AR} cq ${.TARGET} ${POBJS} ${ARADD} - ${RANLIB} ${.TARGET} - .endif - -@@ -195,15 +187,9 @@ ${SHLIB_NAME}: ${SOBJS} - .if defined(SHLIB_LINK) - @ln -fs ${.TARGET} ${SHLIB_LINK} - .endif --.if !defined(NM) -- @${CC} ${LDFLAGS} ${SSP_CFLAGS} -shared -Wl,-x \ -- -o ${.TARGET} -Wl,-soname,${SONAME} \ -- `lorder ${SOBJS} | tsort -q` ${LDADD} --.else - @${CC} ${LDFLAGS} ${SSP_CFLAGS} -shared -Wl,-x \ - -o ${.TARGET} -Wl,-soname,${SONAME} \ -- `NM='${NM}' lorder ${SOBJS} | tsort -q` ${LDADD} --.endif -+ `echo ${SOBJS} | xargs -n 1 echo | sort -u` ${LDADD} - .if defined(CTFMERGE) - ${CTFMERGE} ${CTFFLAGS} -o ${.TARGET} ${SOBJS} - .endif -@@ -251,13 +237,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}} -@@ -273,12 +252,12 @@ realinstall: _libinstall - _libinstall: - .if defined(LIB) && !empty(LIB) && ${MK_INSTALLLIB} != "no" - ${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 ${MK_PROFILE} != "no" && 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/bsd.prog.mk.orig -+++ mk/bsd.prog.mk -@@ -130,13 +130,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-9.0-gentoo.patch b/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-9.0-gentoo.patch deleted file mode 100644 index f5e6568..0000000 --- a/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-9.0-gentoo.patch +++ /dev/null @@ -1,326 +0,0 @@ -diff -ur share/mk.old/bsd.doc.mk share/mk/bsd.doc.mk ---- share/mk.old/bsd.doc.mk 2011-10-18 14:42:26.000000000 +0000 -+++ share/mk/bsd.doc.mk 2011-11-06 15:45:08.000000000 +0000 -@@ -135,10 +135,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/mk.old/bsd.files.mk share/mk/bsd.files.mk ---- share/mk.old/bsd.files.mk 2011-10-18 14:42:26.000000000 +0000 -+++ share/mk/bsd.files.mk 2011-11-06 15:45:08.000000000 +0000 -@@ -39,6 +39,7 @@ - .endif - installfiles: _${group}INS_${file:T} - _${group}INS_${file:T}: ${file} -+ ${INSTALL} -d ${DESTDIR}${${group}DIR_${.ALLSRC:T}} - ${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/mk.old/bsd.incs.mk share/mk/bsd.incs.mk ---- share/mk.old/bsd.incs.mk 2011-10-18 14:42:26.000000000 +0000 -+++ share/mk/bsd.incs.mk 2011-11-06 15:45:08.000000000 +0000 -@@ -41,7 +41,10 @@ - .endif - installincludes: _${group}INS_${header:T} - _${group}INS_${header:T}: ${header} -+ ${INSTALL} -d -o ${${group}OWN_${.ALLSRC:T}} \ -+ -g ${${group}GRP_${.ALLSRC:T}} \ -+ ${DESTDIR}${${group}DIR_${.ALLSRC:T}} - ${INSTALL} -C -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}} -@@ -53,10 +56,14 @@ - installincludes: _${group}INS - _${group}INS: ${_${group}INCS} - .if defined(${group}NAME) -+ ${INSTALL} -d -o ${${group}OWN} -g ${${group}GRP} \ -+ ${DESTDIR}${${group}DIR} - ${INSTALL} -C -o ${${group}OWN} -g ${${group}GRP} -m ${${group}MODE} \ - ${.ALLSRC} ${DESTDIR}${${group}DIR}/${${group}NAME} - .else -+ ${INSTALL} -d -o ${${group}OWN} -g ${${group}GRP} \ -+ ${DESTDIR}${${group}DIR} - ${INSTALL} -C -o ${${group}OWN} -g ${${group}GRP} -m ${${group}MODE} \ - ${.ALLSRC} ${DESTDIR}${${group}DIR} - .endif - .endif -diff -ur share/mk.old/bsd.info.mk share/mk/bsd.info.mk ---- share/mk.old/bsd.info.mk 2011-10-18 14:42:26.000000000 +0000 -+++ share/mk/bsd.info.mk 2011-11-06 15:45:08.000000000 +0000 -@@ -83,6 +83,7 @@ - TEX?= tex - DVIPS?= dvips - DVIPS2ASCII?= dvips2ascii -+INSTALL?= install - - .SUFFIXES: ${ICOMPRESS_EXT} .info .texi .texinfo .dvi .ps .latin1 .html - -@@ -144,15 +145,17 @@ - INSTALLINFODIRS+= ${x:S/$/-install/} - ${x:S/$/-install/}: - .if !empty(.MAKEFLAGS:M-j) -+ ${INSTALL} -d ${DESTDIR}${INFODIR} - lockf -k ${DESTDIR}${INFODIR}/${INFODIRFILE} \ - ${INSTALLINFO} ${INSTALLINFOFLAGS} \ -- --defsection=${INFOSECTION} \ -- --defentry=${INFOENTRY_${x}} \ -+ --section=${INFOSECTION} \ -+ --entry=${INFOENTRY_${x}} \ - ${x}.info ${DESTDIR}${INFODIR}/${INFODIRFILE} - .else -+ ${INSTALL} -d ${DESTDIR}${INFODIR} - ${INSTALLINFO} ${INSTALLINFOFLAGS} \ -- --defsection=${INFOSECTION} \ -- --defentry=${INFOENTRY_${x}} \ -+ --section=${INFOSECTION} \ -+ --entry=${INFOENTRY_${x}} \ - ${x}.info ${DESTDIR}${INFODIR}/${INFODIRFILE} - .endif - .endfor -diff -ur share/mk.old/bsd.lib.mk share/mk/bsd.lib.mk ---- share/mk.old/bsd.lib.mk 2011-10-18 14:42:26.000000000 +0000 -+++ share/mk/bsd.lib.mk 2011-11-06 15:45:08.000000000 +0000 -@@ -46,10 +46,6 @@ - .endif - .endif - --.if !defined(DEBUG_FLAGS) --STRIP?= -s --.endif -- - .include - - # prefer .s to a .c, add .po, remove stuff not used in the BSD libraries -@@ -270,14 +266,17 @@ - .ORDER: beforeinstall _libinstall - _libinstall: - .if defined(LIB) && !empty(LIB) && ${MK_INSTALLLIB} != "no" -+ ${INSTALL} -d ${DESTDIR}${LIBDIR} - ${INSTALL} -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ - ${_INSTALLFLAGS} lib${LIB}.a ${DESTDIR}${LIBDIR} - .endif - .if ${MK_PROFILE} != "no" && 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} -@@ -295,10 +294,12 @@ - .endif - .endif - .if defined(INSTALL_PIC_ARCHIVE) && defined(LIB) && !empty(LIB) && ${MK_TOOLCHAIN} != "no" -+ ${INSTALL} -d ${DESTDIR}${LIBDIR} - ${INSTALL} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ - ${_INSTALLFLAGS} lib${LIB}_pic.a ${DESTDIR}${LIBDIR} - .endif - .if defined(WANT_LINT) && !defined(NO_LINT) && defined(LIB) && !empty(LIB) -+ ${INSTALL} -d ${DESTDIR}${LINTLIBDIR} - ${INSTALL} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ - ${_INSTALLFLAGS} ${LINTLIB} ${DESTDIR}${LINTLIBDIR} - .endif -diff -ur share/mk.old/bsd.libnames.mk share/mk/bsd.libnames.mk ---- share/mk.old/bsd.libnames.mk 2011-10-18 14:42:26.000000000 +0000 -+++ share/mk/bsd.libnames.mk 2011-11-06 15:45:08.000000000 +0000 -@@ -46,7 +46,7 @@ - LIBEDIT?= ${DESTDIR}${LIBDIR}/libedit.a - LIBELF?= ${DESTDIR}${LIBDIR}/libelf.a - LIBFETCH?= ${DESTDIR}${LIBDIR}/libfetch.a --LIBFL?= "don't use LIBFL, use LIBL" -+LIBFL?= ${DESTDIR}${LIBDIR}/libfl.a - LIBFORM?= ${DESTDIR}${LIBDIR}/libform.a - LIBFTPIO?= ${DESTDIR}${LIBDIR}/libftpio.a - LIBG2C?= ${DESTDIR}${LIBDIR}/libg2c.a -@@ -77,7 +77,7 @@ - LIBKICONV?= ${DESTDIR}${LIBDIR}/libkiconv.a - LIBKRB5?= ${DESTDIR}${LIBDIR}/libkrb5.a - LIBKVM?= ${DESTDIR}${LIBDIR}/libkvm.a --LIBL?= ${DESTDIR}${LIBDIR}/libl.a -+LIBL?= ${DESTDIR}${LIBDIR}/libfl.a - LIBLN?= "don't use LIBLN, use LIBL" - .if ${MK_BIND} != "no" - LIBLWRES?= ${DESTDIR}${LIBDIR}/liblwres.a -diff -ur share/mk.old/bsd.links.mk share/mk/bsd.links.mk ---- share/mk.old/bsd.links.mk 2011-10-18 14:42:26.000000000 +0000 -+++ share/mk/bsd.links.mk 2011-11-06 15:45:08.000000000 +0000 -@@ -15,6 +15,8 @@ - t=${DESTDIR}$$1; \ - shift; \ - ${ECHO} $$t -\> $$l; \ -+ d=`dirname $$t`; \ -+ test -d $$d || mkdir $$d; \ - ln -f $$l $$t; \ - done; true - .endif -@@ -26,6 +28,8 @@ - t=${DESTDIR}$$1; \ - shift; \ - ${ECHO} $$t -\> $$l; \ -+ d=`dirname $$t`; \ -+ test -d $$d || mkdir $$d; \ - ln -fs $$l $$t; \ - done; true - .endif -diff -ur share/mk.old/bsd.man.mk share/mk/bsd.man.mk ---- share/mk.old/bsd.man.mk 2011-10-18 14:42:26.000000000 +0000 -+++ share/mk/bsd.man.mk 2011-11-06 15:45:08.000000000 +0000 -@@ -165,9 +165,11 @@ - .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 @@ - 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 @@ - .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/mk.old/bsd.nls.mk share/mk/bsd.nls.mk ---- share/mk.old/bsd.nls.mk 2011-10-18 14:42:26.000000000 +0000 -+++ share/mk/bsd.nls.mk 2011-11-06 15:45:08.000000000 +0000 -@@ -62,7 +62,8 @@ - # installation rules - # - .for file in ${NLS} --NLSNAME_${file:T}= ${file:T:R}/${NLSNAME}.cat -+NLSDIR_${file:T}= ${SHAREDIR}/nls/${file:T:R}/ -+NLSNAME_${file:T}= ${NLSNAME}.cat - .if defined(NLSLINKS_${file:R}) && !empty(NLSLINKS_${file:R}) - NLSLINKS+= ${file:R} - .endif -diff -ur share/mk.old/bsd.own.mk share/mk/bsd.own.mk ---- share/mk.old/bsd.own.mk 2011-10-18 14:42:26.000000000 +0000 -+++ share/mk/bsd.own.mk 2011-11-06 15:45:08.000000000 +0000 -@@ -182,9 +182,6 @@ - INCLUDEDIR?= /usr/include - - # Common variables --.if !defined(DEBUG_FLAGS) --STRIP?= -s --.endif - - COMPRESS_CMD?= gzip -cn - COMPRESS_EXT?= .gz -diff -ur share/mk.old/bsd.prog.mk share/mk/bsd.prog.mk ---- share/mk.old/bsd.prog.mk 2011-10-18 14:42:26.000000000 +0000 -+++ share/mk/bsd.prog.mk 2011-11-06 15:45:08.000000000 +0000 -@@ -33,10 +33,6 @@ - CFLAGS+=${CRUNCH_CFLAGS} - .endif - --.if !defined(DEBUG_FLAGS) --STRIP?= -s --.endif -- - .if defined(NO_SHARED) && (${NO_SHARED} != "no" && ${NO_SHARED} != "NO") - LDFLAGS+= -static - .endif -@@ -155,6 +151,7 @@ - .ORDER: beforeinstall _proginstall - _proginstall: - .if defined(PROG) -+ ${INSTALL} -d ${DESTDIR}${BINDIR} - .if defined(PROGNAME) - ${INSTALL} ${STRIP} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \ - ${_INSTALLFLAGS} ${PROG} ${DESTDIR}${BINDIR}/${PROGNAME} -@@ -186,6 +183,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/mk.old/bsd.sys.mk share/mk/bsd.sys.mk ---- share/mk.old/bsd.sys.mk 2011-10-18 14:42:26.000000000 +0000 -+++ share/mk/bsd.sys.mk 2011-11-06 15:45:08.000000000 +0000 -@@ -28,9 +28,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 -@@ -66,9 +63,6 @@ - . 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 - . if defined(NO_WFORMAT) -diff -ur share/mk.old/sys.mk share/mk/sys.mk ---- share/mk.old/sys.mk 2011-10-18 14:42:26.000000000 +0000 -+++ share/mk/sys.mk 2011-11-06 15:45:08.000000000 +0000 -@@ -349,12 +349,6 @@ - (${ECHO} ${CTFCONVERT} ${CTFFLAGS} ${.TARGET} && \ - ${CTFCONVERT} ${CTFFLAGS} ${.TARGET}) - --# 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 -- - .if defined(__MAKE_SHELL) && !empty(__MAKE_SHELL) - SHELL= ${__MAKE_SHELL} - .SHELL: path=${__MAKE_SHELL} diff --git a/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-9.0-gnu.patch b/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-9.0-gnu.patch deleted file mode 100644 index bd7d7e6..0000000 --- a/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-9.0-gnu.patch +++ /dev/null @@ -1,79 +0,0 @@ -Index: work/share/mk/bsd.lib.mk -=================================================================== ---- work.orig/share/mk/bsd.lib.mk -+++ work/share/mk/bsd.lib.mk -@@ -146,11 +146,7 @@ _LIBS= lib${LIB}.a - lib${LIB}.a: ${OBJS} ${STATICOBJS} - @${ECHO} building static ${LIB} library - @rm -f ${.TARGET} --.if !defined(NM) -- @${AR} cq ${.TARGET} `lorder ${OBJS} ${STATICOBJS} | tsort -q` ${ARADD} --.else -- @${AR} cq ${.TARGET} `NM='${NM}' lorder ${OBJS} ${STATICOBJS} | tsort -q` ${ARADD} --.endif -+ @${AR} cq ${.TARGET} ${OBJS} ${STATICOBJS} ${ARADD} - ${RANLIB} ${.TARGET} - .endif - -@@ -163,11 +159,7 @@ POBJS+= ${OBJS:.o=.po} ${STATICOBJS:.o= - lib${LIB}_p.a: ${POBJS} - @${ECHO} building profiled ${LIB} library - @rm -f ${.TARGET} --.if !defined(NM) -- @${AR} cq ${.TARGET} `lorder ${POBJS} | tsort -q` ${ARADD} --.else -- @${AR} cq ${.TARGET} `NM='${NM}' lorder ${POBJS} | tsort -q` ${ARADD} --.endif -+ @${AR} cq ${.TARGET} ${POBJS} ${ARADD} - ${RANLIB} ${.TARGET} - .endif - -@@ -189,15 +181,9 @@ ${SHLIB_NAME}: ${SOBJS} - .if defined(SHLIB_LINK) - @ln -fs ${.TARGET} ${SHLIB_LINK} - .endif --.if !defined(NM) - @${CC} ${LDFLAGS} ${SSP_CFLAGS} -shared -Wl,-x \ - -o ${.TARGET} -Wl,-soname,${SONAME} \ -- `lorder ${SOBJS} | tsort -q` ${LDADD} --.else -- @${CC} ${LDFLAGS} ${SSP_CFLAGS} -shared -Wl,-x \ -- -o ${.TARGET} -Wl,-soname,${SONAME} \ -- `NM='${NM}' lorder ${SOBJS} | tsort -q` ${LDADD} --.endif -+ `echo ${SOBJS} | xargs -n 1 echo | sort -u` ${LDADD} - @[ -z "${CTFMERGE}" -o -n "${NO_CTF}" ] || \ - (${ECHO} ${CTFMERGE} ${CTFFLAGS} -o ${.TARGET} ${SOBJS} && \ - ${CTFMERGE} ${CTFFLAGS} -o ${.TARGET} ${SOBJS}) -@@ -245,13 +231,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}} -Index: work/share/mk/bsd.prog.mk -=================================================================== ---- work.orig/share/mk/bsd.prog.mk -+++ work/share/mk/bsd.prog.mk -@@ -134,13 +134,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-9.1-gentoo.patch b/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-9.1-gentoo.patch deleted file mode 100644 index 598d0b9..0000000 --- a/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-9.1-gentoo.patch +++ /dev/null @@ -1,326 +0,0 @@ -diff -Nur share.orig/mk/bsd.doc.mk share/mk/bsd.doc.mk ---- share.orig/mk/bsd.doc.mk 2012-07-12 13:25:44.000000000 +0900 -+++ share/mk/bsd.doc.mk 2012-07-16 00:01:55.000000000 +0900 -@@ -135,10 +135,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 -Nur share.orig/mk/bsd.files.mk share/mk/bsd.files.mk ---- share.orig/mk/bsd.files.mk 2012-07-12 13:25:44.000000000 +0900 -+++ share/mk/bsd.files.mk 2012-07-16 00:01:55.000000000 +0900 -@@ -39,6 +39,7 @@ - .endif - installfiles: _${group}INS_${file:T} - _${group}INS_${file:T}: ${file} -+ ${INSTALL} -d ${DESTDIR}${${group}DIR_${.ALLSRC:T}} - ${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 -Nur share.orig/mk/bsd.incs.mk share/mk/bsd.incs.mk ---- share.orig/mk/bsd.incs.mk 2012-07-12 13:25:44.000000000 +0900 -+++ share/mk/bsd.incs.mk 2012-07-16 00:01:55.000000000 +0900 -@@ -41,6 +41,9 @@ - .endif - installincludes: _${group}INS_${header:T} - _${group}INS_${header:T}: ${header} -+ ${INSTALL} -d -o ${${group}OWN_${.ALLSRC:T}} \ -+ -g ${${group}GRP_${.ALLSRC:T}} \ -+ ${DESTDIR}${${group}DIR_${.ALLSRC:T}} - ${INSTALL} -C -o ${${group}OWN_${.ALLSRC:T}} \ - -g ${${group}GRP_${.ALLSRC:T}} -m ${${group}MODE_${.ALLSRC:T}} \ - ${.ALLSRC} \ -@@ -53,9 +56,13 @@ - installincludes: _${group}INS - _${group}INS: ${_${group}INCS} - .if defined(${group}NAME) -+ ${INSTALL} -d -o ${${group}OWN} -g ${${group}GRP} \ -+ ${DESTDIR}${${group}DIR} - ${INSTALL} -C -o ${${group}OWN} -g ${${group}GRP} -m ${${group}MODE} \ - ${.ALLSRC} ${DESTDIR}${${group}DIR}/${${group}NAME} - .else -+ ${INSTALL} -d -o ${${group}OWN} -g ${${group}GRP} \ -+ ${DESTDIR}${${group}DIR} - ${INSTALL} -C -o ${${group}OWN} -g ${${group}GRP} -m ${${group}MODE} \ - ${.ALLSRC} ${DESTDIR}${${group}DIR} - .endif -diff -Nur share.orig/mk/bsd.info.mk share/mk/bsd.info.mk ---- share.orig/mk/bsd.info.mk 2012-07-12 13:25:44.000000000 +0900 -+++ share/mk/bsd.info.mk 2012-07-16 00:01:55.000000000 +0900 -@@ -83,6 +83,7 @@ - TEX?= tex - DVIPS?= dvips - DVIPS2ASCII?= dvips2ascii -+INSTALL?= install - - .SUFFIXES: ${ICOMPRESS_EXT} .info .texi .texinfo .dvi .ps .latin1 .html - -@@ -144,15 +145,17 @@ - INSTALLINFODIRS+= ${x:S/$/-install/} - ${x:S/$/-install/}: - .if !empty(.MAKEFLAGS:M-j) -+ ${INSTALL} -d ${DESTDIR}${INFODIR} - lockf -k ${DESTDIR}${INFODIR}/${INFODIRFILE} \ - ${INSTALLINFO} ${INSTALLINFOFLAGS} \ -- --defsection=${INFOSECTION} \ -- --defentry=${INFOENTRY_${x}} \ -+ --section=${INFOSECTION} \ -+ --entry=${INFOENTRY_${x}} \ - ${x}.info ${DESTDIR}${INFODIR}/${INFODIRFILE} - .else -+ ${INSTALL} -d ${DESTDIR}${INFODIR} - ${INSTALLINFO} ${INSTALLINFOFLAGS} \ -- --defsection=${INFOSECTION} \ -- --defentry=${INFOENTRY_${x}} \ -+ --section=${INFOSECTION} \ -+ --entry=${INFOENTRY_${x}} \ - ${x}.info ${DESTDIR}${INFODIR}/${INFODIRFILE} - .endif - .endfor -diff -Nur share.orig/mk/bsd.lib.mk share/mk/bsd.lib.mk ---- share.orig/mk/bsd.lib.mk 2012-07-12 13:25:44.000000000 +0900 -+++ share/mk/bsd.lib.mk 2012-07-16 00:01:55.000000000 +0900 -@@ -46,10 +46,6 @@ - .endif - .endif - --.if !defined(DEBUG_FLAGS) --STRIP?= -s --.endif -- - .include - - # prefer .s to a .c, add .po, remove stuff not used in the BSD libraries -@@ -284,14 +280,17 @@ - .ORDER: beforeinstall _libinstall - _libinstall: - .if defined(LIB) && !empty(LIB) && ${MK_INSTALLLIB} != "no" -+ ${INSTALL} -d ${DESTDIR}${LIBDIR} - ${INSTALL} -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ - ${_INSTALLFLAGS} lib${LIB}.a ${DESTDIR}${LIBDIR} - .endif - .if ${MK_PROFILE} != "no" && 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} -@@ -329,10 +328,12 @@ - .endif # SHLIB_LINK - .endif # SHIB_NAME - .if defined(INSTALL_PIC_ARCHIVE) && defined(LIB) && !empty(LIB) && ${MK_TOOLCHAIN} != "no" -+ ${INSTALL} -d ${DESTDIR}${LIBDIR} - ${INSTALL} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ - ${_INSTALLFLAGS} lib${LIB}_pic.a ${DESTDIR}${LIBDIR} - .endif - .if defined(WANT_LINT) && !defined(NO_LINT) && defined(LIB) && !empty(LIB) -+ ${INSTALL} -d ${DESTDIR}${LINTLIBDIR} - ${INSTALL} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ - ${_INSTALLFLAGS} ${LINTLIB} ${DESTDIR}${LINTLIBDIR} - .endif -diff -Nur share.orig/mk/bsd.libnames.mk share/mk/bsd.libnames.mk ---- share.orig/mk/bsd.libnames.mk 2012-07-12 13:25:44.000000000 +0900 -+++ share/mk/bsd.libnames.mk 2012-07-16 00:01:55.000000000 +0900 -@@ -48,7 +48,7 @@ - LIBEDIT?= ${DESTDIR}${LIBDIR}/libedit.a - LIBELF?= ${DESTDIR}${LIBDIR}/libelf.a - LIBFETCH?= ${DESTDIR}${LIBDIR}/libfetch.a --LIBFL?= "don't use LIBFL, use LIBL" -+LIBFL?= ${DESTDIR}${LIBDIR}/libfl.a - LIBFORM?= ${DESTDIR}${LIBDIR}/libform.a - LIBFTPIO?= ${DESTDIR}${LIBDIR}/libftpio.a - LIBG2C?= ${DESTDIR}${LIBDIR}/libg2c.a -@@ -79,7 +79,7 @@ - LIBKICONV?= ${DESTDIR}${LIBDIR}/libkiconv.a - LIBKRB5?= ${DESTDIR}${LIBDIR}/libkrb5.a - LIBKVM?= ${DESTDIR}${LIBDIR}/libkvm.a --LIBL?= ${DESTDIR}${LIBDIR}/libl.a -+LIBL?= ${DESTDIR}${LIBDIR}/libfl.a - LIBLN?= "don't use LIBLN, use LIBL" - .if ${MK_BIND} != "no" - LIBLWRES?= ${DESTDIR}${LIBDIR}/liblwres.a -diff -Nur share.orig/mk/bsd.links.mk share/mk/bsd.links.mk ---- share.orig/mk/bsd.links.mk 2012-07-12 13:25:44.000000000 +0900 -+++ share/mk/bsd.links.mk 2012-07-16 00:01:55.000000000 +0900 -@@ -15,6 +15,8 @@ - t=${DESTDIR}$$1; \ - shift; \ - ${ECHO} $$t -\> $$l; \ -+ d=`dirname $$t`; \ -+ test -d $$d || mkdir $$d; \ - ln -f $$l $$t; \ - done; true - .endif -@@ -26,6 +28,8 @@ - t=${DESTDIR}$$1; \ - shift; \ - ${ECHO} $$t -\> $$l; \ -+ d=`dirname $$t`; \ -+ test -d $$d || mkdir $$d; \ - ln -fs $$l $$t; \ - done; true - .endif -diff -Nur share.orig/mk/bsd.man.mk share/mk/bsd.man.mk ---- share.orig/mk/bsd.man.mk 2012-07-12 13:25:44.000000000 +0900 -+++ share/mk/bsd.man.mk 2012-07-16 00:01:55.000000000 +0900 -@@ -165,9 +165,11 @@ - .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 @@ - 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 @@ - .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 -Nur share.orig/mk/bsd.nls.mk share/mk/bsd.nls.mk ---- share.orig/mk/bsd.nls.mk 2012-07-12 13:25:44.000000000 +0900 -+++ share/mk/bsd.nls.mk 2012-07-16 00:01:55.000000000 +0900 -@@ -62,7 +62,8 @@ - # installation rules - # - .for file in ${NLS} --NLSNAME_${file:T}= ${file:T:R}/${NLSNAME}.cat -+NLSDIR_${file:T}= ${SHAREDIR}/nls/${file:T:R}/ -+NLSNAME_${file:T}= ${NLSNAME}.cat - .if defined(NLSLINKS_${file:R}) && !empty(NLSLINKS_${file:R}) - NLSLINKS+= ${file:R} - .endif -diff -Nur share.orig/mk/bsd.own.mk share/mk/bsd.own.mk ---- share.orig/mk/bsd.own.mk 2012-07-12 13:25:44.000000000 +0900 -+++ share/mk/bsd.own.mk 2012-07-16 00:01:55.000000000 +0900 -@@ -182,9 +182,6 @@ - INCLUDEDIR?= /usr/include - - # Common variables --.if !defined(DEBUG_FLAGS) --STRIP?= -s --.endif - - COMPRESS_CMD?= gzip -cn - COMPRESS_EXT?= .gz -diff -Nur share.orig/mk/bsd.prog.mk share/mk/bsd.prog.mk ---- share.orig/mk/bsd.prog.mk 2012-07-12 13:25:44.000000000 +0900 -+++ share/mk/bsd.prog.mk 2012-07-16 00:01:55.000000000 +0900 -@@ -33,10 +33,6 @@ - CFLAGS+=${CRUNCH_CFLAGS} - .endif - --.if !defined(DEBUG_FLAGS) --STRIP?= -s --.endif -- - .if defined(NO_SHARED) && (${NO_SHARED} != "no" && ${NO_SHARED} != "NO") - LDFLAGS+= -static - .endif -@@ -155,6 +151,7 @@ - .ORDER: beforeinstall _proginstall - _proginstall: - .if defined(PROG) -+ ${INSTALL} -d ${DESTDIR}${BINDIR} - .if defined(PROGNAME) - ${INSTALL} ${STRIP} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \ - ${_INSTALLFLAGS} ${PROG} ${DESTDIR}${BINDIR}/${PROGNAME} -@@ -186,6 +183,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 -Nur share.orig/mk/bsd.sys.mk share/mk/bsd.sys.mk ---- share.orig/mk/bsd.sys.mk 2012-07-12 13:25:44.000000000 +0900 -+++ share/mk/bsd.sys.mk 2012-07-16 00:04:14.000000000 +0900 -@@ -28,10 +28,6 @@ - .if defined(WARNS) - .if ${WARNS} >= 1 - CWARNFLAGS+= -Wsystem-headers --.if !defined(NO_WERROR) && ((${MK_CLANG_IS_CC} == "no" && \ -- ${CC:T:Mclang} != "clang") || !defined(NO_WERROR.clang)) --CWARNFLAGS+= -Werror --.endif # !NO_WERROR && (!CLANG || !NO_WERROR.clang) - .endif # WARNS >= 1 - .if ${WARNS} >= 2 - CWARNFLAGS+= -Wall -Wno-format-y2k -@@ -95,10 +91,6 @@ - CWARNFLAGS+= -Wno-format-nonliteral - .endif # WARNS <= 3 - .endif # CLANG --.if !defined(NO_WERROR) && ((${MK_CLANG_IS_CC} == "no" && \ -- ${CC:T:Mclang} != "clang") || !defined(NO_WERROR.clang)) --CWARNFLAGS+= -Werror --.endif # !NO_WERROR && (!CLANG || !NO_WERROR.clang) - .endif # WFORMAT > 0 - .endif # WFORMAT - .if defined(NO_WFORMAT) || ((${MK_CLANG_IS_CC} != "no" || \ -diff -Nur share.orig/mk/sys.mk share/mk/sys.mk ---- share.orig/mk/sys.mk 2012-07-12 13:25:44.000000000 +0900 -+++ share/mk/sys.mk 2012-07-16 00:01:55.000000000 +0900 -@@ -349,12 +349,6 @@ - (${ECHO} ${CTFCONVERT} ${CTFFLAGS} ${.TARGET} && \ - ${CTFCONVERT} ${CTFFLAGS} ${.TARGET}) - --# 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 -- - .if defined(__MAKE_SHELL) && !empty(__MAKE_SHELL) - SHELL= ${__MAKE_SHELL} - .SHELL: path=${__MAKE_SHELL} diff --git a/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-9.1-gnu.patch b/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-9.1-gnu.patch deleted file mode 100644 index f986ed9..0000000 --- a/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-9.1-gnu.patch +++ /dev/null @@ -1,77 +0,0 @@ -diff -Nur share.orig/mk/bsd.lib.mk share/mk/bsd.lib.mk ---- share.orig/mk/bsd.lib.mk 2012-07-16 02:40:07.000000000 +0900 -+++ share/mk/bsd.lib.mk 2012-07-16 02:41:40.000000000 +0900 -@@ -155,11 +155,7 @@ - lib${LIB}.a: ${OBJS} ${STATICOBJS} - @${ECHO} building static ${LIB} library - @rm -f ${.TARGET} --.if !defined(NM) -- @${AR} cq ${.TARGET} `lorder ${OBJS} ${STATICOBJS} | tsort -q` ${ARADD} --.else -- @${AR} cq ${.TARGET} `NM='${NM}' lorder ${OBJS} ${STATICOBJS} | tsort -q` ${ARADD} --.endif -+ @${AR} cq ${.TARGET} ${OBJS} ${STATICOBJS} ${ARADD} - ${RANLIB} ${.TARGET} - .endif - -@@ -172,11 +168,7 @@ - lib${LIB}_p.a: ${POBJS} - @${ECHO} building profiled ${LIB} library - @rm -f ${.TARGET} --.if !defined(NM) -- @${AR} cq ${.TARGET} `lorder ${POBJS} | tsort -q` ${ARADD} --.else -- @${AR} cq ${.TARGET} `NM='${NM}' lorder ${POBJS} | tsort -q` ${ARADD} --.endif -+ @${AR} cq ${.TARGET} ${POBJS} ${ARADD} - ${RANLIB} ${.TARGET} - .endif - -@@ -203,15 +195,9 @@ - .if defined(SHLIB_LINK) - @ln -fs ${.TARGET} ${SHLIB_LINK} - .endif --.if !defined(NM) - @${CC} ${LDFLAGS} ${SSP_CFLAGS} ${SOLINKOPTS} \ - -o ${.TARGET} -Wl,-soname,${SONAME} \ -- `lorder ${SOBJS} | tsort -q` ${LDADD} --.else -- @${CC} ${LDFLAGS} ${SSP_CFLAGS} ${SOLINKOPTS} \ -- -o ${.TARGET} -Wl,-soname,${SONAME} \ -- `NM='${NM}' lorder ${SOBJS} | tsort -q` ${LDADD} --.endif -+ `echo ${SOBJS} | xargs -n 1 echo | sort -u` ${LDADD} - @[ -z "${CTFMERGE}" -o -n "${NO_CTF}" ] || \ - (${ECHO} ${CTFMERGE} ${CTFFLAGS} -o ${.TARGET} ${SOBJS} && \ - ${CTFMERGE} ${CTFFLAGS} -o ${.TARGET} ${SOBJS}) -@@ -259,13 +245,6 @@ - - .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}} -diff -Nur share.orig/mk/bsd.prog.mk share/mk/bsd.prog.mk ---- share.orig/mk/bsd.prog.mk 2012-07-16 02:40:07.000000000 +0900 -+++ share/mk/bsd.prog.mk 2012-07-16 02:40:24.000000000 +0900 -@@ -134,13 +134,6 @@ - - .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/freebsd-mk-defs-9.1_rc1.ebuild b/sys-freebsd/freebsd-mk-defs/freebsd-mk-defs-9.1_rc1.ebuild deleted file mode 100644 index d70e1d3..0000000 --- a/sys-freebsd/freebsd-mk-defs/freebsd-mk-defs-9.1_rc1.ebuild +++ /dev/null @@ -1,38 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=3 - -inherit bsdmk freebsd - -DESCRIPTION="Makefiles definitions used for building and installing libraries and system files" -SLOT="0" -KEYWORDS="~amd64 ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd" - -IUSE="userland_GNU" - -SRC_URI="mirror://gentoo/${SHARE}.tar.bz2" - -RDEPEND="" -DEPEND="" - -RESTRICT="strip" - -S="${WORKDIR}/share/mk" - -src_prepare() { - epatch "${FILESDIR}/${PN}-9.1-gentoo.patch" - use userland_GNU && epatch "${FILESDIR}/${PN}-9.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 -}