Changeset 81302

Timestamp:

07/28/11 22:38:23 (4 years ago)

Author:

ryandesign@…

Message:

pgplot: do not use ".." in patchfile paths; see #30219

Location:

trunk/dports/graphics/pgplot

Files:

• Portfile (modified) (11 diffs)
• files/patch-drivers.list.patch (modified) (1 diff)
• files/patch-makemake.diff (modified) (1 diff)
• files/patch-proccom.c.diff (modified) (1 diff)

trunk/dports/graphics/pgplot/Portfile

@@ -25 +25 @@
 
 distname                        ${name}[join [split ${version} .] ""]
-
-worksrcdir                      build
-set srcdir          ${workpath}/${name}
+worksrcdir                      ${name}
+configure.dir           ${workpath}/build
+build.dir                       ${configure.dir}
 
 checksums \
@@ -43 +43 @@
 set compat_version  [join [lrange [split ${version} .] 0 0] .]
 
-pre-patch {
-    file mkdir ${worksrcpath}
+post-extract {
+    file mkdir ${build.dir}
 }
 
 post-patch {
     # Ensure MacPorts libraries are being used.
-    reinplace "s|\\(-L\\\\`pwd\\\\`\\)|\\1 -L${prefix}/lib|" ${srcdir}/makemake
+    reinplace "s|\\(-L\\\\`pwd\\\\`\\)|\\1 -L${prefix}/lib|" ${worksrcpath}/makemake
 
     # Look in the correct place for run-time data files.
-    reinplace "s|/usr/local/pgplot/|${prefix}/share/${name}/|" ${srcdir}/src/grgfil.f
+    reinplace "s|/usr/local/pgplot/|${prefix}/share/${name}/|" ${worksrcpath}/src/grgfil.f
 
     # /usr/local/bin/perl may not exist.
-    reinplace "s|#!/usr/local/bin/perl|#!/usr/bin/env perl|" ${srcdir}/makehtml ${srcdir}/maketex
-
-    copy ${srcdir}/drivers.list ${worksrcpath}
+    reinplace "s|#!/usr/local/bin/perl|#!/usr/bin/env perl|" ${worksrcpath}/makehtml ${worksrcpath}/maketex
+
+    copy ${worksrcpath}/drivers.list ${build.dir}
 
     set drivers  "GIF VGIF LATEX PNG TPNG PS VPS CPS VCPS"
@@ -71 +71 @@
 
     foreach driver ${drivers} {
-        reinplace "s|!\\(.*/${driver} .*\\)| \\1|" ${worksrcpath}/drivers.list
+        reinplace "s|!\\(.*/${driver} .*\\)| \\1|" ${build.dir}/drivers.list
     }
 }
@@ -95 +95 @@
 
     # Create configuration file.
-    #    For a description of options, see ${srcdir}/sys_linux/g77_gcc.conf
+    #    For a description of options, see ${worksrcpath}/sys_linux/g77_gcc.conf
     lappend options  XINCL            "${configure.cppflags}"
     lappend options  MOTIF_INCL       ""
@@ -125 +125 @@
     lappend options  CSHARED_LD       "${configure.fc} ${shlib_opts} ${configure.ldflags} ${x11Libs} -install_name ${prefix}/lib/libcpgplot${compat_version}.dylib"
 
-    file mkdir ${srcdir}/sys_darwin
+    file mkdir ${worksrcpath}/sys_darwin
     foreach {var val} ${options} {
-        system "/bin/echo \"   ${var}=\\\"${val}\\\"\" >> ${srcdir}/sys_darwin/marcports.conf"
+        system "/bin/echo \"   ${var}=\\\"${val}\\\"\" >> ${worksrcpath}/sys_darwin/marcports.conf"
     }
 
     # Create optional routine which makemake will find and compile.
-    system "/bin/echo \"int iand_ (int *a, int *b) { return *a & *b;}\" >> ${srcdir}/sys_darwin/iand.c"
-}
-
-configure.cmd       ${srcdir}/makemake
+    system "/bin/echo \"int iand_ (int *a, int *b) { return *a & *b;}\" >> ${worksrcpath}/sys_darwin/iand.c"
+}
+
+configure.cmd       ${worksrcpath}/makemake
 configure.pre_args
-configure.args      ${srcdir} ${os.platform}
+configure.args      ${worksrcpath} ${os.platform}
 
 # When linking against fortran code, PG_PPU gets number of underscores correct.
@@ -147 +147 @@
     # pgxwin_server is only built if the X11 drivers are requested.
     # pgdisp is only built if the XDISP driver is requested.
-    foreach fl [glob -directory ${worksrcpath} -nocomplain pgxwin_server pgdisp] {
+    foreach fl [glob -directory ${destroot.dir} -nocomplain pgxwin_server pgdisp] {
         xinstall -m 755 ${fl} ${destroot}${prefix}/bin
     }
 
-    foreach fl [glob -directory ${worksrcpath} -nocomplain *.dylib] {
+    foreach fl [glob -directory ${destroot.dir} -nocomplain *.dylib] {
         xinstall -m 755 ${fl} ${destroot}${prefix}/lib
     }
 
-    foreach fl [glob -directory ${worksrcpath} -nocomplain *.a] {
+    foreach fl [glob -directory ${destroot.dir} -nocomplain *.a] {
         xinstall -m 644 ${fl} ${destroot}${prefix}/lib
     }
 
-    foreach fl [glob -directory ${worksrcpath} -nocomplain *.h] {
+    foreach fl [glob -directory ${destroot.dir} -nocomplain *.h] {
         xinstall -m 644 ${fl} ${destroot}${prefix}/include
     }
@@ -165 +165 @@
     # Install run-time data files.
     xinstall -d -m 755 ${destroot}${prefix}/share/${name}
-    foreach fl [glob -directory ${worksrcpath} -nocomplain *.dat *.txt] {
+    foreach fl [glob -directory ${destroot.dir} -nocomplain *.dat *.txt] {
         xinstall -m 644 ${fl} ${destroot}${prefix}/share/${name}
     }
@@ -171 +171 @@
     # Install docs.
     xinstall -d -m 755 ${destroot}${prefix}/share/doc/${name}
-    xinstall -m 644 ${srcdir}/copyright.notice ${destroot}${prefix}/share/doc/${name}
-    foreach fl [glob -directory ${worksrcpath} -nocomplain *.doc *.html *.pdf] {
+    xinstall -m 644 ${worksrcpath}/copyright.notice ${destroot}${prefix}/share/doc/${name}
+    foreach fl [glob -directory ${destroot.dir} -nocomplain *.doc *.html *.pdf] {
         xinstall -m 644 ${fl} ${destroot}${prefix}/share/doc/${name}
     }
@@ -178 +178 @@
     # Install examples.
     xinstall -d -m 755 ${destroot}${prefix}/share/${name}/examples
-    foreach fl [glob -directory ${srcdir} examples/pgdemo*.f cpg/cpgdemo*.c drivers/*/pg*demo.*] {
+    foreach fl [glob -directory ${worksrcpath} examples/pgdemo*.f cpg/cpgdemo*.c drivers/*/pg*demo.*] {
         xinstall -m 644 ${fl} ${destroot}${prefix}/share/${name}/examples
     }
-    foreach fl [glob -directory ${worksrcpath} *demo*] {
+    foreach fl [glob -directory ${destroot.dir} *demo*] {
         xinstall -m 755 ${fl} ${destroot}${prefix}/share/${name}/examples
     }
@@ -208 +208 @@
 
     post-extract {
-        copy ${prefix}/share/aquaterm/adapters/pgplot/aqdriv.m ${srcdir}/drivers
+        copy ${prefix}/share/aquaterm/adapters/pgplot/aqdriv.m ${worksrcpath}/drivers
     }
 }
@@ -244 +244 @@
 
     post-build {
-        system "cd ${worksrcpath} && pdflatex pgplot-routines.tex && pdflatex pgplot-routines.tex"
-    }
-}
+        system "cd ${build.dir} && pdflatex pgplot-routines.tex && pdflatex pgplot-routines.tex"
+    }
+}

trunk/dports/graphics/pgplot/files/patch-drivers.list.patch

@@ -1 @@
---- ../pgplot/drivers.list.orig 1999-05-04 01:02:15.000000000 -0400
-+++ ../pgplot/drivers.list      2009-02-28 13:23:46.000000000 -0500
+--- drivers.list.orig   1999-05-04 01:02:15.000000000 -0400
++++ drivers.list        2009-02-28 13:23:46.000000000 -0500
 @@ -5,6 +5,7 @@
  ! available on selected operating systems only.

trunk/dports/graphics/pgplot/files/patch-makemake.diff

@@ -1 @@
---- ../pgplot/makemake.orig     2009-02-28 16:57:42.000000000 -0500
-+++ ../pgplot/makemake  2009-02-28 16:58:30.000000000 -0500 
+--- makemake.orig       2009-02-28 16:57:42.000000000 -0500
++++ makemake    2009-02-28 16:58:30.000000000 -0500 
 @@ -100,6 +100,7 @@
  #-----------------------------------------------------------------------

trunk/dports/graphics/pgplot/files/patch-proccom.c.diff

@@ -1 @@
---- ../pgplot/pgdispd/proccom.c.orig    1994-08-22 16:33:35.000000000 -0400
-+++ ../pgplot/pgdispd/proccom.c 2009-02-28 13:37:38.000000000 -0500
+--- pgdispd/proccom.c.orig      1994-08-22 16:33:35.000000000 -0400
++++ pgdispd/proccom.c   2009-02-28 13:37:38.000000000 -0500
 @@ -93,10 +93,12 @@
  #include <sys/types.h>