From 73cc57aece1aa5c49d2cc1c4252af43ed806b79d Mon Sep 17 00:00:00 2001 From: sebastia Date: Sun, 1 Feb 2026 19:06:45 +0000 Subject: [PATCH] bump dependent ports after libobjc2 update, while there, straighten some WANTLIB as well --- devel/libproplist/Makefile | 2 +- games/oolite/Makefile | 2 +- net/openvpn-auth-ldap/Makefile | 2 +- www/sogo/Makefile | 1 + www/sope/Makefile | 1 + x11/gnustep/back/Makefile | 5 +++-- x11/gnustep/base/Makefile | 6 +++--- x11/gnustep/camerakit/Makefile | 4 ++-- x11/gnustep/databasinkit/Makefile | 4 ++-- x11/gnustep/gnumail/Makefile | 4 ++-- x11/gnustep/gnustep.port.mk | 3 ++- x11/gnustep/highlighterkit/Makefile | 4 ++-- x11/gnustep/make/Makefile | 5 ++--- x11/gnustep/matharray/Makefile | 4 ++-- x11/gnustep/netclasses/Makefile | 4 ++-- x11/gnustep/pantomime/Makefile | 4 ++-- x11/gnustep/pcapkit/Makefile | 4 ++-- x11/gnustep/pdfkit/Makefile | 4 ++-- x11/gnustep/performance/Makefile | 4 ++-- x11/gnustep/projectcenter/Makefile | 3 +-- x11/gnustep/rsskit/Makefile | 4 ++-- x11/gnustep/webserver/Makefile | 4 ++-- x11/gnustep/webservices/Makefile | 4 ++-- 23 files changed, 42 insertions(+), 40 deletions(-) diff --git a/devel/libproplist/Makefile b/devel/libproplist/Makefile index a53fa0ccab1..7705294e8d4 100644 --- a/devel/libproplist/Makefile +++ b/devel/libproplist/Makefile @@ -3,7 +3,7 @@ COMMENT= GNUstep/OPENSTEP property lists compatibility library V= 0.10.1 DISTNAME= libPropList-${V} PKGNAME= libproplist-${V} -REVISION= 3 +REVISION= 4 SHARED_LIBS= PropList 2.2 MODGNU_SHARED_LIBS= PropList '' diff --git a/games/oolite/Makefile b/games/oolite/Makefile index 285aee3c0be..fc27826070e 100644 --- a/games/oolite/Makefile +++ b/games/oolite/Makefile @@ -1,7 +1,7 @@ COMMENT= space combat and trading game in the style of Elite VERSION= 1.73.4 -REVISION = 20 +REVISION = 21 DISTNAME= oolite-dev-source-${VERSION} PKGNAME= oolite-${VERSION} CATEGORIES= games diff --git a/net/openvpn-auth-ldap/Makefile b/net/openvpn-auth-ldap/Makefile index f8a25dffec9..9bf734ebf5a 100644 --- a/net/openvpn-auth-ldap/Makefile +++ b/net/openvpn-auth-ldap/Makefile @@ -1,7 +1,7 @@ COMMENT = LDAP authentication plugin for OpenVPN 2.x VERSION = 2.0.4 -REVISION = 3 +REVISION = 5 GH_ACCOUNT = threerings GH_PROJECT = openvpn-auth-ldap GH_TAGNAME = auth-ldap-${VERSION} diff --git a/www/sogo/Makefile b/www/sogo/Makefile index 795e6fc33db..61079dea175 100644 --- a/www/sogo/Makefile +++ b/www/sogo/Makefile @@ -1,5 +1,6 @@ COMMENT = web based groupware server +REVISION = 0 VERSION = 5.11.2 DISTNAME = SOGo-${VERSION} PKGNAME = sogo-${VERSION} diff --git a/www/sope/Makefile b/www/sope/Makefile index 3cb2d5f6d47..bb37bb480c0 100644 --- a/www/sope/Makefile +++ b/www/sope/Makefile @@ -1,3 +1,4 @@ +REVISION = 0 COMMENT-main= Skyrix Object Publishing Environment COMMENT-mysql= SOPE MySQL adaptor COMMENT-postgres= SOPE PostgreSQL adaptor diff --git a/x11/gnustep/back/Makefile b/x11/gnustep/back/Makefile index 57994edb7d2..6aac533039a 100644 --- a/x11/gnustep/back/Makefile +++ b/x11/gnustep/back/Makefile @@ -1,5 +1,6 @@ COMMENT= GNUstep gui backend +REVISION= 0 GH_TAGNAME= 0.32.0 GH_ACCOUNT= gnustep GH_PROJECT= libs-back @@ -15,8 +16,8 @@ MODULES = x11/gnustep MODGNUSTEP_NEEDS_BACK= No WANTLIB += Xft Xrender cairo Xfixes Xcursor fontconfig -WANTLIB += freetype GL X11 Xext Xmu Xt z Xrandr -WANTLIB += ${COMPILER_LIBCXX} +WANTLIB += freetype GL X11 Xext Xmu Xt Xrandr +WANTLIB += ${COMPILER_LIBCXX} LIB_DEPENDS= graphics/cairo diff --git a/x11/gnustep/base/Makefile b/x11/gnustep/base/Makefile index e5cb694e18a..cbbdb4e5617 100644 --- a/x11/gnustep/base/Makefile +++ b/x11/gnustep/base/Makefile @@ -1,5 +1,6 @@ COMMENT= GNUstep base library +REVISION = 0 GH_TAGNAME= 1.31.1 GH_ACCOUNT= gnustep GH_PROJECT= libs-base @@ -15,7 +16,7 @@ HOMEPAGE= http://www.gnustep.org/ WANTLIB += avahi-client avahi-common c ffi gmp gnutls iberty iconv icudata WANTLIB += curl icui18n icuuc m objc2 pthread xml2 xslt z zstd -WANTLIB += ${COMPILER_LIBCXX} +WANTLIB += ${COMPILER_LIBCXX} BlocksRuntime dispatch .if ${MACHINE_ARCH} != "i386" && ${MACHINE_ARCH} != "amd64" WANTLIB += iberty @@ -42,8 +43,7 @@ WRKDIST= ${WRKDIR}/${DISTNAME} CONFIGURE_STYLE=gnu CONFIGURE_ENV= ac_cv_header_execinfo_h=false -CONFIGURE_ARGS += --disable-libdispatch \ - --disable-procfs \ +CONFIGURE_ARGS += --disable-procfs \ --disable-procfs-psinfo MAKE_FLAGS += libgnustep-base_INTERFACE_VERSION=${LIBgnustep-base_VERSION} diff --git a/x11/gnustep/camerakit/Makefile b/x11/gnustep/camerakit/Makefile index a0124ae21ac..eea8292a992 100644 --- a/x11/gnustep/camerakit/Makefile +++ b/x11/gnustep/camerakit/Makefile @@ -1,7 +1,7 @@ COMMENT = GNUstep wrapper around libgphoto2 V = 20041011 -REVISION = 13 +REVISION = 14 DISTNAME = CameraKit-${V} PKGNAME = gnustep-camerakit-${V} EXTRACT_SUFX = .tar.bz2 @@ -13,7 +13,7 @@ HOMEPAGE = http://home.gna.org/gsimageapps/ SITES = http://download.gna.org/gsimageapps/ MODULES = x11/gnustep -WANTLIB = pthread gphoto2 +WANTLIB = pthread gphoto2 c++abi objc2 LIB_DEPENDS = graphics/libgphoto2 MODGNUSTEP_IS_FRAMEWORK = Yes diff --git a/x11/gnustep/databasinkit/Makefile b/x11/gnustep/databasinkit/Makefile index db3771a10ec..c2c97b71443 100644 --- a/x11/gnustep/databasinkit/Makefile +++ b/x11/gnustep/databasinkit/Makefile @@ -1,7 +1,7 @@ COMMENT = GNUstep client framework for salesforce.com VERSION = 1.0 -REVISION = 5 +REVISION = 6 DISTNAME = DataBasinKit-${VERSION} SHARED_LIBS += DataBasinKit 0.2 @@ -12,7 +12,7 @@ SITES = ${SITE_SAVANNAH:=gap/} MODULES = x11/gnustep MODGNUSTEP_IS_FRAMEWORK = Yes -WANTLIB += pthread WebServices +WANTLIB += pthread WebServices c++abi objc2 BUILD_DEPENDS += x11/gnustep/gui LIB_DEPENDS += x11/gnustep/webservices diff --git a/x11/gnustep/gnumail/Makefile b/x11/gnustep/gnumail/Makefile index 36d3c8da7f2..9ad7fde59f9 100644 --- a/x11/gnustep/gnumail/Makefile +++ b/x11/gnustep/gnumail/Makefile @@ -4,11 +4,11 @@ DISTNAME = GNUMail-1.4.0 SHLIB_VERSION = 3.0 SHARED_LIBS = GNUMail ${SHLIB_VERSION} CATEGORIES= mail -REVISION = 0 +REVISION = 1 HOMEPAGE= https://savannah.nongnu.org/projects/gnustep-nonfsf/ -WANTLIB += crypto ssl AddressView Addresses Pantomime +WANTLIB += AddressView Addresses Pantomime WANTLIB += ${COMPILER_LIBCXX} SITES= https://download.savannah.nongnu.org/releases/gnustep-nonfsf/ diff --git a/x11/gnustep/gnustep.port.mk b/x11/gnustep/gnustep.port.mk index 9c9119527c4..68583932a7a 100644 --- a/x11/gnustep/gnustep.port.mk +++ b/x11/gnustep/gnustep.port.mk @@ -40,6 +40,7 @@ MODGNUSTEP_RUN_DEPENDS += x11/gnustep/base MODGNUSTEP_NEEDS_BASE ?= No MODGNUSTEP_NEEDS_GUI ?= No MODGNUSTEP_NEEDS_BACK ?= No +MODGNUSTEP_WANTLIB += BlocksRuntime .else MODGNUSTEP_NEEDS_BASE ?= Yes MODGNUSTEP_NEEDS_GUI ?= Yes @@ -57,7 +58,7 @@ MODGNUSTEP_RUN_DEPENDS += x11/gnustep/back . endif .endif .if ${MODGNUSTEP_NEEDS_BASE:L} == yes -MODGNUSTEP_WANTLIB += objc2 m +MODGNUSTEP_WANTLIB += objc2 m BlocksRuntime MODGNUSTEP_WANTLIB += gnustep-base pthread MODGNUSTEP_LIB_DEPENDS += x11/gnustep/base .endif diff --git a/x11/gnustep/highlighterkit/Makefile b/x11/gnustep/highlighterkit/Makefile index a5a862d82af..af598a55f27 100644 --- a/x11/gnustep/highlighterkit/Makefile +++ b/x11/gnustep/highlighterkit/Makefile @@ -1,6 +1,6 @@ COMMENT = framework for highlighting and coloring syntax -REVISION = 11 +REVISION = 12 DISTNAME = HighlighterKit-0.1.3 SHARED_LIBS = HighlighterKit 0.1 @@ -9,7 +9,7 @@ SITES = http://download.gna.org/gnustep-nonfsf/ MODULES = x11/gnustep MODGNUSTEP_IS_FRAMEWORK = Yes -WANTLIB += pthread +WANTLIB += pthread c++abi objc2 BUILD_DEPENDS += x11/gnustep/gui diff --git a/x11/gnustep/make/Makefile b/x11/gnustep/make/Makefile index b2e5c2397e6..b5c06f0c5f5 100644 --- a/x11/gnustep/make/Makefile +++ b/x11/gnustep/make/Makefile @@ -4,6 +4,7 @@ USE_NOBTCFI-aarch64 = Yes COMMENT= GNUstep makefile package +REVISION = 0 CATEGORIES= devel x11/gnustep GH_ACCOUNT= gnustep GH_PROJECT= tools-make @@ -41,9 +42,7 @@ CONFIGURE_ARGS= --with-layout=openbsd \ # base-clang LIBRARY_COMBO = "ng-gnu-gnu" CONFIGURE_ENV += GS_WITH_ARC=1 AS=llvm-as CPP="clang -E" -CONFIGURE_ENV += LDFLAGS="-L${LOCALBASE}/lib -lc++abi -lobjc2 -lpthread" -# XXX ports-gcc? -#LIBRARY_COMBO = "gnu-gnu-gnu" +CONFIGURE_ENV += LDFLAGS="-L${LOCALBASE}/lib -lobjc2 -lpthread -lBlocksRuntime" pre-configure: ${SUBST_CMD} -c -m 444 ${FILESDIR}/openbsd \ diff --git a/x11/gnustep/matharray/Makefile b/x11/gnustep/matharray/Makefile index 52b77de1637..a8121bce8ff 100644 --- a/x11/gnustep/matharray/Makefile +++ b/x11/gnustep/matharray/Makefile @@ -1,7 +1,7 @@ COMMENT = GNUstep library to manipulate matrices VERSION = 1.3 -REVISION = 12 +REVISION = 13 DISTNAME = MathArray-${VERSION} PKGNAME = gnustep-matharray-${VERSION} CATEGORIES = math @@ -10,7 +10,7 @@ SHARED_LIBS += MathArray 0.0 HOMEPAGE = http://wiki.gnustep.org/index.php/MathArray SITES = ${SITE_GNUSTEP:=contrib/} -WANTLIB += pthread +WANTLIB += pthread c++abi objc2 MODULES = x11/gnustep MODGNUSTEP_IS_FRAMEWORK = Yes diff --git a/x11/gnustep/netclasses/Makefile b/x11/gnustep/netclasses/Makefile index e8d96501bc5..73ac2e014ef 100644 --- a/x11/gnustep/netclasses/Makefile +++ b/x11/gnustep/netclasses/Makefile @@ -1,7 +1,7 @@ COMMENT = asynchronous networking framework for GNUstep VERSION = 1.1.0 -REVISION = 10 +REVISION = 11 EPOCH = 0 DISTNAME = netclasses-${VERSION} PKGNAME = gnustep-netclasses-${VERSION} @@ -13,7 +13,7 @@ SITES = ${SITE_SAVANNAH:=gap/} MODULES = x11/gnustep MODGNUSTEP_IS_FRAMEWORK = Yes -WANTLIB += pthread +WANTLIB += pthread c++abi objc2 CONFIGURE_STYLE = gnu MAKE_FLAGS += netclasses_INTERFACE_VERSION=${LIBnetclasses_VERSION} diff --git a/x11/gnustep/pantomime/Makefile b/x11/gnustep/pantomime/Makefile index aa85d23ad6f..735edfa7894 100644 --- a/x11/gnustep/pantomime/Makefile +++ b/x11/gnustep/pantomime/Makefile @@ -1,7 +1,7 @@ COMMENT= framework to major mail protocols DISTNAME= Pantomime-1.4.0 -REVISION= 0 +REVISION= 1 SHLIB_VERSION = 2.0 SHARED_LIBS= Pantomime ${SHLIB_VERSION} @@ -15,7 +15,7 @@ SITES= https://download.savannah.nongnu.org/releases/gnustep-nonfsf/ MODULES= x11/gnustep MODGNUSTEP_IS_FRAMEWORK = Yes -WANTLIB += pthread gnustep-base objc2 +WANTLIB += pthread gnustep-base objc2 c++abi MAKE_FLAGS += Pantomime_INTERFACE_VERSION=${LIBPantomime_VERSION} diff --git a/x11/gnustep/pcapkit/Makefile b/x11/gnustep/pcapkit/Makefile index d55de88dc2a..daad5c6f5dc 100644 --- a/x11/gnustep/pcapkit/Makefile +++ b/x11/gnustep/pcapkit/Makefile @@ -1,7 +1,7 @@ COMMENT = GNUstep wrapper around libpcap V = 0.2 -REVISION = 11 +REVISION = 12 DISTNAME = PcapKit-${V} PKGNAME = gnustep-pcapkit-${V} CATEGORIES = net @@ -12,7 +12,7 @@ HOMEPAGE = http://gna.org/projects/gnustep-nonfsf SITES = http://download.gna.org/gnustep-nonfsf/ MODULES = x11/gnustep -WANTLIB = pthread pcap +WANTLIB = pthread pcap c++abi objc2 MODGNUSTEP_IS_FRAMEWORK = Yes MAKE_ENV += PcapKit_INTERFACE_VERSION=${LIBPcapKit_VERSION} diff --git a/x11/gnustep/pdfkit/Makefile b/x11/gnustep/pdfkit/Makefile index 5d72a8a4b8c..47fa8b78932 100644 --- a/x11/gnustep/pdfkit/Makefile +++ b/x11/gnustep/pdfkit/Makefile @@ -1,7 +1,7 @@ COMMENT = framework for accessing and rendering PDF content DISTNAME = PDFKit-1.2.0 -REVISION = 1 +REVISION = 2 SHARED_LIBS += PDFKit 0.0 HOMEPAGE = http://wiki.gnustep.org/index.php/PDFKit @@ -9,7 +9,7 @@ SITES = ${SITE_SAVANNAH:=gap/} MODULES = x11/gnustep MODGNUSTEP_IS_FRAMEWORK = Yes -WANTLIB += pthread freetype m z +WANTLIB += pthread freetype m c++abi objc2 WANTLIB += ${COMPILER_LIBCXX} BUILD_DEPENDS = x11/gnustep/gui diff --git a/x11/gnustep/performance/Makefile b/x11/gnustep/performance/Makefile index fa6ea90deee..e1b898e460f 100644 --- a/x11/gnustep/performance/Makefile +++ b/x11/gnustep/performance/Makefile @@ -5,13 +5,13 @@ DISTNAME = Performance-${VERSION} PKGNAME = gnustep-performance-${VERSION} CATEGORIES = devel SHARED_LIBS += Performance 0.3 -REVISION = 1 +REVISION = 2 HOMEPAGE = http://wiki.gnustep.org/index.php/Performance SITES = ${SITE_GNUSTEP:=libs/} MODULES = x11/gnustep -WANTLIB = pthread +WANTLIB = pthread c++abi MODGNUSTEP_NEEDS_GUI = No MODGNUSTEP_NEEDS_BACK = No diff --git a/x11/gnustep/projectcenter/Makefile b/x11/gnustep/projectcenter/Makefile index 8d76da7758d..f0f17b46643 100644 --- a/x11/gnustep/projectcenter/Makefile +++ b/x11/gnustep/projectcenter/Makefile @@ -5,7 +5,7 @@ GH_ACCOUNT= gnustep GH_PROJECT= apps-projectcenter DISTNAME= ProjectCenter-${GH_TAGNAME} CATEGORIES= devel -REVISION= 0 +REVISION= 1 HOMEPAGE= http://www.gnustep.org/experience/ProjectCenter.html @@ -16,7 +16,6 @@ SHARED_LIBS= ProjectCenter 1.2 RUN_DEPENDS += devel/gmake devel/gdb MODULES= x11/gnustep -WANTLIB += util WANTLIB += ${COMPILER_LIBCXX} LIBDIR = lib/GNUstep/Frameworks/ProjectCenter.framework/Versions/${GH_TAGNAME} diff --git a/x11/gnustep/rsskit/Makefile b/x11/gnustep/rsskit/Makefile index e90ea06b7af..8cd75fce72e 100644 --- a/x11/gnustep/rsskit/Makefile +++ b/x11/gnustep/rsskit/Makefile @@ -1,6 +1,6 @@ COMMENT = framework for reading different types of RSS formats -REVISION = 15 +REVISION = 16 DISTNAME = RSSKit-0.4 SHARED_LIBS += RSSKit 0.0 @@ -10,7 +10,7 @@ SITES = ${SITE_SAVANNAH:=gap/} MODULES = x11/gnustep MODGNUSTEP_IS_FRAMEWORK = Yes -WANTLIB += gnustep-base objc2 pthread +WANTLIB += gnustep-base objc2 pthread c++abi MAKE_FLAGS = RSSKit_INTERFACE_VERSION=${LIBRSSKit_VERSION} diff --git a/x11/gnustep/webserver/Makefile b/x11/gnustep/webserver/Makefile index 36b0d821f26..70e4667d60c 100644 --- a/x11/gnustep/webserver/Makefile +++ b/x11/gnustep/webserver/Makefile @@ -3,7 +3,7 @@ COMMENT = GNUstep webserver framework VERSION = 1.6.0 DISTNAME = WebServer-${VERSION} PKGNAME = gnustep-webserver-${VERSION} -REVISION = 1 +REVISION = 2 SHARED_LIBS += WebServer 2.2 @@ -15,7 +15,7 @@ SITES = ${SITE_GNUSTEP:=libs/} MODULES = x11/gnustep MODGNUSTEP_IS_FRAMEWORK = Yes -WANTLIB += Performance pthread +WANTLIB += Performance pthread c++abi objc2 LIB_DEPENDS += x11/gnustep/performance MAKE_FLAGS += WebServer_INTERFACE_VERSION=${LIBWebServer_VERSION} diff --git a/x11/gnustep/webservices/Makefile b/x11/gnustep/webservices/Makefile index e13dd369ec6..8e9deaa4711 100644 --- a/x11/gnustep/webservices/Makefile +++ b/x11/gnustep/webservices/Makefile @@ -5,12 +5,12 @@ DISTNAME = WebServices-${VERSION} PKGNAME = gnustep-webservices-${VERSION} CATEGORIES = www SHARED_LIBS += WebServices 0.5 -REVISION = 1 +REVISION = 2 HOMEPAGE = http://wiki.gnustep.org/index.php/WebServices SITES = ${SITE_GNUSTEP:=libs/} -WANTLIB += Performance pthread gnutls nettle +WANTLIB += Performance pthread gnutls nettle c++abi objc2 MODULES = x11/gnustep LIB_DEPENDS = x11/gnustep/performance