Conversion to a single libtool environment.

Approved by:	portmgr (kris)

15 files changed, 44 insertions, 32 deletions

diff --git a/x11-fm/evidence/Makefile b/x11-fm/evidence/Makefile
index f30c90676c4f..11d808e3c2f5 100644
--- a/x11-fm/evidence/Makefile
+++ b/x11-fm/evidence/Makefile
@@ -30,7 +30,7 @@ USE_X_PREFIX=	yes
 USE_GNOME=	gtk20
 USE_GETTEXT=	yes
 USE_REINPLACE=	yes
-USE_AUTOTOOLS=	libtool:15
+GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-dbus \
 		--disable-dcop \
 		--enable-ecore-ipc \
diff --git a/x11-fm/krusader/Makefile b/x11-fm/krusader/Makefile
index b2c4ae18cde8..cd97e2b37dc2 100644
--- a/x11-fm/krusader/Makefile
+++ b/x11-fm/krusader/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	krusader
 PORTVERSION=	1.60.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-fm kde
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=krusader
@@ -16,7 +16,7 @@ MAINTAINER=	h.eichmann@gmx.de
 COMMENT=	A two window file-manager for KDE, like midnight or norton commander
 
 USE_KDELIBS_VER=3
-GNU_CONFIGURE=	yes
+USE_AUTOTOOLS=	libtool:15
 USE_GMAKE=	yes
 
 QTDIR?=${X11BASE}/bin
diff --git a/x11-fm/krusader/pkg-plist b/x11-fm/krusader/pkg-plist
index 043967e03436..5fc037fb852c 100644
--- a/x11-fm/krusader/pkg-plist
+++ b/x11-fm/krusader/pkg-plist
@@ -1,6 +1,8 @@
 bin/krusader
+lib/kde3/kio_iso.a
 lib/kde3/kio_iso.la
 lib/kde3/kio_iso.so
+lib/kde3/kio_krarc.a
 lib/kde3/kio_krarc.la
 lib/kde3/kio_krarc.so
 share/applnk/Applications/krusader.desktop
diff --git a/x11-fm/krusader2/Makefile b/x11-fm/krusader2/Makefile
index b2c4ae18cde8..cd97e2b37dc2 100644
--- a/x11-fm/krusader2/Makefile
+++ b/x11-fm/krusader2/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	krusader
 PORTVERSION=	1.60.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-fm kde
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=krusader
@@ -16,7 +16,7 @@ MAINTAINER=	h.eichmann@gmx.de
 COMMENT=	A two window file-manager for KDE, like midnight or norton commander
 
 USE_KDELIBS_VER=3
-GNU_CONFIGURE=	yes
+USE_AUTOTOOLS=	libtool:15
 USE_GMAKE=	yes
 
 QTDIR?=${X11BASE}/bin
diff --git a/x11-fm/krusader2/pkg-plist b/x11-fm/krusader2/pkg-plist
index 043967e03436..5fc037fb852c 100644
--- a/x11-fm/krusader2/pkg-plist
+++ b/x11-fm/krusader2/pkg-plist
@@ -1,6 +1,8 @@
 bin/krusader
+lib/kde3/kio_iso.a
 lib/kde3/kio_iso.la
 lib/kde3/kio_iso.so
+lib/kde3/kio_krarc.a
 lib/kde3/kio_krarc.la
 lib/kde3/kio_krarc.so
 share/applnk/Applications/krusader.desktop
diff --git a/x11-fm/nautilus2/Makefile b/x11-fm/nautilus2/Makefile
index 7f6d06bd3cdd..3e6398200b0f 100644
--- a/x11-fm/nautilus2/Makefile
+++ b/x11-fm/nautilus2/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	nautilus2
 PORTVERSION=	2.12.2
+PORTREVISION=	1
 CATEGORIES=	x11-fm gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/2$//}/2.12
@@ -26,7 +27,7 @@ USE_GNOME=	gnomeprefix gnomehack intlhack gnomedesktop eel2 \
 		librsvg2 desktopfileutils
 GNOME_DESKTOP_VERSION=2
 INSTALLS_SHLIB=	yes
-USE_AUTOTOOLS=	libtool:15
+GNU_CONFIGURE=	yes
 USE_REINPLACE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="${PTHREAD_LIBS} -L${LOCALBASE}/lib -L${X11BASE}/lib -liconv" \
diff --git a/x11-fm/nautilus2/pkg-plist b/x11-fm/nautilus2/pkg-plist
index 60edb891ab2a..148b775a88ed 100644
--- a/x11-fm/nautilus2/pkg-plist
+++ b/x11-fm/nautilus2/pkg-plist
@@ -11,9 +11,11 @@ include/nautilus/libnautilus-extension/nautilus-menu-provider.h
 include/nautilus/libnautilus-extension/nautilus-property-page-provider.h
 include/nautilus/libnautilus-extension/nautilus-property-page.h
 lib/libnautilus-extension.a
+lib/libnautilus-extension.la
 lib/libnautilus-extension.so
 lib/libnautilus-extension.so.1
 lib/libnautilus-private.a
+lib/libnautilus-private.la
 lib/libnautilus-private.so
 lib/libnautilus-private.so.2
 libdata/bonobo/servers/Nautilus_shell.server
diff --git a/x11-fm/pcmanfm/Makefile b/x11-fm/pcmanfm/Makefile
index 53932a68cb6c..0fc8228d667b 100644
--- a/x11-fm/pcmanfm/Makefile
+++ b/x11-fm/pcmanfm/Makefile
@@ -19,6 +19,7 @@ USE_GCC=	3.3+
 USE_AUTOTOOLS=	libtool:15
 USE_X_PREFIX=	yes
 USE_FAM=	yes
+WANT_FAM_SYSTEM=fam		# Note: broken compilation with gamin
 INSTALLS_SHLIB=	yes
 
 .if !defined(WITHOUT_NLS)
diff --git a/x11-fm/py-nautilus/Makefile b/x11-fm/py-nautilus/Makefile
index 3cb1bb082f16..106705089157 100644
--- a/x11-fm/py-nautilus/Makefile
+++ b/x11-fm/py-nautilus/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	nautilus
 PORTVERSION=	0.4.2
+PORTREVISION=	1
 CATEGORIES=	x11-fm gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/nautilus-python/${PORTVERSION:R}/
@@ -21,7 +22,7 @@ LIB_DEPENDS=	nautilus-extension:${PORTSDIR}/x11-fm/nautilus2
 
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
-USE_AUTOTOOLS=	libtool:15
+GNU_CONFIGURE=	yes
 USE_REINPLACE=	yes
 USE_PYTHON=	yes
 USE_GMAKE=	yes
diff --git a/x11-fm/py-nautilus/pkg-plist b/x11-fm/py-nautilus/pkg-plist
index ea97dc442777..04dcd21e8563 100644
--- a/x11-fm/py-nautilus/pkg-plist
+++ b/x11-fm/py-nautilus/pkg-plist
@@ -1,4 +1,6 @@
+lib/nautilus-python/nautilus.la
 lib/nautilus-python/nautilus.so
+lib/nautilus/extensions-1.0/libnautilus-python.la
 lib/nautilus/extensions-1.0/libnautilus-python.so
 libdata/pkgconfig/nautilus-python.pc
 %%DOCSDIR%%/README
diff --git a/x11-fm/velocity/Makefile b/x11-fm/velocity/Makefile
index 143d9c4b0224..2fd37f43466d 100644
--- a/x11-fm/velocity/Makefile
+++ b/x11-fm/velocity/Makefile
@@ -16,7 +16,7 @@ MAINTAINER=	ryan.moe@fastfreedom.net
 COMMENT=	GNOME file and desktop manager
 
 WRKSRC=		${WRKDIR}/velocity-0.1.0
-USE_AUTOTOOLS=	libtool:13
+USE_AUTOTOOLS=	libtool:15
 USE_X_PREFIX=	yes
 USE_BZIP2=	yes
 USE_REINPLACE=	yes
diff --git a/x11-fm/workplace/files/patch-aa b/x11-fm/workplace/files/patch-aa
index 7f57ac57fbba..7dd24a87cd4e 100644
--- a/x11-fm/workplace/files/patch-aa
+++ b/x11-fm/workplace/files/patch-aa
@@ -7,15 +7,15 @@
 -        echo $ac_n "checking for gtk_widget_new in -lgtk""... $ac_c" 1>&6
 -echo "configure:1812: checking for gtk_widget_new in -lgtk" >&5
 -ac_lib_var=`echo gtk'_'gtk_widget_new | sed 'y%./+-%__p_%'`
-+        echo $ac_n "checking for gtk_widget_new in -lgtk12""... $ac_c" 1>&6
-+echo "configure:1812: checking for gtk_widget_new in -lgtk12" >&5
-+ac_lib_var=`echo gtk12'_'gtk_widget_new | sed 'y%./+-%__p_%'`
++        echo $ac_n "checking for gtk_widget_new in -lgtk-12""... $ac_c" 1>&6
++echo "configure:1812: checking for gtk_widget_new in -lgtk-12" >&5
++ac_lib_var=`echo gtk-12'_'gtk_widget_new | 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="-lgtk -lgdk -lglib $x_libs -lm $LIBS"
-+LIBS="-lgtk12 -lgdk12 -lglib12 $x_libs -lm $LIBS"
++LIBS="-lgtk-12 -lgdk-12 -lglib-12 $x_libs -lm $LIBS"
  cat > conftest.$ac_ext <<EOF
  #line 1820 "configure"
  #include "confdefs.h"
@@ -24,7 +24,7 @@
  if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
    echo "$ac_t""yes" 1>&6
 -  X_LIBS="$X_LIBS -lgtk -lgdk -lglib $x_libs -lm"
-+  X_LIBS="$X_LIBS -lgtk12 -lgdk12 -lglib12 $x_libs -lm"
++  X_LIBS="$X_LIBS -lgtk-12 -lgdk-12 -lglib-12 $x_libs -lm"
  else
    echo "$ac_t""no" 1>&6
  { echo "configure: error: Can not link with gtk/gdk/glib" 1>&2; exit 1; }
diff --git a/x11-fm/workplace/files/patch-ab b/x11-fm/workplace/files/patch-ab
index 3bf8ce275d9d..5e6d58663f0c 100644
--- a/x11-fm/workplace/files/patch-ab
+++ b/x11-fm/workplace/files/patch-ab
@@ -6,11 +6,11 @@
  
 -        AC_CHECK_LIB(gtk, gtk_widget_new,
 -                X_LIBS="$X_LIBS -lgtk -lgdk -lglib $x_libs -lm",
-+        AC_CHECK_LIB(gtk12, gtk_widget_new,
-+                X_LIBS="$X_LIBS -lgtk12 -lgdk12 -lglib12 $x_libs -lm",
++        AC_CHECK_LIB(gtk-12, gtk_widget_new,
++                X_LIBS="$X_LIBS -lgtk-12 -lgdk-12 -lglib-12 $x_libs -lm",
                  [AC_MSG_ERROR(Can not link with gtk/gdk/glib)],
 -                -lgdk -lglib $x_libs -lm)
-+                -lgdk12 -lglib12 $x_libs -lm)
++                -lgdk-12 -lglib-12 $x_libs -lm)
  
          CFLAGS="$saved_cflags"
          LDFLAGS="$saved_ldflags"
diff --git a/x11-fm/xfce4-fm/Makefile b/x11-fm/xfce4-fm/Makefile
index 74b7ccfed890..9a4d6d6b0db0 100644
--- a/x11-fm/xfce4-fm/Makefile
+++ b/x11-fm/xfce4-fm/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xfce4-fm
 PORTVERSION=	4.2.3
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	x11-fm xfce
 MASTER_SITES=	http://www.us.xfce.org/archive/xfce-${PORTVERSION}/src/ \
 		http://www.ca-us.xfce.org/archive/xfce-${PORTVERSION}/src/ \
@@ -30,7 +30,7 @@ USE_GNOME=	gtk20 gnomehack
 USE_REINPLACE=	yes
 USE_X_PREFIX=	yes
 USE_XPM=	yes
-USE_AUTOTOOLS=	libtool:15
+GNU_CONFIGURE=	yes
 INSTALLS_SHLIB=	yes
 CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ENV=	CFLAGS=-I${LOCALBASE}/include \
diff --git a/x11-fm/xfce4-fm/pkg-plist b/x11-fm/xfce4-fm/pkg-plist
index cedf356029b6..8baa8c7caa82 100644
--- a/x11-fm/xfce4-fm/pkg-plist
+++ b/x11-fm/xfce4-fm/pkg-plist
@@ -15,47 +15,48 @@ bin/xfsamba4
 bin/xftrash4
 bin/xftree4
 bin/xffm
-lib/libxffm_actions.a
+lib/libxffm_actions.la
 lib/libxffm_actions.so
 lib/libxffm_actions.so.1
-lib/libxffm_basic.a
+lib/libxffm_basic.la
 lib/libxffm_basic.so
 lib/libxffm_basic.so.1
-lib/libxffm_calls.a
+lib/libxffm_calls.la
 lib/libxffm_calls.so
 lib/libxffm_calls.so.1
-lib/libxffm_cpy.a
+lib/libxffm_cpy.la
 lib/libxffm_cpy.so
 lib/libxffm_cpy.so.1
-lib/libxffm_on_demand.a
+lib/libxffm_on_demand.la
 lib/libxffm_on_demand.so
 lib/libxffm_on_demand.so.1
-lib/libxffm_secondary.a
+lib/libxffm_secondary.la
 lib/libxffm_secondary.so
 lib/libxffm_secondary.so.1
-lib/libxffm_tubo.a
+lib/libxffm_tubo.la
 lib/libxffm_tubo.so
 lib/libxffm_tubo.so.1
+lib/xfce4/mcs-plugins/libxffmsettings.la
 lib/xfce4/mcs-plugins/libxffmsettings.so
-lib/xfce4/xffm/libxffm_book.a
+lib/xfce4/xffm/libxffm_book.la
 lib/xfce4/xffm/libxffm_book.so
 lib/xfce4/xffm/libxffm_book.so.1
-lib/xfce4/xffm/libxffm_fstab.a
+lib/xfce4/xffm/libxffm_fstab.la
 lib/xfce4/xffm/libxffm_fstab.so
 lib/xfce4/xffm/libxffm_fstab.so.1
-lib/xfce4/xffm/libxffm_prop.a
+lib/xfce4/xffm/libxffm_prop.la
 lib/xfce4/xffm/libxffm_prop.so
 lib/xfce4/xffm/libxffm_prop.so.1
-lib/xfce4/xffm/libxffm_recent.a
+lib/xfce4/xffm/libxffm_recent.la
 lib/xfce4/xffm/libxffm_recent.so
 lib/xfce4/xffm/libxffm_recent.so.1
-lib/xfce4/xffm/libxffm_find.a
+lib/xfce4/xffm/libxffm_find.la
 lib/xfce4/xffm/libxffm_find.so
 lib/xfce4/xffm/libxffm_find.so.1
-lib/xfce4/xffm/libxffm_smb.a
+lib/xfce4/xffm/libxffm_smb.la
 lib/xfce4/xffm/libxffm_smb.so
 lib/xfce4/xffm/libxffm_smb.so.1
-lib/xfce4/xffm/libxffm_trash.a
+lib/xfce4/xffm/libxffm_trash.la
 lib/xfce4/xffm/libxffm_trash.so
 lib/xfce4/xffm/libxffm_trash.so.1
 libdata/pkgconfig/xffm-1.0.pc