diff options
| author | kwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059> | 2014-09-14 19:35:07 +0800 |
|---|---|---|
| committer | kwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059> | 2014-09-14 19:35:07 +0800 |
| commit | eb4502df39e60d02a1862d904b2c7bcf7c42c2f8 (patch) | |
| tree | dd780f0be0cd6505eaf3930e8c832868dcacf31b | |
| parent | 81394d342f088d2107f6336fea4259217747af25 (diff) | |
| download | marcuscom-ports-eb4502df39e60d02a1862d904b2c7bcf7c42c2f8.tar marcuscom-ports-eb4502df39e60d02a1862d904b2c7bcf7c42c2f8.tar.gz marcuscom-ports-eb4502df39e60d02a1862d904b2c7bcf7c42c2f8.tar.bz2 marcuscom-ports-eb4502df39e60d02a1862d904b2c7bcf7c42c2f8.tar.lz marcuscom-ports-eb4502df39e60d02a1862d904b2c7bcf7c42c2f8.tar.xz marcuscom-ports-eb4502df39e60d02a1862d904b2c7bcf7c42c2f8.tar.zst marcuscom-ports-eb4502df39e60d02a1862d904b2c7bcf7c42c2f8.zip | |
Merge some ports changes.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@19860 df743ca5-7f9a-e211-a948-0013205c9059
| -rw-r--r-- | Mk/bsd.gnome.mk | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/Mk/bsd.gnome.mk b/Mk/bsd.gnome.mk index 5d7a49b56..bb7da0398 100644 --- a/Mk/bsd.gnome.mk +++ b/Mk/bsd.gnome.mk @@ -296,7 +296,7 @@ libxml2_BUILD_DEPENDS= xml2-config:${PORTSDIR}/textproc/libxml2 libxml2_LIB_DEPENDS= libxml2.so:${PORTSDIR}/textproc/libxml2 libxml2_RUN_DEPENDS= xml2-config:${PORTSDIR}/textproc/libxml2 libxml2_DETECT= ${LOCALBASE}/libdata/pkgconfig/libxml-2.0.pc - + libxslt_BUILD_DEPENDS= xsltproc:${PORTSDIR}/textproc/libxslt libxslt_LIB_DEPENDS= libxslt.so:${PORTSDIR}/textproc/libxslt libxslt_RUN_DEPENDS= ${libxslt_BUILD_DEPENDS} @@ -482,7 +482,7 @@ intltool_BUILD_DEPENDS= ${intltool_DETECT}:${PORTSDIR}/textproc/intltool intlhack_PRE_PATCH= ${FIND} ${WRKSRC} -name "intltool-merge.in" | ${XARGS} ${REINPLACE_CMD} -e \ 's|mkdir $$lang or|mkdir $$lang, 0777 or| ; \ s|^push @INC, "/.*|push @INC, "${LOCALBASE}/share/intltool";| ; \ - s|/usr/bin/iconv|${LOCALBASE}/bin/iconv|g ; \ + s|/usr/bin/iconv|${ICONV_CMD|g ; \ s|unpack *[(]'"'"'U\*'"'"'|unpack ('"'"'C*'"'"'|' intlhack_USE_GNOME_IMPL=intltool @@ -802,7 +802,7 @@ GNOME_PRE_PATCH+= ; ${${component}_PRE_PATCH} . endfor .endif -. if defined(GCONF_SCHEMAS) && ! defined(NO_STAGE) +. if defined(GCONF_SCHEMAS) MAKE_ENV+= GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 . endif .endif @@ -892,17 +892,13 @@ gnome-post-install: . if defined(INSTALLS_ICONS) @${RM} -f ${TMPPLIST}.icons1 @for i in `${GREP} "^share/icons/.*/" ${TMPPLIST} | ${CUT} -d / -f 1-3 | ${SORT} -u`; do \ - ${ECHO_CMD} "@unexec /bin/rm %D/$${i}/icon-theme.cache 2>/dev/null || /usr/bin/true" \ + ${ECHO_CMD} "@rmtry %D/$${i}/icon-theme.cache 2>/dev/null || /usr/bin/true" \ >> ${TMPPLIST}.icons1; \ ${ECHO_CMD} "@exec ${LOCALBASE}/bin/gtk-update-icon-cache -q -f %D/$${i} 2>/dev/null || /usr/bin/true" \ >> ${TMPPLIST}; \ ${ECHO_CMD} "@unexec ${LOCALBASE}/bin/gtk-update-icon-cache -q -f %D/$${i} 2>/dev/null || /usr/bin/true" \ >> ${TMPPLIST}; \ done -.if defined(NO_STAGE) - @for i in `${GREP} "^share/icons/.*/" ${TMPPLIST} | ${CUT} -d / -f 1-3 | ${SORT} -u`; do \ - ${LOCALBASE}/bin/gtk-update-icon-cache -q -f ${PREFIX}/$${i} 2>/dev/null || ${TRUE}; \ - done .endif @if test -f ${TMPPLIST}.icons1; then \ ${CAT} ${TMPPLIST}.icons1 ${TMPPLIST} > ${TMPPLIST}.icons2; \ |