diff options
author | kristerw <kristerw@pkgsrc.org> | 2004-01-12 21:50:07 +0000 |
---|---|---|
committer | kristerw <kristerw@pkgsrc.org> | 2004-01-12 21:50:07 +0000 |
commit | a833f70f2d3e08c428554031ab0f92cb76ed91fd (patch) | |
tree | bc27267d2fa1dbbc31f6fa09cb938ad3ca85d93c /lang/ksi | |
parent | 538de4a05ba806cf83b04cd655fc0f1f3ebcdeb9 (diff) | |
download | pkgsrc-a833f70f2d3e08c428554031ab0f92cb76ed91fd.tar.gz |
The package was marked broken because it kept throwing SIGSEGV due to
using an old boehm-gc that does not work on NetBSD.
Unbreak it by changing it to use the devel/boehm-gc package.
PKGREVISION++.
Diffstat (limited to 'lang/ksi')
-rw-r--r-- | lang/ksi/Makefile | 6 | ||||
-rw-r--r-- | lang/ksi/PLIST | 23 | ||||
-rw-r--r-- | lang/ksi/distinfo | 4 | ||||
-rw-r--r-- | lang/ksi/patches/patch-ab | 22 | ||||
-rw-r--r-- | lang/ksi/patches/patch-ac | 22 |
5 files changed, 51 insertions, 26 deletions
diff --git a/lang/ksi/Makefile b/lang/ksi/Makefile index 6491970bc74..43d2abb93b7 100644 --- a/lang/ksi/Makefile +++ b/lang/ksi/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.2 2003/12/09 12:17:35 agc Exp $ +# $NetBSD: Makefile,v 1.3 2004/01/12 21:50:07 kristerw Exp $ DISTNAME= ksi-3.4.1 +PKGREVISION= 1 CATEGORIES= lang MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=ksi/} @@ -19,8 +20,7 @@ USE_NEW_TEXINFO= YES USE_MAKEINFO= YES INFO_FILES= ksi-lang.info ksi-lib.info ksi.info -BROKEN= throws SIGSEGV when invoking ksi interpreter during build - +.include "../../devel/boehm-gc/buildlink2.mk" .include "../../devel/readline/buildlink2.mk" .include "../../devel/zlib/buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/lang/ksi/PLIST b/lang/ksi/PLIST index 6daec4ab9ef..727ce971f60 100644 --- a/lang/ksi/PLIST +++ b/lang/ksi/PLIST @@ -1,10 +1,7 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 2003/08/30 21:23:43 jtb Exp $ +@comment $NetBSD: PLIST,v 1.2 2004/01/12 21:50:07 kristerw Exp $ bin/ksi bin/ksi-compile bin/ksi-config -include/ksi/gc.h -include/ksi/gc_cpp.h -include/ksi/gc_typed.h include/ksi/ksi.h include/ksi/ksi_conf.h include/ksi/ksi_ext.h @@ -16,24 +13,6 @@ include/ksi/ksi_type.h include/ksi/ksi_ver.h include/ksi/ksi_vtab.h include/ksi/ksi_z.h -info/ksi-lang.info -info/ksi-lang.info-1 -info/ksi-lang.info-2 -info/ksi-lang.info-3 -info/ksi-lang.info-4 -info/ksi-lang.info-5 -info/ksi-lang.info-6 -info/ksi-lang.info-7 -info/ksi-lib.info -info/ksi-lib.info-1 -info/ksi-lib.info-2 -info/ksi-lib.info-3 -info/ksi.info -lib/ksi/libgc.a -lib/ksi/libgc.la -lib/ksi/libgc.so -lib/ksi/libgc.so.1 -lib/ksi/libgc.so.1.1 lib/ksi/libksi.a lib/ksi/libksi.la lib/ksi/libksi.so diff --git a/lang/ksi/distinfo b/lang/ksi/distinfo index 1002ff12526..703fd56acce 100644 --- a/lang/ksi/distinfo +++ b/lang/ksi/distinfo @@ -1,5 +1,7 @@ -$NetBSD: distinfo,v 1.1.1.1 2003/08/30 21:23:44 jtb Exp $ +$NetBSD: distinfo,v 1.2 2004/01/12 21:50:07 kristerw Exp $ SHA1 (ksi-3.4.1.tar.gz) = 8ebba1e0775f29bce2662716ea8cc7d0ab0fe778 Size (ksi-3.4.1.tar.gz) = 1509920 bytes SHA1 (patch-aa) = b361c1dd64726cac15f3c0aea469f45cb433a044 +SHA1 (patch-ab) = fca89ed52700affeb0af65554c88d9b106f6e600 +SHA1 (patch-ac) = 99d375ae5035b52776b9e373ff382187c2040da8 diff --git a/lang/ksi/patches/patch-ab b/lang/ksi/patches/patch-ab new file mode 100644 index 00000000000..6a076a63257 --- /dev/null +++ b/lang/ksi/patches/patch-ab @@ -0,0 +1,22 @@ +$NetBSD: patch-ab,v 1.1 2004/01/12 21:50:07 kristerw Exp $ + +--- Makefile.in.orig Mon Jan 12 22:06:06 2004 ++++ Makefile.in Mon Jan 12 22:06:23 2004 +@@ -98,7 +98,7 @@ + @NOT_COMPILE_EXAMPLES_TRUE@examples_subdir = + @NOT_COMPILE_EXAMPLES_FALSE@examples_subdir = example + +-SUBDIRS = gc_build si interp lib ext doc $(examples_subdir) ++SUBDIRS = si interp lib ext doc $(examples_subdir) + + bin_SCRIPTS = ksi-config + +@@ -119,7 +119,7 @@ + + TAR = tar + GZIP_ENV = --best +-DIST_SUBDIRS = gc_build si interp lib ext doc example ++DIST_SUBDIRS = si interp lib ext doc example + all: all-redirect + .SUFFIXES: + $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) diff --git a/lang/ksi/patches/patch-ac b/lang/ksi/patches/patch-ac new file mode 100644 index 00000000000..da928beca19 --- /dev/null +++ b/lang/ksi/patches/patch-ac @@ -0,0 +1,22 @@ +$NetBSD: patch-ac,v 1.1 2004/01/12 21:50:07 kristerw Exp $ + +--- si/Makefile.in.orig Mon Jan 12 22:07:27 2004 ++++ si/Makefile.in Mon Jan 12 22:12:45 2004 +@@ -120,7 +120,7 @@ + revision = 0 + age = 0 + +-libksi_la_LIBADD = $(top_builddir)/gc_build/libgc.la @KSI_LIBS@ @LTLIBOBJS@ ++libksi_la_LIBADD = $(BUILDLINK_DIR)/lib/libgc.la @KSI_LIBS@ @LTLIBOBJS@ + libksi_la_LDFLAGS = -version-info $(current):$(revision):$(age) + + ksi_ver_vars = 'KSI_VERSION "$(KSI_VERSION)"' 'KSI_MAJOR_VERSION $(KSI_MAJOR_VERSION)' 'KSI_MINOR_VERSION $(KSI_MINOR_VERSION)' 'KSI_PATCH_LEVEL $(KSI_PATCH_LEVEL)' 'KSI_CPU "$(KSI_CPU)"' 'KSI_OS "$(KSI_OS)"' +@@ -140,7 +140,7 @@ + CPPFLAGS = @CPPFLAGS@ + LDFLAGS = @LDFLAGS@ + LIBS = @LIBS@ +-libksi_la_DEPENDENCIES = $(top_builddir)/gc_build/libgc.la @LTLIBOBJS@ ++libksi_la_DEPENDENCIES = $(BUILDLINK_DIR)/lib/libgc.la @LTLIBOBJS@ + libksi_la_OBJECTS = ksi_gc.lo ksi_jump.lo ksi_shel.lo ksi_time.lo \ + ksi_base.lo ksi_err.lo ksi_exep.lo ksi_vtab.lo ksi_prim.lo ksi_sign.lo \ + ksi_evt.lo ksi_symb.lo ksi_bool.lo ksi_char.lo ksi_str.lo ksi_key.lo \ |