Date: Thu, 22 Nov 2012 21:39:32 +0000 (UTC) From: Thierry Thomas <thierry@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r307667 - in head/science/medit: . files Message-ID: <201211222139.qAMLdWL4068897@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: thierry Date: Thu Nov 22 21:39:32 2012 New Revision: 307667 URL: http://svnweb.freebsd.org/changeset/ports/307667 Log: Upgrade to 2012.02.05. Feature safe: yes Added: head/science/medit/files/gttime.c (contents, props changed) head/science/medit/files/patch-sources_lplib3.c (contents, props changed) Modified: head/science/medit/Makefile (contents, props changed) head/science/medit/distinfo (contents, props changed) head/science/medit/files/patch-makefile (contents, props changed) Modified: head/science/medit/Makefile ============================================================================== --- head/science/medit/Makefile Thu Nov 22 20:27:45 2012 (r307666) +++ head/science/medit/Makefile Thu Nov 22 21:39:32 2012 (r307667) @@ -1,12 +1,8 @@ -# New ports collection makefile for: Medit -# Date created: Sep 24, 2006 -# Whom: Thierry Thomas <thierry@pompo.net> -# +# Created by: Thierry Thomas <thierry@pompo.net> # $FreeBSD$ PORTNAME= medit -PORTVERSION= 2011.03.06 -PORTREVISION= 1 +PORTVERSION= 2012.02.05 CATEGORIES= science graphics MASTER_SITES= http://www.ann.jussieu.fr/~frey/ftp/archives/ EXTRACT_SUFX= .tgz @@ -16,6 +12,8 @@ EXTRACT_ONLY= ${SOURCETARB} MAINTAINER= thierry@FreeBSD.org COMMENT= Interactive meshes visualization +BUILD_DEPENDS= ${LOCALBASE}/include/cfortran.h:${PORTSDIR}/lang/cfortran + USE_XORG= x11 xmu xext USE_GL= glut USE_GMAKE= yes @@ -24,9 +22,7 @@ ALL_TARGET= ${OPSYS} MAKE_ENV= WRKSRC="${WRKSRC}" ARCHI=${OPSYS} ARCH=${ARCH} OSREL=${OSREL} NO_WRKSUBDIR= yes -# medit-2011.03.06 does not compile with library.2011.03.06 -#LIBVERSION= ${PORTVERSION} -LIBVERSION= 2010.05.20 +LIBVERSION= ${PORTVERSION} SOURCETARB= ${PORTNAME}.${PORTVERSION}${EXTRACT_SUFX} LIBTARBALL= library.${LIBVERSION}${EXTRACT_SUFX} @@ -43,6 +39,10 @@ PLIST_DIRS= %%EXAMPLESDIR%% post-extract: cd ${WRKDIR} && \ ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${_DISTDIR}/${LIBTARBALL} ${EXTRACT_AFTER_ARGS} --exclude ${MAKEFILE} + ${CP} ${FILESDIR}/gttime.c ${WRKSRC}/sources/ +.for l in lplib2.c lplib2.h + ${MV} ${WRKSRC}/sources/${l} ${WRKSRC}/sources/${l}.old +.endfor pre-build: ${MKDIR} ${WRKSRC}/bin/${ARCH}/${OSREL} Modified: head/science/medit/distinfo ============================================================================== --- head/science/medit/distinfo Thu Nov 22 20:27:45 2012 (r307666) +++ head/science/medit/distinfo Thu Nov 22 21:39:32 2012 (r307667) @@ -1,6 +1,6 @@ -SHA256 (medit.2011.03.06.tgz) = 4f4e8f35c6ea43f5f98bf772138c0801a8e592f5cc1313071b59e1d89043d0c2 -SIZE (medit.2011.03.06.tgz) = 207904 -SHA256 (library.2010.05.20.tgz) = 47c00e3683b7a4919684003f000de45df7a262743956a4634e11ee70058cd0ca -SIZE (library.2010.05.20.tgz) = 27075 +SHA256 (medit.2012.02.05.tgz) = 75794b5993edfa47d7bea0bdb4471fd14f30da1429d90e3b5d9bd6cd10f66ba0 +SIZE (medit.2012.02.05.tgz) = 217993 +SHA256 (library.2012.02.05.tgz) = 192150663cf054d6961f4784dcb6518a0c7a9c107a3645696c8406f57b122f7f +SIZE (library.2012.02.05.tgz) = 34060 SHA256 (meshes.tar.gz) = 643869e1d797bf5c40024465d323ea3ae10477e687b6625be3f880cc6743298b SIZE (meshes.tar.gz) = 2136831 Added: head/science/medit/files/gttime.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/science/medit/files/gttime.c Thu Nov 22 21:39:32 2012 (r307667) @@ -0,0 +1,55 @@ +/* Ftools info: $Header: /software/lheasoft/lheavc/ftools_42/src/ftoolslib/unx/gttime.c,v 1.1 1998/06/26 03:19:14 guerber Exp $ */ +/*************************************************************************** + * + * gttime: Get current system time, returning hours, minutes, and seconds + * as integers. Time will be UTC if available, else local. + * + * This is a reimplementation of /library/utilties/unx/gttime.f, reading + * the standard C time structure instead of calling xanlib's gettim, which + * uses the system-dependent fdate() call. + * + * To get the system date as integers, use the Cfitsio routine ffgsdt/ftgsdt. + * + * AUTHOR: Jeff Guerber, Raytheon STX / NASA-GSFC, June 25, 1998. + * Based largely on the cfitsio function ffgsdt(). + * + * MODIFICATION HISTORY: + * $Log: gttime.c,v $ + * Revision 1.1 1998/06/26 03:19:14 guerber + * Get system time, returning integers. Replaces library/utilities/unx/gttime.f. + * + * + ***************************************************************************/ + +/*************************************************************************** + * $FreeBSD$ + * Downloaded by thierry@FreeBSD.org on Nov. 22 2012 + * from ftp://legacy.gsfc.nasa.gov/software/ftools/release/FTools_4.2/ftools_42/src/ftoolslib/unx/gttime.c + * See http://heasarc.gsfc.nasa.gov/docs/software/ftools/ftools_menu.html + * FV License Agreement: http://heasarc.gsfc.nasa.gov/docs/software/ftools/fv/doc/license.html + * + ***************************************************************************/ +#include <stdio.h> +#include <time.h> +#include <cfortran.h> + +void gttime( int *hr, int *min, int *sec ) +{ + time_t sysclk; + struct tm *timep; + + sysclk = time( NULL ); + timep = gmtime( &sysclk ); + + if ( timep == NULL ) { /* UTC isn't available so use local time */ + timep = localtime( &sysclk ); + } + + *hr = timep->tm_hour; + *min = timep->tm_min; + *sec = timep->tm_sec; + + return; +} + +FCALLSCSUB3(gttime,GTTIME,gttime,PINT,PINT,PINT) Modified: head/science/medit/files/patch-makefile ============================================================================== --- head/science/medit/files/patch-makefile Thu Nov 22 20:27:45 2012 (r307666) +++ head/science/medit/files/patch-makefile Thu Nov 22 21:39:32 2012 (r307667) @@ -16,7 +16,7 @@ + $(MAKE) $(MFLAGS) -f Makefile.arch \ + "prog = medit" \ + "INCDIR = -I. -I$(WRKSRC)/sources -I$(LOCALBASE)/include" \ -+ "XLIBS = -L$(LOCALBASE)/lib -lXmu -lXext -lX11" \ ++ "XLIBS = -L$(LOCALBASE)/lib -lXmu -lXext -lX11 -lpmc" \ + "GL_LIB = -lGL" \ + "GLU_LIB = -lGLU" \ + "GLUT_LIB = -lglut" \ Added: head/science/medit/files/patch-sources_lplib3.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/science/medit/files/patch-sources_lplib3.c Thu Nov 22 21:39:32 2012 (r307667) @@ -0,0 +1,21 @@ +--- sources/lplib3.c.orig 2011-03-15 11:22:22.000000000 +0100 ++++ sources/lplib3.c 2012-11-22 22:25:15.000000000 +0100 +@@ -29,6 +29,10 @@ + #include <stdbool.h> + #include <assert.h> + #include <errno.h> ++#ifdef __FreeBSD__ ++# include <sys/types.h> ++# include <pmc.h> ++#endif + #include "lplib3.h" + + +@@ -1244,6 +1248,7 @@ + goto f1; + errno = 0; + #ifdef __FreeBSD__ ++ int ncpu; + if (maxthreads == 0) { + /* + * Other candidates:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201211222139.qAMLdWL4068897>