diff options
author | veego <veego@pkgsrc.org> | 2005-05-16 17:04:03 +0000 |
---|---|---|
committer | veego <veego@pkgsrc.org> | 2005-05-16 17:04:03 +0000 |
commit | e57db3afa26641d36cddb5548ff145b21e377db6 (patch) | |
tree | 0b49ac645ee9cdeb4be4fa0ce56757aeb627ab84 /net | |
parent | 2c8bb3deeb5e5928f01ecbd2a7d120732cd3db64 (diff) | |
download | pkgsrc-e57db3afa26641d36cddb5548ff145b21e377db6.tar.gz |
Don't initialize $(LD_SEARCH_FLAGS), which is used in the $(LD) link command.
Inspired by an patch from agc to tk83. Thx to krister for pointing that out
to me.
fix PR pkg/30241
Diffstat (limited to 'net')
-rw-r--r-- | net/tcl-scotty/distinfo | 4 | ||||
-rw-r--r-- | net/tcl-scotty/patches/patch-ab | 47 |
2 files changed, 30 insertions, 21 deletions
diff --git a/net/tcl-scotty/distinfo b/net/tcl-scotty/distinfo index ab75143bac7..541f6ed8cfa 100644 --- a/net/tcl-scotty/distinfo +++ b/net/tcl-scotty/distinfo @@ -1,10 +1,10 @@ -$NetBSD: distinfo,v 1.7 2005/02/24 12:14:04 agc Exp $ +$NetBSD: distinfo,v 1.8 2005/05/16 17:04:03 veego 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) = 7d35e18fa738d6be6b627774f072c1f68200edd4 -SHA1 (patch-ab) = 19cfe3674601e639095cd26605684114a40c6aac +SHA1 (patch-ab) = 4edfac2aabaaf32537fc332b1e0c7f08959c6575 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 203a93dbbef..fd09748e9a0 100644 --- a/net/tcl-scotty/patches/patch-ab +++ b/net/tcl-scotty/patches/patch-ab @@ -1,8 +1,6 @@ -$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 +--- Makefile.in.orig 2001-06-15 12:06:35.000000000 +0200 ++++ Makefile.in 2005-05-16 18:28:53.000000000 +0200 +@@ -35,13 +35,13 @@ LIB_RUNTIME_DIR = $(exec_prefix)/lib # Directory in which to install library files belonging to the extension. @@ -18,7 +16,7 @@ $NetBSD: patch-ab,v 1.2 2004/06/05 04:30:44 minskim Exp $ # Top-level directory for manual entries: MAN_INSTALL_DIR = $(prefix)/man -@@ -82,7 +82,7 @@ TCL_EXEC_PREFIX=@TCL_EXEC_PREFIX@ +@@ -82,7 +82,7 @@ # The full name of the tclsh executable (including the full path # and the Tcl version number). @@ -27,7 +25,7 @@ $NetBSD: patch-ab,v 1.2 2004/06/05 04:30:44 minskim Exp $ # Top-level directory in which Tk's platform-specific files (e.g. # executables) are installed. -@@ -90,7 +90,7 @@ TK_EXEC_PREFIX=@TK_EXEC_PREFIX@ +@@ -90,7 +90,7 @@ # The full name of the wish executable (including the full path # and the Tk version number). @@ -36,7 +34,18 @@ $NetBSD: patch-ab,v 1.2 2004/06/05 04:30:44 minskim 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 @@ LD_SEARCH_FLAGS = @LD_SEARCH_FLAGS@ +@@ -197,8 +197,8 @@ + + # Flags to pass to the compiler to tell the run-time dynamic linker + # where to look for shared libraries. +-LD_SEARCH_FLAGS = @LD_SEARCH_FLAGS@ +-#LD_SEARCH_FLAGS = ++#LD_SEARCH_FLAGS = @LD_SEARCH_FLAGS@ ++LD_SEARCH_FLAGS = + + #---------------------------------------------------------------- + # The information below is modified by the configure script when +@@ -207,8 +207,8 @@ #---------------------------------------------------------------- INSTALL = @INSTALL@ @@ -47,7 +56,7 @@ $NetBSD: patch-ab,v 1.2 2004/06/05 04:30:44 minskim Exp $ RPCGEN = @RPCGEN@ LEX = @LEX@ YACC = @YACC@ -@@ -244,8 +244,8 @@ TKI_LIBRARY_DIR = $(TKI_DIR)/library +@@ -244,8 +244,8 @@ # either. #---------------------------------------------------------------- @@ -58,7 +67,7 @@ $NetBSD: patch-ab,v 1.2 2004/06/05 04:30:44 minskim Exp $ CC_SWITCHES = $(CFLAGS) $(PROTO_FLAGS) $(SHLIB_CFLAGS) $(MEM_DEBUG_FLAGS) -@@ -261,13 +261,14 @@ TNM_GENERIC_SRCS = $(TNM_GENERIC_DIR)/tn +@@ -261,13 +261,14 @@ $(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 @@ -75,7 +84,7 @@ $NetBSD: patch-ab,v 1.2 2004/06/05 04:30:44 minskim 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 @@ TKI_OBJS = $(TKI_GENERIC_OBJS) +@@ -406,21 +407,23 @@ all: @TARGET@ @@ -105,7 +114,7 @@ $NetBSD: patch-ab,v 1.2 2004/06/05 04:30:44 minskim Exp $ test: @echo -@@ -495,7 +498,7 @@ install-man: +@@ -495,7 +498,7 @@ chmod 444 $(MANN_INSTALL_DIR)/$$i; \ done; @@ -114,7 +123,7 @@ $NetBSD: patch-ab,v 1.2 2004/06/05 04:30:44 minskim Exp $ @for i in $(BIN_INSTALL_DIR) $(LIB_RUNTIME_DIR) $(TNM_INSTALL_DIR) ; \ do \ if [ ! -d $$i ] ; then \ -@@ -505,11 +508,10 @@ tnm-install-bin: scotty tnm$(SHLIB_SUFFI +@@ -505,11 +508,10 @@ else true; \ fi; \ done; @@ -129,7 +138,7 @@ $NetBSD: patch-ab,v 1.2 2004/06/05 04:30:44 minskim Exp $ tnm-install-mibs: @for i in $(TNM_INSTALL_DIR)/mibs ; \ -@@ -597,7 +599,7 @@ tnm-install-agents: +@@ -597,7 +599,7 @@ $(INSTALL_DATA) $$i $(TNM_INSTALL_DIR)/agents; \ done @@ -138,7 +147,7 @@ $NetBSD: patch-ab,v 1.2 2004/06/05 04:30:44 minskim Exp $ @for i in $(BIN_INSTALL_DIR) $(LIB_RUNTIME_DIR) $(TKI_INSTALL_DIR) ; \ do \ if [ ! -d $$i ] ; then \ -@@ -607,11 +609,10 @@ tki-install-bin: tkined tkined$(SHLIB_SU +@@ -607,11 +609,10 @@ else true; \ fi; \ done; @@ -154,7 +163,7 @@ $NetBSD: patch-ab,v 1.2 2004/06/05 04:30:44 minskim Exp $ @$(INSTALL_DATA) $(TKI_DIR)/tkined.defaults $(TKI_INSTALL_DIR) tki-install-library: -@@ -696,9 +697,9 @@ sinstall: ntping straps +@@ -696,9 +697,9 @@ uninstall: tnm-uninstall uninstall-man tki-uninstall tnm-uninstall: @@ -166,7 +175,7 @@ $NetBSD: patch-ab,v 1.2 2004/06/05 04:30:44 minskim Exp $ @for i in $(LIB_INSTALL_DIR)/tnm$(TNM_VERSION)/* ; \ do \ if [ "`basename $$i`" != "site" ] ; then \ -@@ -713,9 +714,9 @@ tnm-uninstall: +@@ -713,9 +714,9 @@ fi tki-uninstall: @@ -178,7 +187,7 @@ $NetBSD: patch-ab,v 1.2 2004/06/05 04:30:44 minskim Exp $ @for i in $(LIB_INSTALL_DIR)/tkined$(TKI_VERSION)/* ; \ do \ if [ "`basename $$i`" != "site" ] ; then \ -@@ -750,7 +751,7 @@ clean: +@@ -750,7 +751,7 @@ @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 @@ -187,7 +196,7 @@ $NetBSD: patch-ab,v 1.2 2004/06/05 04:30:44 minskim 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 @@ BIN_FILES = $(BIN_INSTALL_DIR)/tkined$(T +@@ -821,8 +822,8 @@ $(MAN8_INSTALL_DIR)/straps.8 \ $(BIN_INSTALL_DIR)/ntping \ $(MAN8_INSTALL_DIR)/ntping.8 \ |