Date: Wed, 25 Jun 2014 08:36:37 +0000 (UTC) From: Baptiste Daroussin <bapt@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r359201 - in head: Keywords Mk Message-ID: <201406250836.s5P8abD4081750@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bapt Date: Wed Jun 25 08:36:36 2014 New Revision: 359201 URL: http://svnweb.freebsd.org/changeset/ports/359201 QAT: https://qat.redports.org/buildarchive/r359201/ Log: Use print/texinfo-lite to install info pages This allows to use modern version of texinfo as well as allow packages to install properly on a system built WITHOUT_INFO Modified: head/Keywords/info.yaml head/Mk/bsd.port.mk Modified: head/Keywords/info.yaml ============================================================================== --- head/Keywords/info.yaml Wed Jun 25 08:32:12 2014 (r359200) +++ head/Keywords/info.yaml Wed Jun 25 08:36:36 2014 (r359201) @@ -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 Modified: head/Mk/bsd.port.mk ============================================================================== --- head/Mk/bsd.port.mk Wed Jun 25 08:32:12 2014 (r359200) +++ head/Mk/bsd.port.mk Wed Jun 25 08:36:36 2014 (r359201) @@ -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}
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201406250836.s5P8abD4081750>