Attachment 92155 Details for Bug 129741 – file.diff

[patch] file.diff

file.diff (text/plain), 2.19 KB, created by John E. Hein on 2008-12-18 19:10:03 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: John E. Hein

Created: 2008-12-18 19:10:03 UTC

Size: 2.19 KB

patch

obsolete

>Index: bsd.commands.mk
>===================================================================
>RCS file: /base/FreeBSD-CVS/ports/Mk/bsd.commands.mk,v
>retrieving revision 1.3
>diff -u -p -r1.3 bsd.commands.mk
>--- bsd.commands.mk	14 Apr 2008 16:46:41 -0000	1.3
>+++ bsd.commands.mk	18 Dec 2008 17:58:12 -0000
>@@ -92,6 +92,18 @@ XARGS?=		/usr/bin/xargs
> XMKMF?=		${LOCALBASE}/bin/xmkmf -a
> YACC?=		/usr/bin/yacc
> 
>+.if exists(/usr/bin/install-info) && !defined(WITHOUT_INFO)
>+HAS_INFO=	yes
>+INSTALLINFO?=	/usr/bin/install-info
>+MAKEINFO?=	/usr/bin/makeinfo
>+.else
>+# Ideally, ports should key on HAS_INFO.  In some cases, it
>+# may make more sense to just have a port use ${MAKEINFO} and
>+# ${INSTALLINFO} which are defined to a no-op here.
>+INSTALLINFO?=	true
>+MAKEINFO?=	true
>+.endif
>+
> .if exists(/sbin/md5)
> MD5?=		/sbin/md5
> .else
>Index: bsd.port.mk
>===================================================================
>RCS file: /base/FreeBSD-CVS/ports/Mk/bsd.port.mk,v
>retrieving revision 1.604
>diff -u -p -r1.604 bsd.port.mk
>--- bsd.port.mk	5 Sep 2008 19:41:43 -0000	1.604
>+++ bsd.port.mk	18 Dec 2008 17:58:05 -0000
>@@ -5672,13 +5672,16 @@ add-plist-data:
> .if !target(add-plist-info)
> add-plist-info:
> # Process GNU INFO files at package install/deinstall time
>-.if defined(INFO)
>+.if defined(INFO) && defined(HAS_INFO)
> .for i in ${INFO}
>-	install-info --quiet ${PREFIX}/${INFO_PATH}/$i.info ${PREFIX}/${INFO_PATH}/dir
>-	@${ECHO_CMD} "@unexec install-info --quiet --delete %D/${INFO_PATH}/$i.info %D/${INFO_PATH}/dir" \
>+	-ls -alF ${PREFIX}/${INFO_PATH}/$i.info ${PREFIX}/${INFO_PATH}/dir
>+	-cat ${PREFIX}/${INFO_PATH}/dir
>+	${INSTALLINFO} --quiet ${PREFIX}/${INFO_PATH}/$i.info ${PREFIX}/${INFO_PATH}/dir || \
>+		{ echo "*** ignoring failed ${INSTALLINFO} for possible duplicate entry ***" >&2; true; }
>+	@${ECHO_CMD} "@unexec ${INSTALLINFO} --quiet --delete %D/${INFO_PATH}/$i.info %D/${INFO_PATH}/dir" \
> 		>> ${TMPPLIST}
> 	@${LS} ${PREFIX}/${INFO_PATH}/$i.info* | ${SED} -e s:${PREFIX}/::g >> ${TMPPLIST}
>-	@${ECHO_CMD} "@exec install-info --quiet %D/${INFO_PATH}/$i.info %D/${INFO_PATH}/dir" \
>+	@${ECHO_CMD} "@exec ${INSTALLINFO} --quiet %D/${INFO_PATH}/$i.info %D/${INFO_PATH}/dir" \
> 		>> ${TMPPLIST}
> .endfor
> .if defined(INFO_SUBDIR)

Actions: View | Diff

Attachments on bug 129741: 92155 | 92156 | 92157 | 92158