Better fix for PR 41500 -- use gmake and msgfmt.

Installs some additional files now, so update PLIST and add omf
dependency.
Ride PKGREVISION bump from a few minutes ago.

2 files changed, 165 insertions, 9 deletions

diff --git a/devel/accerciser/Makefile b/devel/accerciser/Makefile
index 42346ed202a..abe1c8f5877 100644
--- a/devel/accerciser/Makefile
+++ b/devel/accerciser/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2009/05/28 21:17:14 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2009/05/28 21:25:32 wiz Exp $
 #
 
 DISTNAME=	accerciser-1.6.1
@@ -15,7 +15,7 @@ LICENSE=	modified-bsd
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 USE_DIRS+=		gnome2-1.5
-USE_TOOLS+=		intltool pkg-config
+USE_TOOLS+=		gmake intltool msgfmt pkg-config
 USE_PKGLOCALEDIR=	yes
 GNU_CONFIGURE=		yes
 PYTHON_VERSIONS_ACCEPTED=	25 24
@@ -23,12 +23,6 @@ PY_PATCHPLIST=		yes
 REPLACE_PYTHON=		plugins/ipython_view.py
 REPLACE_PYTHON+=	src/accerciser.in
 
-SUBST_CLASSES+=		path
-SUBST_SED.path=		-e "s,/usr/local,${PREFIX},"
-SUBST_FILES.path=	accerciser.desktop accerciser.desktop.in
-SUBST_STAGE.path=	pre-build
-SUBST_MESSAGE.path=	Fixing path in desktop file.
-
 .include "../../devel/GConf/schemas.mk"
 BUILDLINK_API_DEPENDS.py-at-spi+=	${PYPKGPREFIX}-at-spi>=1.23.3
 .include "../../devel/py-at-spi/buildlink3.mk"
@@ -39,4 +33,5 @@ BUILDLINK_API_DEPENDS.py-at-spi+=	${PYPKGPREFIX}-at-spi>=1.23.3
 .include "../../textproc/gnome-doc-utils/buildlink3.mk"
 .include "../../x11/py-gnome2-desktop/buildlink3.mk"
 .include "../../x11/py-gtk2/buildlink3.mk"
+.include "../../mk/omf-scrollkeeper.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/accerciser/PLIST b/devel/accerciser/PLIST
index b4d709100e1..aa95c82e01b 100644
--- a/devel/accerciser/PLIST
+++ b/devel/accerciser/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2009/01/16 23:38:22 wiz Exp $
+@comment $NetBSD: PLIST,v 1.2 2009/05/28 21:25:32 wiz Exp $
 bin/accerciser
 ${PYSITELIB}/accerciser/__init__.py
 ${PYSITELIB}/accerciser/__init__.pyc
@@ -153,17 +153,178 @@ share/accerciser/plugins/validate.glade
 share/accerciser/plugins/validate.py
 share/applications/accerciser.desktop
 share/gconf/schemas/accerciser.schemas
+share/gnome/help/accerciser/C/accerciser.xml
+share/gnome/help/accerciser/C/figures/accerciser.png
+share/gnome/help/accerciser/C/figures/api_browser.png
+share/gnome/help/accerciser/C/figures/event_monitor.png
+share/gnome/help/accerciser/C/figures/interface_viewer.png
+share/gnome/help/accerciser/C/figures/script_recorder.png
+share/gnome/help/accerciser/C/legal.xml
+share/gnome/help/accerciser/ca/accerciser.xml
+share/gnome/help/accerciser/ca/figures/accerciser.png
+share/gnome/help/accerciser/ca/figures/api_browser.png
+share/gnome/help/accerciser/ca/figures/event_monitor.png
+share/gnome/help/accerciser/ca/figures/interface_viewer.png
+share/gnome/help/accerciser/ca/figures/script_recorder.png
+share/gnome/help/accerciser/cs/accerciser.xml
+share/gnome/help/accerciser/cs/figures/accerciser.png
+share/gnome/help/accerciser/cs/figures/api_browser.png
+share/gnome/help/accerciser/cs/figures/event_monitor.png
+share/gnome/help/accerciser/cs/figures/interface_viewer.png
+share/gnome/help/accerciser/cs/figures/script_recorder.png
+share/gnome/help/accerciser/de/accerciser.xml
+share/gnome/help/accerciser/de/figures/accerciser.png
+share/gnome/help/accerciser/de/figures/api_browser.png
+share/gnome/help/accerciser/de/figures/event_monitor.png
+share/gnome/help/accerciser/de/figures/interface_viewer.png
+share/gnome/help/accerciser/de/figures/script_recorder.png
+share/gnome/help/accerciser/el/accerciser.xml
+share/gnome/help/accerciser/el/figures/accerciser.png
+share/gnome/help/accerciser/el/figures/api_browser.png
+share/gnome/help/accerciser/el/figures/event_monitor.png
+share/gnome/help/accerciser/el/figures/interface_viewer.png
+share/gnome/help/accerciser/el/figures/script_recorder.png
+share/gnome/help/accerciser/en_GB/accerciser.xml
+share/gnome/help/accerciser/en_GB/figures/accerciser.png
+share/gnome/help/accerciser/en_GB/figures/api_browser.png
+share/gnome/help/accerciser/en_GB/figures/event_monitor.png
+share/gnome/help/accerciser/en_GB/figures/interface_viewer.png
+share/gnome/help/accerciser/en_GB/figures/script_recorder.png
+share/gnome/help/accerciser/es/accerciser.xml
+share/gnome/help/accerciser/es/figures/accerciser.png
+share/gnome/help/accerciser/es/figures/api_browser.png
+share/gnome/help/accerciser/es/figures/event_monitor.png
+share/gnome/help/accerciser/es/figures/interface_viewer.png
+share/gnome/help/accerciser/es/figures/script_recorder.png
+share/gnome/help/accerciser/fr/accerciser.xml
+share/gnome/help/accerciser/fr/figures/accerciser.png
+share/gnome/help/accerciser/fr/figures/api_browser.png
+share/gnome/help/accerciser/fr/figures/event_monitor.png
+share/gnome/help/accerciser/fr/figures/interface_viewer.png
+share/gnome/help/accerciser/fr/figures/script_recorder.png
+share/gnome/help/accerciser/oc/accerciser.xml
+share/gnome/help/accerciser/oc/figures/accerciser.png
+share/gnome/help/accerciser/oc/figures/api_browser.png
+share/gnome/help/accerciser/oc/figures/event_monitor.png
+share/gnome/help/accerciser/oc/figures/interface_viewer.png
+share/gnome/help/accerciser/oc/figures/script_recorder.png
+share/gnome/help/accerciser/pt_BR/accerciser.xml
+share/gnome/help/accerciser/pt_BR/figures/accerciser.png
+share/gnome/help/accerciser/pt_BR/figures/api_browser.png
+share/gnome/help/accerciser/pt_BR/figures/event_monitor.png
+share/gnome/help/accerciser/pt_BR/figures/interface_viewer.png
+share/gnome/help/accerciser/pt_BR/figures/script_recorder.png
+share/gnome/help/accerciser/sv/accerciser.xml
+share/gnome/help/accerciser/sv/figures/accerciser.png
+share/gnome/help/accerciser/sv/figures/api_browser.png
+share/gnome/help/accerciser/sv/figures/event_monitor.png
+share/gnome/help/accerciser/sv/figures/interface_viewer.png
+share/gnome/help/accerciser/sv/figures/script_recorder.png
 share/icons/hicolor/16x16/apps/accerciser.png
 share/icons/hicolor/22x22/apps/accerciser.png
 share/icons/hicolor/32x32/apps/accerciser.png
 share/icons/hicolor/48x48/apps/accerciser.png
 share/icons/hicolor/scalable/apps/accerciser.svg
+share/locale/ar/LC_MESSAGES/accerciser.mo
+share/locale/bg/LC_MESSAGES/accerciser.mo
+share/locale/bn/LC_MESSAGES/accerciser.mo
+share/locale/bn_IN/LC_MESSAGES/accerciser.mo
+share/locale/ca/LC_MESSAGES/accerciser.mo
+share/locale/cs/LC_MESSAGES/accerciser.mo
+share/locale/da/LC_MESSAGES/accerciser.mo
+share/locale/de/LC_MESSAGES/accerciser.mo
+share/locale/dz/LC_MESSAGES/accerciser.mo
+share/locale/el/LC_MESSAGES/accerciser.mo
+share/locale/en_CA/LC_MESSAGES/accerciser.mo
+share/locale/en_GB/LC_MESSAGES/accerciser.mo
+share/locale/es/LC_MESSAGES/accerciser.mo
+share/locale/eu/LC_MESSAGES/accerciser.mo
+share/locale/fi/LC_MESSAGES/accerciser.mo
+share/locale/fr/LC_MESSAGES/accerciser.mo
+share/locale/gl/LC_MESSAGES/accerciser.mo
+share/locale/gu/LC_MESSAGES/accerciser.mo
+share/locale/he/LC_MESSAGES/accerciser.mo
+share/locale/hi/LC_MESSAGES/accerciser.mo
+share/locale/hu/LC_MESSAGES/accerciser.mo
+share/locale/it/LC_MESSAGES/accerciser.mo
+share/locale/ja/LC_MESSAGES/accerciser.mo
+share/locale/kn/LC_MESSAGES/accerciser.mo
+share/locale/lt/LC_MESSAGES/accerciser.mo
+share/locale/lv/LC_MESSAGES/accerciser.mo
+share/locale/mk/LC_MESSAGES/accerciser.mo
+share/locale/ml/LC_MESSAGES/accerciser.mo
+share/locale/mr/LC_MESSAGES/accerciser.mo
+share/locale/nb/LC_MESSAGES/accerciser.mo
+share/locale/nl/LC_MESSAGES/accerciser.mo
+share/locale/oc/LC_MESSAGES/accerciser.mo
+share/locale/or/LC_MESSAGES/accerciser.mo
+share/locale/pa/LC_MESSAGES/accerciser.mo
+share/locale/pl/LC_MESSAGES/accerciser.mo
+share/locale/pt/LC_MESSAGES/accerciser.mo
+share/locale/pt_BR/LC_MESSAGES/accerciser.mo
+share/locale/ru/LC_MESSAGES/accerciser.mo
+share/locale/si/LC_MESSAGES/accerciser.mo
+share/locale/sl/LC_MESSAGES/accerciser.mo
+share/locale/sq/LC_MESSAGES/accerciser.mo
+share/locale/sv/LC_MESSAGES/accerciser.mo
+share/locale/te/LC_MESSAGES/accerciser.mo
+share/locale/th/LC_MESSAGES/accerciser.mo
+share/locale/tr/LC_MESSAGES/accerciser.mo
+share/locale/uk/LC_MESSAGES/accerciser.mo
+share/locale/vi/LC_MESSAGES/accerciser.mo
+share/locale/zh_CN/LC_MESSAGES/accerciser.mo
+share/locale/zh_HK/LC_MESSAGES/accerciser.mo
+share/locale/zh_TW/LC_MESSAGES/accerciser.mo
+share/omf/accerciser/accerciser-C.omf
+share/omf/accerciser/accerciser-ca.omf
+share/omf/accerciser/accerciser-cs.omf
+share/omf/accerciser/accerciser-de.omf
+share/omf/accerciser/accerciser-el.omf
+share/omf/accerciser/accerciser-en_GB.omf
+share/omf/accerciser/accerciser-es.omf
+share/omf/accerciser/accerciser-fr.omf
+share/omf/accerciser/accerciser-oc.omf
+share/omf/accerciser/accerciser-pt_BR.omf
+share/omf/accerciser/accerciser-sv.omf
+@dirrm share/omf/accerciser
+@comment in rarian: @dirrm share/omf
 @comment in hicolor-icon-theme: @dirrm share/icons/hicolor/scalable/apps
+@comment in hicolor-icon-theme: @dirrm share/icons/hicolor/scalable
 @comment in hicolor-icon-theme: @dirrm share/icons/hicolor/48x48/apps
+@comment in hicolor-icon-theme: @dirrm share/icons/hicolor/48x48
 @comment in hicolor-icon-theme: @dirrm share/icons/hicolor/32x32/apps
+@comment in hicolor-icon-theme: @dirrm share/icons/hicolor/32x32
 @comment in hicolor-icon-theme: @dirrm share/icons/hicolor/22x22/apps
+@comment in hicolor-icon-theme: @dirrm share/icons/hicolor/22x22
 @comment in hicolor-icon-theme: @dirrm share/icons/hicolor/16x16/apps
+@comment in hicolor-icon-theme: @dirrm share/icons/hicolor/16x16
 @comment in hicolor-icon-theme: @dirrm share/icons/hicolor
+@comment in xdg-dirs: @dirrm share/icons
+@dirrm share/gnome/help/accerciser/sv/figures
+@dirrm share/gnome/help/accerciser/sv
+@dirrm share/gnome/help/accerciser/pt_BR/figures
+@dirrm share/gnome/help/accerciser/pt_BR
+@dirrm share/gnome/help/accerciser/oc/figures
+@dirrm share/gnome/help/accerciser/oc
+@dirrm share/gnome/help/accerciser/fr/figures
+@dirrm share/gnome/help/accerciser/fr
+@dirrm share/gnome/help/accerciser/es/figures
+@dirrm share/gnome/help/accerciser/es
+@dirrm share/gnome/help/accerciser/en_GB/figures
+@dirrm share/gnome/help/accerciser/en_GB
+@dirrm share/gnome/help/accerciser/el/figures
+@dirrm share/gnome/help/accerciser/el
+@dirrm share/gnome/help/accerciser/de/figures
+@dirrm share/gnome/help/accerciser/de
+@dirrm share/gnome/help/accerciser/cs/figures
+@dirrm share/gnome/help/accerciser/cs
+@dirrm share/gnome/help/accerciser/ca/figures
+@dirrm share/gnome/help/accerciser/ca
+@dirrm share/gnome/help/accerciser/C/figures
+@dirrm share/gnome/help/accerciser/C
+@dirrm share/gnome/help/accerciser
+@comment in gnome2-dirs: @dirrm share/gnome/help
+@comment in gnome2-dirs: @dirrm share/gnome
 @comment in GConf: @dirrm share/gconf/schemas
 @comment in xdg-dirs: @dirrm share/applications
 @dirrm share/accerciser/plugins