Date: Fri, 25 Apr 2014 15:03:15 -0500 From: Antonio Olivares <olivares14031@gmail.com> To: Tijl Coosemans <tijl@freebsd.org>, Koop Mast <kwm@rainbow-runner.nl>, FreeBSD Questions <freebsd-questions@freebsd.org> Subject: Re: portmaster ports update 20140416 Message-ID: <CAJ5UdcMZyHD-mPO7rGU2fOL9eBnj%2Bmvyj4Jttb76DZ57rSQ7%2Bw@mail.gmail.com> In-Reply-To: <CAJ5UdcM7YbBe%2BkVNzyjrOi4Gyygup3ZE6T1_92TQ=7%2B4o7BDvQ@mail.gmail.com> References: <CAJ5UdcO1=pEHownza5VGH7wd06e3QhGr-yxuUPJvVXBvH1HbLg@mail.gmail.com> <20140424232140.08a9acff@kalimero.tijl.coosemans.org> <CAJ5UdcPi1eq_BGZwm4iDWgkE6ZtSUe1jMF6DPoC0UTBYb-dO%2Bw@mail.gmail.com> <20140425000339.44c933b6@kalimero.tijl.coosemans.org> <CAJ5UdcM%2B4Eb-gEFG_w10VxHBEgnVuVtXy%2BYwkZdyLLkPvFmZ%2Bw@mail.gmail.com> <20140425142046.15efbeb7@kalimero.tijl.coosemans.org> <CAJ5UdcMkZZ9HuW7MAXCkwx-kuNBwcJCC2kB0nkeCBdxApH=0gQ@mail.gmail.com> <20140425174815.296cff33@kalimero.tijl.coosemans.org> <CAJ5UdcNO0Mbrv2MMMXsUJp1v4SufKs7=WxoZkAJ1Aj31TEZSEg@mail.gmail.com> <CAJ5UdcORTOKZfs6DqKLJC8ELwJiCTZnme=eEVQVLxCLtWS2VUg@mail.gmail.com> <20140425182347.248aca18@kalimero.tijl.coosemans.org> <CAJ5UdcN1g-XS1ZOWkk9NWyfrs3MuivQORR_erm7xRto%2Be2_d4w@mail.gmail.com> <CAJ5UdcNasGf9sHGi0KQT51KTxxhyBxKE1WG7CR8F_6RsZ83Gfg@mail.gmail.com> <20140425184420.5b697ac3@kalimero.tijl.coosemans.org> <CAJ5UdcO5uQ6VDTrDt41fa6O%2BTWjOe6JNCW3epeH2KDhmiciT1w@mail.gmail.com> <20140425185442.6849a7c6@kalimero.tijl.coosemans.org> <CAJ5UdcM7YbBe%2BkVNzyjrOi4Gyygup3ZE6T1_92TQ=7%2B4o7BDvQ@mail.gmail.com>
next in thread | previous in thread | raw e-mail | index | archive | help
On Fri, Apr 25, 2014 at 11:58 AM, Antonio Olivares <olivares14031@gmail.com> wrote: > On Fri, Apr 25, 2014 at 11:54 AM, Tijl Coosemans <tijl@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@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 >>> -@cwd / >>> -@dirrmtry var/db/colord/icc >>> -@dirrmtry var/db/colord >>> -@cwd >>> +@exec install -d -o colord -g colord -m 0755 /var/db/colord >>> +@exec install -d -o colord -g colord -m 0755 /var/db/colord/icc >>> +@unexec rm -d /var/db/colord/icc 2>/dev/null || : >>> +@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@E-213-3W:~ # cd /usr/ports/ > root@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@E-213-3W:/usr/ports # cd graphics/colord > root@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@E-213-3W:/usr/ports/graphics/colord # > > Best Regards, > > > Antonio One more machine to update. Three out of 4 have succeeded. Thanks to all for your valuable advice and help. I could not have achieved this without you. Best Regards, Antonio
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAJ5UdcMZyHD-mPO7rGU2fOL9eBnj%2Bmvyj4Jttb76DZ57rSQ7%2Bw>