diff options
author | marino <marino@pkgsrc.org> | 2012-08-22 22:18:23 +0000 |
---|---|---|
committer | marino <marino@pkgsrc.org> | 2012-08-22 22:18:23 +0000 |
commit | 21230d25654de5237f1980faeb3447f4eccb53e1 (patch) | |
tree | 1d2985a14f7ff2071bc8fc845d6bd13fccf5547e /net | |
parent | e2df4b646f4b90718a86c3a006a7420bbe5f094e (diff) | |
download | pkgsrc-21230d25654de5237f1980faeb3447f4eccb53e1.tar.gz |
net/tcl-scotty: Last change no longer needed, revert
The reason tcl-scotty was missing an rpath during the build is because
tclConfig.sh wasn't configured with it. lang/tcl has been updated so
that tclConfig.sh adds the appropriate runpath for the system.
Remove the previously hardcoded "-rpath" to revert the package to be
the way it way.
Diffstat (limited to 'net')
-rw-r--r-- | net/tcl-scotty/Makefile | 4 | ||||
-rw-r--r-- | net/tcl-scotty/distinfo | 4 | ||||
-rw-r--r-- | net/tcl-scotty/patches/patch-ab | 5 |
3 files changed, 6 insertions, 7 deletions
diff --git a/net/tcl-scotty/Makefile b/net/tcl-scotty/Makefile index 852fdc1a203..78ed33f3534 100644 --- a/net/tcl-scotty/Makefile +++ b/net/tcl-scotty/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.26 2012/08/21 21:54:19 marino Exp $ +# $NetBSD: Makefile,v 1.27 2012/08/22 22:18:23 marino Exp $ # DISTNAME= scotty-${DIST_VERS} PKGNAME= tcl-scotty-${DIST_VERS} -PKGREVISION= 6 +PKGREVISION= 7 CATEGORIES= net tcl MASTER_SITES= ftp://ftp.ibr.cs.tu-bs.de/pub/local/tkined/ diff --git a/net/tcl-scotty/distinfo b/net/tcl-scotty/distinfo index ae061fd090c..0459671efa4 100644 --- a/net/tcl-scotty/distinfo +++ b/net/tcl-scotty/distinfo @@ -1,10 +1,10 @@ -$NetBSD: distinfo,v 1.10 2012/08/21 21:54:19 marino Exp $ +$NetBSD: distinfo,v 1.11 2012/08/22 22:18:23 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) = 1f59223ec7557c6175bb3d5c736752aa70b54fce +SHA1 (patch-ab) = a948075a85ace0ab0cd2a0fe10a2a80f15f367dc SHA1 (patch-ac) = bf067f64474dc3ed6306caa468f29a040023e165 SHA1 (patch-ad) = 512d58ca512467b293e1f96d6728e4d5b5839a20 SHA1 (patch-af) = 0db13ef063f641559c3f7c98480ab99b4877451e diff --git a/net/tcl-scotty/patches/patch-ab b/net/tcl-scotty/patches/patch-ab index a807d0ed75d..5a6211dadc3 100644 --- a/net/tcl-scotty/patches/patch-ab +++ b/net/tcl-scotty/patches/patch-ab @@ -1,4 +1,4 @@ -$NetBSD: patch-ab,v 1.6 2012/08/21 21:54:19 marino Exp $ +$NetBSD: patch-ab,v 1.7 2012/08/22 22:18:23 marino Exp $ Put installed files under lib/tcl, so that tcl more easily picks it up using e.g. "package require Tnm". @@ -99,9 +99,8 @@ 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 -rpath ${PREFIX}/lib + $(LD) $(LD_FLAGS) $(LD_SEARCH_FLAGS) -o scotty scotty.o $(TCL_LIB_SPEC) $(LIBS) $(DL_LIBS) -lm -tnm$(SHLIB_SUFFIX): $(TNM_OBJS) - $(SHLIB_LD) $(TNM_OBJS) -o tnm$(SHLIB_SUFFIX) $(LIBS) $(OSIMIS_LIBS) $(MSQL_LIBS) $(GDMO_LIBS) |