From f9d287477f6d0643663604aa95d3d6915ea98254 Mon Sep 17 00:00:00 2001 From: tnn Date: Tue, 14 Jul 2009 10:01:28 +0000 Subject: Update to librep-0.90.0. Changes: * Added UTF-8 Support! [Wang Diancheng] * Remove scheme and unscheme modules * Going on with code-cleanup --- lang/librep/Makefile | 9 +++++---- lang/librep/PLIST | 37 ++++++------------------------------- lang/librep/buildlink3.mk | 5 ++--- lang/librep/distinfo | 9 +++++---- lang/librep/patches/patch-ab | 15 +++++++++++++++ 5 files changed, 33 insertions(+), 42 deletions(-) create mode 100644 lang/librep/patches/patch-ab (limited to 'lang/librep') diff --git a/lang/librep/Makefile b/lang/librep/Makefile index 20842dddf2b..f55950a97d6 100644 --- a/lang/librep/Makefile +++ b/lang/librep/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.48 2009/05/20 00:58:19 wiz Exp $ +# $NetBSD: Makefile,v 1.49 2009/07/14 10:01:28 tnn Exp $ # -DISTNAME= librep-0.17.3 -PKGREVISION= 1 +DISTNAME= librep-0.90.0 CATEGORIES= lang devel MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=librep/} EXTRACT_SUFX= .tar.bz2 @@ -15,6 +14,8 @@ PKG_DESTDIR_SUPPORT= user-destdir USE_TOOLS+= gmake makeinfo USE_GNU_READLINE= yes # uses rl_basic_quote_characters USE_LIBTOOL= yes +# we have a symlink to libtool +DEPENDS+= libtool-base-[0-9]*:../../devel/libtool-base INFO_FILES= yes PKGCONFIG_OVERRIDE= librep.pc.in @@ -32,7 +33,7 @@ REPLACE_FILES.rep= src/rep-xgettext.jl post-install: ${RM} -f ${DESTDIR}${REP_LIBTOOL} - ${INSTALL_SCRIPT} ${PKG_LIBTOOL} ${DESTDIR}${REP_LIBTOOL} + ${LN} -s ${PKG_LIBTOOL} ${DESTDIR}${REP_LIBTOOL} .include "../../databases/gdbm/buildlink3.mk" .include "../../devel/gettext-lib/buildlink3.mk" diff --git a/lang/librep/PLIST b/lang/librep/PLIST index f236e0097d2..f907e923d56 100644 --- a/lang/librep/PLIST +++ b/lang/librep/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.11 2009/06/14 18:03:35 joerg Exp $ +@comment $NetBSD: PLIST,v 1.12 2009/07/14 10:01:28 tnn Exp $ bin/rep bin/rep-config bin/rep-remote @@ -12,10 +12,6 @@ include/rep_subrs.h info/librep.info lib/librep.la lib/pkgconfig/librep.pc -libexec/rep/${MACHINE_GNU_PLATFORM}/install-aliases -libexec/rep/${MACHINE_GNU_PLATFORM}/libtool -libexec/rep/${MACHINE_GNU_PLATFORM}/rep_config.h -libexec/rep/${MACHINE_GNU_PLATFORM}/rules.mk libexec/rep/${PKGVERSION}/${MACHINE_GNU_PLATFORM}/doc-strings libexec/rep/${PKGVERSION}/${MACHINE_GNU_PLATFORM}/emulate-gnu-tar libexec/rep/${PKGVERSION}/${MACHINE_GNU_PLATFORM}/gdbm.la @@ -31,10 +27,15 @@ libexec/rep/${PKGVERSION}/${MACHINE_GNU_PLATFORM}/rep/io/sockets.la libexec/rep/${PKGVERSION}/${MACHINE_GNU_PLATFORM}/rep/io/timers.la libexec/rep/${PKGVERSION}/${MACHINE_GNU_PLATFORM}/rep/lang/record-profile.la libexec/rep/${PKGVERSION}/${MACHINE_GNU_PLATFORM}/rep/util/md5.la +libexec/rep/${PKGVERSION}/${MACHINE_GNU_PLATFORM}/rep/util/utf8.la libexec/rep/${PKGVERSION}/${MACHINE_GNU_PLATFORM}/rep/vm/safe-interpreter.la libexec/rep/${PKGVERSION}/${MACHINE_GNU_PLATFORM}/sdbm.la libexec/rep/${PKGVERSION}/${MACHINE_GNU_PLATFORM}/tables.la libexec/rep/${PKGVERSION}/${MACHINE_GNU_PLATFORM}/timers.la +libexec/rep/${MACHINE_GNU_PLATFORM}/install-aliases +libexec/rep/${MACHINE_GNU_PLATFORM}/libtool +libexec/rep/${MACHINE_GNU_PLATFORM}/rep_config.h +libexec/rep/${MACHINE_GNU_PLATFORM}/rules.mk share/emacs/site-lisp/rep-debugger.el share/rep/${PKGVERSION}/lisp/cgi-get.jl share/rep/${PKGVERSION}/lisp/cgi-get.jlc @@ -195,12 +196,8 @@ share/rep/${PKGVERSION}/lisp/rep/vm/compiler/no-lang.jl share/rep/${PKGVERSION}/lisp/rep/vm/compiler/no-lang.jlc share/rep/${PKGVERSION}/lisp/rep/vm/compiler/rep.jl share/rep/${PKGVERSION}/lisp/rep/vm/compiler/rep.jlc -share/rep/${PKGVERSION}/lisp/rep/vm/compiler/scheme.jl -share/rep/${PKGVERSION}/lisp/rep/vm/compiler/scheme.jlc share/rep/${PKGVERSION}/lisp/rep/vm/compiler/src.jl share/rep/${PKGVERSION}/lisp/rep/vm/compiler/src.jlc -share/rep/${PKGVERSION}/lisp/rep/vm/compiler/unscheme.jl -share/rep/${PKGVERSION}/lisp/rep/vm/compiler/unscheme.jlc share/rep/${PKGVERSION}/lisp/rep/vm/compiler/utils.jl share/rep/${PKGVERSION}/lisp/rep/vm/compiler/utils.jlc share/rep/${PKGVERSION}/lisp/rep/vm/disassembler.jl @@ -219,27 +216,5 @@ share/rep/${PKGVERSION}/lisp/rep/xml/reader.jl share/rep/${PKGVERSION}/lisp/rep/xml/reader.jlc share/rep/${PKGVERSION}/lisp/ring.jl share/rep/${PKGVERSION}/lisp/ring.jlc -share/rep/${PKGVERSION}/lisp/scheme.jl -share/rep/${PKGVERSION}/lisp/scheme.jlc -share/rep/${PKGVERSION}/lisp/scheme/data.jl -share/rep/${PKGVERSION}/lisp/scheme/data.jlc -share/rep/${PKGVERSION}/lisp/scheme/misc.jl -share/rep/${PKGVERSION}/lisp/scheme/misc.jlc -share/rep/${PKGVERSION}/lisp/scheme/syntax-funs.jl -share/rep/${PKGVERSION}/lisp/scheme/syntax-funs.jlc -share/rep/${PKGVERSION}/lisp/scheme/syntax.jl -share/rep/${PKGVERSION}/lisp/scheme/syntax.jlc -share/rep/${PKGVERSION}/lisp/scheme/utils.jl -share/rep/${PKGVERSION}/lisp/scheme/utils.jlc share/rep/${PKGVERSION}/lisp/symbol-table.jl share/rep/${PKGVERSION}/lisp/symbol-table.jlc -share/rep/${PKGVERSION}/lisp/unscheme.jl -share/rep/${PKGVERSION}/lisp/unscheme.jlc -share/rep/${PKGVERSION}/lisp/unscheme/data.jl -share/rep/${PKGVERSION}/lisp/unscheme/data.jlc -share/rep/${PKGVERSION}/lisp/unscheme/misc.jl -share/rep/${PKGVERSION}/lisp/unscheme/misc.jlc -share/rep/${PKGVERSION}/lisp/unscheme/syntax-funs.jl -share/rep/${PKGVERSION}/lisp/unscheme/syntax-funs.jlc -share/rep/${PKGVERSION}/lisp/unscheme/syntax.jl -share/rep/${PKGVERSION}/lisp/unscheme/syntax.jlc diff --git a/lang/librep/buildlink3.mk b/lang/librep/buildlink3.mk index f9da494e83d..627b6fe7fce 100644 --- a/lang/librep/buildlink3.mk +++ b/lang/librep/buildlink3.mk @@ -1,12 +1,11 @@ -# $NetBSD: buildlink3.mk,v 1.13 2009/03/20 19:24:50 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.14 2009/07/14 10:01:28 tnn Exp $ BUILDLINK_TREE+= librep .if !defined(LIBREP_BUILDLINK3_MK) LIBREP_BUILDLINK3_MK:= -BUILDLINK_API_DEPENDS.librep+= librep>=0.17 -BUILDLINK_ABI_DEPENDS.librep+= librep>=0.17nb2 +BUILDLINK_API_DEPENDS.librep+= librep>=0.90.0 BUILDLINK_PKGSRCDIR.librep?= ../../lang/librep MAKE_FLAGS+= rep_LIBTOOL=${LIBTOOL:Q} diff --git a/lang/librep/distinfo b/lang/librep/distinfo index 71279c4b5be..142d8e2eacf 100644 --- a/lang/librep/distinfo +++ b/lang/librep/distinfo @@ -1,6 +1,7 @@ -$NetBSD: distinfo,v 1.13 2009/04/16 18:08:32 tnn Exp $ +$NetBSD: distinfo,v 1.14 2009/07/14 10:01:28 tnn Exp $ -SHA1 (librep-0.17.3.tar.bz2) = 95ec32398846956ddb452802ea9cab71f12b4353 -RMD160 (librep-0.17.3.tar.bz2) = 61463d77c9536fa66b1c8602fa3a9ac030610563 -Size (librep-0.17.3.tar.bz2) = 793084 bytes +SHA1 (librep-0.90.0.tar.bz2) = b99f353c23ec853df0a58e3f918e2b7f4c30fafc +RMD160 (librep-0.90.0.tar.bz2) = 373812a545ad4fec2bee621dea3298b66e995230 +Size (librep-0.90.0.tar.bz2) = 696345 bytes SHA1 (patch-aa) = 53f785e75205f64e7b44b84e9b8f3483d2492c28 +SHA1 (patch-ab) = fca1a67b17d5ae87ec9675907ba8c63ac4839f50 diff --git a/lang/librep/patches/patch-ab b/lang/librep/patches/patch-ab new file mode 100644 index 00000000000..978125a6d91 --- /dev/null +++ b/lang/librep/patches/patch-ab @@ -0,0 +1,15 @@ +$NetBSD: patch-ab,v 1.5 2009/07/14 10:01:28 tnn Exp $ + +Build fix. From GIT master. + +--- src/unix_processes.c.orig 2009-07-02 20:36:42.000000000 +0200 ++++ src/unix_processes.c +@@ -496,7 +496,7 @@ get_pty(char *slavenam) + The FIRST_PTY_LETTER gives the first X to try. We try in the + sequence FIRST_PTY_LETTER, .., 'z', 'a', .., FIRST_PTY_LETTER. + Is this worthwhile, or just over-zealous? */ +- c = FIRST_PTY_LETTER; ++ char c = FIRST_PTY_LETTER; + do { + int i; + for(i = 0; i < 16; i++) -- cgit v1.2.3