diff options
Diffstat (limited to 'net-fs')
| -rwxr-xr-x | net-fs/nfs-utils/files/nfs | 6 | ||||
| -rw-r--r-- | net-fs/nfs-utils/nfs-utils-1.0.7.ebuild | 46 |
2 files changed, 24 insertions, 28 deletions
diff --git a/net-fs/nfs-utils/files/nfs b/net-fs/nfs-utils/files/nfs index 2639cb6f9368..566fcea761b9 100755 --- a/net-fs/nfs-utils/files/nfs +++ b/net-fs/nfs-utils/files/nfs @@ -1,7 +1,7 @@ #!/sbin/runscript -# Copyright 1999-2004 Gentoo Foundation +# Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/files/nfs,v 1.8 2004/11/14 02:34:05 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/files/nfs,v 1.9 2005/03/15 05:23:38 vapier Exp $ #--------------------------------------------------------------------------- # This script starts/stops the following @@ -13,7 +13,7 @@ # NB: Config is in /etc/conf.d/nfs -opts="start stop restart reload" +opts="reload" # This variable is used for controlling whether or not to run exportfs -ua; # see stop() for more information diff --git a/net-fs/nfs-utils/nfs-utils-1.0.7.ebuild b/net-fs/nfs-utils/nfs-utils-1.0.7.ebuild index e13a358c18dc..41de5e22f237 100644 --- a/net-fs/nfs-utils/nfs-utils-1.0.7.ebuild +++ b/net-fs/nfs-utils/nfs-utils-1.0.7.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/nfs-utils-1.0.7.ebuild,v 1.2 2005/03/15 04:44:54 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/nfs-utils-1.0.7.ebuild,v 1.3 2005/03/15 05:23:38 vapier Exp $ inherit gnuconfig eutils flag-o-matic @@ -11,18 +11,18 @@ SRC_URI="mirror://sourceforge/nfs/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86" -IUSE="nfsv4 tcpd" +IUSE="nonfsv4 tcpd" RDEPEND="tcpd? ( sys-apps/tcp-wrappers ) >=net-nds/portmap-5b-r6 >=sys-apps/util-linux-2.11f" DEPEND="${RDEPEND} >=sys-apps/portage-2.0.51 - nfsv4? ( + !nonfsv4? ( >=dev-libs/libevent-1.0b >=net-libs/nfsidmap-0.9 - app-crypt/mit-krb5 - )" + ) + kerberos? ( app-crypt/mit-krb5 )" # kth-krb doesn't provide the right include # files, and nfs-utils doesn't build against heimdal either, # so don't depend on virtual/krb. @@ -30,30 +30,30 @@ DEPEND="${RDEPEND} src_unpack() { unpack ${A} + cd "${S}" # getrpcbynumber_r is not in the SuSv3 spec. disable it for uClibc - cd ${S} - epatch ${FILESDIR}/nfs-utils-1.0.6-uclibc.patch + epatch "${FILESDIR}"/nfs-utils-1.0.6-uclibc.patch # since the usn36 patch is now integrated (at least the parts we care about) # into 1.0.7, we need to re-apply the rquoted patch (04 Feb 2005 agriffis) - epatch ${FILESDIR}/nfs-utils-0.3.3-rquotad-overflow.patch + epatch "${FILESDIR}"/nfs-utils-0.3.3-rquotad-overflow.patch + + sed -i 's:@mandir@:$(install_prefix)@mandir@:' config.mk.in } src_compile() { - append-flags -I/usr/include/heimdal - econf \ --mandir=/usr/share/man \ --with-statedir=/var/lib/nfs \ --disable-rquotad \ --enable-nfsv3 \ --enable-secure-statd \ - $(use_enable nfsv4) \ - $(use_enable nfsv4 gss) \ + $(use_enable !nonfsv4 nfsv4) \ + $(use_enable kerberos gss) \ || die "Configure failed" - if ! use tcpd; then + if ! use tcpd ; then sed -i "s:\(-lwrap\|-DHAVE_TCP_WRAPPER\)::" config.mk fi @@ -63,31 +63,27 @@ src_compile() { } src_install() { - make \ - install_prefix=${D} \ - MANDIR=${D}/usr/share/man \ - install \ - || die "Failed to install" + make install_prefix="${D}" install || die # Don't overwrite existing xtab/etab, install the original # versions somewhere safe... more info in pkg_postinst dodir /usr/lib/nfs keepdir /var/lib/nfs/{sm,sm.bak} - mv ${D}/var/lib/nfs/* ${D}/usr/lib/nfs + mv "${D}"/var/lib/nfs/* "${D}"/usr/lib/nfs keepdir /var/lib/nfs keepdir /var/lib/nfs/v4root # Install some client-side binaries in /sbin dodir /sbin - mv ${D}/usr/sbin/rpc.{lockd,statd} ${D}/sbin/ + mv "${D}"/usr/sbin/rpc.{lockd,statd} "${D}"/sbin/ dodoc ChangeLog README docinto linux-nfs ; dodoc linux-nfs/* - insinto /etc ; doins ${FILESDIR}/exports + insinto /etc ; doins "${FILESDIR}"/exports - doinitd ${FILESDIR}/nfs ${FILESDIR}/nfsmount - newconfd ${FILESDIR}/nfs.confd nfs + doinitd "${FILESDIR}"/nfs "${FILESDIR}"/nfsmount + newconfd "${FILESDIR}"/nfs.confd nfs } pkg_postinst() { @@ -96,9 +92,9 @@ pkg_postinst() { # the daemons actually use the files in /var/lib/nfs. This fixes # bug 30486 local f - for f in ${ROOT}/usr/lib/nfs/*; do + for f in "${ROOT}"/usr/lib/nfs/*; do [[ -f ${ROOT}/var/lib/nfs/${f##*/} ]] && continue einfo "Copying default ${f##*/} from /usr/lib/nfs to /var/lib/nfs" - cp -a ${f} ${ROOT}/var/lib/nfs/ + cp -a ${f} "${ROOT}"/var/lib/nfs/ done } |