Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 20 Nov 2009 23:25:52 GMT
From:      Alexey Shuvaev <shuvaev@physik.uni-wuerzburg.de>
To:        freebsd-gnats-submit@FreeBSD.org
Subject:   ports/140730: [UPDATE] science/libctl to 3.1 and take maintainership
Message-ID:  <200911202325.nAKNPqvG093985@www.freebsd.org>
Resent-Message-ID: <200911202330.nAKNU4Gg054511@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         140730
>Category:       ports
>Synopsis:       [UPDATE] science/libctl to 3.1 and take maintainership
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Fri Nov 20 23:30:03 UTC 2009
>Closed-Date:
>Last-Modified:
>Originator:     Alexey Shuvaev
>Release:        9.0-CURRENT
>Organization:
University of Wuerzburg
>Environment:
FreeBSD wep4035 9.0-CURRENT FreeBSD 9.0-CURRENT #0 r199525: Thu Nov 19 15:24:46 CET 2009     root@wep4035:/usr/obj/usr/src/sys/GENERIC  amd64
>Description:
Update science/libctl to version 3.1 and take maintainership.

ChangeLog:

5 June 2008

    * Support specifying the location of the guile and guile-config programs
      with GUILE and GUILE_CONFIG environment variables in the configure script.
    * Support for calling NLopt optimization library (also requires
      the program using libctl to be changed to link nlopt).
    * New ellipsoid_overlap_with_object function, analogous
      to box_overlap_with_object function.
    * Bug fix in include function for recent versions of Guile,
      to properly keep track of the current include directory.
    * Bug fix in numerical-derivative routine, which didn't converge
      when the error was exactly zero.

This requires to bump PORTREVISION of science/mpb. While there I can
take the maintainership of mpb too (however there were not so many changes
recently).

Inlining the patch for science/mpb:

diff -ruN mpb.orig/Makefile mpb/Makefile
--- mpb.orig/Makefile   2009-09-15 16:21:56.000000000 +0200
+++ mpb/Makefile        2009-11-21 00:12:53.000000000 +0100
@@ -12,13 +12,13 @@
 CATEGORIES=    science
 MASTER_SITES=  http://ab-initio.mit.edu/mpb/
 
-MAINTAINER=    ports@FreeBSD.org
+MAINTAINER=    shuvaev@physik.uni-wuerzburg.de
 COMMENT=       MIT Photonic-Bands
 
 BUILD_DEPENDS= bash:${PORTSDIR}/shells/bash
 LIB_DEPENDS=   fftw.2:${PORTSDIR}/math/fftw \
                hdf5.0:${PORTSDIR}/science/hdf5 \
-               ctl.3:${PORTSDIR}/science/libctl \
+               ctl.4:${PORTSDIR}/science/libctl \
                guile.20:${PORTSDIR}/lang/guile
 
 USE_FORTRAN=   yes

>How-To-Repeat:

>Fix:


Patch attached with submission follows:

diff -ruN libctl.orig/Makefile libctl/Makefile
--- libctl.orig/Makefile	2009-09-15 16:21:56.000000000 +0200
+++ libctl/Makefile	2009-11-21 00:12:14.000000000 +0100
@@ -7,12 +7,11 @@
 #
 
 PORTNAME=	libctl
-PORTVERSION=	3.0.3
-PORTREVISION=	5
+PORTVERSION=	3.1
 CATEGORIES=	science math
 MASTER_SITES=	http://ab-initio.mit.edu/libctl/
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	shuvaev@physik.uni-wuerzburg.de
 COMMENT=	Control Language Library
 
 LIB_DEPENDS=	guile.20:${PORTSDIR}/lang/guile
@@ -32,11 +31,15 @@
 post-install:
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
-	${CP} -R ${WRKSRC}/doc/ ${DOCSDIR}
+	${INSTALL_MAN} ${WRKSRC}/doc/* ${DOCSDIR}
 .endif
 .if !defined(NOPORTEXAMPLES)
 	@${MKDIR} ${EXAMPLESDIR}
-	${CP} -R ${WRKSRC}/examples/ ${EXAMPLESDIR}
+	${INSTALL_DATA} ${WRKSRC}/examples/Makefile.am ${EXAMPLESDIR}
+	${INSTALL_DATA} ${WRKSRC}/examples/README ${EXAMPLESDIR}
+	${INSTALL_DATA} ${WRKSRC}/examples/example.c ${EXAMPLESDIR}
+	${INSTALL_DATA} ${WRKSRC}/examples/example.scm.in ${EXAMPLESDIR}
+	${INSTALL_DATA} ${WRKSRC}/examples/run.ctl ${EXAMPLESDIR}
 .endif
 
 .include <bsd.port.post.mk>
diff -ruN libctl.orig/distinfo libctl/distinfo
--- libctl.orig/distinfo	2008-08-08 18:39:02.000000000 +0200
+++ libctl/distinfo	2009-11-20 20:52:44.000000000 +0100
@@ -1,3 +1,3 @@
-MD5 (libctl-3.0.3.tar.gz) = e014c8a27bff041eb6cb9bb0576464a1
-SHA256 (libctl-3.0.3.tar.gz) = f3b29b45e34a13169aaa9846521c39d3dd3ebccf0c794ff0a84829e53d8d32a7
-SIZE (libctl-3.0.3.tar.gz) = 452536
+MD5 (libctl-3.1.tar.gz) = 173fdc658b652a4ddfb983efc849e760
+SHA256 (libctl-3.1.tar.gz) = 9001f95efa0812b6b76220f2de1edcb512f9c26764df63680fc37c8c9684eee5
+SIZE (libctl-3.1.tar.gz) = 460108
diff -ruN libctl.orig/pkg-plist libctl/pkg-plist
--- libctl.orig/pkg-plist	2008-08-08 18:39:02.000000000 +0200
+++ libctl/pkg-plist	2009-11-20 23:33:33.000000000 +0100
@@ -5,11 +5,11 @@
 lib/libctl.a
 lib/libctl.la
 lib/libctl.so
-lib/libctl.so.3
+lib/libctl.so.4
 lib/libctlgeom.a
 lib/libctlgeom.la
 lib/libctlgeom.so
-lib/libctlgeom.so.3
+lib/libctlgeom.so.4
 %%PORTDOCS%%%%DOCSDIR%%/advanced-user.html
 %%PORTDOCS%%%%DOCSDIR%%/basic-user.html
 %%PORTDOCS%%%%DOCSDIR%%/developer.html
@@ -18,27 +18,10 @@
 %%PORTDOCS%%%%DOCSDIR%%/introduction.html
 %%PORTDOCS%%%%DOCSDIR%%/license.html
 %%PORTDOCS%%%%DOCSDIR%%/user-ref.html
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/.deps/example-ctl-io.Po
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/.deps/example-example.Po
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/.deps/example-geom.Po
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/.deps/example-main.Po
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/.libs/example
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Makefile
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/Makefile.am
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Makefile.in
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/README
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ctl-io.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ctl-io.h
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example-ctl-io.o
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example-example.o
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example-geom.o
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example-main.o
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/example.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example.scm
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/example.scm.in
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/geom.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/main.c
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/run.ctl
 %%DATADIR%%/base/class.scm
 %%DATADIR%%/base/ctl.scm
@@ -56,10 +39,10 @@
 %%DATADIR%%/utils/ctl-io.scm
 %%DATADIR%%/utils/geom.c
 %%DATADIR%%/utils/geom.scm
+%%DATADIR%%/utils/nlopt-constants.scm
+%%DATADIR%%/utils/nlopt.c
 @dirrm %%DATADIR%%/utils
 @dirrm %%DATADIR%%/base
 @dirrm %%DATADIR%%
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/.libs
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/.deps
 %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
 %%PORTDOCS%%@dirrm %%DOCSDIR%%


>Release-Note:
>Audit-Trail:
>Unformatted:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200911202325.nAKNPqvG093985>