Conversion to a single libtool environment.

Approved by:	portmgr (kris)

2 files changed, 129 insertions, 1 deletions

diff --git a/x11/kdelibs4/Makefile b/x11/kdelibs4/Makefile
index 529901e..997cf1f 100644
--- a/x11/kdelibs4/Makefile
+++ b/x11/kdelibs4/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	kdelibs
 PORTVERSION=	${KDE_VERSION}
+PORTREVISION=	1
 CATEGORIES=	x11 kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION:S/.0//}/src
@@ -58,7 +59,7 @@ PREFIX=		${KDE_PREFIX}
 INSTALLS_SHLIB=	yes
 LDCONFIG_DIRS+=	%%PREFIX%%/lib %%PREFIX%%/lib/kde3
 
-GNU_CONFIGURE=	yes
+USE_AUTOTOOLS=	libtool:15
 CONFIGURE_TARGET=# empty
 CONFIGURE_ARGS+=--disable-ltdl-install	\
 		--disable-as-needed \
diff --git a/x11/kdelibs4/pkg-plist b/x11/kdelibs4/pkg-plist
index c1eba52..d155993 100644
--- a/x11/kdelibs4/pkg-plist
+++ b/x11/kdelibs4/pkg-plist
@@ -756,298 +756,425 @@ include/renamedlgplugin.h
 include/scriptclientinterface.h
 include/scriptinterface.h
 include/scriptmanager.h
+lib/kde3/cupsdconf.a
 lib/kde3/cupsdconf.la
 lib/kde3/cupsdconf.so
+lib/kde3/dcopserver.a
 lib/kde3/dcopserver.la
 lib/kde3/dcopserver.so
+lib/kde3/kabc_dir.a
 lib/kde3/kabc_dir.la
 lib/kde3/kabc_dir.so
+lib/kde3/kabc_file.a
 lib/kde3/kabc_file.la
 lib/kde3/kabc_file.so
+lib/kde3/kabc_ldapkio.a
 lib/kde3/kabc_ldapkio.la
 lib/kde3/kabc_ldapkio.so
+lib/kde3/kabc_net.a
 lib/kde3/kabc_net.la
 lib/kde3/kabc_net.so
+lib/kde3/kabcformat_binary.a
 lib/kde3/kabcformat_binary.la
 lib/kde3/kabcformat_binary.so
+lib/kde3/kaddprinterwizard.a
 lib/kde3/kaddprinterwizard.la
 lib/kde3/kaddprinterwizard.so
+lib/kde3/kbuildsycoca.a
 lib/kde3/kbuildsycoca.la
 lib/kde3/kbuildsycoca.so
+lib/kde3/kbzip2filter.a
 lib/kde3/kbzip2filter.la
 lib/kde3/kbzip2filter.so
+lib/kde3/kcm_kresources.a
 lib/kde3/kcm_kresources.la
 lib/kde3/kcm_kresources.so
+lib/kde3/kcmshell.a
 lib/kde3/kcmshell.la
 lib/kde3/kcmshell.so
+lib/kde3/kconf_update.a
 lib/kde3/kconf_update.la
 lib/kde3/kconf_update.so
+lib/kde3/kcookiejar.a
 lib/kde3/kcookiejar.la
 lib/kde3/kcookiejar.so
+lib/kde3/kded.a
 lib/kde3/kded.la
 lib/kde3/kded.so
+lib/kde3/kded_kcookiejar.a
 lib/kde3/kded_kcookiejar.la
 lib/kde3/kded_kcookiejar.so
+lib/kde3/kded_kdeprintd.a
 lib/kde3/kded_kdeprintd.la
 lib/kde3/kded_kdeprintd.so
+lib/kde3/kded_kdetrayproxy.a
 lib/kde3/kded_kdetrayproxy.la
 lib/kde3/kded_kdetrayproxy.so
+lib/kde3/kded_kpasswdserver.a
 lib/kde3/kded_kpasswdserver.la
 lib/kde3/kded_kpasswdserver.so
+lib/kde3/kded_kssld.a
 lib/kde3/kded_kssld.la
 lib/kde3/kded_kssld.so
+lib/kde3/kded_kwalletd.a
 lib/kde3/kded_kwalletd.la
 lib/kde3/kded_kwalletd.so
+lib/kde3/kded_proxyscout.a
 lib/kde3/kded_proxyscout.la
 lib/kde3/kded_proxyscout.so
+lib/kde3/kdeprint_cups.a
 lib/kde3/kdeprint_cups.la
 lib/kde3/kdeprint_cups.so
+lib/kde3/kdeprint_ext.a
 lib/kde3/kdeprint_ext.la
 lib/kde3/kdeprint_ext.so
+lib/kde3/kdeprint_lpdunix.a
 lib/kde3/kdeprint_lpdunix.la
 lib/kde3/kdeprint_lpdunix.so
+lib/kde3/kdeprint_lpr.a
 lib/kde3/kdeprint_lpr.la
 lib/kde3/kdeprint_lpr.so
+lib/kde3/kdeprint_rlpr.a
 lib/kde3/kdeprint_rlpr.la
 lib/kde3/kdeprint_rlpr.so
+lib/kde3/kdeprint_tool_escputil.a
 lib/kde3/kdeprint_tool_escputil.la
 lib/kde3/kdeprint_tool_escputil.so
+lib/kde3/kfileaudiopreview.a
 lib/kde3/kfileaudiopreview.la
 lib/kde3/kfileaudiopreview.so
+lib/kde3/kgzipfilter.a
 lib/kde3/kgzipfilter.la
 lib/kde3/kgzipfilter.so
+lib/kde3/khtmlimagepart.a
 lib/kde3/khtmlimagepart.la
 lib/kde3/khtmlimagepart.so
+lib/kde3/kimg_dds.a
 lib/kde3/kimg_dds.la
 lib/kde3/kimg_dds.so
+lib/kde3/kimg_eps.a
 lib/kde3/kimg_eps.la
 lib/kde3/kimg_eps.so
+lib/kde3/kimg_exr.a
 lib/kde3/kimg_exr.la
 lib/kde3/kimg_exr.so
+lib/kde3/kimg_hdr.a
 lib/kde3/kimg_hdr.la
 lib/kde3/kimg_hdr.so
+lib/kde3/kimg_ico.a
 lib/kde3/kimg_ico.la
 lib/kde3/kimg_ico.so
+lib/kde3/kimg_jp2.a
 lib/kde3/kimg_jp2.la
 lib/kde3/kimg_jp2.so
+lib/kde3/kimg_pcx.a
 lib/kde3/kimg_pcx.la
 lib/kde3/kimg_pcx.so
+lib/kde3/kimg_psd.a
 lib/kde3/kimg_psd.la
 lib/kde3/kimg_psd.so
+lib/kde3/kimg_rgb.a
 lib/kde3/kimg_rgb.la
 lib/kde3/kimg_rgb.so
+lib/kde3/kimg_tga.a
 lib/kde3/kimg_tga.la
 lib/kde3/kimg_tga.so
+lib/kde3/kimg_tiff.a
 lib/kde3/kimg_tiff.la
 lib/kde3/kimg_tiff.so
+lib/kde3/kimg_xcf.a
 lib/kde3/kimg_xcf.la
 lib/kde3/kimg_xcf.so
+lib/kde3/kimg_xview.a
 lib/kde3/kimg_xview.la
 lib/kde3/kimg_xview.so
+lib/kde3/kio_file.a
 lib/kde3/kio_file.la
 lib/kde3/kio_file.so
+lib/kde3/kio_ftp.a
 lib/kde3/kio_ftp.la
 lib/kde3/kio_ftp.so
+lib/kde3/kio_ghelp.a
 lib/kde3/kio_ghelp.la
 lib/kde3/kio_ghelp.so
+lib/kde3/kio_help.a
 lib/kde3/kio_help.la
 lib/kde3/kio_help.so
+lib/kde3/kio_http.a
 lib/kde3/kio_http.la
 lib/kde3/kio_http.so
+lib/kde3/kio_http_cache_cleaner.a
 lib/kde3/kio_http_cache_cleaner.la
 lib/kde3/kio_http_cache_cleaner.so
+lib/kde3/kio_metainfo.a
 lib/kde3/kio_metainfo.la
 lib/kde3/kio_metainfo.so
+lib/kde3/kio_uiserver.a
 lib/kde3/kio_uiserver.la
 lib/kde3/kio_uiserver.so
+lib/kde3/kjavaappletviewer.a
 lib/kde3/kjavaappletviewer.la
 lib/kde3/kjavaappletviewer.so
+lib/kde3/klauncher.a
 lib/kde3/klauncher.la
 lib/kde3/klauncher.so
+lib/kde3/knotify.a
 lib/kde3/knotify.la
 lib/kde3/knotify.so
+lib/kde3/kspell_aspell.a
 lib/kde3/kspell_aspell.la
 lib/kde3/kspell_aspell.so
+lib/kde3/kspell_ispell.a
 lib/kde3/kspell_ispell.la
 lib/kde3/kspell_ispell.so
+lib/kde3/kstyle_highcontrast_config.a
 lib/kde3/kstyle_highcontrast_config.la
 lib/kde3/kstyle_highcontrast_config.so
+lib/kde3/kstyle_plastik_config.a
 lib/kde3/kstyle_plastik_config.la
 lib/kde3/kstyle_plastik_config.so
+lib/kde3/ktexteditor_docwordcompletion.a
 lib/kde3/ktexteditor_docwordcompletion.la
 lib/kde3/ktexteditor_docwordcompletion.so
+lib/kde3/ktexteditor_insertfile.a
 lib/kde3/ktexteditor_insertfile.la
 lib/kde3/ktexteditor_insertfile.so
+lib/kde3/ktexteditor_isearch.a
 lib/kde3/ktexteditor_isearch.la
 lib/kde3/ktexteditor_isearch.so
+lib/kde3/ktexteditor_kdatatool.a
 lib/kde3/ktexteditor_kdatatool.la
 lib/kde3/ktexteditor_kdatatool.so
+lib/kde3/libkatepart.a
 lib/kde3/libkatepart.la
 lib/kde3/libkatepart.so
+lib/kde3/libkcertpart.a
 lib/kde3/libkcertpart.la
 lib/kde3/libkcertpart.so
+lib/kde3/libkdeprint_management_module.a
 lib/kde3/libkdeprint_management_module.la
 lib/kde3/libkdeprint_management_module.so
+lib/kde3/libkhtmlpart.a
 lib/kde3/libkhtmlpart.la
 lib/kde3/libkhtmlpart.so
+lib/kde3/libkmultipart.a
 lib/kde3/libkmultipart.la
 lib/kde3/libkmultipart.so
+lib/kde3/libshellscript.a
 lib/kde3/libshellscript.la
 lib/kde3/libshellscript.so
+lib/kde3/plugins/designer/kdewidgets.a
 lib/kde3/plugins/designer/kdewidgets.la
 lib/kde3/plugins/designer/kdewidgets.so
+lib/kde3/plugins/styles/highcolor.a
 lib/kde3/plugins/styles/highcolor.la
 lib/kde3/plugins/styles/highcolor.so
+lib/kde3/plugins/styles/highcontrast.a
 lib/kde3/plugins/styles/highcontrast.la
 lib/kde3/plugins/styles/highcontrast.so
+lib/kde3/plugins/styles/keramik.a
 lib/kde3/plugins/styles/keramik.la
 lib/kde3/plugins/styles/keramik.so
+lib/kde3/plugins/styles/kthemestyle.a
 lib/kde3/plugins/styles/kthemestyle.la
 lib/kde3/plugins/styles/kthemestyle.so
+lib/kde3/plugins/styles/light.a
 lib/kde3/plugins/styles/light.la
 lib/kde3/plugins/styles/light.so
+lib/kde3/plugins/styles/plastik.a
 lib/kde3/plugins/styles/plastik.la
 lib/kde3/plugins/styles/plastik.so
+lib/libDCOP.a
 lib/libDCOP.la
 lib/libDCOP.so
 lib/libDCOP.so.6
+lib/libartskde.a
 lib/libartskde.la
 lib/libartskde.so
 lib/libartskde.so.3
+lib/libkabc.a
 lib/libkabc.la
 lib/libkabc.so
 lib/libkabc.so.3
+lib/libkabc_dir.a
 lib/libkabc_dir.la
 lib/libkabc_dir.so
 lib/libkabc_dir.so.1
+lib/libkabc_file.a
 lib/libkabc_file.la
 lib/libkabc_file.so
 lib/libkabc_file.so.1
+lib/libkabc_ldapkio.a
 lib/libkabc_ldapkio.la
 lib/libkabc_ldapkio.so
 lib/libkabc_ldapkio.so.1
+lib/libkabc_net.a
 lib/libkabc_net.la
 lib/libkabc_net.so
 lib/libkabc_net.so.1
+lib/libkatepartinterfaces.a
 lib/libkatepartinterfaces.la
 lib/libkatepartinterfaces.so
 lib/libkatepartinterfaces.so.0
+lib/libkdecore.a
 lib/libkdecore.la
 lib/libkdecore.so
 lib/libkdecore.so.6
+lib/libkdefakes.a
 lib/libkdefakes.la
 lib/libkdefakes.so
 lib/libkdefakes.so.6
 lib/libkdefakes_nonpic.a
+lib/libkdefx.a
 lib/libkdefx.la
 lib/libkdefx.so
 lib/libkdefx.so.6
+lib/libkdeinit_cupsdconf.a
 lib/libkdeinit_cupsdconf.la
 lib/libkdeinit_cupsdconf.so
+lib/libkdeinit_dcopserver.a
 lib/libkdeinit_dcopserver.la
 lib/libkdeinit_dcopserver.so
+lib/libkdeinit_kaddprinterwizard.a
 lib/libkdeinit_kaddprinterwizard.la
 lib/libkdeinit_kaddprinterwizard.so
+lib/libkdeinit_kbuildsycoca.a
 lib/libkdeinit_kbuildsycoca.la
 lib/libkdeinit_kbuildsycoca.so
+lib/libkdeinit_kcmshell.a
 lib/libkdeinit_kcmshell.la
 lib/libkdeinit_kcmshell.so
+lib/libkdeinit_kconf_update.a
 lib/libkdeinit_kconf_update.la
 lib/libkdeinit_kconf_update.so
+lib/libkdeinit_kcookiejar.a
 lib/libkdeinit_kcookiejar.la
 lib/libkdeinit_kcookiejar.so
+lib/libkdeinit_kded.a
 lib/libkdeinit_kded.la
 lib/libkdeinit_kded.so
+lib/libkdeinit_kio_http_cache_cleaner.a
 lib/libkdeinit_kio_http_cache_cleaner.la
 lib/libkdeinit_kio_http_cache_cleaner.so
+lib/libkdeinit_kio_uiserver.a
 lib/libkdeinit_kio_uiserver.la
 lib/libkdeinit_kio_uiserver.so
+lib/libkdeinit_klauncher.a
 lib/libkdeinit_klauncher.la
 lib/libkdeinit_klauncher.so
+lib/libkdeprint.a
 lib/libkdeprint.la
 lib/libkdeprint.so
 lib/libkdeprint.so.6
+lib/libkdeprint_management.a
 lib/libkdeprint_management.la
 lib/libkdeprint_management.so
 lib/libkdeprint_management.so.6
+lib/libkdesasl.a
 lib/libkdesasl.la
 lib/libkdesasl.so
 lib/libkdesasl.so.3
+lib/libkdesu.a
 lib/libkdesu.la
 lib/libkdesu.so
 lib/libkdesu.so.6
+lib/libkdeui.a
 lib/libkdeui.la
 lib/libkdeui.so
 lib/libkdeui.so.6
+lib/libkdnssd.a
 lib/libkdnssd.la
 lib/libkdnssd.so
 lib/libkdnssd.so.1
+lib/libkhtml.a
 lib/libkhtml.la
 lib/libkhtml.so
 lib/libkhtml.so.6
+lib/libkimproxy.a
 lib/libkimproxy.la
 lib/libkimproxy.so
 lib/libkimproxy.so.0
+lib/libkio.a
 lib/libkio.la
 lib/libkio.so
 lib/libkio.so.6
+lib/libkjava.a
 lib/libkjava.la
 lib/libkjava.so
 lib/libkjava.so.1
+lib/libkjs.a
 lib/libkjs.la
 lib/libkjs.so
 lib/libkjs.so.3
+lib/libkmdi.a
 lib/libkmdi.la
 lib/libkmdi.so
 lib/libkmdi.so.1
+lib/libkmdi2.a
 lib/libkmdi2.la
 lib/libkmdi2.so
 lib/libkmdi2.so.1
+lib/libkmediaplayer.a
 lib/libkmediaplayer.la
 lib/libkmediaplayer.so
 lib/libkmediaplayer.so.0
+lib/libkmid.a
 lib/libkmid.la
 lib/libkmid.so
 lib/libkmid.so.0
+lib/libknewstuff.a
 lib/libknewstuff.la
 lib/libknewstuff.so
 lib/libknewstuff.so.1
+lib/libkntlm.a
 lib/libkntlm.la
 lib/libkntlm.so
 lib/libkntlm.so.0
+lib/libkparts.a
 lib/libkparts.la
 lib/libkparts.so
 lib/libkparts.so.3
+lib/libkresources.a
 lib/libkresources.la
 lib/libkresources.so
 lib/libkresources.so.3
+lib/libkscreensaver.a
 lib/libkscreensaver.la
 lib/libkscreensaver.so
 lib/libkscreensaver.so.6
+lib/libkscript.a
 lib/libkscript.la
 lib/libkscript.so
 lib/libkscript.so.0
+lib/libkspell.a
 lib/libkspell.la
 lib/libkspell.so
 lib/libkspell.so.6
+lib/libkspell2.a
 lib/libkspell2.la
 lib/libkspell2.so
 lib/libkspell2.so.1
+lib/libktexteditor.a
 lib/libktexteditor.la
 lib/libktexteditor.so
 lib/libktexteditor.so.0
+lib/libkunittest.a
 lib/libkunittest.la
 lib/libkunittest.so
 lib/libkunittest.so.1
+lib/libkutils.a
 lib/libkutils.la
 lib/libkutils.so
 lib/libkutils.so.3
+lib/libkwalletbackend.a
 lib/libkwalletbackend.la
 lib/libkwalletbackend.so
 lib/libkwalletbackend.so.1
+lib/libkwalletclient.a
 lib/libkwalletclient.la
 lib/libkwalletclient.so
 lib/libkwalletclient.so.1
+lib/libvcard.a
 lib/libvcard.la
 lib/libvcard.so
 lib/libvcard.so.0