Date: Sun, 22 Oct 2006 17:35:49 +0300 From: Andy Fawcett <andy@athame.co.uk> To: kde-freebsd@freebsd.kde.org Cc: gnome@freebsd.org, Kris Kennaway <kris@obsecurity.org> Subject: Re: [kde-freebsd] [ports-i386@FreeBSD.org: ru-ksocrat-3.2.1_1 failed on i386 6] Message-ID: <200610221735.51066.andy@athame.co.uk> In-Reply-To: <200610212216.05499.andy@athame.co.uk> References: <20061021152926.GA8559@xor.obsecurity.org> <20061021182715.GA11214@xor.obsecurity.org> <200610212216.05499.andy@athame.co.uk>
next in thread | previous in thread | raw e-mail | index | archive | help
--Boundary-00=_HH4OFtOBM4s+9Wc Content-Type: text/plain; charset="iso-8859-15" Content-Transfer-Encoding: 7bit Content-Disposition: inline On Saturday 21 October 2006 22:16, Andy Fawcett wrote: > On Saturday 21 October 2006 21:27, Kris Kennaway wrote: > > On Sat, Oct 21, 2006 at 09:23:29PM +0300, Andy Fawcett wrote: > > > > OK, so who is going to take responsibility for the ~50 other > > > > failures that began after the recent commit? > > > > > > Can you point to them? Since they're not listed against kde@, I > > > can't guess which of the other 15000+ ports they are against? If > > > they're caused by lofi's last change I'll do my best to find > > > solutions. > > > > As I said, check pointyhat's i386 6.x build. Specifically: > > > > http://pointyhat.freebsd.org/errorlogs/i386-6-latest/ > > > > Almost all of the mtree failures are fallout from this recent > > change. > > > > Kris > > > > P.S. Actually there are only 37 of them, but that's still too many. > > Looking at them. Since they are all virtually the same error, > hopefully will be easy to fix them all. Previously, these directories were owned by misc/kdehier which included a .keep_me file to prevent dependency ports @dirrmtry from removing the directories. Now the directories are owned by misc/hicolor-icon-theme which doesn't have this mechanism. Thus the dependency ports are able to remove the directories. One possibility would be to adapt hicolor-icon-theme to do something similar to what kdehier does, and fix it centrally. Patch attached ( in case mailman strips it, also at http://athame.ath.cx/hicolor2.diff ) developed by myself and Markus Brueffer. Opening this up to gnome@ for further consideration. Andy -- Andy Fawcett | andy@athame.co.uk | tap@kde.org "In an open world without walls and fences, | tap@lspace.org we wouldn't need Windows and Gates." -- anon | tap@fruitsalad.org --Boundary-00=_HH4OFtOBM4s+9Wc Content-Type: text/x-diff; charset="iso-8859-15"; name="hicolor2.diff" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="hicolor2.diff" --- Makefile.real Sat Oct 14 11:35:20 2006 +++ Makefile Sat Oct 21 23:49:32 2006 @@ -8,7 +8,7 @@ PORTNAME= hicolor-icon-theme PORTVERSION= 0.9 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= misc gnome MASTER_SITES= http://icon-theme.freedesktop.org/releases/ @@ -45,6 +45,16 @@ . for ctxt in ${ICON_CONTEXTS} if [ "${ctxt}" = "stock" ] ; then \ for sub in ${STOCK_SUBS} ; do \ + ${ECHO_CMD} "${ICON_DIR}/${dir}/${ctxt}/$${sub}/.keep_me" >> ${PLIST} ; \ + done \ + fi + ${ECHO_CMD} "${ICON_DIR}/${dir}/${ctxt}/.keep_me" >> ${PLIST} ; +. endfor +.endfor +.for dir in ${ICON_SIZES} +. for ctxt in ${ICON_CONTEXTS} + if [ "${ctxt}" = "stock" ] ; then \ + for sub in ${STOCK_SUBS} ; do \ ${ECHO_CMD} "@dirrmtry ${ICON_DIR}/${dir}/${ctxt}/$${sub}" >> ${PLIST} ; \ done \ fi @@ -54,5 +64,17 @@ .endfor ${ECHO_CMD} "@dirrmtry ${ICON_DIR}" >> ${PLIST} ${ECHO_CMD} "@dirrmtry share/icons" >> ${PLIST} + +post-install: +.for dir in ${ICON_SIZES} +. for ctxt in ${ICON_CONTEXTS} + if [ "${ctxt}" = "stock" ] ; then \ + for sub in ${STOCK_SUBS} ; do \ + ${TOUCH} ${PREFIX}/${ICON_DIR}/${dir}/${ctxt}/$${sub}/.keep_me ; \ + done \ + fi + ${TOUCH} ${PREFIX}/${ICON_DIR}/${dir}/${ctxt}/.keep_me +. endfor +.endfor .include <bsd.port.post.mk> --Boundary-00=_HH4OFtOBM4s+9Wc--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200610221735.51066.andy>