Attachment #251930 for bug #280151




PORTNAME=	di
PORTVERSION=	4.53
PORTREVISION=	1
CATEGORIES=	sysutils
MASTER_SITES=	SF/diskinfo-di


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_MAKE_ENV_OFF=	DI_NO_NLS=T

pre-install:

Lines 1-3 Link Here

(-)b/sysutils/di/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1669607852	1	TIMESTAMP = 1720237886
2	SHA256 (di-4.51.tar.gz) = 79b2129c4aff27428695441175940a1717fa0fe2ec2f46d1b886ebb4921461bb	2	SHA256 (di-4.53.tar.gz) = 00dd5befc11dac8d65a68b248fd34158a2e6a850c2e4e2ab77594c79aa01e83e
3	SIZE (di-4.51.tar.gz) = 229504	3	SIZE (di-4.53.tar.gz) = 200828




--- C/Makefile.orig	2024-06-24 00:49:39 UTC
+++ C/Makefile
@@ -42,7 +42,7 @@ TEST = test
 ###
 # installation options
 #
-prefix = /usr/local
+prefix ?= /usr/local
 PREFIX = $(prefix)
 BINDIR = $(PREFIX)/bin
 DATADIR = $(PREFIX)/share
@@ -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:




--- Makefile.orig	2024-06-24 00:49:39 UTC
+++ Makefile
@@ -34,7 +34,7 @@ MKC_DIR = ./mkconfig
 ###
 # installation options
 #
-prefix = /usr/local
+prefix ?= /usr/local
 PREFIX = $(prefix)
 PROG = di
 MPROG = mi
@@ -152,7 +152,7 @@ install-prog:
 	$(TEST) -d $(INST_BINDIR) || $(MKDIR) $(INST_BINDIR)
 	$(CP) -f ./$(FROMDIR)/$(PROG)$(EXE_EXT) $(DITARGET)
 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)
 	-$(RM) -f $(MTARGET) > /dev/null 2>&1
-	-$(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 LOCALEDIR="$(LOCALEDIR)" \

Added Link Here

(-)b/sysutils/di/files/patch-tests.d_test__order (+8 lines)
1	--- tests.d/test_order.orig 2024-06-24 00:49:39 UTC
2	+++ tests.d/test_order
3	@@ -3,5 +3,4 @@
4	3 diarg
5	3 disort
6	3 ditot
7	-4 diinst
8	5 dinls

Return to bug 280151

Lines 1-6 Link Here

(-)b/sysutils/di/Makefile (-3 / +6 lines)
1	PORTNAME= di	1	PORTNAME= di
2	PORTVERSION= 4.51	2	PORTVERSION= 4.53
3	PORTREVISION= 1
4	CATEGORIES= sysutils	3	CATEGORIES= sysutils
5	MASTER_SITES= SF/diskinfo-di	4	MASTER_SITES= SF/diskinfo-di
6		5
Lines 11-23 WWW= https://diskinfo-di.sourceforge.io/ Link Here
11	LICENSE= ZLIB	10	LICENSE= ZLIB
12	LICENSE_FILE= ${WRKSRC}/LICENSE	11	LICENSE_FILE= ${WRKSRC}/LICENSE
13		12
		13	USES= perl5
		14	USE_PERL5= test
		15
14	MAKE_ARGS= -e	16	MAKE_ARGS= -e
15	MAKE_ENV= prefix="${PREFIX}"	17	MAKE_ENV= prefix="${PREFIX}"
		18	TEST_TARGET= test
16		19
17	OPTIONS_DEFINE= NLS	20	OPTIONS_DEFINE= NLS
18	OPTIONS_SUB= yes	21	OPTIONS_SUB= yes
19		22
20	NLS_USES= gettext	23	NLS_USES= gettext
21	NLS_MAKE_ENV_OFF= DI_NO_NLS=T	24	NLS_MAKE_ENV_OFF= DI_NO_NLS=T
22		25
23	pre-install:	26	pre-install:

Lines 1-29 Link Here

(-)b/sysutils/di/files/patch-C-Makefile (-23 / +5 lines)
1	--- C/Makefile.orig 2019-10-30 18:14:13 UTC	1	--- C/Makefile.orig 2024-06-24 00:49:39 UTC
2	+++ C/Makefile	2	+++ C/Makefile
3	@@ -29,7 +29,7 @@ TEST = test	3	@@ -42,7 +42,7 @@ TEST = test
4	###	4	###
5	# installation options	5	# installation options
6	#	6	#
7	-prefix = /usr/local	7	-prefix = /usr/local
8	+prefix ?= /usr/local	8	+prefix ?= /usr/local
9	LOCALEDIR = $(prefix)/share/locale	9	PREFIX = $(prefix)
10		10	BINDIR = $(PREFIX)/bin
11	###	11	DATADIR = $(PREFIX)/share
12	@@ -178,7 +178,7 @@ bsd43-cc:
13	$(MAKE) _MKCONFIG_SHELL=$(MKCONFIG_SHELL) \
14	CC=cc LD=cc EXE_EXT="" OBJ_EXT=".o" \
15	DI_CFLAGS="$(DI_CFLAGS) -O" \
16	- LDFLAGS="-O" di-programs
17	+ LDFLAGS="-O $(LDFLAGS)" di-programs
18
19	.PHONY: bsd43-gcc
20	bsd43-gcc:
21	@@ -192,7 +192,7 @@ bsd43-gcc:
22	$(MAKE) _MKCONFIG_SHELL=$(MKCONFIG_SHELL) \
23	CC=gcc LD=gcc EXE_EXT="" OBJ_EXT=".o" \
24	DI_CFLAGS="$(DI_CFLAGS) -O2" \
25	- LDFLAGS="-O2" di-programs
26	+ LDFLAGS="-O2 $(LDFLAGS)" di-programs
27
28	.PHONY: ultrix-cc
29	ultrix-cc:

Lines 1-26 Link Here

(-)b/sysutils/di/files/patch-Makefile (-15 / +9 lines)
1	--- Makefile.orig 2015-05-18 19:48:09 UTC	1	--- Makefile.orig 2024-06-24 00:49:39 UTC
2	+++ Makefile	2	+++ Makefile
3	@@ -36,12 +36,12 @@ MKC_DIR = ./mkconfig	3	@@ -34,7 +34,7 @@ MKC_DIR = ./mkconfig
4	###	4	###
5	# installation options	5	# installation options
6	#	6	#
7	-prefix = /usr/local	7	-prefix = /usr/local
8	+prefix ?= /usr/local	8	+prefix ?= /usr/local
9	LOCALEDIR = $(prefix)/share/locale	9	PREFIX = $(prefix)
10	PROG = di	10	PROG = di
11	MPROG = mi	11	MPROG = mi
12	#	12	@@ -152,7 +152,7 @@ install-prog:
13	-INSTALL_DIR = $(prefix)	13	$(TEST) -d $(INST_BINDIR) \|\| $(MKDIR) $(INST_BINDIR)
14	+INSTALL_DIR = $(DESTDIR)$(prefix)	14	$(CP) -f ./$(FROMDIR)/$(PROG)$(EXE_EXT) $(DITARGET)
15	INSTALL_BIN_DIR = $(INSTALL_DIR)/bin
16	INST_LOCALEDIR = $(INSTALL_DIR)/share/locale
17	TARGET = $(INSTALL_BIN_DIR)/$(PROG)$(EXE_EXT)
18	@@ -140,7 +140,7 @@ install-prog:
19	$(TEST) -d $(INSTALL_BIN_DIR) \|\| $(MKDIR) $(INSTALL_BIN_DIR)
20	$(CP) -f ./$(FROMDIR)/$(PROG)$(EXE_EXT) $(TARGET)
21	-$(RM) -f $(MTARGET) > /dev/null 2>&1	15	-$(RM) -f $(MTARGET) > /dev/null 2>&1
22	- -$(LN) -s $(PROG)$(EXE_EXT) $(MTARGET)	16	- -$(LN) -s $(DITARGET) $(MTARGET)
23	+ -( cd $(INSTALL_BIN_DIR) && $(LN) -s $(PROG)$(EXE_EXT) $(MPROG)$(EXE_EXT) )	17	+ -$(LN) -s $(PROG)$(EXE_EXT) $(MTARGET)
24	@-test -f $(FROMDIR)/config.h && \	18	@-test -f $(FROMDIR)/config.h && \
25	grep '^#define _enable_nls 1' $(FROMDIR)/config.h >/dev/null 2>&1 && \	19	grep '^#define _enable_nls 1' $(FROMDIR)/config.h >/dev/null 2>&1 && \
26	(. ./$(FROMDIR)/di.env; $(MAKE) -e INST_LOCALEDIR="$(INST_LOCALEDIR)" \	20	(. ./$(FROMDIR)/di.env; $(MAKE) -e LOCALEDIR="$(LOCALEDIR)" \