Make plist and options match

diff --git a/Makefile b/Makefile
index 0c777841e811a419d053927ee577636331e62864..a3fb386fe8aaff9bb0d72e9756e1a0a28eef4599 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -60,7 +60,7 @@ SHEBANG_FILES=        \
                man/fix-roff-punct
 
 OPTIONS_DEFINE=        POPPLER VISIO CDR DBUS WPG LCMS SVG2 OPENMP  NLS GTKSPELL
-OPTIONS_DEFAULT=POPPLER VISIO CDR WPG LCMS SVG2 IMAGEMAGICK NLS GTKSPELL IMAGEMAGICK
+OPTIONS_DEFAULT=POPPLER VISIO CDR WPG LCMS SVG2 IMAGEMAGICK NLS GTKSPELL
 OPTIONS_DEFAULT_amd64= OPENMP
 OPTIONS_SUB=   yes
 

diff --git a/pkg-plist b/pkg-plist
index d88523d1508015f54f56230fd707def808181f99..10476cc87f9bd7a1dc4a59aa6fd362cd1ea6e506 100644 (file)
--- a/pkg-plist
+++ b/pkg-plist
@@ -2373,77 +2373,77 @@ share/icons/hicolor/48x48/apps/org.inkscape.Inkscape.png
 %%DATADIR%%/templates/LaTeX_Beamer.svg
 %%DATADIR%%/templates/README
 %%DATADIR%%/templates/Typography_Canvas.svg
-%%DATADIR%%/templates/default.ar.svg
-%%DATADIR%%/templates/default.as.svg
-%%DATADIR%%/templates/default.be.svg
-%%DATADIR%%/templates/default.bg.svg
-%%DATADIR%%/templates/default.bn_BD.svg
-%%DATADIR%%/templates/default.br.svg
-%%DATADIR%%/templates/default.brx.svg
-%%DATADIR%%/templates/default.ca.svg
-%%DATADIR%%/templates/default.ca@valencia.svg
-%%DATADIR%%/templates/default.cs.svg
-%%DATADIR%%/templates/default.da.svg
-%%DATADIR%%/templates/default.de.svg
-%%DATADIR%%/templates/default.doi.svg
-%%DATADIR%%/templates/default.el.svg
-%%DATADIR%%/templates/default.eo.svg
-%%DATADIR%%/templates/default.es.svg
-%%DATADIR%%/templates/default.es_MX.svg
-%%DATADIR%%/templates/default.et.svg
-%%DATADIR%%/templates/default.eu.svg
-%%DATADIR%%/templates/default.fi.svg
-%%DATADIR%%/templates/default.fr.svg
-%%DATADIR%%/templates/default.gl.svg
-%%DATADIR%%/templates/default.gu.svg
-%%DATADIR%%/templates/default.he.svg
-%%DATADIR%%/templates/default.hi.svg
-%%DATADIR%%/templates/default.hr.svg
-%%DATADIR%%/templates/default.hu.svg
-%%DATADIR%%/templates/default.id.svg
-%%DATADIR%%/templates/default.is.svg
-%%DATADIR%%/templates/default.it.svg
-%%DATADIR%%/templates/default.ja.svg
-%%DATADIR%%/templates/default.km.svg
-%%DATADIR%%/templates/default.kn.svg
-%%DATADIR%%/templates/default.ko.svg
-%%DATADIR%%/templates/default.kok.svg
-%%DATADIR%%/templates/default.kok@latin.svg
-%%DATADIR%%/templates/default.ks@aran.svg
-%%DATADIR%%/templates/default.ks@deva.svg
-%%DATADIR%%/templates/default.lv.svg
-%%DATADIR%%/templates/default.mai.svg
-%%DATADIR%%/templates/default.ml.svg
-%%DATADIR%%/templates/default.mni.svg
-%%DATADIR%%/templates/default.mni@beng.svg
-%%DATADIR%%/templates/default.mr.svg
-%%DATADIR%%/templates/default.nb.svg
-%%DATADIR%%/templates/default.nl.svg
-%%DATADIR%%/templates/default.or.svg
-%%DATADIR%%/templates/default.pl.svg
-%%DATADIR%%/templates/default.pt.svg
-%%DATADIR%%/templates/default.pt_BR.svg
-%%DATADIR%%/templates/default.ro.svg
-%%DATADIR%%/templates/default.ru.svg
-%%DATADIR%%/templates/default.sa.svg
-%%DATADIR%%/templates/default.sat.svg
-%%DATADIR%%/templates/default.sat@deva.svg
-%%DATADIR%%/templates/default.sd.svg
-%%DATADIR%%/templates/default.sd@deva.svg
-%%DATADIR%%/templates/default.sk.svg
-%%DATADIR%%/templates/default.sl.svg
-%%DATADIR%%/templates/default.sr.svg
-%%DATADIR%%/templates/default.sr@latin.svg
-%%DATADIR%%/templates/default.sv.svg
+%%NLS%%%%DATADIR%%/templates/default.ar.svg
+%%NLS%%%%DATADIR%%/templates/default.as.svg
+%%NLS%%%%DATADIR%%/templates/default.be.svg
+%%NLS%%%%DATADIR%%/templates/default.bg.svg
+%%NLS%%%%DATADIR%%/templates/default.bn_BD.svg
+%%NLS%%%%DATADIR%%/templates/default.br.svg
+%%NLS%%%%DATADIR%%/templates/default.brx.svg
+%%NLS%%%%DATADIR%%/templates/default.ca.svg
+%%NLS%%%%DATADIR%%/templates/default.ca@valencia.svg
+%%NLS%%%%DATADIR%%/templates/default.cs.svg
+%%NLS%%%%DATADIR%%/templates/default.da.svg
+%%NLS%%%%DATADIR%%/templates/default.de.svg
+%%NLS%%%%DATADIR%%/templates/default.doi.svg
+%%NLS%%%%DATADIR%%/templates/default.el.svg
+%%NLS%%%%DATADIR%%/templates/default.eo.svg
+%%NLS%%%%DATADIR%%/templates/default.es.svg
+%%NLS%%%%DATADIR%%/templates/default.es_MX.svg
+%%NLS%%%%DATADIR%%/templates/default.et.svg
+%%NLS%%%%DATADIR%%/templates/default.eu.svg
+%%NLS%%%%DATADIR%%/templates/default.fi.svg
+%%NLS%%%%DATADIR%%/templates/default.fr.svg
+%%NLS%%%%DATADIR%%/templates/default.gl.svg
+%%NLS%%%%DATADIR%%/templates/default.gu.svg
+%%NLS%%%%DATADIR%%/templates/default.he.svg
+%%NLS%%%%DATADIR%%/templates/default.hi.svg
+%%NLS%%%%DATADIR%%/templates/default.hr.svg
+%%NLS%%%%DATADIR%%/templates/default.hu.svg
+%%NLS%%%%DATADIR%%/templates/default.id.svg
+%%NLS%%%%DATADIR%%/templates/default.is.svg
+%%NLS%%%%DATADIR%%/templates/default.it.svg
+%%NLS%%%%DATADIR%%/templates/default.ja.svg
+%%NLS%%%%DATADIR%%/templates/default.km.svg
+%%NLS%%%%DATADIR%%/templates/default.kn.svg
+%%NLS%%%%DATADIR%%/templates/default.ko.svg
+%%NLS%%%%DATADIR%%/templates/default.kok.svg
+%%NLS%%%%DATADIR%%/templates/default.kok@latin.svg
+%%NLS%%%%DATADIR%%/templates/default.ks@aran.svg
+%%NLS%%%%DATADIR%%/templates/default.ks@deva.svg
+%%NLS%%%%DATADIR%%/templates/default.lv.svg
+%%NLS%%%%DATADIR%%/templates/default.mai.svg
+%%NLS%%%%DATADIR%%/templates/default.ml.svg
+%%NLS%%%%DATADIR%%/templates/default.mni.svg
+%%NLS%%%%DATADIR%%/templates/default.mni@beng.svg
+%%NLS%%%%DATADIR%%/templates/default.mr.svg
+%%NLS%%%%DATADIR%%/templates/default.nb.svg
+%%NLS%%%%DATADIR%%/templates/default.nl.svg
+%%NLS%%%%DATADIR%%/templates/default.or.svg
+%%NLS%%%%DATADIR%%/templates/default.pl.svg
+%%NLS%%%%DATADIR%%/templates/default.pt.svg
+%%NLS%%%%DATADIR%%/templates/default.pt_BR.svg
+%%NLS%%%%DATADIR%%/templates/default.ro.svg
+%%NLS%%%%DATADIR%%/templates/default.ru.svg
+%%NLS%%%%DATADIR%%/templates/default.sa.svg
+%%NLS%%%%DATADIR%%/templates/default.sat.svg
+%%NLS%%%%DATADIR%%/templates/default.sat@deva.svg
+%%NLS%%%%DATADIR%%/templates/default.sd.svg
+%%NLS%%%%DATADIR%%/templates/default.sd@deva.svg
+%%NLS%%%%DATADIR%%/templates/default.sk.svg
+%%NLS%%%%DATADIR%%/templates/default.sl.svg
+%%NLS%%%%DATADIR%%/templates/default.sr.svg
+%%NLS%%%%DATADIR%%/templates/default.sr@latin.svg
+%%NLS%%%%DATADIR%%/templates/default.sv.svg
 %%DATADIR%%/templates/default.svg
-%%DATADIR%%/templates/default.ta.svg
-%%DATADIR%%/templates/default.te.svg
-%%DATADIR%%/templates/default.tr.svg
-%%DATADIR%%/templates/default.uk.svg
-%%DATADIR%%/templates/default.ur.svg
-%%DATADIR%%/templates/default.vi.svg
-%%DATADIR%%/templates/default.zh_CN.svg
-%%DATADIR%%/templates/default.zh_TW.svg
+%%NLS%%%%DATADIR%%/templates/default.ta.svg
+%%NLS%%%%DATADIR%%/templates/default.te.svg
+%%NLS%%%%DATADIR%%/templates/default.tr.svg
+%%NLS%%%%DATADIR%%/templates/default.uk.svg
+%%NLS%%%%DATADIR%%/templates/default.ur.svg
+%%NLS%%%%DATADIR%%/templates/default.vi.svg
+%%NLS%%%%DATADIR%%/templates/default.zh_CN.svg
+%%NLS%%%%DATADIR%%/templates/default.zh_TW.svg
 %%DATADIR%%/templates/default_pt.svg
 %%DATADIR%%/templates/default_px.svg
 %%DATADIR%%/templates/no_layers.svg
@@ -2677,92 +2677,92 @@ share/icons/hicolor/48x48/apps/org.inkscape.Inkscape.png
 %%DATADIR%%/ui/toolbox.xml
 %%DATADIR%%/ui/units.xml
 %%DATADIR%%/ui/win32.css
-share/locale/ar/LC_MESSAGES/inkscape.mo
-share/locale/as/LC_MESSAGES/inkscape.mo
-share/locale/az/LC_MESSAGES/inkscape.mo
-share/locale/be/LC_MESSAGES/inkscape.mo
-share/locale/bg/LC_MESSAGES/inkscape.mo
-share/locale/bn/LC_MESSAGES/inkscape.mo
-share/locale/bn_BD/LC_MESSAGES/inkscape.mo
-share/locale/br/LC_MESSAGES/inkscape.mo
-share/locale/brx/LC_MESSAGES/inkscape.mo
-share/locale/ca/LC_MESSAGES/inkscape.mo
-share/locale/ca@valencia/LC_MESSAGES/inkscape.mo
-share/locale/cs/LC_MESSAGES/inkscape.mo
-share/locale/da/LC_MESSAGES/inkscape.mo
-share/locale/de/LC_MESSAGES/inkscape.mo
-share/locale/doi/LC_MESSAGES/inkscape.mo
-share/locale/dz/LC_MESSAGES/inkscape.mo
-share/locale/el/LC_MESSAGES/inkscape.mo
-share/locale/en_AU/LC_MESSAGES/inkscape.mo
-share/locale/en_CA/LC_MESSAGES/inkscape.mo
-share/locale/en_GB/LC_MESSAGES/inkscape.mo
-share/locale/eo/LC_MESSAGES/inkscape.mo
-share/locale/es/LC_MESSAGES/inkscape.mo
-share/locale/es_MX/LC_MESSAGES/inkscape.mo
-share/locale/et/LC_MESSAGES/inkscape.mo
-share/locale/eu/LC_MESSAGES/inkscape.mo
-share/locale/fa/LC_MESSAGES/inkscape.mo
-share/locale/fi/LC_MESSAGES/inkscape.mo
-share/locale/fr/LC_MESSAGES/inkscape.mo
-share/locale/ga/LC_MESSAGES/inkscape.mo
-share/locale/gl/LC_MESSAGES/inkscape.mo
-share/locale/gu/LC_MESSAGES/inkscape.mo
-share/locale/he/LC_MESSAGES/inkscape.mo
-share/locale/hi/LC_MESSAGES/inkscape.mo
-share/locale/hr/LC_MESSAGES/inkscape.mo
-share/locale/hu/LC_MESSAGES/inkscape.mo
-share/locale/hy/LC_MESSAGES/inkscape.mo
-share/locale/id/LC_MESSAGES/inkscape.mo
-share/locale/is/LC_MESSAGES/inkscape.mo
-share/locale/it/LC_MESSAGES/inkscape.mo
-share/locale/ja/LC_MESSAGES/inkscape.mo
-share/locale/km/LC_MESSAGES/inkscape.mo
-share/locale/kn/LC_MESSAGES/inkscape.mo
-share/locale/ko/LC_MESSAGES/inkscape.mo
-share/locale/kok/LC_MESSAGES/inkscape.mo
-share/locale/kok@latin/LC_MESSAGES/inkscape.mo
-share/locale/ks@aran/LC_MESSAGES/inkscape.mo
-share/locale/ks@deva/LC_MESSAGES/inkscape.mo
-share/locale/lt/LC_MESSAGES/inkscape.mo
-share/locale/lv/LC_MESSAGES/inkscape.mo
-share/locale/mai/LC_MESSAGES/inkscape.mo
-share/locale/mk/LC_MESSAGES/inkscape.mo
-share/locale/ml/LC_MESSAGES/inkscape.mo
-share/locale/mn/LC_MESSAGES/inkscape.mo
-share/locale/mni/LC_MESSAGES/inkscape.mo
-share/locale/mni@beng/LC_MESSAGES/inkscape.mo
-share/locale/mr/LC_MESSAGES/inkscape.mo
-share/locale/nb/LC_MESSAGES/inkscape.mo
-share/locale/ne/LC_MESSAGES/inkscape.mo
-share/locale/nl/LC_MESSAGES/inkscape.mo
-share/locale/nn/LC_MESSAGES/inkscape.mo
-share/locale/or/LC_MESSAGES/inkscape.mo
-share/locale/pa/LC_MESSAGES/inkscape.mo
-share/locale/pl/LC_MESSAGES/inkscape.mo
-share/locale/pt/LC_MESSAGES/inkscape.mo
-share/locale/pt_BR/LC_MESSAGES/inkscape.mo
-share/locale/ro/LC_MESSAGES/inkscape.mo
-share/locale/ru/LC_MESSAGES/inkscape.mo
-share/locale/rw/LC_MESSAGES/inkscape.mo
-share/locale/sa/LC_MESSAGES/inkscape.mo
-share/locale/sat/LC_MESSAGES/inkscape.mo
-share/locale/sat@deva/LC_MESSAGES/inkscape.mo
-share/locale/sd/LC_MESSAGES/inkscape.mo
-share/locale/sd@deva/LC_MESSAGES/inkscape.mo
-share/locale/sk/LC_MESSAGES/inkscape.mo
-share/locale/sl/LC_MESSAGES/inkscape.mo
-share/locale/sq/LC_MESSAGES/inkscape.mo
-share/locale/sr/LC_MESSAGES/inkscape.mo
-share/locale/sr@latin/LC_MESSAGES/inkscape.mo
-share/locale/sv/LC_MESSAGES/inkscape.mo
-share/locale/ta/LC_MESSAGES/inkscape.mo
-share/locale/te/LC_MESSAGES/inkscape.mo
-share/locale/th/LC_MESSAGES/inkscape.mo
-share/locale/tr/LC_MESSAGES/inkscape.mo
-share/locale/uk/LC_MESSAGES/inkscape.mo
-share/locale/ur/LC_MESSAGES/inkscape.mo
-share/locale/vi/LC_MESSAGES/inkscape.mo
-share/locale/zh_CN/LC_MESSAGES/inkscape.mo
-share/locale/zh_TW/LC_MESSAGES/inkscape.mo
+%%NLS%%share/locale/ar/LC_MESSAGES/inkscape.mo
+%%NLS%%share/locale/as/LC_MESSAGES/inkscape.mo
+%%NLS%%share/locale/az/LC_MESSAGES/inkscape.mo
+%%NLS%%share/locale/be/LC_MESSAGES/inkscape.mo
+%%NLS%%share/locale/bg/LC_MESSAGES/inkscape.mo
+%%NLS%%share/locale/bn/LC_MESSAGES/inkscape.mo
+%%NLS%%share/locale/bn_BD/LC_MESSAGES/inkscape.mo
+%%NLS%%share/locale/br/LC_MESSAGES/inkscape.mo
+%%NLS%%share/locale/brx/LC_MESSAGES/inkscape.mo
+%%NLS%%share/locale/ca/LC_MESSAGES/inkscape.mo
+%%NLS%%share/locale/ca@valencia/LC_MESSAGES/inkscape.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/inkscape.mo
+%%NLS%%share/locale/da/LC_MESSAGES/inkscape.mo
+%%NLS%%share/locale/de/LC_MESSAGES/inkscape.mo
+%%NLS%%share/locale/doi/LC_MESSAGES/inkscape.mo
+%%NLS%%share/locale/dz/LC_MESSAGES/inkscape.mo
+%%NLS%%share/locale/el/LC_MESSAGES/inkscape.mo
+%%NLS%%share/locale/en_AU/LC_MESSAGES/inkscape.mo
+%%NLS%%share/locale/en_CA/LC_MESSAGES/inkscape.mo
+%%NLS%%share/locale/en_GB/LC_MESSAGES/inkscape.mo
+%%NLS%%share/locale/eo/LC_MESSAGES/inkscape.mo
+%%NLS%%share/locale/es/LC_MESSAGES/inkscape.mo
+%%NLS%%share/locale/es_MX/LC_MESSAGES/inkscape.mo
+%%NLS%%share/locale/et/LC_MESSAGES/inkscape.mo
+%%NLS%%share/locale/eu/LC_MESSAGES/inkscape.mo
+%%NLS%%share/locale/fa/LC_MESSAGES/inkscape.mo
+%%NLS%%share/locale/fi/LC_MESSAGES/inkscape.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/inkscape.mo
+%%NLS%%share/locale/ga/LC_MESSAGES/inkscape.mo
+%%NLS%%share/locale/gl/LC_MESSAGES/inkscape.mo
+%%NLS%%share/locale/gu/LC_MESSAGES/inkscape.mo
+%%NLS%%share/locale/he/LC_MESSAGES/inkscape.mo
+%%NLS%%share/locale/hi/LC_MESSAGES/inkscape.mo
+%%NLS%%share/locale/hr/LC_MESSAGES/inkscape.mo
+%%NLS%%share/locale/hu/LC_MESSAGES/inkscape.mo
+%%NLS%%share/locale/hy/LC_MESSAGES/inkscape.mo
+%%NLS%%share/locale/id/LC_MESSAGES/inkscape.mo
+%%NLS%%share/locale/is/LC_MESSAGES/inkscape.mo
+%%NLS%%share/locale/it/LC_MESSAGES/inkscape.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/inkscape.mo
+%%NLS%%share/locale/km/LC_MESSAGES/inkscape.mo
+%%NLS%%share/locale/kn/LC_MESSAGES/inkscape.mo
+%%NLS%%share/locale/ko/LC_MESSAGES/inkscape.mo
+%%NLS%%share/locale/kok/LC_MESSAGES/inkscape.mo
+%%NLS%%share/locale/kok@latin/LC_MESSAGES/inkscape.mo
+%%NLS%%share/locale/ks@aran/LC_MESSAGES/inkscape.mo
+%%NLS%%share/locale/ks@deva/LC_MESSAGES/inkscape.mo
+%%NLS%%share/locale/lt/LC_MESSAGES/inkscape.mo
+%%NLS%%share/locale/lv/LC_MESSAGES/inkscape.mo
+%%NLS%%share/locale/mai/LC_MESSAGES/inkscape.mo
+%%NLS%%share/locale/mk/LC_MESSAGES/inkscape.mo
+%%NLS%%share/locale/ml/LC_MESSAGES/inkscape.mo
+%%NLS%%share/locale/mn/LC_MESSAGES/inkscape.mo
+%%NLS%%share/locale/mni/LC_MESSAGES/inkscape.mo
+%%NLS%%share/locale/mni@beng/LC_MESSAGES/inkscape.mo
+%%NLS%%share/locale/mr/LC_MESSAGES/inkscape.mo
+%%NLS%%share/locale/nb/LC_MESSAGES/inkscape.mo
+%%NLS%%share/locale/ne/LC_MESSAGES/inkscape.mo
+%%NLS%%share/locale/nl/LC_MESSAGES/inkscape.mo
+%%NLS%%share/locale/nn/LC_MESSAGES/inkscape.mo
+%%NLS%%share/locale/or/LC_MESSAGES/inkscape.mo
+%%NLS%%share/locale/pa/LC_MESSAGES/inkscape.mo
+%%NLS%%share/locale/pl/LC_MESSAGES/inkscape.mo
+%%NLS%%share/locale/pt/LC_MESSAGES/inkscape.mo
+%%NLS%%share/locale/pt_BR/LC_MESSAGES/inkscape.mo
+%%NLS%%share/locale/ro/LC_MESSAGES/inkscape.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/inkscape.mo
+%%NLS%%share/locale/rw/LC_MESSAGES/inkscape.mo
+%%NLS%%share/locale/sa/LC_MESSAGES/inkscape.mo
+%%NLS%%share/locale/sat/LC_MESSAGES/inkscape.mo
+%%NLS%%share/locale/sat@deva/LC_MESSAGES/inkscape.mo
+%%NLS%%share/locale/sd/LC_MESSAGES/inkscape.mo
+%%NLS%%share/locale/sd@deva/LC_MESSAGES/inkscape.mo
+%%NLS%%share/locale/sk/LC_MESSAGES/inkscape.mo
+%%NLS%%share/locale/sl/LC_MESSAGES/inkscape.mo
+%%NLS%%share/locale/sq/LC_MESSAGES/inkscape.mo
+%%NLS%%share/locale/sr/LC_MESSAGES/inkscape.mo
+%%NLS%%share/locale/sr@latin/LC_MESSAGES/inkscape.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/inkscape.mo
+%%NLS%%share/locale/ta/LC_MESSAGES/inkscape.mo
+%%NLS%%share/locale/te/LC_MESSAGES/inkscape.mo
+%%NLS%%share/locale/th/LC_MESSAGES/inkscape.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/inkscape.mo
+%%NLS%%share/locale/uk/LC_MESSAGES/inkscape.mo
+%%NLS%%share/locale/ur/LC_MESSAGES/inkscape.mo
+%%NLS%%share/locale/vi/LC_MESSAGES/inkscape.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/inkscape.mo
+%%NLS%%share/locale/zh_TW/LC_MESSAGES/inkscape.mo
 share/metainfo/org.inkscape.Inkscape.appdata.xml