Sync w/ FreeBSD, using DATADIR and reorder in plist.

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

3 files changed, 67 insertions, 67 deletions

diff --git a/devel/goffice/Makefile b/devel/goffice/Makefile
index be493b3e7..d5b5baf7a 100644
--- a/devel/goffice/Makefile
+++ b/devel/goffice/Makefile
@@ -3,11 +3,11 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/devel/goffice/Makefile,v 1.26 2007/05/19 21:36:06 marcus Exp $
+#   $MCom: ports/devel/goffice/Makefile,v 1.27 2007/05/30 17:42:15 mezz Exp $
 #
 
 PORTNAME=	goffice
-PORTVERSION=	0.4.0
+PORTVERSION=	0.4.1
 PORTREVISION=	1
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
diff --git a/devel/goffice/distinfo b/devel/goffice/distinfo
index 56034c244..b4422bf93 100644
--- a/devel/goffice/distinfo
+++ b/devel/goffice/distinfo
@@ -1,3 +1,3 @@
-MD5 (goffice-0.4.0.tar.bz2) = fc3456f721ecc559da1fd21e927748fc
-SHA256 (goffice-0.4.0.tar.bz2) = 2857b85b3ced46b2fbac4ff6ee3dc7827c52c40ea53a6e78bdd94fd42fb7f244
-SIZE (goffice-0.4.0.tar.bz2) = 1697474
+MD5 (goffice-0.4.1.tar.bz2) = ea21fb396ea173043d696250601636d9
+SHA256 (goffice-0.4.1.tar.bz2) = 14e047585cd38fe02e4992adce5250e96181aea8a6c9c765f4fe27f619620d10
+SIZE (goffice-0.4.1.tar.bz2) = 1751282
diff --git a/devel/goffice/pkg-plist b/devel/goffice/pkg-plist
index 4ca85e475..9376fb0a0 100644
--- a/devel/goffice/pkg-plist
+++ b/devel/goffice/pkg-plist
@@ -290,21 +290,64 @@ libdata/pkgconfig/libgoffice-0.4.pc
 %%DOCSDIR%%/right.png
 %%DOCSDIR%%/style.css
 %%DOCSDIR%%/up.png
-share/goffice/%%VERSION%%/glade/go-font-sel.glade
-share/goffice/%%VERSION%%/glade/go-format-sel.glade
-share/goffice/%%VERSION%%/glade/go-image-save-dialog-extra.glade
-share/goffice/%%VERSION%%/glade/go-rotation-sel.glade
-share/goffice/%%VERSION%%/glade/gog-axis-prefs.glade
-share/goffice/%%VERSION%%/glade/gog-error-bar-prefs.glade
-share/goffice/%%VERSION%%/glade/gog-graph-prefs.glade
-share/goffice/%%VERSION%%/glade/gog-guru-type-selector.glade
-share/goffice/%%VERSION%%/glade/gog-guru.glade
-share/goffice/%%VERSION%%/glade/gog-object-prefs.glade
-share/goffice/%%VERSION%%/glade/gog-plot-prefs.glade
-share/goffice/%%VERSION%%/glade/gog-reg-curve-prefs.glade
-share/goffice/%%VERSION%%/glade/gog-reg-eqn-prefs.glade
-share/goffice/%%VERSION%%/glade/gog-style-prefs.glade
-share/goffice/%%VERSION%%/patterns/svg-patterns.xml
+%%DATADIR%%/%%VERSION%%/glade/go-font-sel.glade
+%%DATADIR%%/%%VERSION%%/glade/go-format-sel.glade
+%%DATADIR%%/%%VERSION%%/glade/go-image-save-dialog-extra.glade
+%%DATADIR%%/%%VERSION%%/glade/go-rotation-sel.glade
+%%DATADIR%%/%%VERSION%%/glade/gog-axis-prefs.glade
+%%DATADIR%%/%%VERSION%%/glade/gog-error-bar-prefs.glade
+%%DATADIR%%/%%VERSION%%/glade/gog-graph-prefs.glade
+%%DATADIR%%/%%VERSION%%/glade/gog-guru-type-selector.glade
+%%DATADIR%%/%%VERSION%%/glade/gog-guru.glade
+%%DATADIR%%/%%VERSION%%/glade/gog-object-prefs.glade
+%%DATADIR%%/%%VERSION%%/glade/gog-plot-prefs.glade
+%%DATADIR%%/%%VERSION%%/glade/gog-reg-curve-prefs.glade
+%%DATADIR%%/%%VERSION%%/glade/gog-reg-eqn-prefs.glade
+%%DATADIR%%/%%VERSION%%/glade/gog-style-prefs.glade
+%%DATADIR%%/%%VERSION%%/patterns/svg-patterns.xml
+share/locale/am/LC_MESSAGES/goffice-%%VERSION%%.mo
+share/locale/az/LC_MESSAGES/goffice-%%VERSION%%.mo
+share/locale/bg/LC_MESSAGES/goffice-%%VERSION%%.mo
+share/locale/ca/LC_MESSAGES/goffice-%%VERSION%%.mo
+share/locale/cs/LC_MESSAGES/goffice-%%VERSION%%.mo
+share/locale/da/LC_MESSAGES/goffice-%%VERSION%%.mo
+share/locale/de/LC_MESSAGES/goffice-%%VERSION%%.mo
+share/locale/el/LC_MESSAGES/goffice-%%VERSION%%.mo
+share/locale/en_CA/LC_MESSAGES/goffice-%%VERSION%%.mo
+share/locale/en_GB/LC_MESSAGES/goffice-%%VERSION%%.mo
+share/locale/es/LC_MESSAGES/goffice-%%VERSION%%.mo
+share/locale/et/LC_MESSAGES/goffice-%%VERSION%%.mo
+share/locale/fi/LC_MESSAGES/goffice-%%VERSION%%.mo
+share/locale/fr/LC_MESSAGES/goffice-%%VERSION%%.mo
+share/locale/ga/LC_MESSAGES/goffice-%%VERSION%%.mo
+share/locale/gl/LC_MESSAGES/goffice-%%VERSION%%.mo
+share/locale/he/LC_MESSAGES/goffice-%%VERSION%%.mo
+share/locale/hr/LC_MESSAGES/goffice-%%VERSION%%.mo
+share/locale/hu/LC_MESSAGES/goffice-%%VERSION%%.mo
+share/locale/it/LC_MESSAGES/goffice-%%VERSION%%.mo
+share/locale/ja/LC_MESSAGES/goffice-%%VERSION%%.mo
+share/locale/ko/LC_MESSAGES/goffice-%%VERSION%%.mo
+share/locale/lv/LC_MESSAGES/goffice-%%VERSION%%.mo
+share/locale/ml/LC_MESSAGES/goffice-%%VERSION%%.mo
+share/locale/mr/LC_MESSAGES/goffice-%%VERSION%%.mo
+share/locale/ms/LC_MESSAGES/goffice-%%VERSION%%.mo
+share/locale/nb/LC_MESSAGES/goffice-%%VERSION%%.mo
+share/locale/nl/LC_MESSAGES/goffice-%%VERSION%%.mo
+share/locale/nn/LC_MESSAGES/goffice-%%VERSION%%.mo
+share/locale/pl/LC_MESSAGES/goffice-%%VERSION%%.mo
+share/locale/pt/LC_MESSAGES/goffice-%%VERSION%%.mo
+share/locale/pt_BR/LC_MESSAGES/goffice-%%VERSION%%.mo
+share/locale/ro/LC_MESSAGES/goffice-%%VERSION%%.mo
+share/locale/ru/LC_MESSAGES/goffice-%%VERSION%%.mo
+share/locale/sk/LC_MESSAGES/goffice-%%VERSION%%.mo
+share/locale/sr/LC_MESSAGES/goffice-%%VERSION%%.mo
+share/locale/sr@Latn/LC_MESSAGES/goffice-%%VERSION%%.mo
+share/locale/sv/LC_MESSAGES/goffice-%%VERSION%%.mo
+share/locale/tr/LC_MESSAGES/goffice-%%VERSION%%.mo
+share/locale/uk/LC_MESSAGES/goffice-%%VERSION%%.mo
+share/locale/vi/LC_MESSAGES/goffice-%%VERSION%%.mo
+share/locale/zh_CN/LC_MESSAGES/goffice-%%VERSION%%.mo
+share/locale/zh_TW/LC_MESSAGES/goffice-%%VERSION%%.mo
 share/pixmaps/goffice/%%VERSION%%/area.xpm
 share/pixmaps/goffice/%%VERSION%%/bar-hboth.png
 share/pixmaps/goffice/%%VERSION%%/bar-hminus.png
@@ -413,55 +456,12 @@ share/pixmaps/goffice/%%VERSION%%/radar.xpm
 share/pixmaps/goffice/%%VERSION%%/scatter.xpm
 share/pixmaps/goffice/%%VERSION%%/stock.xpm
 share/pixmaps/goffice/%%VERSION%%/surface.xpm
-share/locale/am/LC_MESSAGES/goffice-%%VERSION%%.mo
-share/locale/az/LC_MESSAGES/goffice-%%VERSION%%.mo
-share/locale/bg/LC_MESSAGES/goffice-%%VERSION%%.mo
-share/locale/ca/LC_MESSAGES/goffice-%%VERSION%%.mo
-share/locale/cs/LC_MESSAGES/goffice-%%VERSION%%.mo
-share/locale/da/LC_MESSAGES/goffice-%%VERSION%%.mo
-share/locale/de/LC_MESSAGES/goffice-%%VERSION%%.mo
-share/locale/el/LC_MESSAGES/goffice-%%VERSION%%.mo
-share/locale/en_CA/LC_MESSAGES/goffice-%%VERSION%%.mo
-share/locale/en_GB/LC_MESSAGES/goffice-%%VERSION%%.mo
-share/locale/es/LC_MESSAGES/goffice-%%VERSION%%.mo
-share/locale/et/LC_MESSAGES/goffice-%%VERSION%%.mo
-share/locale/fi/LC_MESSAGES/goffice-%%VERSION%%.mo
-share/locale/fr/LC_MESSAGES/goffice-%%VERSION%%.mo
-share/locale/ga/LC_MESSAGES/goffice-%%VERSION%%.mo
-share/locale/gl/LC_MESSAGES/goffice-%%VERSION%%.mo
-share/locale/he/LC_MESSAGES/goffice-%%VERSION%%.mo
-share/locale/hr/LC_MESSAGES/goffice-%%VERSION%%.mo
-share/locale/hu/LC_MESSAGES/goffice-%%VERSION%%.mo
-share/locale/it/LC_MESSAGES/goffice-%%VERSION%%.mo
-share/locale/ja/LC_MESSAGES/goffice-%%VERSION%%.mo
-share/locale/ko/LC_MESSAGES/goffice-%%VERSION%%.mo
-share/locale/lv/LC_MESSAGES/goffice-%%VERSION%%.mo
-share/locale/ml/LC_MESSAGES/goffice-%%VERSION%%.mo
-share/locale/mr/LC_MESSAGES/goffice-%%VERSION%%.mo
-share/locale/ms/LC_MESSAGES/goffice-%%VERSION%%.mo
-share/locale/nb/LC_MESSAGES/goffice-%%VERSION%%.mo
-share/locale/nl/LC_MESSAGES/goffice-%%VERSION%%.mo
-share/locale/nn/LC_MESSAGES/goffice-%%VERSION%%.mo
-share/locale/pl/LC_MESSAGES/goffice-%%VERSION%%.mo
-share/locale/pt/LC_MESSAGES/goffice-%%VERSION%%.mo
-share/locale/pt_BR/LC_MESSAGES/goffice-%%VERSION%%.mo
-share/locale/ro/LC_MESSAGES/goffice-%%VERSION%%.mo
-share/locale/ru/LC_MESSAGES/goffice-%%VERSION%%.mo
-share/locale/sk/LC_MESSAGES/goffice-%%VERSION%%.mo
-share/locale/sr/LC_MESSAGES/goffice-%%VERSION%%.mo
-share/locale/sr@Latn/LC_MESSAGES/goffice-%%VERSION%%.mo
-share/locale/sv/LC_MESSAGES/goffice-%%VERSION%%.mo
-share/locale/tr/LC_MESSAGES/goffice-%%VERSION%%.mo
-share/locale/uk/LC_MESSAGES/goffice-%%VERSION%%.mo
-share/locale/vi/LC_MESSAGES/goffice-%%VERSION%%.mo
-share/locale/zh_CN/LC_MESSAGES/goffice-%%VERSION%%.mo
-share/locale/zh_TW/LC_MESSAGES/goffice-%%VERSION%%.mo
 @dirrm share/pixmaps/goffice/%%VERSION%%
 @dirrm share/pixmaps/goffice
-@dirrm share/goffice/%%VERSION%%/patterns
-@dirrm share/goffice/%%VERSION%%/glade
-@dirrm share/goffice/%%VERSION%%
-@dirrm share/goffice
+@dirrm %%DATADIR%%/%%VERSION%%/patterns
+@dirrm %%DATADIR%%/%%VERSION%%/glade
+@dirrm %%DATADIR%%/%%VERSION%%
+@dirrm %%DATADIR%%
 @dirrm %%DOCSDIR%%
 @dirrm lib/goffice/%%VERSION%%/plugins/smoothing
 @dirrm lib/goffice/%%VERSION%%/plugins/reg_logfit