samba fixes

7 files changed, 26 insertions, 145 deletions

diff --git a/gnome-extra/mc/ChangeLog b/gnome-extra/mc/ChangeLog
index e0d08bd36b1c..269dea56407c 100644
--- a/gnome-extra/mc/ChangeLog
+++ b/gnome-extra/mc/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for gnome-extra/mc
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/mc/ChangeLog,v 1.5 2002/04/12 17:00:31 spider Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/mc/ChangeLog,v 1.6 2002/06/20 20:26:24 seemant Exp $
+
+*mc-4.5.55-r5 (20 Jun 2002)
+
+  20 Jun 2002; Seemant Kulleen <seemant@gentoo.org> mc-4.5.55-r5.ebuild
+  files/digest-mc-4.5.55-r5 :
+
+  Samba fixes from Maik Schreiber bZ@iq-computing.de in bug #3113
 
 *mc-4.5.55-r4 (11 Apr 2002)
   11 Apr 2002; Spider <spider@gentoo.org>
diff --git a/gnome-extra/mc/files/digest-mc-4.5.55-r2 b/gnome-extra/mc/files/digest-mc-4.5.55-r2
deleted file mode 100644
index 60b693823ea7..000000000000
--- a/gnome-extra/mc/files/digest-mc-4.5.55-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 bb670d48589f26f00b7fce8d25f66bd6 mc-4.5.55.tar.gz 4849958
diff --git a/gnome-extra/mc/files/digest-mc-4.5.55-r3 b/gnome-extra/mc/files/digest-mc-4.5.55-r3
deleted file mode 100644
index 60b693823ea7..000000000000
--- a/gnome-extra/mc/files/digest-mc-4.5.55-r3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 bb670d48589f26f00b7fce8d25f66bd6 mc-4.5.55.tar.gz 4849958
diff --git a/gnome-extra/mc/files/digest-mc-4.5.55-r1 b/gnome-extra/mc/files/digest-mc-4.5.55-r5
index 60b693823ea7..60b693823ea7 100644
--- a/gnome-extra/mc/files/digest-mc-4.5.55-r1
+++ b/gnome-extra/mc/files/digest-mc-4.5.55-r5
diff --git a/gnome-extra/mc/mc-4.5.55-r1.ebuild b/gnome-extra/mc/mc-4.5.55-r1.ebuild
deleted file mode 100644
index 37d24c6483ad..000000000000
--- a/gnome-extra/mc/mc-4.5.55-r1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author Achim Gottinger <achim@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/mc/mc-4.5.55-r1.ebuild,v 1.2 2002/04/12 17:00:31 spider Exp $
-
-S=${WORKDIR}/${P}
-DESCRIPTION="GNOME Midnight Commander"
-SRC_URI="http://www.gnome.org/projects/${PN}/${P}.tar.gz"
-HOMEPAGE="http://www.gnome.org/projects/mc/"
-
-DEPEND="virtual/glibc
-	gpm? ( >=sys-libs/gpm-1.19.3 )
-	pam? ( >=sys-libs/pam-0.72 )
-	slang? ( >=sys-libs/slang-1.4.2 )
-	>=sys-apps/e2fsprogs-1.19
-	=dev-libs/glib-1.2*
-	nls? ( sys-devel/gettext )
-	gnome? ( >=gnome-base/gnome-libs-1.4.1.2-r1 )"
-
-
-src_unpack() {
-	unpack ${A}
-
-	cd ${S}/vfs
-	cp smbfs.c smbfs.c.orig
-	sed -e "s:/etc/smb\.conf:/etc/smb/smb\.conf:" smbfs.c.orig > smbfs.c
-}
-
-src_compile() {                           
-	local myconf
-
-	use pam && myconf="${myconf} --with-pam"
-	use pam || myconf="${myconf} --without-pam"
-
-	use slang && myconf="${myconf} --with-slang"
-	use slang || myconf="${myconf} --with-included-slang"
-
-	use gnome && myconf="${myconf} --with-gnome"
-	use gnome || myconf="${myconf} --without-gnome"
-
-	use nls || myconf="${myconf} --disable-nls"
-
-	LDFLAGS="-lcrypt -lncurses" ./configure --host=${CHOST} 	 \
-						--prefix=/usr		 \
-						--sysconfdir=/etc	 \
-						--localstatedir=/var/lib \
-						--with-samba 		 \
-						--with-vfs 		 \
-						--with-netrc 		 \
-						$myconf || die
-
-	make || die  # Doesn't work with -j 4 (hallski)
-}
-
-src_install() {                               
-	make prefix=${D}/usr						 \
-	     sysconfdir=${D}/etc					 \
-	     localstatedir=${D}/var/lib					\
-	     install || die
-
-	dodoc ABOUT-NLS COPYING* FAQ INSTALL* NEWS README*
-}
diff --git a/gnome-extra/mc/mc-4.5.55-r2.ebuild b/gnome-extra/mc/mc-4.5.55-r2.ebuild
deleted file mode 100644
index e3eae5d4cf32..000000000000
--- a/gnome-extra/mc/mc-4.5.55-r2.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author Achim Gottinger <achim@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/mc/mc-4.5.55-r2.ebuild,v 1.2 2002/04/12 17:00:31 spider Exp $
-
-S=${WORKDIR}/${P}
-DESCRIPTION="GNOME Midnight Commander"
-SRC_URI="http://www.gnome.org/projects/${PN}/${P}.tar.gz"
-HOMEPAGE="http://www.gnome.org/projects/mc/"
-
-DEPEND="virtual/glibc
-	>=sys-apps/e2fsprogs-1.19
-	=dev-libs/glib-1.2*
-	gpm? ( >=sys-libs/gpm-1.19.3 )
-	pam? ( >=sys-libs/pam-0.72 )
-	slang? ( >=sys-libs/slang-1.4.2 )
-	nls? ( sys-devel/gettext )
-	gnome? ( >=gnome-base/gnome-libs-1.4.1.2-r1 )
-	samba? ( >=net-fs/samba-2.2.3a-r1 )"
-
-
-src_compile() {                           
-	local myconf
-
-	use pam && myconf="${myconf} --with-pam" \
-		|| myconf="${myconf} --without-pam"
-
-	use slang && myconf="${myconf} --with-slang" \
-		|| myconf="${myconf} --with-included-slang"
-
-	use gnome && myconf="${myconf} --with-gnome" \
-		|| myconf="${myconf} --without-gnome"
-
-	use gpm && myconf="${myconf} --with-gpm-mouse=/usr" \
-		|| myconf="${myconf} --without-gpm-mouse"
-
-	use nls || myconf="${myconf} --disable-nls"
-
-	if [ "`use samba`" ] ; then
-		cd ${S}/vfs
-		cp smbfs.c smbfs.c.orig
-		sed -e "s:/etc/smb\.conf:/etc/smb/smb\.conf:" smbfs.c.orig > smbfs.c
-		myconf="${myconf} --with-samba"
-	fi
-
-	libtoolize --force --copy
-	aclocal
-
-	LDFLAGS="-lcrypt -lncurses" ./configure --host=${CHOST} 	 \
-						--prefix=/usr		 \
-						--mandir=/usr/share/man	 \
-						--sysconfdir=/etc	 \
-						--localstatedir=/var/lib \
-						--with-vfs 		 \
-						--with-netrc 		 \
-						--with-ext2undel	\
-						--with-x	\
-						$myconf || die
-
-	make || die  # Doesn't work with -j 4 (hallski)
-}
-
-src_install() {                               
-	make prefix=${D}/usr						 \
-	     mandir=${D}/usr/share/man					 \
-	     sysconfdir=${D}/etc					 \
-	     localstatedir=${D}/var/lib					\
-	     install || die
-
-	dodoc ABOUT-NLS COPYING* FAQ INSTALL* NEWS README*
-}
diff --git a/gnome-extra/mc/mc-4.5.55-r3.ebuild b/gnome-extra/mc/mc-4.5.55-r5.ebuild
index 597c7a8c1695..d6f694dc69b4 100644
--- a/gnome-extra/mc/mc-4.5.55-r3.ebuild
+++ b/gnome-extra/mc/mc-4.5.55-r5.ebuild
@@ -1,7 +1,6 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
+# Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# Author Achim Gottinger <achim@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/mc/mc-4.5.55-r3.ebuild,v 1.2 2002/04/12 17:00:31 spider Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/mc/mc-4.5.55-r5.ebuild,v 1.1 2002/06/20 20:26:24 seemant Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="GNOME Midnight Commander"
@@ -16,9 +15,13 @@ DEPEND="virtual/glibc
 	pam? ( >=sys-libs/pam-0.72 )
 	slang? ( >=sys-libs/slang-1.4.2 )
 	nls? ( sys-devel/gettext )
-	gnome? ( >=gnome-base/gnome-libs-1.4.1.2-r1 )
 	samba? ( >=net-fs/samba-2.2.3a-r1 )
 	X? ( virtual/x11 )"
+#currently broken
+#	gnome? ( >=gnome-base/gnome-libs-1.4.1.2-r1 )
+
+SLOT=""
+LICENSE="GPL-2"
 
 
 src_compile() {                           
@@ -30,8 +33,10 @@ src_compile() {
 	use slang && myconf="${myconf} --with-slang"
 	use slang || myconf="${myconf} --with-included-slang"
 
-	use gnome && myconf="${myconf} --with-gnome"
-	use gnome || myconf="${myconf} --without-gnome"
+#currently broken
+#	use gnome && myconf="${myconf} --with-gnome"
+#	use gnome || myconf="${myconf} --without-gnome"
+	myconf="${myconf} --without-gnome"
 
 	use gpm && myconf="${myconf} --with-gpm-mouse=/usr"
 	use gpm || myconf="${myconf} --without-gpm-mouse"
@@ -41,12 +46,16 @@ src_compile() {
 	use X && myconf="${myconf} --with-tm-x-support"
 	use X || myconf="${myconf} --without-tm-x-support"
 
-	if [ "`use samba`" ] ; then
+	use samba && ( \
 		cd ${S}/vfs
 		cp smbfs.c smbfs.c.orig
-		sed -e "s:/etc/smb\.conf:/etc/smb/smb\.conf:" smbfs.c.orig > smbfs.c
+		sed -e "s:/etc/smb\.conf:/etc/samba/smb\.conf:" smbfs.c.orig > smbfs.c
+		cd samba
+		cp Makefile.in Makefile.in.orig
+		sed -e 's:$(LIBDIR)\(/codepages\):/var/lib/samba\1:' \
+			Makefile.in.orig > Makefile.in
 		myconf="${myconf} --with-samba"
-	fi
+	)
 
 	cd ${S}
 #	export WANT_AUTOMAKE_1_5=1