diff --git a/sysutils/di/Makefile b/sysutils/di/Makefile index ae5e34be7848..db0facdf1281 100644 --- a/sysutils/di/Makefile +++ b/sysutils/di/Makefile @@ -1,25 +1,26 @@ PORTNAME= di PORTVERSION= 4.51 +PORTREVISION= 1 CATEGORIES= sysutils MASTER_SITES= SF/diskinfo-di MAINTAINER= cyberbotx@cyberbotx.com COMMENT= Disk Information Utility WWW= https://diskinfo-di.sourceforge.io/ LICENSE= ZLIB LICENSE_FILE= ${WRKSRC}/LICENSE MAKE_ARGS= -e MAKE_ENV= prefix="${PREFIX}" OPTIONS_DEFINE= NLS OPTIONS_SUB= yes NLS_USES= gettext NLS_MAKE_ENV_OFF= DI_NO_NLS=T pre-install: @${STRIP_CMD} ${WRKSRC}/C/di .include diff --git a/sysutils/di/files/patch-Makefile b/sysutils/di/files/patch-Makefile index 9b8cb9ce3536..23c0584ae338 100644 --- a/sysutils/di/files/patch-Makefile +++ b/sysutils/di/files/patch-Makefile @@ -1,35 +1,26 @@ --- Makefile.orig 2015-05-18 19:48:09 UTC +++ Makefile @@ -36,12 +36,12 @@ MKC_DIR = ./mkconfig ### # installation options # -prefix = /usr/local +prefix ?= /usr/local LOCALEDIR = $(prefix)/share/locale 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) -@@ -58,7 +58,7 @@ INSTPERM = 4111 # install suid if your - # - # simple man page installation - # --DI_MANINSTDIR = $(INSTALL_DIR)/share/man -+DI_MANINSTDIR = $(INSTALL_DIR)/man - DI_MANDIR = $(DI_MANINSTDIR)/man1 - MAN_TARGET = $(PROG).1 - MANPERM = 644 @@ -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 $(PROG)$(EXE_EXT) $(MTARGET) + -( cd $(INSTALL_BIN_DIR) && $(LN) -s $(PROG)$(EXE_EXT) $(MPROG)$(EXE_EXT) ) @-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)" \ diff --git a/sysutils/di/pkg-plist b/sysutils/di/pkg-plist index 86382ec6da73..08ce6c248d35 100644 --- a/sysutils/di/pkg-plist +++ b/sysutils/di/pkg-plist @@ -1,6 +1,6 @@ bin/di bin/mi -man/man1/di.1.gz +share/man/man1/di.1.gz %%NLS%%share/locale/de/LC_MESSAGES/di.mo %%NLS%%share/locale/en/LC_MESSAGES/di.mo %%NLS%%share/locale/es/LC_MESSAGES/di.mo