[115962] trunk/dports/tex/pgf

[mojca at macports.org]

Revision: 115962
          https://trac.macports.org/changeset/115962
Author:   mojca at macports.org
Date:     2014-01-15 07:22:01 -0800 (Wed, 15 Jan 2014)
Log Message:
-----------
pgf: upgrade to 3.0.0, add some preliminary patches (see #42088)

Modified Paths:
--------------
    trunk/dports/tex/pgf/Portfile

Added Paths:
-----------
    trunk/dports/tex/pgf/files/
    trunk/dports/tex/pgf/files/patch-Makefile.diff
    trunk/dports/tex/pgf/files/patch-MakefileConfig.mk.diff

Modified: trunk/dports/tex/pgf/Portfile
===================================================================
--- trunk/dports/tex/pgf/Portfile	2014-01-15 15:06:14 UTC (rev 115961)
+++ trunk/dports/tex/pgf/Portfile	2014-01-15 15:22:01 UTC (rev 115962)
@@ -5,7 +5,7 @@
 PortGroup           texlive 1.0
 
 name                pgf
-version             2.10
+version             3.0.0
 categories          tex textproc
 platforms           darwin
 license             {GPL-2 LPPL-1.3}
@@ -23,23 +23,39 @@
 
 depends_lib         bin:texhash:texlive-basic
 
-master_sites        sourceforge:pgf
+master_sites        sourceforge:project/pgf/pgf/version%20${version}
 use_zip             yes
 distname            ${name}_${version}.tds
-checksums           rmd160  85eea50acad282a3f13d11a87368c6f16e35ff49 \
-                    sha256  6d197e2a6a7bdadc81d180ef58ad2ef3e446fb07e05ac52821047d8c31b90b95
+checksums           rmd160  572204fedbaf9034dc56d9049e40c919b08d4b9e \
+                    sha256  672b15d0a73fcaee1efefdaf396db1d8313e08d91db9b15bfde293eb6132474e
 
 extract.mkdir       yes
 
+# the patchfiles are only relevant if building the C code gets enabled one day,
+# but the patches are not complete yet (building the module is not working)
+patchfiles          patch-MakefileConfig.mk.diff \
+                    patch-Makefile.diff
+post-patch {
+    # instead of patching all this one could also create LocalMakefileConfig.mk
+    set mymakefileconfig ${worksrcpath}/source/generic/pgf/c/config/MakefileConfig.mk
+    reinplace s|@@PREFIX@@|${prefix}| ${mymakefileconfig}
+    reinplace s|@@CC@@|${configure.cc}| ${mymakefileconfig}
+    reinplace s|@@ARCHFLAGS@@|-arch\ ${build_arch}| ${mymakefileconfig}
+    reinplace s|@@CFLAGS@@|${configure.cflags}| ${mymakefileconfig}
+    reinplace s|@@LDFLAGS@@|${configure.ldflags}\ -llua| ${mymakefileconfig}
+}
+
 use_configure       no
 
+# we won't build anything for now, but if anyone wants to finish the work,
+# see https://trac.macports.org/ticket/42088
 build { }
+# build.dir         ${worksrcpath}/source/generic/pgf/c
 
 destroot {
     set r ${workpath}/${name}_${version}.tds
     file mkdir ${destroot}${texlive_texmfports}/
     file copy ${r}/doc ${destroot}${texlive_texmfports}/
-    file copy ${r}/scripts ${destroot}${texlive_texmfports}/
     file copy ${r}/source ${destroot}${texlive_texmfports}/
     file copy ${r}/tex ${destroot}${texlive_texmfports}/
 }

Added: trunk/dports/tex/pgf/files/patch-Makefile.diff
===================================================================
--- trunk/dports/tex/pgf/files/patch-Makefile.diff	                        (rev 0)
+++ trunk/dports/tex/pgf/files/patch-Makefile.diff	2014-01-15 15:22:01 UTC (rev 115962)
@@ -0,0 +1,20 @@
+--- source/generic/pgf/c/graphdrawing/pgf/gd/interface/c/Makefile.orig
++++ source/generic/pgf/c/graphdrawing/pgf/gd/interface/c/Makefile
+@@ -1,7 +1,7 @@
+ CONFIGDIR=../../../../../config
+ include $(CONFIGDIR)/MakefileConfig.mk
+ 
+-FLAGS=$(MYCFLAGS) $(ARCHFLAGS) -O2 -Wall -I$(LUAINCLUDES) -I$(PGFINCLUDES)
++FLAGS=$(MYCFLAGS) $(ARCHFLAGS) -Wall -I$(LUAINCLUDES) -I$(PGFINCLUDES)
+ 
+ all: InterfaceFromC.o InterfaceFromC++.o
+ 
+--- source/generic/pgf/c/graphdrawing/pgf/gd/examples/c/Makefile.orig
++++ source/generic/pgf/c/graphdrawing/pgf/gd/examples/c/Makefile
+@@ -31,5 +31,5 @@ SimpleDemoCPlusPlus.so: SimpleDemoCPlusPlus.o ../../interface/c/InterfaceFromC++
+ 	SimpleDemoCPlusPlus.o ../../interface/c/InterfaceFromC++.o ../../interface/c/InterfaceFromC.o
+ 
+ SimpleDemoCPlusPlus.o: SimpleDemoCPlusPlus.c++ ../../interface/c/InterfaceFromC++.h  ../../interface/c/InterfaceFromC.h
+-	g++ $(FLAGS) -c -o SimpleDemoCPlusPlus.o SimpleDemoCPlusPlus.c++
++	$(CC) $(FLAGS) -c -o SimpleDemoCPlusPlus.o SimpleDemoCPlusPlus.c++
+ 

Added: trunk/dports/tex/pgf/files/patch-MakefileConfig.mk.diff
===================================================================
--- trunk/dports/tex/pgf/files/patch-MakefileConfig.mk.diff	                        (rev 0)
+++ trunk/dports/tex/pgf/files/patch-MakefileConfig.mk.diff	2014-01-15 15:22:01 UTC (rev 115962)
@@ -0,0 +1,36 @@
+--- source/generic/pgf/c/config/MakefileConfig.mk.orig
++++ source/generic/pgf/c/config/MakefileConfig.mk
+@@ -1,6 +1,6 @@
+ 
+ # Where Lua is installed
+-LUAPATH=/usr/local/lua52
++LUAPATH=@@PREFIX@@
+ 
+ LUAINCLUDES = $(LUAPATH)/include
+ LUALIBPATH = $(LUAPATH)/lib
+@@ -22,20 +22,20 @@ INSTALLDIR=/usr/texbin/lib/luatex/lua
+ 
+ 
+ # If you need special flags:
+-MYCFLAGS=
+-MYLDFLAGS=
++MYCFLAGS=@@CFLAGS@@
++MYLDFLAGS=@@LDFLAGS@@
+ 
+ # Link flags for building a shared library 
+-SHAREDFLAGS=
++SHAREDFLAGS=-shared
+ 
+ # Link flags for linking against the shared Lua lib
+ LINKSHAREDLUA=
+ 
+ # Architecture flags:
+-ARCHFLAGS=
++ARCHFLAGS=@@ARCHFLAGS@@
+ 
+ # The to-be-used compiler
+-CC=gcc
++CC=@@CC@@
+ 
+ 
+ # Now read local definition, which may overwrite the above
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140115/95bd2afa/attachment.html>