diff -x digest-* -x Manifest -Nur /root/overlay/sys-apps/freebsd-share/files/freebsd-share-doc-locations.patch freebsd-share/files/freebsd-share-doc-locations.patch --- /root/overlay/sys-apps/freebsd-share/files/freebsd-share-doc-locations.patch Thu Jan 1 00:00:00 1970 +++ freebsd-share/files/freebsd-share-doc-locations.patch Fri Mar 11 21:35:22 2005 @@ -0,0 +1,24 @@ +diff -Npaur share.orig/examples/smbfs/Makefile share/examples/smbfs/Makefile +--- share.orig/examples/smbfs/Makefile Fri Mar 11 21:24:41 2005 ++++ share/examples/smbfs/Makefile Fri Mar 11 21:32:45 2005 +@@ -1,7 +1,7 @@ + # $FreeBSD: src/share/examples/smbfs/Makefile,v 1.3 2002/04/02 07:48:30 ru Exp $ + + NOOBJ= noobj +-BINDIR= /usr/share/examples/smbfs ++FILESDIR= ${DOCDIR}/smbfs + FILES= dot.nsmbrc + + .PATH: ${.CURDIR}/../../../contrib/smbfs/examples +diff -Npaur share.orig/examples/smbfs/print/Makefile share/examples/smbfs/print/Makefile +--- share.orig/examples/smbfs/print/Makefile Fri Mar 11 21:24:41 2005 ++++ share/examples/smbfs/print/Makefile Fri Mar 11 21:34:19 2005 +@@ -1,7 +1,7 @@ + # $FreeBSD: src/share/examples/smbfs/print/Makefile,v 1.2 2002/04/02 07:48:32 ru Exp $ + + NOOBJ= noobj +-BINDIR= /usr/share/examples/smbfs/print ++FILESDIR= ${DOCDIR}/smbfs/print + FILES= lj6l ljspool printcap.sample tolj + + .PATH: ${.CURDIR}/../../../../contrib/smbfs/examples/print diff -x digest-* -x Manifest -Nur /root/overlay/sys-apps/freebsd-share/freebsd-share-5.3.ebuild freebsd-share/freebsd-share-5.3.ebuild --- /root/overlay/sys-apps/freebsd-share/freebsd-share-5.3.ebuild Wed Feb 9 17:47:00 2005 +++ freebsd-share/freebsd-share-5.3.ebuild Fri Mar 11 21:42:14 2005 @@ -13,7 +13,6 @@ LIB="freebsd-lib-${PV}" ETC="freebsd-etc-${PV}" - DESCRIPTION="FreeBSD shared tools/files" SRC_URI="${SRC_URI} ${BASE_SRC_URI}${CONTRIB}.tar.bz2 @@ -30,6 +29,14 @@ S=${WORKDIR}/share +IUSE="doc isdn sendmail" + +pkg_setup() { + use isdn || mymakeopts="${mymakeopts} NO_I4B= " + use sendmail || mymakeopts="${mymakeopts} NO_SENDMAIL= " + use doc || mymakeopts="${mymakeopts} NO_SHAREDOCS= " +} + src_unpack() { unpack ${P}.tar.bz2 unpack ${CONTRIB}.tar.bz2 @@ -44,6 +51,7 @@ # Disables mk cd ${S} epatch ${FILESDIR}/${P}-no_mk.patch + epatch ${FILESDIR}/${PN}-doc-locations.patch # Adjust colldef makefile cd ${S}/colldef @@ -53,23 +61,10 @@ src_compile() { # This is a groff problem and not a -shared problem. - GROFF_TMAC_PATH="/usr/share/tmac/:/usr/share/groff/1.19.1/tmac/" emake || die "emake failed" + export GROFF_TMAC_PATH="/usr/share/tmac/:/usr/share/groff/1.19.1/tmac/" + fmake || die "emake failed" } src_install() { - make DESTDIR=${D} install || die "Install failed" - correct_wrong_path -} - -# SmbFS' Makefile tries to install files in this ebuild's ${FILESDIR} -# this function is a workaround to this problem -correct_wrong_path() { - local WRONG="local/sys-apps/freebsd-share/files" - local CORRECT="/usr/share/examples/smbfs" - - einfo "Correcting the path of files installed in an incorrect dir" - mv ${D}/${PORTDIR}/${WRONG}/dot.nsmbrc ${D}/${CORRECT} - mv ${D}/${PORTDIR}/${WRONG}/* ${D}/${CORRECT}/print - rm -rf ${D}/usr/portage - + fmake DESTDIR=${D} DOCDIR=/usr/share/doc/${PF} install || die "Install failed" }