[patch] patch to rdist-6.1.5-r1.ebuild

rdist.patch (text/plain), 2.31 KB, created by splite on 2005-01-20 10:09:58 UTC

--- /usr/portage/net-misc/rdist/rdist-6.1.5-r1.ebuild	2004-07-14 22:39:54.000000000 -0500
+++ rdist-6.1.5-r2.ebuild	2005-01-20 11:39:23.000000000 -0500
@@ -2,35 +2,60 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/net-misc/rdist/rdist-6.1.5-r1.ebuild,v 1.4 2004/07/15 03:23:10 agriffis Exp $
 
+inherit eutils
+
 DESCRIPTION="Remote software distribution system"
 HOMEPAGE="http://www.magnicomp.com/rdist/rdist.shtml"
 SRC_URI="http://www.magnicomp.com/download/rdist/${P}.tar.gz"
 
 LICENSE="RDist"
 SLOT="1"
-KEYWORDS="x86 sparc alpha ia64 ~ppc"
-IUSE=""
+KEYWORDS="x86 sparc alpha ia64 ppc amd64 ppc64"
+IUSE="crypt"
 
-DEPEND="dev-util/yacc >=sys-apps/sed-4"
-RDEPEND=""  # yacc only needed for compile
+DEPEND="sys-devel/bison >=sys-apps/sed-4"
+RDEPEND="crypt? ( virtual/ssh )"
 
 src_unpack() {
 	unpack ${A} && cd ${S} || die
 
-	# Fix for bug 41781: Build with yacc instead of bison and change
-	# the following #define (10 Mar 2004 agriffis)
+	# Fix for varargs bug 41781 (10 Mar 2004 agriffis)
 	sed -i -e 's/^\(#define ARG_TYPE\).*/\1 ARG_STDARG/' config/os-linux.h
 	assert "sed ARG_TYPE failed"
+
+	# Linux switched from a.out to ELF years ago...
+	sed -i -e 's/^\(#define EXE_TYPE\).*/\1 EXE_ELF/' config/os-linux.h
+	assert "sed EXE_TYPE failed"
+	sed -i -e 's/a\.out/ELF/g' doc/rdist.man
+	assert "sed a.out failed"
+
+	# crypto lovers prefer ssh to rsh
+	if use crypt; then
+		sed -i -e 's,^\(#define _PATH_REMSH\).*,\1 "/usr/bin/ssh",' config/os-linux.h
+		assert "sed _PATH_REMSH failed"
+	fi
+
+	# remove yacc-isms eshewed by modern bisons
+	sed -i -e '/^%type/ s/,//g' -e 's/= {/{/g' src/gram.y
+	assert "fixup of gram.y failed"
+
+	# use mkstemp(3) instead of mktemp(3)
+	epatch ${FILESDIR}/rdist_mkstemp.patch
 }
 
 src_compile() {
-	emake || die "emake failed"
+	# pull in <string.h> so strerror() is defined properly (64-bit bug)
+	emake DEFS_LOCAL=-DNEED_STRING_H YACC='bison -y' || die "emake failed"
 }
 
 src_install() {
 	dodir /usr/bin /usr/share/man/man{1,8}
-	make install BIN_DIR=${D}/usr/bin || die "make install failed"
+	make install \
+		BIN_GROUP=root \
+		BIN_DIR=${D}/usr/bin \
+		|| die "make install failed"
 	make install.man \
+		MAN_GROUP=root \
 		MAN_1_DIR=${D}/usr/share/man/man1 MAN_8_DIR=${D}/usr/share/man/man8 \
 		|| die "make install.man failed"
 }