svn commit: r349922 - in head/sysutils/di: . files
Philippe Audeoud
jadawin at FreeBSD.org
Wed Apr 2 14:08:52 UTC 2014
Author: jadawin
Date: Wed Apr 2 14:08:51 2014
New Revision: 349922
URL: http://svnweb.freebsd.org/changeset/ports/349922
QAT: https://qat.redports.org/buildarchive/r349922/
Log:
- Use gettext
- Fix ln in patch
PR: ports/188151
Submitted by: maintainer
Reported by: marino@
Modified:
head/sysutils/di/Makefile
head/sysutils/di/files/patch-Makefile
Modified: head/sysutils/di/Makefile
==============================================================================
--- head/sysutils/di/Makefile Wed Apr 2 14:08:26 2014 (r349921)
+++ head/sysutils/di/Makefile Wed Apr 2 14:08:51 2014 (r349922)
@@ -3,6 +3,7 @@
PORTNAME= di
PORTVERSION= 4.35
+PORTREVISION= 1
CATEGORIES= sysutils
MASTER_SITES= http://www.gentoo.com/di/ \
http://www.cyberbotx.com/di/
@@ -13,16 +14,10 @@ COMMENT= Disk Information Utility
MAKE_ENV+= prefix="${PREFIX}"
OPTIONS_DEFINE= NLS
+OPTIONS_SUB= yes
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MNLS}
-USES+= gettext
-PLIST_SUB= NLS=""
-.else
-PLIST_SUB= NLS="@comment "
-MAKE_ENV+= DI_NO_NLS=T
-.endif
+NLS_USES= gettext
+NLS_MAKE_ENV_OFF= DI_NO_NLS=T
post-patch:
@${REINPLACE_CMD} -e "s|zoneid_t|zoneId_t|g" ${WRKSRC}/C/di.c
Modified: head/sysutils/di/files/patch-Makefile
==============================================================================
--- head/sysutils/di/files/patch-Makefile Wed Apr 2 14:08:26 2014 (r349921)
+++ head/sysutils/di/files/patch-Makefile Wed Apr 2 14:08:51 2014 (r349922)
@@ -1,5 +1,5 @@
---- Makefile.orig 2014-02-15 12:14:49.000000000 -0500
-+++ Makefile 2014-03-03 16:00:53.000000000 -0500
+--- ./Makefile.orig 2014-02-15 12:14:49.000000000 -0500
++++ ./Makefile 2014-03-31 20:03:46.000000000 -0400
@@ -36,12 +36,12 @@
###
# installation options
@@ -24,3 +24,12 @@
DI_MANDIR = $(DI_MANINSTDIR)/man1
MAN_TARGET = $(PROG).1
MANPERM = 644
+@@ -140,7 +140,7 @@
+ $(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)" \
More information about the svn-ports-all
mailing list