diff options
Diffstat (limited to 'x11-fm')
| -rw-r--r-- | x11-fm/nautilus/Makefile | 2 | ||||
| -rw-r--r-- | x11-fm/nautilus/files/patch-aa | 27 | ||||
| -rw-r--r-- | x11-fm/nautilus2/Makefile | 2 | ||||
| -rw-r--r-- | x11-fm/nautilus2/files/patch-aa | 27 |
4 files changed, 2 insertions, 56 deletions
diff --git a/x11-fm/nautilus/Makefile b/x11-fm/nautilus/Makefile index 95daea13b8ea..7348985c029d 100644 --- a/x11-fm/nautilus/Makefile +++ b/x11-fm/nautilus/Makefile @@ -40,7 +40,7 @@ USE_GNOME= yes INSTALLS_SHLIB= yes GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -fno-rtti -fno-exceptions" \ - LIBS="${PTHREAD_LIBS} -L${LOCALBASE}/lib -L${X11BASE}/lib -lgiconv" \ + LIBS="${PTHREAD_LIBS} -L${LOCALBASE}/lib -L${X11BASE}/lib -liconv" \ LIBPNG="-L${LOCALBASE}/lib -lpng -lz ${MOZILLA_LIBS}" \ MSGFMT=${LOCALBASE}/bin/msgfmt-new \ XGETTEXT=${LOCALBASE}/bin/xgettext-new diff --git a/x11-fm/nautilus/files/patch-aa b/x11-fm/nautilus/files/patch-aa index 45dcf1f7b504..d50ac2068a3a 100644 --- a/x11-fm/nautilus/files/patch-aa +++ b/x11-fm/nautilus/files/patch-aa @@ -30,33 +30,6 @@ $FreeBSD$ cat > conftest.$ac_ext <<EOF #line 7063 "configure" #include "confdefs.h" -@@ -7585,14 +7585,14 @@ - # - # Check for libiconv - # -- echo $ac_n "checking for libiconv_open in -liconv""... $ac_c" 1>&6 --echo "configure:7590: checking for libiconv_open in -liconv" >&5 -+ echo $ac_n "checking for libiconv_open in -lgiconv""... $ac_c" 1>&6 -+echo "configure:7590: checking for libiconv_open in -lgiconv" >&5 - ac_lib_var=`echo iconv'_'libiconv_open | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - ac_save_LIBS="$LIBS" --LIBS="-liconv $LIBS" -+LIBS="-lgiconv $LIBS" - cat > conftest.$ac_ext <<EOF - #line 7598 "configure" - #include "confdefs.h" -@@ -7632,7 +7632,7 @@ - fi - - if test "x$with_libiconv" = "xyes" ; then -- ICONV_LIBS="-liconv" -+ ICONV_LIBS="-lgiconv" - fi - - @@ -9141,7 +9141,7 @@ fi diff --git a/x11-fm/nautilus2/Makefile b/x11-fm/nautilus2/Makefile index 95daea13b8ea..7348985c029d 100644 --- a/x11-fm/nautilus2/Makefile +++ b/x11-fm/nautilus2/Makefile @@ -40,7 +40,7 @@ USE_GNOME= yes INSTALLS_SHLIB= yes GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -fno-rtti -fno-exceptions" \ - LIBS="${PTHREAD_LIBS} -L${LOCALBASE}/lib -L${X11BASE}/lib -lgiconv" \ + LIBS="${PTHREAD_LIBS} -L${LOCALBASE}/lib -L${X11BASE}/lib -liconv" \ LIBPNG="-L${LOCALBASE}/lib -lpng -lz ${MOZILLA_LIBS}" \ MSGFMT=${LOCALBASE}/bin/msgfmt-new \ XGETTEXT=${LOCALBASE}/bin/xgettext-new diff --git a/x11-fm/nautilus2/files/patch-aa b/x11-fm/nautilus2/files/patch-aa index 45dcf1f7b504..d50ac2068a3a 100644 --- a/x11-fm/nautilus2/files/patch-aa +++ b/x11-fm/nautilus2/files/patch-aa @@ -30,33 +30,6 @@ $FreeBSD$ cat > conftest.$ac_ext <<EOF #line 7063 "configure" #include "confdefs.h" -@@ -7585,14 +7585,14 @@ - # - # Check for libiconv - # -- echo $ac_n "checking for libiconv_open in -liconv""... $ac_c" 1>&6 --echo "configure:7590: checking for libiconv_open in -liconv" >&5 -+ echo $ac_n "checking for libiconv_open in -lgiconv""... $ac_c" 1>&6 -+echo "configure:7590: checking for libiconv_open in -lgiconv" >&5 - ac_lib_var=`echo iconv'_'libiconv_open | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - ac_save_LIBS="$LIBS" --LIBS="-liconv $LIBS" -+LIBS="-lgiconv $LIBS" - cat > conftest.$ac_ext <<EOF - #line 7598 "configure" - #include "confdefs.h" -@@ -7632,7 +7632,7 @@ - fi - - if test "x$with_libiconv" = "xyes" ; then -- ICONV_LIBS="-liconv" -+ ICONV_LIBS="-lgiconv" - fi - - @@ -9141,7 +9141,7 @@ fi |