net/tcl-scotty: Insert rpath into libtnm.so

This is not a tcl/tk 8.5 fix.  The libtnm.so couldn't be found during the
build due to an omitted runpath.  Two other patches were regenerated
because they didn't match the source exactly.

5 files changed, 20 insertions, 22 deletions

diff --git a/net/tcl-scotty/Makefile b/net/tcl-scotty/Makefile
index 22504f0b7bf..852fdc1a203 100644
--- a/net/tcl-scotty/Makefile
+++ b/net/tcl-scotty/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.25 2011/09/02 08:06:55 he Exp $
+# $NetBSD: Makefile,v 1.26 2012/08/21 21:54:19 marino Exp $
 #
 
 DISTNAME=	scotty-${DIST_VERS}
 PKGNAME=	tcl-scotty-${DIST_VERS}
-PKGREVISION=	5
+PKGREVISION=	6
 CATEGORIES=	net tcl
 MASTER_SITES=	ftp://ftp.ibr.cs.tu-bs.de/pub/local/tkined/
 
@@ -13,8 +13,6 @@ COMMENT=	Network management extensions to TCL
 
 LICENSE=	2-clause-bsd
 
-BUILDLINK_API_DEPENDS.tcl+=	tcl>=8.4.6nb4
-
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 PKG_DESTDIR_SUPPORT= destdir
 
@@ -34,8 +32,6 @@ USE_TOOLS+=	lex yacc
 
 INSTALL_TARGET= tnm-install install-man sinstall
 
-.include "../../lang/tcl/buildlink3.mk"
-
 post-extract:
 	cd ${WRKSRC}/${BUILD_DIRS} && ${RM} -f ../doc/http.n
 	cd ${WRKSRC}/${BUILD_DIRS} && ${RM} -f ../doc/tkined.1
@@ -49,4 +45,5 @@ post-install:
 		sed -e 's:${DESTDIR}/::' <pkgIndex.tcl >pkgIndex.tcl.new; \
 		rm -f pkgIndex.tcl; mv pkgIndex.tcl.new pkgIndex.tcl
 
+.include "../../lang/tcl/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/tcl-scotty/distinfo b/net/tcl-scotty/distinfo
index 92107e8b56a..ae061fd090c 100644
--- a/net/tcl-scotty/distinfo
+++ b/net/tcl-scotty/distinfo
@@ -1,12 +1,12 @@
-$NetBSD: distinfo,v 1.9 2011/09/02 08:06:55 he Exp $
+$NetBSD: distinfo,v 1.10 2012/08/21 21:54:19 marino Exp $
 
 SHA1 (scotty-2.1.11.tar.gz) = 819011f908c57e4591d6f50e51677c01eb55dc13
 RMD160 (scotty-2.1.11.tar.gz) = 3b4d45f3db73f05b49a46017bf2ffed6d6464b00
 Size (scotty-2.1.11.tar.gz) = 1381059 bytes
 SHA1 (patch-aa) = 6d2b4b522ba802d07c0bc8346330070ae7e0edea
-SHA1 (patch-ab) = a948075a85ace0ab0cd2a0fe10a2a80f15f367dc
+SHA1 (patch-ab) = 1f59223ec7557c6175bb3d5c736752aa70b54fce
 SHA1 (patch-ac) = bf067f64474dc3ed6306caa468f29a040023e165
-SHA1 (patch-ad) = 7823f5deab60b7979c87c3a000ac638bf7bb7924
+SHA1 (patch-ad) = 512d58ca512467b293e1f96d6728e4d5b5839a20
 SHA1 (patch-af) = 0db13ef063f641559c3f7c98480ab99b4877451e
-SHA1 (patch-ag) = 407aa9ab0276a4fe6afd0c522667e0a80008a7be
+SHA1 (patch-ag) = fb115d88369b45f43da1b906ee8aefde9db96ab2
 SHA1 (patch-ah) = 327f9a0dae60ceacc039e288946114e0bbdbebde
diff --git a/net/tcl-scotty/patches/patch-ab b/net/tcl-scotty/patches/patch-ab
index 1236729e70a..a807d0ed75d 100644
--- a/net/tcl-scotty/patches/patch-ab
+++ b/net/tcl-scotty/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.5 2011/09/02 08:06:55 he Exp $
+$NetBSD: patch-ab,v 1.6 2012/08/21 21:54:19 marino Exp $
 
 Put installed files under lib/tcl, so that tcl more easily picks it
 up using e.g. "package require Tnm".
@@ -99,8 +99,9 @@ since that's not used in pkgsrc.
  all: @TARGET@
  
 -scotty: tnm$(SHLIB_SUFFIX) ntping straps scotty.o
+-	$(LD) $(LD_FLAGS) $(LD_SEARCH_FLAGS) -o scotty scotty.o $(TCL_LIB_SPEC) $(LIBS) $(DL_LIBS) -lm
 +scotty: libtnm$(SHLIB_SUFFIX) ntping straps scotty.o
- 	$(LD) $(LD_FLAGS) $(LD_SEARCH_FLAGS) -o scotty scotty.o $(TCL_LIB_SPEC) $(LIBS) $(DL_LIBS) -lm
++	$(LD) $(LD_FLAGS) $(LD_SEARCH_FLAGS) -o scotty scotty.o $(TCL_LIB_SPEC) $(LIBS) $(DL_LIBS) -lm -rpath ${PREFIX}/lib
  
 -tnm$(SHLIB_SUFFIX): $(TNM_OBJS)
 -	$(SHLIB_LD) $(TNM_OBJS) -o tnm$(SHLIB_SUFFIX) $(LIBS) $(OSIMIS_LIBS) $(MSQL_LIBS) $(GDMO_LIBS)
diff --git a/net/tcl-scotty/patches/patch-ad b/net/tcl-scotty/patches/patch-ad
index 77df065e8ca..566711d6c02 100644
--- a/net/tcl-scotty/patches/patch-ad
+++ b/net/tcl-scotty/patches/patch-ad
@@ -1,10 +1,10 @@
-$NetBSD: patch-ad,v 1.3 2011/09/02 08:06:55 he Exp $
+$NetBSD: patch-ad,v 1.4 2012/08/21 21:54:19 marino Exp $
 
 Don't try to include OS version in directory name for mib files.
 
---- tnm/generic/tnmInit.c.orig	Mon Jan 26 16:35:26 1998
-+++ tnm/generic/tnmInit.c	Wed Jan 24 19:09:20 2001
-@@ -83,15 +83,12 @@
+--- tnm/generic/tnmInit.c.orig	1999-03-05 22:32:26.000000000 +0000
++++ tnm/generic/tnmInit.c
+@@ -106,15 +106,12 @@ InitVars(interp)
  
      machine = Tcl_GetVar2(interp, "tcl_platform", "machine", TCL_GLOBAL_ONLY);
      os = Tcl_GetVar2(interp, "tcl_platform", "os", TCL_GLOBAL_ONLY);
diff --git a/net/tcl-scotty/patches/patch-ag b/net/tcl-scotty/patches/patch-ag
index 7b1f9c680cf..67ae9e1a666 100644
--- a/net/tcl-scotty/patches/patch-ag
+++ b/net/tcl-scotty/patches/patch-ag
@@ -1,8 +1,8 @@
-$NetBSD: patch-ag,v 1.2 2011/09/02 08:06:55 he Exp $
+$NetBSD: patch-ag,v 1.3 2012/08/21 21:54:19 marino Exp $
 
 Provide more robustness for the straps helper program.
 
---- tnm/snmp/straps.c.orig	Tue Mar  9 18:06:10 1999
+--- tnm/snmp/straps.c.orig	1999-03-09 17:06:10.000000000 +0000
 +++ tnm/snmp/straps.c
 @@ -246,6 +246,17 @@ main(argc, argv)
  #endif
@@ -49,11 +49,10 @@ Provide more robustness for the straps helper program.
  	      /* read trap message and forward to clients: */
  	      llen = sizeof(laddr);
  	      if ((rc = recvfrom(trap_s, buf, sizeof(buf), 0, 
-@@ -328,24 +357,6 @@ main(argc, argv)
- 	      for (go_on = 0, i = 0; i < FD_SETSIZE; i++) {
+@@ -329,24 +358,6 @@ main(argc, argv)
  		  go_on += cl_addr [i] > 0;
  	      }
--
+ 
 -	  } else if (FD_ISSET(serv_s, &fds)) {
 -	      memset((char *) &daddr, 0, sizeof(daddr));
 -	      dlen = sizeof(daddr);
@@ -71,6 +70,7 @@ Provide more robustness for the straps helper program.
 -		  continue;
 -	      }
 -	      cl_addr [rc] = 1;
- 
+-
  	  } else {
  	      /* fd's connected from clients. (XXX: should check for EOF): */
+ 	      for (i = 0; i < FD_SETSIZE; i++) {