diff options
Diffstat (limited to 'sci-mathematics')
| -rw-r--r-- | sci-mathematics/dataplot/ChangeLog | 10 | ||||
| -rw-r--r-- | sci-mathematics/dataplot/Manifest | 11 | ||||
| -rw-r--r-- | sci-mathematics/dataplot/dataplot-20080225.ebuild | 109 | ||||
| -rw-r--r-- | sci-mathematics/dataplot/files/Makefile.am | 45 | ||||
| -rw-r--r-- | sci-mathematics/dataplot/files/configure.ac | 97 | ||||
| -rw-r--r-- | sci-mathematics/dataplot/files/dpsrc-datadir-20080225.patch | 41 | ||||
| -rw-r--r-- | sci-mathematics/dataplot/files/dpsrc-dp1patches-20080225.patch | 76 | ||||
| -rw-r--r-- | sci-mathematics/dataplot/files/dpsrc-maxobvvalue-20080225.patch | 11 | ||||
| -rw-r--r-- | sci-mathematics/dataplot/files/dpsrc-patchset-20080225.patch | 42 |
9 files changed, 368 insertions, 74 deletions
diff --git a/sci-mathematics/dataplot/ChangeLog b/sci-mathematics/dataplot/ChangeLog index eba5ed111..dbd9e013a 100644 --- a/sci-mathematics/dataplot/ChangeLog +++ b/sci-mathematics/dataplot/ChangeLog @@ -3,6 +3,16 @@ # $Header: $ 30 Apr 2008; Thomas Anderson (gentoofan23) <gentoofan23@gmail.com> + dataplot-20080225.ebuild, +files/dpsrc-datadir-20080225.patch, + +files/dpsrc-maxobvvalue-20080225.patch, + files/dpsrc-patchset-20080225.patch, + +files/dpsrc-dp1patches-20080225.patch, +files/Makefile.am, + +files/configure.ac: + Many changes. Add parallel build support, using autotools. Add GhostScript + support. Many many thanks to bicatali for helping with the autofoo and other + general pointers. + + 30 Apr 2008; Thomas Anderson (gentoofan23) <gentoofan23@gmail.com> dataplot-20080225.ebuild: Only do built_with_use check if USE='gd' diff --git a/sci-mathematics/dataplot/Manifest b/sci-mathematics/dataplot/Manifest index b6a2e5c91..366f04493 100644 --- a/sci-mathematics/dataplot/Manifest +++ b/sci-mathematics/dataplot/Manifest @@ -1,6 +1,11 @@ -AUX dpsrc-patchset-20080225.patch 2672 RMD160 5877cc97e034c52a4228fe19d87fc2d9a7ae043d SHA1 4377f353fb3de6f598884d542fc0c1842a3c29a9 SHA256 022995d5dca408d099c95165476c47f633a91273b931405cb1a90b27ae1113a1 +AUX Makefile.am 1246 RMD160 05e5b07336606da88381a31882f32b482e807d22 SHA1 acb5e834086dbf895e60cb75a8807dfa763f5372 SHA256 083de39fb87096dc26209b2084d04d9ead949a0c8a87f6da9dddb21899acbfef +AUX configure.ac 2967 RMD160 7e5f8a192fba3e5e4441b912bec60e97f3c3c981 SHA1 2a8ea0e90240071cd3d80d1af88fc54266ad9a07 SHA256 a89eade674ffaf683b73537133e56df6d6ccc3093ea78c783049400a845eec85 +AUX dpsrc-datadir-20080225.patch 1456 RMD160 0ee8fed957398fcb7e01d3d6a089394666124bde SHA1 1e307675d4f0b926773cac6d2d50bccffd96f643 SHA256 c6be8c74015258bd24284a877aa377873e541faea468353ccf62b0a8cff0b3a3 +AUX dpsrc-dp1patches-20080225.patch 2647 RMD160 347112c6a48466e110cd897c214404bcb2446d3a SHA1 37dfc75ad47a0372407835d278f9041a25586528 SHA256 e8aa95d90a856970e33448b9077dfbb8ed6d0770dcba0d32ca7750632895b1b2 +AUX dpsrc-maxobvvalue-20080225.patch 352 RMD160 fe8d89430ec5e63b644cd4b9e5161c4065a17eaf SHA1 2c4c7baa19a3d2cac23e000043553cd58c9b0ccd SHA256 86e7971f02aaff3c1df04754ce3e56bef63352ed09625def4e1f56e49b43e6a2 +AUX dpsrc-patchset-20080225.patch 4587 RMD160 a582f14dbe92cb3802b641b737d726ed2d39d527 SHA1 3aa03d5d53135ca9ac1464f26a3eceae4a8a9d3a SHA256 4a1c7ca2418558a857bd7d55d0815c5caa6fbe911bd4bf320b8460aa917effbb DIST dplib.02_25_2008.tar.gz 5340447 RMD160 51b5892c83bb5d420f324e3dab5edec24925f728 SHA1 3a77ed5e1e49f377083a11b8a177f678284b91f2 SHA256 7f9a30ae8ab029e0eeca4fbe08e665b572ec98a05ec001a67f95e4857d2a5b05 DIST dpsrc.02_25_2008.tar.gz 6399167 RMD160 ed14f8ceb225e86f25026916ab4934a140f602ae SHA1 f1023d99ec7d2a64611dabedfbc5ad6f16e67cf7 SHA256 794bedcc48cf444c5813f864f4bacb158474d450337279edaf7fba1055c552c6 -EBUILD dataplot-20080225.ebuild 3079 RMD160 46019d22e1a45ef7e3f06b0ac85bd41822b81d28 SHA1 6ee208442af18f1412abfc57142d81519708a979 SHA256 8d9c22193306e5b4e4bfaf59873d4bd4218d50ca368781fa7f9d3035ec581b6b -MISC ChangeLog 1226 RMD160 981bd1d7614843b3d6817d0c5d3490e8bf623f82 SHA1 32c93b582209431dc941e93213910b50872405a8 SHA256 f098dcbd9886bbbdb2826f5ab0a1a8b9f5d757f0f1ebceda2e18db5d2a7ba454 +EBUILD dataplot-20080225.ebuild 2338 RMD160 6c1e8278cc0c4242698431c4d8eb58ae5016c1bf SHA1 347ac86851591e82e95aaeef36542acb7e9ddeb6 SHA256 b37b2c0495b3c4b7fb9d573af408cd6fa3385d0fd5db30912eddb1f64d831f72 +MISC ChangeLog 1704 RMD160 90a9fda07da45c2fba96654d1fc6195b9740f0b8 SHA1 04d5606c41a1ca7d1fb730d5b3d6a5f0623624f6 SHA256 ae09307f68b23a96aecdc058df96c94730fdcc057cf610869aa6f75f966a41e8 MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42 diff --git a/sci-mathematics/dataplot/dataplot-20080225.ebuild b/sci-mathematics/dataplot/dataplot-20080225.ebuild index 7f1d9ab21..3abfaf87e 100644 --- a/sci-mathematics/dataplot/dataplot-20080225.ebuild +++ b/sci-mathematics/dataplot/dataplot-20080225.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 # $Header: $ -inherit eutils fortran toolchain-funcs flag-o-matic +inherit eutils toolchain-funcs flag-o-matic autotools # DAY MONTH YEAR MY_PV=${PV:4:2}_${PV:6:2}_${PV:0:4} @@ -12,107 +12,74 @@ MY_P_AUX=dplib.${MY_PV} DESCRIPTION="A program for scientific visualization and statistical analyis" HOMEPAGE="http://www.itl.nist.gov/div898/software/dataplot/" SRC_URI="ftp://ftp.nist.gov/pub/dataplot/unix/dpsrc.${MY_PV}.tar.gz - examples? ( ftp://ftp.nist.gov/pub/dataplot/unix/dplib.${MY_PV}.tar.gz )" + ftp://ftp.nist.gov/pub/dataplot/unix/dplib.${MY_PV}.tar.gz" LICENSE="public-domain" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="examples gd opengl X" +IUSE="examples gd gs opengl X" -DEPEND="${RDEPEND}" -RDEPEND="X? ( x11-libs/libX11 ) - opengl? ( virtual/opengl ) - gd? ( media-libs/gd )" +COMMON_DEPEND="opengl? ( virtual/opengl ) + gd? ( media-libs/gd ) + gs? ( virtual/ghostscript media-libs/gd )" +DEPEND="${COMMON_DEPEND}" +RDEPEND="${COMMON_DEPEND}" S="${WORKDIR}/${MY_P}" S_AUX="${WORKDIR}/${MY_P_AUX}" pkg_setup() { - #With USE=gd, dataplot requires media-libs/gd to be built with USE="png jpeg" - if use gd; then + #Dataplot requires media-libs/gd to be built with USE="png jpeg" + if use gd || use gs; then if ! built_with_use -a media-libs/gd png jpeg; then eerror "media-libs/gd is not compiled with USE=\"png jpeg\"" eerror "Please recompile media-libs/gd, ensuring USE=\"png jpeg\"" die fi fi - FORTRAN="gfortran" # needs tests on g77 and ifc - fortran_pkg_setup + #We also need a Fortran 77 compiler + if ! built_with_use sys-devel/gcc fortran; then + eerror "sys-devel/gcc is not compiled with USE=\"fortran\" and ${PN} + needs a fortran compiler" + eerror "Please recompile sys-devel/gcc, ensuring USE=\"fortran\"" + fi } src_unpack() { mkdir ${MY_P} && cd "${S}" unpack ${MY_P}.tar.gz - ##Arches!: Add your architecture name here in the braces if you are 64-bit! - if use amd64; then - cp dp1_linux_64.f dp1.f - cp DPCOPA_BIG.INC DPCOPA.INC - else - cp dp1_linux.f dp1.f - fi - - epatch "${FILESDIR}/dpsrc-patchset-${PV}.patch" - if use examples; then - mkdir "${S_AUX}" && cd "${S_AUX}" - unpack ${MY_P_AUX}.tar.gz - fi + mv DPCOPA.INC DPCOPA.INC.in + mv dp1_linux.f dp1_linux.f.in + mv dp1_linux_64.f dp1_linux_64.f.in + epatch "${FILESDIR}"/dpsrc-patchset-${PV}.patch + epatch "${FILESDIR}"/dpsrc-maxobvvalue-${PV}.patch + epatch "${FILESDIR}"/dpsrc-dp1patches-${PV}.patch + + cp "${FILESDIR}"/{Makefile.am,configure.ac} "${S}" + + mkdir "${S_AUX}" && cd "${S_AUX}" + unpack ${MY_P_AUX}.tar.gz + cd "${S}" + eautoreconf } src_compile() { - [[ ${FORTRAN} = gfortran ]] && FFLAGS="${FFLAGS:--O2} -fno-range-check -c" - - for i in {1..46}; do - FORTRANSOURCES+="dp${i}.f " - done - - FORTRANSOURCES+=" dpcalc.f dpdds2.f dpdds3.f - dpdds.f edinit.f edmai2.f edsear.f - edsub.f edwrst.f fit3b.f gl_src.f - starpac.f tcdriv_nopc.f aqua_src.f" - - for i in ${FORTRANSOURCES}; do - echo "${FORTRANC} ${FFLAGS} ${i}" - ${FORTRANC} ${FFLAGS} ${i} || die "Fortran Compile failed for file: ${i}" - done - - use X && append-ldflags -lX11 - use opengl && append-ldflags "-lGL -lGLU" - use gd && append-ldflags "-lgd -lpng -ljpeg -lz" - - ##Compile x11/gd/opengl device drivers - - if use gd; then - $(tc-getCC) -c ${CFLAGS} gd_src.c || die "Compiling gd_src.c - failed!" - else - ${FORTRANC} ${FFLAGS} gd_src.f || die "Compiling gd_src.f failed!" - fi - - if use opengl; then - $(tc-getCC) -c ${CFLAGS} -I/usr/include/GL -DUNIX_OS -DAPPEND_UNDERSCORE \ - -DSUBROUTINE_CASE gl_src.c || die "Compiling gl_src.c - failed!" - else - ${FORTRANC} ${FFLAGS} gl_src.f || die "Compiling gl_src.f failed!" - fi - - if use X; then - $(tc-getCC) -c ${CFLAGS} -I/usr/include/X11 x11_src.c || die "Compiling x11_src.c - failed!" - else - ${FORTRANC} ${FFLAGS} x11src.f || die "Compiling x11_src.f failed!" - fi + econf $(use_enable gd) \ + $(use_enable gs) \ + $(use_enable opengl) \ + $(use_enable X) - #Link! - ${FORTRANC} -o dataplot main.f *.o ${LDFLAGS} || die "Linking failed!" + emake || die "Make failed" } src_install() { - dobin dataplot + emake DESTDIR="${D}" install || die "Install failed" if use examples; then insinto /usr/share/doc/${PF}/examples - doins -r "${S_AUX}"/data/* || die "installing examples failed" + doins -r "${S_AUX}"/data/* || die "Installing examples failed" fi + insinto /usr/share/dataplot + doins "${S_AUX}"/dpmesf.tex "${S_AUX}"/dpsysf.tex "${S_AUX}"/dplogf.tex } diff --git a/sci-mathematics/dataplot/files/Makefile.am b/sci-mathematics/dataplot/files/Makefile.am new file mode 100644 index 000000000..29dd418b2 --- /dev/null +++ b/sci-mathematics/dataplot/files/Makefile.am @@ -0,0 +1,45 @@ +bin_PROGRAMS = dataplot +dataplot_SOURCES = 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 += gd_src.c +else +dataplot_SOURCES += gd_src.f +endif + +if ENABLE_GL +dataplot_SOURCES += gl_src.c +else +dataplot_SOURCES += gl_src.f +endif + +if ENABLE_X11 +dataplot_SOURCES += x11_src.c +else +dataplot_SOURCES += x11src.f +endif + +if ENABLE_GS +dataplot_SOURCES += gs_src.c +endif + +dataplot_CFLAGS = @GL_CFLAGS@ +dataplot_LDADD = @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 $@ $< diff --git a/sci-mathematics/dataplot/files/configure.ac b/sci-mathematics/dataplot/files/configure.ac new file mode 100644 index 000000000..1051b9dbd --- /dev/null +++ b/sci-mathematics/dataplot/files/configure.ac @@ -0,0 +1,97 @@ +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+=" -w -fno-range-check" ;; + *) ;; +esac + +AC_CANONICAL_HOST +case $host in + i?86*linux*) fdriv=dp1_linux + MAXOBV=100000 ;; + *64*linux*) fdriv=dp1_linux_64 + MAXOBV=1000000 ;; + *-*-*) fdriv=dp1 ;; + *linux*) HOST=LINUX;; +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=$enableval], + [enable_gd=no]) + +AC_ARG_ENABLE(gl, + [AS_HELP_STRING([--enable-gl], [Enable the OpenGL device driver])], + [enable_gl=$enableval], + [enable_gl=no]) + +AC_ARG_ENABLE(X, + [AS_HELP_STRING([--enable-X], [Enable the X11 device driver])], + [enable_x11=$enableval], + [enable_x11=no]) + +AC_ARG_ENABLE(gs, + [AS_HELP_STRING([--enable-gs], [Enable the Ghostscript device driver])], + [enable_gs=$enableval], + [enable_gs=no]) + +if test x"$enable_gd" = x"yes"; then + AC_CHECK_PROG(enable_gd, [gdlib-config],, + [AC_MSG_ERROR([GD driver requested but gdlib-config not found])]) + GD_LIBS="`gdlib-config --libs` -lgd" + GD_CFLAGS="`gdlib-config --cflags`" + AC_SUBST(GD_LIBS) + AC_SUBST(GD_CFLAGS) +fi +AM_CONDITIONAL(ENABLE_GD, [test x"$enable_gd" = x"yes"] ) + +if test x"$enable_gl" = 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="-DUNIX_OS -DAPPEND_UNDERSCORE -DSUBROUTINE_CASE" + AC_SUBST(GL_CFLAGS) + + AC_CHECK_LIB(GL, glXCreateContext, GL_LIBS="-lGL", + [AC_MSG_ERROR([OpenGL driver requested but libraries not found])]) + AC_CHECK_LIB(GLU, gluPerspective, GL_LIBS="-lGL -lGLU", + [AC_MSG_ERROR([OpenGL driver requested but libraries not found])]) + GL_LIBS="-lGL -lGLU" + AC_SUBST(GL_LIBS) +fi +AM_CONDITIONAL(ENABLE_GL, [ test x"$enable_gl" = x"yes" ]) + +if test x"$enable_x11" = 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" = x"yes" ]) + +if test x"$enable_gs" = 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="-lgs `gdlib-config --libs` -lgd" + GS_CFLAGS="-lgs `gdlib-config --cflags`" + AC_SUBST(GS_LIBS) + AC_SUBST(GS_CFLAGS) +fi +AM_CONDITIONAL(ENABLE_GS, [ test x"$enable_gs" = x"yes" ]) + +AC_CONFIG_FILES([Makefile DPCOPA.INC $fdriv.f]) +AC_OUTPUT diff --git a/sci-mathematics/dataplot/files/dpsrc-datadir-20080225.patch b/sci-mathematics/dataplot/files/dpsrc-datadir-20080225.patch new file mode 100644 index 000000000..0e973046f --- /dev/null +++ b/sci-mathematics/dataplot/files/dpsrc-datadir-20080225.patch @@ -0,0 +1,41 @@ +--- dpsrc-orig/dp1_linux.f.in 2007-08-23 18:19:27.000000000 -0400 ++++ dpsrc/dp1_linux.f.in 2008-04-29 08:31:51.000000000 -0400 +@@ -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='DATAPLOT_FILES' + CALL getenv(UNIXPV,UNIXPN) + IF(UNIXPN.EQ.' ')THEN +- IPATH1='/usr/local/lib/dataplot/' ++ IPATH1='@datadir@/dataplot' + NCP1=24 + UNIXPN=' ' + UNIXPN(1:NCP1)=IPATH1(1:NCP1) +--- dpsrc-orig/dp1_linux_64.f.in 2007-08-23 18:19:57.000000000 -0400 ++++ dpsrc/dp1_linux_64.f.in 2008-04-29 08:49:20.000000000 -0400 +@@ -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='DATAPLOT_FILES' + CALL getenv(UNIXPV,UNIXPN) + IF(UNIXPN.EQ.' ')THEN +- IPATH1='/usr/local/lib/dataplot/' ++ IPATH1='@datadir@/dataplot/' + NCP1=24 + UNIXPN=' ' + UNIXPN(1:NCP1)=IPATH1(1:NCP1) + diff --git a/sci-mathematics/dataplot/files/dpsrc-dp1patches-20080225.patch b/sci-mathematics/dataplot/files/dpsrc-dp1patches-20080225.patch new file mode 100644 index 000000000..16e14eb7e --- /dev/null +++ b/sci-mathematics/dataplot/files/dpsrc-dp1patches-20080225.patch @@ -0,0 +1,76 @@ +--- 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='SUN ' ++ IHOST1='@HOST@' + IHOST2=' ' + IHMOD1='3 ' + IHMOD2=' ' +@@ -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='DATAPLOT_FILES' + CALL getenv(UNIXPV,UNIXPN) + IF(UNIXPN.EQ.' ')THEN +- IPATH1='/usr/local/lib/dataplot/' ++ IPATH1='@datadir@/dataplot/' + NCP1=24 + UNIXPN=' ' + UNIXPN(1:NCP1)=IPATH1(1:NCP1) +@@ -2724,8 +2724,6 @@ + ENDIF + CCCCC AUGUST 1996. TO MAKE SEARCH OF SUB-DIRECTORIES WORK, SET PATH + CCCCC TO BE EMPTY. +- IPATH1=' ' +- NCP1=0 + 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='SUN ' ++ IHOST1='@HOST@' + IHOST2=' ' + IHMOD1='3 ' + IHMOD2=' ' +@@ -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='DATAPLOT_FILES' + CALL getenv(UNIXPV,UNIXPN) + IF(UNIXPN.EQ.' ')THEN +- IPATH1='/usr/local/lib/dataplot/' ++ IPATH1='@datadir@/dataplot' + NCP1=24 + UNIXPN=' ' + UNIXPN(1:NCP1)=IPATH1(1:NCP1) +@@ -2655,8 +2655,6 @@ + ENDIF + CCCCC AUGUST 1996. TO MAKE SEARCH OF SUB-DIRECTORIES WORK, SET PATH + CCCCC TO BE EMPTY. +- IPATH1=' ' +- NCP1=0 + 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. diff --git a/sci-mathematics/dataplot/files/dpsrc-maxobvvalue-20080225.patch b/sci-mathematics/dataplot/files/dpsrc-maxobvvalue-20080225.patch new file mode 100644 index 000000000..ddf8544ca --- /dev/null +++ b/sci-mathematics/dataplot/files/dpsrc-maxobvvalue-20080225.patch @@ -0,0 +1,11 @@ +--- 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=82000) + CCCCC PARAMETER (MAXPOP=16400) + C +- PARAMETER (MAXOBV=100000) ++ PARAMETER (MAXOBV=@MAXOBV@) + PARAMETER (MAXOBW=10*MAXOBV) + PARAMETER (MAXPOP=2*MAXOBV) + C diff --git a/sci-mathematics/dataplot/files/dpsrc-patchset-20080225.patch b/sci-mathematics/dataplot/files/dpsrc-patchset-20080225.patch index dbb95da2a..d633dff3d 100644 --- a/sci-mathematics/dataplot/files/dpsrc-patchset-20080225.patch +++ b/sci-mathematics/dataplot/files/dpsrc-patchset-20080225.patch @@ -67,3 +67,45 @@ diff -Naur dpsrc-orig/x11_src.c dpsrc/x11_src.c 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 allocated */ + int CURRENT_COLOR; /* Define current color */ + int CURRENT_LINE_STYLE[12]; /* Define current line style */ +-int NPTS_STYLE = 0; /* Number of points in style */ ++static int NPTS_STYLE = 0; /* Number of points in style */ + int color_table[MAX_COLORS + 100]; /* color table */ +-int red[MAX_COLORS] = { ++static int red[MAX_COLORS] = { + /* 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] = { ++static int green[MAX_COLORS] = { + /* 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] = { ++static int blue[MAX_COLORS] = { + /* 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 = 0; /* 0 - GS closed, 1 - GS open */ +-int DEVICE_TYPE = 0; /* define device */ ++static int DEVICE_TYPE = 0; /* define device */ + /* 1 - jpeg */ + /* 2 - png */ + /* 3 - windows bmp */ + |