4 files changed, 24 insertions, 15 deletions

diff --git a/science/gramps/Makefile b/science/gramps/Makefile
index 628eb3efd2ab..c52fe12a84d8 100644
--- a/science/gramps/Makefile
+++ b/science/gramps/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gramps
 PORTVERSION=	1.0.8
+PORTREVISION=	1
 CATEGORIES=	science gnome python
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	gramps
@@ -23,6 +24,7 @@ USE_GMAKE=	yes
 USE_GNOME=	gnomehack gnomeprefix
 GNU_CONFIGURE=	yes
 USE_REINPLACE=	yes
+INSTALLS_OMF=	yes
 
 MAN1=		gramps.1
 
diff --git a/science/gramps/files/patch-src-Makefile.in b/science/gramps/files/patch-src-Makefile.in
new file mode 100644
index 000000000000..4c07208c7c8c
--- /dev/null
+++ b/science/gramps/files/patch-src-Makefile.in
@@ -0,0 +1,18 @@
+--- src/Makefile.in.orig	Sun Nov 21 23:18:47 2004
++++ src/Makefile.in	Sun Nov 21 23:19:07 2004
+@@ -560,11 +560,11 @@
+ 	pychecker $(pkgpython_PYTHON)
+ 
+ install-data-local:
+-	$(INSTALL) -d $(DESTDIR)$(prefix)/share/pixmaps
+-	$(INSTALL) -d $(DESTDIR)$(prefix)/share/applications
++	$(INSTALL) -d $(DESTDIR)$(prefix)/share/gnome/pixmaps
++	$(INSTALL) -d $(DESTDIR)$(prefix)/share/gnome/applications
+ 	$(INSTALL) -d $(DESTDIR)$(pkglibdir)
+-	$(INSTALL_DATA) $(srcdir)/gramps.png $(DESTDIR)$(prefix)/share/pixmaps
+-	$(INSTALL_DATA) $(srcdir)/gramps.desktop $(DESTDIR)$(prefix)/share/applications
++	$(INSTALL_DATA) $(srcdir)/gramps.png $(DESTDIR)$(prefix)/share/gnome/pixmaps
++	$(INSTALL_DATA) $(srcdir)/gramps.desktop $(DESTDIR)$(prefix)/share/gnome/applications
+ 	$(INSTALL_DATA) grampslib.so $(DESTDIR)$(pkglibdir)
+ 
+ uninstall-local:
diff --git a/science/gramps/pkg-descr b/science/gramps/pkg-descr
index 26525d829470..503bb45a293a 100644
--- a/science/gramps/pkg-descr
+++ b/science/gramps/pkg-descr
@@ -8,5 +8,5 @@ It is written in Python, using the GTK/GNOME interface.
 
 WWW:	http://gramps.sourceforge.net
 
--Andreas Fehlner
-fehlner@gmx.de
+-Stefan 'Steve' Tell
+stefan.tell@crashmail.de
diff --git a/science/gramps/pkg-plist b/science/gramps/pkg-plist
index 5565500b4a81..b94831a7a896 100644
--- a/science/gramps/pkg-plist
+++ b/science/gramps/pkg-plist
@@ -1,4 +1,3 @@
-share/pixmaps/gramps.png
 share/locale/zh_CN/LC_MESSAGES/gramps.mo
 share/locale/sv/LC_MESSAGES/gramps.mo
 share/locale/ru/LC_MESSAGES/gramps.mo
@@ -672,10 +671,10 @@ share/gnome/gramps/AddSpouse.pyo
 share/gnome/gramps/AddSpouse.py
 share/gnome/gramps/AddMedia.pyo
 share/gnome/gramps/AddMedia.py
-share/applications/gramps.desktop
+share/gnome/pixmaps/gramps.png
+share/gnome/applications/gramps.desktop
 lib/gramps/grampslib.so
 bin/gramps
-@dirrm share/pixmaps
 @dirrm share/gnome/omf/gramps
 @dirrm share/gnome/gramps/plugins
 @dirrm share/gnome/gramps/help/gramps/C/figures
@@ -700,13 +699,3 @@ bin/gramps
 @dirrm share/gnome/gramps/data
 @dirrm share/gnome/gramps
 @dirrm lib/gramps
-@exec scrollkeeper-install -q %D/share/gnome/omf/gramps/gramps-manual-ru.omf 2>/dev/null || /usr/bin/true
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gramps/gramps-manual-ru.omf 2>/dev/null || /usr/bin/true
-@exec scrollkeeper-install -q %D/share/gnome/omf/gramps/gramps-manual-hu.omf 2>/dev/null || /usr/bin/true
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gramps/gramps-manual-hu.omf 2>/dev/null || /usr/bin/true
-@exec scrollkeeper-install -q %D/share/gnome/omf/gramps/gramps-manual-fr.omf 2>/dev/null || /usr/bin/true
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gramps/gramps-manual-fr.omf 2>/dev/null || /usr/bin/true
-@exec scrollkeeper-install -q %D/share/gnome/omf/gramps/gramps-manual-de.omf 2>/dev/null || /usr/bin/true
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gramps/gramps-manual-de.omf 2>/dev/null || /usr/bin/true
-@exec scrollkeeper-install -q %D/share/gnome/omf/gramps/gramps-manual-C.omf 2>/dev/null || /usr/bin/true
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gramps/gramps-manual-C.omf 2>/dev/null || /usr/bin/true