diff --git a/databases/recoll/Makefile b/databases/recoll/Makefile index 8acaa16b992..2fe704faafe 100644 --- a/databases/recoll/Makefile +++ b/databases/recoll/Makefile @@ -38,9 +38,7 @@ MODULES= devel/meson \ x11/qt6 MODPY_ADJ_FILES=filters/*.py filters/rclepub -BUILD_DEPENDS= devel/cmake/core \ - devel/gmake \ - devel/py-setuptools \ +BUILD_DEPENDS= devel/py-setuptools \ textproc/aspell/core LIB_DEPENDS-main= databases/xapian-core \ @@ -61,13 +59,8 @@ LIB_DEPENDS-gui= ${FULLPKGNAME-main}:${FULLPKGPATH-main} \ CONFIGURE_ENV= QMAKE="${MODQT_QMAKE}" MAKE_ENV= MAKE_JOBS=${MAKE_JOBS} \ - MAKE=gmake \ QMAKE="${MODQT_QMAKE}" -# #CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib" \ -# export QMAKE=qmake6 -# export MAKE="gmake" - CONFIGURE_ARGS= -Dpython-aspell=false \ -Dpython-chm=false \ -Dinotify=false \ diff --git a/devel/libgit2/libgit2-glib/Makefile b/devel/libgit2/libgit2-glib/Makefile index 77df3e2af9c..630bfebf78f 100644 --- a/devel/libgit2/libgit2-glib/Makefile +++ b/devel/libgit2/libgit2-glib/Makefile @@ -24,8 +24,6 @@ LIB_DEPENDS= devel/libgit2/libgit2 # MODPY_LIBDIR/gi/overrides/ RUN_DEPENDS= devel/py-gobject3 -USE_GMAKE= Yes - WANTLIB += gio-2.0 git2 glib-2.0 gobject-2.0 .include diff --git a/graphics/cairo/Makefile b/graphics/cairo/Makefile index 95e1abcf4ff..179d31b723a 100644 --- a/graphics/cairo/Makefile +++ b/graphics/cairo/Makefile @@ -30,8 +30,6 @@ WANTLIB += z MODULES= devel/meson \ x11/gnome -USE_GMAKE= Yes - LIB_DEPENDS= archivers/lzo2 \ devel/glib2 \ graphics/png diff --git a/net/telepathy/Makefile.inc b/net/telepathy/Makefile.inc index 2f090159ce9..137053df134 100644 --- a/net/telepathy/Makefile.inc +++ b/net/telepathy/Makefile.inc @@ -18,6 +18,4 @@ PERMIT_PACKAGE?= Yes MAINTAINER ?= Antoine Jacoutot -USE_GMAKE?= Yes - CONFIGURE_STYLE?=gnu diff --git a/net/telepathy/telepathy-glib/Makefile b/net/telepathy/telepathy-glib/Makefile index 25f89c59489..854b5eb9930 100644 --- a/net/telepathy/telepathy-glib/Makefile +++ b/net/telepathy/telepathy-glib/Makefile @@ -18,6 +18,8 @@ MODPY_RUNDEP= No # https://bugs.freedesktop.org/show_bug.cgi?id=76495 MODPY_ADJ_FILES= tests/all-errors-documented.py +USE_GMAKE= Yes + BUILD_DEPENDS= devel/gobject-introspection>=1.30.0 \ lang/vala \ textproc/libxslt @@ -25,6 +27,5 @@ LIB_DEPENDS= x11/dbus-glib CONFIGURE_ARGS+= --enable-introspection \ --enable-vala-bindings -#CONFIGURE_ARGS+= --enable-backtrace (add -llibexecinfo) .include diff --git a/net/telepathy/telepathy-idle/Makefile b/net/telepathy/telepathy-idle/Makefile index 53efc7d989d..76c1c68e36a 100644 --- a/net/telepathy/telepathy-idle/Makefile +++ b/net/telepathy/telepathy-idle/Makefile @@ -13,6 +13,8 @@ MODULES= lang/python MODPY_RUNDEP= No +USE_GMAKE= Yes + BUILD_DEPENDS= devel/gettext,-tools \ devel/py-twisted \ textproc/libxslt diff --git a/net/telepathy/telepathy-logger/Makefile b/net/telepathy/telepathy-logger/Makefile index cc3b9582fc6..0bfe223fc57 100644 --- a/net/telepathy/telepathy-logger/Makefile +++ b/net/telepathy/telepathy-logger/Makefile @@ -20,6 +20,8 @@ MODULES= devel/dconf \ MODPY_RUNDEP= No +USE_GMAKE= Yes + BUILD_DEPENDS= devel/gobject-introspection \ devel/py-twisted \ textproc/libxslt diff --git a/net/telepathy/telepathy-mission-control/Makefile b/net/telepathy/telepathy-mission-control/Makefile index 2cba8ab48de..8b5475119e1 100644 --- a/net/telepathy/telepathy-mission-control/Makefile +++ b/net/telepathy/telepathy-mission-control/Makefile @@ -18,6 +18,8 @@ MODULES= devel/dconf \ MODPY_RUNDEP= No +USE_GMAKE= Yes + BUILD_DEPENDS= textproc/libxslt LIB_DEPENDS= net/telepathy/telepathy-glib>=0.18.0