[pkgsrc/pkgsrc-2009Q4]: pkgsrc Pullup ticket #2975 - requested by wiz

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/pkgsrc-2009Q4]: pkgsrc Pullup ticket #2975 - requested by wiz
From: tron <tron%pkgsrc.org@localhost>
Date: Thu, 14 Oct 2021 08:48:03 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/63fc70e1ea92
branches:  pkgsrc-2009Q4
changeset: 569218:63fc70e1ea92
user:      tron <tron%pkgsrc.org@localhost>
date:      Wed Jan 27 16:51:33 2010 +0000

description:
Pullup ticket #2975 - requested by wiz
gnome-terminal: build fix
gtk2: build fix
libxcb: build fix
py-xcbgen: build fix
telepathy-gabble: build fix
telepathy-glib: build fix
telepathy-idle: build fix

Revisions pulled up:
- chat/telepathy-gabble/Makefile                1.11
- chat/telepathy-glib/Makefile                  1.17
- chat/telepathy-idle/Makefile                  1.11
- x11/gnome-terminal/Makefile                   1.30
- x11/gtk2/Makefile                             1.196
- x11/libxcb/Makefile                           1.9
- x11/py-xcbgen/Makefile                        1.5
---
Module Name:    pkgsrc
Committed By:   wiz
Date:           Wed Jan 27 08:46:51 UTC 2010

Modified Files:
        pkgsrc/chat/telepathy-gabble: Makefile
        pkgsrc/chat/telepathy-glib: Makefile
        pkgsrc/chat/telepathy-idle: Makefile
        pkgsrc/x11/gnome-terminal: Makefile
        pkgsrc/x11/gtk2: Makefile

Log Message:
Depend on py-expat for all supported python versions, now that
python25 and python26 have been fixed to behave like python24.
---
Module Name:    pkgsrc
Committed By:   wiz
Date:           Wed Jan 27 13:59:47 UTC 2010

Modified Files:
        pkgsrc/x11/py-xcbgen: Makefile

Log Message:
Needs py-expat nowadays. Depend on it and bump PKGREVISION.
---
Module Name:    pkgsrc
Committed By:   wiz
Date:           Wed Jan 27 14:00:33 UTC 2010

Modified Files:
        pkgsrc/x11/libxcb: Makefile

Log Message:
Depend on py-xcbgen that has py-expat dependency.
There are some 1.6 packages (post-python2{5,6} changes) that don't pull
py-expat in and fail.

diffstat:

 chat/telepathy-gabble/Makefile |  10 ++++------
 chat/telepathy-glib/Makefile   |  13 ++++++-------
 chat/telepathy-idle/Makefile   |   9 ++++-----
 x11/gnome-terminal/Makefile    |   9 ++++-----
 x11/gtk2/Makefile              |  11 +++++------
 x11/libxcb/Makefile            |   4 ++--
 x11/py-xcbgen/Makefile         |   5 ++++-
 7 files changed, 29 insertions(+), 32 deletions(-)

diffs (211 lines):

diff -r c251555384f7 -r 63fc70e1ea92 chat/telepathy-gabble/Makefile
--- a/chat/telepathy-gabble/Makefile    Wed Jan 27 15:08:06 2010 +0000
+++ b/chat/telepathy-gabble/Makefile    Wed Jan 27 16:51:33 2010 +0000
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.9 2009/12/03 23:58:59 wiz Exp $
+# $NetBSD: Makefile,v 1.9.2.1 2010/01/27 16:51:33 tron Exp $
 #
 
 DISTNAME=      telepathy-gabble-0.9.2
+PKGREVISION=   2
 CATEGORIES=    chat
 MASTER_SITES=  http://telepathy.freedesktop.org/releases/telepathy-gabble/
 
@@ -9,17 +10,14 @@
 HOMEPAGE=      http://telepathy.freedesktop.org/wiki/Components
 COMMENT=       Jabber/XMPP connection manager for Telepathy
 
+BUILD_DEPENDS+=                ${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat
+
 PKG_DESTDIR_SUPPORT=   user-destdir
 
 GNU_CONFIGURE= yes
 USE_LIBTOOL=   yes
 USE_TOOLS+=    gmake pkg-config
 
-.include "../../lang/python/pyversion.mk"
-.if ${PYPKGPREFIX} == "py24"
-BUILD_DEPENDS+=                ${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat
-.endif
-
 pre-configure: wocky-pkg-config-hack
 wocky-pkg-config-hack:
        ${LN} -s ${WRKSRC}/lib/ext/wocky/wocky/wocky-uninstalled.pc \
diff -r c251555384f7 -r 63fc70e1ea92 chat/telepathy-glib/Makefile
--- a/chat/telepathy-glib/Makefile      Wed Jan 27 15:08:06 2010 +0000
+++ b/chat/telepathy-glib/Makefile      Wed Jan 27 16:51:33 2010 +0000
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.16 2009/12/06 22:25:19 wiz Exp $
+# $NetBSD: Makefile,v 1.16.2.1 2010/01/27 16:51:33 tron Exp $
 #
 
 DISTNAME=      telepathy-glib-0.9.2
+PKGREVISION=   1
 CATEGORIES=    chat
 MASTER_SITES=  http://telepathy.freedesktop.org/releases/telepathy-glib/
 
@@ -10,18 +11,16 @@
 COMMENT=       GObject-based C binding for the Telepathy D-Bus API
 LICENSE=       gnu-gpl-v2 AND modified-bsd
 
+BUILD_DEPENDS+=                ${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat
+
+PKG_DESTDIR_SUPPORT=   user-destdir
+
 GNU_CONFIGURE= yes
 USE_LIBTOOL=   yes
 USE_TOOLS+=    gmake pkg-config
 
-PKG_DESTDIR_SUPPORT=   user-destdir
-
 PKGCONFIG_OVERRIDE+=   telepathy-glib/telepathy-glib.pc.in
 
-.include "../../lang/python/pyversion.mk"
-.if ${PYPKGPREFIX} == "py24"
-BUILD_DEPENDS+=                ${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat
-.endif
 CONFIGURE_ENV+=                ac_cv_prog_PYTHON=${PYTHONBIN}
 # see https://bugs.freedesktop.org/show_bug.cgi?id=23342
 CONFIGURE_ARGS+=       NM=nm
diff -r c251555384f7 -r 63fc70e1ea92 chat/telepathy-idle/Makefile
--- a/chat/telepathy-idle/Makefile      Wed Jan 27 15:08:06 2010 +0000
+++ b/chat/telepathy-idle/Makefile      Wed Jan 27 16:51:33 2010 +0000
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.9 2009/12/02 12:00:12 wiz Exp $
+# $NetBSD: Makefile,v 1.9.2.1 2010/01/27 16:51:33 tron Exp $
 #
 
 DISTNAME=      telepathy-idle-0.1.5
+PKGREVISION=   2
 CATEGORIES=    chat
 MASTER_SITES=  http://telepathy.freedesktop.org/releases/telepathy-idle/
 
@@ -10,6 +11,8 @@
 COMMENT=       Full-featured IRC connection manager for Telepathy
 LICENSE=       gnu-lgpl-v2.1
 
+BUILD_DEPENDS+=                ${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat
+
 PKG_DESTDIR_SUPPORT=   user-destdir
 
 GNU_CONFIGURE= yes
@@ -19,10 +22,6 @@
 CONFIGURE_ARGS+=       OPENSSL_CFLAGS=-I${BUILDLINK_PREFIX.openssl}/include
 CONFIGURE_ARGS+=       OPENSSL_LIBS="-L${BUILDLINK_PREFIX.openssl}/lib ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.openssl}/lib -lssl"
 
-.include "../../lang/python/pyversion.mk"
-.if ${PYPKGPREFIX} == "py24"
-BUILD_DEPENDS+=                ${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat
-.endif
 CONFIGURE_ENV+=                ac_cv_prog_PYTHON=${PYTHONBIN}
 
 .include "../../chat/telepathy-glib/buildlink3.mk"
diff -r c251555384f7 -r 63fc70e1ea92 x11/gnome-terminal/Makefile
--- a/x11/gnome-terminal/Makefile       Wed Jan 27 15:08:06 2010 +0000
+++ b/x11/gnome-terminal/Makefile       Wed Jan 27 16:51:33 2010 +0000
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.29 2009/12/16 17:20:31 drochner Exp $
+# $NetBSD: Makefile,v 1.29.2.1 2010/01/27 16:51:33 tron Exp $
 #
 
 DISTNAME=              gnome-terminal-2.28.2
+PKGREVISION=           1
 CATEGORIES=            x11 gnome
 MASTER_SITES=          ${MASTER_SITE_GNOME:=sources/gnome-terminal/2.28/}
 EXTRACT_SUFX=          .tar.bz2
@@ -10,6 +11,8 @@
 HOMEPAGE=              http://www.gnome.org/
 COMMENT=               Xterm like terminal program for GNOME 2
 
+BUILD_DEPENDS+=                ${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat
+
 PKG_DESTDIR_SUPPORT=   user-destdir
 
 CONFLICTS=             gnome-core-[0-9]* gnome2-terminal-[0-9]*
@@ -24,10 +27,6 @@
 GCONF_SCHEMAS= gnome-terminal.schemas
 
 PYTHON_FOR_BUILD_ONLY= YES
-.include "../../lang/python/pyversion.mk"
-.if ${PYPKGPREFIX} == "py24"
-BUILD_DEPENDS+=                ${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat
-.endif
 
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 BUILDLINK_API_DEPENDS.GConf+=  GConf>=2.14.0
diff -r c251555384f7 -r 63fc70e1ea92 x11/gtk2/Makefile
--- a/x11/gtk2/Makefile Wed Jan 27 15:08:06 2010 +0000
+++ b/x11/gtk2/Makefile Wed Jan 27 16:51:33 2010 +0000
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.193 2009/12/08 18:54:36 wiz Exp $
+# $NetBSD: Makefile,v 1.193.2.1 2010/01/27 16:51:33 tron Exp $
 
 DISTNAME=              gtk+-2.18.5
 PKGNAME=               ${DISTNAME:S/gtk/gtk2/}
+PKGREVISION=           1
 CATEGORIES=            x11
 MASTER_SITES=          ftp://ftp.gtk.org/pub/gtk/2.18/ \
                        ${MASTER_SITE_GNOME:=sources/gtk+/2.18/}
@@ -12,6 +13,9 @@
 COMMENT=               GIMP Toolkit v2 - libraries for building X11 user interfaces
 LICENSE=               gnu-lgpl-v2.1
 
+# gtk-builder-convert uses minidom from xml.dom, which needs expat
+DEPENDS+=              ${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat
+
 PKG_DESTDIR_SUPPORT=   user-destdir
 
 CONFLICTS=             gtk2-engines<2.6.0
@@ -67,11 +71,6 @@
 SUBST_FILES.pthread=   gdk-pixbuf/Makefile.in
 
 PYTHON_PATCH_SCRIPTS=  gtk/gtk-builder-convert
-# gtk-builder-convert uses minidom from xml.dom, which needs expat
-.include "../../lang/python/pyversion.mk"
-.if ${PYPKGPREFIX} == "py24"
-DEPENDS+=              ${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat
-.endif
 
 .include "options.mk"
 
diff -r c251555384f7 -r 63fc70e1ea92 x11/libxcb/Makefile
--- a/x11/libxcb/Makefile       Wed Jan 27 15:08:06 2010 +0000
+++ b/x11/libxcb/Makefile       Wed Jan 27 16:51:33 2010 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2009/12/15 12:24:47 wiz Exp $
+# $NetBSD: Makefile,v 1.8.2.1 2010/01/27 16:51:33 tron Exp $
 #
 
 DISTNAME=      libxcb-1.5
@@ -11,7 +11,7 @@
 COMMENT=       X protocol C-language Binding
 
 BUILD_DEPENDS+=                libxslt>=1.1.0:../../textproc/libxslt
-BUILD_DEPENDS+= ${PYPKGPREFIX}-xcbgen>=1.6:../../x11/py-xcbgen
+BUILD_DEPENDS+= ${PYPKGPREFIX}-xcbgen>=1.6nb1:../../x11/py-xcbgen
 
 PKG_DESTDIR_SUPPORT=   user-destdir
 
diff -r c251555384f7 -r 63fc70e1ea92 x11/py-xcbgen/Makefile
--- a/x11/py-xcbgen/Makefile    Wed Jan 27 15:08:06 2010 +0000
+++ b/x11/py-xcbgen/Makefile    Wed Jan 27 16:51:33 2010 +0000
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.4 2009/12/15 12:24:02 wiz Exp $
+# $NetBSD: Makefile,v 1.4.2.1 2010/01/27 16:51:33 tron Exp $
 #
 
 DISTNAME=      xcb-proto-1.6
 PKGNAME=       ${PYPKGPREFIX}-xcbgen-1.6
+PKGREVISION=   1
 CATEGORIES=    x11
 MASTER_SITES=  http://xcb.freedesktop.org/dist/
 EXTRACT_SUFX=  .tar.bz2
@@ -11,6 +12,8 @@
 HOMEPAGE=      http://xcb.freedesktop.org/
 COMMENT=       XCB protocol descriptions (in XML)
 
+DEPENDS+=      ${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat
+
 CONFLICTS+=    xcb-proto<1.4nb1
 PKG_DESTDIR_SUPPORT=   user-destdir
Prev by Date: [pkgsrc/trunk]: pkgsrc/pkgtools/bootstrap-mk-files Update bsd.files.mk multip...
Next by Date: [pkgsrc/pkgsrc-2009Q4]: pkgsrc/doc Pullup tickets #2985, #2986 and #2987.
Previous by Thread: [pkgsrc/trunk]: pkgsrc/pkgtools/bootstrap-mk-files Update bsd.files.mk multip...
Next by Thread: [pkgsrc/pkgsrc-2009Q4]: pkgsrc/doc Pullup tickets #2985, #2986 and #2987.
Indexes:
Home | Main Index | Thread Index | Old Index