diff options
| -rw-r--r-- | math/gnumeric/Makefile | 14 | ||||
| -rw-r--r-- | math/gnumeric/distinfo | 4 | ||||
| -rw-r--r-- | math/gnumeric/files/patch-doc_C_Makefile.in | 6 | ||||
| -rw-r--r-- | math/gnumeric/files/patch-src_tools_solver_lp_solve_commonlib.c | 8 | ||||
| -rw-r--r-- | math/gnumeric/files/patch-src_tools_solver_lp_solve_lp_solve.c | 25 |
5 files changed, 33 insertions, 24 deletions
diff --git a/math/gnumeric/Makefile b/math/gnumeric/Makefile index 6270f0788..65e62e31d 100644 --- a/math/gnumeric/Makefile +++ b/math/gnumeric/Makefile @@ -3,11 +3,11 @@ # Whom: Yukihiro Nakai <Nakai@technologist.com> # # $FreeBSD$ -# $MCom: ports/math/gnumeric/Makefile,v 1.9 2005/08/16 06:09:38 marcus Exp $ +# $MCom: ports/math/gnumeric/Makefile,v 1.10 2005/08/19 02:18:00 mezz Exp $ # PORTNAME= gnumeric -PORTVERSION= 1.5.3 +PORTVERSION= 1.5.4 CATEGORIES= math gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:R} @@ -37,7 +37,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \ GCONF_SCHEMAS= gnumeric-dialogs.schemas gnumeric-general.schemas \ gnumeric-plugins.schemas -MAN1= gnumeric.1 ssconvert.1 +MAN1= gnumeric.1 ssconvert.1 ssindex.1 PLIST_SUB= VERSION=${PORTVERSION} @@ -50,14 +50,6 @@ PLIST_SUB+= PERL="" .endif post-patch: - @cd ${WRKSRC} && ${REINPLACE_CMD} -e 's,malloc.h,stdlib.h,' \ - src/tools/solver/lp_solve/commonlib.h \ - src/tools/solver/lp_solve/fortify.c \ - src/tools/solver/lp_solve/lp_Hash.c \ - src/tools/solver/lp_solve/lp_etaPFI.c \ - src/tools/solver/lp_solve/lp_lib.h \ - src/tools/solver/lp_solve/lp_rlp.c \ - src/tools/solver/lp_solve/lp_rlpt.c @${FIND} ${WRKSRC}/plugins -name "plugin.xml.in" | ${XARGS} \ ${REINPLACE_CMD} -e 's|\.la|.so|g' @${FIND} ${WRKSRC}/src/cut-n-paste-code/goffice/graph/plugins -name \ diff --git a/math/gnumeric/distinfo b/math/gnumeric/distinfo index ad5be5b07..5853bc5a1 100644 --- a/math/gnumeric/distinfo +++ b/math/gnumeric/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/gnumeric-1.5.3.tar.bz2) = 2b0496fc7ec3d407f3aebcc29b8e4b2b -SIZE (gnome2/gnumeric-1.5.3.tar.bz2) = 12290411 +MD5 (gnome2/gnumeric-1.5.4.tar.bz2) = a5d5b564d582206a01760fd995b7b02b +SIZE (gnome2/gnumeric-1.5.4.tar.bz2) = 12544897 diff --git a/math/gnumeric/files/patch-doc_C_Makefile.in b/math/gnumeric/files/patch-doc_C_Makefile.in index 4019754d1..e57406a0f 100644 --- a/math/gnumeric/files/patch-doc_C_Makefile.in +++ b/math/gnumeric/files/patch-doc_C_Makefile.in @@ -1,11 +1,11 @@ ---- doc/C/Makefile.in.orig Tue Aug 16 01:15:11 2005 -+++ doc/C/Makefile.in Tue Aug 16 01:16:17 2005 +--- doc/C/Makefile.in.orig Sun Aug 28 15:46:13 2005 ++++ doc/C/Makefile.in Sun Aug 28 15:49:24 2005 @@ -421,7 +421,7 @@ CLEANFILES = omf_timestamp omf_dest_dir = $(datadir)/omf/@PACKAGE@ scrollkeeper_localstate_dir = /var/db/scrollkeeper -manpagedir = $(datadir)/man/man1 +manpagedir = $(prefix)/man/man1 - manpage_DATA = gnumeric.1 ssconvert.1 + manpage_DATA = gnumeric.1 ssconvert.1 ssindex.1 all: all-recursive diff --git a/math/gnumeric/files/patch-src_tools_solver_lp_solve_commonlib.c b/math/gnumeric/files/patch-src_tools_solver_lp_solve_commonlib.c deleted file mode 100644 index 64f9f0c07..000000000 --- a/math/gnumeric/files/patch-src_tools_solver_lp_solve_commonlib.c +++ /dev/null @@ -1,8 +0,0 @@ ---- src/tools/solver/lp_solve/commonlib.c.orig Tue Jan 18 00:16:36 2005 -+++ src/tools/solver/lp_solve/commonlib.c Tue Jan 18 00:19:24 2005 -@@ -1,4 +1,5 @@ - -+#include <gnumeric-config.h> - #include <sys/types.h> - - #ifdef INTEGERTIME diff --git a/math/gnumeric/files/patch-src_tools_solver_lp_solve_lp_solve.c b/math/gnumeric/files/patch-src_tools_solver_lp_solve_lp_solve.c new file mode 100644 index 000000000..61a15d5d0 --- /dev/null +++ b/math/gnumeric/files/patch-src_tools_solver_lp_solve_lp_solve.c @@ -0,0 +1,25 @@ +--- src/tools/solver/lp_solve/lp_solve.c.orig Sun Aug 28 16:01:54 2005 ++++ src/tools/solver/lp_solve/lp_solve.c Sun Aug 28 16:04:24 2005 +@@ -7,7 +7,7 @@ + #include <stdlib.h> + #include <errno.h> + #include <time.h> +-#include <sys/timeb.h> ++#include <sys/time.h> + + #define LoadInverseLib FALSE + #define LoadLanguageLib FALSE +@@ -15891,10 +15891,10 @@ static double timeNow(void) + #elif defined CLOCKTIME + return((double)clock()/CLOCKS_PER_SEC /* CLK_TCK */); + #else +- struct timeb buf; ++ struct timeval tp; + +- ftime(&buf); +- return((double)buf.time+((double) buf.millitm)/1000.0); ++ (void)gettimeofday(&tp, NULL); ++ return((double)tp.tv_sec+((double) (tp.tv_usec*1000))/1000.0); + #endif + } + |