From 371608d23969478db05aeaa3c8f8583b87803cad Mon Sep 17 00:00:00 2001 From: Thomas Anderson Date: Fri, 30 May 2008 10:38:04 +0000 Subject: sci-mathematics/dataplot: Merge maxobvvalue into dp1patches. Move dataplot's Makefile.am and configure.ac to {configure.ac,Makefile.am}.${PV}. Add || die to doins and econf svn path=/sunrise/; revision=6240 --- sci-mathematics/dataplot/ChangeLog | 9 ++ sci-mathematics/dataplot/Manifest | 11 ++- .../dataplot/dataplot-20080225-r1.ebuild | 9 +- sci-mathematics/dataplot/files/Makefile.am | 45 ---------- .../dataplot/files/Makefile.am.20080225 | 45 ++++++++++ sci-mathematics/dataplot/files/configure.ac | 97 ---------------------- .../dataplot/files/configure.ac.20080225 | 97 ++++++++++++++++++++++ .../dataplot/files/dpsrc-dp1patches-20080225.patch | 12 +++ .../files/dpsrc-maxobvvalue-20080225.patch | 11 --- 9 files changed, 173 insertions(+), 163 deletions(-) delete mode 100644 sci-mathematics/dataplot/files/Makefile.am create mode 100644 sci-mathematics/dataplot/files/Makefile.am.20080225 delete mode 100644 sci-mathematics/dataplot/files/configure.ac create mode 100644 sci-mathematics/dataplot/files/configure.ac.20080225 delete mode 100644 sci-mathematics/dataplot/files/dpsrc-maxobvvalue-20080225.patch (limited to 'sci-mathematics') diff --git a/sci-mathematics/dataplot/ChangeLog b/sci-mathematics/dataplot/ChangeLog index 7d99c2779..af0bf6996 100644 --- a/sci-mathematics/dataplot/ChangeLog +++ b/sci-mathematics/dataplot/ChangeLog @@ -2,6 +2,15 @@ # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 30 May 2008; Thomas Anderson (gentoofan23) + dataplot-20080225-r1.ebuild, -files/dpsrc-maxobvvalue-20080225.patch, + files/dpsrc-dp1patches-20080225.patch, -files/Makefile.am, + +files/Makefile.am.20080225, -files/configure.ac, + +files/configure.ac.20080225: + Merge maxobvvalue into dp1patches. Move dataplot's Makefile.am and + configure.ac to {configure.ac,Makefile.am}.${PV}. Add || die to doins and + econf + 30 May 2008; Thomas Anderson (gentoofan23) dataplot-20080225-r1.ebuild: tweak fortran checks diff --git a/sci-mathematics/dataplot/Manifest b/sci-mathematics/dataplot/Manifest index 29656f56b..92cbc0802 100644 --- a/sci-mathematics/dataplot/Manifest +++ b/sci-mathematics/dataplot/Manifest @@ -1,11 +1,10 @@ AUX 90dataplot 75 RMD160 d561beb32d6b98a1809fa46a103beaa115450585 SHA1 160b11d262ee4aac6d1af48dc96af905d1724a55 SHA256 a0e547d52eca3ec872bd996712e93d550d65f66a693416ce6944504cab78df6c -AUX Makefile.am 1246 RMD160 05e5b07336606da88381a31882f32b482e807d22 SHA1 acb5e834086dbf895e60cb75a8807dfa763f5372 SHA256 083de39fb87096dc26209b2084d04d9ead949a0c8a87f6da9dddb21899acbfef -AUX configure.ac 2967 RMD160 7e5f8a192fba3e5e4441b912bec60e97f3c3c981 SHA1 2a8ea0e90240071cd3d80d1af88fc54266ad9a07 SHA256 a89eade674ffaf683b73537133e56df6d6ccc3093ea78c783049400a845eec85 -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 Makefile.am.20080225 1246 RMD160 05e5b07336606da88381a31882f32b482e807d22 SHA1 acb5e834086dbf895e60cb75a8807dfa763f5372 SHA256 083de39fb87096dc26209b2084d04d9ead949a0c8a87f6da9dddb21899acbfef +AUX configure.ac.20080225 2967 RMD160 7e5f8a192fba3e5e4441b912bec60e97f3c3c981 SHA1 2a8ea0e90240071cd3d80d1af88fc54266ad9a07 SHA256 a89eade674ffaf683b73537133e56df6d6ccc3093ea78c783049400a845eec85 +AUX dpsrc-dp1patches-20080225.patch 3003 RMD160 e3480165e3ce77e8f74bb8b1f20ba4beecc54d76 SHA1 16616bd81b6e91dcf3a105d97d593794711c4901 SHA256 3279e55fafa3e43700f5f7df3f8422b0f124d1e12cd356f344f85cb33a0b3551 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-r1.ebuild 2490 RMD160 bf29f68e1950ac09a640bb3245b30843203c8506 SHA1 6e0483ef0fbf9b9816233b5c345e5c4365907c7b SHA256 c8bd89db19fa316759834e4799310cbf59facdca72806f883f0098883e4d81f4 -MISC ChangeLog 3012 RMD160 e06dc9a59f31f797bb3c332f0c17a210ac484461 SHA1 7e18853a3b717763a56941ab76f4b5b92ba3428f SHA256 db039d91f06811c7d97a51c8c424db19f642643b184195615d5fcfd356eff86d +EBUILD dataplot-20080225-r1.ebuild 2546 RMD160 0996ba92325816d3ec48c25bcf0dd248f5ac5813 SHA1 f57136e9792d3fa61c07064117a072a8087cfaa6 SHA256 2e5b783e35689352ca6f7f7b8a5d77c0938872707023d89f4fb440f6d0ce242d +MISC ChangeLog 3452 RMD160 9c59ecc3b8c133d01428db868a688c93e47bfdbf SHA1 cc08dd0f9e741fff66cf81c78e15586036665479 SHA256 58021b676bd57a2be1bc653f228406d2f6a877b6089d88f83219601bf0a6be82 MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42 diff --git a/sci-mathematics/dataplot/dataplot-20080225-r1.ebuild b/sci-mathematics/dataplot/dataplot-20080225-r1.ebuild index 4f68faab0..f10213a62 100644 --- a/sci-mathematics/dataplot/dataplot-20080225-r1.ebuild +++ b/sci-mathematics/dataplot/dataplot-20080225-r1.ebuild @@ -52,10 +52,10 @@ src_unpack() { 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}" + cp "${FILESDIR}"/Makefile.am.${PV} "${S}"/Makefile.am + cp "${FILESDIR}"/configure.ac.${PV} "${S}"/configure.ac mkdir "${S_AUX}" && cd "${S_AUX}" unpack ${MY_P_AUX}.tar.gz @@ -67,7 +67,7 @@ src_compile() { econf $(use_enable gd) \ $(use_enable gs) \ $(use_enable opengl) \ - $(use_enable X) + $(use_enable X) || die "Econf failed" emake || die "Make failed" } @@ -80,7 +80,8 @@ src_install() { 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 + doins "${S_AUX}"/dpmesf.tex "${S_AUX}"/dpsysf.tex "${S_AUX}"/dplogf.tex || \ + die "Doins failed." doenvd "${FILESDIR}"/90${PN} } diff --git a/sci-mathematics/dataplot/files/Makefile.am b/sci-mathematics/dataplot/files/Makefile.am deleted file mode 100644 index 29dd418b2..000000000 --- a/sci-mathematics/dataplot/files/Makefile.am +++ /dev/null @@ -1,45 +0,0 @@ -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/Makefile.am.20080225 b/sci-mathematics/dataplot/files/Makefile.am.20080225 new file mode 100644 index 000000000..29dd418b2 --- /dev/null +++ b/sci-mathematics/dataplot/files/Makefile.am.20080225 @@ -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 deleted file mode 100644 index 1051b9dbd..000000000 --- a/sci-mathematics/dataplot/files/configure.ac +++ /dev/null @@ -1,97 +0,0 @@ -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/configure.ac.20080225 b/sci-mathematics/dataplot/files/configure.ac.20080225 new file mode 100644 index 000000000..1051b9dbd --- /dev/null +++ b/sci-mathematics/dataplot/files/configure.ac.20080225 @@ -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-dp1patches-20080225.patch b/sci-mathematics/dataplot/files/dpsrc-dp1patches-20080225.patch index 16e14eb7e..3c7cdeb4c 100644 --- a/sci-mathematics/dataplot/files/dpsrc-dp1patches-20080225.patch +++ b/sci-mathematics/dataplot/files/dpsrc-dp1patches-20080225.patch @@ -74,3 +74,15 @@ 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=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-maxobvvalue-20080225.patch b/sci-mathematics/dataplot/files/dpsrc-maxobvvalue-20080225.patch deleted file mode 100644 index ddf8544ca..000000000 --- a/sci-mathematics/dataplot/files/dpsrc-maxobvvalue-20080225.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- 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 -- cgit v1.2.3-65-gdbad