Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 31 Mar 2014 20:06:47 -0400 (EDT)
From:      Naram Qashat <cyberbotx@cyberbotx.com>
To:        FreeBSD-gnats-submit@freebsd.org
Subject:   ports/188151: [MAINTAINER] sysutils/di: Fix ln -s for staging, OPTIONS helpers
Message-ID:  <20140401000647.7D67E2846D@kirby.cyberbotx.com>
Resent-Message-ID: <201404010010.s310A04u017581@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         188151
>Category:       ports
>Synopsis:       [MAINTAINER] sysutils/di: Fix ln -s for staging, OPTIONS helpers
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Tue Apr 01 00:10:00 UTC 2014
>Closed-Date:
>Last-Modified:
>Originator:     Naram Qashat
>Release:        FreeBSD 9.2-STABLE amd64
>Organization:
>Environment:
System: FreeBSD kirby.cyberbotx.com 9.2-STABLE FreeBSD 9.2-STABLE #0 r258460: Thu Nov 21 22:30:13 EST
>Description:
- Fix the ln -s of the mi executable for staging
- OPTIONS helpers

Generated with FreeBSD Port Tools 1.00.2014.03.23 (mode: change, diff: SVN)
>How-To-Repeat:
>Fix:

--- di-4.35.patch begins here ---
Index: Makefile
===================================================================
--- Makefile	(revision 349817)
+++ Makefile	(working copy)
@@ -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,17 +14,11 @@
 MAKE_ENV+=	prefix="${PREFIX}"
 
 OPTIONS_DEFINE=	NLS
+OPTIONS_SUB=	yes
 
-.include <bsd.port.options.mk>
+NLS_USES=	gettext
+NLS_MAKE_ENV_OFF=	DI_NO_NLS=T
 
-.if ${PORT_OPTIONS:MNLS}
-USES+=		gettext
-PLIST_SUB=	NLS=""
-.else
-PLIST_SUB=	NLS="@comment "
-MAKE_ENV+=	DI_NO_NLS=T
-.endif
-
 post-patch:
 	@${REINPLACE_CMD} -e "s|zoneid_t|zoneId_t|g" ${WRKSRC}/C/di.c
 
Index: files/patch-Makefile
===================================================================
--- files/patch-Makefile	(revision 349817)
+++ files/patch-Makefile	(working copy)
@@ -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)" \
--- di-4.35.patch ends here ---

>Release-Note:
>Audit-Trail:
>Unformatted:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20140401000647.7D67E2846D>