cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use print/texinfo-lite to install info pages

Browse Source 
This allows to use modern version of texinfo as well as allow packages to
install properly on a system built WITHOUT_INFO
This commit is contained in:
Baptiste Daroussin 2014-06-25 08:36:36 +00:00
parent 4dd5f3ed1d
commit e1d7d7f00f
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=359201
2 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Keywords/info.yaml
View File

@ -5,11 +5,11 @@
actions: [file]
post-install: |
file=%D/%@
install-info --quiet %D/%@ %D/info/dir
ginstall-info --quiet %D/%@ %D/info/dir
post-deinstall: |
file=%D/%@
install-info --quiet --delete %D/%@ %D/info/dir
if [ $(info -d ${file%/*} --output - 2>/dev/null | grep -c '^*') -eq 1 ]; then
ginstall-info --quiet --delete %D/%@ %D/info/dir
if [ $(ginfo -d ${file%/*} --output - 2>/dev/null | grep -c '^*') -eq 1 ]; then
rm -f ${file%/*}/dir
fi
if [ ${file%/*} != "%D/info" ]; then

23
Mk/bsd.port.mk
View File

@ -1118,6 +1118,12 @@ SCRIPTSDIR?= ${PORTSDIR}/Mk/Scripts
LIB_DIRS?= /lib /usr/lib ${LOCALBASE}/lib
NOTPHONY?=
PKG_ENV+= PORTSDIR=${PORTSDIR}
CONFIGURE_ENV+= XDG_DATA_HOME=${WRKDIR} \
XDG_CONFIG_HOME=${WRKDIR} \
HOME=${WRKDIR}
MAKE_ENV+= XDG_DATA_HOME=${WRKDIR} \
XDG_CONFIG_HOME=${WRKDIR} \
HOME=${WRKDIR}
.if defined(FORCE_STAGE)
.undef NO_STAGE
@ -2908,12 +2914,9 @@ INFO_PATH?= info
.endif
.if defined(INFO)
#.if !exists(/usr/bin/install-info)
#.if ${.CURDIR} != ${PORTSDIR}/print/texinfo
#BUILD_DEPENDS+= makeinfo:${PORTSDIR}/print/texinfo
#RUN_DEPENDS+= install-info:${PORTSDIR}/print/texinfo
#.endif
#.endif
BUILD_DEPENDS+= ginstall-info:${PORTSDIR}/print/texinfo-lite
RUN_DEPENDS+= ginstall-info:${PORTSDIR}/print/texinfo-lite
. for D in ${INFO:H}
RD:= ${D}
. if ${RD} != "."
@ -5653,15 +5656,15 @@ add-plist-info:
# Process GNU INFO files at package install/deinstall time
.for i in ${INFO}
.if defined(NO_STAGE)
install-info --quiet ${PREFIX}/${INFO_PATH}/$i.info ${PREFIX}/${INFO_PATH}/dir
ginstall-info --quiet ${PREFIX}/${INFO_PATH}/$i.info ${PREFIX}/${INFO_PATH}/dir
.endif
.if !defined(WITH_PKGNG)
@${ECHO_CMD} "@unexec install-info --quiet --delete %D/${INFO_PATH}/$i.info %D/${INFO_PATH}/dir" \
@${ECHO_CMD} "@unexec ginstall-info --quiet --delete %D/${INFO_PATH}/$i.info %D/${INFO_PATH}/dir" \
>> ${TMPPLIST}
@${ECHO_CMD} "@unexec [ \`info -d %D/${INFO_PATH} --output - 2>/dev/null | grep -c '^*'\` -eq 1 ] && rm -f %D/${INFO_PATH}/dir || :"\
@${ECHO_CMD} "@unexec [ \`ginfo -d %D/${INFO_PATH} --output - 2>/dev/null | grep -c '^*'\` -eq 1 ] && rm -f %D/${INFO_PATH}/dir || :"\
>> ${TMPPLIST}
@${LS} ${STAGEDIR}${PREFIX}/${INFO_PATH}/$i.info* | ${SED} -e s:${STAGEDIR}${PREFIX}/::g >> ${TMPPLIST}
@${ECHO_CMD} "@exec install-info --quiet %D/${INFO_PATH}/$i.info %D/${INFO_PATH}/dir" \
@${ECHO_CMD} "@exec ginstall-info --quiet %D/${INFO_PATH}/$i.info %D/${INFO_PATH}/dir" \
>> ${TMPPLIST}
.else
@${LS} ${STAGEDIR}${PREFIX}/${INFO_PATH}/$i.info* 2>/dev/null | ${SED} -e s:${STAGEDIR}${PREFIX}/:@info\ :g >> ${TMPPLIST}