diff options
author | tnn <tnn> | 2009-04-16 18:08:32 +0000 |
---|---|---|
committer | tnn <tnn> | 2009-04-16 18:08:32 +0000 |
commit | 8ddc4bc67b294b8ecb5ff9b5d66b92162d9dbe7e (patch) | |
tree | d5246919b3097eda98c490db55e039130e0318e2 | |
parent | da61f037cdfedf77dc738cf1326c8db39d69a066 (diff) | |
download | pkgsrc-8ddc4bc67b294b8ecb5ff9b5d66b92162d9dbe7e.tar.gz |
Update to librep-0.17.3.
0.17.3
======
* Updated MAINTAINERS
* Dropped rep.m4 - use librep.pc instead
* Improved librep.pc
* Updated librep.spec
* Add -L/lib$libsuff to READLINE_LIBS [T2 Patch]
* Fix compilation on PPC64 [Marcus Comstedt]
* Small fixup in src/fake-libexec [SuSE]
* No rpath in src/rep-config.sh [Fedora]
* Added ebuild [Harald van Dijk]
* Improved Makefile's distclean rule
* Reworked autogen.sh
* Reworked configure.in
* Major rework of the spec-file
* Improved configure's ending message
* Fixed configure.in's templates for autoheader
* BSD-Tar is not supported by librep, give users a usefull warning
message [Mark Diekhans]
0.17.2
======
* fixups for configure.in
* updated BUGS, HACKING and README
* define inline if undefined (fixes compiler warnings)
* create the destination directory for the .pc file before installing it
* fixed in issue with FreeBSD in numbers.c [FreeBSD patch]
* improved a function of numbers.c [FreeBSD patch]
* rep_file_fdopen has not been listed in librep.sym
* added -tag=CC to libtool in several places
* don't ignore $LDFLAGS upon build
* dropped some useless code in sdbm.c
* make sure inline is defined
0.17.1
======
* started code-cleanup
* added a .pc file
* added -no-split to makeinfo [FreeBSD patch]
* added -enable-paranoia to configure [compile with CFLAGS+="-Wall -ansi"]
* updated the spec file
* replaced a static void by a void in main.c [Debian patch]
* use correct shebang in rep-xgettext.jl [ALT-Linux patch]
* trim trailing / to mkdir(2) [NetBSD patch]
-rw-r--r-- | lang/librep/Makefile | 24 | ||||
-rw-r--r-- | lang/librep/PLIST | 4 | ||||
-rw-r--r-- | lang/librep/distinfo | 18 | ||||
-rw-r--r-- | lang/librep/patches/patch-aa | 122 | ||||
-rw-r--r-- | lang/librep/patches/patch-ab | 18 | ||||
-rw-r--r-- | lang/librep/patches/patch-ac | 17 | ||||
-rw-r--r-- | lang/librep/patches/patch-ad | 12 | ||||
-rw-r--r-- | lang/librep/patches/patch-ae | 15 | ||||
-rw-r--r-- | lang/librep/patches/patch-af | 28 | ||||
-rw-r--r-- | lang/librep/patches/patch-ag | 40 | ||||
-rw-r--r-- | lang/librep/patches/patch-ah | 16 | ||||
-rw-r--r-- | lang/librep/patches/patch-ai | 29 |
12 files changed, 44 insertions, 299 deletions
diff --git a/lang/librep/Makefile b/lang/librep/Makefile index a93c575bcf5..451c40849e1 100644 --- a/lang/librep/Makefile +++ b/lang/librep/Makefile @@ -1,19 +1,22 @@ -# $NetBSD: Makefile,v 1.46 2007/05/07 12:42:19 tnn Exp $ +# $NetBSD: Makefile,v 1.47 2009/04/16 18:08:32 tnn Exp $ # -DISTNAME= librep-0.17 -PKGREVISION= 3 +DISTNAME= librep-0.17.3 CATEGORIES= lang devel MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=librep/} +EXTRACT_SUFX= .tar.bz2 MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://librep.sourceforge.net/ COMMENT= Emacs Lisp-like runtime library, interpreter, compiler and VM +PKG_DESTDIR_SUPPORT= user-destdir USE_TOOLS+= gmake makeinfo -USE_GNU_READLINE= # uses rl_basic_quote_characters - +USE_GNU_READLINE= yes # uses rl_basic_quote_characters USE_LIBTOOL= yes +INFO_FILES= yes +PKGCONFIG_OVERRIDE= librep.pc.in + REP_LIBTOOL= ${PREFIX}/libexec/rep/${MACHINE_GNU_PLATFORM}/libtool GNU_CONFIGURE= yes @@ -21,13 +24,14 @@ CONFIGURE_ARGS+= --with-readline CONFIGURE_ARGS+= --with-gmp CONFIGURE_ARGS+= --enable-static -CONFIG_STATUS_OVERRIDE= # empty - -INFO_FILES= # PLIST +REPLACE_INTERPRETER+= rep +REPLACE.rep.old= .*/bin/rep +REPLACE.rep.new= ${PREFIX}/bin/rep +REPLACE_FILES.rep= src/rep-xgettext.jl post-install: - ${RM} -f ${REP_LIBTOOL} - ${INSTALL_SCRIPT} ${PKG_LIBTOOL} ${REP_LIBTOOL} + ${RM} -f ${DESTDIR}${REP_LIBTOOL} + ${INSTALL_SCRIPT} ${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 0fdfb62e231..aa2518806f0 100644 --- a/lang/librep/PLIST +++ b/lang/librep/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.9 2006/03/30 03:44:43 jlam Exp $ +@comment $NetBSD: PLIST,v 1.10 2009/04/16 18:08:32 tnn Exp $ bin/rep bin/rep-config bin/rep-remote @@ -11,6 +11,7 @@ include/rep_regexp.h 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 @@ -34,7 +35,6 @@ 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 -share/aclocal/rep.m4 share/emacs/site-lisp/rep-debugger.el share/rep/${PKGVERSION}/lisp/cgi-get.jl share/rep/${PKGVERSION}/lisp/cgi-get.jlc diff --git a/lang/librep/distinfo b/lang/librep/distinfo index cee8db01d61..71279c4b5be 100644 --- a/lang/librep/distinfo +++ b/lang/librep/distinfo @@ -1,14 +1,6 @@ -$NetBSD: distinfo,v 1.12 2007/05/07 12:42:19 tnn Exp $ +$NetBSD: distinfo,v 1.13 2009/04/16 18:08:32 tnn Exp $ -SHA1 (librep-0.17.tar.gz) = 00ae330eca0fdfb117797036f499dec61f868431 -RMD160 (librep-0.17.tar.gz) = 2239837386700ed4893fa91b684192cb8721a2d1 -Size (librep-0.17.tar.gz) = 1195890 bytes -SHA1 (patch-aa) = 4914b74e5e2b8f413b7c0b759efd464fb7b921dc -SHA1 (patch-ab) = 5c9c56a05a5c1adc88ce29f199051e9c61b972f8 -SHA1 (patch-ac) = 562f8a25b2da564fa4372101bfa1199b0c755ee3 -SHA1 (patch-ad) = ce6925b5efeb8f1c974cb459611ae1c1a426fc1d -SHA1 (patch-ae) = 147430e222b20e20c3ca387d84d4112d58558196 -SHA1 (patch-af) = 1c5b4180c582c0ae35b35f35803c38da123476bf -SHA1 (patch-ag) = dc5916c607a76bb44312a06e8ecc2655a1ec941d -SHA1 (patch-ah) = 0e8b15339ba87936eda48a9ae827d8c8c91b31c7 -SHA1 (patch-ai) = e0882ee5457f3b7b8c12f78df13b65b342c8cd45 +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 (patch-aa) = 53f785e75205f64e7b44b84e9b8f3483d2492c28 diff --git a/lang/librep/patches/patch-aa b/lang/librep/patches/patch-aa index 70f5936f925..dd9bbfa058b 100644 --- a/lang/librep/patches/patch-aa +++ b/lang/librep/patches/patch-aa @@ -1,101 +1,25 @@ -$NetBSD: patch-aa,v 1.9 2005/12/11 23:12:11 joerg Exp $ +$NetBSD: patch-aa,v 1.10 2009/04/16 18:08:32 tnn Exp $ ---- configure.orig 2005-12-11 22:49:43.000000000 +0000 +--- configure.orig 2009-04-16 19:45:18.000000000 +0200 +++ configure -@@ -3311,13 +3311,13 @@ darwin* | rhapsody*) - lt_cv_deplibs_check_method=pass_all - ;; - --freebsd* | kfreebsd*-gnu) -+freebsd* | kfreebsd*-gnu | dragonfly*) - if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then - case $host_cpu in - i*86 ) - # Not sure whether the presence of OpenBSD here was a mistake. - # Let's accept both of them until this is cleared up. -- lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD)/i[3-9]86 (compact )?demand paged shared library' -+ lt_cv_deplibs_check_method='file_magic (DragonFly|FreeBSD|OpenBSD)/i[3-9]86 (compact )?demand paged shared library' - lt_cv_file_magic_cmd=/usr/bin/file - lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*` - ;; -@@ -6562,7 +6562,7 @@ if test -z "$aix_libpath"; then aix_libp - ;; - - # FreeBSD 3 and greater uses gcc -shared to do shared libraries. -- freebsd* | kfreebsd*-gnu) -+ freebsd* | kfreebsd*-gnu | dragonfly*) - archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' - hardcode_libdir_flag_spec='-R$libdir' - hardcode_direct=yes -@@ -7140,7 +7140,7 @@ kfreebsd*-gnu) - dynamic_linker='GNU ld.so' - ;; - --freebsd*) -+freebsd* | dragonfly*) - objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` - version_type=freebsd-$objformat - case $version_type in -@@ -9392,7 +9392,7 @@ if test -z "$aix_libpath"; then aix_libp - freebsd-elf*) - archive_cmds_need_lc_CXX=no - ;; -- freebsd* | kfreebsd*-gnu) -+ freebsd* | kfreebsd*-gnu | dragonfly*) - # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF - # conventions - ld_shlibs_CXX=yes -@@ -10099,7 +10099,7 @@ echo $ECHO_N "checking for $compiler opt - ;; - esac - ;; -- freebsd* | kfreebsd*-gnu) -+ freebsd* | kfreebsd*-gnu | dragonfly*) - # FreeBSD uses GNU C++ - ;; - hpux9* | hpux10* | hpux11*) -@@ -10717,7 +10717,7 @@ kfreebsd*-gnu) - dynamic_linker='GNU ld.so' - ;; - --freebsd*) -+freebsd* | dragonfly*) - objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` - version_type=freebsd-$objformat - case $version_type in -@@ -13165,7 +13165,7 @@ if test -z "$aix_libpath"; then aix_libp - ;; - - # FreeBSD 3 and greater uses gcc -shared to do shared libraries. -- freebsd* | kfreebsd*-gnu) -+ freebsd* | kfreebsd*-gnu | dragonfly*) - archive_cmds_F77='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' - hardcode_libdir_flag_spec_F77='-R$libdir' - hardcode_direct_F77=yes -@@ -13743,7 +13743,7 @@ kfreebsd*-gnu) - dynamic_linker='GNU ld.so' - ;; - --freebsd*) -+freebsd* | dragonfly*) - objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` - version_type=freebsd-$objformat - case $version_type in -@@ -15477,7 +15477,7 @@ if test -z "$aix_libpath"; then aix_libp - ;; - - # FreeBSD 3 and greater uses gcc -shared to do shared libraries. -- freebsd* | kfreebsd*-gnu) -+ freebsd* | kfreebsd*-gnu | dragonfly*) - archive_cmds_GCJ='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' - hardcode_libdir_flag_spec_GCJ='-R$libdir' - hardcode_direct_GCJ=yes -@@ -16055,7 +16055,7 @@ kfreebsd*-gnu) - dynamic_linker='GNU ld.so' - ;; - --freebsd*) -+freebsd* | dragonfly*) - objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` - version_type=freebsd-$objformat - case $version_type in +@@ -21553,17 +21553,17 @@ fi + + mv librep.ebuild librep-$version.ebuild + +-if test "$with_gmp" != "no" && test "$found_gmp" == "yes" ; then ++if test "$with_gmp" != "no" && test "$found_gmp" = "yes" ; then + with_gmp=yes + else with_gmp=no + fi + +-if test "$with_readline" != "no" && test "$found_readline" == "yes"; then ++if test "$with_readline" != "no" && test "$found_readline" = "yes"; then + with_readline=yes + else with_readline=no + fi + +-if test "$with_libffi" != "no" && test "$found_ffi" == "yes"; then ++if test "$with_libffi" != "no" && test "$found_ffi" = "yes"; then + with_ffi=yes + else with_ffi=no + fi diff --git a/lang/librep/patches/patch-ab b/lang/librep/patches/patch-ab deleted file mode 100644 index 45a2b83afd0..00000000000 --- a/lang/librep/patches/patch-ab +++ /dev/null @@ -1,18 +0,0 @@ -$NetBSD: patch-ab,v 1.3 2005/12/11 23:12:11 joerg Exp $ - ---- src/sdbm.c.orig 2005-12-11 22:58:32.000000000 +0000 -+++ src/sdbm.c -@@ -37,13 +37,6 @@ static char rcsid[] = "$Id: sdbm.c,v 1.2 - #endif - - /* -- * externals -- */ --#ifndef sun --extern int errno; --#endif -- --/* - * forward - */ - static int getdbit (SDBM *, long); diff --git a/lang/librep/patches/patch-ac b/lang/librep/patches/patch-ac deleted file mode 100644 index bf0de1c22a0..00000000000 --- a/lang/librep/patches/patch-ac +++ /dev/null @@ -1,17 +0,0 @@ -$NetBSD: patch-ac,v 1.1 2000/12/16 01:58:01 wiz Exp $ - ---- src/unix_files.c.orig Sat Sep 2 11:43:03 2000 -+++ src/unix_files.c -@@ -286,6 +286,12 @@ - repv - rep_make_directory(repv dir) - { -+ int len = rep_STRING_LEN(dir); -+ -+ /* Trim trailing '/' to mkdir(2) since some OSes fail the call otherwise */ -+ if (*(rep_STR(dir) + len - 1) == '/') -+ dir = rep_string_dupn(rep_STR(dir), len - 1); -+ - if(mkdir(rep_STR(dir), S_IRWXU | S_IRWXG | S_IRWXO) == 0) - return Qt; - else diff --git a/lang/librep/patches/patch-ad b/lang/librep/patches/patch-ad deleted file mode 100644 index 3bf51b51592..00000000000 --- a/lang/librep/patches/patch-ad +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-ad,v 1.1 2007/05/07 12:42:19 tnn Exp $ - ---- lisp/rep/xml/reader.jl.orig 2007-05-07 14:12:43.000000000 +0200 -+++ lisp/rep/xml/reader.jl -@@ -126,6 +126,7 @@ - (let ((data (substitute-entities (read-string-item stream '(#\>))))) - (or (= (current stream) #\>) - (error "Expected '>' character: %s" stream)) -+ (next stream) - (list '! data))) - - (define (read-tag-body stream) diff --git a/lang/librep/patches/patch-ae b/lang/librep/patches/patch-ae deleted file mode 100644 index eb65c969a8a..00000000000 --- a/lang/librep/patches/patch-ae +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-ae,v 1.1 2007/05/07 12:42:19 tnn Exp $ - ---- src/continuations.c.orig 2007-05-07 14:15:20.000000000 +0200 -+++ src/continuations.c -@@ -458,7 +458,9 @@ save_stack (rep_continuation *c) - - FLUSH_REGISTER_WINDOWS; - --#if defined (__GNUC__) && !defined (BROKEN_ALPHA_GCC) -+ /* __builtin_frame_address doesn't give the right thing on athlon64 */ -+ -+#if defined (__GNUC__) && !defined (BROKEN_ALPHA_GCC) && !defined (__x86_64) - c->stack_top = __builtin_frame_address (0); - #else - c->stack_top = (char *) &size; diff --git a/lang/librep/patches/patch-af b/lang/librep/patches/patch-af deleted file mode 100644 index 8bd0aee704c..00000000000 --- a/lang/librep/patches/patch-af +++ /dev/null @@ -1,28 +0,0 @@ -$NetBSD: patch-af,v 1.1 2007/05/07 12:42:19 tnn Exp $ - ---- src/ffi.c.orig 2007-05-07 14:17:55.000000000 +0200 -+++ src/ffi.c -@@ -307,9 +307,11 @@ rep_ffi_marshal (unsigned int type_id, r - *(double *)ptr = (double) rep_get_float (value); - return ptr + sizeof (double); - -+#if FFI_TYPE_LONGDOUBLE != FFI_TYPE_DOUBLE - case FFI_TYPE_LONGDOUBLE: - *(long double *)ptr = (long double) rep_get_float (value); - return ptr + sizeof (long double); -+#endif - - case FFI_TYPE_UINT8: - *(uint8_t *)ptr = (uint8_t) rep_get_long_int (value); -@@ -435,9 +437,11 @@ rep_ffi_demarshal (unsigned int type_id, - *value = rep_make_float (*(double *)ptr, rep_TRUE); - return ptr + sizeof (double); - -+#if FFI_TYPE_LONGDOUBLE != FFI_TYPE_DOUBLE - case FFI_TYPE_LONGDOUBLE: - *value = rep_make_float (*(long double *)ptr, rep_TRUE); - return ptr + sizeof (long double); -+#endif - - case FFI_TYPE_UINT8: - *value = rep_MAKE_INT (*(uint8_t *)ptr); diff --git a/lang/librep/patches/patch-ag b/lang/librep/patches/patch-ag deleted file mode 100644 index 8287744d743..00000000000 --- a/lang/librep/patches/patch-ag +++ /dev/null @@ -1,40 +0,0 @@ -$NetBSD: patch-ag,v 1.1 2007/05/07 12:42:19 tnn Exp $ - ---- src/lisp.c.orig 2007-05-07 14:20:07.000000000 +0200 -+++ src/lisp.c -@@ -2493,7 +2493,7 @@ handler. - rep_DECLARE1(error, rep_SYMBOLP); - - on_error = Fsymbol_value (Qbacktrace_on_error, Qt); -- if (on_error == Qt -+ if ((on_error == Qt && error != Qend_of_stream) - || (rep_CONSP(on_error) - && (tmp = Fmemq (error, on_error)) && tmp != Qnil)) - { -@@ -2504,7 +2504,7 @@ handler. - - errlist = Fcons(error, data); - on_error = Fsymbol_value(Qdebug_on_error, Qt); -- if(((on_error != rep_NULL && on_error == Qt) -+ if(((on_error != rep_NULL && on_error == Qt && error != Qend_of_stream) - || (rep_CONSP(on_error) - && (tmp = Fmemq(error, on_error)) && !rep_NILP(tmp)))) - { -@@ -2705,13 +2705,13 @@ ARGLIST had been evaluated or not before - { - char buf[256]; - #ifdef HAVE_SNPRINTF -- snprintf (buf, sizeof (buf), " at %s:%d", -+ snprintf (buf, sizeof (buf), " at %s:%ld", - rep_STR (rep_CAR (origin)), -- rep_INT (rep_CDR (origin))); -+ (long) rep_INT (rep_CDR (origin))); - #else -- sprintf (buf, " at %s:%d", -+ sprintf (buf, " at %s:%ld", - rep_STR (rep_CAR (origin)), -- rep_INT (rep_CDR (origin))); -+ (long) rep_INT (rep_CDR (origin))); - #endif - rep_stream_puts (strm, buf, -1, rep_FALSE); - } diff --git a/lang/librep/patches/patch-ah b/lang/librep/patches/patch-ah deleted file mode 100644 index d74f813c6b4..00000000000 --- a/lang/librep/patches/patch-ah +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-ah,v 1.1 2007/05/07 12:42:19 tnn Exp $ - ---- src/main.c.orig 2007-05-07 14:21:20.000000000 +0200 -+++ src/main.c -@@ -157,6 +157,11 @@ get_main_options(char *prog_name, int *a - return rep_TRUE; - } - -+/* GCC 4 helpfully inlines this function and breaks the stack check. */ -+#if __GNUC__ >= 4 -+static void check_configuration (int *stack_low) __attribute__ ((noinline)); -+#endif -+ - static void - check_configuration (int *stack_low) - { diff --git a/lang/librep/patches/patch-ai b/lang/librep/patches/patch-ai deleted file mode 100644 index 0d07ab1cb36..00000000000 --- a/lang/librep/patches/patch-ai +++ /dev/null @@ -1,29 +0,0 @@ -$NetBSD: patch-ai,v 1.1 2007/05/07 12:42:19 tnn Exp $ - ---- src/timers.c.orig 2007-05-07 14:22:37.000000000 +0200 -+++ src/timers.c -@@ -128,7 +128,7 @@ fix_time (long *secs, long *msecs) - *msecs += 1000; - (*secs)--; - } -- while (*msecs > 1000) -+ while (*msecs >= 1000) - { - *msecs -= 1000; - (*secs)++; -@@ -252,6 +252,7 @@ to re-enable it. - t->function = fun; - t->secs = rep_get_long_int (secs); - t->msecs = rep_get_long_int (msecs); -+ fix_time (&t->secs, &t->msecs); - t->next_alloc = allocated_timers; - allocated_timers = t; - insert_timer (t); -@@ -290,6 +291,7 @@ duration. Otherwise, the existing values - { - TIMER(timer)->secs = rep_get_long_int (secs); - TIMER(timer)->msecs = rep_get_long_int (msecs); -+ fix_time (&TIMER (timer)->secs, &TIMER (timer)->msecs); - } - insert_timer (TIMER(timer)); - return timer; |