* accept python26, no reason to reject it.

* include python/extension.mk and  PYSITELIB in PLIST instead of hard coded python2.5.
* PKGLOCALEDIR are handled automatically, no need to use in PLIST.
* icontains *.desktop, so include desktop-file-utils/desktopdb.mk.

Bump PKGREVISION.

2 files changed, 49 insertions, 47 deletions

diff --git a/pkgtools/gnome-packagekit/Makefile b/pkgtools/gnome-packagekit/Makefile
index 04df1033a9d..05f94e11900 100644
--- a/pkgtools/gnome-packagekit/Makefile
+++ b/pkgtools/gnome-packagekit/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2009/09/07 19:02:14 joerg Exp $
+# $NetBSD: Makefile,v 1.8 2010/02/14 02:28:16 obache Exp $
 #
 
 DISTNAME=	gnome-packagekit-0.4.0
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	pkgtools gnome
 MASTER_SITES=	http://www.packagekit.org/releases/
 
@@ -12,8 +12,6 @@ COMMENT=	GNOME frontend for PackageKit
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
-PYTHON_VERSIONS_ACCEPTED=	25 24
-
 GNU_CONFIGURE=	yes
 USE_LIBTOOL=	yes
 USE_TOOLS+=	pkg-config gmake intltool perl msgfmt
@@ -21,14 +19,18 @@ USE_PKGLOCALEDIR= yes
 
 GCONF_SCHEMAS+=	gnome-packagekit.schemas
 
+PY_PATCHPLIST=	yes
+
 .include "../../devel/GConf/schemas.mk"
 .include "../../devel/libglade/buildlink3.mk"
 .include "../../devel/libsexy/buildlink3.mk"
 .include "../../lang/python/application.mk"
+.include "../../lang/python/extension.mk"
 .include "../../pkgtools/packagekit/buildlink3.mk"
 .include "../../graphics/gnome-icon-theme/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../security/policykit-gnome/buildlink3.mk"
+.include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../sysutils/gnome-menus/buildlink3.mk"
 .include "../../sysutils/libnotify/buildlink3.mk"
 .include "../../textproc/gnome-doc-utils/buildlink3.mk"
diff --git a/pkgtools/gnome-packagekit/PLIST b/pkgtools/gnome-packagekit/PLIST
index 06c8655981c..5cad6024146 100644
--- a/pkgtools/gnome-packagekit/PLIST
+++ b/pkgtools/gnome-packagekit/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2009/06/14 18:11:02 joerg Exp $
+@comment $NetBSD: PLIST,v 1.3 2010/02/14 02:28:16 obache Exp $
 bin/gpk-application
 bin/gpk-backend-status
 bin/gpk-install-catalog
@@ -12,48 +12,12 @@ bin/gpk-repo
 bin/gpk-service-pack
 bin/gpk-update-icon
 bin/gpk-update-viewer
-${PKGLOCALEDIR}/locale/ar/LC_MESSAGES/gnome-packagekit.mo
-${PKGLOCALEDIR}/locale/as/LC_MESSAGES/gnome-packagekit.mo
-${PKGLOCALEDIR}/locale/bn_IN/LC_MESSAGES/gnome-packagekit.mo
-${PKGLOCALEDIR}/locale/ca/LC_MESSAGES/gnome-packagekit.mo
-${PKGLOCALEDIR}/locale/cs/LC_MESSAGES/gnome-packagekit.mo
-${PKGLOCALEDIR}/locale/cy/LC_MESSAGES/gnome-packagekit.mo
-${PKGLOCALEDIR}/locale/da/LC_MESSAGES/gnome-packagekit.mo
-${PKGLOCALEDIR}/locale/de/LC_MESSAGES/gnome-packagekit.mo
-${PKGLOCALEDIR}/locale/el/LC_MESSAGES/gnome-packagekit.mo
-${PKGLOCALEDIR}/locale/en_GB/LC_MESSAGES/gnome-packagekit.mo
-${PKGLOCALEDIR}/locale/es/LC_MESSAGES/gnome-packagekit.mo
-${PKGLOCALEDIR}/locale/fi/LC_MESSAGES/gnome-packagekit.mo
-${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/gnome-packagekit.mo
-${PKGLOCALEDIR}/locale/gl/LC_MESSAGES/gnome-packagekit.mo
-${PKGLOCALEDIR}/locale/gu/LC_MESSAGES/gnome-packagekit.mo
-${PKGLOCALEDIR}/locale/he/LC_MESSAGES/gnome-packagekit.mo
-${PKGLOCALEDIR}/locale/hi/LC_MESSAGES/gnome-packagekit.mo
-${PKGLOCALEDIR}/locale/hu/LC_MESSAGES/gnome-packagekit.mo
-${PKGLOCALEDIR}/locale/it/LC_MESSAGES/gnome-packagekit.mo
-${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/gnome-packagekit.mo
-${PKGLOCALEDIR}/locale/ml/LC_MESSAGES/gnome-packagekit.mo
-${PKGLOCALEDIR}/locale/mr/LC_MESSAGES/gnome-packagekit.mo
-${PKGLOCALEDIR}/locale/nb/LC_MESSAGES/gnome-packagekit.mo
-${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/gnome-packagekit.mo
-${PKGLOCALEDIR}/locale/oc/LC_MESSAGES/gnome-packagekit.mo
-${PKGLOCALEDIR}/locale/or/LC_MESSAGES/gnome-packagekit.mo
-${PKGLOCALEDIR}/locale/pa/LC_MESSAGES/gnome-packagekit.mo
-${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/gnome-packagekit.mo
-${PKGLOCALEDIR}/locale/pt_BR/LC_MESSAGES/gnome-packagekit.mo
-${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/gnome-packagekit.mo
-${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/gnome-packagekit.mo
-${PKGLOCALEDIR}/locale/ta/LC_MESSAGES/gnome-packagekit.mo
-${PKGLOCALEDIR}/locale/te/LC_MESSAGES/gnome-packagekit.mo
-${PKGLOCALEDIR}/locale/tr/LC_MESSAGES/gnome-packagekit.mo
-${PKGLOCALEDIR}/locale/zh_HK/LC_MESSAGES/gnome-packagekit.mo
-${PKGLOCALEDIR}/locale/zh_TW/LC_MESSAGES/gnome-packagekit.mo
-lib/python2.5/site-packages/packagekit/genums.py
-lib/python2.5/site-packages/packagekit/genums.pyc
-lib/python2.5/site-packages/packagekit/genums.pyo
-lib/python2.5/site-packages/packagekit/gtkwidgets.py
-lib/python2.5/site-packages/packagekit/gtkwidgets.pyc
-lib/python2.5/site-packages/packagekit/gtkwidgets.pyo
+${PYSITELIB}/packagekit/genums.py
+${PYSITELIB}/packagekit/genums.pyc
+${PYSITELIB}/packagekit/genums.pyo
+${PYSITELIB}/packagekit/gtkwidgets.py
+${PYSITELIB}/packagekit/gtkwidgets.pyc
+${PYSITELIB}/packagekit/gtkwidgets.pyo
 share/applications/gpk-application.desktop
 share/applications/gpk-install-catalog.desktop
 share/applications/gpk-install-file.desktop
@@ -380,6 +344,42 @@ share/icons/hicolor/scalable/apps/gpk-service-pack.svg
 share/icons/hicolor/scalable/mimetypes/application-x-catalog.svg
 share/icons/hicolor/scalable/mimetypes/application-x-package-list.svg
 share/icons/hicolor/scalable/mimetypes/application-x-servicepack.svg
+share/locale/ar/LC_MESSAGES/gnome-packagekit.mo
+share/locale/as/LC_MESSAGES/gnome-packagekit.mo
+share/locale/bn_IN/LC_MESSAGES/gnome-packagekit.mo
+share/locale/ca/LC_MESSAGES/gnome-packagekit.mo
+share/locale/cs/LC_MESSAGES/gnome-packagekit.mo
+share/locale/cy/LC_MESSAGES/gnome-packagekit.mo
+share/locale/da/LC_MESSAGES/gnome-packagekit.mo
+share/locale/de/LC_MESSAGES/gnome-packagekit.mo
+share/locale/el/LC_MESSAGES/gnome-packagekit.mo
+share/locale/en_GB/LC_MESSAGES/gnome-packagekit.mo
+share/locale/es/LC_MESSAGES/gnome-packagekit.mo
+share/locale/fi/LC_MESSAGES/gnome-packagekit.mo
+share/locale/fr/LC_MESSAGES/gnome-packagekit.mo
+share/locale/gl/LC_MESSAGES/gnome-packagekit.mo
+share/locale/gu/LC_MESSAGES/gnome-packagekit.mo
+share/locale/he/LC_MESSAGES/gnome-packagekit.mo
+share/locale/hi/LC_MESSAGES/gnome-packagekit.mo
+share/locale/hu/LC_MESSAGES/gnome-packagekit.mo
+share/locale/it/LC_MESSAGES/gnome-packagekit.mo
+share/locale/ja/LC_MESSAGES/gnome-packagekit.mo
+share/locale/ml/LC_MESSAGES/gnome-packagekit.mo
+share/locale/mr/LC_MESSAGES/gnome-packagekit.mo
+share/locale/nb/LC_MESSAGES/gnome-packagekit.mo
+share/locale/nl/LC_MESSAGES/gnome-packagekit.mo
+share/locale/oc/LC_MESSAGES/gnome-packagekit.mo
+share/locale/or/LC_MESSAGES/gnome-packagekit.mo
+share/locale/pa/LC_MESSAGES/gnome-packagekit.mo
+share/locale/pl/LC_MESSAGES/gnome-packagekit.mo
+share/locale/pt_BR/LC_MESSAGES/gnome-packagekit.mo
+share/locale/ru/LC_MESSAGES/gnome-packagekit.mo
+share/locale/sv/LC_MESSAGES/gnome-packagekit.mo
+share/locale/ta/LC_MESSAGES/gnome-packagekit.mo
+share/locale/te/LC_MESSAGES/gnome-packagekit.mo
+share/locale/tr/LC_MESSAGES/gnome-packagekit.mo
+share/locale/zh_HK/LC_MESSAGES/gnome-packagekit.mo
+share/locale/zh_TW/LC_MESSAGES/gnome-packagekit.mo
 share/omf/gnome-packagekit/gnome-packagekit-C.omf
 share/omf/gnome-packagekit/gnome-packagekit-el.omf
 share/omf/gnome-packagekit/gnome-packagekit-es.omf