portmaster ports update 20140416

[Antonio Olivares]

On Fri, Apr 25, 2014 at 11:54 AM, Tijl Coosemans <tijl at freebsd.org> wrote:
> On Fri, 25 Apr 2014 11:47:07 -0500 Antonio Olivares wrote:
>> On Fri, Apr 25, 2014 at 11:44 AM, Tijl Coosemans <tijl at freebsd.org> wrote:
>>> It's strange that the patch doesn't apply at all.  Did it get corrupted
>>> maybe?  How did you get it to the machine?
>>
>> I downloaded it via firefox :
>>
>> $ cat colord.patch
>> Index: graphics/colord/Makefile
>> ===================================================================
>> --- graphics/colord/Makefile    (revision 352018)
>> +++ graphics/colord/Makefile    (working copy)
>> @@ -4,7 +4,7 @@
>>
>>  PORTNAME=    colord
>>  PORTVERSION=    1.0.1
>> -PORTREVISION=    1
>> +PORTREVISION=    2
>>  CATEGORIES=    graphics
>>  MASTER_SITES=    http://www.freedesktop.org/software/colord/releases/
>>
>> @@ -71,7 +71,4 @@ post-patch:
>>          s|2MAN_FALSE='#'|2MAN_FALSE=|g" ${WRKSRC}/configure
>>  .endif
>>
>> -post-install:
>> -    @${MKDIR} ${STAGEDIR}/var/db/colord/icc
>> -
>>  .include <bsd.port.mk>
>> Index: graphics/colord/pkg-install
>> ===================================================================
>> --- graphics/colord/pkg-install    (revision 352018)
>> +++ graphics/colord/pkg-install    (working copy)
>> @@ -1,11 +0,0 @@
>> -#!/bin/sh
>> -
>> -case $2 in
>> -POST-INSTALL)
>> -    /bin/mkdir -p /var/db/colord/icc
>> -    /bin/chmod 0755 /var/db/colord
>> -    /usr/sbin/chown colord:colord /var/db/colord
>> -    /usr/sbin/chown colord:colord /var/db/colord/icc
>> -    exit 0
>> -    ;;
>> -esac
>> Index: graphics/colord/pkg-plist
>> ===================================================================
>> --- graphics/colord/pkg-plist    (revision 352018)
>> +++ graphics/colord/pkg-plist    (working copy)
>> @@ -197,7 +197,7 @@ share/polkit-1/actions/org.freedesktop.c
>>  @dirrm include/colord-1/colord-session
>>  @dirrm include/colord-1/colord
>>  @dirrm include/colord-1
>> - at cwd /
>> - at dirrmtry var/db/colord/icc
>> - at dirrmtry var/db/colord
>> - at cwd
>> + at exec install -d -o colord -g colord -m 0755 /var/db/colord
>> + at exec install -d -o colord -g colord -m 0755 /var/db/colord/icc
>> + at unexec rm -d /var/db/colord/icc 2>/dev/null || :
>> + at unexec rm -d /var/db/colord 2>/dev/null || :
>> $
>
> Hmm, there seem to be spaces where there should be tabs.  I've attached
> a bzip2 compressed version now.  Hopefully that gets through unchanged.
> You can uncompress it with "bunzip2 colord.patch.bz2".  Then you can
> apply it same as before:
>
> # cd /usr/ports
> # patch -E < /path/to/colord.patch
> # cd graphics/colord
> # make clean
> # make install


Thank you very much Sir!  This time success!


root at E-213-3W:~ # cd /usr/ports/
root at E-213-3W:/usr/ports # patch -E < /home/olivares/Downloads/colord.patch
Hmm...  Looks like a unified diff to me...
The text leading up to this was:
--------------------------
|Index: graphics/colord/Makefile
|===================================================================
|--- graphics/colord/Makefile    (revision 352018)
|+++ graphics/colord/Makefile    (working copy)
--------------------------
Patching file graphics/colord/Makefile using Plan A...
Hunk #1 succeeded at 4.
Hunk #2 succeeded at 71.
Hmm...  The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|Index: graphics/colord/pkg-install
|===================================================================
|--- graphics/colord/pkg-install    (revision 352018)
|+++ graphics/colord/pkg-install    (working copy)
--------------------------
Patching file graphics/colord/pkg-install using Plan A...
Hunk #1 succeeded at 0.
Removing graphics/colord/pkg-install (empty after patching).
Hmm...  The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|Index: graphics/colord/pkg-plist
|===================================================================
|--- graphics/colord/pkg-plist    (revision 352018)
|+++ graphics/colord/pkg-plist    (working copy)
--------------------------
Patching file graphics/colord/pkg-plist using Plan A...
Hunk #1 succeeded at 197.
done
root at E-213-3W:/usr/ports # cd graphics/colord
root at E-213-3W:/usr/ports/graphics/colord # make clean
===>  Cleaning for colord-1.0.1_2

...

====> Compressing man pages (compress-man)
===> Correct pkg-plist sequence to create group(s) and user(s)
===>  Building package for colord-1.0.1_2
Creating package /usr/ports/graphics/colord/work/pkg/colord-1.0.1_2.tbz
Registering depends: polkit-0.105_3 gobject-introspection-1.36.0_2
glib-2.36.3_2 python-2.7_1,2 python2-2_2 python27-2.7.6_4
gettext-0.18.3.1 dbus-1.8.0 libX11-1.6.2_2,1 libxcb-1.10_2
libxml2-2.8.0_5 libiconv-1.14_3 sqlite3-3.8.4.2 libffi-3.0.13_1
libpthread-stubs-0.3_4 pcre-8.34 lcms2-2.6_1 perl5-5.16.3_9
gnomehier-3.0 gnome_subr-1.0 expat-2.1.0 kbproto-1.0.6 libSM-1.2.2_2,1
libICE-1.0.8_2,1 libXau-1.0.8_2 libXdmcp-1.1.1_2 xproto-7.0.25.
Creating bzip'd tar ball in
'/usr/ports/graphics/colord/work/pkg/colord-1.0.1_2.tbz'
===>  Installing for colord-1.0.1_2
===>  Checking if graphics/colord already installed
===> Creating users and/or groups.
Using existing group 'colord'.
Using existing user 'colord'.
pkg_install EOL is scheduled for 2014-09-01. Please consider migrating to pkgng
http://blogs.freebsdish.org/portmgr/2014/02/03/time-to-bid-farewell-to-the-old-pkg_-tools/
root at E-213-3W:/usr/ports/graphics/colord #

Best Regards,


Antonio