Add back @unexec/@exec ldconfig pair and remove *.so files

from the PLIST.  These files are generated by ldconfig and
should not be packaged.  Also remove some @dirrm's no longer
required after Erich's last fix.  And while I'm here resort.

OK'd by:	Satoshi Asami

4 files changed, 124 insertions, 136 deletions

diff --git a/x11-toolkits/gtk12/pkg-plist b/x11-toolkits/gtk12/pkg-plist
index eef5e95156a5..2e223a304c6e 100644
--- a/x11-toolkits/gtk12/pkg-plist
+++ b/x11-toolkits/gtk12/pkg-plist
@@ -1,25 +1,4 @@
-info/dir
-info/gdk.info
-info/gtk.info
-info/gtk.info-1
-info/gtk.info-2
-info/gtk.info-3
-info/gtk.info-4
-info/gtk.info-5
-info/glib.info
 bin/gtk-config
-share/aclocal/gtk.m4
-lib/libglib.so.1.0
-lib/libglib.la
-lib/libglib.a
-include/glibconfig.h
-lib/libgdk.so.1.0
-lib/libgdk.la
-lib/libgdk.a
-lib/libgtk.so.1.0
-lib/libgtk.la
-lib/libgtk.a
-include/glib.h
 include/gdk/gdk.h
 include/gdk/gdkcursors.h
 include/gdk/gdki18n.h
@@ -27,14 +6,16 @@ include/gdk/gdkkeysyms.h
 include/gdk/gdkprivate.h
 include/gdk/gdktypes.h
 include/gdk/gdkx.h
+include/glib.h
+include/glibconfig.h
 include/gtk/gtk.h
 include/gtk/gtkaccelerator.h
 include/gtk/gtkadjustment.h
-include/gtk/gtkaspectframe.h
 include/gtk/gtkalignment.h
 include/gtk/gtkarrow.h
-include/gtk/gtkbin.h
+include/gtk/gtkaspectframe.h
 include/gtk/gtkbbox.h
+include/gtk/gtkbin.h
 include/gtk/gtkbox.h
 include/gtk/gtkbutton.h
 include/gtk/gtkcheckbutton.h
@@ -48,7 +29,6 @@ include/gtk/gtkdata.h
 include/gtk/gtkdebug.h
 include/gtk/gtkdialog.h
 include/gtk/gtkdrawingarea.h
-include/gtk/gtkgc.h
 include/gtk/gtkeditable.h
 include/gtk/gtkentry.h
 include/gtk/gtkenums.h
@@ -57,6 +37,7 @@ include/gtk/gtkfilesel.h
 include/gtk/gtkfixed.h
 include/gtk/gtkframe.h
 include/gtk/gtkgamma.h
+include/gtk/gtkgc.h
 include/gtk/gtkhandlebox.h
 include/gtk/gtkhbbox.h
 include/gtk/gtkhbox.h
@@ -72,7 +53,6 @@ include/gtk/gtklabel.h
 include/gtk/gtklist.h
 include/gtk/gtklistitem.h
 include/gtk/gtkmain.h
-include/gtk/gtkrc.h
 include/gtk/gtkmenu.h
 include/gtk/gtkmenubar.h
 include/gtk/gtkmenufactory.h
@@ -90,16 +70,17 @@ include/gtk/gtkprogressbar.h
 include/gtk/gtkradiobutton.h
 include/gtk/gtkradiomenuitem.h
 include/gtk/gtkrange.h
+include/gtk/gtkrc.h
 include/gtk/gtkruler.h
 include/gtk/gtkscale.h
 include/gtk/gtkscrollbar.h
 include/gtk/gtkscrolledwindow.h
-include/gtk/gtksignal.h
 include/gtk/gtkselection.h
 include/gtk/gtkseparator.h
+include/gtk/gtksignal.h
 include/gtk/gtkspinbutton.h
-include/gtk/gtkstyle.h
 include/gtk/gtkstatusbar.h
+include/gtk/gtkstyle.h
 include/gtk/gtktable.h
 include/gtk/gtktext.h
 include/gtk/gtktipsquery.h
@@ -108,6 +89,7 @@ include/gtk/gtktoolbar.h
 include/gtk/gtktooltips.h
 include/gtk/gtktree.h
 include/gtk/gtktreeitem.h
+include/gtk/gtktypebuiltins.h
 include/gtk/gtktypeutils.h
 include/gtk/gtkvbbox.h
 include/gtk/gtkvbox.h
@@ -119,12 +101,27 @@ include/gtk/gtkvscrollbar.h
 include/gtk/gtkvseparator.h
 include/gtk/gtkwidget.h
 include/gtk/gtkwindow.h
-include/gtk/gtktypebuiltins.h
-lib/libglib.so
-lib/libgdk.so
-lib/libgtk.so
-@dirrm share/aclocal
-@dirrm lib/glib/include
-@dirrm lib/glib
+info/dir
+info/gdk.info
+info/glib.info
+info/gtk.info
+info/gtk.info-1
+info/gtk.info-2
+info/gtk.info-3
+info/gtk.info-4
+info/gtk.info-5
+lib/libgdk.a
+lib/libgdk.la
+lib/libgdk.so.1.0
+lib/libglib.a
+lib/libglib.la
+lib/libglib.so.1.0
+lib/libgtk.a
+lib/libgtk.la
+lib/libgtk.so.1.0
+@unexec /sbin/ldconfig -R
+@exec /sbin/ldconfig -m %D/lib
+share/aclocal/gtk.m4
 @dirrm include/gdk
 @dirrm include/gtk
+@dirrm share/aclocal
diff --git a/x11-toolkits/gtk13/pkg-plist b/x11-toolkits/gtk13/pkg-plist
index eef5e95156a5..2e223a304c6e 100644
--- a/x11-toolkits/gtk13/pkg-plist
+++ b/x11-toolkits/gtk13/pkg-plist
@@ -1,25 +1,4 @@
-info/dir
-info/gdk.info
-info/gtk.info
-info/gtk.info-1
-info/gtk.info-2
-info/gtk.info-3
-info/gtk.info-4
-info/gtk.info-5
-info/glib.info
 bin/gtk-config
-share/aclocal/gtk.m4
-lib/libglib.so.1.0
-lib/libglib.la
-lib/libglib.a
-include/glibconfig.h
-lib/libgdk.so.1.0
-lib/libgdk.la
-lib/libgdk.a
-lib/libgtk.so.1.0
-lib/libgtk.la
-lib/libgtk.a
-include/glib.h
 include/gdk/gdk.h
 include/gdk/gdkcursors.h
 include/gdk/gdki18n.h
@@ -27,14 +6,16 @@ include/gdk/gdkkeysyms.h
 include/gdk/gdkprivate.h
 include/gdk/gdktypes.h
 include/gdk/gdkx.h
+include/glib.h
+include/glibconfig.h
 include/gtk/gtk.h
 include/gtk/gtkaccelerator.h
 include/gtk/gtkadjustment.h
-include/gtk/gtkaspectframe.h
 include/gtk/gtkalignment.h
 include/gtk/gtkarrow.h
-include/gtk/gtkbin.h
+include/gtk/gtkaspectframe.h
 include/gtk/gtkbbox.h
+include/gtk/gtkbin.h
 include/gtk/gtkbox.h
 include/gtk/gtkbutton.h
 include/gtk/gtkcheckbutton.h
@@ -48,7 +29,6 @@ include/gtk/gtkdata.h
 include/gtk/gtkdebug.h
 include/gtk/gtkdialog.h
 include/gtk/gtkdrawingarea.h
-include/gtk/gtkgc.h
 include/gtk/gtkeditable.h
 include/gtk/gtkentry.h
 include/gtk/gtkenums.h
@@ -57,6 +37,7 @@ include/gtk/gtkfilesel.h
 include/gtk/gtkfixed.h
 include/gtk/gtkframe.h
 include/gtk/gtkgamma.h
+include/gtk/gtkgc.h
 include/gtk/gtkhandlebox.h
 include/gtk/gtkhbbox.h
 include/gtk/gtkhbox.h
@@ -72,7 +53,6 @@ include/gtk/gtklabel.h
 include/gtk/gtklist.h
 include/gtk/gtklistitem.h
 include/gtk/gtkmain.h
-include/gtk/gtkrc.h
 include/gtk/gtkmenu.h
 include/gtk/gtkmenubar.h
 include/gtk/gtkmenufactory.h
@@ -90,16 +70,17 @@ include/gtk/gtkprogressbar.h
 include/gtk/gtkradiobutton.h
 include/gtk/gtkradiomenuitem.h
 include/gtk/gtkrange.h
+include/gtk/gtkrc.h
 include/gtk/gtkruler.h
 include/gtk/gtkscale.h
 include/gtk/gtkscrollbar.h
 include/gtk/gtkscrolledwindow.h
-include/gtk/gtksignal.h
 include/gtk/gtkselection.h
 include/gtk/gtkseparator.h
+include/gtk/gtksignal.h
 include/gtk/gtkspinbutton.h
-include/gtk/gtkstyle.h
 include/gtk/gtkstatusbar.h
+include/gtk/gtkstyle.h
 include/gtk/gtktable.h
 include/gtk/gtktext.h
 include/gtk/gtktipsquery.h
@@ -108,6 +89,7 @@ include/gtk/gtktoolbar.h
 include/gtk/gtktooltips.h
 include/gtk/gtktree.h
 include/gtk/gtktreeitem.h
+include/gtk/gtktypebuiltins.h
 include/gtk/gtktypeutils.h
 include/gtk/gtkvbbox.h
 include/gtk/gtkvbox.h
@@ -119,12 +101,27 @@ include/gtk/gtkvscrollbar.h
 include/gtk/gtkvseparator.h
 include/gtk/gtkwidget.h
 include/gtk/gtkwindow.h
-include/gtk/gtktypebuiltins.h
-lib/libglib.so
-lib/libgdk.so
-lib/libgtk.so
-@dirrm share/aclocal
-@dirrm lib/glib/include
-@dirrm lib/glib
+info/dir
+info/gdk.info
+info/glib.info
+info/gtk.info
+info/gtk.info-1
+info/gtk.info-2
+info/gtk.info-3
+info/gtk.info-4
+info/gtk.info-5
+lib/libgdk.a
+lib/libgdk.la
+lib/libgdk.so.1.0
+lib/libglib.a
+lib/libglib.la
+lib/libglib.so.1.0
+lib/libgtk.a
+lib/libgtk.la
+lib/libgtk.so.1.0
+@unexec /sbin/ldconfig -R
+@exec /sbin/ldconfig -m %D/lib
+share/aclocal/gtk.m4
 @dirrm include/gdk
 @dirrm include/gtk
+@dirrm share/aclocal
diff --git a/x11-toolkits/gtk20/pkg-plist b/x11-toolkits/gtk20/pkg-plist
index eef5e95156a5..2e223a304c6e 100644
--- a/x11-toolkits/gtk20/pkg-plist
+++ b/x11-toolkits/gtk20/pkg-plist
@@ -1,25 +1,4 @@
-info/dir
-info/gdk.info
-info/gtk.info
-info/gtk.info-1
-info/gtk.info-2
-info/gtk.info-3
-info/gtk.info-4
-info/gtk.info-5
-info/glib.info
 bin/gtk-config
-share/aclocal/gtk.m4
-lib/libglib.so.1.0
-lib/libglib.la
-lib/libglib.a
-include/glibconfig.h
-lib/libgdk.so.1.0
-lib/libgdk.la
-lib/libgdk.a
-lib/libgtk.so.1.0
-lib/libgtk.la
-lib/libgtk.a
-include/glib.h
 include/gdk/gdk.h
 include/gdk/gdkcursors.h
 include/gdk/gdki18n.h
@@ -27,14 +6,16 @@ include/gdk/gdkkeysyms.h
 include/gdk/gdkprivate.h
 include/gdk/gdktypes.h
 include/gdk/gdkx.h
+include/glib.h
+include/glibconfig.h
 include/gtk/gtk.h
 include/gtk/gtkaccelerator.h
 include/gtk/gtkadjustment.h
-include/gtk/gtkaspectframe.h
 include/gtk/gtkalignment.h
 include/gtk/gtkarrow.h
-include/gtk/gtkbin.h
+include/gtk/gtkaspectframe.h
 include/gtk/gtkbbox.h
+include/gtk/gtkbin.h
 include/gtk/gtkbox.h
 include/gtk/gtkbutton.h
 include/gtk/gtkcheckbutton.h
@@ -48,7 +29,6 @@ include/gtk/gtkdata.h
 include/gtk/gtkdebug.h
 include/gtk/gtkdialog.h
 include/gtk/gtkdrawingarea.h
-include/gtk/gtkgc.h
 include/gtk/gtkeditable.h
 include/gtk/gtkentry.h
 include/gtk/gtkenums.h
@@ -57,6 +37,7 @@ include/gtk/gtkfilesel.h
 include/gtk/gtkfixed.h
 include/gtk/gtkframe.h
 include/gtk/gtkgamma.h
+include/gtk/gtkgc.h
 include/gtk/gtkhandlebox.h
 include/gtk/gtkhbbox.h
 include/gtk/gtkhbox.h
@@ -72,7 +53,6 @@ include/gtk/gtklabel.h
 include/gtk/gtklist.h
 include/gtk/gtklistitem.h
 include/gtk/gtkmain.h
-include/gtk/gtkrc.h
 include/gtk/gtkmenu.h
 include/gtk/gtkmenubar.h
 include/gtk/gtkmenufactory.h
@@ -90,16 +70,17 @@ include/gtk/gtkprogressbar.h
 include/gtk/gtkradiobutton.h
 include/gtk/gtkradiomenuitem.h
 include/gtk/gtkrange.h
+include/gtk/gtkrc.h
 include/gtk/gtkruler.h
 include/gtk/gtkscale.h
 include/gtk/gtkscrollbar.h
 include/gtk/gtkscrolledwindow.h
-include/gtk/gtksignal.h
 include/gtk/gtkselection.h
 include/gtk/gtkseparator.h
+include/gtk/gtksignal.h
 include/gtk/gtkspinbutton.h
-include/gtk/gtkstyle.h
 include/gtk/gtkstatusbar.h
+include/gtk/gtkstyle.h
 include/gtk/gtktable.h
 include/gtk/gtktext.h
 include/gtk/gtktipsquery.h
@@ -108,6 +89,7 @@ include/gtk/gtktoolbar.h
 include/gtk/gtktooltips.h
 include/gtk/gtktree.h
 include/gtk/gtktreeitem.h
+include/gtk/gtktypebuiltins.h
 include/gtk/gtktypeutils.h
 include/gtk/gtkvbbox.h
 include/gtk/gtkvbox.h
@@ -119,12 +101,27 @@ include/gtk/gtkvscrollbar.h
 include/gtk/gtkvseparator.h
 include/gtk/gtkwidget.h
 include/gtk/gtkwindow.h
-include/gtk/gtktypebuiltins.h
-lib/libglib.so
-lib/libgdk.so
-lib/libgtk.so
-@dirrm share/aclocal
-@dirrm lib/glib/include
-@dirrm lib/glib
+info/dir
+info/gdk.info
+info/glib.info
+info/gtk.info
+info/gtk.info-1
+info/gtk.info-2
+info/gtk.info-3
+info/gtk.info-4
+info/gtk.info-5
+lib/libgdk.a
+lib/libgdk.la
+lib/libgdk.so.1.0
+lib/libglib.a
+lib/libglib.la
+lib/libglib.so.1.0
+lib/libgtk.a
+lib/libgtk.la
+lib/libgtk.so.1.0
+@unexec /sbin/ldconfig -R
+@exec /sbin/ldconfig -m %D/lib
+share/aclocal/gtk.m4
 @dirrm include/gdk
 @dirrm include/gtk
+@dirrm share/aclocal
diff --git a/x11-toolkits/gtk30/pkg-plist b/x11-toolkits/gtk30/pkg-plist
index eef5e95156a5..2e223a304c6e 100644
--- a/x11-toolkits/gtk30/pkg-plist
+++ b/x11-toolkits/gtk30/pkg-plist
@@ -1,25 +1,4 @@
-info/dir
-info/gdk.info
-info/gtk.info
-info/gtk.info-1
-info/gtk.info-2
-info/gtk.info-3
-info/gtk.info-4
-info/gtk.info-5
-info/glib.info
 bin/gtk-config
-share/aclocal/gtk.m4
-lib/libglib.so.1.0
-lib/libglib.la
-lib/libglib.a
-include/glibconfig.h
-lib/libgdk.so.1.0
-lib/libgdk.la
-lib/libgdk.a
-lib/libgtk.so.1.0
-lib/libgtk.la
-lib/libgtk.a
-include/glib.h
 include/gdk/gdk.h
 include/gdk/gdkcursors.h
 include/gdk/gdki18n.h
@@ -27,14 +6,16 @@ include/gdk/gdkkeysyms.h
 include/gdk/gdkprivate.h
 include/gdk/gdktypes.h
 include/gdk/gdkx.h
+include/glib.h
+include/glibconfig.h
 include/gtk/gtk.h
 include/gtk/gtkaccelerator.h
 include/gtk/gtkadjustment.h
-include/gtk/gtkaspectframe.h
 include/gtk/gtkalignment.h
 include/gtk/gtkarrow.h
-include/gtk/gtkbin.h
+include/gtk/gtkaspectframe.h
 include/gtk/gtkbbox.h
+include/gtk/gtkbin.h
 include/gtk/gtkbox.h
 include/gtk/gtkbutton.h
 include/gtk/gtkcheckbutton.h
@@ -48,7 +29,6 @@ include/gtk/gtkdata.h
 include/gtk/gtkdebug.h
 include/gtk/gtkdialog.h
 include/gtk/gtkdrawingarea.h
-include/gtk/gtkgc.h
 include/gtk/gtkeditable.h
 include/gtk/gtkentry.h
 include/gtk/gtkenums.h
@@ -57,6 +37,7 @@ include/gtk/gtkfilesel.h
 include/gtk/gtkfixed.h
 include/gtk/gtkframe.h
 include/gtk/gtkgamma.h
+include/gtk/gtkgc.h
 include/gtk/gtkhandlebox.h
 include/gtk/gtkhbbox.h
 include/gtk/gtkhbox.h
@@ -72,7 +53,6 @@ include/gtk/gtklabel.h
 include/gtk/gtklist.h
 include/gtk/gtklistitem.h
 include/gtk/gtkmain.h
-include/gtk/gtkrc.h
 include/gtk/gtkmenu.h
 include/gtk/gtkmenubar.h
 include/gtk/gtkmenufactory.h
@@ -90,16 +70,17 @@ include/gtk/gtkprogressbar.h
 include/gtk/gtkradiobutton.h
 include/gtk/gtkradiomenuitem.h
 include/gtk/gtkrange.h
+include/gtk/gtkrc.h
 include/gtk/gtkruler.h
 include/gtk/gtkscale.h
 include/gtk/gtkscrollbar.h
 include/gtk/gtkscrolledwindow.h
-include/gtk/gtksignal.h
 include/gtk/gtkselection.h
 include/gtk/gtkseparator.h
+include/gtk/gtksignal.h
 include/gtk/gtkspinbutton.h
-include/gtk/gtkstyle.h
 include/gtk/gtkstatusbar.h
+include/gtk/gtkstyle.h
 include/gtk/gtktable.h
 include/gtk/gtktext.h
 include/gtk/gtktipsquery.h
@@ -108,6 +89,7 @@ include/gtk/gtktoolbar.h
 include/gtk/gtktooltips.h
 include/gtk/gtktree.h
 include/gtk/gtktreeitem.h
+include/gtk/gtktypebuiltins.h
 include/gtk/gtktypeutils.h
 include/gtk/gtkvbbox.h
 include/gtk/gtkvbox.h
@@ -119,12 +101,27 @@ include/gtk/gtkvscrollbar.h
 include/gtk/gtkvseparator.h
 include/gtk/gtkwidget.h
 include/gtk/gtkwindow.h
-include/gtk/gtktypebuiltins.h
-lib/libglib.so
-lib/libgdk.so
-lib/libgtk.so
-@dirrm share/aclocal
-@dirrm lib/glib/include
-@dirrm lib/glib
+info/dir
+info/gdk.info
+info/glib.info
+info/gtk.info
+info/gtk.info-1
+info/gtk.info-2
+info/gtk.info-3
+info/gtk.info-4
+info/gtk.info-5
+lib/libgdk.a
+lib/libgdk.la
+lib/libgdk.so.1.0
+lib/libglib.a
+lib/libglib.la
+lib/libglib.so.1.0
+lib/libgtk.a
+lib/libgtk.la
+lib/libgtk.so.1.0
+@unexec /sbin/ldconfig -R
+@exec /sbin/ldconfig -m %D/lib
+share/aclocal/gtk.m4
 @dirrm include/gdk
 @dirrm include/gtk
+@dirrm share/aclocal