1
0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-29 10:18:30 +00:00

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
This commit is contained in:
Naram Qashat 2024-07-08 07:22:10 +02:00 committed by Zsolt Udvari
parent bb01c014fd
commit ccca232b0a
5 changed files with 31 additions and 44 deletions

View File

@ -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:

View File

@ -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

View File

@ -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

View File

@ -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)" \

View File

@ -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