ports/58791: GNU INFO related settings in Mk/bsd.port.mk

[Yen-Ming Lee]

>Number:         58791
>Category:       ports
>Synopsis:       GNU INFO related settings in Mk/bsd.port.mk
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Fri Oct 31 19:10:16 PST 2003
>Closed-Date:
>Last-Modified:
>Originator:     Yen-Ming Lee
>Release:        FreeBSD 5.1-RELEASE-p10 i386
>Organization:
>Environment:
System: FreeBSD utopia.leeym.com 5.1-RELEASE-p10 FreeBSD 5.1-RELEASE-p10 #38: Sat Oct 18 06:46:40 CST 2003 root at utopia.leeym.com:/mnt/obj/usr/src/sys/UTOPIA i386


	
>Description:
The INFO only insert "@exec install-info ..." in PLIST, not actually execute
install-info when installing a port.

>How-To-Repeat:
	
>Fix:

	

--- bsd.port.mk.diff begins here ---
Index: bsd.port.mk
===================================================================
RCS file: /home/pcvs/ports/Mk/bsd.port.mk,v
retrieving revision 1.468
diff -u -r1.468 bsd.port.mk
--- bsd.port.mk	3 Sep 2003 19:50:24 -0000	1.468
+++ bsd.port.mk	1 Nov 2003 02:53:22 -0000
@@ -834,6 +834,7 @@
 HEAD?=		/usr/bin/head
 ID?=		/usr/bin/id
 IDENT?=		/usr/bin/ident
+INSTALLINFO?=	/usr/bin/install-info
 LDCONFIG?=	/sbin/ldconfig
 LN?=		/bin/ln
 LS?=		/bin/ls
@@ -4361,11 +4362,12 @@
 add-plist-info:
 # Process GNU INFO files at package install/deinstall time
 .for i in ${INFO}
-	@${ECHO_CMD} "@unexec install-info --delete %D/info/$i.info %D/info/dir" \
+	@${ECHO_CMD} "@unexec ${INSTALLINFO} --delete %D/info/$i.info %D/info/dir" \
 		>> ${TMPPLIST}
 	@${LS} ${PREFIX}/info/$i.info* | ${SED} -e s:${PREFIX}/::g >> ${TMPPLIST}
-	@${ECHO_CMD} "@exec install-info %D/info/$i.info %D/info/dir" \
+	@${ECHO_CMD} "@exec ${INSTALLINFO} %D/info/$i.info %D/info/dir" \
 		>> ${TMPPLIST}
+	${INSTALLINFO} ${PREFIX}/info/$i.info ${PREFIX}/info/dir
 .endfor
 
 # Compress (or uncompress) and symlink manpages.
--- bsd.port.mk.diff ends here ---


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