Attachment #92155 for bug #129741




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




.if !target(add-plist-info)
add-plist-info:
# Process GNU INFO files at package install/deinstall time
.if defined(INFO) && defined(HAS_INFO)
.for i in ${INFO}
	-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 ${INSTALLINFO} --quiet %D/${INFO_PATH}/$i.info %D/${INFO_PATH}/dir" \
		>> ${TMPPLIST}
.endfor
.if defined(INFO_SUBDIR)

Return to bug 129741

Lines 5672-5684 add-plist-data: Link Here

(-)bsd.port.mk (-4 / +7 lines)
5672	.if !target(add-plist-info)	5672	.if !target(add-plist-info)
5673	add-plist-info:	5673	add-plist-info:
5674	# Process GNU INFO files at package install/deinstall time	5674	# Process GNU INFO files at package install/deinstall time
5675	.if defined(INFO)	5675	.if defined(INFO) && defined(HAS_INFO)
5676	.for i in ${INFO}	5676	.for i in ${INFO}
5677	install-info --quiet ${PREFIX}/${INFO_PATH}/$i.info ${PREFIX}/${INFO_PATH}/dir	5677	-ls -alF ${PREFIX}/${INFO_PATH}/$i.info ${PREFIX}/${INFO_PATH}/dir
5678	@${ECHO_CMD} "@unexec install-info --quiet --delete %D/${INFO_PATH}/$i.info %D/${INFO_PATH}/dir" \	5678	-cat ${PREFIX}/${INFO_PATH}/dir
		5679	${INSTALLINFO} --quiet ${PREFIX}/${INFO_PATH}/$i.info ${PREFIX}/${INFO_PATH}/dir \|\| \
		5680	{ echo "* ignoring failed ${INSTALLINFO} for possible duplicate entry *" >&2; true; }
		5681	@${ECHO_CMD} "@unexec ${INSTALLINFO} --quiet --delete %D/${INFO_PATH}/$i.info %D/${INFO_PATH}/dir" \
5679	>> ${TMPPLIST}	5682	>> ${TMPPLIST}
5680	@${LS} ${PREFIX}/${INFO_PATH}/$i.info* \| ${SED} -e s:${PREFIX}/::g >> ${TMPPLIST}	5683	@${LS} ${PREFIX}/${INFO_PATH}/$i.info* \| ${SED} -e s:${PREFIX}/::g >> ${TMPPLIST}
5681	@${ECHO_CMD} "@exec install-info --quiet %D/${INFO_PATH}/$i.info %D/${INFO_PATH}/dir" \	5684	@${ECHO_CMD} "@exec ${INSTALLINFO} --quiet %D/${INFO_PATH}/$i.info %D/${INFO_PATH}/dir" \
5682	>> ${TMPPLIST}	5685	>> ${TMPPLIST}
5683	.endfor	5686	.endfor
5684	.if defined(INFO_SUBDIR)	5687	.if defined(INFO_SUBDIR)

Lines 92-97 XARGS?= /usr/bin/xargs Link Here

(-)bsd.commands.mk (+12 lines)
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