conf/146821: [patch] texinfo/info: respect LOCALBASE for INFODIR

[Anonymous]

>Number:         146821
>Category:       conf
>Synopsis:       [patch] texinfo/info: 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:
>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:
>Unformatted: