View | Details | Raw Unified | Return to bug 129741 | Differences between
and this patch

Collapse All | Expand All

(-)bsd.commands.mk (+12 lines)
Lines 92-97 XARGS?= /usr/bin/xargs Link Here
92
XMKMF?=		${LOCALBASE}/bin/xmkmf -a
92
XMKMF?=		${LOCALBASE}/bin/xmkmf -a
93
YACC?=		/usr/bin/yacc
93
YACC?=		/usr/bin/yacc
94
94
95
.if exists(/usr/bin/install-info) && !defined(WITHOUT_INFO)
96
HAS_INFO=	yes
97
INSTALLINFO?=	/usr/bin/install-info
98
MAKEINFO?=	/usr/bin/makeinfo
99
.else
100
# Ideally, ports should key on HAS_INFO.  In some cases, it
101
# may make more sense to just have a port use ${MAKEINFO} and
102
# ${INSTALLINFO} which are defined to a no-op here.
103
INSTALLINFO?=	true
104
MAKEINFO?=	true
105
.endif
106
95
.if exists(/sbin/md5)
107
.if exists(/sbin/md5)
96
MD5?=		/sbin/md5
108
MD5?=		/sbin/md5
97
.else
109
.else
(-)bsd.port.mk (-4 / +4 lines)
Lines 5663-5675 add-plist-data: Link Here
5663
.if !target(add-plist-info)
5663
.if !target(add-plist-info)
5664
add-plist-info:
5664
add-plist-info:
5665
# Process GNU INFO files at package install/deinstall time
5665
# Process GNU INFO files at package install/deinstall time
5666
.if defined(INFO)
5666
.if defined(INFO) && defined(HAS_INFO)
5667
.for i in ${INFO}
5667
.for i in ${INFO}
5668
	install-info --quiet ${PREFIX}/${INFO_PATH}/$i.info ${PREFIX}/${INFO_PATH}/dir
5668
	${INSTALLINFO} --quiet ${PREFIX}/${INFO_PATH}/$i.info ${PREFIX}/${INFO_PATH}/dir
5669
	@${ECHO_CMD} "@unexec install-info --quiet --delete %D/${INFO_PATH}/$i.info %D/${INFO_PATH}/dir" \
5669
	@${ECHO_CMD} "@unexec ${INSTALLINFO} --quiet --delete %D/${INFO_PATH}/$i.info %D/${INFO_PATH}/dir" \
5670
		>> ${TMPPLIST}
5670
		>> ${TMPPLIST}
5671
	@${LS} ${PREFIX}/${INFO_PATH}/$i.info* | ${SED} -e s:${PREFIX}/::g >> ${TMPPLIST}
5671
	@${LS} ${PREFIX}/${INFO_PATH}/$i.info* | ${SED} -e s:${PREFIX}/::g >> ${TMPPLIST}
5672
	@${ECHO_CMD} "@exec install-info --quiet %D/${INFO_PATH}/$i.info %D/${INFO_PATH}/dir" \
5672
	@${ECHO_CMD} "@exec ${INSTALLINFO} --quiet %D/${INFO_PATH}/$i.info %D/${INFO_PATH}/dir" \
5673
		>> ${TMPPLIST}
5673
		>> ${TMPPLIST}
5674
.endfor
5674
.endfor
5675
.if defined(INFO_SUBDIR)
5675
.if defined(INFO_SUBDIR)

Return to bug 129741