- use PORTDATA instead of long pkg-plist

- fix error with locale.bindtextdomain

PR:		ports/156119
Submitted by:	Zhihao Yuan <lichray@gmail.com> (maintainer)
Approved by:	sahil (mentor)

2 files changed, 2 insertions, 126 deletions

diff --git a/x11-fonts/font-manager/Makefile b/x11-fonts/font-manager/Makefile
index 7fa58c255476..d2aa5f85f4b9 100644
--- a/x11-fonts/font-manager/Makefile
+++ b/x11-fonts/font-manager/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	font-manager
 PORTVERSION=	0.5.7
+PORTREVISION=	1
 CATEGORIES=	x11-fonts gnome
 MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
 
@@ -24,6 +25,7 @@ USE_GMAKE=	yes
 MAKE_JOBS_SAFE=	yes
 
 LICENSE_FILE=	${WRKSRC}/COPYING
+PORTDATA=	*
 
 OPTIONS=	REPORTLAB "Enable font-sampler (PDF sample sheet)" off \
 		NLS "Enable Native Language Support" on
diff --git a/x11-fonts/font-manager/pkg-plist b/x11-fonts/font-manager/pkg-plist
index 98c2c7219862..7f3518683fdc 100644
--- a/x11-fonts/font-manager/pkg-plist
+++ b/x11-fonts/font-manager/pkg-plist
@@ -4,133 +4,7 @@ lib/font-manager/fontutils.so
 share/applications/font-manager.desktop
 share/applications/font-sampler.desktop
 @dirrmtry share/applications
-%%DATADIR%%/__init__.py
-%%DATADIR%%/__init__.pyc
-%%DATADIR%%/__init__.pyo
-%%DATADIR%%/constants.py
-%%DATADIR%%/constants.pyc
-%%DATADIR%%/constants.pyo
-%%DATADIR%%/core/__init__.py
-%%DATADIR%%/core/__init__.pyc
-%%DATADIR%%/core/__init__.pyo
-%%DATADIR%%/core/database.py
-%%DATADIR%%/core/database.pyc
-%%DATADIR%%/core/database.pyo
-%%DATADIR%%/core/fonts.py
-%%DATADIR%%/core/fonts.pyc
-%%DATADIR%%/core/fonts.pyo
-%%DATADIR%%/core/service.py
-%%DATADIR%%/core/service.pyc
-%%DATADIR%%/core/service.pyo
-%%DATADIR%%/data/actions.ui
-%%DATADIR%%/data/bdf.png
-%%DATADIR%%/data/blank.png
-%%DATADIR%%/data/bmp.png
-%%DATADIR%%/data/cff.png
-%%DATADIR%%/data/fnt.png
-%%DATADIR%%/data/font-information.ui
-%%DATADIR%%/data/font-janitor.ui
-%%DATADIR%%/data/font-manager.ui
-%%DATADIR%%/data/font-sampler.ui
-%%DATADIR%%/data/menus.ui
-%%DATADIR%%/data/opentype.png
-%%DATADIR%%/data/pcf.png
-%%DATADIR%%/data/pfr.png
-%%DATADIR%%/data/truetype.png
-%%DATADIR%%/data/type1.png
-%%DATADIR%%/data/type42.png
-%%DATADIR%%/help/C/about.page
-%%DATADIR%%/help/C/actions.page
-%%DATADIR%%/help/C/alias.page
-%%DATADIR%%/help/C/charmap.page
-%%DATADIR%%/help/C/compare.page
-%%DATADIR%%/help/C/directories.page
-%%DATADIR%%/help/C/export.page
-%%DATADIR%%/help/C/figures/add.png
-%%DATADIR%%/help/C/figures/charmap.png
-%%DATADIR%%/help/C/figures/clear.png
-%%DATADIR%%/help/C/figures/color-select.png
-%%DATADIR%%/help/C/figures/disable.png
-%%DATADIR%%/help/C/figures/enable.png
-%%DATADIR%%/help/C/figures/export.png
-%%DATADIR%%/help/C/figures/family-pane.png
-%%DATADIR%%/help/C/figures/font-preferences.png
-%%DATADIR%%/help/C/figures/fontinfo-dialog.png
-%%DATADIR%%/help/C/figures/fontinfo.png
-%%DATADIR%%/help/C/figures/logo.png
-%%DATADIR%%/help/C/figures/main-window.png
-%%DATADIR%%/help/C/figures/manage.png
-%%DATADIR%%/help/C/figures/preferences.png
-%%DATADIR%%/help/C/figures/preview-pane.png
-%%DATADIR%%/help/C/figures/remove.png
-%%DATADIR%%/help/C/figures/side-pane.png
-%%DATADIR%%/help/C/figures/statusbar.png
-%%DATADIR%%/help/C/fontconfig.page
-%%DATADIR%%/help/C/fontinfo.page
-%%DATADIR%%/help/C/index.page
-%%DATADIR%%/help/C/install.page
-%%DATADIR%%/help/C/introduction.page
-%%DATADIR%%/help/C/issues.page
-%%DATADIR%%/help/C/manage.page
-%%DATADIR%%/help/C/organize.page
-%%DATADIR%%/help/C/preview.page
-%%DATADIR%%/help/C/remove.page
-%%DATADIR%%/help/C/search.page
-%%DATADIR%%/help/C/ui.page
-%%DATADIR%%/main.py
-%%DATADIR%%/main.pyc
-%%DATADIR%%/main.pyo
-%%DATADIR%%/ui/__init__.py
-%%DATADIR%%/ui/__init__.pyc
-%%DATADIR%%/ui/__init__.pyo
-%%DATADIR%%/ui/actions.py
-%%DATADIR%%/ui/actions.pyc
-%%DATADIR%%/ui/actions.pyo
-%%DATADIR%%/ui/custom.py
-%%DATADIR%%/ui/custom.pyc
-%%DATADIR%%/ui/custom.pyo
-%%DATADIR%%/ui/export.py
-%%DATADIR%%/ui/export.pyc
-%%DATADIR%%/ui/export.pyo
-%%DATADIR%%/ui/fontconfig.py
-%%DATADIR%%/ui/fontconfig.pyc
-%%DATADIR%%/ui/fontconfig.pyo
-%%DATADIR%%/ui/fontinfo.py
-%%DATADIR%%/ui/fontinfo.pyc
-%%DATADIR%%/ui/fontinfo.pyo
-%%DATADIR%%/ui/janitor.py
-%%DATADIR%%/ui/janitor.pyc
-%%DATADIR%%/ui/janitor.pyo
-%%DATADIR%%/ui/library.py
-%%DATADIR%%/ui/library.pyc
-%%DATADIR%%/ui/library.pyo
-%%DATADIR%%/ui/preferences.py
-%%DATADIR%%/ui/preferences.pyc
-%%DATADIR%%/ui/preferences.pyo
-%%DATADIR%%/ui/previews.py
-%%DATADIR%%/ui/previews.pyc
-%%DATADIR%%/ui/previews.pyo
-%%DATADIR%%/ui/treeviews.py
-%%DATADIR%%/ui/treeviews.pyc
-%%DATADIR%%/ui/treeviews.pyo
-%%DATADIR%%/utils/__init__.py
-%%DATADIR%%/utils/__init__.pyc
-%%DATADIR%%/utils/__init__.pyo
-%%DATADIR%%/utils/common.py
-%%DATADIR%%/utils/common.pyc
-%%DATADIR%%/utils/common.pyo
-%%DATADIR%%/utils/xmlutils.py
-%%DATADIR%%/utils/xmlutils.pyc
-%%DATADIR%%/utils/xmlutils.pyo
 %%NLS%%share/locale/it/LC_MESSAGES/font-manager.mo
 %%NLS%%share/locale/ru/LC_MESSAGES/font-manager.mo
 %%NLS%%share/locale/sk/LC_MESSAGES/font-manager.mo
-@dirrm %%DATADIR%%/utils
-@dirrm %%DATADIR%%/ui
-@dirrm %%DATADIR%%/help/C/figures
-@dirrm %%DATADIR%%/help/C
-@dirrm %%DATADIR%%/help
-@dirrm %%DATADIR%%/data
-@dirrm %%DATADIR%%/core
-@dirrm %%DATADIR%%
 @dirrm lib/font-manager