[106892] trunk/dports/graphics/fontforge

[cal at macports.org]

Revision: 106892
          https://trac.macports.org/changeset/106892
Author:   cal at macports.org
Date:     2013-06-10 04:40:32 -0700 (Mon, 10 Jun 2013)
Log Message:
-----------
fontforge: enable python support, #31852

Modified Paths:
--------------
    trunk/dports/graphics/fontforge/Portfile
    trunk/dports/graphics/fontforge/files/patch-Makefile.dynamic.in.diff

Modified: trunk/dports/graphics/fontforge/Portfile
===================================================================
--- trunk/dports/graphics/fontforge/Portfile	2013-06-10 11:29:16 UTC (rev 106891)
+++ trunk/dports/graphics/fontforge/Portfile	2013-06-10 11:40:32 UTC (rev 106892)
@@ -138,4 +138,22 @@
     configure.args-append   --with-freetype-src=${workpath}/freetype-${ftversion}
 }
 
+variant python26 conflicts python27 description {Enable Python support (Python 2.6)} {
+    configure.args-delete   --without-python
+    configure.args-append   --enable-pyextension \
+                            --with-python=${prefix}/bin/python2.6 \
+                            --with-python-headers=${frameworks_dir}/Python.framework/Versions/2.6/include/python2.6
+    destroot.args-append    PYTHON=${prefix}/bin/python2.6 PYTHONPREFIX=${frameworks_dir}/Python.framework/Versions/2.6
+    depends_lib-append      port:python26
+}
+
+variant python27 conflicts python26 description {Enable Python support (Python 2.7)} {
+    configure.args-delete   --without-python
+    configure.args-append   --enable-pyextension \
+                            --with-python=${prefix}/bin/python2.7 \
+                            --with-python-headers=${frameworks_dir}/Python.framework/Versions/2.7/include/python2.7
+    destroot.args-append    PYTHON=${prefix}/bin/python2.7 PYTHONPREFIX=${frameworks_dir}/Python.framework/Versions/2.7
+    depends_lib-append      port:python27
+}
+
 livecheck.regex     ${name}_full-(\\d+)\.

Modified: trunk/dports/graphics/fontforge/files/patch-Makefile.dynamic.in.diff
===================================================================
--- trunk/dports/graphics/fontforge/files/patch-Makefile.dynamic.in.diff	2013-06-10 11:29:16 UTC (rev 106891)
+++ trunk/dports/graphics/fontforge/files/patch-Makefile.dynamic.in.diff	2013-06-10 11:40:32 UTC (rev 106892)
@@ -1,6 +1,6 @@
---- Makefile.dynamic.in	2009-03-25 10:22:25.000000000 -0400
-+++ Makefile.dynamic.in	2009-03-25 10:27:57.000000000 -0400
-@@ -10,6 +10,7 @@
+--- Makefile.dynamic.in	2013-05-30 18:46:08.000000000 +0200
++++ Makefile.dynamic.in	2013-05-30 18:44:48.000000000 +0200
+@@ -12,6 +12,7 @@
  docdir = $(prefix)/share/doc/fontforge
  localedir = $(prefix)/share/locale
  pythondir = $(sharedir)/python
@@ -8,7 +8,7 @@
  
  srcdir = @srcdir@
  top_builddir = .
-@@ -127,8 +128,7 @@
+@@ -129,17 +130,15 @@
  # You may need to be root to do the install
  #explicit use of sh to make sure we don't invoke csh with different "if" syntax
  	sh -c "if test -d $(srcdir)/htdocs >/dev/null ; then $(MAKE) install_docs ; fi"
@@ -16,9 +16,10 @@
 -	sh < systemspecific
 +	sh -c "if test -d fontforge/FontForge.app >/dev/null ; then mkdir -p $(DESTDIR)$(applicationsdir) ; mv fontforge/FontForge.app $(DESTDIR)$(applicationsdir) ; ln -sf $(bindir)/fontforge $(DESTDIR)$(applicationsdir)/FontForge.app/Contents/MacOS/FontForge ; fi"
  #we don't always create a setup.py
- 	-(cd pyhook ; if test -r setup.py ; then python setup.py install --prefix=$(prefix) --root=$(DESTDIR); for dir in * ; do if test -d $$dir -a "$$dir" != "CVS" ; then  rm -rf $$dir ; fi; done ; fi )
+-	-(cd pyhook ; if test -r setup.py ; then python setup.py install --prefix=$(prefix) --root=$(DESTDIR); for dir in * ; do if test -d $$dir -a "$$dir" != "CVS" ; then  rm -rf $$dir ; fi; done ; fi )
++	-(cd pyhook ; if test -r setup.py ; then $(PYTHON) setup.py --no-user-cfg install --prefix=$(PYTHONPREFIX) --root=$(DESTDIR); for dir in * ; do if test -d $$dir -a "$$dir" != "CVS" ; then  rm -rf $$dir ; fi; done ; fi )
  
-@@ -136,8 +136,7 @@
+ install_py: $(DESTDIR)$(sharedir) all install_libs install_incs install_po install_prog install_pycontrib
  # You may need to be root to do the install
  #explicit use of sh to make sure we don't invoke csh with different "if" syntax
  	sh -c "if test -d $(srcdir)/htdocs >/dev/null ; then $(MAKE) install_docs ; for dir in * ; do if test -d $$dir ; then  rm -rf $$dir ; fi; done ; fi"
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130610/356a0224/attachment.html>