diff options
| author | Baptiste Daroussin <bapt@FreeBSD.org> | 2014-06-25 08:36:36 +0000 |
|---|---|---|
| committer | Baptiste Daroussin <bapt@FreeBSD.org> | 2014-06-25 08:36:36 +0000 |
| commit | e1d7d7f00f4209bc5561ebb7036408bf9ad49f9f (patch) | |
| tree | d12c26e3266c16932d72eb0730b9c19216a464e1 | |
| parent | 4dd5f3ed1dc379f3b19b3e4a7cf705428b89879e (diff) | |
| download | ports-e1d7d7f00f4209bc5561ebb7036408bf9ad49f9f.tar.gz ports-e1d7d7f00f4209bc5561ebb7036408bf9ad49f9f.zip | |
Notes
| -rw-r--r-- | Keywords/info.yaml | 6 | ||||
| -rw-r--r-- | Mk/bsd.port.mk | 23 |
2 files changed, 16 insertions, 13 deletions
diff --git a/Keywords/info.yaml b/Keywords/info.yaml index e571d3a1e7a5..6c34caab8527 100644 --- a/Keywords/info.yaml +++ b/Keywords/info.yaml @@ -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 diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk index 5fe97ab7560d..f7f422089133 100644 --- a/Mk/bsd.port.mk +++ b/Mk/bsd.port.mk @@ -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} |