ports/185413: [ports update] graphics/webp does not install, strange pkg-plist

[Kurt Jaeger]

>Number:         185413
>Category:       ports
>Synopsis:       [ports update] graphics/webp does not install, strange pkg-plist
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Thu Jan 02 10:20:00 UTC 2014
>Closed-Date:
>Last-Modified:
>Originator:     Kurt Jaeger
>Release:        FreeBSD 9.2-RELEASE i386
>Organization:
-
>Environment:
System: FreeBSD fi9.opsec.eu 9.2-RELEASE FreeBSD 9.2-RELEASE #0 r255898: Fri Sep 27 03:52:52 UTC 2013 root at bake.isc.freebsd.org:/usr/obj/usr/src/sys/GENERIC i386


>Description:

fi9$ pwd
/usr/ports/graphics/webp
fi9$ l
total 40
drwxrwxr-x     2 root  wheel    512 Jan  2 10:55 .
drwxrwxr-x  1084 root  wheel  24064 Dec 29 21:28 ..
-rw-r--r--     1 root  wheel    932 Dec 29 21:28 Makefile
-rw-r--r--     1 root  wheel    134 Sep 10 21:28 distinfo
-rw-rw-r--     1 root  wheel    316 Jan  1  2013 pkg-descr
-rw-r--r--     1 root  wheel    798 Dec 29 21:28 pkg-plist
-rw-r--r--     1 root  wheel    715 Dec 29 21:28 pkg-plist.mine
-rw-r--r--     1 root  wheel    725 Dec 29 21:28 pkg-plist.r337897
-rw-r--r--     1 root  wheel    732 Dec 29 21:28 pkg-plist.r338038

The pkg-plist, from what I understand, contains an unresolved merge
conflict -- and some additional pkg-plist-files which are not really
required ?

See:

[...]
bin/gif2webp
<<<<<<< .mine
||||||| .r337897
bin/vwebp
=======
%%X11%%bin/vwebp
>How-To-Repeat:
	
cd /usr/ports/graphics/webp
make install

fails with

[...]
Creating bzip'd tar ball in '/usr/local/ports/graphics/webp/work/webp-0.3.1_4.tbz'
tar: <<<<<<< .mine: Cannot stat: No such file or directory
tar: ||||||| .r337897: Cannot stat: No such file or directory
tar: =======: Cannot stat: No such file or directory
tar: >>>>>>> .r338038: Cannot stat: No such file or directory
tar: Error exit delayed from previous errors.
pkg_create: make_dist: tar command failed with code 256
*** [do-package] Error code 1

>Fix:

diff -r -u graphics/webp/pkg-plist /usr/home/pi/myp/graphics/webp/pkg-plist
--- graphics/webp/pkg-plist	2013-12-29 21:28:56.000000000 +0100
+++ /usr/home/pi/myp/graphics/webp/pkg-plist	2014-01-02 10:55:54.000000000 +0100
@@ -1,12 +1,7 @@
 bin/cwebp
 bin/dwebp
 bin/gif2webp
-<<<<<<< .mine
-||||||| .r337897
 bin/vwebp
-=======
-%%X11%%bin/vwebp
->>>>>>> .r338038
 bin/webpmux
 include/webp/decode.h
 include/webp/demux.h
Only in graphics/webp: pkg-plist.mine
Only in graphics/webp: pkg-plist.r337897
Only in graphics/webp: pkg-plist.r338038

>Release-Note:
>Audit-Trail:
>Unformatted:
 >>>>>>> .r338038
 bin/webpmux
 [...]
 
 Still open: How would a webp build with OPTION X11 disabled work
 if the pkg-plist is fixed ?