[101304] trunk/dports/textproc/aspell

[ryandesign at macports.org]

Revision: 101304
          https://trac.macports.org/changeset/101304
Author:   ryandesign at macports.org
Date:     2013-01-07 16:54:14 -0800 (Mon, 07 Jan 2013)
Log Message:
-----------
aspell: update to 0.60.6.1; enable building with clang; remove ispell variant and always install ispell compatibility script since aspell already conflicts with ispell; make nonls variant a stub that just deselects the existing nls variant

Modified Paths:
--------------
    trunk/dports/textproc/aspell/Portfile

Removed Paths:
-------------
    trunk/dports/textproc/aspell/files/patch-mk-static-filter.pl.diff

Modified: trunk/dports/textproc/aspell/Portfile
===================================================================
--- trunk/dports/textproc/aspell/Portfile	2013-01-08 00:09:16 UTC (rev 101303)
+++ trunk/dports/textproc/aspell/Portfile	2013-01-08 00:54:14 UTC (rev 101304)
@@ -4,8 +4,8 @@
 PortSystem 1.0
 
 name		        	aspell
-version		            0.60.6
-revision                4
+version                 0.60.6.1
+set branch              [join [lrange [split ${version} .] 0 1] .]
 categories	            textproc
 maintainers	            openmaintainer jochen
 conflicts               ispell
@@ -21,36 +21,22 @@
 
 master_sites	        gnu freebsd
 
-checksums	            md5 bc80f0198773d5c05086522be67334eb \
-		                sha1 335bcb560e00f59d89ec9e4c4114c325fb0e65f4 \
-		                rmd160 315638cc7cc4ce9d3dc09c7e15faf637855d504e
+checksums               rmd160  6d4e29228e5c47cd4dbd780a73dbc1d2222e8266 \
+                        sha256  f52583a83a63633701c5f71db3dc40aab87b7f76b29723aeb27941eff42df6e1
 
 depends_lib             port:gettext port:texinfo
 # texinfo is also used in post-activate
 
-patchfiles              patch-mk-static-filter.pl.diff
-
-configure.env	        LIBS="-L${prefix}/lib"
-configure.cflags-append "-I${prefix}/include"
 configure.args	        --enable-dict-dir="${prefix}/share/aspell" \
-                        --infodir="${prefix}/share/info" \
+                        --disable-nls \
                         --enable-compile-in-filters
+
 test.run                yes
 test.target             check
 
-# BUILD FIX TODO: clang C++
-# clang fails to build this project due to buggy C++ as of 2011.06.28 0.60.6
-if {${configure.compiler} == "clang"} {
-    configure.compiler llvm-gcc-4.2 
-}
-
 post-destroot { 
-    file copy ${filespath}/u-deva.cmap ${destroot}${prefix}/lib/aspell-0.60/
-    file copy ${filespath}/u-deva.cset ${destroot}${prefix}/lib/aspell-0.60/
-	file delete -force ${destroot}${prefix}/share/info/dir
-    if {[variant_isset ispell]} {
-        file copy ${worksrcpath}/scripts/ispell ${destroot}${prefix}/bin/ispell
-    }
+    xinstall -m 644 -W ${filespath} u-deva.cmap u-deva.cset ${destroot}${prefix}/lib/aspell-${branch}/
+    copy ${worksrcpath}/scripts/ispell ${destroot}${prefix}/bin/ispell
 }
 
 post-activate {
@@ -63,19 +49,18 @@
     configure.args-append --enable-nls
 }
 
-variant nonls conflicts nls description {Don't include natural language support (default on Mac OS X)} {
-    configure.args-delete --enable-nls
-    configure.args-append --disable-nls
-}
+# nonls variant to be removed after January 2014
+variant nonls conflicts nls description {Legacy compatibility variant} {}
 
-variant ispell description {Install ispell emulation script} {
-}
-
-platform macosx {
-# gnustep-gui uses aspell and will not work if aspell is linked to gettext because
-# gettext is linked to CoreFoundation which is itself linked to the Apple objc runtime
-    if { ![variant_isset nls] } {
-        default_variants        +nonls
+if {[variant_isset nonls]} {
+    default_variants -nls
+} else {
+    if {${os.platform} == "darwin" && ${os.subplatform} == "macosx"} {
+        # gnustep-gui uses aspell and will not work if aspell is linked to gettext because
+        # gettext is linked to CoreFoundation which is itself linked to the Apple objc runtime
+        default_variants -nls
+    } else {
+        default_variants +nls
     }
 }
 

Deleted: trunk/dports/textproc/aspell/files/patch-mk-static-filter.pl.diff
===================================================================
--- trunk/dports/textproc/aspell/files/patch-mk-static-filter.pl.diff	2013-01-08 00:09:16 UTC (rev 101303)
+++ trunk/dports/textproc/aspell/files/patch-mk-static-filter.pl.diff	2013-01-08 00:54:14 UTC (rev 101304)
@@ -1,11 +0,0 @@
---- gen/mk-static-filter.pl.orig	2007-12-03 07:43:09.000000000 +0100
-+++ gen/mk-static-filter.pl	2008-04-18 22:34:26.000000000 +0200
-@@ -159,7 +159,7 @@
-   printf STATICFILTERS "\n  const KeyInfo * ".${$filter}{"NAME"}."_options_begin = ".
-                                               ${$filter}{"NAME"}."_options;\n";
-   # If structure is empty, set options_end to same as options_begin.
--  if (%{$filter}) {
-+  if ($firstopt) {
-     printf STATICFILTERS "\n  const KeyInfo * ".${$filter}{"NAME"}."_options_end = ".
-                                                 ${$filter}{"NAME"}."_options;\n";
-   } else {
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130107/785a2f0b/attachment.html>