[47644] trunk/dports/graphics/pgplot
mcalhoun at macports.org
mcalhoun at macports.org
Mon Mar 2 14:15:43 PST 2009
Revision: 47644
http://trac.macports.org/changeset/47644
Author: mcalhoun at macports.org
Date: 2009-03-02 14:15:43 -0800 (Mon, 02 Mar 2009)
Log Message:
-----------
pgplot:
The pgplot Portfile was almost completely rewritten in order to simplify maintenance and fix build errors.
* gcc34 is no longer provides the Fortran compiler on any platform.
* The Fortran compiler can be provided by g95, gcc42, or gcc43.
* PDF documentation is available.
* The XDISP driver is no longer installed because of difficulty in getting it work (it is possible it never worked).
* The C library wrapper now has a shared library as well as a static one.
* Always having -Wl,-framework -Wl,Foundation with -laquaterm seems to have fixed #14494.
* Variant aqt is now aquaterm and is no longer built by default.
* Instead of variant x11 as a default variant, use no_x11 variant.
Fixes #14494, #15827, #15925, and #18477.
Modified Paths:
--------------
trunk/dports/graphics/pgplot/Portfile
Added Paths:
-----------
trunk/dports/graphics/pgplot/files/patch-makemake.diff
trunk/dports/graphics/pgplot/files/patch-proccom.c.diff
Removed Paths:
-------------
trunk/dports/graphics/pgplot/files/patch-aqdriv.m_aqt
trunk/dports/graphics/pgplot/files/patch-drivers.list
trunk/dports/graphics/pgplot/files/patch-drivers.list_aqt
trunk/dports/graphics/pgplot/files/patch-drivers_x11.list
trunk/dports/graphics/pgplot/files/patch-makemake
trunk/dports/graphics/pgplot/files/patch-makemake_aqt
trunk/dports/graphics/pgplot/files/patch-pgdispd_proccom.c
trunk/dports/graphics/pgplot/files/patch-src_grgfil.f
trunk/dports/graphics/pgplot/files/patch-sys_darwin_aaaread.me
trunk/dports/graphics/pgplot/files/patch-sys_darwin_g77_gcc.conf
trunk/dports/graphics/pgplot/files/patch-sys_darwin_g77_gcc.conf_aqt
trunk/dports/graphics/pgplot/files/patch-sys_darwin_gfortran_gcc_42.conf
trunk/dports/graphics/pgplot/files/patch-sys_darwin_gfortran_gcc_42.conf_aqt
Modified: trunk/dports/graphics/pgplot/Portfile
===================================================================
--- trunk/dports/graphics/pgplot/Portfile 2009-03-02 22:15:17 UTC (rev 47643)
+++ trunk/dports/graphics/pgplot/Portfile 2009-03-02 22:15:43 UTC (rev 47644)
@@ -4,7 +4,7 @@
PortSystem 1.0
name pgplot
version 5.2.2
-revision 4
+revision 5
categories graphics devel
maintainers mcalhoun openmaintainer
description C/Fortran graphics library
@@ -23,120 +23,215 @@
distname ${name}[join [split ${version} .] ""]
-worksrcdir ${name}/build
+worksrcdir build
+set srcdir ${workpath}/${name}
checksums \
md5 e8a6e8d0d5ef9d1709dfb567724525ae \
sha1 1f1c9aa17eeec9a2fb23fd15a0e4a91dcc49ddc1 \
rmd160 4c21cad6613772f4104c65ac3d8d9a42e3c4afe1
-depends_lib lib:libpng:libpng lib:libz:zlib bin:g77-dp-3.4:gcc34
+patchfiles-append patch-makemake.diff patch-drivers.list.patch patch-proccom.c.diff
+depends_lib-append port:libpng port:zlib port:g95
+depends_build-append bin:perl:perl5
-patchfiles \
- patch-makemake \
- patch-src_grgfil.f \
- patch-drivers.list \
- patch-pgdispd_proccom.c
+configure.fc ${prefix}/bin/g95
-post-extract {
- file mkdir ${worksrcpath}
-}
+# Tell the compiler not to treat backslash characters as C-style escape sequences.
+configure.fcflags-append -fno-backslash
+set compat_version [join [lrange [split ${version} .] 0 0] .]
+
pre-patch {
- file copy ${worksrcpath}/../drivers.list ${worksrcpath}/drivers.list
+ file mkdir ${worksrcpath}
}
post-patch {
- reinplace "s|@@PREFIX@@|${prefix}|g" ${worksrcpath}/../src/grgfil.f
-}
+ # Ensure MacPorts libraries are being used.
+ reinplace "s|\\(-L\\\\`pwd\\\\`\\)|\\1 -L${prefix}/lib|" ${srcdir}/makemake
-configure {
- system "cd ${worksrcpath} && ../makemake .. ${os.platform} ${ppCompilerSpec}"
+ # Look in the correct place for run-time data files.
+ reinplace "s|/usr/local/pgplot/|${prefix}/share/${name}/|" ${srcdir}/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}
+
+ set drivers "GIF VGIF LATEX PNG TPNG PS VPS CPS VCPS"
+
+ if {![variant_isset no_x11]} {
+ # XDISP does not work because the program figdisp can not be found.
+ lappend drivers XWINDOW XSERVE
+ }
+
+ if {[variant_isset aquaterm]} {
+ lappend drivers AQT
+ }
+
+ foreach driver ${drivers} {
+ reinplace "s|!\\(.*/${driver} .*\\)| \\1|" ${worksrcpath}/drivers.list
+ }
}
-build.target all
+pre-configure {
+ set shlib_opts \
+ "-dynamiclib -single_module -current_version ${version} -compatibility_version ${compat_version}"
-post-build {
- system "cd ${worksrcpath} && make cpg"
+ if {![variant_isset no_x11]} {
+ if { [file exists ${prefix}/lib/pkgconfig/x11.pc] || [file exists ${x11prefix}/lib/pkgconfig/x11.pc] } {
+ # XQuartz or MacPorts X11 (pkg-config gives precedence to MacPorts X11)
+ eval configure.ldflags-append [exec pkg-config x11 --libs-only-L]
+ set x11Libs [exec pkg-config x11 --libs-only-l]
+ eval configure.cppflags-append [exec pkg-config x11 --cflags]
+ } else {
+ # Tiger or earlier X11 (xorg-libX11 installed with system_x11 variant)
+ configure.ldflags-append "-L${x11prefix}/lib"
+ set x11Libs -lX11
+ configure.cppflags-append "-I${x11prefix}/include"
+ }
+ } else {
+ set x11Libs ""
+ }
+
+ if {[variant_isset aquaterm]} {
+ set aqtLibs "-laquaterm -Wl,-framework -Wl,Foundation"
+ } else {
+ set aqtLibs ""
+ }
+
+ # Create configuration file.
+ # For a description of options, see ${srcdir}/sys_linux/g77_gcc.conf
+ lappend options XINCL "${configure.cppflags}"
+ lappend options MOTIF_INCL ""
+ lappend options ATHENA_INCL ""
+ lappend options TK_INCL ""
+ lappend options RV_INCL ""
+ lappend options FCOMPL "${configure.fc}"
+ lappend options FFLAGC "${configure.fcflags}"
+ lappend options FFLAGD ""
+ lappend options CCOMPL "${configure.cc}"
+ lappend options CFLAGC "${configure.cppflags} ${configure.cflags}"
+ lappend options CFLAGD ""
+ lappend options PGBIND_FLAGS "bsd"
+ lappend options LIBS "${configure.ldflags} ${x11Libs} ${aqtLibs}"
+ lappend options MOTIF_LIBS ""
+ lappend options ATHENA_LIBS ""
+ lappend options TK_LIBS ""
+ lappend options RANLIB "/usr/bin/ranlib"
+ lappend options SHARED_LIB "libpgplot${version}.dylib"
+ lappend options SHARED_LD "${configure.fc} ${shlib_opts} ${configure.ldflags} ${x11Libs} -install_name ${prefix}/lib/libpgplot${compat_version}.dylib"
+ lappend options SHARED_LIB_LIBS "${configure.ldflags} -lpng ${aqtLibs}"
+ lappend options MCOMPL "${configure.objc}"
+ lappend options MFLAGC "${configure.objcflags}"
+ lappend options SYSDIR "\\\$SYSDIR"
+
+ # The following variables are not part of the unpatched pgplot.
+ # They have been added to facilitate building a shared C library.
+ lappend options CSHARED_LIB "libcpgplot${version}.dylib"
+ lappend options CSHARED_LD "${configure.fc} ${shlib_opts} ${configure.ldflags} ${x11Libs} -install_name ${prefix}/lib/libcpgplot${compat_version}.dylib"
+
+ file mkdir ${srcdir}/sys_darwin
+ foreach {var val} ${options} {
+ system "/bin/echo \" ${var}=\\\"${val}\\\"\" >> ${srcdir}/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
+configure.pre_args
+configure.args ${srcdir} ${os.platform}
+
+# When linking against fortran code, PG_PPU gets number of underscores correct.
+configure.cppflags-append -DPG_PPU
+
+# Build the C PGPLOT wrapper library, HTML documentation, and TeX files.
+build.target-append cpg pgplot.html pgplot-routines.tex
+
destroot {
- xinstall -m 755 -d ${destroot}${prefix}/share/${name} \
- ${destroot}${prefix}/share/doc/${name}
- xinstall -m 644 -W ${worksrcpath} grfont.dat rgb.txt \
- ${destroot}${prefix}/share/${name}
- xinstall -m 644 -W ${worksrcpath} libpgplot.a libcpgplot.a \
- ${destroot}${prefix}/lib
- system "ranlib ${destroot}${prefix}/lib/libpgplot.a \
- ${destroot}${prefix}/lib/libcpgplot.a"
- xinstall -m 644 -W ${worksrcpath} cpgplot.h ${destroot}${prefix}/include
- xinstall -m 644 -W ${worksrcpath} pgplot.doc ../copyright.notice \
- ${destroot}${prefix}/share/doc/${name}
-}
+ # 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] {
+ xinstall -m 755 ${fl} ${destroot}${prefix}/bin
+ }
-platform darwin {
- global ppCompilerSpec
- set ppCompilerSpec g77_gcc
-
- patchfiles-append \
- patch-sys_darwin_aaaread.me \
- patch-sys_darwin_g77_gcc.conf
+ foreach fl [glob -directory ${worksrcpath} -nocomplain *.dylib] {
+ xinstall -m 755 ${fl} ${destroot}${prefix}/lib
+ }
- post-patch {
- reinplace "s|@@PREFIX@@|${prefix}|g" \
- ${worksrcpath}/../sys_darwin/${ppCompilerSpec}.conf
- reinplace "s|@@X11PREFIX@@|${x11prefix}|g" \
- ${worksrcpath}/../sys_darwin/${ppCompilerSpec}.conf
- }
-}
+ foreach fl [glob -directory ${worksrcpath} -nocomplain *.a] {
+ xinstall -m 644 ${fl} ${destroot}${prefix}/lib
+ }
-platform darwin i386 {
- depends_lib-delete bin:g77-dp-3.4:gcc34
- depends_lib-append port:gcc42
+ foreach fl [glob -directory ${worksrcpath} -nocomplain *.h] {
+ xinstall -m 644 ${fl} ${destroot}${prefix}/include
+ }
- set ppCompilerSpec gfortran_gcc_42
+ # Install run-time data files.
+ xinstall -d -m 755 ${destroot}${prefix}/share/${name}
+ foreach fl [glob -directory ${worksrcpath} -nocomplain *.dat *.txt] {
+ xinstall -m 644 ${fl} ${destroot}${prefix}/share/${name}
+ }
- patchfiles-delete patch-sys_darwin_g77_gcc.conf
- patchfiles-append patch-sys_darwin_gfortran_gcc_42.conf
-}
+ # 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 ${fl} ${destroot}${prefix}/share/doc/${name}
+ }
-default_variants +x11 +aqt
+ # 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.*] {
+ xinstall -m 644 ${fl} ${destroot}${prefix}/share/${name}/examples
+ }
+ foreach fl [glob -directory ${worksrcpath} *demo*] {
+ xinstall -m 755 ${fl} ${destroot}${prefix}/share/${name}/examples
+ }
-variant x11 {
- depends_lib-append port:xorg-libs
+ # Create more library names.
+ ln -s libcpgplot${version}.dylib ${destroot}${prefix}/lib/libcpgplot.dylib
+ ln -s libcpgplot${version}.dylib ${destroot}${prefix}/lib/libcpgplot[join [lrange [split ${version} .] 0 0] .].dylib
+ ln -s libcpgplot${version}.dylib ${destroot}${prefix}/lib/libcpgplot[join [lrange [split ${version} .] 0 1] .].dylib
- patchfiles-append patch-drivers_x11.list
+ ln -s libpgplot${version}.dylib ${destroot}${prefix}/lib/libpgplot.dylib
+ ln -s libpgplot${version}.dylib ${destroot}${prefix}/lib/libpgplot[join [lrange [split ${version} .] 0 0] .].dylib
+ ln -s libpgplot${version}.dylib ${destroot}${prefix}/lib/libpgplot[join [lrange [split ${version} .] 0 1] .].dylib
+}
- post-destroot {
- xinstall -m 755 -W ${worksrcpath} pgdisp pgxwin_server \
- ${destroot}${prefix}/bin
- }
+variant no_x11 {}
+
+if {![variant_isset no_x11]} {
+ depends_lib-append port:xorg-libX11
+ depends_build-append port:pkgconfig
}
-variant aqt {
-# Variant that adds aquaterm driver support
- depends_lib-append port:aquaterm
+variant aquaterm description {install driver for aquaterm} {
+ depends_lib-append port:aquaterm
- patchfiles-append \
- patch-drivers.list_aqt \
- patch-sys_darwin_${ppCompilerSpec}.conf_aqt \
- patch-makemake_aqt
+ post-extract {
+ copy ${prefix}/share/aquaterm/adapters/pgplot/aqdriv.m ${srcdir}/drivers
+ }
+}
- pre-patch {
- file copy ${prefix}/share/aquaterm/adapters/pgplot/aqdriv.m ${workpath}/pgplot/drivers/
- }
+variant gcc42 description {build with gfortran from gcc42 instead of g95} conflicts gcc43 {
+ depends_lib-delete port:g95
+ depends_lib-append port:gcc42
+ configure.fc ${prefix}/bin/gfortran-mp-4.2
+}
- post-destroot {
- xinstall -m 755 -W ${worksrcpath} libpgplot.dylib \
- ${destroot}${prefix}/lib
- }
+variant gcc43 description {build with gfortran from gcc43 instead of g95} conflicts gcc42 {
+ depends_lib-delete port:g95
+ depends_lib-append port:gcc43
+ configure.fc ${prefix}/bin/gfortran-mp-4.3
}
-# Variant to install demo programs
-variant demos {
- post-destroot {
- foreach f [glob {pgdemo[1-9]} {pgdemo1[0-7]}] {
- xinstall -m 755 -W ${worksrcpath} $f ${destroot}${prefix}/bin
- }
- }
+variant docs {
+ depends_build-append bin:pdflatex:texlive
+
+ post-build {
+ system "cd ${worksrcpath} && pdflatex pgplot-routines.tex && pdflatex pgplot-routines.tex"
+ }
}
Deleted: trunk/dports/graphics/pgplot/files/patch-drivers.list
===================================================================
--- trunk/dports/graphics/pgplot/files/patch-drivers.list 2009-03-02 22:15:17 UTC (rev 47643)
+++ trunk/dports/graphics/pgplot/files/patch-drivers.list 2009-03-02 22:15:43 UTC (rev 47644)
@@ -1,40 +0,0 @@
---- drivers.list.orig Mon May 3 23:02:15 1999
-+++ drivers.list Mon May 17 20:41:47 2004
-@@ -16,8 +16,8 @@
- ! EXDRIV 2 /EXCL Talaris/EXCL printers, portrait
- ! GCDRIV 0 /GENICOM Genicom 4410 dot-matrix printer, landscape
- ! Caution: use of GIDRIV may require a license from Unisys:
--! GIDRIV 1 /GIF GIF-format file, landscape
--! GIDRIV 2 /VGIF GIF-format file, portrait
-+GIDRIV 1 /GIF GIF-format file, landscape
-+GIDRIV 2 /VGIF GIF-format file, portrait
- ! GLDRIV 1 /HPGL Hewlett-Packard HP-GL plotters, landscape Std F77
- ! GLDRIV 2 /VHPGL Hewlett-Packard HP-GL plotters, portrait Std F77
- ! GODRIV 0 /GOC GOC Sigma T5670 terminal VMS
-@@ -32,19 +32,19 @@
- ! LSDRIV 2 /VLIPS2 Canon LaserShot printer (portrait)
- ! LNDRIV 0 /LN03 Dec LN03-PLUS Laser printer (landscape) VMS
- ! LVDRIV 0 /LVN03 Dec LN03-PLUS Laser printer (portrait) VMS
--! LXDRIV 0 /LATEX LaTeX picture environment
-+LXDRIV 0 /LATEX LaTeX picture environment
- ! MFDRIV 0 /FILE PGPLOT graphics metafile
- ! NEDRIV 0 /NEXT Computers running NeXTstep operating system
- NUDRIV 0 /NULL Null device (no output) Std F77
- ! PGDRIV 0 /PGMF PGPLOT metafile (new format, experimental) Std F77
--! PNDRIV 1 /PNG Portable Network Graphics file C
--! PNDRIV 2 /TPNG Portable Network Graphics file - transparent background C
-+PNDRIV 1 /PNG Portable Network Graphics file C
-+PNDRIV 2 /TPNG Portable Network Graphics file - transparent background C
- ! PPDRIV 1 /PPM Portable Pixel Map file, landscape
- ! PPDRIV 2 /VPPM Portable PIxel Map file, portrait
--! PSDRIV 1 /PS PostScript printers, monochrome, landscape Std F77
--! PSDRIV 2 /VPS Postscript printers, monochrome, portrait Std F77
--! PSDRIV 3 /CPS PostScript printers, color, landscape Std F77
--! PSDRIV 4 /VCPS PostScript printers, color, portrait Std F77
-+PSDRIV 1 /PS PostScript printers, monochrome, landscape Std F77
-+PSDRIV 2 /VPS Postscript printers, monochrome, portrait Std F77
-+PSDRIV 3 /CPS PostScript printers, color, landscape Std F77
-+PSDRIV 4 /VCPS PostScript printers, color, portrait Std F77
- ! PXDRIV 0 /PRINTRONI Printronix P300 or P600 dot-matrix printer
- ! QMDRIV 1 /QMS QUIC devices (QMS and Talaris), landscape Std F77
- ! QMDRIV 2 /VQMS QUIC devices (QMS and Talaris), portrait Std F77
Deleted: trunk/dports/graphics/pgplot/files/patch-drivers.list_aqt
===================================================================
--- trunk/dports/graphics/pgplot/files/patch-drivers.list_aqt 2009-03-02 22:15:17 UTC (rev 47643)
+++ trunk/dports/graphics/pgplot/files/patch-drivers.list_aqt 2009-03-02 22:15:43 UTC (rev 47644)
@@ -1,10 +0,0 @@
---- drivers.list.org 2006-04-19 12:18:30.000000000 -0500
-+++ drivers.list 2006-04-19 12:19:47.000000000 -0500
-@@ -5,6 +5,7 @@
- ! available on selected operating systems only.
- !------------------------------------------------------------------------------
- ! File Code Description Restrictions
-+AQDRIV 0 /AQT AquaTerm.app under Mac OS X C
- ! BCDRIV 0 /BCANON Canon Laser printer (bitmap version), landscape
- ! CADRIV 0 /CANON Canon Laser printer, LBP-8/A2, landscape
- ! CCDRIV 0 /CCP DEC LJ250 Color Companion printer
Deleted: trunk/dports/graphics/pgplot/files/patch-drivers_x11.list
===================================================================
--- trunk/dports/graphics/pgplot/files/patch-drivers_x11.list 2009-03-02 22:15:17 UTC (rev 47643)
+++ trunk/dports/graphics/pgplot/files/patch-drivers_x11.list 2009-03-02 22:15:43 UTC (rev 47644)
@@ -1,15 +0,0 @@
---- drivers.list.orig Mon May 3 23:02:15 1999
-+++ drivers.list Tue Sep 14 14:39:39 2004
-@@ -67,9 +67,9 @@
- ! WDDRIV 1 /WD X Window dump file, landscape
- ! WDDRIV 2 /VWD X Window dump file, portrait
- ! WSDRIV 0 /WS VAX workstations running VWS software VMS
--! X2DRIV 0 /XDISP PGDISP or FIGDISP server for X workstations C
--! XWDRIV 1 /XWINDOW Workstations running X Window System C
--! XWDRIV 2 /XSERVE Persistent window on X Window System C
-+X2DRIV 0 /XDISP PGDISP or FIGDISP server for X workstations C
-+XWDRIV 1 /XWINDOW Workstations running X Window System C
-+XWDRIV 2 /XSERVE Persistent window on X Window System C
- ! ZEDRIV 0 /ZETA Zeta 8 Digital Plotter
- !
- ! The following drivers can only be used in PGPLOT installations on MS-DOS
Deleted: trunk/dports/graphics/pgplot/files/patch-makemake
===================================================================
--- trunk/dports/graphics/pgplot/files/patch-makemake 2009-03-02 22:15:17 UTC (rev 47643)
+++ trunk/dports/graphics/pgplot/files/patch-makemake 2009-03-02 22:15:43 UTC (rev 47644)
@@ -1,10 +0,0 @@
---- ../makemake.orig Tue May 4 16:35:43 1999
-+++ ../makemake Tue May 18 02:29:08 2004
-@@ -1025,7 +1025,6 @@
- grivas.o : $(DRVDIR)/gadef.h
- grtv00.o : $(DRVDIR)/imdef.h
- pgxwin.o : $(DRVDIR)/pgxwin.h
--pndriv.o : ./png.h ./pngconf.h ./zlib.h ./zconf.h
-
- x2driv.o figdisp_comm.o: $(DRVDIR)/commands.h
-
Copied: trunk/dports/graphics/pgplot/files/patch-makemake.diff (from rev 47320, trunk/dports/graphics/pgplot/files/patch-makemake)
===================================================================
--- trunk/dports/graphics/pgplot/files/patch-makemake.diff (rev 0)
+++ trunk/dports/graphics/pgplot/files/patch-makemake.diff 2009-03-02 22:15:43 UTC (rev 47644)
@@ -0,0 +1,101 @@
+--- ../pgplot/makemake.orig 2009-02-28 16:57:42.000000000 -0500
++++ ../pgplot/makemake 2009-02-28 16:58:30.000000000 -0500
+@@ -100,6 +100,7 @@
+ #-----------------------------------------------------------------------
+ # Device drivers
+ #-----------------------------------------------------------------------
++AQDRIV="aqdriv.o"
+ ARDRIV="ardriv.o"
+ BCDRIV="bcdriv.o"
+ CADRIV="cadriv.o"
+@@ -657,7 +658,9 @@
+ # Shared library creation.
+ #
+ SHARED_LIB=$SHARED_LIB
++CSHARED_LIB=$CSHARED_LIB
+ SHARED_LD=$SHARED_LD
++CSHARED_LD=$CSHARED_LD
+ #
+ # The libraries that the shared PGPLOT library depends upon.
+ # This is for systems that allow one to specify what libraries
+@@ -824,7 +827,7 @@
+ cat >> makefile << \EOD
+ $(SHARED_LIB): $(PG_ROUTINES) $(PG_NON_STANDARD) \
+ $(GR_ROUTINES) $(DISPATCH_ROUTINE) $(DRIVERS) $(SYSTEM_ROUTINES)
+- $(SHARED_LD) `ls $(PG_ROUTINES) \
++ $(SHARED_LD) -o $@ `ls $(PG_ROUTINES) \
+ $(PG_NON_STANDARD) $(GR_ROUTINES) $(DISPATCH_ROUTINE) \
+ $(DRIVERS) $(SYSTEM_ROUTINES) | sort | uniq` $(SHARED_LIB_LIBS)
+ EOD
+@@ -1025,32 +1028,41 @@
+ grivas.o : $(DRVDIR)/gadef.h
+ grtv00.o : $(DRVDIR)/imdef.h
+ pgxwin.o : $(DRVDIR)/pgxwin.h
+-pndriv.o : ./png.h ./pngconf.h ./zlib.h ./zconf.h
+
+ x2driv.o figdisp_comm.o: $(DRVDIR)/commands.h
+
+
+-cpg: libcpgplot.a cpgplot.h cpgdemo
++cpg: libcpgplot.a cpgplot.h $(CSHARED_LIB) cpgdemo
+ @echo ' '
+ @echo '*** Finished compilation of the C PGPLOT wrapper library ***'
+ @echo ' '
+ @echo 'Note that if you plan to install the library in a different'
+- @echo 'directory than the current one, both libcpgplot.a and cpgplot.h'
++ @echo 'directory than the current one, both libcpgplot.a, $(CSHARED_LIB), and cpgplot.h'
+ @echo 'will be needed.'
+ @echo ' '
+
+ pgbind: $(SRC)/cpg/pgbind.c
+ $(CCOMPL) $(CFLAGC) $(SRC)/cpg/pgbind.c -o pgbind
+
+-libcpgplot.a cpgplot.h: $(PG_SOURCE) pgbind
+- ./pgbind $(PGBIND_FLAGS) -h -w $(PG_SOURCE)
++cpgplot.h: $(PG_SOURCE) pgbind
++ ./pgbind $(PGBIND_FLAGS) -h $(PG_SOURCE)
++
++libcpgplot.a : cpgplot.h
++ ./pgbind $(PGBIND_FLAGS) -w $(PG_SOURCE)
+ $(CCOMPL) -c $(CFLAGC) cpg*.c
+ rm -f cpg*.c
+ ar ru libcpgplot.a cpg*.o
+ $(RANLIB) libcpgplot.a
+ rm -f cpg*.o
+
+-cpgdemo: cpgplot.h $(SRC)/cpg/cpgdemo.c libcpgplot.a
++$(CSHARED_LIB): cpgplot.h
++ ./pgbind $(PGBIND_FLAGS) -w $(PG_SOURCE)
++ $(CCOMPL) -c $(CFLAGC) cpg*.c
++ rm -f cpg*.c
++ $(CSHARED_LD) -o $@ cpg*.o $(SHARED_LIB)
++ rm -f cpg*.o
++
++cpgdemo: cpgplot.h $(SRC)/cpg/cpgdemo.c $(CSHARED_LIB)
+ $(CCOMPL) $(CFLAGD) -c -I. $(SRC)/cpg/cpgdemo.c
+ $(FCOMPL) -o cpgdemo cpgdemo.o $(CPGPLOT_LIB) $(LIBS)
+ rm -f cpgdemo.o
+@@ -1058,13 +1070,13 @@
+ pgmdemo: pgmdemo.o libXmPgplot.a
+ $(FCOMPL) -o pgmdemo pgmdemo.o -L`pwd` -lXmPgplot $(CPGPLOT_LIB) $(MOTIF_LIBS)
+
+-pgmdemo.o: $(XMDIR)/pgmdemo.c XmPgplot.h libcpgplot.a cpgplot.h
++pgmdemo.o: $(XMDIR)/pgmdemo.c XmPgplot.h $(CSHARED_LIB) cpgplot.h
+ $(CCOMPL) $(CFLAGD) -c -I`pwd` $(MOTIF_INCL) $(XMDIR)/pgmdemo.c
+
+ pgawdemo: pgawdemo.o libXaPgplot.a
+ $(FCOMPL) -o pgawdemo pgawdemo.o -L`pwd` -lXaPgplot $(CPGPLOT_LIB) $(ATHENA_LIBS)
+
+-pgawdemo.o: $(XADIR)/pgawdemo.c XaPgplot.h libcpgplot.a cpgplot.h
++pgawdemo.o: $(XADIR)/pgawdemo.c XaPgplot.h $(CSHARED_LIB) cpgplot.h
+ $(CCOMPL) $(CFLAGD) -c -I`pwd` $(ATHENA_INCL) $(XADIR)/pgawdemo.c
+
+ pgtkdemo: pgtkdemo.o libtkpgplot.a
+@@ -1074,6 +1086,6 @@
+ cp $(TKDIR)/pgtkdemo.tcl pgtkdemo.tcl
+ chmod a+x pgtkdemo.tcl
+
+-pgtkdemo.o: $(TKDIR)/pgtkdemo.c tkpgplot.h libcpgplot.a cpgplot.h
++pgtkdemo.o: $(TKDIR)/pgtkdemo.c tkpgplot.h $(CSHARED_LIB) cpgplot.h
+ $(CCOMPL) $(CFLAGD) -c -I`pwd` $(TK_INCL) $(TKDIR)/pgtkdemo.c
+ EOD
Deleted: trunk/dports/graphics/pgplot/files/patch-makemake_aqt
===================================================================
--- trunk/dports/graphics/pgplot/files/patch-makemake_aqt 2009-03-02 22:15:17 UTC (rev 47643)
+++ trunk/dports/graphics/pgplot/files/patch-makemake_aqt 2009-03-02 22:15:43 UTC (rev 47644)
@@ -1,10 +0,0 @@
---- ../makemake.org 2006-04-19 12:18:37.000000000 -0500
-+++ ../makemake 2006-04-19 12:19:44.000000000 -0500
-@@ -100,6 +100,7 @@
- #-----------------------------------------------------------------------
- # Device drivers
- #-----------------------------------------------------------------------
-+AQDRIV="aqdriv.o"
- ARDRIV="ardriv.o"
- BCDRIV="bcdriv.o"
- CADRIV="cadriv.o"
Deleted: trunk/dports/graphics/pgplot/files/patch-pgdispd_proccom.c
===================================================================
--- trunk/dports/graphics/pgplot/files/patch-pgdispd_proccom.c 2009-03-02 22:15:17 UTC (rev 47643)
+++ trunk/dports/graphics/pgplot/files/patch-pgdispd_proccom.c 2009-03-02 22:15:43 UTC (rev 47644)
@@ -1,11 +0,0 @@
---- ../pgdispd/proccom.c.orig Mon Aug 22 14:33:35 1994
-+++ ../pgdispd/proccom.c Tue Sep 14 16:38:57 2004
-@@ -93,7 +93,7 @@
- #include <sys/types.h>
- #include <netinet/in.h>
-
--#ifndef VMS
-+#if !defined(VMS) && !defined(__APPLE__)
- #include <values.h>
- #endif
-
Copied: trunk/dports/graphics/pgplot/files/patch-proccom.c.diff (from rev 47320, trunk/dports/graphics/pgplot/files/patch-pgdispd_proccom.c)
===================================================================
--- trunk/dports/graphics/pgplot/files/patch-proccom.c.diff (rev 0)
+++ trunk/dports/graphics/pgplot/files/patch-proccom.c.diff 2009-03-02 22:15:43 UTC (rev 47644)
@@ -0,0 +1,25 @@
+--- ../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
+@@ -93,10 +93,12 @@
+ #include <sys/types.h>
+ #include <netinet/in.h>
+
+-#ifndef VMS
++#if !defined(VMS) && !defined(__APPLE__)
+ #include <values.h>
+ #endif
+
++#include <stdlib.h>
++
+ #ifdef sun
+ #include <memory.h>
+ #endif
+@@ -163,8 +165,6 @@
+ void drawline(); /* draw a line in the bitmap window */
+ Pixmap XCreatePixmap();
+
+- char *malloc();
+-
+ if (!len & savedshorts)
+ { /* an incomplete command was sent! */
+ savedshorts=0;
Deleted: trunk/dports/graphics/pgplot/files/patch-src_grgfil.f
===================================================================
--- trunk/dports/graphics/pgplot/files/patch-src_grgfil.f 2009-03-02 22:15:17 UTC (rev 47643)
+++ trunk/dports/graphics/pgplot/files/patch-src_grgfil.f 2009-03-02 22:15:43 UTC (rev 47644)
@@ -1,11 +0,0 @@
---- ../src/grgfil.f.orig Tue Jun 13 19:23:31 1995
-+++ ../src/grgfil.f Tue May 18 16:37:57 2004
-@@ -26,7 +26,7 @@
- C 2-Dec-1994 - new routine [TJP].
- C-----------------------------------------------------------------------
- CHARACTER*(*) DEFDIR, DEFFNT, DEFRGB
-- PARAMETER (DEFDIR='/usr/local/pgplot/')
-+ PARAMETER (DEFDIR='@@PREFIX@@/share/pgplot/')
- PARAMETER (DEFFNT='grfont.dat')
- PARAMETER (DEFRGB='rgb.txt')
- CHARACTER*255 FF
Deleted: trunk/dports/graphics/pgplot/files/patch-sys_darwin_aaaread.me
===================================================================
--- trunk/dports/graphics/pgplot/files/patch-sys_darwin_aaaread.me 2009-03-02 22:15:17 UTC (rev 47643)
+++ trunk/dports/graphics/pgplot/files/patch-sys_darwin_aaaread.me 2009-03-02 22:15:43 UTC (rev 47644)
@@ -1,9 +0,0 @@
---- ../sys_darwin/aaaread.me.orig Wed Dec 31 17:00:00 1969
-+++ ../sys_darwin/aaaread.me Mon May 17 16:50:31 2004
-@@ -0,0 +1,6 @@
-+pgplot/sys_darwin
-+
-+The files here setup pgplot for Darwin/Mac OS X, through the MacPorts
-+system. Since MacPorts is used to guarantee dependencies, using these files
-+elsewhere may fail.
-+
Deleted: trunk/dports/graphics/pgplot/files/patch-sys_darwin_g77_gcc.conf
===================================================================
--- trunk/dports/graphics/pgplot/files/patch-sys_darwin_g77_gcc.conf 2009-03-02 22:15:17 UTC (rev 47643)
+++ trunk/dports/graphics/pgplot/files/patch-sys_darwin_g77_gcc.conf 2009-03-02 22:15:43 UTC (rev 47644)
@@ -1,146 +0,0 @@
---- ../sys_darwin/g77_gcc.conf.orig Wed Dec 31 17:00:00 1969
-+++ ../sys_darwin/g77_gcc.conf Mon May 17 17:25:36 2004
-@@ -0,0 +1,143 @@
-+# The GNU g77 FORTRAN compiler and Gnu gcc C compiler on Darwin.
-+#-----------------------------------------------------------------------
-+
-+# Optional: Needed by XWDRIV (/xwindow and /xserve) and
-+# X2DRIV (/xdisp and /figdisp).
-+# The arguments needed by the C compiler to locate X-window include files.
-+
-+ XINCL="-I@@X11PREFIX@@/include"
-+
-+# Optional: Needed by XMDRIV (/xmotif).
-+# The arguments needed by the C compiler to locate Motif, Xt and
-+# X-window include files.
-+
-+ MOTIF_INCL=""
-+
-+# Optional: Needed by XADRIV (/xathena).
-+# The arguments needed by the C compiler to locate Xaw, Xt and
-+# X-window include files.
-+
-+ ATHENA_INCL=""
-+
-+# Optional: Needed by TKDRIV (/xtk).
-+# The arguments needed by the C compiler to locate Tcl, Tk and
-+# X-window include files.
-+
-+ TK_INCL=""
-+
-+# Optional: Needed by RVDRIV (/xrv).
-+# The arguments needed by the C compiler to locate Rivet, Tcl, Tk and
-+# X-window include files.
-+
-+ RV_INCL=""
-+
-+# Mandatory.
-+# The FORTRAN compiler to use.
-+
-+ FCOMPL="g77-dp-3.4"
-+
-+# Mandatory.
-+# The FORTRAN compiler flags to use when compiling the pgplot library.
-+# (NB. makemake prepends -c to $FFLAGC where needed)
-+
-+ FFLAGC="-Wimplicit -Wall -O -I@@PREFIX@@/include"
-+
-+# Mandatory.
-+# The FORTRAN compiler flags to use when compiling fortran demo programs.
-+# This may need to include a flag to tell the compiler not to treat
-+# backslash characters as C-style escape sequences
-+
-+ FFLAGD="-fno-backslash $FFLAGC"
-+
-+# Mandatory.
-+# The C compiler to use.
-+
-+ CCOMPL="gcc"
-+
-+# Mandatory.
-+# The C compiler flags to use when compiling the pgplot library.
-+
-+ CFLAGC="-Wall -DPG_PPU -O3 -I@@PREFIX@@/include"
-+
-+# Mandatory.
-+# The C compiler flags to use when compiling C demo programs.
-+
-+ CFLAGD="$CFLAGC"
-+
-+# Optional: Only needed if the cpgplot library is to be compiled.
-+# The flags to use when running pgbind to create the C pgplot wrapper
-+# library. (See pgplot/cpg/pgbind.usage)
-+
-+ PGBIND_FLAGS="bsd"
-+
-+# Mandatory.
-+# The library-specification flags to use when linking normal pgplot
-+# demo programs.
-+
-+ LIBS="-L@@PREFIX@@/lib -L@@X11PREFIX@@/lib -lX11"
-+
-+# Optional: Needed by XMDRIV (/xmotif).
-+# The library-specification flags to use when linking motif
-+# demo programs.
-+
-+ MOTIF_LIBS=""
-+
-+# Optional: Needed by XADRIV (/xathena).
-+# The library-specification flags to use when linking athena
-+# demo programs.
-+
-+ ATHENA_LIBS=""
-+
-+# Optional: Needed by TKDRIV (/xtk).
-+# The library-specification flags to use when linking Tk demo programs.
-+# Note that you may need to append version numbers to -ltk and -ltcl.
-+
-+ TK_LIBS=""
-+
-+# Mandatory.
-+# On systems that have a ranlib utility, put "ranlib" here. On other
-+# systems put ":" here (Colon is the Bourne-shell do-nothing command).
-+
-+ RANLIB="ranlib"
-+
-+# Optional: Needed on systems that support shared libraries.
-+# The name to give the shared pgplot library.
-+
-+ SHARED_LIB=""
-+
-+# Optional: Needed if SHARED_LIB is set.
-+# How to create a shared library from a trailing list of object files.
-+
-+ SHARED_LD=""
-+
-+# Optional:
-+# On systems such as Solaris 2.x, that allow specification of the
-+# libraries that a shared library needs to be linked with when a
-+# program that uses it is run, this variable should contain the
-+# library-specification flags used to specify these libraries to
-+# $SHARED_LD
-+
-+ SHARED_LIB_LIBS=""
-+
-+# Optional:
-+# Compiler name used on Next systems to compile objective-C files.
-+
-+ MCOMPL=""
-+
-+# Optional:
-+# Compiler flags used with MCOMPL when compiling objective-C files.
-+
-+ MFLAGC=""
-+
-+# Optional: (Actually mandatory, but already defined by makemake).
-+# Where to look for any system-specific versions of the files in
-+# pgplot/sys. Before evaluating this script, makemake sets SYSDIR to
-+# /wherever/pgplot/sys_$OS, where $OS is the operating-system name
-+# given by the second command-line argument of makemake. If the
-+# present configuration is one of many for this OS, and it needs
-+# different modifications to files in pgplot/sys than the other
-+# configurations, then you should create a subdirectory of SYSDIR,
-+# place the modified files in it and change the following line to
-+# $SYSDIR="$SYSDIR/subdirectory_name".
-+
-+ SYSDIR="$SYSDIR"
Deleted: trunk/dports/graphics/pgplot/files/patch-sys_darwin_g77_gcc.conf_aqt
===================================================================
--- trunk/dports/graphics/pgplot/files/patch-sys_darwin_g77_gcc.conf_aqt 2009-03-02 22:15:17 UTC (rev 47643)
+++ trunk/dports/graphics/pgplot/files/patch-sys_darwin_g77_gcc.conf_aqt 2009-03-02 22:15:43 UTC (rev 47644)
@@ -1,65 +0,0 @@
---- ../sys_darwin/g77_gcc.conf.org 2006-04-19 12:15:45.000000000 -0500
-+++ ../sys_darwin/g77_gcc.conf 2006-04-19 12:16:16.000000000 -0500
-@@ -40,7 +40,7 @@
- # The FORTRAN compiler flags to use when compiling the pgplot library.
- # (NB. makemake prepends -c to $FFLAGC where needed)
-
-- FFLAGC="-Wimplicit -Wall -O -I@@PREFIX@@/include"
-+ FFLAGC="-Wimplicit -Wall -O -I@@PREFIX@@/include -I@@PREFIX@@/include/aquaterm"
-
- # Mandatory.
- # The FORTRAN compiler flags to use when compiling fortran demo programs.
-@@ -57,7 +57,7 @@
- # Mandatory.
- # The C compiler flags to use when compiling the pgplot library.
-
-- CFLAGC="-Wall -DPG_PPU -O3 -I@@PREFIX@@/include"
-+ CFLAGC="-Wall -DPG_PPU -O3 -I@@PREFIX@@/include -I@@PREFIX@@/include/aquaterm"
-
- # Mandatory.
- # The C compiler flags to use when compiling C demo programs.
-@@ -74,7 +74,7 @@
- # The library-specification flags to use when linking normal pgplot
- # demo programs.
-
-- LIBS="-L@@PREFIX@@/lib -L@@X11PREFIX@@/lib -lX11"
-+ LIBS="-L@@PREFIX@@/lib -L@@X11PREFIX@@/lib -lX11 -Wl,-framework -Wl,Foundation"
-
- # Optional: Needed by XMDRIV (/xmotif).
- # The library-specification flags to use when linking motif
-@@ -103,12 +103,12 @@
- # Optional: Needed on systems that support shared libraries.
- # The name to give the shared pgplot library.
-
-- SHARED_LIB=""
-+ SHARED_LIB="libpgplot.dylib"
-
- # Optional: Needed if SHARED_LIB is set.
- # How to create a shared library from a trailing list of object files.
-
-- SHARED_LD=""
-+ SHARED_LD="gcc -dynamiclib -single_module -o $SHARED_LIB -install_name @@PREFIX@@/lib/$SHARED_LIB"
-
- # Optional:
- # On systems such as Solaris 2.x, that allow specification of the
-@@ -117,17 +117,17 @@
- # library-specification flags used to specify these libraries to
- # $SHARED_LD
-
-- SHARED_LIB_LIBS=""
-+ SHARED_LIB_LIBS="$LIBS -L@@PREFIX@@/lib/gcc-3.4 -lg2c -lSystem -laquaterm -lpng"
-
- # Optional:
- # Compiler name used on Next systems to compile objective-C files.
-
-- MCOMPL=""
-+ MCOMPL="gcc"
-
- # Optional:
- # Compiler flags used with MCOMPL when compiling objective-C files.
-
-- MFLAGC=""
-+ MFLAGC="-no-cpp-precomp -DPG_PPU -O2 -I. -I@@PREFIX@@/include/aquaterm"
-
- # Optional: (Actually mandatory, but already defined by makemake).
- # Where to look for any system-specific versions of the files in
Deleted: trunk/dports/graphics/pgplot/files/patch-sys_darwin_gfortran_gcc_42.conf
===================================================================
--- trunk/dports/graphics/pgplot/files/patch-sys_darwin_gfortran_gcc_42.conf 2009-03-02 22:15:17 UTC (rev 47643)
+++ trunk/dports/graphics/pgplot/files/patch-sys_darwin_gfortran_gcc_42.conf 2009-03-02 22:15:43 UTC (rev 47644)
@@ -1,147 +0,0 @@
---- ../sys_darwin/gfortran_gcc_42.conf.orig Wed Dec 31 17:00:00 1969
-+++ ../sys_darwin/gfortran_gcc_42.conf Mon May 17 17:25:36 2004
-@@ -0,0 +1,144 @@
-+# The MacPorts build of version 4.2 of the GNU gfortran compiler
-+# and GNU gcc C compiler on Darwin.
-+#-----------------------------------------------------------------------
-+
-+# Optional: Needed by XWDRIV (/xwindow and /xserve) and
-+# X2DRIV (/xdisp and /figdisp).
-+# The arguments needed by the C compiler to locate X-window include files.
-+
-+ XINCL="-I@@X11PREFIX@@/include"
-+
-+# Optional: Needed by XMDRIV (/xmotif).
-+# The arguments needed by the C compiler to locate Motif, Xt and
-+# X-window include files.
-+
-+ MOTIF_INCL=""
-+
-+# Optional: Needed by XADRIV (/xathena).
-+# The arguments needed by the C compiler to locate Xaw, Xt and
-+# X-window include files.
-+
-+ ATHENA_INCL=""
-+
-+# Optional: Needed by TKDRIV (/xtk).
-+# The arguments needed by the C compiler to locate Tcl, Tk and
-+# X-window include files.
-+
-+ TK_INCL=""
-+
-+# Optional: Needed by RVDRIV (/xrv).
-+# The arguments needed by the C compiler to locate Rivet, Tcl, Tk and
-+# X-window include files.
-+
-+ RV_INCL=""
-+
-+# Mandatory.
-+# The FORTRAN compiler to use.
-+
-+ FCOMPL="gfortran-mp-4.2"
-+
-+# Mandatory.
-+# The FORTRAN compiler flags to use when compiling the pgplot library.
-+# (NB. makemake prepends -c to $FFLAGC where needed)
-+
-+ FFLAGC="-Wall -O -I@@PREFIX@@/include"
-+
-+# Mandatory.
-+# The FORTRAN compiler flags to use when compiling fortran demo programs.
-+# This may need to include a flag to tell the compiler not to treat
-+# backslash characters as C-style escape sequences
-+
-+ FFLAGD="-fno-backslash $FFLAGC"
-+
-+# Mandatory.
-+# The C compiler to use.
-+
-+ CCOMPL="gcc-mp-4.2"
-+
-+# Mandatory.
-+# The C compiler flags to use when compiling the pgplot library.
-+
-+ CFLAGC="-Wall -DPG_PPU -O3 -I@@PREFIX@@/include"
-+
-+# Mandatory.
-+# The C compiler flags to use when compiling C demo programs.
-+
-+ CFLAGD="$CFLAGC"
-+
-+# Optional: Only needed if the cpgplot library is to be compiled.
-+# The flags to use when running pgbind to create the C pgplot wrapper
-+# library. (See pgplot/cpg/pgbind.usage)
-+
-+ PGBIND_FLAGS="bsd"
-+
-+# Mandatory.
-+# The library-specification flags to use when linking normal pgplot
-+# demo programs.
-+
-+ LIBS="-L@@PREFIX@@/lib -L@@X11PREFIX@@/lib -lX11"
-+
-+# Optional: Needed by XMDRIV (/xmotif).
-+# The library-specification flags to use when linking motif
-+# demo programs.
-+
-+ MOTIF_LIBS=""
-+
-+# Optional: Needed by XADRIV (/xathena).
-+# The library-specification flags to use when linking athena
-+# demo programs.
-+
-+ ATHENA_LIBS=""
-+
-+# Optional: Needed by TKDRIV (/xtk).
-+# The library-specification flags to use when linking Tk demo programs.
-+# Note that you may need to append version numbers to -ltk and -ltcl.
-+
-+ TK_LIBS=""
-+
-+# Mandatory.
-+# On systems that have a ranlib utility, put "ranlib" here. On other
-+# systems put ":" here (Colon is the Bourne-shell do-nothing command).
-+
-+ RANLIB="ranlib"
-+
-+# Optional: Needed on systems that support shared libraries.
-+# The name to give the shared pgplot library.
-+
-+ SHARED_LIB=""
-+
-+# Optional: Needed if SHARED_LIB is set.
-+# How to create a shared library from a trailing list of object files.
-+
-+ SHARED_LD=""
-+
-+# Optional:
-+# On systems such as Solaris 2.x, that allow specification of the
-+# libraries that a shared library needs to be linked with when a
-+# program that uses it is run, this variable should contain the
-+# library-specification flags used to specify these libraries to
-+# $SHARED_LD
-+
-+ SHARED_LIB_LIBS=""
-+
-+# Optional:
-+# Compiler name used on Next systems to compile objective-C files.
-+
-+ MCOMPL=""
-+
-+# Optional:
-+# Compiler flags used with MCOMPL when compiling objective-C files.
-+
-+ MFLAGC=""
-+
-+# Optional: (Actually mandatory, but already defined by makemake).
-+# Where to look for any system-specific versions of the files in
-+# pgplot/sys. Before evaluating this script, makemake sets SYSDIR to
-+# /wherever/pgplot/sys_$OS, where $OS is the operating-system name
-+# given by the second command-line argument of makemake. If the
-+# present configuration is one of many for this OS, and it needs
-+# different modifications to files in pgplot/sys than the other
-+# configurations, then you should create a subdirectory of SYSDIR,
-+# place the modified files in it and change the following line to
-+# $SYSDIR="$SYSDIR/subdirectory_name".
-+
-+ SYSDIR="$SYSDIR"
Deleted: trunk/dports/graphics/pgplot/files/patch-sys_darwin_gfortran_gcc_42.conf_aqt
===================================================================
--- trunk/dports/graphics/pgplot/files/patch-sys_darwin_gfortran_gcc_42.conf_aqt 2009-03-02 22:15:17 UTC (rev 47643)
+++ trunk/dports/graphics/pgplot/files/patch-sys_darwin_gfortran_gcc_42.conf_aqt 2009-03-02 22:15:43 UTC (rev 47644)
@@ -1,65 +0,0 @@
---- ../sys_darwin/gfortran_gcc_42.conf.org 2006-04-19 12:15:45.000000000 -0500
-+++ ../sys_darwin/gfortran_gcc_42.conf 2006-04-19 12:16:16.000000000 -0500
-@@ -41,7 +41,7 @@
- # The FORTRAN compiler flags to use when compiling the pgplot library.
- # (NB. makemake prepends -c to $FFLAGC where needed)
-
-- FFLAGC="-Wall -O -I@@PREFIX@@/include"
-+ FFLAGC="-Wall -O -I@@PREFIX@@/include -I@@PREFIX@@/include/aquaterm"
-
- # Mandatory.
- # The FORTRAN compiler flags to use when compiling fortran demo programs.
-@@ -58,7 +58,7 @@
- # Mandatory.
- # The C compiler flags to use when compiling the pgplot library.
-
-- CFLAGC="-Wall -DPG_PPU -O3 -I@@PREFIX@@/include"
-+ CFLAGC="-Wall -DPG_PPU -O3 -I@@PREFIX@@/include -I@@PREFIX@@/include/aquaterm"
-
- # Mandatory.
- # The C compiler flags to use when compiling C demo programs.
-@@ -75,7 +75,7 @@
- # The library-specification flags to use when linking normal pgplot
- # demo programs.
-
-- LIBS="-L@@PREFIX@@/lib -L@@X11PREFIX@@/lib -lX11"
-+ LIBS="-L@@PREFIX@@/lib -L@@X11PREFIX@@/lib -lX11 -Wl,-framework -Wl,Foundation"
-
- # Optional: Needed by XMDRIV (/xmotif).
- # The library-specification flags to use when linking motif
-@@ -104,12 +104,12 @@
- # Optional: Needed on systems that support shared libraries.
- # The name to give the shared pgplot library.
-
-- SHARED_LIB=""
-+ SHARED_LIB="libpgplot.dylib"
-
- # Optional: Needed if SHARED_LIB is set.
- # How to create a shared library from a trailing list of object files.
-
-- SHARED_LD=""
-+ SHARED_LD="gcc-mp-4.2 -dynamiclib -single_module -o $SHARED_LIB -install_name @@PREFIX@@/lib/$SHARED_LIB"
-
- # Optional:
- # On systems such as Solaris 2.x, that allow specification of the
-@@ -118,17 +118,17 @@
- # library-specification flags used to specify these libraries to
- # $SHARED_LD
-
-- SHARED_LIB_LIBS=""
-+ SHARED_LIB_LIBS="$LIBS -lgfortran -lSystem -laquaterm -lpng"
-
- # Optional:
- # Compiler name used on Next systems to compile objective-C files.
-
-- MCOMPL=""
-+ MCOMPL="gcc-mp-4.2"
-
- # Optional:
- # Compiler flags used with MCOMPL when compiling objective-C files.
-
-- MFLAGC=""
-+ MFLAGC="-no-cpp-precomp -DPG_PPU -O2 -I. -I@@PREFIX@@/include/aquaterm"
-
- # Optional: (Actually mandatory, but already defined by makemake).
- # Where to look for any system-specific versions of the files in
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090302/26e3750e/attachment-0001.html>
More information about the macports-changes
mailing list