Move the '@unexec ...' stuff before the info/* files and sort.

4 files changed, 104 insertions, 116 deletions

diff --git a/x11-toolkits/gtk12/pkg-plist b/x11-toolkits/gtk12/pkg-plist
index 14c393f..a397d20 100644
--- a/x11-toolkits/gtk12/pkg-plist
+++ b/x11-toolkits/gtk12/pkg-plist
@@ -1,23 +1,3 @@
-info/gdk.info
-info/gtk.info
-@unexec install-info --delete %D/info/gdk.info %D/info/dir
-@unexec install-info --delete %D/info/gtk.info %D/info/dir
-@exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
-@exec install-info %D/info/gtk.info %D/info/dir
-@exec install-info %D/info/gdk.info %D/info/dir
-lib/libglib.so.1.0
-lib/libglib.la
-lib/libglib.a
-lib/libgdk.so.1.0
-lib/libgdk.la
-lib/libgdk.a
-lib/libgtk.so.1.0
-lib/libgtk.la
-lib/libgtk.a
-@exec /sbin/ldconfig -m %D/lib
-@unexec /sbin/ldconfig -R
-include/glib.h
-include/glibconfig.h
 include/gdk/gdk.h
 include/gdk/gdkcursors.h
 include/gdk/gdki18n.h
@@ -25,14 +5,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
@@ -46,13 +28,13 @@ include/gtk/gtkdata.h
 include/gtk/gtkdialog.h
 include/gtk/gtkdrawingarea.h
 include/gtk/gtkentry.h
-include/gtk/gtkgc.h
 include/gtk/gtkenums.h
 include/gtk/gtkeventbox.h
 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
@@ -70,7 +52,6 @@ include/gtk/gtklistitem.h
 include/gtk/gtkmain.h
 include/gtk/gtkmenu.h
 include/gtk/gtkmenubar.h
-include/gtk/gtkrc.h
 include/gtk/gtkmenufactory.h
 include/gtk/gtkmenuitem.h
 include/gtk/gtkmenushell.h
@@ -85,6 +66,7 @@ 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
@@ -92,8 +74,8 @@ include/gtk/gtkscrolledwindow.h
 include/gtk/gtkselection.h
 include/gtk/gtkseparator.h
 include/gtk/gtksignal.h
-include/gtk/gtkstyle.h
 include/gtk/gtkstatusbar.h
+include/gtk/gtkstyle.h
 include/gtk/gtktable.h
 include/gtk/gtktext.h
 include/gtk/gtktogglebutton.h
@@ -101,6 +83,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
@@ -112,9 +95,23 @@ 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
+@unexec install-info --delete %D/info/gdk.info %D/info/dir
+@unexec install-info --delete %D/info/gtk.info %D/info/dir
+info/gdk.info
+info/gtk.info
+@exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
+@exec install-info %D/info/gtk.info %D/info/dir
+@exec install-info %D/info/gdk.info %D/info/dir
+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
 @dirrm include/gdk
 @dirrm include/gtk
diff --git a/x11-toolkits/gtk13/pkg-plist b/x11-toolkits/gtk13/pkg-plist
index 14c393f..a397d20 100644
--- a/x11-toolkits/gtk13/pkg-plist
+++ b/x11-toolkits/gtk13/pkg-plist
@@ -1,23 +1,3 @@
-info/gdk.info
-info/gtk.info
-@unexec install-info --delete %D/info/gdk.info %D/info/dir
-@unexec install-info --delete %D/info/gtk.info %D/info/dir
-@exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
-@exec install-info %D/info/gtk.info %D/info/dir
-@exec install-info %D/info/gdk.info %D/info/dir
-lib/libglib.so.1.0
-lib/libglib.la
-lib/libglib.a
-lib/libgdk.so.1.0
-lib/libgdk.la
-lib/libgdk.a
-lib/libgtk.so.1.0
-lib/libgtk.la
-lib/libgtk.a
-@exec /sbin/ldconfig -m %D/lib
-@unexec /sbin/ldconfig -R
-include/glib.h
-include/glibconfig.h
 include/gdk/gdk.h
 include/gdk/gdkcursors.h
 include/gdk/gdki18n.h
@@ -25,14 +5,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
@@ -46,13 +28,13 @@ include/gtk/gtkdata.h
 include/gtk/gtkdialog.h
 include/gtk/gtkdrawingarea.h
 include/gtk/gtkentry.h
-include/gtk/gtkgc.h
 include/gtk/gtkenums.h
 include/gtk/gtkeventbox.h
 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
@@ -70,7 +52,6 @@ include/gtk/gtklistitem.h
 include/gtk/gtkmain.h
 include/gtk/gtkmenu.h
 include/gtk/gtkmenubar.h
-include/gtk/gtkrc.h
 include/gtk/gtkmenufactory.h
 include/gtk/gtkmenuitem.h
 include/gtk/gtkmenushell.h
@@ -85,6 +66,7 @@ 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
@@ -92,8 +74,8 @@ include/gtk/gtkscrolledwindow.h
 include/gtk/gtkselection.h
 include/gtk/gtkseparator.h
 include/gtk/gtksignal.h
-include/gtk/gtkstyle.h
 include/gtk/gtkstatusbar.h
+include/gtk/gtkstyle.h
 include/gtk/gtktable.h
 include/gtk/gtktext.h
 include/gtk/gtktogglebutton.h
@@ -101,6 +83,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
@@ -112,9 +95,23 @@ 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
+@unexec install-info --delete %D/info/gdk.info %D/info/dir
+@unexec install-info --delete %D/info/gtk.info %D/info/dir
+info/gdk.info
+info/gtk.info
+@exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
+@exec install-info %D/info/gtk.info %D/info/dir
+@exec install-info %D/info/gdk.info %D/info/dir
+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
 @dirrm include/gdk
 @dirrm include/gtk
diff --git a/x11-toolkits/gtk20/pkg-plist b/x11-toolkits/gtk20/pkg-plist
index 14c393f..a397d20 100644
--- a/x11-toolkits/gtk20/pkg-plist
+++ b/x11-toolkits/gtk20/pkg-plist
@@ -1,23 +1,3 @@
-info/gdk.info
-info/gtk.info
-@unexec install-info --delete %D/info/gdk.info %D/info/dir
-@unexec install-info --delete %D/info/gtk.info %D/info/dir
-@exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
-@exec install-info %D/info/gtk.info %D/info/dir
-@exec install-info %D/info/gdk.info %D/info/dir
-lib/libglib.so.1.0
-lib/libglib.la
-lib/libglib.a
-lib/libgdk.so.1.0
-lib/libgdk.la
-lib/libgdk.a
-lib/libgtk.so.1.0
-lib/libgtk.la
-lib/libgtk.a
-@exec /sbin/ldconfig -m %D/lib
-@unexec /sbin/ldconfig -R
-include/glib.h
-include/glibconfig.h
 include/gdk/gdk.h
 include/gdk/gdkcursors.h
 include/gdk/gdki18n.h
@@ -25,14 +5,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
@@ -46,13 +28,13 @@ include/gtk/gtkdata.h
 include/gtk/gtkdialog.h
 include/gtk/gtkdrawingarea.h
 include/gtk/gtkentry.h
-include/gtk/gtkgc.h
 include/gtk/gtkenums.h
 include/gtk/gtkeventbox.h
 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
@@ -70,7 +52,6 @@ include/gtk/gtklistitem.h
 include/gtk/gtkmain.h
 include/gtk/gtkmenu.h
 include/gtk/gtkmenubar.h
-include/gtk/gtkrc.h
 include/gtk/gtkmenufactory.h
 include/gtk/gtkmenuitem.h
 include/gtk/gtkmenushell.h
@@ -85,6 +66,7 @@ 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
@@ -92,8 +74,8 @@ include/gtk/gtkscrolledwindow.h
 include/gtk/gtkselection.h
 include/gtk/gtkseparator.h
 include/gtk/gtksignal.h
-include/gtk/gtkstyle.h
 include/gtk/gtkstatusbar.h
+include/gtk/gtkstyle.h
 include/gtk/gtktable.h
 include/gtk/gtktext.h
 include/gtk/gtktogglebutton.h
@@ -101,6 +83,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
@@ -112,9 +95,23 @@ 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
+@unexec install-info --delete %D/info/gdk.info %D/info/dir
+@unexec install-info --delete %D/info/gtk.info %D/info/dir
+info/gdk.info
+info/gtk.info
+@exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
+@exec install-info %D/info/gtk.info %D/info/dir
+@exec install-info %D/info/gdk.info %D/info/dir
+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
 @dirrm include/gdk
 @dirrm include/gtk
diff --git a/x11-toolkits/gtk30/pkg-plist b/x11-toolkits/gtk30/pkg-plist
index 14c393f..a397d20 100644
--- a/x11-toolkits/gtk30/pkg-plist
+++ b/x11-toolkits/gtk30/pkg-plist
@@ -1,23 +1,3 @@
-info/gdk.info
-info/gtk.info
-@unexec install-info --delete %D/info/gdk.info %D/info/dir
-@unexec install-info --delete %D/info/gtk.info %D/info/dir
-@exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
-@exec install-info %D/info/gtk.info %D/info/dir
-@exec install-info %D/info/gdk.info %D/info/dir
-lib/libglib.so.1.0
-lib/libglib.la
-lib/libglib.a
-lib/libgdk.so.1.0
-lib/libgdk.la
-lib/libgdk.a
-lib/libgtk.so.1.0
-lib/libgtk.la
-lib/libgtk.a
-@exec /sbin/ldconfig -m %D/lib
-@unexec /sbin/ldconfig -R
-include/glib.h
-include/glibconfig.h
 include/gdk/gdk.h
 include/gdk/gdkcursors.h
 include/gdk/gdki18n.h
@@ -25,14 +5,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
@@ -46,13 +28,13 @@ include/gtk/gtkdata.h
 include/gtk/gtkdialog.h
 include/gtk/gtkdrawingarea.h
 include/gtk/gtkentry.h
-include/gtk/gtkgc.h
 include/gtk/gtkenums.h
 include/gtk/gtkeventbox.h
 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
@@ -70,7 +52,6 @@ include/gtk/gtklistitem.h
 include/gtk/gtkmain.h
 include/gtk/gtkmenu.h
 include/gtk/gtkmenubar.h
-include/gtk/gtkrc.h
 include/gtk/gtkmenufactory.h
 include/gtk/gtkmenuitem.h
 include/gtk/gtkmenushell.h
@@ -85,6 +66,7 @@ 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
@@ -92,8 +74,8 @@ include/gtk/gtkscrolledwindow.h
 include/gtk/gtkselection.h
 include/gtk/gtkseparator.h
 include/gtk/gtksignal.h
-include/gtk/gtkstyle.h
 include/gtk/gtkstatusbar.h
+include/gtk/gtkstyle.h
 include/gtk/gtktable.h
 include/gtk/gtktext.h
 include/gtk/gtktogglebutton.h
@@ -101,6 +83,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
@@ -112,9 +95,23 @@ 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
+@unexec install-info --delete %D/info/gdk.info %D/info/dir
+@unexec install-info --delete %D/info/gtk.info %D/info/dir
+info/gdk.info
+info/gtk.info
+@exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
+@exec install-info %D/info/gtk.info %D/info/dir
+@exec install-info %D/info/gdk.info %D/info/dir
+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
 @dirrm include/gdk
 @dirrm include/gtk