diff options
author | Alexis Ballier <aballier@gentoo.org> | 2010-03-19 11:51:07 +0000 |
---|---|---|
committer | Alexis Ballier <aballier@gentoo.org> | 2010-03-19 11:51:07 +0000 |
commit | bbf334e5c06d8676968eb2327d560d97c76a4523 (patch) | |
tree | e2be7c9800aa6fed357f9dda0d7c5f9d20357b13 /sys-freebsd/freebsd-share | |
parent | Fix bug 293374 and sync with fedora to solve other issues (diff) | |
download | gentoo-2-bbf334e5c06d8676968eb2327d560d97c76a4523.tar.gz gentoo-2-bbf334e5c06d8676968eb2327d560d97c76a4523.tar.bz2 gentoo-2-bbf334e5c06d8676968eb2327d560d97c76a4523.zip |
bump to 8.0 from the bsd overlay
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Diffstat (limited to 'sys-freebsd/freebsd-share')
-rw-r--r-- | sys-freebsd/freebsd-share/ChangeLog | 8 | ||||
-rw-r--r-- | sys-freebsd/freebsd-share/files/freebsd-share-8.0-gnu-miscfiles.patch | 26 | ||||
-rw-r--r-- | sys-freebsd/freebsd-share/freebsd-share-8.0.ebuild | 85 |
3 files changed, 118 insertions, 1 deletions
diff --git a/sys-freebsd/freebsd-share/ChangeLog b/sys-freebsd/freebsd-share/ChangeLog index dd497a78a62d..910b6b5f0291 100644 --- a/sys-freebsd/freebsd-share/ChangeLog +++ b/sys-freebsd/freebsd-share/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for sys-freebsd/freebsd-share # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-share/ChangeLog,v 1.35 2010/03/11 11:00:43 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-share/ChangeLog,v 1.36 2010/03/19 11:51:03 aballier Exp $ + +*freebsd-share-8.0 (19 Mar 2010) + + 19 Mar 2010; Alexis Ballier <aballier@gentoo.org> + +freebsd-share-8.0.ebuild, +files/freebsd-share-8.0-gnu-miscfiles.patch: + bump to 8.0 from the bsd overlay 11 Mar 2010; Alexis Ballier <aballier@gentoo.org> -freebsd-share-6.2.ebuild, -freebsd-share-7.1.ebuild, diff --git a/sys-freebsd/freebsd-share/files/freebsd-share-8.0-gnu-miscfiles.patch b/sys-freebsd/freebsd-share/files/freebsd-share-8.0-gnu-miscfiles.patch new file mode 100644 index 000000000000..19167a6e04c7 --- /dev/null +++ b/sys-freebsd/freebsd-share/files/freebsd-share-8.0-gnu-miscfiles.patch @@ -0,0 +1,26 @@ +--- share/misc/Makefile.old 2010-03-12 01:32:39 +0100 ++++ share/misc/Makefile 2010-03-12 01:33:25 +0100 +@@ -3,9 +3,9 @@ + + .PATH: ${.CURDIR}/../../sys/dev/usb + +-FILES= ascii birthtoken bsd-family-tree committers-doc.dot committers-ports.dot \ ++FILES= bsd-family-tree committers-doc.dot committers-ports.dot \ + committers-src.dot eqnchar flowers init.ee \ +- iso3166 iso639 latin1 man.template mdoc.template operator pci_vendors \ ++ iso3166 iso639 man.template mdoc.template pci_vendors \ + scsi_modes usb_hid_usages usbdevs + + NO_OBJ= +--- share/dict/Makefile.old 2010-03-12 01:33:53 +0100 ++++ share/dict/Makefile 2010-03-12 01:34:18 +0100 +@@ -4,8 +4,7 @@ + NO_OBJ= + + # XXX MISSING: connectives words +-FILES= README propernames web2 web2a freebsd ++FILES= README freebsd + FILESDIR= ${BINDIR}/dict +-SYMLINKS= web2 ${FILESDIR}/words + + .include <bsd.prog.mk> diff --git a/sys-freebsd/freebsd-share/freebsd-share-8.0.ebuild b/sys-freebsd/freebsd-share/freebsd-share-8.0.ebuild new file mode 100644 index 000000000000..228719b511d8 --- /dev/null +++ b/sys-freebsd/freebsd-share/freebsd-share-8.0.ebuild @@ -0,0 +1,85 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-share/freebsd-share-8.0.ebuild,v 1.1 2010/03/19 11:51:03 aballier Exp $ + +inherit bsdmk freebsd + +DESCRIPTION="FreeBSD shared tools/files" +SLOT="0" +KEYWORDS="~sparc-fbsd ~x86-fbsd" + +IUSE="doc isdn" + +SRC_URI="mirror://gentoo/${SHARE}.tar.bz2 + mirror://gentoo/${CONTRIB}.tar.bz2 + mirror://gentoo/${GNU}.tar.bz2 + mirror://gentoo/${UBIN}.tar.bz2 + mirror://gentoo/${USBIN}.tar.bz2 + mirror://gentoo/${SBIN}.tar.bz2 + mirror://gentoo/${BIN}.tar.bz2 + mirror://gentoo/${LIB}.tar.bz2 + mirror://gentoo/${ETC}.tar.bz2" + +DEPEND="=sys-freebsd/freebsd-mk-defs-${RV}* + =sys-freebsd/freebsd-sources-${RV}*" +RDEPEND="sys-apps/miscfiles" + +RESTRICT="strip" + +S="${WORKDIR}/share" + +pkg_setup() { + use isdn || mymakeopts="${mymakeopts} NO_I4B= " + use doc || mymakeopts="${mymakeopts} NO_SHAREDOCS= " + + mymakeopts="${mymakeopts} NO_SENDMAIL= NO_MANCOMPRESS= NO_INFOCOMPRESS= " +} + +REMOVE_SUBDIRS="mk termcap zoneinfo tabset" + +PATCHES=( "${FILESDIR}/${PN}-5.3-doc-locations.patch" + "${FILESDIR}/${PN}-5.4-gentoo-skel.patch" + "${FILESDIR}/${PN}-8.0-gnu-miscfiles.patch" ) + +src_unpack() { + freebsd_src_unpack + + # Remove make.conf manpage as it describes bsdmk's make.conf. + sed -i -e 's:make.conf.5::' "${S}/man/man5/Makefile" + # Remove mailer.conf manpage + sed -i -e 's:mailer.conf.5::' "${S}/man/man5/Makefile" + # Remove pbm and moduli(ssh) manpages + sed -i -e 's:pbm.5::' -e 's:moduli.5::' "${S}/man/man5/Makefile" + # Remove builtins manpage + sed -i -e '/builtins\.1/d' "${S}/man/man1/Makefile" + # Remove rc manpages + sed -i -e '/rc.8/d' "${S}/man/man8/Makefile" + + # Don't install the arch-specific directories in subdirectories + sed -i -e '/MANSUBDIR/d' "${S}"/man/man4/man4.{i386,sparc64}/Makefile + + # Remove them so that they can't be included by error + rm -rf "${S}"/mk/*.mk + + # Make proper symlinks by defining the full target. + local sdir + for sdir in colldef mklocale monetdef msgdef numericdef timedef + do + sed -e 's:\${enc2}$:\${enc2}/\${FILESNAME}:g' -i \ + "${S}/${sdir}/Makefile" || \ + die "Error fixing ${sdir}/Makefile" + done + ln -s "/usr/src/sys-${RV}" "${WORKDIR}/sys" || die "failed to set sys symlink" +} + +src_compile() { + export ESED="/usr/bin/sed" + + # This is a groff problem and not a -shared problem. + export GROFF_TMAC_PATH="/usr/share/tmac/:/usr/share/groff/1.19.1/tmac/" + mkmake || die "emake failed" +} + +src_install() { + mkmake -j1 DESTDIR="${D}" DOCDIR=/usr/share/doc/${PF} install || die "Install failed" +} |