From d0ccedf4e4e5a9fe45e7b321f31d68af31b59c0d Mon Sep 17 00:00:00 2001 From: jasper Date: Fri, 9 Oct 2009 13:04:43 +0000 Subject: [PATCH] - update librep to 0.90.2 now that we have libffi - specify license version --- lang/librep/Makefile | 58 +++++++++++-------- lang/librep/distinfo | 10 ++-- lang/librep/patches/patch-Makefile_in | 11 ++++ lang/librep/patches/patch-configure | 11 ---- lang/librep/patches/patch-librep_pc_in | 12 ++++ lang/librep/patches/patch-rep_m4 | 12 ---- lang/librep/patches/patch-src_Makefile_in | 14 ++--- ...atch-src_numbers.c => patch-src_numbers_c} | 7 ++- lang/librep/patches/patch-src_rep-xgettext_jl | 9 +++ ...{patch-src_repint.h => patch-src_repint_h} | 9 ++- lang/librep/pkg/DESCR | 10 ++-- lang/librep/pkg/PLIST | 49 +++++----------- 12 files changed, 106 insertions(+), 106 deletions(-) create mode 100644 lang/librep/patches/patch-Makefile_in delete mode 100644 lang/librep/patches/patch-configure create mode 100644 lang/librep/patches/patch-librep_pc_in delete mode 100644 lang/librep/patches/patch-rep_m4 rename lang/librep/patches/{patch-src_numbers.c => patch-src_numbers_c} (57%) create mode 100644 lang/librep/patches/patch-src_rep-xgettext_jl rename lang/librep/patches/{patch-src_repint.h => patch-src_repint_h} (77%) diff --git a/lang/librep/Makefile b/lang/librep/Makefile index 4768350a327..11136004132 100644 --- a/lang/librep/Makefile +++ b/lang/librep/Makefile @@ -1,43 +1,55 @@ -# $OpenBSD: Makefile,v 1.33 2009/06/22 17:00:23 naddy Exp $ +# $OpenBSD: Makefile,v 1.34 2009/10/09 13:04:43 jasper Exp $ COMMENT= Emacs Lisp-like runtime library SHARED_ONLY= Yes -VERSION= 0.16.2 +VERSION= 0.90.2 DISTNAME= librep-${VERSION} -PKGNAME= ${DISTNAME}p10 -SHARED_LIBS= rep 12.0 -CATEGORIES= lang +SHARED_LIBS += rep 13.0 # .13.0 -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=librep/} +CATEGORIES= lang HOMEPAGE= http://librep.sourceforge.net/ -MODULES= devel/gettext -LIB_DEPENDS= gdbm.>=2::databases/gdbm - -# GPL +# GPLv2 PERMIT_PACKAGE_CDROM= Yes PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes + +MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=librep/} +EXTRACT_SUFX= .tar.bz2 + WANTLIB= c m ncurses readline -GNU_ARCH= ${MACHINE_ARCH:S/amd64/x86_64/}-unknown-openbsd${OPSYS_VER} -SUBST_VARS= GNU_ARCH VERSION +MODULES= devel/gettext +LIB_DEPENDS= gdbm.>=2::databases/gdbm \ + gmp::devel/gmp \ + ffi::devel/libffi -USE_GMAKE= Yes -USE_LIBTOOL= Yes -MAKE_FLAGS= rep_LIBTOOL=${LIBTOOL} -CONFIGURE_STYLE=gnu -CONFIGURE_ARGS+=${CONFIGURE_SHARED} --enable-static -CONFIGURE_ARGS+=--without-gmp -# Don't try to run aclocal -CONFIGURE_ARGS+=--with-aclocaldir='$${datadir}/aclocal' -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" +GNU_ARCH= ${MACHINE_ARCH:S/amd64/x86_64/}-unknown-openbsd${OPSYS_VER} +SUBST_VARS= GNU_ARCH VERSION -NO_REGRESS= Yes +USE_GMAKE= Yes +USE_LIBTOOL= Yes + +MAKE_FLAGS= rep_LIBTOOL=${LIBTOOL} + +CONFIGURE_STYLE= gnu +CONFIGURE_ARGS+= ${CONFIGURE_SHARED} \ + --enable-static \ + --with-aclocaldir=${PREFIX}/share/aclocal +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LDFLAGS="-L${LOCALBASE}/lib -liconv -lintl" + +REP_LT= ${PREFIX}/libexec/rep/${GNU_ARCH}/libtool + +pre-configure: + ${SUBST_CMD} ${WRKSRC}/src/rep-xgettext.jl + +# The bundled libtool get's installed by default, override it. +post-install: + ln -s ${LIBTOOL} ${REP_LT} .include diff --git a/lang/librep/distinfo b/lang/librep/distinfo index 361ebc3c205..57b4b247a8a 100644 --- a/lang/librep/distinfo +++ b/lang/librep/distinfo @@ -1,5 +1,5 @@ -MD5 (librep-0.16.2.tar.gz) = sPIZ+fPVG8BuuxvRhhtuXA== -RMD160 (librep-0.16.2.tar.gz) = UrflIPCgEf5oMDefIkRYWtnItH4= -SHA1 (librep-0.16.2.tar.gz) = WYZHqnI4eqPHDdWPlddVOzC+Kno= -SHA256 (librep-0.16.2.tar.gz) = mzlP0EMpiqao8Am02ME6elzEdaEP7J1+AeO7TE3Blr8= -SIZE (librep-0.16.2.tar.gz) = 911485 +MD5 (librep-0.90.2.tar.bz2) = Ph4QoK17R6CJ1Vm3lE0Shw== +RMD160 (librep-0.90.2.tar.bz2) = KXjlno6cykWD+MMFSOcbe7bU5Yk= +SHA1 (librep-0.90.2.tar.bz2) = 4KcQFlZ6buTJuF/0/q06d4qHfSQ= +SHA256 (librep-0.90.2.tar.bz2) = nal/D0+C95bkhNGKeckXDX1Hk5XfkhFBpRkgwMCpk9U= +SIZE (librep-0.90.2.tar.bz2) = 696044 diff --git a/lang/librep/patches/patch-Makefile_in b/lang/librep/patches/patch-Makefile_in new file mode 100644 index 00000000000..f14a34d3f86 --- /dev/null +++ b/lang/librep/patches/patch-Makefile_in @@ -0,0 +1,11 @@ +$OpenBSD: patch-Makefile_in,v 1.1 2009/10/09 13:04:43 jasper Exp $ +--- Makefile.in.orig Sun Sep 27 21:02:17 2009 ++++ Makefile.in Sun Sep 27 21:10:51 2009 +@@ -50,7 +50,6 @@ install : all installdirs + done + $(INSTALL_DATA) doc-strings $(DESTDIR)$(repexecdir) + $(INSTALL_SCRIPT) emulate-gnu-tar $(DESTDIR)$(repexecdir) +- $(INSTALL_SCRIPT) libtool $(DESTDIR)$(repcommonexecdir) + $(INSTALL_DATA) rules.mk $(DESTDIR)$(repcommonexecdir) + $(INSTALL_SCRIPT) install-aliases $(DESTDIR)$(repcommonexecdir) + $(INSTALL_DATA) rep-debugger.el $(DESTDIR)$(emacssitelispdir) diff --git a/lang/librep/patches/patch-configure b/lang/librep/patches/patch-configure deleted file mode 100644 index d0f7ee09f45..00000000000 --- a/lang/librep/patches/patch-configure +++ /dev/null @@ -1,11 +0,0 @@ -$OpenBSD: patch-configure,v 1.4 2009/01/09 17:43:39 naddy Exp $ ---- configure.orig Wed Feb 26 06:24:11 2003 -+++ configure Fri Jan 9 17:38:46 2009 -@@ -8896,6 +8896,7 @@ echo "configure:8896: checking for _nl_msg_cat_cntr" > - if eval "test \"`echo '$''{'ac_cv_func__nl_msg_cat_cntr'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -+ LIBS="-lintl -liconv ${LIBS}" - cat > conftest.$ac_ext < (y)) ? (x) : (y)) -#define MIN(x,y) (((x) < (y)) ? (x) : (y)) -+ +#ifdef __OpenBSD__ + /* MAX and MIN these are defined in on OpenBSD + * We include that here as sometimes it's included in other @@ -17,7 +17,6 @@ +# define MAX(x,y) (((x) > (y)) ? (x) : (y)) +# define MIN(x,y) (((x) < (y)) ? (x) : (y)) +#endif -+ #define POS(x) MAX(x, 0) #define ABS(x) MAX(x, -(x)) diff --git a/lang/librep/pkg/DESCR b/lang/librep/pkg/DESCR index 17d4b1d0781..46fa61a0acd 100644 --- a/lang/librep/pkg/DESCR +++ b/lang/librep/pkg/DESCR @@ -1,8 +1,8 @@ This is a lightweight Lisp environment for UNIX. It contains a Lisp interpreter, byte-code compiler and virtual machine. Applications may -use the Lisp interpreter as an extension language, or it may be used -for standalone scripts. +use the Lisp interpreter as an extension language, or it may be used for +standalone scripts. -Originally inspired by Emacs Lisp, the language dialect combines many -of the elisp features while trying to remove some of the main -deficiencies, with features from Common Lisp and Scheme. +Originally inspired by Emacs Lisp, the language dialect combines many of +the elisp features while trying to remove some of the main deficiencies, +with features from Common Lisp and Scheme. diff --git a/lang/librep/pkg/PLIST b/lang/librep/pkg/PLIST index e01ab9e4cab..6741048e103 100644 --- a/lang/librep/pkg/PLIST +++ b/lang/librep/pkg/PLIST @@ -1,20 +1,23 @@ -@comment $OpenBSD: PLIST,v 1.6 2006/01/03 22:19:26 alek Exp $ -bin/rep +@comment $OpenBSD: PLIST,v 1.7 2009/10/09 13:04:43 jasper Exp $ +%%SHARED%% +@bin bin/rep bin/rep-config -bin/rep-remote +@bin bin/rep-remote bin/rep-xgettext -bin/repdoc +@bin bin/repdoc include/rep.h +include/rep_gh.h include/rep_lisp.h include/rep_regexp.h include/rep_subrs.h @info info/librep.info lib/librep.a lib/librep.la +lib/pkgconfig/librep.pc libexec/rep/ libexec/rep/${VERSION}/ libexec/rep/${VERSION}/${GNU_ARCH}/ -libexec/rep/${VERSION}/${GNU_ARCH}/DOC +libexec/rep/${VERSION}/${GNU_ARCH}/doc-strings libexec/rep/${VERSION}/${GNU_ARCH}/emulate-gnu-tar libexec/rep/${VERSION}/${GNU_ARCH}/gdbm.a libexec/rep/${VERSION}/${GNU_ARCH}/gdbm.la @@ -26,6 +29,9 @@ libexec/rep/${VERSION}/${GNU_ARCH}/rep/ libexec/rep/${VERSION}/${GNU_ARCH}/rep/data/ libexec/rep/${VERSION}/${GNU_ARCH}/rep/data/tables.a libexec/rep/${VERSION}/${GNU_ARCH}/rep/data/tables.la +libexec/rep/${VERSION}/${GNU_ARCH}/rep/ffi.a +libexec/rep/${VERSION}/${GNU_ARCH}/rep/ffi.la +libexec/rep/${VERSION}/${GNU_ARCH}/rep/ffi.so libexec/rep/${VERSION}/${GNU_ARCH}/rep/i18n/ libexec/rep/${VERSION}/${GNU_ARCH}/rep/i18n/gettext.a libexec/rep/${VERSION}/${GNU_ARCH}/rep/i18n/gettext.la @@ -47,6 +53,9 @@ libexec/rep/${VERSION}/${GNU_ARCH}/rep/lang/record-profile.la libexec/rep/${VERSION}/${GNU_ARCH}/rep/util/ libexec/rep/${VERSION}/${GNU_ARCH}/rep/util/md5.a libexec/rep/${VERSION}/${GNU_ARCH}/rep/util/md5.la +libexec/rep/${VERSION}/${GNU_ARCH}/rep/util/utf8.a +libexec/rep/${VERSION}/${GNU_ARCH}/rep/util/utf8.la +libexec/rep/${VERSION}/${GNU_ARCH}/rep/util/utf8.so libexec/rep/${VERSION}/${GNU_ARCH}/rep/vm/ libexec/rep/${VERSION}/${GNU_ARCH}/rep/vm/safe-interpreter.a libexec/rep/${VERSION}/${GNU_ARCH}/rep/vm/safe-interpreter.la @@ -61,7 +70,6 @@ libexec/rep/${GNU_ARCH}/install-aliases libexec/rep/${GNU_ARCH}/libtool libexec/rep/${GNU_ARCH}/rep_config.h libexec/rep/${GNU_ARCH}/rules.mk -share/aclocal/rep.m4 share/emacs/site-lisp/rep-debugger.el share/rep/ share/rep/${VERSION}/ @@ -240,12 +248,8 @@ share/rep/${VERSION}/lisp/rep/vm/compiler/no-lang.jl share/rep/${VERSION}/lisp/rep/vm/compiler/no-lang.jlc share/rep/${VERSION}/lisp/rep/vm/compiler/rep.jl share/rep/${VERSION}/lisp/rep/vm/compiler/rep.jlc -share/rep/${VERSION}/lisp/rep/vm/compiler/scheme.jl -share/rep/${VERSION}/lisp/rep/vm/compiler/scheme.jlc share/rep/${VERSION}/lisp/rep/vm/compiler/src.jl share/rep/${VERSION}/lisp/rep/vm/compiler/src.jlc -share/rep/${VERSION}/lisp/rep/vm/compiler/unscheme.jl -share/rep/${VERSION}/lisp/rep/vm/compiler/unscheme.jlc share/rep/${VERSION}/lisp/rep/vm/compiler/utils.jl share/rep/${VERSION}/lisp/rep/vm/compiler/utils.jlc share/rep/${VERSION}/lisp/rep/vm/disassembler.jl @@ -266,30 +270,5 @@ share/rep/${VERSION}/lisp/rep/xml/reader.jl share/rep/${VERSION}/lisp/rep/xml/reader.jlc share/rep/${VERSION}/lisp/ring.jl share/rep/${VERSION}/lisp/ring.jlc -share/rep/${VERSION}/lisp/scheme/ -share/rep/${VERSION}/lisp/scheme.jl -share/rep/${VERSION}/lisp/scheme.jlc -share/rep/${VERSION}/lisp/scheme/data.jl -share/rep/${VERSION}/lisp/scheme/data.jlc -share/rep/${VERSION}/lisp/scheme/misc.jl -share/rep/${VERSION}/lisp/scheme/misc.jlc -share/rep/${VERSION}/lisp/scheme/syntax-funs.jl -share/rep/${VERSION}/lisp/scheme/syntax-funs.jlc -share/rep/${VERSION}/lisp/scheme/syntax.jl -share/rep/${VERSION}/lisp/scheme/syntax.jlc -share/rep/${VERSION}/lisp/scheme/utils.jl -share/rep/${VERSION}/lisp/scheme/utils.jlc share/rep/${VERSION}/lisp/symbol-table.jl share/rep/${VERSION}/lisp/symbol-table.jlc -share/rep/${VERSION}/lisp/unscheme/ -share/rep/${VERSION}/lisp/unscheme.jl -share/rep/${VERSION}/lisp/unscheme.jlc -share/rep/${VERSION}/lisp/unscheme/data.jl -share/rep/${VERSION}/lisp/unscheme/data.jlc -share/rep/${VERSION}/lisp/unscheme/misc.jl -share/rep/${VERSION}/lisp/unscheme/misc.jlc -share/rep/${VERSION}/lisp/unscheme/syntax-funs.jl -share/rep/${VERSION}/lisp/unscheme/syntax-funs.jlc -share/rep/${VERSION}/lisp/unscheme/syntax.jl -share/rep/${VERSION}/lisp/unscheme/syntax.jlc -%%SHARED%%