Updated Dutch spell files to use latest OpenOffic.org version.

runtime/spell/nl/main.aap

@@ -19,22 +19,22 @@ $SPELLDIR/nl.utf-8.spl : $FILES
         :sys env LANG=nl_NL.UTF-8
 		$VIM -u NONE -e -c "mkspell! $SPELLDIR/nl nl_NL" -c q
 
-../README_nl.txt : README_nl_NL.txt README_vim.txt
+../README_nl.txt : README_NL.txt README_EN.txt
         :cat $source >! $target
 
 #
 # Fetching the files from OpenOffice.org.
 #
-OODIR = http://ftp.services.openoffice.org/pub/OpenOffice.org/contrib/dictionaries
-:attr {fetch = $OODIR/%file%} nl_NL.zip
+OODIR = http://extensions.services.openoffice.org/e-files/1456/5
+:attr {fetch = $OODIR/%file%} nl-dict.oxt
 
 # The files don't depend on the .zip file so that we can delete it.
 # Only download the zip file if the targets don't exist.
 nl_NL.aff nl_NL.dic: {buildcheck=}
         :assertpkg unzip patch
-        :fetch nl_NL.zip
-        :sys $UNZIP nl_NL.zip
-        :delete nl_NL.zip
+        :fetch nl-dict.oxt
+        :sys $UNZIP nl-dict.oxt
+        :update cleanunused
         @if not os.path.exists('nl_NL.orig.aff'):
             :copy nl_NL.aff nl_NL.orig.aff
         @if not os.path.exists('nl_NL.orig.dic'):
@@ -42,6 +42,23 @@ nl_NL.aff nl_NL.dic: {buildcheck=}
         @if os.path.exists('nl_NL.diff'):
             :sys patch <nl_NL.diff
 
+# Delete all the files unpacked from the archive
+clean: cleanunused
+        :delete {f} nl_NL.dic
+        :delete {f} nl_NL.aff
+        :delete {f} README_EN.txt
+        :delete {f} README_NL.txt
+
+# Delete all the files from the archive that are not used, including the
+# archive itself.
+cleanunused:
+        :delete {f} nl-dict.oxt
+        :delete {f} description.xml
+        :delete {f} Dictionaries.xcu
+        :delete {f} hyph_nl_NL.dic
+        :delete {r}{f} description
+        :delete {r}{f} images
+        :delete {r}{f} META-INF
 
 # Generate diff files, so that others can get the OpenOffice files and apply
 # the diffs to get the Vim versions.
@@ -54,25 +71,26 @@ diff:
 
 # Check for updated OpenOffice spell files.  When there are changes the
 # ".new.aff" and ".new.dic" files are left behind for manual inspection.
-
-check:
-        :assertpkg unzip diff
-        :fetch nl_NL.zip
-        :mkdir tmp
-        :cd tmp
-        @try:
-            @import stat
-            :sys $UNZIP ../nl_NL.zip
-            :sys {force} diff ../nl_NL.orig.aff nl_NL.aff >d
-            @if os.stat('d')[stat.ST_SIZE] > 0:
-                :copy nl_NL.aff ../nl_NL.new.aff
-            :sys {force} diff ../nl_NL.orig.dic nl_NL.dic >d
-            @if os.stat('d')[stat.ST_SIZE] > 0:
-                :copy nl_NL.dic ../nl_NL.new.dic
-        @finally:
-            :cd ..
-            :delete {r}{f}{q} tmp
-            :delete nl_NL.zip
+# Currently doesn't work.
+
+#check:
+#        :assertpkg unzip diff
+#        :fetch nl_NL.zip
+#        :mkdir tmp
+#        :cd tmp
+#        @try:
+#            @import stat
+#            :sys $UNZIP ../nl_NL.zip
+#            :sys {force} diff ../nl_NL.orig.aff nl_NL.aff >d
+#            @if os.stat('d')[stat.ST_SIZE] > 0:
+#                :copy nl_NL.aff ../nl_NL.new.aff
+#            :sys {force} diff ../nl_NL.orig.dic nl_NL.dic >d
+#            @if os.stat('d')[stat.ST_SIZE] > 0:
+#                :copy nl_NL.dic ../nl_NL.new.dic
+#        @finally:
+#            :cd ..
+#            :delete {r}{f}{q} tmp
+#            :delete nl_NL.zip
 
 
 # vim: set sts=4 sw=4 :