From 785b6b6e235f48cc4a5162adcbfed032f5b9601e Mon Sep 17 00:00:00 2001 From: jtb Date: Sun, 21 Jan 2001 04:49:44 +0000 Subject: Updated libctl to version 1.3 . From the NEWS file: * Added improved "subplex" multidimensional optimization algorithm (for maximize-multiple and minimize-multiple). * Documented vector3-x, vector3-y, vector3-z functions for extracting vector3 components. --- devel/libctl/Makefile | 8 ++++---- devel/libctl/files/md5 | 4 ++-- devel/libctl/files/patch-sum | 8 ++++---- devel/libctl/patches/patch-aa | 22 ++++++++++------------ devel/libctl/patches/patch-ab | 34 +++++++++++++++------------------- devel/libctl/patches/patch-ac | 4 ++-- devel/libctl/pkg/DESCR | 2 +- devel/libctl/pkg/PLIST | 4 ++-- 8 files changed, 40 insertions(+), 46 deletions(-) (limited to 'devel') diff --git a/devel/libctl/Makefile b/devel/libctl/Makefile index a7a48b412b9..0053d2e9ee5 100644 --- a/devel/libctl/Makefile +++ b/devel/libctl/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.2 2000/12/10 05:44:32 jtb Exp $ +# $NetBSD: Makefile,v 1.3 2001/01/21 04:49:44 jtb Exp $ -DISTNAME= libctl-1.2 +DISTNAME= libctl-1.3 CATEGORIES= devel MASTER_SITES= http://superjdj.mit.edu/libctl/ @@ -8,14 +8,14 @@ MAINTAINER= jtb@netbsd.org HOMEPAGE= http://ab-initio.mit.edu/libctl/ DEPENDS+= guile-[0-9]*:../../lang/guile -BUILD_DEPENDS+= ${LOCALBASE}/bin/autoreconf:../../devel/autoconf +BUILD_DEPENDS+= autoreconf:../../devel/autoconf WRKSRC= ${WRKDIR}/${DISTNAME} GNU_CONFIGURE= YES USE_LIBTOOL= YES pre-configure: - @(cd ${WRKSRC} && ${LOCALBASE}/bin/autoreconf 2>/dev/null) + (cd ${WRKSRC} && ${LOCALBASE}/bin/autoreconf) post-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/libctl diff --git a/devel/libctl/files/md5 b/devel/libctl/files/md5 index fa787d0cf9c..87eff286d71 100644 --- a/devel/libctl/files/md5 +++ b/devel/libctl/files/md5 @@ -1,3 +1,3 @@ -$NetBSD: md5,v 1.1.1.1 2000/11/25 21:34:10 jtb Exp $ +$NetBSD: md5,v 1.2 2001/01/21 04:49:45 jtb Exp $ -MD5 (libctl-1.2.tar.gz) = 2252d4762c198f5cc6fedc4feb555db0 +MD5 (libctl-1.3.tar.gz) = 1f042d3ba3d171aca7d4ae06ebd487f1 diff --git a/devel/libctl/files/patch-sum b/devel/libctl/files/patch-sum index 60bf4994a07..949d16c2d04 100644 --- a/devel/libctl/files/patch-sum +++ b/devel/libctl/files/patch-sum @@ -1,5 +1,5 @@ -$NetBSD: patch-sum,v 1.3 2000/12/10 06:02:09 jtb Exp $ +$NetBSD: patch-sum,v 1.4 2001/01/21 04:49:45 jtb Exp $ -MD5 (patch-aa) = 75141dd9d046660c6bb04ae3583b21d8 -MD5 (patch-ab) = 718341dabf44fdd7bcb9f5895a63007c -MD5 (patch-ac) = 7fc8b0ccd9960a380429963ba08055c3 +MD5 (patch-aa) = f6a80f7596a418bcd0cf6febacc99fa0 +MD5 (patch-ab) = 18f322867edec4c2c58a49f7812608c9 +MD5 (patch-ac) = a5c696e2cd5a5e9ac5c21f97522c54fd diff --git a/devel/libctl/patches/patch-aa b/devel/libctl/patches/patch-aa index 0fc830114f1..6841324cefe 100644 --- a/devel/libctl/patches/patch-aa +++ b/devel/libctl/patches/patch-aa @@ -1,15 +1,13 @@ -$NetBSD: patch-aa,v 1.1.1.1 2000/11/25 21:34:05 jtb Exp $ +$NetBSD: patch-aa,v 1.2 2001/01/21 04:49:45 jtb Exp $ ---- configure.in.orig Thu Mar 16 12:10:25 2000 +--- configure.in.orig +++ configure.in -@@ -10,7 +10,9 @@ - AC_PROG_CC - AC_PROG_MAKE_SET - AC_PROG_INSTALL --AC_PROG_RANLIB -+ -+AC_PATH_PROG(LIBTOOL, libtool, libtool) -+AC_SUBST(LIBTOOL) +@@ -115,7 +115,7 @@ + # so that examples/Makefile.in can be used as-is for other programs: + CPPFLAGS="$CPPFLAGS -I`pwd`/$srcdir/base -I`pwd`/$srcdir/utils" + LDFLAGS="$LDFLAGS -L`pwd`/$srcdir/base" +-LIBS="-lctl $LIBS" ++#LIBS="-lctl $LIBS" - AC_CHECK_PROGS(INDENT, indent gindent, echo) - AC_SUBST(INDENT) + LIBCTL_DIR="`pwd`/$srcdir" + AC_SUBST(LIBCTL_DIR) diff --git a/devel/libctl/patches/patch-ab b/devel/libctl/patches/patch-ab index 95817ff008a..97a76627620 100644 --- a/devel/libctl/patches/patch-ab +++ b/devel/libctl/patches/patch-ab @@ -1,51 +1,47 @@ -$NetBSD: patch-ab,v 1.3 2000/12/10 05:54:37 jtb Exp $ +$NetBSD: patch-ab,v 1.4 2001/01/21 04:49:45 jtb Exp $ ---- base/Makefile.in.orig Sat Oct 28 11:38:01 2000 +--- base/Makefile.in.orig Thu Jul 13 20:40:36 2000 +++ base/Makefile.in -@@ -7,12 +7,11 @@ - CPPFLAGS = @CPPFLAGS@ -I. - LDFLAGS = @LDFLAGS@ - LIBS = @LIBS@ --RANLIB = @RANLIB@ -+LIBTOOL= @LIBTOOL@ - @SET_MAKE@ +@@ -12,7 +12,7 @@ INSTALL = @INSTALL@ prefix = @prefix@ -AR = ar ++#AR = ar all: libs -@@ -20,18 +19,17 @@ +@@ -20,18 +20,17 @@ math-utils.scm vector3.scm extern-funcs.scm interaction.scm \ matrix3x3.scm simplex.scm - OBJECTS = ctl.o + OBJECTS = ctl.o subplex.o -LIBNAME = libctl.a -+LIBNAME = libctl ++LIBNAME = libctl.la libs: $(LIBNAME) -libctl.a: $(OBJECTS) -+libctl: $(OBJECTS) - rm -f $@ +- rm -f $@ - $(AR) r $@ $(OBJECTS) - $(RANLIB) $@ -+ @$(LIBTOOL) $(CC) -O -o $@.la $(OBJECTS:.o=.lo) -rpath $(prefix)/lib -version-info 0:0 ++libctl.la: $(OBJECTS) ++ $(LIBTOOL) --mode=link $(CC) $(CFLAGS) -o $@ $(OBJECTS.o=.lo) \ ++ $(LIBS) -rpath $(prefix)/lib -version-info 0:0 install: $(INSTALL) -d $(prefix)/lib - $(INSTALL) -m 0644 $(LIBNAME) $(prefix)/lib -+ @$(LIBTOOL) --mode=install $(INSTALL) $(LIBNAME).la $(prefix)/lib ++ $(LIBTOOL) --mode=install $(BSD_INSTALL_DATA) $(LIBNAME) $(prefix)/lib $(INSTALL) -d $(prefix)/include $(INSTALL) -m 0644 ctl.h $(prefix)/include $(INSTALL) -d $(prefix)/share/libctl/base -@@ -41,7 +39,7 @@ +@@ -41,7 +40,7 @@ $(INSTALL) -m 0644 main.c $(prefix)/share/libctl/base .c.o: - $(CC) -c $(CPPFLAGS) $(CFLAGS) $< -o $@ -+ @$(LIBTOOL) $(CC) -c $(CPPFLAGS) $(CFLAGS) $< -o $@ ++ $(LIBTOOL) --mode=compile $(CC) -c $(CPPFLAGS) $(CFLAGS) $< -o $@ clean: - rm -f $(OBJECTS) core $(LIBNAME) -+ rm -rf $(OBJECTS) $(OBJECTS:.o=.lo) core $(LIBNAME).la .libs ++ rm -fr $(OBJECTS) $(OBJECTS:.o=.lo) core $(LIBNAME) .libs diff --git a/devel/libctl/patches/patch-ac b/devel/libctl/patches/patch-ac index 14c95c38bf5..f0c6a3b335c 100644 --- a/devel/libctl/patches/patch-ac +++ b/devel/libctl/patches/patch-ac @@ -1,6 +1,6 @@ -$NetBSD: patch-ac,v 1.3 2000/12/10 05:54:37 jtb Exp $ +$NetBSD: patch-ac,v 1.4 2001/01/21 04:49:45 jtb Exp $ ---- Makefile.in.orig Sat Oct 28 12:00:42 2000 +--- Makefile.in.orig Sun Jan 21 03:58:06 2001 +++ Makefile.in @@ -16,7 +16,7 @@ # Subdirectories to make in: diff --git a/devel/libctl/pkg/DESCR b/devel/libctl/pkg/DESCR index ddf4487670e..b3c28c23aba 100644 --- a/devel/libctl/pkg/DESCR +++ b/devel/libctl/pkg/DESCR @@ -12,7 +12,7 @@ work for us, and allows us to embed a complete interpreter in a program with minimal effort. Despite its power, libctl is designed to be easy to use. A basic user -only sees a convenient file format...with a programming language to +only sees a convenient file format with a programming language to back it up if her needs become more complex. For the programmer, all headaches associated with reading input files are lifted--once an abstract specification is supplied, all interaction with the user is diff --git a/devel/libctl/pkg/PLIST b/devel/libctl/pkg/PLIST index 3fc44162f5a..49da79951f3 100644 --- a/devel/libctl/pkg/PLIST +++ b/devel/libctl/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.3 2001/01/04 15:10:29 agc Exp $ +@comment $NetBSD: PLIST,v 1.4 2001/01/21 04:49:45 jtb Exp $ bin/gen-ctl-io include/ctl.h include/ctlgeom.h @@ -6,7 +6,7 @@ lib/libctl.a lib/libctl.la lib/libctl.so lib/libctl.so.0 -lib/libctl.so.0.0 +lib/libctl.so.0.1 man/man1/gen-ctl-io.1 share/doc/libctl/COPYING share/doc/libctl/COPYRIGHT -- cgit v1.2.3