pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/devel/py-gobject Split off the header and pc file into...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/b31fa248762d
branches:  trunk
changeset: 513153:b31fa248762d
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Sun May 21 18:44:46 2006 +0000

description:
Split off the header and pc file into a separate package, shared
by the various Python version dependent packages. Bump revision.
Force new API version to avoid problems.

diffstat:

 devel/py-gobject/Makefile         |  22 ++++------------------
 devel/py-gobject/Makefile.common  |  24 ++++++++++++++++++++++++
 devel/py-gobject/PLIST            |   5 +----
 devel/py-gobject/buildlink3.mk    |   5 +++--
 devel/py-gobject/distinfo         |   5 +++--
 devel/py-gobject/patches/patch-aa |  13 +++++++++++--
 devel/py-gobject/patches/patch-ab |  13 +++++++++++++
 7 files changed, 59 insertions(+), 28 deletions(-)

diffs (152 lines):

diff -r fdb422923a36 -r b31fa248762d devel/py-gobject/Makefile
--- a/devel/py-gobject/Makefile Sun May 21 18:40:20 2006 +0000
+++ b/devel/py-gobject/Makefile Sun May 21 18:44:46 2006 +0000
@@ -1,26 +1,12 @@
-# $NetBSD: Makefile,v 1.5 2006/04/12 09:28:00 drochner Exp $
+# $NetBSD: Makefile,v 1.6 2006/05/21 18:44:46 joerg Exp $
 #
 
-DISTNAME=              pygobject-2.10.1
 PKGNAME=               ${PYPKGPREFIX}-gobject-2.10.1
-CATEGORIES=            devel
-MASTER_SITES=          ${MASTER_SITE_GNOME:=sources/pygobject/2.10/}
-
-MAINTAINER=            pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE=              http://www.pygtk.org/
-COMMENT=               Python bindings for glib2 gobject
+PKGREVISION=           1
 
-USE_PKGLOCALEDIR=      yes
-USE_LIBTOOL=           yes
-USE_TOOLS+=            pkg-config
-GNU_CONFIGURE=         yes
-CONFIGURE_ENV+=                PYTHON=${PYTHONBIN:Q}
-
-PKGCONFIG_OVERRIDE+=   pygobject-2.0.pc.in
-PYTHON_VERSIONS_ACCEPTED= 24 23
-PY_PATCHPLIST=         yes
-CONFLICTS+=            ${PYPKGPREFIX}-gtk2<2.8.4
+.include "Makefile.common"
 
 .include "../../lang/python/extension.mk"
+.include "../../devel/py-gobject-shared/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r fdb422923a36 -r b31fa248762d devel/py-gobject/Makefile.common
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/py-gobject/Makefile.common  Sun May 21 18:44:46 2006 +0000
@@ -0,0 +1,24 @@
+# $NetBSD: Makefile.common,v 1.1 2006/05/21 18:44:46 joerg Exp $
+#
+
+DISTNAME=              pygobject-2.10.1
+CATEGORIES=            devel
+MASTER_SITES=          ${MASTER_SITE_GNOME:=sources/pygobject/2.10/}
+
+MAINTAINER=            pkgsrc-users%NetBSD.org@localhost
+HOMEPAGE=              http://www.pygtk.org/
+COMMENT=               Python bindings for glib2 gobject
+
+USE_PKGLOCALEDIR=      yes
+USE_LIBTOOL=           yes
+USE_TOOLS+=            pkg-config
+GNU_CONFIGURE=         yes
+CONFIGURE_ENV+=                PYTHON=${PYTHONBIN:Q}
+
+PATCHDIR=              ${.CURDIR}/../../devel/py-gobject/patches
+DISTINFO_FILE=         ${.CURDIR}/../../devel/py-gobject/distinfo
+
+PKGCONFIG_OVERRIDE+=   pygobject-2.0.pc.in
+PYTHON_VERSIONS_ACCEPTED= 24 23
+PY_PATCHPLIST=         yes
+CONFLICTS+=            ${PYPKGPREFIX}-gtk2<2.8.4
diff -r fdb422923a36 -r b31fa248762d devel/py-gobject/PLIST
--- a/devel/py-gobject/PLIST    Sun May 21 18:40:20 2006 +0000
+++ b/devel/py-gobject/PLIST    Sun May 21 18:44:46 2006 +0000
@@ -1,6 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2006/04/12 09:28:00 drochner Exp $
-include/pygtk-2.0/pygobject.h
-lib/pkgconfig/pygobject-2.0.pc
+@comment $NetBSD: PLIST,v 1.3 2006/05/21 18:44:46 joerg Exp $
 ${PYSITELIB}/gtk-2.0/dsextras.py
 ${PYSITELIB}/gtk-2.0/dsextras.pyc
 ${PYSITELIB}/gtk-2.0/dsextras.pyo
@@ -10,4 +8,3 @@
 ${PYSITELIB}/pygtk.pyc
 ${PYSITELIB}/pygtk.pyo
 @dirrm ${PYSITELIB}/gtk-2.0
-@dirrm include/pygtk-2.0
diff -r fdb422923a36 -r b31fa248762d devel/py-gobject/buildlink3.mk
--- a/devel/py-gobject/buildlink3.mk    Sun May 21 18:40:20 2006 +0000
+++ b/devel/py-gobject/buildlink3.mk    Sun May 21 18:44:46 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2006/04/12 10:27:13 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2006/05/21 18:44:46 joerg Exp $
 
 BUILDLINK_DEPTH:=      ${BUILDLINK_DEPTH}+
 PY_GOBJECT_BUILDLINK3_MK:=     ${PY_GOBJECT_BUILDLINK3_MK}+
@@ -13,10 +13,11 @@
 BUILDLINK_PACKAGES+=   pygobject
 
 .if !empty(PY_GOBJECT_BUILDLINK3_MK:M+)
-BUILDLINK_API_DEPENDS.pygobject+=      ${PYPKGPREFIX}-gobject>=2.9.1
+BUILDLINK_API_DEPENDS.pygobject+=      ${PYPKGPREFIX}-gobject>=2.10.1nb1
 BUILDLINK_PKGSRCDIR.pygobject?=        ../../devel/py-gobject
 .endif # PY_GOBJECT_BUILDLINK3_MK
 
+.include "../../devel/py-gobject-shared/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
 
 BUILDLINK_DEPTH:=      ${BUILDLINK_DEPTH:S/+$//}
diff -r fdb422923a36 -r b31fa248762d devel/py-gobject/distinfo
--- a/devel/py-gobject/distinfo Sun May 21 18:40:20 2006 +0000
+++ b/devel/py-gobject/distinfo Sun May 21 18:44:46 2006 +0000
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.3 2006/04/12 09:28:00 drochner Exp $
+$NetBSD: distinfo,v 1.4 2006/05/21 18:44:46 joerg Exp $
 
 SHA1 (pygobject-2.10.1.tar.gz) = 101aa44c57049b02f72aea4cdd352f5cedd58a78
 RMD160 (pygobject-2.10.1.tar.gz) = a8fbd761400c517ca8e137f166c4450a9c835c4c
 Size (pygobject-2.10.1.tar.gz) = 395423 bytes
-SHA1 (patch-aa) = 683caa0aa31d81de65c748c986dd10e662333777
+SHA1 (patch-aa) = b31c74b58b2e4492667d2e29d6112ef987d60a47
+SHA1 (patch-ab) = 25a697dabdf916ebc82acfe8390dc46f9ff33715
diff -r fdb422923a36 -r b31fa248762d devel/py-gobject/patches/patch-aa
--- a/devel/py-gobject/patches/patch-aa Sun May 21 18:40:20 2006 +0000
+++ b/devel/py-gobject/patches/patch-aa Sun May 21 18:44:46 2006 +0000
@@ -1,7 +1,16 @@
-$NetBSD: patch-aa,v 1.1 2006/04/12 09:28:00 drochner Exp $
+$NetBSD: patch-aa,v 1.2 2006/05/21 18:44:46 joerg Exp $
 
---- Makefile.in.orig   2006-04-11 18:41:58.000000000 +0200
+--- Makefile.in.orig   2006-04-11 14:02:29.000000000 +0000
 +++ Makefile.in
+@@ -744,7 +744,7 @@ info: info-recursive
+ 
+ info-am:
+ 
+-install-data-am: install-data-local install-pkgconfigDATA
++install-data-am: install-data-local
+ 
+ install-exec-am: install-exec-local install-nodist_pyexecPYTHON \
+       install-pkgpyexecLTLIBRARIES install-pkgpyexecPYTHON \
 @@ -807,7 +807,7 @@ uninstall-info: uninstall-info-recursive
  
  pygtk.py: pygtk.py.in
diff -r fdb422923a36 -r b31fa248762d devel/py-gobject/patches/patch-ab
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/py-gobject/patches/patch-ab Sun May 21 18:44:46 2006 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-ab,v 1.1 2006/05/21 18:44:46 joerg Exp $
+
+--- gobject/Makefile.in.orig   2006-05-19 11:45:01.000000000 +0000
++++ gobject/Makefile.in
+@@ -793,7 +793,7 @@ info: info-am
+ 
+ info-am:
+ 
+-install-data-am: install-pkgincludeHEADERS
++install-data-am:
+ 
+ install-exec-am: install-pkgpyexecLTLIBRARIES
+ 



Home | Main Index | Thread Index | Old Index