From swell.k@gmail.com  Sat May 22 09:03:36 2010
Return-Path: <swell.k@gmail.com>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id A8AA9106564A
	for <FreeBSD-gnats-submit@freebsd.org>; Sat, 22 May 2010 09:03:36 +0000 (UTC)
	(envelope-from swell.k@gmail.com)
Received: from mail-fx0-f54.google.com (mail-fx0-f54.google.com [209.85.161.54])
	by mx1.freebsd.org (Postfix) with ESMTP id 3B64C8FC26
	for <FreeBSD-gnats-submit@freebsd.org>; Sat, 22 May 2010 09:03:35 +0000 (UTC)
Received: by fxm4 with SMTP id 4so1875864fxm.13
        for <FreeBSD-gnats-submit@freebsd.org>; Sat, 22 May 2010 02:03:35 -0700 (PDT)
Received: by 10.223.24.85 with SMTP id u21mr2470359fab.8.1274519015046;
        Sat, 22 May 2010 02:03:35 -0700 (PDT)
Received: from localhost (95-25-188-72.broadband.corbina.ru [95.25.188.72])
        by mx.google.com with ESMTPS id 2sm8688710faf.3.2010.05.22.02.03.34
        (version=SSLv3 cipher=RC4-MD5);
        Sat, 22 May 2010 02:03:34 -0700 (PDT)
Message-Id: <864oi0wbof.fsf@gmail.com>
Date: Sat, 22 May 2010 13:03:28 +0400
From: Anonymous <swell.k@gmail.com>
To: FreeBSD-gnats-submit@freebsd.org
Subject: [patch] texinfo/info: respect LOCALBASE for INFODIR

>Number:         146821
>Category:       bin
>Synopsis:       [patch] info(1): respect LOCALBASE for INFODIR
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Sat May 22 09:10:01 UTC 2010
>Closed-Date:    
>Last-Modified:  Sat May 22 22:22:36 UTC 2010
>Originator:     Anonymous
>Release:        FreeBSD 9.0-CURRENT amd64
>Organization:
>Environment:
LOCALBASE=/usr/pkg
>Description:
/usr/local is defined in bsd.port.mk. So, pick up non-default LOCALBASE
from environ(7) or make.conf(5).

Workaround: export INFOPATH=$LOCALBASE/info
>How-To-Repeat:
>Fix:
--- a.diff begins here ---
Index: gnu/usr.bin/texinfo/info/Makefile
===================================================================
--- gnu/usr.bin/texinfo/info/Makefile	(revision 208404)
+++ gnu/usr.bin/texinfo/info/Makefile	(working copy)
@@ -8,8 +8,14 @@
 	infomap.c m-x.c man.c nodemenu.c nodes.c search.c session.c \
 	signals.c terminal.c tilde.c variables.c window.c
 
-CFLAGS+= -DINFODIR=\"${INFODIR}:/usr/local/info:.\"
+CFLAGS+= -DINFODIR=\"${INFODIR}:${INFOLOCALDIR}:.\"
 
+.if defined(LOCALBASE)
+INFOLOCALDIR=${LOCALBASE}/info
+.else
+INFOLOCALDIR=/usr/local/info
+.endif
+
 DPADD=	${LIBTERMCAP} ${LIBTXI}
 LDADD=	-ltermcap ${LIBTXI}
 
--- a.diff ends here ---
>Release-Note:
>Audit-Trail:

From: Anonymous <swell.k@gmail.com>
To: bug-followup@freebsd.org
Cc:  
Subject: Re: conf/146821: [patch] texinfo/info: respect LOCALBASE for INFODIR
Date: Sat, 22 May 2010 13:16:55 +0400

 more simpler form
 
 --- a.diff begins here ---
 Index: gnu/usr.bin/texinfo/info/Makefile
 ===================================================================
 --- gnu/usr.bin/texinfo/info/Makefile	(revision 208414)
 +++ gnu/usr.bin/texinfo/info/Makefile	(working copy)
 @@ -8,8 +8,10 @@
  	infomap.c m-x.c man.c nodemenu.c nodes.c search.c session.c \
  	signals.c terminal.c tilde.c variables.c window.c
  
 -CFLAGS+= -DINFODIR=\"${INFODIR}:/usr/local/info:.\"
 +CFLAGS+= -DINFODIR=\"${INFODIR}:${LOCALBASE}/info:.\"
  
 +LOCALBASE?= /usr/local
 +
  DPADD=	${LIBTERMCAP} ${LIBTXI}
  LDADD=	-ltermcap ${LIBTXI}
  
 --- a.diff ends here ---
>Unformatted:
