From c9f7f2e36f5739e112d4363cb398e53b8b510601 Mon Sep 17 00:00:00 2001 From: Timothy Redaelli Date: Tue, 24 Apr 2007 13:43:55 +0000 Subject: svn path=/; revision=117 --- sys-freebsd/freebsd-mk-defs/ChangeLog | 3 + sys-freebsd/freebsd-mk-defs/Manifest | 7 +- .../files/freebsd-mk-defs-6.2-2-gentoo.patch | 288 --------------------- .../files/freebsd-mk-defs-7.0-gentoo.patch | 83 +++--- 4 files changed, 45 insertions(+), 336 deletions(-) delete mode 100644 sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-6.2-2-gentoo.patch diff --git a/sys-freebsd/freebsd-mk-defs/ChangeLog b/sys-freebsd/freebsd-mk-defs/ChangeLog index f402e6b..0475eb8 100644 --- a/sys-freebsd/freebsd-mk-defs/ChangeLog +++ b/sys-freebsd/freebsd-mk-defs/ChangeLog @@ -2,6 +2,9 @@ # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 # $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-mk-defs/ChangeLog,v 1.30 2007/01/15 21:36:42 drizzt Exp $ + 24 Apr 2007; Timothy Redaelli ChangeLog: + Fix files/freebsd-mk-defs-7.0-gentoo.patch thanks to Kumba for remember me. + *freebsd-mk-defs-6.2 (15 Jan 2007) 15 Jan 2007; Timothy Redaelli diff --git a/sys-freebsd/freebsd-mk-defs/Manifest b/sys-freebsd/freebsd-mk-defs/Manifest index 7a53baa..5e095fa 100644 --- a/sys-freebsd/freebsd-mk-defs/Manifest +++ b/sys-freebsd/freebsd-mk-defs/Manifest @@ -1,7 +1,6 @@ AUX freebsd-mk-defs-6.0-gnu.patch 3584 RMD160 c9705a8a3f1d0f5c1be71587c391efdda846e3a3 SHA1 677729af4401fdc36f8f4582b7b3a0039759c9f4 SHA256 9519ea8a3e7b1261abdf3694501d1634d74670c8ff4e8a328e1e10e089a64695 -AUX freebsd-mk-defs-6.2-2-gentoo.patch 10377 RMD160 f36d72686e0c175193acff6f65abddea2d53a42c SHA1 4913957abd354db5ea7321f01e8c40e8e6f878f5 SHA256 6ce69b3c1735593d09ab51e9174f4e6bb6b185c68fa3fa30676d87174654d1c7 -AUX freebsd-mk-defs-7.0-gentoo.patch 10357 RMD160 c2b0286458f141084d357a59a5215d3e39fa9cc9 SHA1 e87742d5d4d9ffb05ffe3bea70709195df7f6220 SHA256 30260015c2cbbc9a067c9c71a3a504f0b3b0a84768acf6ea71b4646e1b4ee2c2 -DIST freebsd-share-7.0_pre200704.tar.bz2 3856556 RMD160 b7010932bf6c5df8d3b8f7ab5e1d69ca98d09251 SHA1 a4ffb1cac25a5ffc7ba6f90ba5fd198c03681a28 SHA256 b43e4e76497ce3b40ee810a7ce152a0d578745ee0ba5ac30f273cd75e55c0646 +AUX freebsd-mk-defs-7.0-gentoo.patch 9919 RMD160 244da033a4bfc6264414a7952423e4f86b4110da SHA1 283c195abac340820453269f73daac297fa6fde1 SHA256 b183ed3b1925de8a2870ae1e7c8c0ca2ecadb6646b91750dfb4b15232365f624 +DIST freebsd-share-7.0_pre200704.tar.bz2 231432 RMD160 af3c3526096b8d2d04de398dc8fc48625c095b5a SHA1 ef9ac9db7118504453cf4bb997cbb41266503cba SHA256 f3e68fe3cad1e496ca12c2ba45aba2be7ae171a3074fe8ee8fe2fcceff9f6513 EBUILD freebsd-mk-defs-7.0_pre200704.ebuild 886 RMD160 32b4847a1b71e5cebf430c88c60f485424c60912 SHA1 98a9eae4b65be3509c59d103a7a452591d9d0f85 SHA256 c13cac605007d835efabe0cde9812bee0f7b03613c06860973359d371d317879 -MISC ChangeLog 7323 RMD160 d6c11c54e532c5e62ffc6222f3a260c12845a074 SHA1 39e371f7b755c18c548207b8f964d48334a8667f SHA256 1558b8d0c364514e66a97276378b7925b502569b5699308a72e8bc18a72450ba +MISC ChangeLog 7465 RMD160 ce0838617a2fc842d52faa25d46df345adcb4940 SHA1 2cd2a3fb6c02479b0d3e51d74968d6b71d81a102 SHA256 27dc887f04cd0e10bc8e282ab84855344596beefd34c470fcbf27605c9a88022 MISC metadata.xml 156 RMD160 60b5820a08275f307e5bd936d78f5afd1f141086 SHA1 d9d9d4f2b5afc58339ea3e562fca490156935f1f SHA256 30ab515d6ac492d3d6c36ac3c675511742c2149e56a6b3228c8d22ab8edb3ff7 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 c09633b..0000000 --- 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 - - # 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/files/freebsd-mk-defs-7.0-gentoo.patch b/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-7.0-gentoo.patch index 1ef6ead..04d1af2 100644 --- a/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-7.0-gentoo.patch +++ b/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-7.0-gentoo.patch @@ -1,6 +1,6 @@ -diff -ur share.orig/mk/bsd.doc.mk share/mk/bsd.doc.mk ---- share.orig/mk/bsd.doc.mk 2007-04-20 21:55:49 +0000 -+++ share/mk/bsd.doc.mk 2007-04-20 22:01:52 +0000 +diff -ur mk.old/bsd.doc.mk mk/bsd.doc.mk +--- mk.old/bsd.doc.mk 2004-12-21 09:33:42 +0000 ++++ mk/bsd.doc.mk 2007-04-24 13:34:50 +0000 @@ -137,10 +137,12 @@ realinstall: .for _dev in ${PRINTERDEVICE:Mhtml} @@ -14,10 +14,9 @@ diff -ur share.orig/mk/bsd.doc.mk share/mk/bsd.doc.mk ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \ ${DFILE.${_dev}} ${DESTDIR}${BINDIR}/${VOLUME} .endfor -Only in share/mk: bsd.doc.mk.orig -diff -ur share.orig/mk/bsd.files.mk share/mk/bsd.files.mk ---- share.orig/mk/bsd.files.mk 2007-04-20 21:55:49 +0000 -+++ share/mk/bsd.files.mk 2007-04-20 22:01:52 +0000 +diff -ur mk.old/bsd.files.mk mk/bsd.files.mk +--- mk.old/bsd.files.mk 2005-04-11 07:13:29 +0000 ++++ mk/bsd.files.mk 2007-04-24 13:34:50 +0000 @@ -39,6 +39,7 @@ .endif installfiles: _${group}INS_${file:T} @@ -39,10 +38,9 @@ diff -ur share.orig/mk/bsd.files.mk share/mk/bsd.files.mk ${INSTALL} -o ${${group}OWN} -g ${${group}GRP} \ -m ${${group}MODE} ${.ALLSRC} ${DESTDIR}${${group}DIR} .endif -Only in share/mk: bsd.files.mk.orig -diff -ur share.orig/mk/bsd.incs.mk share/mk/bsd.incs.mk ---- share.orig/mk/bsd.incs.mk 2007-04-20 21:55:49 +0000 -+++ share/mk/bsd.incs.mk 2007-04-20 22:01:52 +0000 +diff -ur mk.old/bsd.incs.mk mk/bsd.incs.mk +--- mk.old/bsd.incs.mk 2006-03-17 18:54:34 +0000 ++++ mk/bsd.incs.mk 2007-04-24 13:34:50 +0000 @@ -41,6 +41,10 @@ .endif installincludes: _${group}INS_${header:T} @@ -66,10 +64,9 @@ diff -ur share.orig/mk/bsd.incs.mk share/mk/bsd.incs.mk ${INSTALL} -C -o ${${group}OWN} -g ${${group}GRP} -m ${${group}MODE} \ ${.ALLSRC} ${DESTDIR}${${group}DIR} .endif -Only in share/mk: bsd.incs.mk.orig -diff -ur share.orig/mk/bsd.info.mk share/mk/bsd.info.mk ---- share.orig/mk/bsd.info.mk 2007-04-20 21:55:49 +0000 -+++ share/mk/bsd.info.mk 2007-04-20 22:01:52 +0000 +diff -ur mk.old/bsd.info.mk mk/bsd.info.mk +--- mk.old/bsd.info.mk 2006-09-29 15:36:19 +0000 ++++ mk/bsd.info.mk 2007-04-24 13:34:50 +0000 @@ -83,6 +83,7 @@ TEX?= tex DVIPS?= dvips @@ -93,10 +90,9 @@ diff -ur share.orig/mk/bsd.info.mk share/mk/bsd.info.mk ${INSTALLINFO} ${INSTALLINFOFLAGS} \ --defsection=${INFOSECTION} \ --defentry=${INFOENTRY_${x}} \ -Only in share/mk: bsd.info.mk.orig -diff -ur share.orig/mk/bsd.lib.mk share/mk/bsd.lib.mk ---- share.orig/mk/bsd.lib.mk 2007-04-20 21:55:49 +0000 -+++ share/mk/bsd.lib.mk 2007-04-20 22:05:21 +0000 +diff -ur mk.old/bsd.lib.mk mk/bsd.lib.mk +--- mk.old/bsd.lib.mk 2007-04-03 18:56:05 +0000 ++++ mk/bsd.lib.mk 2007-04-24 13:34:50 +0000 @@ -37,10 +37,6 @@ CFLAGS+= ${DEBUG_FLAGS} .endif @@ -139,11 +135,9 @@ diff -ur share.orig/mk/bsd.lib.mk share/mk/bsd.lib.mk ${INSTALL} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ ${_INSTALLFLAGS} ${LINTLIB} ${DESTDIR}${LINTLIBDIR} .endif -Only in share/mk: bsd.lib.mk.orig -Only in share/mk: bsd.lib.mk.rej -diff -ur share.orig/mk/bsd.libnames.mk share/mk/bsd.libnames.mk ---- share.orig/mk/bsd.libnames.mk 2007-04-20 21:55:49 +0000 -+++ share/mk/bsd.libnames.mk 2007-04-20 22:01:52 +0000 +diff -ur mk.old/bsd.libnames.mk mk/bsd.libnames.mk +--- mk.old/bsd.libnames.mk 2007-04-06 10:33:06 +0000 ++++ mk/bsd.libnames.mk 2007-04-24 13:34:50 +0000 @@ -41,7 +41,7 @@ LIBDNS?= ${DESTDIR}${LIBDIR}/libdns.a LIBEDIT?= ${DESTDIR}${LIBDIR}/libedit.a @@ -162,10 +156,9 @@ diff -ur share.orig/mk/bsd.libnames.mk share/mk/bsd.libnames.mk LIBLN?= "don't use LIBLN, use LIBL" .if ${MK_BIND} != "no" LIBLWRES?= ${DESTDIR}${LIBDIR}/liblwres.a -Only in share/mk: bsd.libnames.mk.orig -diff -ur share.orig/mk/bsd.man.mk share/mk/bsd.man.mk ---- share.orig/mk/bsd.man.mk 2007-04-20 21:55:49 +0000 -+++ share/mk/bsd.man.mk 2007-04-20 22:06:58 +0000 +diff -ur mk.old/bsd.man.mk mk/bsd.man.mk +--- mk.old/bsd.man.mk 2007-03-12 13:54:52 +0000 ++++ mk/bsd.man.mk 2007-04-24 13:34:50 +0000 @@ -165,9 +165,11 @@ .if defined(NO_MANCOMPRESS) .if defined(MANFILTER) @@ -178,7 +171,14 @@ diff -ur share.orig/mk/bsd.man.mk share/mk/bsd.man.mk ${MINSTALL} ${__page:T:S/$/${CATEXT}${FILTEXTENSION}/g} \ ${DESTDIR}${CATDIR}${__page:E}${MANSUBDIR}/${__page} .endif -@@ -186,6 +188,7 @@ +@@ -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} @@ -186,7 +186,7 @@ diff -ur share.orig/mk/bsd.man.mk share/mk/bsd.man.mk ${MINSTALL} ${__page:T:S/$/${CATEXT}/} \ ${DESTDIR}${CATDIR}${__page:E}${MANSUBDIR}/${__page:T} .endfor -@@ -193,9 +196,11 @@ +@@ -193,9 +198,11 @@ .endif .else .for __page in ${MAN} @@ -198,11 +198,9 @@ diff -ur share.orig/mk/bsd.man.mk share/mk/bsd.man.mk ${MINSTALL} ${__page:T:S/$/${CATEXT}${MCOMPRESS_EXT}/g} \ ${DESTDIR}${CATDIR}${__page:E}${MANSUBDIR}/${__page:T:S/$/${MCOMPRESS_EXT}/} .endif -Only in share/mk: bsd.man.mk.orig -Only in share/mk: bsd.man.mk.rej -diff -ur share.orig/mk/bsd.prog.mk share/mk/bsd.prog.mk ---- share.orig/mk/bsd.prog.mk 2007-04-20 21:55:49 +0000 -+++ share/mk/bsd.prog.mk 2007-04-20 22:01:52 +0000 +diff -ur mk.old/bsd.prog.mk mk/bsd.prog.mk +--- mk.old/bsd.prog.mk 2006-09-13 23:27:21 +0000 ++++ mk/bsd.prog.mk 2007-04-24 13:34:50 +0000 @@ -23,10 +23,6 @@ CFLAGS+=${CRUNCH_CFLAGS} .endif @@ -234,10 +232,9 @@ diff -ur share.orig/mk/bsd.prog.mk share/mk/bsd.prog.mk ${INSTALL} -o ${SCRIPTSOWN_${.ALLSRC:T}} \ -g ${SCRIPTSGRP_${.ALLSRC:T}} -m ${SCRIPTSMODE_${.ALLSRC:T}} \ ${.ALLSRC} \ -Only in share/mk: bsd.prog.mk.orig -diff -ur share.orig/mk/bsd.sys.mk share/mk/bsd.sys.mk ---- share.orig/mk/bsd.sys.mk 2007-04-20 21:55:49 +0000 -+++ share/mk/bsd.sys.mk 2007-04-20 22:01:52 +0000 +diff -ur mk.old/bsd.sys.mk mk/bsd.sys.mk +--- mk.old/bsd.sys.mk 2006-11-04 04:39:05 +0000 ++++ mk/bsd.sys.mk 2007-04-24 13:34:50 +0000 @@ -27,9 +27,6 @@ . if defined(WARNS) . if ${WARNS} >= 1 @@ -258,10 +255,9 @@ diff -ur share.orig/mk/bsd.sys.mk share/mk/bsd.sys.mk . endif . endif .endif -Only in share/mk: bsd.sys.mk.orig -diff -ur share.orig/mk/sys.mk share/mk/sys.mk ---- share.orig/mk/sys.mk 2007-04-20 21:55:49 +0000 -+++ share/mk/sys.mk 2007-04-20 22:01:52 +0000 +diff -ur mk.old/sys.mk mk/sys.mk +--- mk.old/sys.mk 2006-10-06 23:32:23 +0000 ++++ mk/sys.mk 2007-04-24 13:34:50 +0000 @@ -32,13 +32,13 @@ .if defined(%POSIX) @@ -293,4 +289,3 @@ diff -ur share.orig/mk/sys.mk share/mk/sys.mk # Default executable format # XXX hint for bsd.port.mk OBJFORMAT?= elf -Only in share/mk: sys.mk.orig -- cgit v1.2.3-65-gdbad