[36057] trunk/dports/print/ghostscript/Portfile

[digdog at macports.org]

Revision: 36057
          http://trac.macosforge.org/projects/macports/changeset/36057
Author:   digdog at macports.org
Date:     2008-04-16 00:56:33 -0700 (Wed, 16 Apr 2008)

Log Message:
-----------
1. Disable cups to avoid mtree violation
2. Add cups variant and allow it to install files outside the common directory
3. Rename variant name from gslib to framework (since we don't generate gslib at all)
4. update comments

Modified Paths:
--------------
    trunk/dports/print/ghostscript/Portfile

Modified: trunk/dports/print/ghostscript/Portfile
===================================================================
--- trunk/dports/print/ghostscript/Portfile	2008-04-16 07:51:57 UTC (rev 36056)
+++ trunk/dports/print/ghostscript/Portfile	2008-04-16 07:56:33 UTC (rev 36057)
@@ -19,66 +19,46 @@
 distfiles   ${distname}.tar.gz:source \
         ghostscript-fonts-std-8.11.tar.gz:fonts \
         ghostscript-fonts-other-6.0.tar.gz:fonts
+
 patchfiles  patch-src_macos-fw.mak.diff \
-            patch-src_macosx.mak.diff \
-            patch-src_unix-aux.mak.diff
+        patch-src_macosx.mak.diff \
+        patch-src_unix-aux.mak.diff
 
 checksums   ${distname}.tar.gz md5 1dd7f0cc9adbcd9e5d6082067cc43ebb \
         ghostscript-fonts-std-8.11.tar.gz md5 6865682b095f8c4500c54b285ff05ef6 \
         ghostscript-fonts-other-6.0.tar.gz md5 1a643ae62ef166562e4d422b1a601272
 
 depends_lib lib:libX11.6:XFree86 \
-            port:zlib \
-            port:libiconv \
-            port:fontconfig \
-            port:expat
+        port:zlib \
+        port:libiconv \
+        port:fontconfig \
+        port:expat
 
 # Ticket #11901, Thanks to Christian Cornelssen (ccorn at cs.tu-berlin.de).
-# Make included JasPer find its own headers rather than the system ones
+# Make included JasPer uses its own headers rather than the system ones
 configure.cppflags-delete   "-I${prefix}/include"
 configure.cppflags-append   "-I${worksrcpath}/jasper/src/libjasper/include"
 configure.cppflags-append   "-I${prefix}/include"
-        
+
 configure.args --disable-compile-inits \
-               --mandir='\${prefix}/share/man'
+               --mandir='\${prefix}/share/man' \
+               --disable-cups
 
 build.target
 
-destroot.violate_mtree  yes
-
 post-destroot   {
-        copy ${workpath}/fonts ${destroot}${prefix}/share/ghostscript/fonts
-        }
+    copy ${workpath}/fonts ${destroot}${prefix}/share/ghostscript/fonts
+}
 
-pre-activate {
-    # remove some files accidentally installed by gs 8.60. (#12637)
-    if {![variant_isset no_cups]} {
-        set renamed_files {}
-        foreach f {/private/etc/cups/pstoraster.convs
-                   /usr/libexec/cups/filter/pstopxl
-                   /usr/libexec/cups/filter/pstoraster
-                   /usr/share/cups/model/pxlcolor.ppd
-                   /usr/share/cups/model/pxlmono.ppd} {
-            if {[file exists ${f}]} {
-                if {[file exists ${f}.old]} {
-                    delete ${f}.old
-                }
-                move ${f} ${f}.old
-                lpush renamed_files ${f}
-            }
-        }
-        if {[llength ${renamed_files}]} {
-            ui_msg "\nThe following files have been renamed (and should be removed):"
-            foreach f ${renamed_files} {
-                ui_msg "    ${f} -> ${f}.old"
-            }
-            ui_msg ""
-        }
-    }
+variant cups {
+    configure.args-append --enable-cups
+
+    # Informing user enable cups will install files outside of the common directory structure
+    destroot.violate_mtree yes
 }
 
 # Added variant that build the Ghostscript framework. (Thanks, Sal!)
-variant gslib   {
+variant framework {
         post-patch {
             foreach f {src/macosx.mak src/macos-fw.mak} {
                 reinplace "s|@@DESTROOT@@|${destroot}|" ${worksrcpath}/${f}
@@ -104,7 +84,3 @@
         }
 }
 
-# this should probably be the default because the port breaks the destroot without that
-variant no_cups	description "Disable CUPS support" {
-	configure.args-append --disable-cups
-}

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20080416/77a6f9c5/attachment.html