1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-23 04:23:08 +00:00

- Update to 2.3.0

- Fix build on 64 bits platforms
- Adopt maintainship

Approved by:	miwi (mentor)
This commit is contained in:
Pietro Cerutti 2008-02-26 17:07:04 +00:00
parent 69f3dc450a
commit 6188dd1db3
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=207950
5 changed files with 91 additions and 23 deletions

View File

@ -6,13 +6,12 @@
# $FreeBSD$
PORTNAME= movingmotif
PORTVERSION= 2.2.0
PORTREVISION= 2
PORTVERSION= 2.3.0
CATEGORIES= x11-toolkits
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= ports@FreeBSD.org
MAINTAINER= gahr@FreeBSD.org
COMMENT= Display scientific data as dynamic plot
USE_MOTIF= yes
@ -22,10 +21,8 @@ USE_LDCONFIG= yes
.include <bsd.port.pre.mk>
.if ${OSVERSION} >= 700042
.if ${ARCH} == "sparc64"
BROKEN= Does not compile with GCC 4.2
.endif
CONFIGURE_ENV+= CFLAGS="-O0"
.endif
.include <bsd.port.post.mk>

View File

@ -1,3 +1,3 @@
MD5 (movingmotif-2.2.0.tar.gz) = c27bf61d5ea444b5564a4268665ca896
SHA256 (movingmotif-2.2.0.tar.gz) = ff01b9a7bb8b86047159ef9b6595de00225227931f98a8e8b1bd321e61a3616e
SIZE (movingmotif-2.2.0.tar.gz) = 370223
MD5 (movingmotif-2.3.0.tar.gz) = 126a36ae236075af5ff9d7bc68c087c2
SHA256 (movingmotif-2.3.0.tar.gz) = 20bf6c061de80c9a27de8cb9373017fe5f7223d68b205076fabe4c24570dd0b2
SIZE (movingmotif-2.3.0.tar.gz) = 438133

View File

@ -1,10 +1,20 @@
--- src/WHistbar.c.orig Sat Sep 14 02:50:22 2002
+++ src/WHistbar.c Sat Sep 14 02:50:27 2002
@@ -78,7 +78,6 @@
#endif
#include <math.h>
#include <limits.h>
-#include <values.h>
#include <X11/Xlib.h>
#include<Xm/PrimitiveP.h>
#include<Xm/DrawP.h>
--- src/WHistbar.c.orig 2008-02-20 09:44:34.000000000 +0100
+++ src/WHistbar.c 2008-02-20 09:48:53.000000000 +0100
@@ -1140,7 +1140,7 @@
colorpix[0] = cw->histbar.bars[ID].color;
colorpix[1] = cw->histbar.bars[ID].shadecolor;
XFreeColors(XtDisplay(cw), DefaultColormap(XtDisplay(cw)
- ,DefaultScreen(XtDisplay(cw))),colorpix,2,(int)NULL);
+ ,DefaultScreen(XtDisplay(cw))),colorpix,2,0);
}
}
@@ -1930,7 +1930,7 @@
colorpix[0] = cw->histbar.bars[ID].color;
colorpix[1] = cw->histbar.bars[ID].shadecolor;
XFreeColors(XtDisplay(w), DefaultColormap(XtDisplay(w)
- ,DefaultScreen(XtDisplay(w))),colorpix,2,(int)NULL);
+ ,DefaultScreen(XtDisplay(w))),colorpix,2,0);
cw->histbar.bars[ID].color = color;
Gethistbarcolours (cw , &(cw->histbar.bars[ID]) );

View File

@ -1,7 +1,11 @@
--- demo/Makefile.in.orig Wed Sep 25 01:04:47 2002
+++ demo/Makefile.in Sat Oct 12 15:10:51 2002
@@ -114,12 +114,12 @@
bin_PROGRAMS = ezdrawtest Scrollingtest histbar Rottest
--- demo/Makefile.in.orig 2003-12-27 14:27:04.000000000 +0100
+++ demo/Makefile.in 2008-02-20 10:09:07.000000000 +0100
@@ -111,20 +111,20 @@
xmVer = @xmVer@
SUBDIRS = mindsrc
-bin_PROGRAMS = ezdrawtest Scrollingtest histbar Rottest Spectrtest
+bin_PROGRAMS = ezdrawtest Scrollingtest histbar Rottest
ezdrawtest_SOURCES = ezdrawtest.c
-ezdrawtest_LDADD = -L$(top_builddir)/src -lmovingmotif -L$(top_builddir)/demo/mindsrc -lmindsrc
@ -16,3 +20,32 @@
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_CLEAN_FILES =
bin_PROGRAMS = ezdrawtest$(EXEEXT) Scrollingtest$(EXEEXT) \
-histbar$(EXEEXT) Rottest$(EXEEXT) Spectrtest$(EXEEXT)
+histbar$(EXEEXT) Rottest$(EXEEXT)
PROGRAMS = $(bin_PROGRAMS)
@@ -153,11 +153,6 @@
Rottest_LDADD = $(LDADD)
Rottest_DEPENDENCIES =
Rottest_LDFLAGS =
-Spectrtest_SOURCES = histspectrtest.c
-Spectrtest_OBJECTS = histspectrtest.$(OBJEXT)
-Spectrtest_LDADD = $(LDADD)
-Spectrtest_DEPENDENCIES =
-Spectrtest_LDFLAGS =
COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
CCLD = $(CC)
@@ -268,10 +263,6 @@
@rm -f Rottest$(EXEEXT)
$(LINK) $(Rottest_LDFLAGS) $(Rottest_OBJECTS) $(Rottest_LDADD) $(LIBS)
-Spectrtest$(EXEEXT): $(Spectrtest_OBJECTS) $(Spectrtest_DEPENDENCIES)
- @rm -f Spectrtest$(EXEEXT)
- $(LINK) $(Spectrtest_LDFLAGS) $(Spectrtest_OBJECTS) $(Spectrtest_LDADD) $(LIBS)
-
# This directory's subdirectories are mostly independent; you can cd
# into them and run `make' without going through this Makefile.
# To change the values of `make' variables: instead of editing Makefiles,

View File

@ -0,0 +1,28 @@
--- src/Whistspectr.c.orig 2008-02-20 09:56:01.000000000 +0100
+++ src/Whistspectr.c 2008-02-20 09:57:28.000000000 +0100
@@ -52,7 +52,6 @@
#endif
#include <math.h>
#include <limits.h>
-#include <values.h>
#include <X11/Xlib.h>
#include<Xm/PrimitiveP.h>
#include<Xm/DrawP.h>
@@ -574,7 +573,7 @@
colorpix[i++] = current->histspectr.linecolor;
if(i)
XFreeColors(XtDisplay(current), DefaultColormap(XtDisplay(current)
- ,DefaultScreen(XtDisplay(current))),colorpix,i,(int)NULL);
+ ,DefaultScreen(XtDisplay(current))),colorpix,i,0);
if(newon->histspectr.xndecimals != current->histspectr.xndecimals){
get_proportion(newon); /* recalculate sizes and starting */
@@ -1029,7 +1028,7 @@
colorpix[i++] = cw->histspectr.linecolor;
if(i)
XFreeColors(XtDisplay(cw), DefaultColormap(XtDisplay(cw)
- ,DefaultScreen(XtDisplay(cw))),colorpix,i,(int)NULL);
+ ,DefaultScreen(XtDisplay(cw))),colorpix,i,0);
/* XmFontListFree(cw->histspectr.font_list); */
XFreePixmap(XtDisplay(cw), cw->histspectr.pix);