From f5c5712d45bc037567fa232389a5f66678dc063f Mon Sep 17 00:00:00 2001 From: ajacoutot Date: Sat, 5 Nov 2022 17:10:20 +0000 Subject: [PATCH] WANTLIB: pcre -> pcre2-8 after recent glib2 update. --- devel/gwenhywfar/Makefile | 6 +++--- editors/tpad/Makefile | 21 ++++++++++----------- games/stepmania/Makefile | 3 +++ lang/apl/Makefile | 4 ++-- multimedia/libde265/Makefile | 4 +++- net/bitcoin/Makefile | 4 ++-- security/gpgme/Makefile | 4 +++- security/gpgme/pkg/PLIST-qt | 1 - textproc/pdfgrep/Makefile | 4 +++- www/bluefish/Makefile | 4 ++-- x11/mate/terminal/Makefile | 4 ++-- x11/vlc/Makefile | 4 ++-- x11/xfce4/terminal/Makefile | 3 ++- 13 files changed, 37 insertions(+), 29 deletions(-) diff --git a/devel/gwenhywfar/Makefile b/devel/gwenhywfar/Makefile index 20f393e70d2..b3cf570880c 100644 --- a/devel/gwenhywfar/Makefile +++ b/devel/gwenhywfar/Makefile @@ -1,7 +1,7 @@ COMMENT= helper library for networking and security applications DISTNAME= gwenhywfar-5.4.0 -REVISION= 0 +REVISION= 1 SHARED_LIBS += gwenhywfar 2.1 # 83.0 SHARED_LIBS += gwengui-cpp 1.0 # 83.0 @@ -22,9 +22,9 @@ WANTLIB += cairo-gobject crypto double-conversion drm epoxy execinfo WANTLIB += expat ffi fontconfig freetype fribidi gcrypt gdk-3 WANTLIB += gdk_pixbuf-2.0 gio-2.0 glapi glib-2.0 gmodule-2.0 gmp WANTLIB += gnutls gobject-2.0 gpg-error graphite2 gthread-2.0 -WANTLIB += gtk-3 harfbuzz hogweed iconv icudata icui18n icuio +WANTLIB += gtk-3 harfbuzz hogweed iconv icudata icui18n WANTLIB += icuuc idn2 intl m nettle p11-kit pango-1.0 pangocairo-1.0 -WANTLIB += pangoft2-1.0 pcre pcre2-16 pixman-1 png ssl tasn1 unistring +WANTLIB += pangoft2-1.0 pcre2-8 pcre2-16 pixman-1 png ssl tasn1 unistring WANTLIB += xcb xcb-dri2 xcb-dri3 xcb-glx xcb-present xcb-render WANTLIB += xcb-shm xcb-sync xcb-xfixes xshmfence z zstd WANTLIB += Xau Xdmcp brotlidec brotlienc jpeg diff --git a/editors/tpad/Makefile b/editors/tpad/Makefile index 5adfcb609fd..2a05a163085 100644 --- a/editors/tpad/Makefile +++ b/editors/tpad/Makefile @@ -1,23 +1,22 @@ COMMENT = simple, fast GTK-based text editor DISTNAME = tpad-5.7.1.3 CATEGORIES = editors x11 -REVISION = 11 +REVISION = 12 HOMEPAGE = https://launchpad.net/tpad-project/ # GPLv3+ PERMIT_PACKAGE = Yes -WANTLIB += X11 Xcomposite Xcursor Xdamage Xext Xfixes Xi Xinerama -WANTLIB += Xrandr Xrender aspell atk-1.0 atk-bridge-2.0 atspi -WANTLIB += c cairo cairo-gobject dbus-1 enchant-2 epoxy expat -WANTLIB += ffi fontconfig freetype fribidi gdk-3 gdk_pixbuf-2.0 -WANTLIB += gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 graphite2 -WANTLIB += gthread-2.0 gtk-3 gtksourceview-3.0 gtkspell3-3 gucharmap_2_90 -WANTLIB += harfbuzz iconv intl lzma m magic pango-1.0 pangocairo-1.0 -WANTLIB += pangoft2-1.0 pcre pixman-1 png pthread xcb xcb-render -WANTLIB += xcb-shm xml2 z Xau Xdmcp execinfo jpeg pcre2-8 -WANTLIB += ${COMPILER_LIBCXX} +WANTLIB += ${COMPILER_LIBCXX} X11 Xau Xcomposite Xcursor Xdamage +WANTLIB += Xdmcp Xext Xfixes Xi Xinerama Xrandr Xrender aspell +WANTLIB += atk-1.0 atk-bridge-2.0 c cairo cairo-gobject enchant-2 +WANTLIB += epoxy execinfo expat ffi fontconfig freetype fribidi +WANTLIB += gdk-3 gdk_pixbuf-2.0 gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 +WANTLIB += graphite2 gtk-3 gtksourceview-3.0 gtkspell3-3 gucharmap_2_90 +WANTLIB += harfbuzz iconv intl jpeg lzma m magic pango-1.0 pangocairo-1.0 +WANTLIB += pangoft2-1.0 pcre2-8 pixman-1 png xcb xcb-render xcb-shm +WANTLIB += xml2 z MASTER_SITES = https://launchpad.net/tpad-project/4.0/4.0/+download/ diff --git a/games/stepmania/Makefile b/games/stepmania/Makefile index 8921719cb27..58102c1927f 100644 --- a/games/stepmania/Makefile +++ b/games/stepmania/Makefile @@ -6,6 +6,8 @@ CATEGORIES = games emulators DISTNAME = stepmania-5.0.12 HOMEPAGE = http://www.stepmania.com +REVISION = 0 + GH_ACCOUNT = stepmania GH_PROJECT = stepmania GH_TAGNAME = v5.0.12 @@ -34,6 +36,7 @@ COMPILER = base-clang ports-gcc base-gcc LIB_DEPENDS = audio/libvorbis \ audio/libmad \ + devel/pcre \ graphics/ffmpeg \ audio/pulseaudio diff --git a/lang/apl/Makefile b/lang/apl/Makefile index 746b1013104..377603f2486 100644 --- a/lang/apl/Makefile +++ b/lang/apl/Makefile @@ -1,6 +1,6 @@ COMMENT = interpreter for the programming language APL DISTNAME = apl-1.8 -REVISION = 1 +REVISION = 2 CATEGORIES = lang SHARED_LIBS += _sql 0.0 # 0.0 @@ -18,7 +18,7 @@ WANTLIB += c cairo cairo-gobject curses epoxy execinfo expat ffi WANTLIB += fftw3 fontconfig freetype fribidi gdk-3 gdk_pixbuf-2.0 WANTLIB += gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 graphite2 WANTLIB += gtk-3 harfbuzz iconv intl m pango-1.0 pangocairo-1.0 -WANTLIB += pangoft2-1.0 pcre pcre2-32 pixman-1 png xcb xcb-render +WANTLIB += pangoft2-1.0 pcre2-8 pcre2-32 pixman-1 png xcb xcb-render WANTLIB += xcb-shm z Xau Xdmcp jpeg DEBUG_PACKAGES = ${BUILD_PACKAGES} diff --git a/multimedia/libde265/Makefile b/multimedia/libde265/Makefile index 97b31301f92..8e3187765ae 100644 --- a/multimedia/libde265/Makefile +++ b/multimedia/libde265/Makefile @@ -6,6 +6,8 @@ DISTNAME= libde265-$V PKGNAME-main= ${DISTNAME} PKGNAME-tools= libde265-tools-$V +REVISION-tools= 0 + SHARED_LIBS += de265 1.0 # 0.12 CATEGORIES= multimedia @@ -22,7 +24,7 @@ WANTLIB-tools += GL Qt5Core Qt5Gui Qt5Widgets SDL X11 X11-xcb Xau WANTLIB-tools += Xdmcp Xext Xfixes Xxf86vm avutil c de265 double-conversion WANTLIB-tools += drm execinfo expat freetype glapi glib-2.0 graphite2 WANTLIB-tools += gthread-2.0 harfbuzz iconv icudata icui18n icuuc -WANTLIB-tools += intl pcre pcre2-16 png sndio swscale usbhid xcb xcb-dri2 +WANTLIB-tools += intl pcre2-8 pcre2-16 png sndio swscale usbhid xcb xcb-dri2 WANTLIB-tools += xcb-dri3 xcb-glx xcb-present xcb-sync xcb-xfixes xshmfence WANTLIB-tools += z zstd xcb-shm diff --git a/net/bitcoin/Makefile b/net/bitcoin/Makefile index 2edd6f7e577..cfdada8eccc 100644 --- a/net/bitcoin/Makefile +++ b/net/bitcoin/Makefile @@ -6,7 +6,7 @@ GH_ACCOUNT = bitcoin GH_PROJECT = bitcoin GH_TAGNAME = v0.21.2 -REVISION = 0 +REVISION = 1 SHARED_LIBS += bitcoinconsensus 4.0 # 0.0 SHARED_LIBS += secp256k1 0.1 # 0.0 @@ -62,7 +62,7 @@ WANTLIB += GL Qt5Core Qt5DBus Qt5Gui Qt5Network Qt5Widgets X11 WANTLIB += X11-xcb Xau Xdmcp Xext Xfixes Xxf86vm crypto dbus-1 WANTLIB += double-conversion drm execinfo expat freetype glapi WANTLIB += glib-2.0 graphite2 gthread-2.0 harfbuzz iconv icudata -WANTLIB += icui18n icuuc intl miniupnpc pcre pcre2-16 png qrencode +WANTLIB += icui18n icuuc intl miniupnpc pcre2-8 pcre2-16 png qrencode WANTLIB += ssl xcb xcb-dri2 xcb-dri3 xcb-glx xcb-present xcb-shm WANTLIB += xcb-sync xcb-xfixes xshmfence zstd diff --git a/security/gpgme/Makefile b/security/gpgme/Makefile index 19adfaa945e..cc047e2b853 100644 --- a/security/gpgme/Makefile +++ b/security/gpgme/Makefile @@ -6,6 +6,8 @@ DISTNAME = gpgme-${VERSION} PKGNAME-main = gpgme-${VERSION} PKGNAME-qt = gpgme-qt-${VERSION} +REVISION-qt = 0 + CATEGORIES = security devel SHARED_LIBS += gpgme 24.0 # 37.0 @@ -24,7 +26,7 @@ WANTLIB = assuan gpg-error iconv intl WANTLIB-main = ${WANTLIB} c m WANTLIB-qt = ${COMPILER_LIBCXX} ${WANTLIB} Qt5Core double-conversion WANTLIB-qt += execinfo glib-2.0 gpgme gthread-2.0 icudata icui18n icuuc -WANTLIB-qt += m pcre pcre2-16 z zstd +WANTLIB-qt += m pcre2-8 pcre2-16 z zstd COMPILER = base-clang ports-gcc diff --git a/security/gpgme/pkg/PLIST-qt b/security/gpgme/pkg/PLIST-qt index 1a56c2ae5de..dbcb07ef0bc 100644 --- a/security/gpgme/pkg/PLIST-qt +++ b/security/gpgme/pkg/PLIST-qt @@ -134,7 +134,6 @@ include/qgpgme/verifyopaquejob.h include/qgpgme/wkdlookupjob.h include/qgpgme/wkdlookupresult.h include/qgpgme/wkspublishjob.h -lib/cmake/ lib/cmake/Gpgmepp/ lib/cmake/Gpgmepp/GpgmeppConfig.cmake lib/cmake/Gpgmepp/GpgmeppConfigVersion.cmake diff --git a/textproc/pdfgrep/Makefile b/textproc/pdfgrep/Makefile index 2b5f0635a57..9a0af2ce79d 100644 --- a/textproc/pdfgrep/Makefile +++ b/textproc/pdfgrep/Makefile @@ -1,6 +1,7 @@ COMMENT = tool to search text in PDF files DISTNAME = pdfgrep-2.1.2 +REVISION = 0 CATEGORIES = textproc @@ -19,7 +20,8 @@ WANTLIB += c m pthread poppler-cpp pcre gcrypt gpg-error MASTER_SITES = https://pdfgrep.org/download/ -LIB_DEPENDS = print/poppler \ +LIB_DEPENDS = devel/pcre \ + print/poppler \ security/libgcrypt TEST_DEPENDS = devel/dejagnu \ print/texlive/base diff --git a/www/bluefish/Makefile b/www/bluefish/Makefile index db256d088ef..f34ebd035f6 100644 --- a/www/bluefish/Makefile +++ b/www/bluefish/Makefile @@ -2,7 +2,7 @@ COMMENT= HTML editor for experienced web designers MODPY_VERSION=3.10 DISTNAME= bluefish-2.2.12 -REVISION= 2 +REVISION= 3 CATEGORIES= www editors @@ -17,7 +17,7 @@ WANTLIB += c cairo cairo-gobject enchant-2 epoxy expat ffi fontconfig WANTLIB += freetype fribidi gdk-3 gdk_pixbuf-2.0 gio-2.0 glib-2.0 WANTLIB += gmodule-2.0 gobject-2.0 graphite2 gthread-2.0 gtk-3 WANTLIB += gucharmap_2_90 harfbuzz iconv intl lzma m pango-1.0 -WANTLIB += pangocairo-1.0 pangoft2-1.0 pcre pixman-1 png ${MODPY_WANTLIB} +WANTLIB += pangocairo-1.0 pangoft2-1.0 pixman-1 png ${MODPY_WANTLIB} WANTLIB += util xcb xcb-render xcb-shm xml2 z Xau Xdmcp execinfo jpeg pcre2-8 MASTER_SITES= https://www.bennewitz.com/bluefish/stable/source/ diff --git a/x11/mate/terminal/Makefile b/x11/mate/terminal/Makefile index db58f36c3ea..4c012ef578e 100644 --- a/x11/mate/terminal/Makefile +++ b/x11/mate/terminal/Makefile @@ -1,5 +1,5 @@ COMMENT= MATE terminal -REVISION= 0 +REVISION= 1 MATE_PROJECT= mate-terminal @@ -12,7 +12,7 @@ WANTLIB += dconf epoxy expat ffi fontconfig freetype fribidi gdk-3 WANTLIB += gdk_pixbuf-2.0 gio-2.0 glib-2.0 gmodule-2.0 gmp gnutls WANTLIB += gobject-2.0 graphite2 gthread-2.0 gtk-3 harfbuzz hogweed WANTLIB += iconv idn2 intl m nettle p11-kit pango-1.0 pangocairo-1.0 -WANTLIB += pangoft2-1.0 pcre pcre2-8 pixman-1 png pthread tasn1 +WANTLIB += pangoft2-1.0 pcre2-8 pixman-1 png pthread tasn1 WANTLIB += unistring vte-2.91 xcb xcb-render xcb-shm z WANTLIB += ${COMPILER_LIBCXX} execinfo icudata icuuc jpeg Xau Xdmcp WANTLIB += brotlidec brotlienc zstd diff --git a/x11/vlc/Makefile b/x11/vlc/Makefile index 33fca12bcbd..1f626e36d54 100644 --- a/x11/vlc/Makefile +++ b/x11/vlc/Makefile @@ -2,7 +2,7 @@ COMMENT-main= VideoLAN client; multimedia player COMMENT-jack= JACK audio output module for VLC V= 3.0.17.3 -REVISION-main= 0 +REVISION-main= 1 DISTNAME= vlc-${V} PKGNAME-main= ${DISTNAME} PKGNAME-jack= vlc-jack-${V} @@ -34,7 +34,7 @@ WANTLIB-main= EGL GL ICE Qt5Core Qt5Gui Qt5Svg Qt5Widgets Qt5X11Extras \ gobject-2.0 gpg-error graphite2 gsm gthread-2.0 gtk-3 harfbuzz \ hogweed icudata icui18n icuuc idn2 jpeg lcms2 lz4 lzma \ matroska mp3lame nettle nfs notify ogg opus p11-kit \ - pango-1.0 pangocairo-1.0 pangoft2-1.0 pcre pcre2-16 \ + pango-1.0 pangocairo-1.0 pangoft2-1.0 pcre2-8 pcre2-16 \ pixman-1 placebo png postproc protobuf-lite rsvg-2 \ smb2 sndio soxr speex speexdsp ssl swresample swscale \ tag tar tasn1 theoradec theoraenc tiff udfread unistring \ diff --git a/x11/xfce4/terminal/Makefile b/x11/xfce4/terminal/Makefile index 784645abd39..6f240d42839 100644 --- a/x11/xfce4/terminal/Makefile +++ b/x11/xfce4/terminal/Makefile @@ -2,6 +2,7 @@ COMMENT= Xfce4 vte-based terminal XFCE_VERSION= 1.0.4 XFCE_GOODIE= xfce4-terminal +REVISION= 0 # GPLv2 PERMIT_PACKAGE= Yes @@ -21,7 +22,7 @@ WANTLIB += fontconfig freetype fribidi gdk-3 gdk_pixbuf-2.0 gio-2.0 WANTLIB += glib-2.0 gmodule-2.0 gmp gnutls gobject-2.0 graphite2 WANTLIB += gthread-2.0 gtk-3 harfbuzz hogweed iconv icudata icuuc WANTLIB += idn2 intl m nettle p11-kit pango-1.0 pangocairo-1.0 -WANTLIB += pangoft2-1.0 pcre pcre2-8 pixman-1 png startup-notification-1 +WANTLIB += pangoft2-1.0 pcre2-8 pixman-1 png startup-notification-1 WANTLIB += tasn1 unistring vte-2.91 xcb xcb-render xcb-shm xcb-util WANTLIB += xfce4kbd-private-3 xfce4ui-2 xfce4util xfconf-0 z execinfo jpeg WANTLIB += brotlidec brotlienc zstd