Chase the GNOME X11BASE to LOCALBASE move, and fix the build with the

new freetype2 where needed.

Submitted by:	mezz, ahze, pav, and many others
Approved by:	portmgr (implicit, kris)

2 files changed, 33 insertions, 16 deletions

diff --git a/science/gramps/Makefile b/science/gramps/Makefile
index 6ac05337156d..8095d5c2b1f1 100644
--- a/science/gramps/Makefile
+++ b/science/gramps/Makefile
@@ -3,10 +3,12 @@
 # Whom:			Andreas Fehlner <fehlner@gmx.de>
 #
 # $FreeBSD$
+#    $MCom: ports/science/gramps/Makefile,v 1.2 2006/10/10 20:22:19 mezz Exp $
 #
 
 PORTNAME=	gramps
 PORTVERSION=	2.0.11
+PORTREVISION=	1
 CATEGORIES=	science gnome python
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	gramps
@@ -17,7 +19,7 @@ COMMENT=	A GTK/GNOME-based genealogy program written in Python
 RUN_DEPENDS=	${PYTHON_SITELIBDIR}/_bsddb.so:${PORTSDIR}/databases/py-bsddb \
 		${PYTHON_LIBDIR}/site-packages/_xmlplus/__init__.py:${PORTSDIR}/textproc/py-xml
 
-USE_X_PREFIX=	yes
+USE_XLIB=	yes
 USE_PYTHON=	yes
 USE_GETTEXT=	yes
 USE_GMAKE=	yes
diff --git a/science/gramps/pkg-plist b/science/gramps/pkg-plist
index a6373ce27f73..49cc751d7a0d 100644
--- a/science/gramps/pkg-plist
+++ b/science/gramps/pkg-plist
@@ -580,7 +580,6 @@ share/gnome/help/gramps/sk/cmdline.xml
 share/gnome/help/gramps/sk/cmdplug.xml
 share/gnome/help/gramps/sk/custom.xml
 share/gnome/help/gramps/sk/faq.xml
-share/gnome/help/gramps/sk/figures
 share/gnome/help/gramps/sk/figures/bookreport.png
 share/gnome/help/gramps/sk/figures/cfe-ar.png
 share/gnome/help/gramps/sk/figures/cfe-df.png
@@ -677,22 +676,38 @@ share/mime/application/x-gramps-package.xml
 share/mime/application/x-gramps-xml.xml
 share/mime/application/x-gramps.xml
 share/mime/packages/gramps.xml
-@dirrm share/gnome/gramps/data/templates
-@dirrm share/gnome/gramps/data
-@dirrm share/gnome/gramps/dates
-@dirrm share/gnome/gramps/docgen
-@dirrm share/gnome/gramps/example
-@dirrm share/gnome/gramps/plugins
-@dirrm share/gnome/gramps
-@dirrm share/gnome/help/gramps/C/figures
-@dirrm share/gnome/help/gramps/C
-@dirrm share/gnome/help/gramps/fr/figures
-@dirrm share/gnome/help/gramps/fr
+@dirrmtry share/icons/gnome/48x48/mimetypes
+@dirrmtry share/icons/gnome/48x48
+@dirrm share/gnome/omf/gramps
 @dirrm share/gnome/help/gramps/sk/figures
 @dirrm share/gnome/help/gramps/sk
+@dirrm share/gnome/help/gramps/fr/figures
+@dirrm share/gnome/help/gramps/fr
+@dirrm share/gnome/help/gramps/C/figures
+@dirrm share/gnome/help/gramps/C
 @dirrm share/gnome/help/gramps
-@dirrm share/gnome/omf/gramps
-@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
-@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
+@dirrm share/gnome/gramps/plugins
+@dirrm share/gnome/gramps/example
+@dirrm share/gnome/gramps/docgen
+@dirrm share/gnome/gramps/dates
+@dirrm share/gnome/gramps/data/templates
+@dirrm share/gnome/gramps/data
+@dirrm share/gnome/gramps
 @exec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
 @unexec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
+@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
+@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
+@dirrmtry share/locale/zh_CN/LC_MESSAGES
+@dirrmtry share/locale/zh_CN
+@dirrmtry share/locale/sk/LC_MESSAGES
+@dirrmtry share/locale/sk
+@dirrmtry share/locale/ro/LC_MESSAGES
+@dirrmtry share/locale/ro
+@dirrmtry share/locale/pl/LC_MESSAGES
+@dirrmtry share/locale/pl
+@dirrmtry share/locale/no/LC_MESSAGES
+@dirrmtry share/locale/no
+@dirrmtry share/locale/fi/LC_MESSAGES
+@dirrmtry share/locale/fi
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs