From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([69.77.167.62] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1K3vtr-0003iM-JB for garchives@archives.gentoo.org; Wed, 04 Jun 2008 16:31:48 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 21FD0E045F; Wed, 4 Jun 2008 16:31:47 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 9BEB2E045F for ; Wed, 4 Jun 2008 16:31:46 +0000 (UTC) Received: from stork.gentoo.org (stork.gentoo.org [64.127.104.133]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTP id 14BEF66E99 for ; Wed, 4 Jun 2008 16:31:46 +0000 (UTC) Received: from bicatali by stork.gentoo.org with local (Exim 4.69) (envelope-from ) id 1K3vtm-0001FX-1j for gentoo-commits@lists.gentoo.org; Wed, 04 Jun 2008 16:31:42 +0000 From: "Sebastien Fabbro (bicatali)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, bicatali@gentoo.org Subject: [gentoo-commits] gentoo-x86 commit in sci-mathematics/dataplot/files: 90dataplot dpsrc-patchset-20080225.patch dpsrc-dp1patches-20080225.patch Makefile.am.20080225 configure.ac.20080225 X-VCS-Repository: gentoo-x86 X-VCS-Files: 90dataplot dpsrc-patchset-20080225.patch dpsrc-dp1patches-20080225.patch Makefile.am.20080225 configure.ac.20080225 X-VCS-Directories: sci-mathematics/dataplot/files X-VCS-Committer: bicatali X-VCS-Committer-Name: Sebastien Fabbro Content-Type: text/plain; charset=utf8 Message-Id: Sender: Sebastien Fabbro Date: Wed, 04 Jun 2008 16:31:42 +0000 Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: b4013e6a-d3f9-4470-9071-cd2fb04730b1 X-Archives-Hash: cb927bdf28ea20e3f48cabfdfe80a1d1 bicatali 08/06/04 16:31:42 Added: 90dataplot dpsrc-patchset-20080225.patch dpsrc-dp1patches-20080225.patch Makefile.am.20080225 configure.ac.20080225 Log: Initial import from sunrise. Proxy-maintaining for Thomas Anderson (Portage version: 2.1.5.3) Revision Changes Path 1.1 sci-mathematics/dataplot/files/90dataplot file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-mathematics/da= taplot/files/90dataplot?rev=3D1.1&view=3Dmarkup plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-mathematics/da= taplot/files/90dataplot?rev=3D1.1&content-type=3Dtext/plain Index: 90dataplot =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D DATAPLOT_FILES=3D"/usr/share/dataplot" DATAPLOT_WEB=3D"OFF" BROWSER=3D"xdg-open" 1.1 sci-mathematics/dataplot/files/dpsrc-patchset-200802= 25.patch file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-mathematics/da= taplot/files/dpsrc-patchset-20080225.patch?rev=3D1.1&view=3Dmarkup plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-mathematics/da= taplot/files/dpsrc-patchset-20080225.patch?rev=3D1.1&content-type=3Dtext/= plain Index: dpsrc-patchset-20080225.patch =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D diff -Naur dpsrc-orig/gl_src.c dpsrc/gl_src.c --- dpsrc-orig/gl_src.c 2001-02-28 16:45:56.000000000 -0500 +++ dpsrc/gl_src.c 2008-04-10 17:03:03.000000000 -0400 @@ -154,7 +154,7 @@ #include #include #include -#include +#include =20 #if UNIX =3D=3D 0 #include @@ -257,7 +257,7 @@ /* flags for current attribute settings */ static int OPEN_FLAG =3D 0; /* 0 - X11 closed, 1 - X11 open */ static int OPEN_FLAG_2 =3D 0; /* 0 - repeat graph window closed, 1= - open */ -int GRAPH_FLAG =3D 0; /* 0 - gleras has not been called, 1= - gleras has been called */ +static int GRAPH_FLAG =3D 0; /* 0 - gleras has not been ca= lled, 1 - gleras has been called */ int WIDTH_CURRENT; /* current line width */ int LINE_STYLE_CURRENT; /* current line style */ char FONT_NAME_CURRENT[80]; /* name of current font */ @@ -922,7 +922,7 @@ glNewList(list_id, GL_COMPILE_AND_EXECUTE); =20 glClearColor(red_temp,green_temp,blue_temp,1.0); - glclear(GL_COLOR_BUFFER_BIT); + glClear(GL_COLOR_BUFFER_BIT); =20 GRAPH_FLAG =3D 1; } @@ -1486,7 +1486,7 @@ * Color only set if being changed. */ #if APPEND_UNDERSCORE =3D=3D 1 && SUBROUTINE_CASE =3D=3D 1 -void glseco(jcol, red, green, blue) +void glseco_(jcol, red, green, blue) #elif APPEND_UNDERSCORE =3D=3D 1 && SUBROUTINE_CASE =3D=3D 0 void GLSECO_(jcol, red, green, blue) #elif APPEND_UNDERSCORE =3D=3D 0 && SUBROUTINE_CASE =3D=3D 1 @@ -1691,7 +1691,7 @@ width =3D isize[0]; #endif if (width < 1.0) width =3D 1.0; - glPointsize(width); + glPointSize(width); glBegin(GL_POINTS); #if PRECISION =3D=3D 0 glVertex2f(*ix, *iy); diff -Naur dpsrc-orig/x11_src.c dpsrc/x11_src.c --- dpsrc-orig/x11_src.c 2007-08-23 13:57:06.000000000 -0400 +++ dpsrc/x11_src.c 2008-04-10 17:02:18.000000000 -0400 @@ -214,7 +214,7 @@ /* add following 2 lines MAY 1995 */ #include #include -#include +#include =20 /* global definitions */ =20 @@ -507,7 +507,7 @@ /* flags for current attribute settings */ static int OPEN_FLAG =3D 0; /* 0 - X11 closed, 1 - X11 open = */ static int OPEN_FLAG_2 =3D 0; /* 0 - repeat graph window close= d, 1 - open */ -int GRAPH_FLAG =3D 0; /* 0 - xerase has not been calle= d, 1 - xerase has been called */ +static int GRAPH_FLAG =3D 0; /* 0 - xerase has not bee= n called, 1 - xerase has been called */ int WIDTH_CURRENT; /* current line width */ int LINE_STYLE_CURRENT; /* current line style */ int CAP_STYLE_CURRENT; /* current cap style */ --- dpsrc-orig/gs_src.c 2002-02-20 13:28:36.000000000 -0500 +++ dpsrc/gs_src.c 2008-04-28 08:54:28.000000000 -0400 @@ -111,9 +111,9 @@ int max_colors; /* maximum colors actually alloca= ted */ int CURRENT_COLOR; /* Define current color */ int CURRENT_LINE_STYLE[12]; /* Define current line style */ -int NPTS_STYLE =3D 0; /* Number of points in style */ +static int NPTS_STYLE =3D 0; /* Number of points in s= tyle */ int color_table[MAX_COLORS + 100]; /* color table */ -int red[MAX_COLORS] =3D { +static int red[MAX_COLORS] =3D { /* 0 - 7 */ 255, 0, 255, 0, 0, 255, 255, 0, /* 8 - 15 */ 255, 154, 0, 173, 138, 208, 47, 211, /* 16 - 23 */ 127, 165, 95, 255, 100, 85, 153, 72, @@ -127,7 +127,7 @@ /* 80 - 87 */ 238, 205, 139, 238, 205, 139, 238, 205, /* 88 - 88 */ 139 }; -int green[MAX_COLORS] =3D { +static int green[MAX_COLORS] =3D { /* 0 - 7 */ 255, 0, 0, 0, 255, 0, 165, 255, /* 8 - 15 */ 255, 205, 100, 216, 43, 32, 79, 211, /* 16 - 23 */ 255, 42, 158, 127, 149, 107, 50, 61, @@ -141,7 +141,7 @@ /* 80 - 87 */ 154, 133, 90, 0, 0, 0, 0, 0, /* 88 - 88 */ 0 }; -int blue[MAX_COLORS] =3D { +static int blue[MAX_COLORS] =3D { /* 0 - 7 */ 255, 0, 0, 255, 0, 255, 0, 255, /* 8 - 15 */ 0, 50, 0, 230, 226, 144, 79, 211, /* 16 - 23 */ 212, 42, 160, 80, 237, 47, 204, 139, @@ -158,7 +158,7 @@ /* flags for current attribute settings */ static int OPEN_FLAG =3D 0; /* 0 - GS closed, 1 - GS open */ -int DEVICE_TYPE =3D 0; /* define device */ +static int DEVICE_TYPE =3D 0; /* define device */ /* 1 - jpeg */ /* 2 - png */ /* 3 - windows bmp */ 1.1 sci-mathematics/dataplot/files/dpsrc-dp1patches-2008= 0225.patch file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-mathematics/da= taplot/files/dpsrc-dp1patches-20080225.patch?rev=3D1.1&view=3Dmarkup plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-mathematics/da= taplot/files/dpsrc-dp1patches-20080225.patch?rev=3D1.1&content-type=3Dtex= t/plain Index: dpsrc-dp1patches-20080225.patch =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- dpsrc-orig/dp1_linux_64.f.in 2007-08-23 18:19:57.000000000 -0400 +++ dpsrc/dp1_linux_64.f.in 2008-04-30 08:02:18.000000000 -0400 @@ -1550,7 +1550,7 @@ DATA D2MACH(4) / 1.9259299443872358530559779425849273D-034 / DATA D2MACH(5) / 0.30102999566398119521373889472449302 / C - IHOST1=3D'SUN ' + IHOST1=3D'@HOST@' IHOST2=3D' ' IHMOD1=3D'3 ' IHMOD2=3D' ' @@ -2688,7 +2688,7 @@ 1 (IHOST1.EQ.'SGI ') .OR. 1 (IHOST1.EQ.'HP-9') .OR. 1 (IHOST1.EQ.'AIX ') .OR. - 1 (IHOST1.EQ.'LINU') .OR. + 1 (IHOST1.EQ.'LINUX') .OR. 1 (IOPSY1.EQ.'UNIX') 1 )THEN CCCCC FOLLOWING SECTION ADDED FEBRUARY 1998. @@ -2704,7 +2704,7 @@ UNIXPV=3D'DATAPLOT_FILES' CALL getenv(UNIXPV,UNIXPN) IF(UNIXPN.EQ.' ')THEN - IPATH1=3D'/usr/local/lib/dataplot/' + IPATH1=3D'@datadir@/dataplot/' NCP1=3D24 UNIXPN=3D' ' UNIXPN(1:NCP1)=3DIPATH1(1:NCP1) @@ -2724,8 +2724,6 @@ ENDIF CCCCC AUGUST 1996. TO MAKE SEARCH OF SUB-DIRECTORIES WORK, SET PATH CCCCC TO BE EMPTY. - IPATH1=3D' ' - NCP1=3D0 CCCCC JUNE 1996. FOR UNIX SYSTEMS, CHECK FOR EXISTENCE OF CCCCC "HOME" ENVIRONMENT VARIABLE. READ DPLOGF FROM USER'S HOME CCCCC DIRECTORY IF FOUND. OTHERWISE, CURRENT DIRECTORY. --- dpsrc-orig/dp1_linux.f.in 2007-08-23 18:19:27.000000000 -0400 +++ dpsrc/dp1_linux.f.in 2008-04-30 08:02:46.000000000 -0400 @@ -1481,7 +1481,7 @@ DATA D2MACH(4) / 2.2204460492503D-16 / DATA D2MACH(5) / 0.3010299956639812D0 / CC - IHOST1=3D'SUN ' + IHOST1=3D'@HOST@' IHOST2=3D' ' IHMOD1=3D'3 ' IHMOD2=3D' ' @@ -2619,7 +2619,7 @@ 1 (IHOST1.EQ.'SGI ') .OR. 1 (IHOST1.EQ.'HP-9') .OR. 1 (IHOST1.EQ.'AIX ') .OR. - 1 (IHOST1.EQ.'LINU') .OR. + 1 (IHOST1.EQ.'LINUX') .OR. 1 (IOPSY1.EQ.'UNIX') 1 )THEN CCCCC FOLLOWING SECTION ADDED FEBRUARY 1998. @@ -2635,7 +2635,7 @@ UNIXPV=3D'DATAPLOT_FILES' CALL getenv(UNIXPV,UNIXPN) IF(UNIXPN.EQ.' ')THEN - IPATH1=3D'/usr/local/lib/dataplot/' + IPATH1=3D'@datadir@/dataplot' NCP1=3D24 UNIXPN=3D' ' UNIXPN(1:NCP1)=3DIPATH1(1:NCP1) @@ -2655,8 +2655,6 @@ ENDIF CCCCC AUGUST 1996. TO MAKE SEARCH OF SUB-DIRECTORIES WORK, SET PATH CCCCC TO BE EMPTY. - IPATH1=3D' ' - NCP1=3D0 CCCCC JUNE 1996. FOR UNIX SYSTEMS, CHECK FOR EXISTENCE OF CCCCC "HOME" ENVIRONMENT VARIABLE. READ DPLOGF FROM USER'S HOME CCCCC DIRECTORY IF FOUND. OTHERWISE, CURRENT DIRECTORY. --- dpsrc-orig/DPCOPA.INC.in 2008-02-24 12:52:09.000000000 -0500 +++ dpsrc/DPCOPA.INC.in 2008-04-28 14:16:02.000000000 -0400 @@ -64,7 +64,7 @@ CCCCC PARAMETER (MAXOBW=3D82000) CCCCC PARAMETER (MAXPOP=3D16400) C - PARAMETER (MAXOBV=3D100000) + PARAMETER (MAXOBV=3D@MAXOBV@) PARAMETER (MAXOBW=3D10*MAXOBV) PARAMETER (MAXPOP=3D2*MAXOBV) C 1.1 sci-mathematics/dataplot/files/Makefile.am.20080225 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-mathematics/da= taplot/files/Makefile.am.20080225?rev=3D1.1&view=3Dmarkup plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-mathematics/da= taplot/files/Makefile.am.20080225?rev=3D1.1&content-type=3Dtext/plain Index: Makefile.am.20080225 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D bin_PROGRAMS =3D dataplot dataplot_SOURCES =3D dp1_fdriv.f \ dp2.f dp3.f dp4.f dp5.f dp6.f dp7.f dp8.f dp9.f dp10.f dp11.f \ dp12.f dp13.f dp14.f dp15.f dp16.f dp17.f dp18.f dp19.f dp20.f dp21.f \ dp22.f dp23.f dp24.f dp25.f dp26.f dp27.f dp28.f dp29.f dp30.f dp31.f \ dp32.f dp33.f dp34.f dp35.f dp36.f dp37.f dp38.f dp39.f dp40.f dp41.f \ dp42.f dp43.f dp44.f dp45.f dp46.f \ dpcalc.f dpdds2.f dpdds3.f dpdds.f edinit.f edmai2.f edsear.f edsub.f \ edwrst.f fit3b.f starpac.f tcdriv_nopc.f aqua_src.f main.f if ENABLE_GD dataplot_SOURCES +=3D gd_src.c else dataplot_SOURCES +=3D gd_src.f endif if ENABLE_GL dataplot_SOURCES +=3D gl_src.c else dataplot_SOURCES +=3D gl_src.f endif if ENABLE_X11 dataplot_SOURCES +=3D x11_src.c else dataplot_SOURCES +=3D x11src.f endif if ENABLE_GS dataplot_SOURCES +=3D gs_src.c endif dataplot_CFLAGS =3D @GL_CFLAGS@ dataplot_LDADD =3D @GD_LIBS@ @GL_LIBS@ @X11_LIBS@ $(FLIBS) # this is to remove ambiguity between the similar filenames # of the c and f77 version (shortcoming of automake) # the f77 versions are forced # the c versions objects are called dataplot-gd_src.o etc gd_src.o: gd_src.f $(F77COMPILE) -c -o $@ $< gl_src.o: gl_src.f $(F77COMPILE) -c -o $@ $< aqua_src.o: aqua_src.f $(F77COMPILE) -c -o $@ $< 1.1 sci-mathematics/dataplot/files/configure.ac.20080225 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-mathematics/da= taplot/files/configure.ac.20080225?rev=3D1.1&view=3Dmarkup plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-mathematics/da= taplot/files/configure.ac.20080225?rev=3D1.1&content-type=3Dtext/plain Index: configure.ac.20080225 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D AC_PREREQ(2.59) AC_INIT([dataplot], [20080225], [n.heckert@nist.gov]) AC_CONFIG_HEADER([config.h]) AC_CONFIG_AUX_DIR(config) AM_MAINTAINER_MODE AM_INIT_AUTOMAKE([foreign]) AC_PROG_CC AC_PROG_F77 AC_F77_LIBRARY_LDFLAGS case $F77 in *gfortran*) FFLAGS+=3D" -w -fno-range-check" ;; *) ;; esac AC_CANONICAL_HOST case $host in i?86*linux*) fdriv=3Ddp1_linux=20 MAXOBV=3D100000 ;; *64*linux*) fdriv=3Ddp1_linux_64=20 MAXOBV=3D1000000 ;; *-*-*) fdriv=3Ddp1 ;; *linux*) HOST=3DLINUX;; esac AC_CONFIG_LINKS([dp1_fdriv.f:$fdriv.f]) AC_SUBST(MAXOBV) AC_SUBST(HOST) AC_ARG_ENABLE(gd, [AS_HELP_STRING([--enable-gd], [Enable the gd device driver])], [enable_gd=3D$enableval], [enable_gd=3Dno]) AC_ARG_ENABLE(gl, [AS_HELP_STRING([--enable-gl], [Enable the OpenGL device driver])], [enable_gl=3D$enableval], [enable_gl=3Dno]) AC_ARG_ENABLE(X, [AS_HELP_STRING([--enable-X], [Enable the X11 device driver])], [enable_x11=3D$enableval], [enable_x11=3Dno]) AC_ARG_ENABLE(gs, [AS_HELP_STRING([--enable-gs], [Enable the Ghostscript device driver])]= , [enable_gs=3D$enableval], [enable_gs=3Dno]) if test x"$enable_gd" =3D x"yes"; then AC_CHECK_PROG(enable_gd, [gdlib-config],, [AC_MSG_ERROR([GD driver requested but gdlib-config not found])]) GD_LIBS=3D"`gdlib-config --libs` -lgd" GD_CFLAGS=3D"`gdlib-config --cflags`" AC_SUBST(GD_LIBS) AC_SUBST(GD_CFLAGS) fi AM_CONDITIONAL(ENABLE_GD, [test x"$enable_gd" =3D x"yes"] ) if test x"$enable_gl" =3D x"yes"; then dnl hardcoded opengl libs (should be host/implementation dependent) AC_CHECK_HEADER(GL/gl.h,, [AC_MSG_ERROR([OpenGL driver requested but header gl.h not found])]) AC_CHECK_HEADER(GL/glu.h,, [AC_MSG_ERROR([OpenGL driver requested but header glu.h not found])]) GL_CFLAGS=3D"-DUNIX_OS -DAPPEND_UNDERSCORE -DSUBROUTINE_CASE" AC_SUBST(GL_CFLAGS) AC_CHECK_LIB(GL, glXCreateContext, GL_LIBS=3D"-lGL", [AC_MSG_ERROR([OpenGL driver requested but libraries not found])]) AC_CHECK_LIB(GLU, gluPerspective, GL_LIBS=3D"-lGL -lGLU", [AC_MSG_ERROR([OpenGL driver requested but libraries not found])]) GL_LIBS=3D"-lGL -lGLU" AC_SUBST(GL_LIBS) fi AM_CONDITIONAL(ENABLE_GL, [ test x"$enable_gl" =3D x"yes" ]) if test x"$enable_x11" =3D x"yes"; then PKG_CHECK_MODULES(X11, x11,, [AC_MSG_ERROR([X11 driver requested but pkgconfig module not found])= ]) fi AM_CONDITIONAL(ENABLE_X11, [ test x"$enable_x11" =3D x"yes" ]) if test x"$enable_gs" =3D x"yes"; then AC_CHECK_PROG(enable_gs, [gs],, [AC_MSG_ERROR([Ghostscript driver requested but gs not found])]) AC_CHECK_PROG(enable_gd, [gdlib-config],, [AC_MSG_ERROR([Ghostscript driver requested, which requires gd, but gdlib-config not found])]) GS_LIBS=3D"-lgs `gdlib-config --libs` -lgd" GS_CFLAGS=3D"-lgs `gdlib-config --cflags`" AC_SUBST(GS_LIBS) AC_SUBST(GS_CFLAGS) fi AM_CONDITIONAL(ENABLE_GS, [ test x"$enable_gs" =3D x"yes" ]) AC_CONFIG_FILES([Makefile DPCOPA.INC $fdriv.f]) AC_OUTPUT --=20 gentoo-commits@lists.gentoo.org mailing list