Date: Wed, 20 Feb 2008 13:11:12 +0100 From: "Pietro Cerutti" <gahr@gahr.ch> To: "FreeBSD gnats submit" <FreeBSD-gnats-submit@FreeBSD.org> Subject: ports/120879: [update+patch] x11-toolkits/movingmotif update to 2.3.0 + unbreak on sparc64 + adopt maintainship Message-ID: <1203509472.7822@gahrtop.localhost> Resent-Message-ID: <200802201220.m1KCK0WF011174@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 120879
>Category: ports
>Synopsis: [update+patch] x11-toolkits/movingmotif update to 2.3.0 + unbreak on sparc64 + adopt maintainship
>Confidential: no
>Severity: serious
>Priority: medium
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: sw-bug
>Submitter-Id: current-users
>Arrival-Date: Wed Feb 20 12:20:00 UTC 2008
>Closed-Date:
>Last-Modified:
>Originator: Pietro Cerutti
>Release: FreeBSD 8.0-CURRENT i386
>Organization:
>Environment:
System: FreeBSD 8.0-CURRENT #4: Wed Feb 13 18:13:34 CET 2008
root@gahrtop.localhost:/usr/obj/usr/src/sys/MSI1034
>Description:
>How-To-Repeat:
>Fix:
--- _movingmotif.diff begins here ---
--- Makefile.orig 2008-02-20 09:38:16.000000000 +0100
+++ Makefile 2008-02-20 10:05:38.000000000 +0100
@@ -6,13 +6,12 @@
# $FreeBSD: ports/x11-toolkits/movingmotif/Makefile,v 1.13 2008/02/01 12:52:44 linimon Exp $
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@gahr.ch
COMMENT= Display scientific data as dynamic plot
USE_MOTIF= yes
@@ -22,10 +21,8 @@
.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>
--- /dev/null 2008-02-20 10:55:01.000000000 +0100
+++ files/patch-src_Whistspectr.c 2008-02-20 09:57:33.000000000 +0100
@@ -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);
--- files/patch-demo::Makefile.in.orig 2008-02-20 10:09:24.000000000 +0100
+++ files/patch-demo::Makefile.in 2008-02-20 10:09:48.000000000 +0100
@@ -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,
--- files/patch-WHistbar.c.orig 2002-09-13 21:00:01.000000000 +0200
+++ files/patch-WHistbar.c 2008-02-20 09:49:08.000000000 +0100
@@ -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]) );
+
--- distinfo.orig 2008-02-20 10:59:02.000000000 +0100
+++ distinfo 2008-02-20 10:59:06.000000000 +0100
@@ -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
--- _movingmotif.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?1203509472.7822>