Be more consistent when using %%EVO_VERSION%% and %%VERSION%% (jump

that to the current version of evo).
Also stop using %%GTK_VERSION%% in the pkg-plist, makes no sense to use that
there.


git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@19590 df743ca5-7f9a-e211-a948-0013205c9059

2 files changed, 90 insertions, 90 deletions

diff --git a/databases/evolution-data-server/Makefile b/databases/evolution-data-server/Makefile
index 0b9fd8b0b..ccd6eb261 100644
--- a/databases/evolution-data-server/Makefile
+++ b/databases/evolution-data-server/Makefile
@@ -48,7 +48,7 @@ GLIB_SCHEMAS=	org.gnome.Evolution.DefaultSources.gschema.xml \
 		org.gnome.evolution-data-server.calendar.gschema.xml \
 		org.gnome.evolution.shell.network-config.gschema.xml
 
-PLIST_SUB=	VERSION="3.6" EVO_VERSION="1.2"
+PLIST_SUB=	VERSION="3.12" EVO_VERSION="1.2"
 
 OPTIONS_DEFINE=	WEATHER KERBEROS
 OPTIONS_DEFAULT=WEATHER KERBEROS
diff --git a/databases/evolution-data-server/pkg-plist b/databases/evolution-data-server/pkg-plist
index 20292517e..d430d5c78 100644
--- a/databases/evolution-data-server/pkg-plist
+++ b/databases/evolution-data-server/pkg-plist
@@ -364,7 +364,7 @@ lib/libedata-cal-%%EVO_VERSION%%.a
 lib/libedata-cal-%%EVO_VERSION%%.la
 lib/libedata-cal-%%EVO_VERSION%%.so
 lib/libedata-cal-%%EVO_VERSION%%.so.23
-lib/libedata-cal-%%EVO_VERSION%%.so.2%%GTK3_VERSION%%
+lib/libedata-cal-%%EVO_VERSION%%.so.23.0.0
 lib/libedataserver-%%EVO_VERSION%%.a
 lib/libedataserver-%%EVO_VERSION%%.la
 lib/libedataserver-%%EVO_VERSION%%.so
@@ -555,7 +555,7 @@ share/doc/camel/api-index-3.10.html
 share/doc/camel/api-index-3.12.html
 share/doc/camel/api-index-3.2.html
 share/doc/camel/api-index-3.4.html
-share/doc/camel/api-index-%%VERSION%%.html
+share/doc/camel/api-index-3.6.html
 share/doc/camel/api-index-3.8.html
 share/doc/camel/api-index-deprecated.html
 share/doc/camel/api-index-full.html
@@ -610,7 +610,7 @@ share/doc/eds/api-index-3.10.html
 share/doc/eds/api-index-3.12.html
 share/doc/eds/api-index-3.2.html
 share/doc/eds/api-index-3.4.html
-share/doc/eds/api-index-%%VERSION%%.html
+share/doc/eds/api-index-3.6.html
 share/doc/eds/api-index-3.8.html
 share/doc/eds/api-index-deprecated.html
 share/doc/eds/api-index-full.html
@@ -780,92 +780,92 @@ share/doc/eds/up.png
 share/gir-1.0/EBook-%%EVO_VERSION%%.gir
 share/gir-1.0/EBookContacts-%%EVO_VERSION%%.gir
 share/gir-1.0/EDataServer-%%EVO_VERSION%%.gir
-share/locale/am/LC_MESSAGES/evolution-data-server-3.12.mo
-share/locale/ar/LC_MESSAGES/evolution-data-server-3.12.mo
-share/locale/as/LC_MESSAGES/evolution-data-server-3.12.mo
-share/locale/ast/LC_MESSAGES/evolution-data-server-3.12.mo
-share/locale/az/LC_MESSAGES/evolution-data-server-3.12.mo
-share/locale/be/LC_MESSAGES/evolution-data-server-3.12.mo
-share/locale/bg/LC_MESSAGES/evolution-data-server-3.12.mo
-share/locale/bn/LC_MESSAGES/evolution-data-server-3.12.mo
-share/locale/bn_IN/LC_MESSAGES/evolution-data-server-3.12.mo
-share/locale/bs/LC_MESSAGES/evolution-data-server-3.12.mo
-share/locale/ca/LC_MESSAGES/evolution-data-server-3.12.mo
-share/locale/ca@valencia/LC_MESSAGES/evolution-data-server-3.12.mo
-share/locale/cs/LC_MESSAGES/evolution-data-server-3.12.mo
-share/locale/cy/LC_MESSAGES/evolution-data-server-3.12.mo
-share/locale/da/LC_MESSAGES/evolution-data-server-3.12.mo
-share/locale/de/LC_MESSAGES/evolution-data-server-3.12.mo
-share/locale/dz/LC_MESSAGES/evolution-data-server-3.12.mo
-share/locale/el/LC_MESSAGES/evolution-data-server-3.12.mo
-share/locale/en@shaw/LC_MESSAGES/evolution-data-server-3.12.mo
-share/locale/en_AU/LC_MESSAGES/evolution-data-server-3.12.mo
-share/locale/en_CA/LC_MESSAGES/evolution-data-server-3.12.mo
-share/locale/en_GB/LC_MESSAGES/evolution-data-server-3.12.mo
-share/locale/eo/LC_MESSAGES/evolution-data-server-3.12.mo
-share/locale/es/LC_MESSAGES/evolution-data-server-3.12.mo
-share/locale/et/LC_MESSAGES/evolution-data-server-3.12.mo
-share/locale/eu/LC_MESSAGES/evolution-data-server-3.12.mo
-share/locale/fa/LC_MESSAGES/evolution-data-server-3.12.mo
-share/locale/fi/LC_MESSAGES/evolution-data-server-3.12.mo
-share/locale/fr/LC_MESSAGES/evolution-data-server-3.12.mo
-share/locale/ga/LC_MESSAGES/evolution-data-server-3.12.mo
-share/locale/gl/LC_MESSAGES/evolution-data-server-3.12.mo
-share/locale/gu/LC_MESSAGES/evolution-data-server-3.12.mo
-share/locale/he/LC_MESSAGES/evolution-data-server-3.12.mo
-share/locale/hi/LC_MESSAGES/evolution-data-server-3.12.mo
-share/locale/hr/LC_MESSAGES/evolution-data-server-3.12.mo
-share/locale/hu/LC_MESSAGES/evolution-data-server-3.12.mo
-share/locale/id/LC_MESSAGES/evolution-data-server-3.12.mo
-share/locale/is/LC_MESSAGES/evolution-data-server-3.12.mo
-share/locale/it/LC_MESSAGES/evolution-data-server-3.12.mo
-share/locale/ja/LC_MESSAGES/evolution-data-server-3.12.mo
-share/locale/ka/LC_MESSAGES/evolution-data-server-3.12.mo
-share/locale/km/LC_MESSAGES/evolution-data-server-3.12.mo
-share/locale/kn/LC_MESSAGES/evolution-data-server-3.12.mo
-share/locale/ko/LC_MESSAGES/evolution-data-server-3.12.mo
-share/locale/ku/LC_MESSAGES/evolution-data-server-3.12.mo
-share/locale/lt/LC_MESSAGES/evolution-data-server-3.12.mo
-share/locale/lv/LC_MESSAGES/evolution-data-server-3.12.mo
-share/locale/mai/LC_MESSAGES/evolution-data-server-3.12.mo
-share/locale/mk/LC_MESSAGES/evolution-data-server-3.12.mo
-share/locale/ml/LC_MESSAGES/evolution-data-server-3.12.mo
-share/locale/mn/LC_MESSAGES/evolution-data-server-3.12.mo
-share/locale/mr/LC_MESSAGES/evolution-data-server-3.12.mo
-share/locale/ms/LC_MESSAGES/evolution-data-server-3.12.mo
-share/locale/nb/LC_MESSAGES/evolution-data-server-3.12.mo
-share/locale/ne/LC_MESSAGES/evolution-data-server-3.12.mo
-share/locale/nl/LC_MESSAGES/evolution-data-server-3.12.mo
-share/locale/nn/LC_MESSAGES/evolution-data-server-3.12.mo
-share/locale/oc/LC_MESSAGES/evolution-data-server-3.12.mo
-share/locale/or/LC_MESSAGES/evolution-data-server-3.12.mo
-share/locale/pa/LC_MESSAGES/evolution-data-server-3.12.mo
-share/locale/pl/LC_MESSAGES/evolution-data-server-3.12.mo
-share/locale/pt/LC_MESSAGES/evolution-data-server-3.12.mo
-share/locale/pt_BR/LC_MESSAGES/evolution-data-server-3.12.mo
-share/locale/ro/LC_MESSAGES/evolution-data-server-3.12.mo
-share/locale/ru/LC_MESSAGES/evolution-data-server-3.12.mo
-share/locale/rw/LC_MESSAGES/evolution-data-server-3.12.mo
-share/locale/si/LC_MESSAGES/evolution-data-server-3.12.mo
-share/locale/sk/LC_MESSAGES/evolution-data-server-3.12.mo
-share/locale/sl/LC_MESSAGES/evolution-data-server-3.12.mo
-share/locale/sq/LC_MESSAGES/evolution-data-server-3.12.mo
-share/locale/sr/LC_MESSAGES/evolution-data-server-3.12.mo
-share/locale/sr@latin/LC_MESSAGES/evolution-data-server-3.12.mo
-share/locale/sv/LC_MESSAGES/evolution-data-server-3.12.mo
-share/locale/ta/LC_MESSAGES/evolution-data-server-3.12.mo
-share/locale/te/LC_MESSAGES/evolution-data-server-3.12.mo
-share/locale/tg/LC_MESSAGES/evolution-data-server-3.12.mo
-share/locale/th/LC_MESSAGES/evolution-data-server-3.12.mo
-share/locale/tr/LC_MESSAGES/evolution-data-server-3.12.mo
-share/locale/ug/LC_MESSAGES/evolution-data-server-3.12.mo
-share/locale/uk/LC_MESSAGES/evolution-data-server-3.12.mo
-share/locale/vi/LC_MESSAGES/evolution-data-server-3.12.mo
-share/locale/wa/LC_MESSAGES/evolution-data-server-3.12.mo
-share/locale/xh/LC_MESSAGES/evolution-data-server-3.12.mo
-share/locale/zh_CN/LC_MESSAGES/evolution-data-server-3.12.mo
-share/locale/zh_HK/LC_MESSAGES/evolution-data-server-3.12.mo
-share/locale/zh_TW/LC_MESSAGES/evolution-data-server-3.12.mo
+share/locale/am/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
+share/locale/ar/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
+share/locale/as/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
+share/locale/ast/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
+share/locale/az/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
+share/locale/be/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
+share/locale/bg/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
+share/locale/bn/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
+share/locale/bn_IN/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
+share/locale/bs/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
+share/locale/ca/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
+share/locale/ca@valencia/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
+share/locale/cs/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
+share/locale/cy/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
+share/locale/da/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
+share/locale/de/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
+share/locale/dz/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
+share/locale/el/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
+share/locale/en@shaw/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
+share/locale/en_AU/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
+share/locale/en_CA/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
+share/locale/en_GB/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
+share/locale/eo/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
+share/locale/es/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
+share/locale/et/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
+share/locale/eu/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
+share/locale/fa/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
+share/locale/fi/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
+share/locale/fr/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
+share/locale/ga/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
+share/locale/gl/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
+share/locale/gu/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
+share/locale/he/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
+share/locale/hi/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
+share/locale/hr/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
+share/locale/hu/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
+share/locale/id/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
+share/locale/is/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
+share/locale/it/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
+share/locale/ja/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
+share/locale/ka/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
+share/locale/km/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
+share/locale/kn/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
+share/locale/ko/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
+share/locale/ku/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
+share/locale/lt/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
+share/locale/lv/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
+share/locale/mai/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
+share/locale/mk/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
+share/locale/ml/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
+share/locale/mn/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
+share/locale/mr/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
+share/locale/ms/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
+share/locale/nb/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
+share/locale/ne/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
+share/locale/nl/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
+share/locale/nn/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
+share/locale/oc/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
+share/locale/or/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
+share/locale/pa/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
+share/locale/pl/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
+share/locale/pt/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
+share/locale/pt_BR/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
+share/locale/ro/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
+share/locale/ru/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
+share/locale/rw/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
+share/locale/si/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
+share/locale/sk/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
+share/locale/sl/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
+share/locale/sq/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
+share/locale/sr/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
+share/locale/sr@latin/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
+share/locale/sv/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
+share/locale/ta/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
+share/locale/te/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
+share/locale/tg/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
+share/locale/th/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
+share/locale/tr/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
+share/locale/ug/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
+share/locale/uk/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
+share/locale/vi/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
+share/locale/wa/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
+share/locale/xh/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
+share/locale/zh_CN/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
+share/locale/zh_HK/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
+share/locale/zh_TW/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
 share/pixmaps/evolution-data-server/category_birthday_16.png
 share/pixmaps/evolution-data-server/category_business_16.png
 share/pixmaps/evolution-data-server/category_favorites_16.png