diff --git a/benchmarks/wrk/Makefile b/benchmarks/wrk/Makefile index 0adf72dca70..16fa707e1c1 100644 --- a/benchmarks/wrk/Makefile +++ b/benchmarks/wrk/Makefile @@ -3,16 +3,13 @@ COMMENT = modern HTTP benchmarking tool GH_ACCOUNT = wg GH_PROJECT = wrk GH_TAGNAME = 4.2.0 -REVISION = 2 +REVISION = 3 CATEGORIES = benchmarks # Apache 2.0, BSD, MIT PERMIT_PACKAGE = Yes -# luajit -USE_NOBTCFI-aarch64 = Yes - WANTLIB += c crypto luajit-5.1 m pthread ssl LIB_DEPENDS = lang/luajit diff --git a/games/luanti/Makefile b/games/luanti/Makefile index 6db74ff91c2..503528bae36 100644 --- a/games/luanti/Makefile +++ b/games/luanti/Makefile @@ -3,6 +3,7 @@ DPB_PROPERTIES = parallel COMMENT = infinite-world block sandbox game DIST_TUPLE += github luanti-org luanti 5.14.0 . +REVISION = 0 CATEGORIES = games x11 @@ -34,9 +35,6 @@ CONFIGURE_ARGS += -DINSTALL_DEVTEST=ON CONFIGURE_ARGS += -DENABLE_LTO=OFF .endif -# luajit -USE_NOBTCFI-aarch64 = Yes - CXXFLAGS += -I${X11BASE}/include MODCMAKE_LDFLAGS = -L${X11BASE}/lib -L${LOCALBASE}/lib diff --git a/games/luasteam/Makefile b/games/luasteam/Makefile index 066fd25c179..6aa12632a23 100644 --- a/games/luasteam/Makefile +++ b/games/luasteam/Makefile @@ -1,12 +1,10 @@ -USE_NOBTCFI-aarch64 = Yes - COMMENT = Lua bindings for Steam API V = 3.2.1 DISTNAME = ${GH_PROJECT}-${V} GH_ACCOUNT = uspgamedev GH_PROJECT = luasteam GH_TAGNAME = v${V} -REVISION = 1 +REVISION = 2 CATEGORIES = games MAINTAINER = Thomas Frohwein diff --git a/games/openmw/Makefile b/games/openmw/Makefile index 6487b4a7d89..b4f76caf562 100644 --- a/games/openmw/Makefile +++ b/games/openmw/Makefile @@ -5,12 +5,13 @@ ONLY_FOR_ARCHS = amd64 i386 COMMENT = open source implementation of TES III: Morrowind V = 0.50.0 +REVISION = 0 GH_ACCOUNT = OpenMW GH_PROJECT = openmw GH_TAGNAME = openmw-$V DISTNAME = openmw-$V -DISTFILES.a = c393777d26d2ff6519ac23612abf8af42678c9dd.zip +DISTFILES.a = c393777d26d2ff6519ac23612abf8af42678c9dd.zip DIST_SUBDIR = openmw SITES.a = https://github.com/recastnavigation/recastnavigation/archive/ @@ -23,8 +24,6 @@ MAINTAINER = Pascal Stumpf # GPLv3 / custom BSD-like font license / DejaVu license PERMIT_PACKAGE = Yes -USE_NOBTCFI-aarch64 = Yes - WANTLIB += ${COMPILER_LIBCXX} BulletCollision GL LinearMath MyGUIEngine WANTLIB += OpenThreads Qt6Core Qt6Gui Qt6Network Qt6OpenGL Qt6OpenGLWidgets WANTLIB += Qt6Svg Qt6Widgets SDL2 avcodec avformat avutil boost_iostreams-mt @@ -38,7 +37,7 @@ MODULES = devel/cmake lang/lua x11/qt6 lang/clang MODCLANG_VERSION = 19 COMPILER = ports-clang -BUILD_DEPENDS = sysutils/e2fsprogs +BUILD_DEPENDS = sysutils/e2fsprogs LIB_DEPENDS = archivers/unshield \ audio/openal \ databases/sqlite3 \ @@ -52,9 +51,9 @@ LIB_DEPENDS = archivers/unshield \ lang/luajit \ textproc/icu4c \ x11/qt6/qtsvg -RUN_DEPENDS = devel/desktop-file-utils +RUN_DEPENDS = devel/desktop-file-utils -CONFIGURE_ARGS += -DBINDIR=${LOCALBASE}/bin \ +CONFIGURE_ARGS += -DBINDIR=${LOCALBASE}/bin \ -DDATADIR:PATH=${LOCALBASE}/share/openmw \ -DSYSCONFDIR=${PREFIX}/share/examples/openmw \ -DGLOBAL_CONFIG_PATH="${SYSCONFDIR}" \ @@ -67,7 +66,7 @@ NO_TEST = Yes WRKDIST = ${WRKDIR}/openmw-${GH_TAGNAME} -CFLAGS += -I${X11BASE}/include -pthread +CFLAGS += -I${X11BASE}/include -pthread CXXFLAGS += -I${X11BASE}/include -pthread MODCMAKE_LDFLAGS = -L${X11BASE}/lib diff --git a/games/powder-toy/Makefile b/games/powder-toy/Makefile index bd2b55197d2..9dd94d02f7b 100644 --- a/games/powder-toy/Makefile +++ b/games/powder-toy/Makefile @@ -1,14 +1,11 @@ COMMENT = physics sandbox simulation -# LuaJIT -USE_NOBTCFI-aarch64 = Yes - V = 99.3.384 PKGNAME = powder-toy-${V} DIST_TUPLE += github The-Powder-Toy The-Powder-Toy v${V} . CATEGORIES = games MAINTAINER = Thomas Frohwein -REVISION = 0 +REVISION = 1 # GPL-3.0 PERMIT_PACKAGE = Yes diff --git a/games/solarus/solarus/Makefile b/games/solarus/solarus/Makefile index 0e005721d37..a15607195a9 100644 --- a/games/solarus/solarus/Makefile +++ b/games/solarus/solarus/Makefile @@ -2,7 +2,7 @@ V = 1.6.0 COMMENT = open-source Zelda-like 2D game engine DISTNAME = solarus-${V}-src PKGNAME = solarus-${V} -REVISION = 4 +REVISION = 5 SHARED_LIBS += solarus 0.0 # 1.5 @@ -11,9 +11,6 @@ HOMEPAGE = https://www.solarus-games.org/ # GPLv3+ PERMIT_PACKAGE = Yes -# luajit -USE_NOBTCFI-aarch64 = Yes - WANTLIB += Qt5Core Qt5Gui Qt5Widgets SDL2 SDL2_image SDL2_ttf WANTLIB += c luajit-5.1 m modplug ogg openal physfs pthread vorbis WANTLIB += vorbisfile GL GLU ${COMPILER_LIBCXX} diff --git a/mail/rspamd/Makefile b/mail/rspamd/Makefile index 757ffdf7653..1f7a5cd3c5f 100644 --- a/mail/rspamd/Makefile +++ b/mail/rspamd/Makefile @@ -3,6 +3,7 @@ COMMENT= event-driven spam filtering system in C/Lua GH_ACCOUNT= vstakhov GH_PROJECT= rspamd GH_TAGNAME= 3.14.0 +REVISION= 0 CATEGORIES= mail @@ -76,7 +77,6 @@ CONFIGURE_ARGS+= -DENABLE_LTO=off .if ${PROPERTIES:Mluajit} LIB_DEPENDS+= lang/luajit WANTLIB+= luajit-5.1 -USE_NOBTCFI-aarch64= Yes .else CONFIGURE_ARGS+= -DENABLE_LUAJIT=0 MODULES+= lang/lua diff --git a/net/hexchat/Makefile b/net/hexchat/Makefile index c3f79613ea5..ccb6d0ddc91 100644 --- a/net/hexchat/Makefile +++ b/net/hexchat/Makefile @@ -3,16 +3,13 @@ V = 2.16.2 DISTNAME = hexchat-$V EXTRACT_SUFX = .tar.xz CATEGORIES = net x11 -REVISION = 5 +REVISION = 6 HOMEPAGE = https://hexchat.github.io/ # GPLv2+ PERMIT_PACKAGE = Yes -# luajit -USE_NOBTCFI-aarch64 = Yes - WANTLIB += X11 c canberra crypto dbus-glib-1 gdk-x11-2.0 gdk_pixbuf-2.0 WANTLIB += gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 gtk-x11-2.0 WANTLIB += intl luajit-5.1 pango-1.0 perl ssl diff --git a/net/snort/Makefile b/net/snort/Makefile index d37ed67d1f8..fa27e767fe9 100644 --- a/net/snort/Makefile +++ b/net/snort/Makefile @@ -1,7 +1,7 @@ COMMENT = highly flexible sniffer/NIDS DISTNAME = snort-2.9.20 -REVISION = 5 +REVISION = 6 RULESV = 29200 SUBST_VARS = RULESV APPID_COMMENT @@ -46,7 +46,6 @@ APPID_COMMENT = "@comment " LIB_DEPENDS += lang/luajit WANTLIB += c++abi luajit-5.1 APPID_COMMENT = -USE_NOBTCFI-aarch64 = Yes .endif CONFIGS = classification.config gen-msg.map reference.config \ diff --git a/www/luakit/Makefile b/www/luakit/Makefile index 88304b1eab1..393f41692e4 100644 --- a/www/luakit/Makefile +++ b/www/luakit/Makefile @@ -2,7 +2,7 @@ COMMENT = fast, small, webkit based browser written in lua V = 2.4.0 DISTNAME = luakit-${V} -REVISION = 0 +REVISION = 1 EPOCH = 1 @@ -31,7 +31,6 @@ WANTLIB += soup-3.0 sqlite3 webkit2gtk-4.1 WANTLIB += luajit-5.1 LIB_DEPENDS += lang/luajit MAKE_FLAGS += USE_LUAJIT=1 -USE_NOBTCFI-aarch64 = Yes .else WANTLIB += ${MODLUA_WANTLIB} MAKE_FLAGS += USE_LUAJIT=0 diff --git a/x11/kde-applications/cantor/Makefile b/x11/kde-applications/cantor/Makefile index 86b45562ea9..b36f450b2e9 100644 --- a/x11/kde-applications/cantor/Makefile +++ b/x11/kde-applications/cantor/Makefile @@ -1,12 +1,9 @@ USE_WXNEEDED = Yes -# luajit -USE_NOBTCFI-aarch64 = Yes - COMMENT = KDE mathematical applications DISTNAME = cantor-${VERSION} CATEGORIES = education math -REVISION = 0 +REVISION = 1 SHARED_LIBS += cantorlibs 55.0 # 17.08