git: ccca232b0a6f - main - sysutils/di: update to 4.53

The branch main has been updated by uzsolt:

URL: https://cgit.FreeBSD.org/ports/commit/?id=ccca232b0a6f12f16160066a45a144afce40ad1a

commit ccca232b0a6f12f16160066a45a144afce40ad1a
Author:     Naram Qashat <cyberbotx@cyberbotx.com>
AuthorDate: 2024-07-08 05:22:10 +0000
Commit:     Zsolt Udvari <uzsolt@FreeBSD.org>
CommitDate: 2024-07-08 05:22:10 +0000

    sysutils/di: update to 4.53
    
    Swith to DISTVERSION.
    Add TEST_TARGET and USES=perl5 to test phase.
    
    Changelog:
    Fixed library check for modern compilers.
    Removed old D language stuff.
    Remove support for K&R compilers and ancient systems.
    Fix debug output for env vars.
    DI_ARGS: print error and exit when encountering unknown data.
    
    PR:             280151
    Approved by:    submitter is maintainer
---
 sysutils/di/Makefile                        |  9 ++++++---
 sysutils/di/distinfo                        |  6 +++---
 sysutils/di/files/patch-C-Makefile          | 28 +++++-----------------------
 sysutils/di/files/patch-Makefile            | 24 +++++++++---------------
 sysutils/di/files/patch-tests.d_test__order |  8 ++++++++
 5 files changed, 31 insertions(+), 44 deletions(-)

diff --git a/sysutils/di/Makefile b/sysutils/di/Makefile
index db0facdf1281..84a3ef4f7b06 100644
--- a/sysutils/di/Makefile
+++ b/sysutils/di/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	di
-PORTVERSION=	4.51
-PORTREVISION=	1
+DISTVERSION=	4.53
 CATEGORIES=	sysutils
 MASTER_SITES=	SF/diskinfo-di
 
@@ -11,13 +10,17 @@ WWW=		https://diskinfo-di.sourceforge.io/
 LICENSE=	ZLIB
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
+USES=		perl5
+USE_PERL5=	test
+
 MAKE_ARGS=	-e
 MAKE_ENV=	prefix="${PREFIX}"
+TEST_TARGET=	test
 
 OPTIONS_DEFINE=	NLS
 OPTIONS_SUB=	yes
 
-NLS_USES=	gettext
+NLS_USES=		gettext
 NLS_MAKE_ENV_OFF=	DI_NO_NLS=T
 
 pre-install:
diff --git a/sysutils/di/distinfo b/sysutils/di/distinfo
index 60e27b79b161..a3985318ee6d 100644
--- a/sysutils/di/distinfo
+++ b/sysutils/di/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1669607852
-SHA256 (di-4.51.tar.gz) = 79b2129c4aff27428695441175940a1717fa0fe2ec2f46d1b886ebb4921461bb
-SIZE (di-4.51.tar.gz) = 229504
+TIMESTAMP = 1720237886
+SHA256 (di-4.53.tar.gz) = 00dd5befc11dac8d65a68b248fd34158a2e6a850c2e4e2ab77594c79aa01e83e
+SIZE (di-4.53.tar.gz) = 200828
diff --git a/sysutils/di/files/patch-C-Makefile b/sysutils/di/files/patch-C-Makefile
index 839722131a29..92fd828d75c2 100644
--- a/sysutils/di/files/patch-C-Makefile
+++ b/sysutils/di/files/patch-C-Makefile
@@ -1,29 +1,11 @@
---- C/Makefile.orig	2019-10-30 18:14:13 UTC
+--- C/Makefile.orig	2024-06-24 00:49:39 UTC
 +++ C/Makefile
-@@ -29,7 +29,7 @@ TEST = test
+@@ -42,7 +42,7 @@ TEST = test
  ###
  # installation options
  #
 -prefix = /usr/local
 +prefix ?= /usr/local
- LOCALEDIR = $(prefix)/share/locale
- 
- ###
-@@ -178,7 +178,7 @@ bsd43-cc:
- 	$(MAKE) _MKCONFIG_SHELL=$(MKCONFIG_SHELL) \
- 		CC=cc LD=cc EXE_EXT="" OBJ_EXT=".o" \
- 		DI_CFLAGS="$(DI_CFLAGS) -O" \
--		LDFLAGS="-O" di-programs
-+		LDFLAGS="-O $(LDFLAGS)" di-programs
- 
- .PHONY: bsd43-gcc
- bsd43-gcc:
-@@ -192,7 +192,7 @@ bsd43-gcc:
- 	$(MAKE) _MKCONFIG_SHELL=$(MKCONFIG_SHELL) \
- 		CC=gcc LD=gcc EXE_EXT="" OBJ_EXT=".o" \
- 		DI_CFLAGS="$(DI_CFLAGS) -O2" \
--		LDFLAGS="-O2" di-programs
-+		LDFLAGS="-O2 $(LDFLAGS)" di-programs
- 
- .PHONY: ultrix-cc
- ultrix-cc:
+ PREFIX = $(prefix)
+ BINDIR = $(PREFIX)/bin
+ DATADIR = $(PREFIX)/share
diff --git a/sysutils/di/files/patch-Makefile b/sysutils/di/files/patch-Makefile
index 23c0584ae338..cc43dcc0b0e9 100644
--- a/sysutils/di/files/patch-Makefile
+++ b/sysutils/di/files/patch-Makefile
@@ -1,26 +1,20 @@
---- Makefile.orig	2015-05-18 19:48:09 UTC
+--- Makefile.orig	2024-06-24 00:49:39 UTC
 +++ Makefile
-@@ -36,12 +36,12 @@ MKC_DIR = ./mkconfig
+@@ -34,7 +34,7 @@ MKC_DIR = ./mkconfig
  ###
  # installation options
  #
 -prefix = /usr/local
 +prefix ?= /usr/local
- LOCALEDIR = $(prefix)/share/locale
+ PREFIX = $(prefix)
  PROG = di
  MPROG = mi
- #
--INSTALL_DIR = $(prefix)
-+INSTALL_DIR = $(DESTDIR)$(prefix)
- INSTALL_BIN_DIR = $(INSTALL_DIR)/bin
- INST_LOCALEDIR = $(INSTALL_DIR)/share/locale
- TARGET = $(INSTALL_BIN_DIR)/$(PROG)$(EXE_EXT)
-@@ -140,7 +140,7 @@ install-prog:
- 	$(TEST) -d $(INSTALL_BIN_DIR) || $(MKDIR) $(INSTALL_BIN_DIR)
- 	$(CP) -f ./$(FROMDIR)/$(PROG)$(EXE_EXT) $(TARGET)
+@@ -152,7 +152,7 @@ install-prog:
+ 	$(TEST) -d $(INST_BINDIR) || $(MKDIR) $(INST_BINDIR)
+ 	$(CP) -f ./$(FROMDIR)/$(PROG)$(EXE_EXT) $(DITARGET)
  	-$(RM) -f $(MTARGET) > /dev/null 2>&1
--	-$(LN) -s $(PROG)$(EXE_EXT) $(MTARGET)
-+	-( cd $(INSTALL_BIN_DIR) && $(LN) -s $(PROG)$(EXE_EXT) $(MPROG)$(EXE_EXT) )
+-	-$(LN) -s $(DITARGET) $(MTARGET)
++	-$(LN) -s $(PROG)$(EXE_EXT) $(MTARGET)
  	@-test -f $(FROMDIR)/config.h && \
  		grep '^#define _enable_nls 1' $(FROMDIR)/config.h >/dev/null 2>&1 && \
- 		(. ./$(FROMDIR)/di.env; $(MAKE) -e INST_LOCALEDIR="$(INST_LOCALEDIR)" \
+ 		(. ./$(FROMDIR)/di.env; $(MAKE) -e LOCALEDIR="$(LOCALEDIR)" \
diff --git a/sysutils/di/files/patch-tests.d_test__order b/sysutils/di/files/patch-tests.d_test__order
new file mode 100644
index 000000000000..8a97595a658a
--- /dev/null
+++ b/sysutils/di/files/patch-tests.d_test__order
@@ -0,0 +1,8 @@
+--- tests.d/test_order.orig	2024-06-24 00:49:39 UTC
++++ tests.d/test_order
+@@ -3,5 +3,4 @@
+ 3 diarg
+ 3 disort
+ 3 ditot
+-4 diinst
+ 5 dinls