ports/157047: [Patch] graphics/imlib2 - Wrong LIB_DEPENDS if graphics/giflib is installed

[Herbert J. Skuhra]

>Number:         157047
>Category:       ports
>Synopsis:       [Patch] graphics/imlib2 - Wrong LIB_DEPENDS if graphics/giflib is installed
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sat May 14 20:10:09 UTC 2011
>Closed-Date:
>Last-Modified:
>Originator:     Herbert J. Skuhra
>Release:        FreeBSD 8.2-STABLE i386
>Organization:
>Environment:
FreeBSD oslo.ath.cx 8.2-STABLE FreeBSD 8.2-STABLE #6 r221585: Sat May  7 12:21:20 CEST 2011     herbert at oslo.ath.cx:/usr/obj/usr/src/sys/PC1  i386
>Description:
If graphics/giflib is installed graphics/imlib2 is linked against libgif.so.5
and not libungif.so.5!

% ls -l /var/db/pkg |grep gif
drwxr-xr-x  2 root  wheel  512 14 mai 21:25 giflib-4.1.6
drwxr-xr-x  2 root  wheel  512 13 mai 16:02 libungif-4.1.4_5

% pwd
/usr/ports/graphics/imlib2

% ldd work/imlib2-1.4.4/src/modules/loaders/.libs/gif.so |grep gif
work/imlib2-1.4.4/src/modules/loaders/.libs/gif.so:
        libgif.so.5 => /usr/local/lib/libgif.so.5 (0x281a4000)

So in this case LIB_DEPENDS is wrong.

Is the attached patch commitable or should we enforce linking against
libungif?

>How-To-Repeat:

>Fix:


Patch attached with submission follows:

diff -u imlib2.bak/Makefile imlib2/Makefile
--- imlib2.bak/Makefile	2011-05-14 21:11:42.000000000 +0200
+++ imlib2/Makefile	2011-05-14 21:47:44.000000000 +0200
@@ -77,11 +77,16 @@
 .endif
 
 .if !defined(WITHOUT_GIF)
-LIB_DEPENDS+=	ungif.5:${PORTSDIR}/graphics/libungif
-PLIST_SUB+=	GIF=""
+. if exists(${LOCALBASE}/lib/libgif.so)
+LIB_DEPENDS+=   gif.5:${PORTSDIR}/graphics/giflib
+PLIST_SUB+=     GIF=""
+. else
+LIB_DEPENDS+=   ungif.5:${PORTSDIR}/graphics/libungif
+PLIST_SUB+=     GIF=""
+. endif
 .else
-CONFIGURE_ARGS+=	--without-gif
-PLIST_SUB+=	GIF="@comment "
+CONFIGURE_ARGS+=        --without-gif
+PLIST_SUB+=     GIF="@comment "
 .endif
 
 .if !defined(WITHOUT_ID3)
Common subdirectories: imlib2.bak/files and imlib2/files


>Release-Note:
>Audit-Trail:
>Unformatted: