- Use -ltcl and -ltk instead of -ltcl83 and -ltk83, which are

  version-dependent.
- Buildlink tcl-scotty.
- Enable pkgviews installation.

4 files changed, 47 insertions, 23 deletions

diff --git a/net/tcl-scotty/buildlink3.mk b/net/tcl-scotty/buildlink3.mk
new file mode 100644
index 00000000000..a79fc22fca3
--- /dev/null
+++ b/net/tcl-scotty/buildlink3.mk
@@ -0,0 +1,20 @@
+# $NetBSD: buildlink3.mk,v 1.1 2004/06/05 04:30:44 minskim Exp $
+
+BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
+TCL_SCOTTY_BUILDLINK3_MK:=	${TCL_SCOTTY_BUILDLINK3_MK}+
+
+.if !empty(BUILDLINK_DEPTH:M+)
+BUILDLINK_DEPENDS+=	tcl-scotty
+.endif
+
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ntcl-scotty}
+BUILDLINK_PACKAGES+=	tcl-scotty
+
+.if !empty(TCL_SCOTTY_BUILDLINK3_MK:M+)
+BUILDLINK_DEPENDS.tcl-scotty+=	tcl-scotty>=2.1.11
+BUILDLINK_PKGSRCDIR.tcl-scotty?=	../../net/tcl-scotty
+.endif	# TCL_SCOTTY_BUILDLINK3_MK
+
+.include "../../lang/tcl/buildlink3.mk"
+
+BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/net/tcl-scotty/distinfo b/net/tcl-scotty/distinfo
index 2de015bf30b..1edeb048681 100644
--- a/net/tcl-scotty/distinfo
+++ b/net/tcl-scotty/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.4 2004/05/13 12:07:48 he Exp $
+$NetBSD: distinfo,v 1.5 2004/06/05 04:30:44 minskim Exp $
 
 SHA1 (scotty-2.1.11.tar.gz) = 819011f908c57e4591d6f50e51677c01eb55dc13
 Size (scotty-2.1.11.tar.gz) = 1381059 bytes
 SHA1 (patch-aa) = 7d35e18fa738d6be6b627774f072c1f68200edd4
-SHA1 (patch-ab) = f789d464c73a830453b1ea43bfb8bad93b5c3e7e
+SHA1 (patch-ab) = 19cfe3674601e639095cd26605684114a40c6aac
 SHA1 (patch-ac) = 5414110cb56026e77dc96316e33ee07d1331b85f
 SHA1 (patch-ad) = 64c2f53c0eb0e32af144ec6c4e2b0f55edc9b60a
 SHA1 (patch-af) = 8915bfd1912e9255e39d2c3b5b49e0b5c518bb9c
diff --git a/net/tcl-scotty/patches/patch-ab b/net/tcl-scotty/patches/patch-ab
index f702e1db07e..203a93dbbef 100644
--- a/net/tcl-scotty/patches/patch-ab
+++ b/net/tcl-scotty/patches/patch-ab
@@ -1,7 +1,8 @@
-$NetBSD: patch-ab,v 1.1.1.1 2000/09/07 17:38:46 jwise Exp $
---- Makefile.in.orig	Mon Sep  7 13:12:57 1998
-+++ Makefile.in	Thu Sep  7 12:10:37 2000
-@@ -35,13 +35,13 @@
+$NetBSD: patch-ab,v 1.2 2004/06/05 04:30:44 minskim Exp $
+
+--- Makefile.in.orig	2001-06-15 05:06:35.000000000 -0500
++++ Makefile.in
+@@ -35,13 +35,13 @@ LIB_INSTALL_DIR =       $(exec_prefix)/l
  LIB_RUNTIME_DIR =       $(exec_prefix)/lib
  
  # Directory in which to install library files belonging to the extension.
@@ -17,7 +18,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2000/09/07 17:38:46 jwise Exp $
  
  # Top-level directory for manual entries:
  MAN_INSTALL_DIR =	$(prefix)/man
-@@ -82,7 +82,7 @@
+@@ -82,7 +82,7 @@ TCL_EXEC_PREFIX=@TCL_EXEC_PREFIX@
  
  # The full name of the tclsh executable (including the full path
  # and the Tcl version number).
@@ -26,7 +27,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2000/09/07 17:38:46 jwise Exp $
  
  # Top-level directory in which Tk's platform-specific files (e.g.
  # executables) are installed.
-@@ -90,7 +90,7 @@
+@@ -90,7 +90,7 @@ TK_EXEC_PREFIX=@TK_EXEC_PREFIX@
  
  # The full name of the wish executable (including the full path
  # and the Tk version number).
@@ -35,7 +36,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2000/09/07 17:38:46 jwise Exp $
  
  # A "-I" switch that can be used when compiling to make all the
  # Tcl include files accessible (the configure script will try to
-@@ -207,8 +207,8 @@
+@@ -207,8 +207,8 @@ LD_SEARCH_FLAGS = @LD_SEARCH_FLAGS@
  #----------------------------------------------------------------
  
  INSTALL =		@INSTALL@
@@ -46,7 +47,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2000/09/07 17:38:46 jwise Exp $
  RPCGEN =		@RPCGEN@
  LEX =			@LEX@
  YACC =			@YACC@
-@@ -244,8 +244,8 @@
+@@ -244,8 +244,8 @@ TKI_LIBRARY_DIR =	$(TKI_DIR)/library
  # either.
  #----------------------------------------------------------------
  
@@ -57,7 +58,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2000/09/07 17:38:46 jwise Exp $
  
  CC_SWITCHES	= $(CFLAGS) $(PROTO_FLAGS) $(SHLIB_CFLAGS) $(MEM_DEBUG_FLAGS)
  
-@@ -261,13 +261,14 @@
+@@ -261,13 +261,14 @@ TNM_GENERIC_SRCS = $(TNM_GENERIC_DIR)/tn
  		$(TNM_GENERIC_DIR)/tnmHttp.c $(TNM_GENERIC_DIR)/tnmNetdb.c \
  		$(UNIX_DIR)/tnmUnixInit.c $(UNIX_DIR)/tnmUnixLog.c \
  		$(UNIX_DIR)/tnmUnixSocket.c $(UNIX_DIR)/tnmUnixIcmp.c
@@ -74,7 +75,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2000/09/07 17:38:46 jwise Exp $
  
  SNMP_SRCS =	$(TNM_SNMP_DIR)/tnmAsn1.c $(TNM_SNMP_DIR)/tnmMD5.c \
  		$(TNM_SNMP_DIR)/tnmSnmpNet.c $(TNM_SNMP_DIR)/tnmSnmpUtil.c \
-@@ -406,21 +407,23 @@
+@@ -406,21 +407,23 @@ TKI_OBJS =	$(TKI_GENERIC_OBJS)
  
  all: @TARGET@
  
@@ -100,11 +101,11 @@ $NetBSD: patch-ab,v 1.1.1.1 2000/09/07 17:38:46 jwise Exp $
 -	$(SHLIB_LD) $(TKI_GENERIC_OBJS) -o tkined$(SHLIB_SUFFIX) $(LIBS)
 +libtkined$(SHLIB_SUFFIX): $(TKI_OBJS)
 +	${LIBTOOL} --mode=link @CC@ $(TKI_OBJS:.o=.lo) -o libtkined${SHLIB_SUFFIX:C/\.so.*/.la/} \
-+		-Wl,-R${PREFIX}/lib -Wl,-R${X11BASE}/lib -L${PREFIX}/lib -L${X11BASE}/lib $(LIBS) -ltnm -ltk83 -ltcl83 -lX11 -lm -rpath ${PREFIX}/lib:${X11BASE}/lib -version-info 1:0
++		-Wl,-R${PREFIX}/lib -Wl,-R${X11BASE}/lib -L${PREFIX}/lib -L${X11BASE}/lib $(LIBS) -ltnm -ltk -ltcl -lX11 -lm -rpath ${PREFIX}/lib:${X11BASE}/lib -version-info 1:0
  
  test:
  	@echo
-@@ -495,7 +498,7 @@
+@@ -495,7 +498,7 @@ install-man:
  	    chmod 444 $(MANN_INSTALL_DIR)/$$i; \
  	    done;
  
@@ -113,7 +114,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2000/09/07 17:38:46 jwise Exp $
  	@for i in $(BIN_INSTALL_DIR) $(LIB_RUNTIME_DIR) $(TNM_INSTALL_DIR) ; \
  	    do \
  	    if [ ! -d $$i ] ; then \
-@@ -505,11 +508,10 @@
+@@ -505,11 +508,10 @@ tnm-install-bin: scotty tnm$(SHLIB_SUFFI
  		else true; \
  		fi; \
  	    done;
@@ -128,7 +129,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2000/09/07 17:38:46 jwise Exp $
  
  tnm-install-mibs:
  	@for i in $(TNM_INSTALL_DIR)/mibs ; \
-@@ -597,7 +599,7 @@
+@@ -597,7 +599,7 @@ tnm-install-agents:
  	    $(INSTALL_DATA) $$i $(TNM_INSTALL_DIR)/agents; \
  	    done
  
@@ -137,7 +138,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2000/09/07 17:38:46 jwise Exp $
  	@for i in $(BIN_INSTALL_DIR) $(LIB_RUNTIME_DIR) $(TKI_INSTALL_DIR) ; \
  	    do \
  	    if [ ! -d $$i ] ; then \
-@@ -607,11 +609,10 @@
+@@ -607,11 +609,10 @@ tki-install-bin: tkined tkined$(SHLIB_SU
  		else true; \
  		fi; \
  	    done;
@@ -153,7 +154,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2000/09/07 17:38:46 jwise Exp $
  	@$(INSTALL_DATA) $(TKI_DIR)/tkined.defaults $(TKI_INSTALL_DIR)
  
  tki-install-library:
-@@ -696,9 +697,9 @@
+@@ -696,9 +697,9 @@ sinstall: ntping straps
  uninstall: tnm-uninstall uninstall-man tki-uninstall
  
  tnm-uninstall:
@@ -165,7 +166,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2000/09/07 17:38:46 jwise Exp $
  	@for i in $(LIB_INSTALL_DIR)/tnm$(TNM_VERSION)/* ; \
  	    do \
  	    if [ "`basename $$i`" != "site" ] ; then \
-@@ -713,9 +714,9 @@
+@@ -713,9 +714,9 @@ tnm-uninstall:
  	    fi
  
  tki-uninstall:
@@ -177,7 +178,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2000/09/07 17:38:46 jwise Exp $
  	@for i in $(LIB_INSTALL_DIR)/tkined$(TKI_VERSION)/* ; \
  	    do \
  	    if [ "`basename $$i`" != "site" ] ; then \
-@@ -750,7 +751,7 @@
+@@ -750,7 +751,7 @@ clean:
  	@rm -f $(TNM_OBJS) $(TKI_OBJS) scotty.o ntping.o straps.o
  	@rm -f tnmGdmoScan.c tnmGdmoParser.c tnmGdmoParser.h
  	@rm -f scotty ntping straps tkined
@@ -186,7 +187,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2000/09/07 17:38:46 jwise Exp $
  	@rm -f core *_svc.c *~ *.bak so_locations lmake.???
  	@rm -f map.so tnmMap.o tnmMapUtil.o 
  	@rm -f tnmMapNode.o tnmMapClnt.o tnmMapAppl.o
-@@ -821,8 +822,8 @@
+@@ -821,8 +822,8 @@ BIN_FILES =	$(BIN_INSTALL_DIR)/tkined$(T
  		$(MAN8_INSTALL_DIR)/straps.8 \
  		$(BIN_INSTALL_DIR)/ntping \
  		$(MAN8_INSTALL_DIR)/ntping.8 \
diff --git a/net/tkined/Makefile b/net/tkined/Makefile
index 10707762a4a..442272b48f5 100644
--- a/net/tkined/Makefile
+++ b/net/tkined/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2004/06/05 04:10:21 minskim Exp $
+# $NetBSD: Makefile,v 1.12 2004/06/05 04:30:44 minskim Exp $
 #
 
 DISTNAME=	scotty-2.1.11
@@ -11,7 +11,7 @@ MAINTAINER=	jwise@NetBSD.org
 HOMEPAGE=	http://wwwhome.cs.utwente.nl/~schoenw/scotty/
 COMMENT=	Graphical network discovery and monitoring tool based on scotty
 
-DEPENDS+=	tcl-scotty>=2.1.11:../../net/tcl-scotty
+PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/unix
 USE_BUILDLINK3=	yes
@@ -27,6 +27,9 @@ DISTINFO_FILE=	${.CURDIR}/../../net/tcl-scotty/distinfo
 FILESDIR=	${.CURDIR}/../../net/tcl-scotty/files
 PATCHDIR=	${.CURDIR}/../../net/tcl-scotty/patches
 
+INSTALLATION_DIRS=	man/man1
+
+.include "../../net/tcl-scotty/buildlink3.mk"
 .include "../../x11/tk/buildlink3.mk"
 
 do-install: