diff options
| author | Philippe Audeoud <jadawin@FreeBSD.org> | 2014-04-02 14:08:51 +0000 |
|---|---|---|
| committer | Philippe Audeoud <jadawin@FreeBSD.org> | 2014-04-02 14:08:51 +0000 |
| commit | f596560d93a3b3df5c6fa452a3d97bb8f6531768 (patch) | |
| tree | 3dc3dc468400adfef665c9d4a8b16640681c9775 /sysutils/di | |
| parent | a448ee249b76247f2d94e373638a42f8767518ba (diff) | |
| download | ports-f596560d93a3b3df5c6fa452a3d97bb8f6531768.tar.gz ports-f596560d93a3b3df5c6fa452a3d97bb8f6531768.zip | |
- Use gettext
- Fix ln in patch
PR: ports/188151
Submitted by: maintainer
Reported by: marino@
Notes
Notes:
svn path=/head/; revision=349922
Diffstat (limited to 'sysutils/di')
| -rw-r--r-- | sysutils/di/Makefile | 13 | ||||
| -rw-r--r-- | sysutils/di/files/patch-Makefile | 13 |
2 files changed, 15 insertions, 11 deletions
diff --git a/sysutils/di/Makefile b/sysutils/di/Makefile index f2d528977209..e76aab1e39c0 100644 --- a/sysutils/di/Makefile +++ b/sysutils/di/Makefile @@ -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 diff --git a/sysutils/di/files/patch-Makefile b/sysutils/di/files/patch-Makefile index bc31bd9e9b9f..934cc3c12943 100644 --- a/sysutils/di/files/patch-Makefile +++ b/sysutils/di/files/patch-Makefile @@ -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)" \ |