diff options
Diffstat (limited to 'sys-freebsd/freebsd-mk-defs')
7 files changed, 148 insertions, 30 deletions
diff --git a/sys-freebsd/freebsd-mk-defs/ChangeLog b/sys-freebsd/freebsd-mk-defs/ChangeLog index 4d032ebf8aae..ef23868a3754 100644 --- a/sys-freebsd/freebsd-mk-defs/ChangeLog +++ b/sys-freebsd/freebsd-mk-defs/ChangeLog @@ -1,6 +1,17 @@ # 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.12 2006/05/09 07:37:49 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-mk-defs/ChangeLog,v 1.13 2006/05/09 16:50:08 flameeyes Exp $ + +*freebsd-mk-defs-6.1-r1 (09 May 2006) +*freebsd-mk-defs-6.0-r2 (09 May 2006) + + 09 May 2006; Diego Pettenò <flameeyes@gentoo.org> + files/freebsd-mk-defs-6.0-gentoo.patch, + files/freebsd-mk-defs-6.1-gentoo.patch, -freebsd-mk-defs-6.0-r1.ebuild, + +freebsd-mk-defs-6.0-r2.ebuild, -freebsd-mk-defs-6.1.ebuild, + +freebsd-mk-defs-6.1-r1.ebuild: + Add patch to correctly create directories for man pages when not compressing + them. *freebsd-mk-defs-6.1 (09 May 2006) diff --git a/sys-freebsd/freebsd-mk-defs/files/digest-freebsd-mk-defs-6.0-r2 b/sys-freebsd/freebsd-mk-defs/files/digest-freebsd-mk-defs-6.0-r2 new file mode 100644 index 000000000000..145d5af2f15a --- /dev/null +++ b/sys-freebsd/freebsd-mk-defs/files/digest-freebsd-mk-defs-6.0-r2 @@ -0,0 +1,3 @@ +MD5 e6da34bbe65a9cb2031e0613ab46108c freebsd-share-6.0.tar.bz2 3719732 +RMD160 f2acb308d4f0d571e4ae1cb23b8248623a131017 freebsd-share-6.0.tar.bz2 3719732 +SHA256 5314ba2f6abbc41b63c6f5aa30c802f373a0a398e5dff63402fa1225b77b7e86 freebsd-share-6.0.tar.bz2 3719732 diff --git a/sys-freebsd/freebsd-mk-defs/files/digest-freebsd-mk-defs-6.1-r1 b/sys-freebsd/freebsd-mk-defs/files/digest-freebsd-mk-defs-6.1-r1 new file mode 100644 index 000000000000..80d00a6b0cb0 --- /dev/null +++ b/sys-freebsd/freebsd-mk-defs/files/digest-freebsd-mk-defs-6.1-r1 @@ -0,0 +1,3 @@ +MD5 87e50c5ad62ac4c2e062c5a05b6709f3 freebsd-share-6.1.tar.bz2 3745745 +RMD160 02c0369d9384d83cc22f8e41d7c8f642b9b91b3a freebsd-share-6.1.tar.bz2 3745745 +SHA256 e784b691a3df97ac8e2c0399ae48cf13b545cddfe513d3ec47c1656fe4e41f77 freebsd-share-6.1.tar.bz2 3745745 diff --git a/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-6.0-gentoo.patch b/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-6.0-gentoo.patch index 43eb745e67db..c52f6aa488d4 100644 --- a/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-6.0-gentoo.patch +++ b/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-6.0-gentoo.patch @@ -1,7 +1,7 @@ -Index: freebsd-6.0/share/mk/bsd.doc.mk +Index: fbsd-6.0/share/mk/bsd.doc.mk =================================================================== ---- freebsd-6.0.orig/share/mk/bsd.doc.mk -+++ freebsd-6.0/share/mk/bsd.doc.mk +--- fbsd-6.0.orig/share/mk/bsd.doc.mk ++++ fbsd-6.0/share/mk/bsd.doc.mk @@ -137,10 +137,12 @@ CLEANFILES+= ${DOC}.ascii ${DOC}.ascii${ realinstall: .for _dev in ${PRINTERDEVICE:Mhtml} @@ -15,10 +15,10 @@ Index: freebsd-6.0/share/mk/bsd.doc.mk ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \ ${DFILE.${_dev}} ${DESTDIR}${BINDIR}/${VOLUME} .endfor -Index: freebsd-6.0/share/mk/bsd.files.mk +Index: fbsd-6.0/share/mk/bsd.files.mk =================================================================== ---- freebsd-6.0.orig/share/mk/bsd.files.mk -+++ freebsd-6.0/share/mk/bsd.files.mk +--- fbsd-6.0.orig/share/mk/bsd.files.mk ++++ fbsd-6.0/share/mk/bsd.files.mk @@ -39,6 +39,7 @@ ${group}NAME_${file:T}?= ${file:T} .endif installfiles: _${group}INS_${file:T} @@ -40,10 +40,10 @@ Index: freebsd-6.0/share/mk/bsd.files.mk ${INSTALL} -o ${${group}OWN} -g ${${group}GRP} \ -m ${${group}MODE} ${.ALLSRC} ${DESTDIR}${${group}DIR} .endif -Index: freebsd-6.0/share/mk/bsd.incs.mk +Index: fbsd-6.0/share/mk/bsd.incs.mk =================================================================== ---- freebsd-6.0.orig/share/mk/bsd.incs.mk -+++ freebsd-6.0/share/mk/bsd.incs.mk +--- fbsd-6.0.orig/share/mk/bsd.incs.mk ++++ fbsd-6.0/share/mk/bsd.incs.mk @@ -39,6 +39,10 @@ ${group}NAME_${header:T}?= ${header:T} .endif installincludes: _${group}INS_${header:T} @@ -67,10 +67,10 @@ Index: freebsd-6.0/share/mk/bsd.incs.mk ${INSTALL} -C -o ${${group}OWN} -g ${${group}GRP} -m ${${group}MODE} \ ${.ALLSRC} ${DESTDIR}${${group}DIR} .endif -Index: freebsd-6.0/share/mk/bsd.info.mk +Index: fbsd-6.0/share/mk/bsd.info.mk =================================================================== ---- freebsd-6.0.orig/share/mk/bsd.info.mk -+++ freebsd-6.0/share/mk/bsd.info.mk +--- fbsd-6.0.orig/share/mk/bsd.info.mk ++++ fbsd-6.0/share/mk/bsd.info.mk @@ -85,6 +85,7 @@ INFO2HTML?= info2html TEX?= tex DVIPS?= dvips @@ -87,10 +87,10 @@ Index: freebsd-6.0/share/mk/bsd.info.mk ${INSTALLINFO} ${INSTALLINFOFLAGS} \ --defsection=${INFOSECTION} \ --defentry=${INFOENTRY_${x}} \ -Index: freebsd-6.0/share/mk/bsd.lib.mk +Index: fbsd-6.0/share/mk/bsd.lib.mk =================================================================== ---- freebsd-6.0.orig/share/mk/bsd.lib.mk -+++ freebsd-6.0/share/mk/bsd.lib.mk +--- fbsd-6.0.orig/share/mk/bsd.lib.mk ++++ fbsd-6.0/share/mk/bsd.lib.mk @@ -208,14 +208,17 @@ realinstall: _libinstall .ORDER: beforeinstall _libinstall _libinstall: @@ -109,10 +109,10 @@ Index: freebsd-6.0/share/mk/bsd.lib.mk ${INSTALL} ${STRIP} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ ${_INSTALLFLAGS} ${_SHLINSTALLFLAGS} \ ${SHLIB_NAME} ${DESTDIR}${SHLIBDIR} -Index: freebsd-6.0/share/mk/bsd.man.mk +Index: fbsd-6.0/share/mk/bsd.man.mk =================================================================== ---- freebsd-6.0.orig/share/mk/bsd.man.mk -+++ freebsd-6.0/share/mk/bsd.man.mk +--- fbsd-6.0.orig/share/mk/bsd.man.mk ++++ fbsd-6.0/share/mk/bsd.man.mk @@ -165,9 +165,11 @@ _maninstall: ${MAN} .if defined(NO_MANCOMPRESS) .if defined(MANFILTER) @@ -125,7 +125,14 @@ Index: freebsd-6.0/share/mk/bsd.man.mk ${MINSTALL} ${page:T:S/$/${CATEXT}${FILTEXTENSION}/g} \ ${DESTDIR}${CATDIR}${page:E}${MANSUBDIR}/${page} .endif -@@ -186,6 +188,7 @@ _maninstall: ${MAN} +@@ -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} @@ -133,7 +140,7 @@ Index: freebsd-6.0/share/mk/bsd.man.mk ${MINSTALL} ${page:T:S/$/${CATEXT}/} \ ${DESTDIR}${CATDIR}${page:E}${MANSUBDIR}/${page:T} .endfor -@@ -193,9 +196,11 @@ _maninstall: ${MAN} +@@ -193,9 +198,11 @@ _maninstall: ${MAN} .endif .else .for page in ${MAN} @@ -145,10 +152,10 @@ Index: freebsd-6.0/share/mk/bsd.man.mk ${MINSTALL} ${page:T:S/$/${CATEXT}${MCOMPRESS_EXT}/g} \ ${DESTDIR}${CATDIR}${page:E}${MANSUBDIR}/${page:T:S/$/${MCOMPRESS_EXT}/} .endif -Index: freebsd-6.0/share/mk/bsd.prog.mk +Index: fbsd-6.0/share/mk/bsd.prog.mk =================================================================== ---- freebsd-6.0.orig/share/mk/bsd.prog.mk -+++ freebsd-6.0/share/mk/bsd.prog.mk +--- fbsd-6.0.orig/share/mk/bsd.prog.mk ++++ fbsd-6.0/share/mk/bsd.prog.mk @@ -133,9 +133,11 @@ realinstall: _proginstall _proginstall: .if defined(PROG) @@ -169,10 +176,10 @@ Index: freebsd-6.0/share/mk/bsd.prog.mk ${INSTALL} -o ${SCRIPTSOWN_${.ALLSRC:T}} \ -g ${SCRIPTSGRP_${.ALLSRC:T}} -m ${SCRIPTSMODE_${.ALLSRC:T}} \ ${.ALLSRC} \ -Index: freebsd-6.0/share/mk/sys.mk +Index: fbsd-6.0/share/mk/sys.mk =================================================================== ---- freebsd-6.0.orig/share/mk/sys.mk -+++ freebsd-6.0/share/mk/sys.mk +--- fbsd-6.0.orig/share/mk/sys.mk ++++ fbsd-6.0/share/mk/sys.mk @@ -19,7 +19,7 @@ unix ?= We run FreeBSD, not UNIX. .SUFFIXES: .out .a .ln .o .c .cc .cpp .cxx .C .m .F .f .e .r .y .l .S .asm .s .cl .p .h .sh .endif diff --git a/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-6.1-gentoo.patch b/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-6.1-gentoo.patch index f0160bc60cea..689e0e8652ab 100644 --- a/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-6.1-gentoo.patch +++ b/sys-freebsd/freebsd-mk-defs/files/freebsd-mk-defs-6.1-gentoo.patch @@ -83,7 +83,7 @@ Index: fbsd-6.1/share/mk/bsd.info.mk .for x in ${INFO} INSTALLINFODIRS+= ${x:S/$/-install/} ${x:S/$/-install/}: -+ ${INSTALL} -d ${DESTDIR}${INFODIR} ++ ${INSTALL} -d ${DESTDIR}${INFODIR}/${INFODIRFILE} lockf -k ${DESTDIR}${INFODIR}/${INFODIRFILE} \ ${INSTALLINFO} ${INSTALLINFOFLAGS} \ --defsection=${INFOSECTION} \ @@ -136,7 +136,14 @@ Index: fbsd-6.1/share/mk/bsd.man.mk ${MINSTALL} ${page:T:S/$/${CATEXT}${FILTEXTENSION}/g} \ ${DESTDIR}${CATDIR}${page:E}${MANSUBDIR}/${page} .endif -@@ -186,6 +188,7 @@ _maninstall: ${MAN} +@@ -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} @@ -144,7 +151,7 @@ Index: fbsd-6.1/share/mk/bsd.man.mk ${MINSTALL} ${page:T:S/$/${CATEXT}/} \ ${DESTDIR}${CATDIR}${page:E}${MANSUBDIR}/${page:T} .endfor -@@ -193,9 +196,11 @@ _maninstall: ${MAN} +@@ -193,9 +198,11 @@ _maninstall: ${MAN} .endif .else .for page in ${MAN} diff --git a/sys-freebsd/freebsd-mk-defs/freebsd-mk-defs-6.0-r2.ebuild b/sys-freebsd/freebsd-mk-defs/freebsd-mk-defs-6.0-r2.ebuild new file mode 100644 index 000000000000..e8932e301544 --- /dev/null +++ b/sys-freebsd/freebsd-mk-defs/freebsd-mk-defs-6.0-r2.ebuild @@ -0,0 +1,45 @@ +# Copyright 1999-2006 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-mk-defs/freebsd-mk-defs-6.0-r2.ebuild,v 1.1 2006/05/09 16:50:08 flameeyes Exp $ + +inherit bsdmk freebsd + +DESCRIPTION="Makefiles definitions used for building and installing libraries and system files" +SLOT="0" +KEYWORDS="~amd64 ~x86-fbsd" + +IUSE="" + +SRC_URI="mirror://gentoo/${SHARE}.tar.bz2" + +RDEPEND="" +DEPEND="" + +RESTRICT="nostrip" + +S="${WORKDIR}/share/mk" + +src_unpack() { + unpack ${A} + cd ${WORKDIR}/share + epatch "${FILESDIR}/${PN}-${RV}-gentoo.patch" + epatch "${FILESDIR}/${PN}-flex.patch" + epatch "${FILESDIR}/${PN}-${RV}-strip.patch" + epatch "${FILESDIR}/${PN}-${RV}-nowerror.patch" + + [[ ${CHOST} != *-*bsd* || ${CHOST} == *-gnu ]] && \ + epatch "${FILESDIR}/${PN}-${RV}-gnu.patch" +} + +src_compile() { + einfo "Nothing to compile" +} + +src_install() { + if [[ ${CHOST} != *-freebsd* ]]; then + insinto /usr/share/mk/freebsd + else + insinto /usr/share/mk + fi + doins *.mk +} diff --git a/sys-freebsd/freebsd-mk-defs/freebsd-mk-defs-6.1-r1.ebuild b/sys-freebsd/freebsd-mk-defs/freebsd-mk-defs-6.1-r1.ebuild new file mode 100644 index 000000000000..0b5089fc30b7 --- /dev/null +++ b/sys-freebsd/freebsd-mk-defs/freebsd-mk-defs-6.1-r1.ebuild @@ -0,0 +1,42 @@ +# Copyright 1999-2006 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-mk-defs/freebsd-mk-defs-6.1-r1.ebuild,v 1.1 2006/05/09 16:50:08 flameeyes Exp $ + +inherit bsdmk freebsd + +DESCRIPTION="Makefiles definitions used for building and installing libraries and system files" +SLOT="0" +KEYWORDS="~amd64 ~x86-fbsd" + +IUSE="" + +SRC_URI="mirror://gentoo/${SHARE}.tar.bz2" + +RDEPEND="" +DEPEND="" + +RESTRICT="nostrip" + +S="${WORKDIR}/share/mk" + +src_unpack() { + unpack ${A} + cd ${WORKDIR}/share + epatch "${FILESDIR}/${PN}-6.1-gentoo.patch" + + [[ ${CHOST} != *-*bsd* || ${CHOST} == *-gnu ]] && \ + epatch "${FILESDIR}/${PN}-6.0-gnu.patch" +} + +src_compile() { + einfo "Nothing to compile" +} + +src_install() { + if [[ ${CHOST} != *-freebsd* ]]; then + insinto /usr/share/mk/freebsd + else + insinto /usr/share/mk + fi + doins *.mk +} |