summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--devel/accerciser3/Makefile10
-rw-r--r--devel/libappindicator3/Makefile5
-rw-r--r--devel/libpeas/Makefile11
-rw-r--r--devel/libpeas/buildlink3.mk3
-rw-r--r--devel/py-at-spi2/Makefile6
-rw-r--r--editors/gedit3/Makefile12
-rw-r--r--inputmethod/ibus-python/Makefile26
-rw-r--r--math/gnumeric112/Makefile5
-rw-r--r--multimedia/py-gstreamer1/Makefile24
-rw-r--r--net/syncthing-gtk/Makefile4
-rw-r--r--x11/mate-applets/Makefile6
-rw-r--r--x11/mozo/Makefile7
12 files changed, 54 insertions, 65 deletions
diff --git a/devel/accerciser3/Makefile b/devel/accerciser3/Makefile
index f6dc2db8c28..850c9fb964c 100644
--- a/devel/accerciser3/Makefile
+++ b/devel/accerciser3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2018/03/12 11:16:14 wiz Exp $
+# $NetBSD: Makefile,v 1.23 2018/04/14 12:24:31 adam Exp $
DISTNAME= accerciser-3.22.0
PKGREVISION= 2
@@ -19,23 +19,19 @@ REPLACE_PYTHON= plugins/ipython_view.py
REPLACE_PYTHON+= src/accerciser.in
BUILD_DEPENDS+= itstool-[0-9]*:../../textproc/itstool
-DEPENDS+= ${PYPKGPREFIX}-at-spi2-[0-9]*:../../devel/py-at-spi2
DEPENDS+= libwnck3-[0-9]*:../../devel/libwnck3
+DEPENDS+= ${PYPKGPREFIX}-at-spi2-[0-9]*:../../devel/py-at-spi2
+DEPENDS+= ${PYPKGPREFIX}-gobject3-[0-9]*:../../devel/py-gobject3
DEPENDS+= ${PYPKGPREFIX}-ipython>=1.2.1:../../devel/py-ipython
# dependencies to keep package's configure script happy:
-USE_LANGUAGES= c
-
PYTHON_VERSIONS_INCOMPATIBLE= 27
.include "../../x11/gtk3/buildlink3.mk"
.include "../../devel/at-spi2-core/buildlink3.mk"
-.include "../../devel/py-gobject3/buildlink3.mk"
-
.include "../../devel/glib2/schemas.mk"
.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
.include "../../lang/python/application.mk"
.include "../../lang/python/extension.mk"
.include "../../sysutils/desktop-file-utils/desktopdb.mk"
-
.include "../../mk/bsd.pkg.mk"
diff --git a/devel/libappindicator3/Makefile b/devel/libappindicator3/Makefile
index 105c3cd2508..e7fa08eef88 100644
--- a/devel/libappindicator3/Makefile
+++ b/devel/libappindicator3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2018/03/12 11:15:28 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2018/04/14 12:24:31 adam Exp $
USE_GTK_VERSION= 3
PYTHON_VERSIONS_INCOMPATIBLE= 34 35 36 # py-gtk2
@@ -12,9 +12,10 @@ PKGNAME= ${DISTNAME:S/-/3-/}
BUILDLINK_TRANSFORM+= rm:-Werror
+DEPENDS+= ${PYPKGPREFIX}-gobject3-[0-9]*:../../devel/py-gobject3
+
.include "../../devel/libindicator3/buildlink3.mk"
.include "../../devel/libdbusmenu-gtk3/buildlink3.mk"
-.include "../../devel/py-gobject3/buildlink3.mk"
.include "../../sysutils/dbus-glib/buildlink3.mk"
.include "../../x11/gtk3/buildlink3.mk"
.include "../../x11/py-gtk2/buildlink3.mk"
diff --git a/devel/libpeas/Makefile b/devel/libpeas/Makefile
index faad772f205..f58b3e16c9e 100644
--- a/devel/libpeas/Makefile
+++ b/devel/libpeas/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2018/03/12 11:15:30 wiz Exp $
+# $NetBSD: Makefile,v 1.36 2018/04/14 12:24:31 adam Exp $
DISTNAME= libpeas-1.20.0
PKGREVISION= 2
@@ -11,20 +11,20 @@ HOMEPAGE= https://wiki.gnome.org/Projects/Libpeas
COMMENT= GObject-based plugins engine
LICENSE= gnu-lgpl-v2.1
-USE_PKGLOCALEDIR= yes
+DEPENDS+= ${PYPKGPREFIX}-gobject3-[0-9]*:../../devel/py-gobject3
-GNU_CONFIGURE= yes
USE_LIBTOOL= yes
+USE_PKGLOCALEDIR= yes
USE_TOOLS+= gmake intltool msgfmt pkg-config gsed
+GNU_CONFIGURE= yes
PYTHON_VERSIONS_INCOMPATIBLE= 27
.include "../../lang/python/pyversion.mk"
CONFIGURE_ARGS+= --disable-python2
-CONFIGURE_ENV+= PYTHON3_CONFIG=${PYTHONCONFIG}
CONFIGURE_ARGS+= --disable-lua5.1 # looks for lua5.1.pc
CONFIGURE_ARGS+= --disable-luajit
-
+CONFIGURE_ENV+= PYTHON3_CONFIG=${PYTHONCONFIG}
PKGCONFIG_OVERRIDE+= data/libpeas-gtk-1.0.pc.in
PKGCONFIG_OVERRIDE+= data/libpeas-1.0.pc.in
@@ -33,7 +33,6 @@ BUILDLINK_API_DEPENDS.glib2+= glib2>=2.38.0
.include "../../devel/glib2/buildlink3.mk"
BUILDLINK_API_DEPENDS.gobject-introspection+= gobject-introspection>=1.39.0
.include "../../devel/gobject-introspection/buildlink3.mk"
-.include "../../devel/py-gobject3/buildlink3.mk"
.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
.include "../../lang/python/extension.mk"
.include "../../x11/gtk3/buildlink3.mk"
diff --git a/devel/libpeas/buildlink3.mk b/devel/libpeas/buildlink3.mk
index 78a60a8b02d..39f26ee14ef 100644
--- a/devel/libpeas/buildlink3.mk
+++ b/devel/libpeas/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.22 2018/03/12 11:15:30 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.23 2018/04/14 12:24:31 adam Exp $
BUILDLINK_TREE+= libpeas
@@ -12,7 +12,6 @@ BUILDLINK_PKGSRCDIR.libpeas?= ../../devel/libpeas
.include "../../devel/glib2/buildlink3.mk"
.include "../../devel/gobject-introspection/buildlink3.mk"
PYTHON_VERSIONS_INCOMPATIBLE+= 27
-.include "../../devel/py-gobject3/buildlink3.mk"
.include "../../x11/gtk3/buildlink3.mk"
.endif # LIBPEAS_BUILDLINK3_MK
diff --git a/devel/py-at-spi2/Makefile b/devel/py-at-spi2/Makefile
index 21b9d06d77c..9314105d93c 100644
--- a/devel/py-at-spi2/Makefile
+++ b/devel/py-at-spi2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2017/08/25 12:33:55 prlw1 Exp $
+# $NetBSD: Makefile,v 1.22 2018/04/14 12:24:31 adam Exp $
DISTNAME= pyatspi-2.24.0
PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/pyatspi/at-spi2/}
@@ -14,6 +14,7 @@ LICENSE= gnu-lgpl-v2
DEPENDS+= at-spi2-core>=2.3.90:../../devel/at-spi2-core
DEPENDS+= at-spi2-atk-[0-9]*:../../devel/at-spi2-atk
+DEPENDS+= ${PYPKGPREFIX}-gobject3-[0-9]*:../../devel/py-gobject3
USE_LIBTOOL= yes
USE_TOOLS+= pkg-config
@@ -25,8 +26,5 @@ CONFLICTS= ${PYPKGPREFIX}-at-spi-[0-9]*
CHECK_PORTABILITY_SKIP= config/test-driver
-.include "../../devel/py-gobject3/buildlink3.mk"
-
-.include "../../lang/python/application.mk"
.include "../../lang/python/extension.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/editors/gedit3/Makefile b/editors/gedit3/Makefile
index c5d81b79228..00581168327 100644
--- a/editors/gedit3/Makefile
+++ b/editors/gedit3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.38 2018/03/12 11:16:23 wiz Exp $
+# $NetBSD: Makefile,v 1.39 2018/04/14 12:24:31 adam Exp $
DISTNAME= gedit-3.22.1
PKGREVISION= 2
@@ -11,10 +11,10 @@ HOMEPAGE= https://wiki.gnome.org/Apps/Gedit
COMMENT= Lightweight GNOME UTF-8 text editor
LICENSE= gnu-gpl-v2
-GNU_CONFIGURE= yes
USE_LIBTOOL= yes
-USE_TOOLS+= gmake intltool msgfmt perl pkg-config
USE_PKGLOCALEDIR= yes
+USE_TOOLS+= gmake intltool msgfmt perl pkg-config
+GNU_CONFIGURE= yes
PKGCONFIG_OVERRIDE+= data/gedit.pc.in
PY_PATCHPLIST= yes
@@ -28,14 +28,13 @@ CONFIGURE_ARGS+= --disable-maintainer-mode
.include "options.mk"
-BUILD_DEPENDS+= itstool-[0-9]*:../../textproc/itstool
-
DEPENDS+= adwaita-icon-theme-[0-9]*:../../graphics/adwaita-icon-theme
+DEPENDS+= ${PYPKGPREFIX}-gobject3-[0-9]*:../../devel/py-gobject3
+BUILD_DEPENDS+= itstool-[0-9]*:../../textproc/itstool
.include "../../devel/gobject-introspection/buildlink3.mk"
BUILDLINK_API_DEPENDS.libpeas+= libpeas>=1.14.1
.include "../../devel/libpeas/buildlink3.mk"
-.include "../../devel/py-gobject3/buildlink3.mk"
BUILDLINK_API_DEPENDS.glib2+= glib2>=2.44.0
.include "../../devel/glib2/schemas.mk"
.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
@@ -51,5 +50,4 @@ BUILDLINK_API_DEPENDS.gtksourceview3+= gtksourceview3>=3.21.2
.include "../../lang/python/application.mk"
.include "../../lang/python/extension.mk"
-
.include "../../mk/bsd.pkg.mk"
diff --git a/inputmethod/ibus-python/Makefile b/inputmethod/ibus-python/Makefile
index df0035e37c5..8603bbe3e67 100644
--- a/inputmethod/ibus-python/Makefile
+++ b/inputmethod/ibus-python/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2017/11/05 04:19:15 tsutsui Exp $
+# $NetBSD: Makefile,v 1.13 2018/04/14 12:24:31 adam Exp $
.include "../../inputmethod/ibus/Makefile.common"
@@ -7,14 +7,15 @@ PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/ibus/ibus-python/}
COMMENT= Python library for Intelligent Input Bus
LICENSE= gnu-lgpl-v2.1
-GNU_CONFIGURE= yes
-USE_LIBTOOL= yes
-USE_TOOLS+= pkg-config intltool msgfmt gmake
-USE_LANGUAGES= c c++
+USE_LANGUAGES= c c++
+USE_LIBTOOL= yes
USE_PKGLOCALEDIR= yes
+USE_TOOLS+= pkg-config intltool msgfmt gmake
+GNU_CONFIGURE= yes
-DEPENDS+= ibus>=${PKGVERSION_NOREV}:../../inputmethod/ibus
-DEPENDS+= ${PYPKGPREFIX}-gtk2-[0-9]*:../../x11/py-gtk2
+DEPENDS+= ibus>=${PKGVERSION_NOREV}:../../inputmethod/ibus
+DEPENDS+= ${PYPKGPREFIX}-gobject3-[0-9]*:../../devel/py-gobject3
+DEPENDS+= ${PYPKGPREFIX}-gtk2-[0-9]*:../../x11/py-gtk2
PKGCONFIG_OVERRIDE+= ibus-1.0.pc.in
@@ -35,14 +36,13 @@ BUILDLINK_TRANSFORM+= rm:-Wno-unused-but-set-variable
NO_BUILD= yes
INSTALL_DIRS= bindings ibus
-CONFIGURE_ARGS+= --disable-dconf
-CONFIGURE_ARGS+= --disable-gconf
-CONFIGURE_ARGS+= --enable-python-library
-CONFIGURE_ENV+= PYTHON2=${PYTHONBIN}
+CONFIGURE_ARGS+= --disable-dconf
+CONFIGURE_ARGS+= --disable-gconf
+CONFIGURE_ARGS+= --enable-python-library
+CONFIGURE_ENV+= PYTHON2=${PYTHONBIN}
-PYTHON_VERSIONS_INCOMPATIBLE= 34 35 36 # py-gtk2, py-gobject3
+PYTHON_VERSIONS_INCOMPATIBLE= 34 35 36 # py-gtk2
-.include "../../devel/py-gobject3/buildlink3.mk"
PY_PATCHPLIST= yes
.include "../../lang/python/extension.mk"
BUILDLINK_API_DEPENDS.py-dbus+= ${PYPKGPREFIX}-dbus>=0.83.0
diff --git a/math/gnumeric112/Makefile b/math/gnumeric112/Makefile
index 14debf1bd50..5cacd1b70ad 100644
--- a/math/gnumeric112/Makefile
+++ b/math/gnumeric112/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.40 2018/03/12 11:17:02 wiz Exp $
+# $NetBSD: Makefile,v 1.41 2018/04/14 12:24:31 adam Exp $
DISTNAME= gnumeric-1.12.38
PKGREVISION= 1
@@ -12,6 +12,7 @@ COMMENT= Spreadsheet program from the GNOME project
LICENSE= gnu-gpl-v2 OR gnu-gpl-v3
BUILD_DEPENDS+= itstool-[0-9]*:../../textproc/itstool
+DEPENDS+= ${PYPKGPREFIX}-gobject3-[0-9]*:../../devel/py-gobject3
USE_TOOLS+= gmake intltool msgfmt perl:run pkg-config yacc
USE_LIBTOOL= yes
@@ -31,7 +32,6 @@ CONFIGURE_ARGS+= --with-python
CONFIGURE_ENV+= PYTHON=${PYTHONBIN:Q}
PYTHON_VERSIONS_INCOMPATIBLE= 34 35 36 # not yet ported as of 1.12.9
.include "../../lang/python/application.mk"
-.include "../../devel/py-gobject3/buildlink3.mk"
#CONFIGURE_ARGS+= --with-gnome
@@ -54,5 +54,4 @@ BUILDLINK_API_DEPENDS.libxml2+= libxml2>=2.4.12
BUILDLINK_API_DEPENDS.gtk3+= gtk3+>=3.8.7
.include "../../x11/gtk3/buildlink3.mk"
.include "../../sysutils/desktop-file-utils/desktopdb.mk"
-
.include "../../mk/bsd.pkg.mk"
diff --git a/multimedia/py-gstreamer1/Makefile b/multimedia/py-gstreamer1/Makefile
index 1d3be594fab..71f1234ce7d 100644
--- a/multimedia/py-gstreamer1/Makefile
+++ b/multimedia/py-gstreamer1/Makefile
@@ -1,15 +1,17 @@
-# $NetBSD: Makefile,v 1.8 2018/01/28 19:37:14 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2018/04/14 12:24:32 adam Exp $
-DISTNAME= gst-python-1.12.4
-PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/gst-python/gstreamer1/}
-CATEGORIES= multimedia
-MASTER_SITES= https://gstreamer.freedesktop.org/src/gst-python/
-EXTRACT_SUFX= .tar.xz
+DISTNAME= gst-python-1.12.4
+PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/gst-python/gstreamer1/}
+CATEGORIES= multimedia
+MASTER_SITES= https://gstreamer.freedesktop.org/src/gst-python/
+EXTRACT_SUFX= .tar.xz
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= https://gstreamer.freedesktop.org/
-COMMENT= Python bindings for gstreamer1
-LICENSE= gnu-lgpl-v2.1
+MAINTAINER= pkgsrc-users@NetBSD.org
+HOMEPAGE= https://gstreamer.freedesktop.org/
+COMMENT= Python bindings for gstreamer1
+LICENSE= gnu-lgpl-v2.1
+
+DEPENDS+= ${PYPKGPREFIX}-gobject3-[0-9]*:../../devel/py-gobject3
USE_LIBTOOL= yes
USE_TOOLS+= pkg-config gmake
@@ -22,7 +24,5 @@ CONFIGURE_ENV.SunOS+= ac_cv_prog_cc_c99=no
BUILDLINK_API_DEPENDS.gstreamer1+= gstreamer1>=1.12.0
.include "../../multimedia/gstreamer1/buildlink3.mk"
.include "../../multimedia/gst-plugins1-base/buildlink3.mk"
-.include "../../lang/python/application.mk"
.include "../../lang/python/extension.mk"
-.include "../../devel/py-gobject3/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/net/syncthing-gtk/Makefile b/net/syncthing-gtk/Makefile
index 1657ca9d88f..16fd8bc4636 100644
--- a/net/syncthing-gtk/Makefile
+++ b/net/syncthing-gtk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2018/03/12 11:17:23 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2018/04/14 12:24:31 adam Exp $
DISTNAME= syncthing-gtk-0.9.2.3
PKGREVISION= 4
@@ -14,6 +14,7 @@ LICENSE= gnu-gpl-v2
DEPENDS+= syncthing>=0.13.0:../../net/syncthing
DEPENDS+= psmisc-[0-9]*:../../sysutils/psmisc # for killall
DEPENDS+= ${PYPKGPREFIX}-dateutil-[0-9]*:../../time/py-dateutil
+DEPENDS+= ${PYPKGPREFIX}-gobject3-[0-9]*:../../devel/py-gobject3
PYTHON_VERSIONS_ACCEPTED= 27
EGG_NAME= ${DISTNAME:S/0/v0/:S/-/_/}
@@ -32,7 +33,6 @@ SUBST_SED.paths= -e 's|/usr/share/syncthing-gtk|${PREFIX}/share/syncthing-gtk|'
BUILDLINK_ABI_DEPENDS.libnotify+= libnotify>=0.7.6nb4
.include "../../sysutils/libnotify/buildlink3.mk"
-.include "../../devel/py-gobject3/buildlink3.mk"
BUILDLINK_API_DEPENDS.librsvg+= librsvg>=2.40.9nb2 # for introspection
.include "../../graphics/librsvg/buildlink3.mk"
.include "../../lang/python/application.mk"
diff --git a/x11/mate-applets/Makefile b/x11/mate-applets/Makefile
index acf37750c3a..44f2299a3d6 100644
--- a/x11/mate-applets/Makefile
+++ b/x11/mate-applets/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2018/04/14 07:34:45 adam Exp $
+# $NetBSD: Makefile,v 1.13 2018/04/14 12:24:32 adam Exp $
PYTHON_VERSIONS_ACCEPTED= 27
PKGREVISION= 5
@@ -9,6 +9,7 @@ CATEGORIES= x11
COMMENT= MATE panel applets
+DEPENDS+= ${PYPKGPREFIX}-gobject3-[0-9]*:../../devel/py-gobject3
TOOL_DEPENDS+= itstool-[0-9]*:../../textproc/itstool
TOOL_DEPENDS+= libxml2-[0-9]*:../../textproc/libxml2 # for xmllint
@@ -38,7 +39,6 @@ PLIST.batt= yes
REPLACE_PYTHON+= invest-applet/invest/chart.py
REPLACE_PYTHON+= invest-applet/invest/invest-applet.py
REPLACE_PYTHON+= invest-applet/invest/mate-invest-chart
-.include "../../lang/python/application.mk"
.include "../../x11/mate-panel/buildlink3.mk"
.include "../../x11/mate-desktop/buildlink3.mk"
@@ -47,7 +47,6 @@ REPLACE_PYTHON+= invest-applet/invest/mate-invest-chart
.include "../../devel/glib2/buildlink3.mk"
.include "../../devel/libglade/buildlink3.mk"
.include "../../devel/libwnck3/buildlink3.mk"
-.include "../../devel/py-gobject3/buildlink3.mk"
.include "../../fonts/gucharmap/buildlink3.mk"
.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
.include "../../textproc/libxml2/buildlink3.mk"
@@ -58,5 +57,6 @@ REPLACE_PYTHON+= invest-applet/invest/mate-invest-chart
.include "../../x11/gtksourceview3/buildlink3.mk"
.include "../../x11/libxklavier/buildlink3.mk"
PY_PATCHPLIST= yes
+.include "../../lang/python/application.mk"
.include "../../lang/python/extension.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/x11/mozo/Makefile b/x11/mozo/Makefile
index d4f580b0dec..490feeca510 100644
--- a/x11/mozo/Makefile
+++ b/x11/mozo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2018/03/12 11:17:54 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2018/04/14 12:24:32 adam Exp $
PKGREVISION= 2
.include "../../meta-pkgs/mate/Makefile.common"
@@ -8,15 +8,14 @@ CATEGORIES= x11
COMMENT= Menu editor for MATE
-DEPENDS+= ${PYPKGPREFIX}-gtk2>=2.13.0:../../x11/py-gtk2
+DEPENDS+= ${PYPKGPREFIX}-gobject3-[0-9]*:../../devel/py-gobject3
+DEPENDS+= ${PYPKGPREFIX}-gtk2>=2.13.0:../../x11/py-gtk2
PYTHON_VERSIONS_INCOMPATIBLE= 34 35 36 # py-gtk2
PY_PATCHPLIST= yes
.include "../../sysutils/desktop-file-utils/desktopdb.mk"
.include "../../x11/mate-menus/buildlink3.mk"
-.include "../../devel/py-gobject3/buildlink3.mk"
.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
-.include "../../lang/python/application.mk"
.include "../../lang/python/extension.mk"
.include "../../mk/bsd.pkg.mk"