ports/58541: x11-fm/xfe: fix libintl and libiconv depedencies => avoid conflicts with other ports

[Simon Barner]

>Number:         58541
>Category:       ports
>Synopsis:       x11-fm/xfe: fix libintl and libiconv depedencies => avoid conflicts with other ports
>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 Oct 25 14:00:35 PDT 2003
>Closed-Date:
>Last-Modified:
>Originator:     Simon Barner
>Release:        FreeBSD 4.9-PRERELEASE i386
>Organization:
>Environment:
System: FreeBSD zi025.glhnet.mhn.de 4.9-PRERELEASE FreeBSD 4.9-PRERELEASE #1: Thu Sep 4 20:49:53 CEST 2003 simon at zi025.glhnet.mhn.de:/usr/src/sys/compile/KISTE i386

>Description:

This port did not pick up the two libraries mentioned.

One possitive side effect of getting the libintl dependency right, is
that the port does not build its included version of the gettext library and
does not install those two .alias that were conflicting with other ports
(have a look at the pkg-plist diff and you'll see what I mean)
        
http://freebsd.rambler.ru/bsdmail/freebsd-ports_2003/msg08919.html

>How-To-Repeat:
>Fix:

diff -ruN xfe/Makefile xfe.patched/Makefile
--- xfe/Makefile	Fri Aug  8 15:17:47 2003
+++ xfe.patched/Makefile	Sat Oct 25 22:30:38 2003
@@ -16,15 +16,19 @@
 COMMENT=	Fast MS-Explorer like filemanager for X
 
 LIB_DEPENDS=	FOX:${PORTSDIR}/x11-toolkits/fox \
-		png.5:${PORTSDIR}/graphics/png
+		png.5:${PORTSDIR}/graphics/png \
+		intl.5:${PORTSDIR}/devel/gettext \
+		iconv.3:${PORTSDIR}/converters/libiconv
 
 GNU_CONFIGURE=	yes
+USE_AUTOCONF=	yes
 CONFIGURE_ENV+=	CFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
 		CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 CONFIGURE_ARGS+=--x-includes=${X11BASE}/include \
 		--x-libraries=${X11BASE}/lib \
 		--with-x
+
 USE_GMAKE=	yes
 USE_REINPLACE=	yes
 
diff -ruN xfe/files/patch-aclocal.m4 xfe.patched/files/patch-aclocal.m4
--- xfe/files/patch-aclocal.m4	Thu Jan  1 01:00:00 1970
+++ xfe.patched/files/patch-aclocal.m4	Sat Oct 25 22:27:26 2003
@@ -0,0 +1,46 @@
+
+$FreeBSD: ports/audio/gqmpeg/files/patch-aclocal.m4,v 1.1 2002/07/19 14:10:42 naddy Exp $
+
+--- aclocal.m4.orig	Wed Jul 17 20:48:30 2002
++++ aclocal.m4	Thu Jul 18 16:38:49 2002
+@@ -545,7 +545,7 @@
+   rm -f conf.gdk_pixbuftest
+ ])
+ 
+-# gettext.m4 serial 13 (gettext-0.11.1)
++# gettext.m4 serial 14 (gettext-0.11.2)
+ dnl Copyright (C) 1995-2002 Free Software Foundation, Inc.
+ dnl This file is free software, distributed under the terms of the GNU
+ dnl General Public License.  As a special exception to the GNU General
+@@ -689,14 +689,13 @@
+             dnl Now see whether libintl exists and does not depend on libiconv.
+             AC_TRY_LINK([#include <libintl.h>
+ extern int _nl_msg_cat_cntr;
+-extern int *_nl_domain_bindings;
+ extern
+ #ifdef __cplusplus
+ "C"
+ #endif
+ const char *_nl_expand_alias ();],
+               [bindtextdomain ("", "");
+-return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr + *_nl_domain_bindings + *_nl_expand_alias (0)],
++return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr + *_nl_expand_alias (0)],
+               gt_cv_func_gnugettext_libintl=yes,
+               gt_cv_func_gnugettext_libintl=no)
+             dnl Now see whether libintl exists and depends on libiconv.
+@@ -704,14 +703,13 @@
+               LIBS="$LIBS $LIBICONV"
+               AC_TRY_LINK([#include <libintl.h>
+ extern int _nl_msg_cat_cntr;
+-extern int *_nl_domain_bindings;
+ extern
+ #ifdef __cplusplus
+ "C"
+ #endif
+ const char *_nl_expand_alias ();],
+                 [bindtextdomain ("", "");
+-return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr + *_nl_domain_bindings + *_nl_expand_alias (0)],
++return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr + *_nl_expand_alias (0)],
+                [LIBINTL="$LIBINTL $LIBICONV"
+                 LTLIBINTL="$LTLIBINTL $LTLIBICONV"
+                 gt_cv_func_gnugettext_libintl=yes
diff -ruN xfe/pkg-plist xfe.patched/pkg-plist
--- xfe/pkg-plist	Fri Aug  8 15:17:47 2003
+++ xfe.patched/pkg-plist	Sat Oct 25 22:28:40 2003
@@ -1,7 +1,6 @@
 bin/xfe
 bin/xfq
 bin/xfv
-lib/charset.alias
 lib/foxicons/a_32x32.gif
 lib/foxicons/bak_16x16.gif
 lib/foxicons/bak_32x32.gif
@@ -141,7 +140,6 @@
 lib/foxrc/Desktop
 share/locale/fr/LC_MESSAGES/xfe.mo
 share/locale/de/LC_MESSAGES/xfe.mo
-share/locale/locale.alias
 share/locale/pt_BR/LC_MESSAGES/xfe.mo
 share/locale/pl/LC_MESSAGES/xfe.mo
 share/pixmaps/xfe.png
>Release-Note:
>Audit-Trail:
>Unformatted: