[42222] trunk/dports/graphics/fontforge

[ryandesign at macports.org]

Revision: 42222
          http://trac.macports.org/changeset/42222
Author:   ryandesign at macports.org
Date:     2008-11-16 16:36:52 -0800 (Sun, 16 Nov 2008)
Log Message:
-----------
fontforge: install app into ${applications_dir}; don't assume /Applications/MacPorts. Closes #17225.

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	2008-11-17 00:13:43 UTC (rev 42221)
+++ trunk/dports/graphics/fontforge/Portfile	2008-11-17 00:36:52 UTC (rev 42222)
@@ -68,10 +68,17 @@
     system "tar xjf $distpath/[suffix $docdistname] -C $worksrcpath/htdocs"
 }
 
+# Can be removed once MacPorts 1.7.0 is released
+if {![info exists applications_dir]} {
+    set applications_dir /Applications/MacPorts
+}
+
 post-patch {
     reinplace "s|@PREFIX@|${prefix}|g" \
         $worksrcpath/configure \
         $worksrcpath/gutils/dynamic.c
+    reinplace "/^applicationsdir/s|/Applications|${applications_dir}|" \
+        ${worksrcpath}/Makefile.dynamic.in
 }
 
 depends_lib     lib:libX11:xorg \

Modified: trunk/dports/graphics/fontforge/files/patch-Makefile.dynamic.in.diff
===================================================================
--- trunk/dports/graphics/fontforge/files/patch-Makefile.dynamic.in.diff	2008-11-17 00:13:43 UTC (rev 42221)
+++ trunk/dports/graphics/fontforge/files/patch-Makefile.dynamic.in.diff	2008-11-17 00:36:52 UTC (rev 42222)
@@ -1,12 +1,30 @@
---- Makefile.dynamic.in.orig	2008-11-10 13:43:37.000000000 +0100
-+++ Makefile.dynamic.in	2008-11-10 14:06:41.000000000 +0100
-@@ -127,8 +127,7 @@
+--- Makefile.dynamic.in	2008-07-28 19:01:36.000000000 -0500
++++ Makefile.dynamic.in	2008-11-16 17:50:00.000000000 -0600
+@@ -10,6 +10,7 @@
+ docdir = $(prefix)/share/doc/fontforge
+ localedir = $(prefix)/share/locale
+ pythondir = $(sharedir)/python
++applicationsdir = /Applications
+ 
+ srcdir = @srcdir@
+ top_builddir = .
+@@ -127,8 +128,7 @@
  # 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"
 -	sh -c "if test -d fontforge/FontForge.app >/dev/null ; then rm -rf /Applications/FontForge.app ; mv fontforge/FontForge.app /Applications ; ln -s /usr/local/bin/fontforge /Applications/FontForge.app/Contents/MacOS/FontForge ; fi"
 -	sh < systemspecific
-+	sh -c "if test -d fontforge/FontForge.app >/dev/null ; then mkdir -p $(DESTDIR)/Applications/MacPorts ; mv fontforge/FontForge.app $(DESTDIR)/Applications/MacPorts ; ln -sf $(bindir)/fontforge $(DESTDIR)/Applications/MacPorts/FontForge.app/Contents/MacOS/FontForge ; fi"
++	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 ; then  rm -rf $$dir ; fi; done ; fi )
  
+@@ -136,8 +136,7 @@
+ # 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"
+-	sh -c "if test -d fontforge/FontForge.app >/dev/null ; then rm -rf /Applications/FontForge.app ; mv fontforge/FontForge.app /Applications ; ln -s /usr/local/bin/fontforge /Applications/FontForge.app/Contents/MacOS/FontForge ; fi"
+-	sh < systemspecific
++	sh -c "if test -d fontforge/FontForge.app >/dev/null ; then mkdir -p $(DESTDIR)$(applicationsdir) ; mv fontforge/FontForge.app $(DESTDIR)$(applicationsdir) ; ln -s $(bindir)/fontforge $(DESTDIR)$(applicationsdir)/FontForge.app/Contents/MacOS/FontForge ; fi"
+ 	-(cd pyhook ; python setup.py bdist --formats=gztar ; cp dist/fontforge-*.tar.gz $(DESTDIR)/tmp )
+ 
+ install_gtk: fontforgegtk
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20081116/089c38a6/attachment.html>