[42204] trunk/dports/print/ghostscript

[mcalhoun at macports.org]

Revision: 42204
          http://trac.macports.org/changeset/42204
Author:   mcalhoun at macports.org
Date:     2008-11-16 12:18:50 -0800 (Sun, 16 Nov 2008)
Log Message:
-----------
ghostscript: use the MacPorts 1.7 variable frameworks_dir
partial fix of #17107 (maintainer timeout)

Modified Paths:
--------------
    trunk/dports/print/ghostscript/Portfile
    trunk/dports/print/ghostscript/files/patch-src_macos-fw.mak.diff
    trunk/dports/print/ghostscript/files/patch-src_macosx.mak.diff

Modified: trunk/dports/print/ghostscript/Portfile
===================================================================
--- trunk/dports/print/ghostscript/Portfile	2008-11-16 19:58:16 UTC (rev 42203)
+++ trunk/dports/print/ghostscript/Portfile	2008-11-16 20:18:50 UTC (rev 42204)
@@ -32,10 +32,15 @@
                 port:libiconv \
                 port:pkgconfig
 
+# Can be removed once MacPorts 1.7.0 is released
+if {![info exists frameworks_dir]} {
+    set frameworks_dir ${prefix}/Library/Frameworks
+}
+
 post-patch {
     foreach f {src/macosx.mak src/macos-fw.mak} {
         reinplace "s|@@DESTROOT@@|${destroot}|" ${worksrcpath}/${f}
-        reinplace "s|@@PREFIX@@|${prefix}|" ${worksrcpath}/${f}
+        reinplace "s|@@FRAMEWORKS_DIR@@|${frameworks_dir}|" ${worksrcpath}/${f}
     }
 }
 

Modified: trunk/dports/print/ghostscript/files/patch-src_macos-fw.mak.diff
===================================================================
--- trunk/dports/print/ghostscript/files/patch-src_macos-fw.mak.diff	2008-11-16 19:58:16 UTC (rev 42203)
+++ trunk/dports/print/ghostscript/files/patch-src_macos-fw.mak.diff	2008-11-16 20:18:50 UTC (rev 42204)
@@ -5,7 +5,7 @@
  # we should also be passing compatibility versions
  
 -SODEFS=LDFLAGS='$(LDFLAGS) $(CFLAGS_SO) -dynamiclib -install_name $(prefix)/$(FRAMEWORK_NAME)'\
-+SODEFS=LDFLAGS='$(LDFLAGS) $(CFLAGS_SO) -dynamiclib -install_name @@PREFIX@@/Library/Frameworks/$(FRAMEWORK_NAME)$(FRAMEWORK_EXT)/$(FRAMEWORK_NAME)'\
++SODEFS=LDFLAGS='$(LDFLAGS) $(CFLAGS_SO) -dynamiclib -install_name @@FRAMEWORKS_DIR@@/$(FRAMEWORK_NAME)$(FRAMEWORK_EXT)/$(FRAMEWORK_NAME)'\
   GS_XE=$(BINDIR)/$(SOBINRELDIR)/$(GS_SONAME_MAJOR_MINOR)\
   STDIO_IMPLEMENTATION=c\
   DISPLAY_DEV=$(DD)$(SOOBJRELDIR)/display.dev\

Modified: trunk/dports/print/ghostscript/files/patch-src_macosx.mak.diff
===================================================================
--- trunk/dports/print/ghostscript/files/patch-src_macosx.mak.diff	2008-11-16 19:58:16 UTC (rev 42203)
+++ trunk/dports/print/ghostscript/files/patch-src_macosx.mak.diff	2008-11-16 20:18:50 UTC (rev 42204)
@@ -5,7 +5,7 @@
  FRAMEWORK_NAME=Ghostscript
  FRAMEWORK_EXT=.framework
 -prefix = /Library/Frameworks/$(FRAMEWORK_NAME)$(FRAMEWORK_EXT)
-+prefix = @@DESTROOT@@@@PREFIX@@/Library/Frameworks/$(FRAMEWORK_NAME)$(FRAMEWORK_EXT)
++prefix = @@DESTROOT@@@@FRAMEWORKS_DIR@@/$(FRAMEWORK_NAME)$(FRAMEWORK_EXT)
  exec_prefix = $(prefix)
  bindir = $(exec_prefix)/bin
  scriptdir = $(bindir)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20081116/32d2f86b/attachment.html>