portmaster ports update 20140416

[Antonio Olivares]

On Fri, Apr 25, 2014 at 11:44 AM, Tijl Coosemans <tijl at freebsd.org> wrote:
> On Fri, 25 Apr 2014 11:34:23 -0500 Antonio Olivares wrote:
>> I run the make clean in /usr/ports/graphics/colord/
>>
>> I check which files are in colord directory.  I see  :
>>
>> root at E-213-3W:/usr/ports/graphics/colord # ls -l
>> total 72
>> -rw-r--r--  1 root  wheel  2249 Apr 25 16:18 Makefile
>> -rw-r--r--  1 root  wheel  2249 Apr 25 15:57 Makefile.orig
>> -rw-r--r--  1 root  wheel   675 Apr 25 16:18 Makefile.rej
>> -rw-r--r--  1 root  wheel   675 Apr 25 15:57 Makefile.rej.orig
>> -rw-r--r--  1 root  wheel  1197 Apr 25 15:38 buildlog
>> -rw-r--r--  1 root  wheel   133 Jul 31  2013 distinfo
>> drwxr-xr-x  2 root  wheel   512 Apr 10 13:46 files
>> -rw-r--r--  1 root  wheel   195 Mar  8  2013 pkg-descr
>> -rw-r--r--  1 root  wheel   215 Apr 25 16:18 pkg-install
>> -rw-r--r--  1 root  wheel   215 Apr 25 15:57 pkg-install.orig
>> -rw-r--r--  1 root  wheel   289 Apr 25 16:18 pkg-install.rej
>> -rw-r--r--  1 root  wheel   289 Apr 25 15:57 pkg-install.rej.orig
>> -rw-r--r--  1 root  wheel  7386 Apr 25 16:18 pkg-plist
>> -rw-r--r--  1 root  wheel  7386 Apr 25 15:57 pkg-plist.orig
>> -rw-r--r--  1 root  wheel   564 Apr 25 16:18 pkg-plist.rej
>> -rw-r--r--  1 root  wheel   564 Apr 25 15:57 pkg-plist.rej.orig
>> root at E-213-3W:/usr/ports/graphics/colord # make clean
>> root at E-213-3W:/usr/ports/graphics/colord # make clean
>> ===>  Cleaning for colord-1.0.1_1
>>
>> ......
>>
>> ====> Compressing man pages (compress-man)
>> ===> Correct pkg-plist sequence to create group(s) and user(s)
>> ===>  Building package for colord-1.0.1_1
>> Creating package /usr/ports/graphics/colord/work/pkg/colord-1.0.1_1.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_1.tbz'
>> tar: share/glib-2.0/schemas/org.freedesktop.ColorHelper.gschema.xml:
>> Cannot stat: No such file or directory
>> tar: Error exit delayed from previous errors.
>> pkg_create: make_dist: tar command failed with code 256
>
> You can remove *.orig and *.rej files.
>
> 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 || :
$

Best Regards,


Antonio