From 45b5fa29caa139605b7becef91caafd66627fe46 Mon Sep 17 00:00:00 2001 From: Diego Elio Pettenò Date: Sun, 2 Apr 2006 22:26:13 +0000 Subject: Drop obsolete files. (Portage version: 2.1_pre7-r3) --- sys-freebsd/freebsd-mk-defs/ChangeLog | 6 +- .../files/freebsd-mk-defs-gentoo.patch | 189 --------------------- sys-freebsd/freebsd-mk-defs/files/sys.patch | 28 --- 3 files changed, 5 insertions(+), 218 deletions(-) delete mode 100644 sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-gentoo.patch delete mode 100644 sys-freebsd/freebsd-mk-defs/files/sys.patch (limited to 'sys-freebsd/freebsd-mk-defs') diff --git a/sys-freebsd/freebsd-mk-defs/ChangeLog b/sys-freebsd/freebsd-mk-defs/ChangeLog index 812a09ea5ce4..76484f9cd7c6 100644 --- a/sys-freebsd/freebsd-mk-defs/ChangeLog +++ b/sys-freebsd/freebsd-mk-defs/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sys-freebsd/freebsd-mk-defs # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-mk-defs/ChangeLog,v 1.2 2006/04/02 21:53:18 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-mk-defs/ChangeLog,v 1.3 2006/04/02 22:26:13 flameeyes Exp $ + + 02 Apr 2006; Diego Pettenò + -files/freebsd-mk-defs-gentoo.patch, -files/sys.patch: + Drop obsolete files. *freebsd-mk-defs-6.0 (01 Apr 2006) diff --git a/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-gentoo.patch b/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-gentoo.patch deleted file mode 100644 index 5d5235eb0097..000000000000 --- a/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-gentoo.patch +++ /dev/null @@ -1,189 +0,0 @@ -diff -ur share.orig/mk/bsd.doc.mk share/mk/bsd.doc.mk ---- share.orig/mk/bsd.doc.mk Thu Apr 7 12:01:25 2005 -+++ share/mk/bsd.doc.mk Thu Apr 7 12:00:13 2005 -@@ -137,10 +137,12 @@ - realinstall: - .for _dev in ${PRINTERDEVICE:Mhtml} - cd ${SRCDIR}; \ -+ ${INSTALL} -d ${DESTDIR}${BINDIR}/${VOLUME} - ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \ - ${DOC}*.html ${DESTDIR}${BINDIR}/${VOLUME} - .endfor - .for _dev in ${PRINTERDEVICE:Nhtml} -+ ${INSTALL} -d ${DESTDIR}${BINDIR}/${VOLUME} - ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \ - ${DFILE.${_dev}} ${DESTDIR}${BINDIR}/${VOLUME} - .endfor -diff -ur share.orig/mk/bsd.files.mk share/mk/bsd.files.mk ---- share.orig/mk/bsd.files.mk Thu Apr 7 12:01:25 2005 -+++ share/mk/bsd.files.mk Thu Apr 7 12:00:34 2005 -@@ -39,6 +39,7 @@ - .endif - installfiles: _${group}INS_${file:T} - _${group}INS_${file:T}: ${file} -+ ${INSTALL} -d ${DESTDIR}${${group}DIR_${.ALLSRC}}/${${group}NAME_${.ALLSRC:T}:H} - ${INSTALL} -o ${${group}OWN_${.ALLSRC:T}} \ - -g ${${group}GRP_${.ALLSRC:T}} -m ${${group}MODE_${.ALLSRC:T}} \ - ${.ALLSRC} \ -@@ -51,10 +52,12 @@ - installfiles: _${group}INS - _${group}INS: ${_${group}FILES} - .if defined(${group}NAME) -+ ${INSTALL} -d ${DESTDIR}${${group}DIR}/${${group}NAME} - ${INSTALL} -o ${${group}OWN} -g ${${group}GRP} \ - -m ${${group}MODE} ${.ALLSRC} \ - ${DESTDIR}${${group}DIR}/${${group}NAME} - .else -+ ${INSTALL} -d ${DESTDIR}${${group}DIR} - ${INSTALL} -o ${${group}OWN} -g ${${group}GRP} \ - -m ${${group}MODE} ${.ALLSRC} ${DESTDIR}${${group}DIR} - .endif -diff -ur share.orig/mk/bsd.incs.mk share/mk/bsd.incs.mk ---- share.orig/mk/bsd.incs.mk Thu Apr 7 12:01:25 2005 -+++ share/mk/bsd.incs.mk Thu Apr 7 12:00:40 2005 -@@ -39,6 +39,10 @@ - .endif - installincludes: _${group}INS_${header:T} - _${group}INS_${header:T}: ${header} -+ -+ ${INSTALL} -d -o ${${group}OWN_${.ALLSRC:T}} \ -+ -g ${${group}GRP_${.ALLSRC:T}} -m ${${group}MODE_${.ALLSRC:T}} \ -+ ${DESTDIR}${${group}DIR_${.ALLSRC:T}}/${${group}NAME_${.ALLSRC:T}} - ${INSTALL} -C -o ${${group}OWN_${.ALLSRC:T}} \ - -g ${${group}GRP_${.ALLSRC:T}} -m ${${group}MODE_${.ALLSRC:T}} \ - ${.ALLSRC} \ -@@ -51,9 +55,11 @@ - installincludes: _${group}INS - _${group}INS: ${_${group}INCS} - .if defined(${group}NAME) -+ ${INSTALL} -d ${DESTDIR}${${group}DIR} - ${INSTALL} -C -o ${${group}OWN} -g ${${group}GRP} -m ${${group}MODE} \ - ${.ALLSRC} ${DESTDIR}${${group}DIR}/${${group}NAME} - .else -+ ${INSTALL} -d ${DESTDIR}${${group}DIR} - ${INSTALL} -C -o ${${group}OWN} -g ${${group}GRP} -m ${${group}MODE} \ - ${.ALLSRC} ${DESTDIR}${${group}DIR} - .endif -diff -ur share.orig/mk/bsd.info.mk share/mk/bsd.info.mk ---- share.orig/mk/bsd.info.mk Thu Apr 7 12:01:25 2005 -+++ share/mk/bsd.info.mk Thu Apr 7 12:00:44 2005 -@@ -85,6 +85,7 @@ - TEX?= tex - DVIPS?= dvips - DVIPS2ASCII?= dvips2ascii -+INSTALL?= install - - .SUFFIXES: ${ICOMPRESS_EXT} .info .texi .texinfo .dvi .ps .latin1 .html - -@@ -145,6 +146,7 @@ - .for x in ${INFO} - INSTALLINFODIRS+= ${x:S/$/-install/} - ${x:S/$/-install/}: -+ ${INSTALL} -d ${DESTDIR}${INFODIR} - ${INSTALLINFO} ${INSTALLINFOFLAGS} \ - --defsection=${INFOSECTION} \ - --defentry=${INFOENTRY_${x}} \ -diff -ur share.orig/mk/bsd.lib.mk share/mk/bsd.lib.mk ---- share.orig/mk/bsd.lib.mk Thu Apr 7 12:01:25 2005 -+++ share/mk/bsd.lib.mk Thu Apr 7 12:00:49 2005 -@@ -208,14 +208,17 @@ - .ORDER: beforeinstall _libinstall - _libinstall: - .if defined(LIB) && !empty(LIB) && !defined(NOINSTALLLIB) -+ ${INSTALL} -d ${DESTDIR}${LIBDIR} - ${INSTALL} -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ - ${_INSTALLFLAGS} lib${LIB}.a ${DESTDIR}${LIBDIR} - .endif - .if !defined(NOPROFILE) && defined(LIB) && !empty(LIB) -+ ${INSTALL} -d ${DESTDIR}${LIBDIR} - ${INSTALL} -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ - ${_INSTALLFLAGS} lib${LIB}_p.a ${DESTDIR}${LIBDIR} - .endif - .if defined(SHLIB_NAME) -+ ${INSTALL} -d ${DESTDIR}${SHLIBDIR} - ${INSTALL} ${STRIP} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ - ${_INSTALLFLAGS} ${_SHLINSTALLFLAGS} \ - ${SHLIB_NAME} ${DESTDIR}${SHLIBDIR} -diff -ur share.orig/mk/bsd.man.mk share/mk/bsd.man.mk ---- share.orig/mk/bsd.man.mk Thu Apr 7 12:01:25 2005 -+++ share/mk/bsd.man.mk Thu Apr 7 12:00:52 2005 -@@ -165,9 +165,11 @@ - .if defined(NOMANCOMPRESS) - .if defined(MANFILTER) - .for page in ${MAN} -+ ${INSTALL} -d ${DESTDIR}${MANDIR}${page:E}${MANSUBDIR}/${page} - ${MINSTALL} ${page:T:S/$/${FILTEXTENSION}/g} \ - ${DESTDIR}${MANDIR}${page:E}${MANSUBDIR}/${page} - .if defined(MANBUILDCAT) && !empty(MANBUILDCAT) -+ ${INSTALL} -d ${DESTDIR}${CATDIR}${page:E}${MANSUBDIR}/${page} - ${MINSTALL} ${page:T:S/$/${CATEXT}${FILTEXTENSION}/g} \ - ${DESTDIR}${CATDIR}${page:E}${MANSUBDIR}/${page} - .endif -@@ -186,6 +188,7 @@ - done - .if defined(MANBUILDCAT) && !empty(MANBUILDCAT) - .for page in ${MAN} -+ ${INSTALL} -d ${DESTDIR}${CATDIR}${page:E}${MANSUBDIR}/${page:T} - ${MINSTALL} ${page:T:S/$/${CATEXT}/} \ - ${DESTDIR}${CATDIR}${page:E}${MANSUBDIR}/${page:T} - .endfor -@@ -193,9 +196,11 @@ - .endif - .else - .for page in ${MAN} -+ ${INSTALL} -d ${DESTDIR}${MANDIR}${page:E}${MANSUBDIR} - ${MINSTALL} ${page:T:S/$/${MCOMPRESS_EXT}/g} \ - ${DESTDIR}${MANDIR}${page:E}${MANSUBDIR} - .if defined(MANBUILDCAT) && !empty(MANBUILDCAT) -+ ${INSTALL} -d ${DESTDIR}${CATDIR}${page:E}${MANSUBDIR}/${page:T:S/$/${MCOMPRESS_EXT}/} - ${MINSTALL} ${page:T:S/$/${CATEXT}${MCOMPRESS_EXT}/g} \ - ${DESTDIR}${CATDIR}${page:E}${MANSUBDIR}/${page:T:S/$/${MCOMPRESS_EXT}/} - .endif -diff -ur share.orig/mk/bsd.prog.mk share/mk/bsd.prog.mk ---- share.orig/mk/bsd.prog.mk Thu Apr 7 12:01:25 2005 -+++ share/mk/bsd.prog.mk Thu Apr 7 12:00:55 2005 -@@ -126,9 +126,11 @@ - _proginstall: - .if defined(PROG) - .if defined(PROGNAME) -+ ${INSTALL} -d ${DESTDIR}${BINDIR} - ${INSTALL} ${STRIP} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \ - ${_INSTALLFLAGS} ${PROG} ${DESTDIR}${BINDIR}/${PROGNAME} - .else -+ ${INSTALL} -d ${DESTDIR}${BINDIR} - ${INSTALL} ${STRIP} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \ - ${_INSTALLFLAGS} ${PROG} ${DESTDIR}${BINDIR} - .endif -@@ -156,6 +158,7 @@ - SCRIPTSMODE_${script:T}?= ${SCRIPTSMODE} - _scriptsinstall: _SCRIPTSINS_${script:T} - _SCRIPTSINS_${script:T}: ${script} -+ ${INSTALL} -d ${DESTDIR}${SCRIPTSDIR_${.ALLSRC:T}} - ${INSTALL} -o ${SCRIPTSOWN_${.ALLSRC:T}} \ - -g ${SCRIPTSGRP_${.ALLSRC:T}} -m ${SCRIPTSMODE_${.ALLSRC:T}} \ - ${.ALLSRC} \ -diff -ur share.orig/mk/sys.mk share/mk/sys.mk ---- share.orig/mk/sys.mk Thu Apr 7 12:01:25 2005 -+++ share/mk/sys.mk Thu Apr 7 12:02:06 2005 -@@ -37,7 +37,7 @@ - CFLAGS ?= -O - .else - CC ?= cc --CFLAGS ?= -O -pipe -+CFLAGS += -pipe - .endif - - CXX ?= c++ -@@ -258,12 +258,6 @@ - ${LEX} -t ${LFLAGS} ${.IMPSRC} > ${.PREFIX}.tmp.c - ${CC} ${CFLAGS} ${LDFLAGS} ${.PREFIX}.tmp.c ${LDLIBS} -ll -o ${.TARGET} - rm -f ${.PREFIX}.tmp.c -- --# FreeBSD build pollution. Hide it in the non-POSIX part of the ifdef. --__MAKE_CONF?=/etc/make.conf --.if exists(${__MAKE_CONF}) --.include "${__MAKE_CONF}" --.endif - - # Default executable format - # XXX hint for bsd.port.mk diff --git a/sys-freebsd/freebsd-mk-defs/files/sys.patch b/sys-freebsd/freebsd-mk-defs/files/sys.patch deleted file mode 100644 index 051d7c40eed4..000000000000 --- a/sys-freebsd/freebsd-mk-defs/files/sys.patch +++ /dev/null @@ -1,28 +0,0 @@ ---- sys.mk.orig Wed Oct 20 15:05:43 2004 -+++ sys.mk Wed Oct 20 16:45:42 2004 -@@ -253,17 +253,17 @@ - - .endif - --__MAKE_CONF?=/etc/make.conf --.if exists(${__MAKE_CONF}) --.include "${__MAKE_CONF}" --.endif -+#__MAKE_CONF?=/etc/make.conf -+#.if exists(${__MAKE_CONF}) -+#.include "${__MAKE_CONF}" -+#.endif - - .include - --.if exists(/etc/make.conf.local) --.error Error, /etc/make.conf.local should be renamed to /etc/make.conf. --.include --.endif -+#.if exists(/etc/make.conf.local) -+#.error Error, /etc/make.conf.local should be renamed to /etc/make.conf. -+#.include -+#.endif - - # Default executable format - # XXX hint for bsd.port.mk -- cgit v1.2.3-65-gdbad