From owner-freebsd-ports-bugs@FreeBSD.ORG  Tue Apr  1 00:10:00 2014
Return-Path: <owner-freebsd-ports-bugs@FreeBSD.ORG>
Delivered-To: freebsd-ports-bugs@smarthost.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 93F8F813
 for <freebsd-ports-bugs@smarthost.ysv.freebsd.org>;
 Tue,  1 Apr 2014 00:10:00 +0000 (UTC)
Received: from freefall.freebsd.org (freefall.freebsd.org
 [IPv6:2001:1900:2254:206c::16:87])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 70CF5822
 for <freebsd-ports-bugs@smarthost.ysv.freebsd.org>;
 Tue,  1 Apr 2014 00:10:00 +0000 (UTC)
Received: from freefall.freebsd.org (localhost [127.0.0.1])
 by freefall.freebsd.org (8.14.8/8.14.8) with ESMTP id s310A0XP017582
 for <freebsd-ports-bugs@freefall.freebsd.org>; Tue, 1 Apr 2014 00:10:00 GMT
 (envelope-from gnats@freefall.freebsd.org)
Received: (from gnats@localhost)
 by freefall.freebsd.org (8.14.8/8.14.8/Submit) id s310A04u017581;
 Tue, 1 Apr 2014 00:10:00 GMT (envelope-from gnats)
Resent-Date: Tue, 1 Apr 2014 00:10:00 GMT
Resent-Message-Id: <201404010010.s310A04u017581@freefall.freebsd.org>
Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer)
Resent-To: freebsd-ports-bugs@FreeBSD.org
Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org,
 Naram Qashat <cyberbotx@cyberbotx.com>
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 0E5487DF
 for <freebsd-gnats-submit@freebsd.org>; Tue,  1 Apr 2014 00:06:50 +0000 (UTC)
Received: from qmta15.westchester.pa.mail.comcast.net
 (qmta15.westchester.pa.mail.comcast.net [IPv6:2001:558:fe14:44:76:96:59:228])
 by mx1.freebsd.org (Postfix) with ESMTP id ADFF4808
 for <freebsd-gnats-submit@freebsd.org>; Tue,  1 Apr 2014 00:06:49 +0000 (UTC)
Received: from omta20.westchester.pa.mail.comcast.net ([76.96.62.71])
 by qmta15.westchester.pa.mail.comcast.net with comcast
 id kP891n0041YDfWL5FQ6oKF; Tue, 01 Apr 2014 00:06:48 +0000
Received: from kirby.cyberbotx.com ([107.5.48.95])
 by omta20.westchester.pa.mail.comcast.net with comcast
 id kQ6n1n00g23DSHF3gQ6oQx; Tue, 01 Apr 2014 00:06:48 +0000
Received: by kirby.cyberbotx.com (Postfix, from userid 0)
 id 7D67E2846D; Mon, 31 Mar 2014 20:06:47 -0400 (EDT)
Message-Id: <20140401000647.7D67E2846D@kirby.cyberbotx.com>
Date: Mon, 31 Mar 2014 20:06:47 -0400 (EDT)
From: Naram Qashat <cyberbotx@cyberbotx.com>
To: FreeBSD-gnats-submit@freebsd.org
X-Send-Pr-Version: 3.113
Subject: ports/188151: [MAINTAINER] sysutils/di: Fix ln -s for staging,
 OPTIONS helpers
X-BeenThere: freebsd-ports-bugs@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: Ports bug reports <freebsd-ports-bugs.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/freebsd-ports-bugs>, 
 <mailto:freebsd-ports-bugs-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-ports-bugs/>
List-Post: <mailto:freebsd-ports-bugs@freebsd.org>
List-Help: <mailto:freebsd-ports-bugs-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-ports-bugs>, 
 <mailto:freebsd-ports-bugs-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 01 Apr 2014 00:10:00 -0000


>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: