Mechanical changes to package PLISTs to make use of LIBTOOLIZE_PLIST.

All library names listed by *.la files no longer need to be listed
in the PLIST, e.g., instead of:

	lib/libfoo.a
	lib/libfoo.la
	lib/libfoo.so
	lib/libfoo.so.0
	lib/libfoo.so.0.1

one simply needs:

	lib/libfoo.la

and bsd.pkg.mk will automatically ensure that the additional library
names are listed in the installed package +CONTENTS file.

Also make LIBTOOLIZE_PLIST default to "yes".

2 files changed, 2 insertions, 247 deletions

diff --git a/x11/kdebase3/Makefile b/x11/kdebase3/Makefile
index 34fb6533617..d30795a731a 100644
--- a/x11/kdebase3/Makefile
+++ b/x11/kdebase3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.56 2004/08/21 12:35:15 markd Exp $
+# $NetBSD: Makefile,v 1.57 2004/09/22 08:10:05 jlam Exp $
 
 DISTNAME=	kdebase-${_KDE_VERSION}
 CATEGORIES=	x11
@@ -58,18 +58,6 @@ CONFIGURE_ENV+=		RUN_KAPPFINDER=no
 
 PLIST_SRC+=		${PKGDIR}/PLIST
 
-.if ${OPSYS} == "NetBSD" && !exists(${X11BASE}/lib/libxkbfile.so)
-PLIST_SUBST+=		KCMKEYBOARD="kcm_keyboard.a"
-.else
-PLIST_SUBST+=		KCMKEYBOARD="kcm_keyboard.so"
-.endif
-
-.if ${OPSYS} == "NetBSD" && !exists(${X11BASE}/lib/libfontenc.so)
-PLIST_SUBST+=		FONTENC_SUFFIX="a"
-.else
-PLIST_SUBST+=		FONTENC_SUFFIX="so"
-.endif
-
 .if exists(${X11BASE}/include/X11/extensions/Xrandr.h)
 HAVE_RANDR!=		${GREP} XRRSetScreenConfigAndRateX  ${X11BASE}/include/X11/extensions/Xrandr.h; ${ECHO}
 .endif
diff --git a/x11/kdebase3/PLIST b/x11/kdebase3/PLIST
index 151ef3d5e59..c3681428702 100644
--- a/x11/kdebase3/PLIST
+++ b/x11/kdebase3/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.22 2004/08/21 12:35:15 markd Exp $
+@comment $NetBSD: PLIST,v 1.23 2004/09/22 08:10:05 jlam Exp $
 bin/appletproxy
 bin/drkonqi
 bin/extensionproxy
@@ -139,449 +139,216 @@ include/kwin/workspace.h
 lib/kconf_update_bin/khotkeys_update
 lib/kconf_update_bin/kwin_update_window_settings
 lib/kde3/appletproxy.la
-lib/kde3/appletproxy.so
 lib/kde3/childpanel_panelextension.la
-lib/kde3/childpanel_panelextension.so
 lib/kde3/clock_panelapplet.la
-lib/kde3/clock_panelapplet.so
 ${HAVE_XCURSOR}lib/kde3/cursorthumbnail.la
-${HAVE_XCURSOR}lib/kde3/cursorthumbnail.so
 lib/kde3/djvuthumbnail.la
-lib/kde3/djvuthumbnail.so
 lib/kde3/dockbar_panelextension.la
-lib/kde3/dockbar_panelextension.so
 lib/kde3/extensionproxy.la
-lib/kde3/extensionproxy.so
 lib/kde3/fontthumbnail.la
-lib/kde3/fontthumbnail.${FONTENC_SUFFIX}
 lib/kde3/htmlthumbnail.la
-lib/kde3/htmlthumbnail.so
 lib/kde3/imagethumbnail.la
-lib/kde3/imagethumbnail.so
 lib/kde3/kaccess.la
-lib/kde3/kaccess.so
 lib/kde3/kasbar_panelextension.la
-lib/kde3/kasbar_panelextension.so
 lib/kde3/kate.la
-lib/kde3/kate.so
 lib/kde3/katedefaultprojectplugin.la
-lib/kde3/katedefaultprojectplugin.so
 lib/kde3/kcm_access.la
-lib/kde3/kcm_access.so
 lib/kde3/kcm_arts.la
-lib/kde3/kcm_arts.so
 lib/kde3/kcm_background.la
-lib/kde3/kcm_background.so
 lib/kde3/kcm_bell.la
-lib/kde3/kcm_bell.so
 lib/kde3/kcm_cgi.la
-lib/kde3/kcm_cgi.so
 lib/kde3/kcm_clock.la
-lib/kde3/kcm_clock.so
 lib/kde3/kcm_colors.la
-lib/kde3/kcm_colors.so
 lib/kde3/kcm_componentchooser.la
-lib/kde3/kcm_componentchooser.so
 lib/kde3/kcm_crypto.la
-lib/kde3/kcm_crypto.so
 lib/kde3/kcm_css.la
-lib/kde3/kcm_css.so
 lib/kde3/kcm_display.la
-lib/kde3/kcm_display.so
 lib/kde3/kcm_energy.la
-lib/kde3/kcm_energy.so
 lib/kde3/kcm_filetypes.la
-lib/kde3/kcm_filetypes.so
 lib/kde3/kcm_fontinst.la
-lib/kde3/kcm_fontinst.${FONTENC_SUFFIX}
 lib/kde3/kcm_fonts.la
-lib/kde3/kcm_fonts.so
 lib/kde3/kcm_history.la
-lib/kde3/kcm_history.so
 lib/kde3/kcm_icons.la
-lib/kde3/kcm_icons.so
 lib/kde3/kcm_info.la
-lib/kde3/kcm_info.so
 lib/kde3/kcm_input.la
-lib/kde3/kcm_input.so
 lib/kde3/kcm_ioslaveinfo.la
-lib/kde3/kcm_ioslaveinfo.so
 lib/kde3/kcm_kded.la
-lib/kde3/kcm_kded.so
 lib/kde3/kcm_kdm.la
-lib/kde3/kcm_kdm.so
 lib/kde3/kcm_keyboard.la
-lib/kde3/${KCMKEYBOARD}
 lib/kde3/kcm_keys.la
-lib/kde3/kcm_keys.so
 lib/kde3/kcm_khotkeys.la
-lib/kde3/kcm_khotkeys.so
 lib/kde3/kcm_kicker.la
-lib/kde3/kcm_kicker.so
 lib/kde3/kcm_kio.la
-lib/kde3/kcm_kio.so
 lib/kde3/kcm_knotify.la
-lib/kde3/kcm_knotify.so
 lib/kde3/kcm_konq.la
-lib/kde3/kcm_konq.so
 lib/kde3/kcm_konqhtml.la
-lib/kde3/kcm_konqhtml.so
 lib/kde3/kcm_konsole.la
-lib/kde3/kcm_konsole.so
 lib/kde3/kcm_ksplashthemes.la
-lib/kde3/kcm_ksplashthemes.so
 lib/kde3/kcm_kthememanager.la
-lib/kde3/kcm_kthememanager.so
 lib/kde3/kcm_kurifilt.la
-lib/kde3/kcm_kurifilt.so
 lib/kde3/kcm_kwindecoration.la
-lib/kde3/kcm_kwindecoration.so
 lib/kde3/kcm_kwinoptions.la
-lib/kde3/kcm_kwinoptions.so
 lib/kde3/kcm_kwinrules.la
-lib/kde3/kcm_kwinrules.so
 lib/kde3/kcm_launch.la
-lib/kde3/kcm_launch.so
 lib/kde3/kcm_locale.la
-lib/kde3/kcm_locale.so
 lib/kde3/kcm_nic.la
-lib/kde3/kcm_nic.so
 lib/kde3/kcm_nsplugins.la
-lib/kde3/kcm_nsplugins.so
 lib/kde3/kcm_performance.la
-lib/kde3/kcm_performance.so
 lib/kde3/kcm_printmgr.la
-lib/kde3/kcm_printmgr.so
 lib/kde3/kcm_privacy.la
-lib/kde3/kcm_privacy.so
 ${HAVE_RANDR}lib/kde3/kcm_randr.la
-${HAVE_RANDR}lib/kde3/kcm_randr.so
 lib/kde3/kcm_samba.la
-lib/kde3/kcm_samba.so
 lib/kde3/kcm_screensaver.la
-lib/kde3/kcm_screensaver.so
 lib/kde3/kcm_smserver.la
-lib/kde3/kcm_smserver.so
 lib/kde3/kcm_spellchecking.la
-lib/kde3/kcm_spellchecking.so
 lib/kde3/kcm_style.la
-lib/kde3/kcm_style.so
 lib/kde3/kcm_taskbar.la
-lib/kde3/kcm_taskbar.so
 lib/kde3/kcm_useraccount.la
-lib/kde3/kcm_useraccount.so
 lib/kde3/kcm_xinerama.la
-lib/kde3/kcm_xinerama.so
 lib/kde3/kcminit.la
-lib/kde3/kcminit.so
 lib/kde3/kcmshell.la
-lib/kde3/kcmshell.so
 lib/kde3/kcontrol.la
-lib/kde3/kcontrol.so
 lib/kde3/kcontroledit.la
-lib/kde3/kcontroledit.so
 lib/kde3/kded_favicons.la
-lib/kde3/kded_favicons.so
 lib/kde3/kded_konqy_preloader.la
-lib/kde3/kded_konqy_preloader.so
 lib/kde3/kded_kwrited.la
-lib/kde3/kded_kwrited.so
 lib/kde3/kdesktop.la
-lib/kde3/kdesktop.so
 lib/kde3/keditbookmarks.la
-lib/kde3/keditbookmarks.so
 lib/kde3/kfile_font.la
-lib/kde3/kfile_font.${FONTENC_SUFFIX}
 lib/kde3/kfmclient.la
-lib/kde3/kfmclient.so
 lib/kde3/kgreet_classic.la
-lib/kde3/kgreet_classic.so
 lib/kde3/khelpcenter.la
-lib/kde3/khelpcenter.so
 lib/kde3/khotkeys.la
-lib/kde3/khotkeys.so
 lib/kde3/kicker.la
-lib/kde3/kicker.so
 lib/kde3/kickermenu_find.la
-lib/kde3/kickermenu_find.so
 lib/kde3/kickermenu_kdeprint.la
-lib/kde3/kickermenu_kdeprint.so
 lib/kde3/kickermenu_konqueror.la
-lib/kde3/kickermenu_konqueror.so
 lib/kde3/kickermenu_konsole.la
-lib/kde3/kickermenu_konsole.so
 lib/kde3/kickermenu_prefmenu.la
-lib/kde3/kickermenu_prefmenu.so
 lib/kde3/kickermenu_recentdocs.la
-lib/kde3/kickermenu_recentdocs.so
 lib/kde3/kio_about.la
-lib/kde3/kio_about.so
 lib/kde3/kio_cgi.la
-lib/kde3/kio_cgi.so
 lib/kde3/kio_filter.la
-lib/kde3/kio_filter.so
 lib/kde3/kio_finger.la
-lib/kde3/kio_finger.so
 lib/kde3/kio_fish.la
-lib/kde3/kio_fish.so
 lib/kde3/kio_floppy.la
-lib/kde3/kio_floppy.so
 lib/kde3/kio_fonts.la
-lib/kde3/kio_fonts.${FONTENC_SUFFIX}
 lib/kde3/kio_imap4.la
-lib/kde3/kio_imap4.so
 lib/kde3/kio_info.la
-lib/kde3/kio_info.so
 lib/kde3/kio_ldap.la
-lib/kde3/kio_ldap.so
 lib/kde3/kio_mac.la
-lib/kde3/kio_mac.so
 lib/kde3/kio_man.la
-lib/kde3/kio_man.so
 lib/kde3/kio_nfs.la
-lib/kde3/kio_nfs.so
 lib/kde3/kio_nntp.la
-lib/kde3/kio_nntp.so
 lib/kde3/kio_pop3.la
-lib/kde3/kio_pop3.so
 lib/kde3/kio_print.la
-lib/kde3/kio_print.so
 lib/kde3/kio_settings.la
-lib/kde3/kio_settings.so
 lib/kde3/kio_sftp.la
-lib/kde3/kio_sftp.so
 lib/kde3/kio_smtp.la
-lib/kde3/kio_smtp.so
 lib/kde3/kio_tar.la
-lib/kde3/kio_tar.so
 lib/kde3/kio_thumbnail.la
-lib/kde3/kio_thumbnail.so
 lib/kde3/kjobviewer.la
-lib/kde3/kjobviewer.so
 lib/kde3/klipper.la
-lib/kde3/klipper.so
 lib/kde3/klipper_panelapplet.la
-lib/kde3/klipper_panelapplet.so
 lib/kde3/kmenuedit.la
-lib/kde3/kmenuedit.so
 lib/kde3/konq_aboutpage.la
-lib/kde3/konq_aboutpage.so
 lib/kde3/konq_iconview.la
-lib/kde3/konq_iconview.so
 lib/kde3/konq_listview.la
-lib/kde3/konq_listview.so
 lib/kde3/konq_remoteencoding.la
-lib/kde3/konq_remoteencoding.so
 lib/kde3/konq_shellcmdplugin.la
-lib/kde3/konq_shellcmdplugin.so
 lib/kde3/konq_sidebar.la
-lib/kde3/konq_sidebar.so
 lib/kde3/konq_sidebartree_bookmarks.la
-lib/kde3/konq_sidebartree_bookmarks.so
 lib/kde3/konq_sidebartree_dirtree.la
-lib/kde3/konq_sidebartree_dirtree.so
 lib/kde3/konq_sidebartree_history.la
-lib/kde3/konq_sidebartree_history.so
 lib/kde3/konq_sound.la
-lib/kde3/konq_sound.so
 lib/kde3/konqsidebar_tree.la
-lib/kde3/konqsidebar_tree.so
 lib/kde3/konqsidebar_web.la
-lib/kde3/konqsidebar_web.so
 lib/kde3/konqueror.la
-lib/kde3/konqueror.so
 lib/kde3/konsole.la
-lib/kde3/konsole.so
 lib/kde3/kprinter.la
-lib/kde3/kprinter.so
 ${HAVE_RANDR}lib/kde3/krandrinithack.la
-${HAVE_RANDR}lib/kde3/krandrinithack.so
 lib/kde3/ksmserver.la
-lib/kde3/ksmserver.so
 lib/kde3/ksplashdefault.la
-lib/kde3/ksplashdefault.so
 lib/kde3/ksplashredmond.la
-lib/kde3/ksplashredmond.so
 lib/kde3/ksplashstandard.la
-lib/kde3/ksplashstandard.so
 lib/kde3/kstyle_keramik_config.la
-lib/kde3/kstyle_keramik_config.so
 lib/kde3/kwin.la
-lib/kde3/kwin.so
 lib/kde3/kwin3_b2.la
-lib/kde3/kwin3_b2.so
 lib/kde3/kwin3_default.la
-lib/kde3/kwin3_default.so
 lib/kde3/kwin3_keramik.la
-lib/kde3/kwin3_keramik.so
 lib/kde3/kwin3_laptop.la
-lib/kde3/kwin3_laptop.so
 lib/kde3/kwin3_modernsys.la
-lib/kde3/kwin3_modernsys.so
 lib/kde3/kwin3_quartz.la
-lib/kde3/kwin3_quartz.so
 lib/kde3/kwin3_redmond.la
-lib/kde3/kwin3_redmond.so
 lib/kde3/kwin3_web.la
-lib/kde3/kwin3_web.so
 lib/kde3/kwin_b2_config.la
-lib/kde3/kwin_b2_config.so
 lib/kde3/kwin_default_config.la
-lib/kde3/kwin_default_config.so
 lib/kde3/kwin_keramik_config.la
-lib/kde3/kwin_keramik_config.so
 lib/kde3/kwin_modernsys_config.la
-lib/kde3/kwin_modernsys_config.so
 lib/kde3/kwin_quartz_config.la
-lib/kde3/kwin_quartz_config.so
 lib/kde3/kwin_rules_dialog.la
-lib/kde3/kwin_rules_dialog.so
 lib/kde3/kwrite.la
-lib/kde3/kwrite.so
 lib/kde3/kxkb.la
-lib/kde3/kxkb.so
 lib/kde3/launcher_panelapplet.la
-lib/kde3/launcher_panelapplet.so
 lib/kde3/libkdeprint_part.la
-lib/kde3/libkdeprint_part.so
 lib/kde3/libkfindpart.la
-lib/kde3/libkfindpart.so
 lib/kde3/libkfontviewpart.la
-lib/kde3/libkfontviewpart.${FONTENC_SUFFIX}
 lib/kde3/libkmanpart.la
-lib/kde3/libkmanpart.so
 lib/kde3/libkonsolepart.la
-lib/kde3/libkonsolepart.so
 lib/kde3/libkshorturifilter.la
-lib/kde3/libkshorturifilter.so
 lib/kde3/libkuriikwsfilter.la
-lib/kde3/libkuriikwsfilter.so
 lib/kde3/libkurisearchfilter.la
-lib/kde3/libkurisearchfilter.so
 lib/kde3/liblocaldomainurifilter.la
-lib/kde3/liblocaldomainurifilter.so
 lib/kde3/libnsplugin.la
-lib/kde3/libnsplugin.so
 lib/kde3/lockout_panelapplet.la
-lib/kde3/lockout_panelapplet.so
 lib/kde3/menu_panelapplet.la
-lib/kde3/menu_panelapplet.so
 lib/kde3/minipager_panelapplet.la
-lib/kde3/minipager_panelapplet.so
 lib/kde3/naughty_panelapplet.la
-lib/kde3/naughty_panelapplet.so
 lib/kde3/picturethumbnail.la
-lib/kde3/picturethumbnail.so
 lib/kde3/run_panelapplet.la
-lib/kde3/run_panelapplet.so
 lib/kde3/sidebar_panelextension.la
-lib/kde3/sidebar_panelextension.so
 lib/kde3/sysguard_panelapplet.la
-lib/kde3/sysguard_panelapplet.so
 lib/kde3/systemtray_panelapplet.la
-lib/kde3/systemtray_panelapplet.so
 lib/kde3/taskbar_panelapplet.la
-lib/kde3/taskbar_panelapplet.so
 lib/kde3/taskbar_panelextension.la
-lib/kde3/taskbar_panelextension.so
 lib/kde3/textthumbnail.la
-lib/kde3/textthumbnail.so
 lib/libkateinterfaces.la
-lib/libkateinterfaces.so
-lib/libkateinterfaces.so.0
-lib/libkateinterfaces.so.0.0
 lib/libkateutils.la
-lib/libkateutils.so
-lib/libkateutils.so.0
-lib/libkateutils.so.0.0
 lib/libkdecorations.la
-lib/libkdecorations.so
-lib/libkdecorations.so.1
-lib/libkdecorations.so.1.0
 lib/libkdeinit_appletproxy.la
-lib/libkdeinit_appletproxy.so
 lib/libkdeinit_extensionproxy.la
-lib/libkdeinit_extensionproxy.so
 lib/libkdeinit_kaccess.la
-lib/libkdeinit_kaccess.so
 lib/libkdeinit_kate.la
-lib/libkdeinit_kate.so
 lib/libkdeinit_kcminit.la
-lib/libkdeinit_kcminit.so
 lib/libkdeinit_kcmshell.la
-lib/libkdeinit_kcmshell.so
 lib/libkdeinit_kcontrol.la
-lib/libkdeinit_kcontrol.so
 lib/libkdeinit_kcontroledit.la
-lib/libkdeinit_kcontroledit.so
 lib/libkdeinit_kdesktop.la
-lib/libkdeinit_kdesktop.so
 lib/libkdeinit_keditbookmarks.la
-lib/libkdeinit_keditbookmarks.so
 lib/libkdeinit_kfmclient.la
-lib/libkdeinit_kfmclient.so
 lib/libkdeinit_khelpcenter.la
-lib/libkdeinit_khelpcenter.so
 lib/libkdeinit_khotkeys.la
-lib/libkdeinit_khotkeys.so
 lib/libkdeinit_kicker.la
-lib/libkdeinit_kicker.so
 lib/libkdeinit_kjobviewer.la
-lib/libkdeinit_kjobviewer.so
 lib/libkdeinit_klipper.la
-lib/libkdeinit_klipper.so
 lib/libkdeinit_kmenuedit.la
-lib/libkdeinit_kmenuedit.so
 lib/libkdeinit_konqueror.la
-lib/libkdeinit_konqueror.so
 lib/libkdeinit_konsole.la
-lib/libkdeinit_konsole.so
 lib/libkdeinit_kprinter.la
-lib/libkdeinit_kprinter.so
 ${HAVE_RANDR}lib/libkdeinit_krandrinithack.la
-${HAVE_RANDR}lib/libkdeinit_krandrinithack.so
 lib/libkdeinit_ksmserver.la
-lib/libkdeinit_ksmserver.so
 lib/libkdeinit_kwin.la
-lib/libkdeinit_kwin.so
 lib/libkdeinit_kwin_rules_dialog.la
-lib/libkdeinit_kwin_rules_dialog.so
 lib/libkdeinit_kwrite.la
-lib/libkdeinit_kwrite.so
 lib/libkdeinit_kxkb.la
-lib/libkdeinit_kxkb.so
 lib/libkfontinst.la
-lib/libkfontinst.so
-lib/libkfontinst.so.0
-lib/libkfontinst.so.0.0
 lib/libkickermain.la
-lib/libkickermain.so
-lib/libkickermain.so.1
-lib/libkickermain.so.1.0
 lib/libkonq.la
-lib/libkonq.so
-lib/libkonq.so.6
-lib/libkonq.so.6.0
 lib/libkonqsidebarplugin.la
-lib/libkonqsidebarplugin.so
-lib/libkonqsidebarplugin.so.3
-lib/libkonqsidebarplugin.so.3.0
 lib/libksgrd.la
-lib/libksgrd.so
-lib/libksgrd.so.3
-lib/libksgrd.so.3.0
 lib/libksplashthemes.la
-lib/libksplashthemes.so
-lib/libksplashthemes.so.0
-lib/libksplashthemes.so.0.0
 lib/libtaskbar.la
-lib/libtaskbar.so
-lib/libtaskbar.so.3
-lib/libtaskbar.so.3.0
 lib/libtaskmanager.la
-lib/libtaskmanager.so
-lib/libtaskmanager.so.1
-lib/libtaskmanager.so.1.0
 share/applications/kde/Help.desktop
 share/applications/kde/Home.desktop
 share/applications/kde/KControl.desktop