[71785] trunk/dports/math/ploticus

[ryandesign at macports.org]

Revision: 71785
          http://trac.macports.org/changeset/71785
Author:   ryandesign at macports.org
Date:     2010-09-22 20:42:56 -0700 (Wed, 22 Sep 2010)
Log Message:
-----------
ploticus: update to 2.41, support universal and non-default-build_arch builds, add license info

Modified Paths:
--------------
    trunk/dports/math/ploticus/Portfile
    trunk/dports/math/ploticus/files/patch-src-Makefile.diff

Modified: trunk/dports/math/ploticus/Portfile
===================================================================
--- trunk/dports/math/ploticus/Portfile	2010-09-23 03:21:02 UTC (rev 71784)
+++ trunk/dports/math/ploticus/Portfile	2010-09-23 03:42:56 UTC (rev 71785)
@@ -3,10 +3,11 @@
 PortSystem 1.0
 
 name             ploticus
-version          2.40
-revision         3
+version          2.41
 categories       math
 maintainers      nomaintainer
+license          GPL
+
 description      plot generation program
 long_description \
 	A free, GPL, non-interactive software package for producing plots, \
@@ -21,24 +22,32 @@
 
 master_sites     sourceforge
 distname         pl[join [split ${version} .] {}]src
-checksums        md5 560bf4ede9d7a132261ba36574434962 \
-                 sha1 824860a41a46ad15cc8c6cb37fa6f59176f4e01e \
-                 rmd160 4e36b4cff635042213a4693a44fb03298782edfc
 
+checksums        md5     ed68bd653488bbe86301077e12d3265a \
+                 sha1    f12aa6d5d2d0d284f69b589263f0ee39ed8e0317 \
+                 rmd160  25dfca2d40d7da44235292587aaf7e3b47cac12c
+
 depends_lib      port:xorg-libX11 port:libpng port:zlib \
                  port:gd2 port:jpeg port:freetype
 
 patchfiles       patch-src-Makefile.diff
 
-post-patch {
-	reinplace s|__PREFIX__|${prefix}| ${worksrcpath}/src/Makefile
+use_configure    no
+
+variant universal {}
+if {[variant_isset universal]} {
+    set archflags ${configure.universal_cflags}
+} else {
+    set archflags ${configure.cc_archflags}
 }
 
-use_configure    no
-
 build.dir        ${worksrcpath}/src
 build.target
+build.args       PREFIX=${prefix} \
+                 CC="${configure.cc} ${archflags}"
 
+destroot.args    PREFIX=${prefix}
+
 post-destroot {
     xinstall -m 444 ${worksrcpath}/man/man1/pl.1 ${destroot}${prefix}/share/man/man1/ploticus.1
 }

Modified: trunk/dports/math/ploticus/files/patch-src-Makefile.diff
===================================================================
--- trunk/dports/math/ploticus/files/patch-src-Makefile.diff	2010-09-23 03:21:02 UTC (rev 71784)
+++ trunk/dports/math/ploticus/files/patch-src-Makefile.diff	2010-09-23 03:42:56 UTC (rev 71785)
@@ -1,31 +1,36 @@
---- src/Makefile.orig	2008-01-16 07:05:14.000000000 +1100
-+++ src/Makefile	2008-02-29 11:11:54.000000000 +1100
-@@ -35,8 +35,8 @@
+--- src/Makefile.orig	2010-09-22 22:28:21.000000000 -0500
++++ src/Makefile	2010-09-22 22:33:21.000000000 -0500
+@@ -25,13 +25,13 @@
  
+ 
+ ############ Option 1: build the pl executable (unix), no X11 ....
+-NOX11 = -DNOX11
++# NOX11 = -DNOX11
+ 
+ 
+ 
+ ############ Option 2: build the pl executable (unix), with X11 enabled .... 
+-# NOX11 = 
+-# XOBJ = x11.o interact.o
++NOX11 = 
++XOBJ = x11.o interact.o
+ 
  ############ ...AND... activate the lines below for your platform... (X11 libs & header files)
  #### linux
--XLIBS = -L/usr/X11R6/lib -lX11
--XINCLUDEDIR = -I/usr/X11R6/include
-+# XLIBS = -L/usr/X11R6/lib -lX11
-+# XINCLUDEDIR = -I/usr/X11R6/include
- #### alt linux
- # XLIBS = -lX11
- # XINCLUDEDIR = -I/usr/include/X11
-@@ -47,8 +47,8 @@
- # XINCLUDEDIR = -I/usr/openwin/include
- #### mac osx
- # CC = cc
--# XLIBS = -L/usr/X11R6/lib -lX11
--# XINCLUDEDIR = -I/usr/X11R6/include
-+XLIBS = -L/usr/X11R6/lib -lX11
-+XINCLUDEDIR = -I/usr/X11R6/include
- #### cygwin 
+@@ -53,7 +53,8 @@
  # XLIBS = -L/usr/X11R6/lib -lX11
  # XINCLUDEDIR = -I/usr/X11R6/include
-@@ -92,10 +92,10 @@
- # exetarget: pl 
+ # PLATFORM = WIN32
+-
++XLIBS = -L$(PREFIX)/lib -lX11
++XINCLUDEDIR = -I$(PREFIX)/include
  
- ########### Option 2: use bundled GD16 (PNG only).  Requires libpng and zlib.
+ 
+ ############ Option 3: build pl executable (native win32 pl.exe)
+@@ -89,10 +90,10 @@
+ 
+ 
+ ########### Option 1: use bundled GD16 (PNG only).  Requires libpng and zlib.
 -exetarget: plpng 
 -GD16LIBS = -lpng -lz
 -GD16H = 
@@ -35,9 +40,9 @@
 +# GD16H = 
 +# ZFLAG = -DWZ
  
- ########### Option 3: use your own GD resource.  Requires GD 1.84+, libpng, zlib, libjpeg
- # exetarget: plgd18 
-@@ -106,11 +106,11 @@
+ ########### Option 2: use bundled GD13 (pseudoGIF only). No additional lib dependencies.
+ # exetarget: pl 
+@@ -106,11 +107,11 @@
  
  ########### Option 4: use your own GD resource with FreeType2 fonts enabled.  
  ###########           Requires GD 1.84+, libpng, zlib, libjpeg and libfreetype
@@ -47,19 +52,19 @@
 -# GDFREETYPE = -DGDFREETYPE
 -# ZFLAG = -DWZ
 +exetarget: plgd18 
-+GD18LIBS = -L__PREFIX__/lib -lgd -lpng -lz -ljpeg -lfreetype
-+GD18H = -I__PREFIX__/include
++GD18LIBS = -lgd -lpng -lz -ljpeg -lfreetype
++GD18H = 
 +GDFREETYPE = -DGDFREETYPE
 +ZFLAG = -DWZ
  
  ########### Option 5: don't use GD at all.
  # exetarget: plnogd 
-@@ -131,12 +131,12 @@
+@@ -137,12 +138,12 @@
  
  
  #### If you do a "make install", where do you want the executable(s) to be moved to?
 -INSTALLBIN = /usr/local/bin
-+INSTALLBIN = $(DESTDIR)__PREFIX__/bin
++INSTALLBIN = $(DESTDIR)$(PREFIX)/bin
  
  
  #### For LOCALE support (non-roman alphabets & collation), uncomment the following..
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20100922/31db85cf/attachment-0001.html>