[62095] trunk/dports/aqua/TeXShop/Portfile

[jmr at macports.org]

Revision: 62095
          http://trac.macports.org/changeset/62095
Author:   jmr at macports.org
Date:     2009-12-28 15:00:46 -0800 (Mon, 28 Dec 2009)
Log Message:
-----------
TeXShop: match distname with upstream (#23054), update code dealing with build arch, more specific license

Modified Paths:
--------------
    trunk/dports/aqua/TeXShop/Portfile

Modified: trunk/dports/aqua/TeXShop/Portfile
===================================================================
--- trunk/dports/aqua/TeXShop/Portfile	2009-12-28 22:54:27 UTC (rev 62094)
+++ trunk/dports/aqua/TeXShop/Portfile	2009-12-28 23:00:46 UTC (rev 62095)
@@ -7,7 +7,7 @@
 name            TeXShop
 version         2.29
 categories      aqua editors
-license         GPL
+license         GPLv2+
 maintainers     snc openmaintainer
 description     TeX previewer for Mac OS X
 long_description   \
@@ -19,18 +19,18 @@
 homepage        http://www.uoregon.edu/~koch/texshop/texshop.html
 master_sites    http://www.uoregon.edu/~koch/texshop
 use_zip         yes
-distname        texshopsource-${version}
-#dist_subdir     ${name}/${version}_${revision}
+distname        texshopsource
+dist_subdir     ${name}/${version}
 worksrcdir      texshop${version}
 checksums           md5     082855728955a552b4176eea0caff747 \
                     sha1    d5128e8c7674b164b56ffca8bddeaaeff2084c87 \
                     rmd160  3e256d80ede7c59de9abf81d107ac8b896b38f6f
 
-if {${os.major} > 9} {
-    # force 32-bit in SL and beyond.
-    # temporary fix for the 7 build issues presented
-    # in ticket #20291
+# force 32-bit, ticket #20291
+if {$build_arch == "x86_64"} {
     configure.build_arch i386
+} elseif {$build_arch == "ppc64"} {
+    configure.build_arch ppc
 }
 post-extract    {
     reinplace "s/defaultConfigurationName = Debug/defaultConfigurationName = Release/" ${worksrcpath}/${name}.xcodeproj/project.pbxproj
@@ -39,19 +39,8 @@
     set ogrekit "OgreKit.framework/Versions/A/OgreKit"
     if {![variant_isset universal]} {
         # thin the bundled frameworks
-        if {${os.major} >= 10 && $tcl_platform(wordSize) == 8} {
-            set arch x86_64
-        } elseif {${os.arch} == "powerpc"} {
-            set arch ppc
-        } else {
-            set arch i386
-        }
-        system "cd ${worksrcpath} && lipo -thin $arch $sparkle -output $sparkle"
-        # x86_64 does not exist in OgreKit
-        if {${arch} == "x86_64"} {
-            set arch i386
-        }
-        system "cd ${worksrcpath} && lipo -thin $arch $ogrekit -output $ogrekit"
+        system "cd ${worksrcpath} && lipo -thin ${configure.build_arch} $sparkle -output $sparkle"
+        system "cd ${worksrcpath} && lipo -thin ${configure.build_arch} $ogrekit -output $ogrekit"
     } elseif {${os.major} == 8} {
         # Tiger chokes on the x86_64
         system "cd ${worksrcpath} && lipo -remove x86_64 $sparkle -output $sparkle"
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20091228/dafa6e0d/attachment-0001.html>