From nobody Mon Dec 30 19:57:45 2024 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YMRj70zhYz5hgyZ; Mon, 30 Dec 2024 19:57:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YMRj55YKjz4DJZ; Mon, 30 Dec 2024 19:57:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735588665; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5jdbHx7R/7fBKrPDp4Ge6L68HUExSk+rpuQrCP+i9Gk=; b=uGgdlyskjcDcQvPknTnTCuLS/iD0pTAyGNWSkQ1O5US9YOcsikAkv3m3+jOeNSDEnHjJ++ v19+2QNICjq9lrLTbqkZsWb4bfdCeTj5qL9YurptkRRX5KPm4iZX/P7zreuOwtXbigB0ZE m23L8XnI1NsmpY0ZgI/GmJaCex3Q79vDulbwiTevRpPdRjJUS7EsvEyOeMPBLHXUswDl0v ecfQ8cyoOMNY0e9PGJhrkc+mnLdrSYltyAuplUxiCH2FSR2Yljc4FfXiIg1orq4Y2rFvfz Gu4U7R6trynRTkzVTC/UzL7ZIWwwsMmsfINrTCI+HBLeK8CDMOzn9S9/FN/P2Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735588665; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5jdbHx7R/7fBKrPDp4Ge6L68HUExSk+rpuQrCP+i9Gk=; b=SMTvHnC9mlBO1vq6nldM5RvHfJ3JT7XXwJGIjl0bVCm6UOpNbRkv7PMa7tqnnpdW2bYikv twGgXKMJipkg52SEIN1w7iAQgBojhCyDmddqGdnO9UFVvOMS6Z60YBuKa4t1RTPAixS0mk p48T26RbQIl8cEdrwB0HnXouqnY2zN4JHpf+YW2w7Tt9KCGaEWIuruUa/Spu90AAhocGCE 3kYUU8IMQCfoCNWF9hzbUVMiiLd0TOUAeyRgGdUppUx/Tk4wtxltIN8+XhnpEsn2cv4Hsd 5zqa2MbmN19OcT48Vr7zvFVbUddXGIpnUoFCXMsAEikz4jdJZkRfoFv9iYUJoQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735588665; a=rsa-sha256; cv=none; b=DxaicDJwV9ch1eWdgLvHRqRIoYFmPajAXx0Ys6qMCwkg+mq0bZpEU/4EZjb87O+Xbf7qNJ sM4ecfZq8x2aDa91Sar5cs3k7UpGWundV9UZTO7ypP1eOh2ZSDCXEDsGtuLju8XwdM/IzD xL9ZSOuuFzoH1YoK21tXXVqou4HChxFzjXBAnNKyfLmvhjSwh4TtF1UuIBDlPRCIeTbOXi BhyiRhZY31wTYUhRSzSAZrSxX3Iegon1oH1h0CcbJFE96k1edC4T0BTk3rbXX/YWxnbAkt o8ahXKhKLw5s35qD2UgbAei2iDYuM6spSoWHAehbVSTgYqCj0U/u8u2yQDTIpw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YMRj5479rz17KR; Mon, 30 Dec 2024 19:57:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4BUJvj4q026889; Mon, 30 Dec 2024 19:57:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BUJvjnm026886; Mon, 30 Dec 2024 19:57:45 GMT (envelope-from git) Date: Mon, 30 Dec 2024 19:57:45 GMT Message-Id: <202412301957.4BUJvjnm026886@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Muhammad Moinur Rahman Subject: git: d412e6378db5 - main - games/prboom: Refactor List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bofh X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d412e6378db598159b35cdf3c9112234bf608f0b Auto-Submitted: auto-generated The branch main has been updated by bofh: URL: https://cgit.FreeBSD.org/ports/commit/?id=d412e6378db598159b35cdf3c9112234bf608f0b commit d412e6378db598159b35cdf3c9112234bf608f0b Author: Muhammad Moinur Rahman AuthorDate: 2024-12-30 07:14:38 +0000 Commit: Muhammad Moinur Rahman CommitDate: 2024-12-30 19:57:26 +0000 games/prboom: Refactor - Mark DEPRECATED as the last release was in 2008. There is a newer fork in the tree games/prboom-plus. - Remove LIB_DEPENDS to smpeg as it was removed and there is no src pertaining to smpeg in the src tree - Set EXPIRATION_DATE 2025-01-29 - Pet port{clippy|fmt} - Refresh patches Approved by: portmgr (blanket) --- games/prboom/Makefile | 25 +++++++++++----------- games/prboom/files/patch-Makefile.in | 6 +++--- games/prboom/files/patch-configure | 10 ++++----- ...patch-src-Makefile.in => patch-src_Makefile.in} | 12 +++++------ .../{patch-i_sshot.c => patch-src_SDL_i__sshot.c} | 10 ++++----- 5 files changed, 31 insertions(+), 32 deletions(-) diff --git a/games/prboom/Makefile b/games/prboom/Makefile index 9ffe885098a1..54d70ba993d3 100644 --- a/games/prboom/Makefile +++ b/games/prboom/Makefile @@ -1,6 +1,6 @@ PORTNAME= prboom -PORTVERSION= 2.5.0 -PORTREVISION= 14 +DISTVERSION= 2.5.0 +PORTREVISION= 15 CATEGORIES= games MASTER_SITES= SF/${PORTNAME}/${PORTNAME}%20stable/${PORTVERSION} @@ -10,29 +10,28 @@ WWW= https://prboom.sourceforge.net/ LICENSE= GPLv2 -LIB_DEPENDS= libsmpeg.so:multimedia/smpeg \ - libpng.so:graphics/png +DEPRECATED= Unmaintained, use games/prboom-plus instead +EXPIRATION_DATE= 2025-01-30 -USES= gmake sdl +LIB_DEPENDS= libpng.so:graphics/png + +USES= gmake localbase:ldflags sdl USE_GL= gl USE_SDL= mixer net sdl GNU_CONFIGURE= yes -GNU_CONFIGURE_MANPREFIX=${PREFIX}/share CONFIGURE_ARGS= --disable-i386-asm -CPPFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib - -OPTIONS_DEFINE= OPENGL -OPTIONS_DEFAULT= OPENGL DATADIR= ${LOCALBASE}/share/doom +SUB_FILES= pkg-message + PLIST_SUB= PORTVERSION=${PORTVERSION} -SUB_FILES= pkg-message +OPTIONS_DEFINE= OPENGL +OPTIONS_DEFAULT= OPENGL -OPENGL_CONFIGURE_ENABLE= gl OPENGL_USES= gl OPENGL_USE= GL=glu +OPENGL_CONFIGURE_ENABLE= gl .include diff --git a/games/prboom/files/patch-Makefile.in b/games/prboom/files/patch-Makefile.in index 3bb84a8dde19..c5739fb02d04 100644 --- a/games/prboom/files/patch-Makefile.in +++ b/games/prboom/files/patch-Makefile.in @@ -1,6 +1,6 @@ ---- Makefile.in.orig 2008-11-09 14:22:16.000000000 -0500 -+++ Makefile.in 2008-11-18 18:16:54.000000000 -0500 -@@ -258,22 +258,8 @@ +--- Makefile.in.orig 2008-11-09 19:22:16 UTC ++++ Makefile.in +@@ -258,22 +258,8 @@ install-docDATA: $(doc_DATA) prboom.spec: $(top_builddir)/config.status $(srcdir)/prboom.spec.in cd $(top_builddir) && $(SHELL) ./config.status $@ install-docDATA: $(doc_DATA) diff --git a/games/prboom/files/patch-configure b/games/prboom/files/patch-configure index d439ccb3f1d7..044b62584b1b 100644 --- a/games/prboom/files/patch-configure +++ b/games/prboom/files/patch-configure @@ -1,7 +1,7 @@ ---- configure.orig Sun Nov 19 12:45:22 2006 -+++ configure Fri Oct 12 14:02:43 2007 -@@ -1913,9 +1913,9 @@ - DOOMWADDIR="$withval" +--- configure.orig 2008-11-09 19:22:17 UTC ++++ configure +@@ -2422,9 +2422,9 @@ else + withval=$with_waddir; DOOMWADDIR="$withval" else if test "x$prefix" != xNONE; then - DOOMWADDIR="$prefix/share/games/doom" @@ -11,4 +11,4 @@ + DOOMWADDIR="$ac_default_prefix/share/doom" fi - fi; + fi diff --git a/games/prboom/files/patch-src-Makefile.in b/games/prboom/files/patch-src_Makefile.in similarity index 67% rename from games/prboom/files/patch-src-Makefile.in rename to games/prboom/files/patch-src_Makefile.in index 83da50fae5d4..508d791bc6f8 100644 --- a/games/prboom/files/patch-src-Makefile.in +++ b/games/prboom/files/patch-src_Makefile.in @@ -1,6 +1,6 @@ ---- src/Makefile.in.orig Sun Nov 19 12:45:21 2006 -+++ src/Makefile.in Fri Oct 12 14:12:30 2007 -@@ -37,7 +37,7 @@ +--- src/Makefile.in.orig 2008-11-09 19:22:16 UTC ++++ src/Makefile.in +@@ -31,7 +31,7 @@ INSTALL_HEADER = $(INSTALL_DATA) install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c INSTALL_HEADER = $(INSTALL_DATA) @@ -9,9 +9,9 @@ NORMAL_INSTALL = : PRE_INSTALL = : POST_INSTALL = : -@@ -248,7 +248,7 @@ - target_os = @target_os@ - target_vendor = @target_vendor@ +@@ -246,7 +246,7 @@ SUBDIRS = SDL POSIX MAC + top_builddir = @top_builddir@ + top_srcdir = @top_srcdir@ SUBDIRS = SDL POSIX MAC -gamesdir = $(prefix)/games +gamesdir = $(prefix)/bin diff --git a/games/prboom/files/patch-i_sshot.c b/games/prboom/files/patch-src_SDL_i__sshot.c similarity index 68% rename from games/prboom/files/patch-i_sshot.c rename to games/prboom/files/patch-src_SDL_i__sshot.c index b4e7485740a8..34deeeb0d3f1 100644 --- a/games/prboom/files/patch-i_sshot.c +++ b/games/prboom/files/patch-src_SDL_i__sshot.c @@ -1,15 +1,15 @@ ---- src/SDL/i_sshot.c.orig 2010-05-19 13:40:36.506099313 +0300 -+++ src/SDL/i_sshot.c 2010-05-19 13:41:50.837973800 +0300 -@@ -231,7 +231,7 @@ +--- src/SDL/i_sshot.c.orig 2008-10-18 13:32:29 UTC ++++ src/SDL/i_sshot.c +@@ -231,7 +231,7 @@ int I_ScreenShot (const char *fname) if (fp) { png_struct *png_ptr = png_create_write_struct( - PNG_LIBPNG_VER_STRING, png_error_ptr_NULL, error_fn, warning_fn); + PNG_LIBPNG_VER_STRING, NULL, error_fn, warning_fn); - + if (png_ptr) { -@@ -279,7 +279,7 @@ +@@ -279,7 +279,7 @@ int I_ScreenShot (const char *fname) break; } }