summaryrefslogtreecommitdiff
path: root/x11
diff options
context:
space:
mode:
authorjoerg <joerg@pkgsrc.org>2012-10-24 15:48:32 +0000
committerjoerg <joerg@pkgsrc.org>2012-10-24 15:48:32 +0000
commit518ff971708970c4720fccee973320115bd05cb5 (patch)
treecb204428018ed79bd22bb60d4432d116d87b6c4e /x11
parent513375f78a2cf46ee6837bd78b4797719326bebd (diff)
downloadpkgsrc-518ff971708970c4720fccee973320115bd05cb5.tar.gz
Add missing pangox-compat dependency in wxGTK24 and wxGTK26.
Recursive bump for the new dependency.
Diffstat (limited to 'x11')
-rw-r--r--x11/wxGTK24/Makefile4
-rw-r--r--x11/wxGTK24/Makefile.common3
-rw-r--r--x11/wxGTK24/buildlink3.mk3
-rw-r--r--x11/wxGTK26-contrib/Makefile4
-rw-r--r--x11/wxGTK26/Makefile4
-rw-r--r--x11/wxGTK26/Makefile.common3
-rw-r--r--x11/wxGTK26/buildlink3.mk3
-rw-r--r--x11/wxhaskell/Makefile4
8 files changed, 16 insertions, 12 deletions
diff --git a/x11/wxGTK24/Makefile b/x11/wxGTK24/Makefile
index 4ce9b616ce2..068c2901b46 100644
--- a/x11/wxGTK24/Makefile
+++ b/x11/wxGTK24/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.23 2012/10/08 23:00:43 adam Exp $
+# $NetBSD: Makefile,v 1.24 2012/10/24 15:48:32 joerg Exp $
#
PKG_DESTDIR_SUPPORT= user-destdir
.include "Makefile.common"
-PKGREVISION= 28
+PKGREVISION= 29
COMMENT= GTK-based implementation of the wxWidgets GUI library
CONFLICTS+= wxGTK<=2.4.2nb5
diff --git a/x11/wxGTK24/Makefile.common b/x11/wxGTK24/Makefile.common
index ecbc38e01f4..a660d9995f7 100644
--- a/x11/wxGTK24/Makefile.common
+++ b/x11/wxGTK24/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.9 2011/04/19 11:47:12 obache Exp $
+# $NetBSD: Makefile.common,v 1.10 2012/10/24 15:48:32 joerg Exp $
#
# used by x11/wxGTK24/Makefile
@@ -42,6 +42,7 @@ CONFIGURE_ARGS+= --with-gtk
CONFIGURE_ARGS+= --enable-gtk2
PLIST_SUBST+= GTKVER=2
+.include "../../devel/pangox-compat/buildlink3.mk"
.include "../../devel/zlib/buildlink3.mk"
.include "../../graphics/MesaLib/buildlink3.mk"
.include "../../mk/jpeg.buildlink3.mk"
diff --git a/x11/wxGTK24/buildlink3.mk b/x11/wxGTK24/buildlink3.mk
index 38eea0ba24a..a47a3455adf 100644
--- a/x11/wxGTK24/buildlink3.mk
+++ b/x11/wxGTK24/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.26 2012/10/08 23:00:43 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.27 2012/10/24 15:48:32 joerg Exp $
.include "../../mk/bsd.fast.prefs.mk"
@@ -11,6 +11,7 @@ BUILDLINK_API_DEPENDS.wxGTK24+= wxGTK24>=2.4.2
BUILDLINK_ABI_DEPENDS.wxGTK24+= wxGTK24>=2.4.2nb28
BUILDLINK_PKGSRCDIR.wxGTK24?= ../../x11/wxGTK24
+.include "../../devel/pangox-compat/buildlink3.mk"
.include "../../devel/zlib/buildlink3.mk"
.include "../../graphics/MesaLib/buildlink3.mk"
.include "../../mk/jpeg.buildlink3.mk"
diff --git a/x11/wxGTK26-contrib/Makefile b/x11/wxGTK26-contrib/Makefile
index a958c53195f..e60cb3179bd 100644
--- a/x11/wxGTK26-contrib/Makefile
+++ b/x11/wxGTK26-contrib/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.16 2012/10/08 23:00:50 adam Exp $
+# $NetBSD: Makefile,v 1.17 2012/10/24 15:48:32 joerg Exp $
#
.include "../../x11/wxGTK26/Makefile.common"
PKGNAME= ${DISTNAME:S/wxGTK/wxGTK-contrib/}
-PKGREVISION= 17
+PKGREVISION= 18
MAINTAINER= pkgsrc-users@NetBSD.org
COMMENT= GTK-based implementation of the wxWidgets GUI library (contrib libraries)
diff --git a/x11/wxGTK26/Makefile b/x11/wxGTK26/Makefile
index 2001611867d..2a2e5337cfd 100644
--- a/x11/wxGTK26/Makefile
+++ b/x11/wxGTK26/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.19 2012/10/08 23:00:44 adam Exp $
+# $NetBSD: Makefile,v 1.20 2012/10/24 15:48:32 joerg Exp $
#
.include "Makefile.common"
-PKGREVISION= 18
+PKGREVISION= 19
COMMENT= GTK-based implementation of the wxWidgets GUI library
REPLACE_SH= wx-config.in wx-config-inplace.in
diff --git a/x11/wxGTK26/Makefile.common b/x11/wxGTK26/Makefile.common
index bdd4ffef60f..afcf1337111 100644
--- a/x11/wxGTK26/Makefile.common
+++ b/x11/wxGTK26/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.4 2011/01/12 11:21:28 wiz Exp $
+# $NetBSD: Makefile.common,v 1.5 2012/10/24 15:48:32 joerg Exp $
#
# used by x11/wxGTK26/Makefile
# used by x11/wxGTK26-contrib/Makefile
@@ -44,6 +44,7 @@ CPPFLAGS+= -Dunix=1 # src/common/unzip.c needs this
DOCDIR= ${PREFIX}/share/doc/wxGTK
+.include "../../devel/pangox-compat/buildlink3.mk"
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../devel/zlib/buildlink3.mk"
.include "../../graphics/MesaLib/buildlink3.mk"
diff --git a/x11/wxGTK26/buildlink3.mk b/x11/wxGTK26/buildlink3.mk
index 9462aadcecd..2b1795bc7ca 100644
--- a/x11/wxGTK26/buildlink3.mk
+++ b/x11/wxGTK26/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.18 2012/10/08 23:00:44 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.19 2012/10/24 15:48:32 joerg Exp $
BUILDLINK_TREE+= wxGTK
@@ -9,6 +9,7 @@ BUILDLINK_API_DEPENDS.wxGTK+= wxGTK>=2.6.0nb2
BUILDLINK_ABI_DEPENDS.wxGTK+= wxGTK>=2.6.3nb18
BUILDLINK_PKGSRCDIR.wxGTK?= ../../x11/wxGTK26
+.include "../../devel/pangox-compat/buildlink3.mk"
.include "../../devel/zlib/buildlink3.mk"
.include "../../graphics/MesaLib/buildlink3.mk"
.include "../../mk/jpeg.buildlink3.mk"
diff --git a/x11/wxhaskell/Makefile b/x11/wxhaskell/Makefile
index 901a5fe0e4a..efd30b6c092 100644
--- a/x11/wxhaskell/Makefile
+++ b/x11/wxhaskell/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.39 2012/10/08 23:02:39 adam Exp $
+# $NetBSD: Makefile,v 1.40 2012/10/24 15:48:33 joerg Exp $
DISTNAME= wxhaskell-src-0.9.4
PKGNAME= ${DISTNAME:S/-src//}
-PKGREVISION= 23
+PKGREVISION= 24
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=wxhaskell/}
EXTRACT_SUFX= .zip