Closing #50954.

5 files changed, 125 insertions, 12 deletions

diff --git a/app-admin/scotty/ChangeLog b/app-admin/scotty/ChangeLog
index a2a2b8611311..a59053734839 100644
--- a/app-admin/scotty/ChangeLog
+++ b/app-admin/scotty/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-admin/scotty
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/scotty/ChangeLog,v 1.6 2005/01/01 11:24:24 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/scotty/ChangeLog,v 1.7 2005/01/01 21:05:25 aliz Exp $
+
+  01 Jan 2005; Daniel Ahlberg <aliz@gentoo.org> scotty-2.1.11.ebuild,
+  files/scotty-2.1.11-Makefile.patch, files/scotty-2.1.11-suse.patch:
+  Various fixes, closing #50954.
 
   06 Jun 2004; Daniel Black <dragonheart@gentoo.org> +metadata.xml,
   scotty-2.1.11.ebuild:
diff --git a/app-admin/scotty/Manifest b/app-admin/scotty/Manifest
index aa438135afa3..76b9312cbe43 100644
--- a/app-admin/scotty/Manifest
+++ b/app-admin/scotty/Manifest
@@ -1,4 +1,6 @@
-MD5 69b8ca1d74d9db37065151a2656e41bb ChangeLog 697
+MD5 c7c1ae0db5e9d904ab2111604b7ed841 scotty-2.1.11.ebuild 1512
+MD5 18c443ed19487f9b3990565b59d37683 ChangeLog 865
 MD5 1652522405f5936eb29776ef8d5ffa5b metadata.xml 310
-MD5 972d1a53e1bf7a257788b3064ef7ab07 scotty-2.1.11.ebuild 1279
+MD5 bd297ad6fa62c6121eec4359dea16f5d files/scotty-2.1.11-suse.patch 1392
+MD5 5e31a17e51acbdffe1180406519de4b1 files/scotty-2.1.11-Makefile.patch 1892
 MD5 65153a5ddbadbafaa1814c82f5c2d563 files/digest-scotty-2.1.11 66
diff --git a/app-admin/scotty/files/scotty-2.1.11-Makefile.patch b/app-admin/scotty/files/scotty-2.1.11-Makefile.patch
new file mode 100644
index 000000000000..7f1fb6da1401
--- /dev/null
+++ b/app-admin/scotty/files/scotty-2.1.11-Makefile.patch
@@ -0,0 +1,47 @@
+--- unix/Makefile.in	2001-06-15 10:06:35.000000000 +0000
++++ unix/Makefile.in	2005-01-01 20:57:04.365251179 +0000
+@@ -26,34 +26,34 @@
+ exec_prefix =	@exec_prefix@
+ 
+ # Directory in which to install the program scotty:
+-BIN_INSTALL_DIR =	$(exec_prefix)/bin
++BIN_INSTALL_DIR =	$(DESTDIR)$(exec_prefix)/bin
+ 
+ # Directory in which to install dynamic loadable modules:
+-LIB_INSTALL_DIR =       $(exec_prefix)/lib
++LIB_INSTALL_DIR =       $(DESTDIR)$(exec_prefix)/lib
+ 
+ # Directory in which dynamic loadable modules are installed:
+-LIB_RUNTIME_DIR =       $(exec_prefix)/lib
++LIB_RUNTIME_DIR =       $(DESTDIR)$(exec_prefix)/lib
+ 
+ # Directory in which to install library files belonging to the extension.
+-TNM_INSTALL_DIR =	$(prefix)/lib/tnm$(TNM_VERSION)
++TNM_INSTALL_DIR =	$(DESTDIR)$(prefix)/lib/tnm$(TNM_VERSION)
+ 
+ # Directory in which to install library files belonging to the extension.
+-TCL_INSTALL_DIR =	$(prefix)/lib/tcl$(TCL_VERSION)
++TCL_INSTALL_DIR =	$(DESTDIR)$(prefix)/lib/tcl$(TCL_VERSION)
+ 
+ # Directory in which to install the library of tkined scripts.
+-TKI_INSTALL_DIR =	$(prefix)/lib/tkined$(TKI_VERSION)
++TKI_INSTALL_DIR =	$(DESTDIR)$(prefix)/lib/tkined$(TKI_VERSION)
+ 
+ # Top-level directory for manual entries:
+-MAN_INSTALL_DIR =	$(prefix)/man
++MAN_INSTALL_DIR =	$(DESTDIR)$(prefix)/man
+ 
+ # Directory in which to install the manual entries:
+-MAN1_INSTALL_DIR =	$(MAN_INSTALL_DIR)/man1
++MAN1_INSTALL_DIR =	$(DESTDIR)$(MAN_INSTALL_DIR)/man1
+ 
+ # Directory in which to install manual entry for straps:
+-MAN8_INSTALL_DIR =	$(MAN_INSTALL_DIR)/man8
++MAN8_INSTALL_DIR =	$(DESTDIR)$(MAN_INSTALL_DIR)/man8
+ 
+ # Directory in which to install manual entry for msqltcl, cmiptcl:
+-MANN_INSTALL_DIR =	$(MAN_INSTALL_DIR)/mann
++MANN_INSTALL_DIR =	$(DESTDIR)$(MAN_INSTALL_DIR)/mann
+ 
+ # To change the compiler switches, for example to change from -O
+ # to -g, change the following line:
diff --git a/app-admin/scotty/files/scotty-2.1.11-suse.patch b/app-admin/scotty/files/scotty-2.1.11-suse.patch
new file mode 100644
index 000000000000..9686e9fba16f
--- /dev/null
+++ b/app-admin/scotty/files/scotty-2.1.11-suse.patch
@@ -0,0 +1,47 @@
+--- tnm/generic/tnmInt.h
++++ tnm/generic/tnmInt.h
+@@ -36,7 +36,10 @@
+ #define TnmGetTime TclpGetTime
+ #endif
+ 
++#if TCL_MAJOR_VERSION < 8 || TCL_MAJOR_VERSION == 8 && TCL_MINOR_VERSION < 4
+ #define TnmCreateDirectory	TclpCreateDirectory
++#endif
++
+ #if TCL_MAJOR_VERSION == 8 && TCL_MINOR_VERSION == 8 && TCL_RELEASE_SERIAL > 2 
+ #define TnmStat			TclStat
+ #else
+--- tnm/generic/tnmUtil.c
++++ tnm/generic/tnmUtil.c
+@@ -12,6 +12,18 @@
+ #include "tnmInt.h"
+ #include "tnmPort.h"
+ 
++#if TCL_MAJOR_VERSION == 8 && TCL_MINOR_VERSION >= 4 || TCL_MAJOR_VERSION > 8
++int TnmCreateDirectory(char *path)
++{
++	Tcl_Obj *o;
++	int res;
++	o = Tcl_NewStringObj(path, -1);
++	Tcl_IncrRefCount(o);
++        res = Tcl_FSCreateDirectory(o);
++	Tcl_DecrRefCount(o);
++	return res;
++}
++#endif
+ 
+ /*
+  *----------------------------------------------------------------------
+--- unix/configure.in
++++ unix/configure.in
+@@ -251,8 +251,8 @@
+ AC_CHECK_LIB(ieee, main, [LIBS="$LIBS -lieee"])
+ AC_CHECK_LIB(rpc, main, [LIBS="$LIBS -lrpc"])
+ AC_CHECK_LIB(rpcsvc, main, [LIBS="$LIBS -lrpcsvc"])
+-AC_CHECK_FUNC(res_mkquery, ,
+-	AC_CHECK_LIB(resolv, res_mkquery, [LIBS="$LIBS -lresolv"]))
++AC_CHECK_FUNC(__res_mkquery, ,
++	AC_CHECK_LIB(resolv, __res_mkquery, [LIBS="$LIBS -lresolv"]))
+ 
+ #----------------------------------------------------------------------------
+ #	Checks for various include files missing on some machines.
diff --git a/app-admin/scotty/scotty-2.1.11.ebuild b/app-admin/scotty/scotty-2.1.11.ebuild
index cb2a2a3c3191..dd82f409c699 100644
--- a/app-admin/scotty/scotty-2.1.11.ebuild
+++ b/app-admin/scotty/scotty-2.1.11.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/scotty/scotty-2.1.11.ebuild,v 1.9 2005/01/01 11:24:24 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/scotty/scotty-2.1.11.ebuild,v 1.10 2005/01/01 21:05:25 aliz Exp $
+
+inherit eutils
 
 DESCRIPTION="tcl network management extension"
 HOMEPAGE="http://wwwhome.cs.utwente.nl/~schoenw/scotty"
@@ -8,7 +10,7 @@ SRC_URI="ftp://ftp.ibr.cs.tu-bs.de/pub/local/tkined/${P}.tar.gz"
 
 LICENSE="GPL-2 LGPL-2"
 SLOT="0"
-KEYWORDS="x86 alpha"
+KEYWORDS="x86 alpha ~amd64"
 IUSE=""
 
 DEPEND="virtual/libc
@@ -16,22 +18,33 @@ DEPEND="virtual/libc
 	sys-devel/bison
 	dev-lang/perl
 	dev-lang/tcl
-	dev-lang/tk"
+	dev-lang/tk
+	sys-devel/autoconf"
+
+src_unpack() {
+	unpack ${A} ; cd ${S}
+
+	epatch ${FILESDIR}/${P}-suse.patch
+	epatch ${FILESDIR}/${P}-Makefile.patch
+
+	cd ${S}/unix ; autoconf
+}
 
 src_compile() {
 	cd ${S}/unix
 	econf || die
-	make || die
+	make "CFLAGS=${CFLAGS}" || die
 }
 
 src_install() {
 	cd ${S}/unix
 	dodir /usr/share/man
-	TNM_LIBRARY=${D}/usr/lib/tnm${V} \
-		make prefix=${D}/usr \
-		MAN_INSTALL_DIR=${D}/usr/share/man install
-	make prefix=${D}/usr \
-		MAN_INSTALL_DIR=${D}/usr/share/man sinstall
+#	TNM_LIBRARY=${D}/usr/lib/tnm${V} \
+#		make prefix=${D}/usr \
+#		MAN_INSTALL_DIR=${D}/usr/share/man install
+#	make prefix=${D}/usr \
+#		MAN_INSTALL_DIR=${D}/usr/share/man sinstall
+	make DESTDIR=${D} install
 	cd ${D}/usr/bin
 	perl -p -i -e 's|/.*/image||' ${D}/usr/lib/tnm2.1.11/pkgIndex.tcl
 	perl -p -i -e 's|/.*/image||' ${D}/usr/lib/tkined1.4.11/pkgIndex.tcl