1 files changed, 109 insertions, 112 deletions

diff --git a/x11-toolkits/gtoolkit/pkg-plist b/x11-toolkits/gtoolkit/pkg-plist
index 853c6d34db22..3094d5b1e31c 100644
--- a/x11-toolkits/gtoolkit/pkg-plist
+++ b/x11-toolkits/gtoolkit/pkg-plist
@@ -1,113 +1,110 @@
-%%LOCALLIBRARY%%/Headers/GToolKit/GTK.h
-%%LOCALLIBRARY%%/Headers/GToolKit/GTKAccelGroup.h
-%%LOCALLIBRARY%%/Headers/GToolKit/GTKAccelLabel.h
-%%LOCALLIBRARY%%/Headers/GToolKit/GTKAction.h
-%%LOCALLIBRARY%%/Headers/GToolKit/GTKAdjustment.h
-%%LOCALLIBRARY%%/Headers/GToolKit/GTKAlignment.h
-%%LOCALLIBRARY%%/Headers/GToolKit/GTKApplication.h
-%%LOCALLIBRARY%%/Headers/GToolKit/GTKArrow.h
-%%LOCALLIBRARY%%/Headers/GToolKit/GTKAspectFrame.h
-%%LOCALLIBRARY%%/Headers/GToolKit/GTKBin.h
-%%LOCALLIBRARY%%/Headers/GToolKit/GTKBox.h
-%%LOCALLIBRARY%%/Headers/GToolKit/GTKButton.h
-%%LOCALLIBRARY%%/Headers/GToolKit/GTKButtonBox.h
-%%LOCALLIBRARY%%/Headers/GToolKit/GTKCList.h
-%%LOCALLIBRARY%%/Headers/GToolKit/GTKCTree.h
-%%LOCALLIBRARY%%/Headers/GToolKit/GTKCalendar.h
-%%LOCALLIBRARY%%/Headers/GToolKit/GTKCheckButton.h
-%%LOCALLIBRARY%%/Headers/GToolKit/GTKCheckMenuItem.h
-%%LOCALLIBRARY%%/Headers/GToolKit/GTKColorSelection.h
-%%LOCALLIBRARY%%/Headers/GToolKit/GTKColorSelectionDialog.h
-%%LOCALLIBRARY%%/Headers/GToolKit/GTKCombo.h
-%%LOCALLIBRARY%%/Headers/GToolKit/GTKContainer.h
-%%LOCALLIBRARY%%/Headers/GToolKit/GTKCurve.h
-%%LOCALLIBRARY%%/Headers/GToolKit/GTKData.h
-%%LOCALLIBRARY%%/Headers/GToolKit/GTKDialog.h
-%%LOCALLIBRARY%%/Headers/GToolKit/GTKDrawingArea.h
-%%LOCALLIBRARY%%/Headers/GToolKit/GTKEditable.h
-%%LOCALLIBRARY%%/Headers/GToolKit/GTKEntry.h
-%%LOCALLIBRARY%%/Headers/GToolKit/GTKEventBox.h
-%%LOCALLIBRARY%%/Headers/GToolKit/GTKFileSelection.h
-%%LOCALLIBRARY%%/Headers/GToolKit/GTKFixed.h
-%%LOCALLIBRARY%%/Headers/GToolKit/GTKFontSelection.h
-%%LOCALLIBRARY%%/Headers/GToolKit/GTKFontSelectionDialog.h
-%%LOCALLIBRARY%%/Headers/GToolKit/GTKFrame.h
-%%LOCALLIBRARY%%/Headers/GToolKit/GTKGammaCurve.h
-%%LOCALLIBRARY%%/Headers/GToolKit/GTKGladeXML.h
-%%LOCALLIBRARY%%/Headers/GToolKit/GTKHBox.h
-%%LOCALLIBRARY%%/Headers/GToolKit/GTKHButtonBox.h
-%%LOCALLIBRARY%%/Headers/GToolKit/GTKHPaned.h
-%%LOCALLIBRARY%%/Headers/GToolKit/GTKHRuler.h
-%%LOCALLIBRARY%%/Headers/GToolKit/GTKHScale.h
-%%LOCALLIBRARY%%/Headers/GToolKit/GTKHScrollbar.h
-%%LOCALLIBRARY%%/Headers/GToolKit/GTKHSeparator.h
-%%LOCALLIBRARY%%/Headers/GToolKit/GTKHandleBox.h
-%%LOCALLIBRARY%%/Headers/GToolKit/GTKImage.h
-%%LOCALLIBRARY%%/Headers/GToolKit/GTKInputDialog.h
-%%LOCALLIBRARY%%/Headers/GToolKit/GTKInvisible.h
-%%LOCALLIBRARY%%/Headers/GToolKit/GTKItem.h
-%%LOCALLIBRARY%%/Headers/GToolKit/GTKItemFactory.h
-%%LOCALLIBRARY%%/Headers/GToolKit/GTKLabel.h
-%%LOCALLIBRARY%%/Headers/GToolKit/GTKLayout.h
-%%LOCALLIBRARY%%/Headers/GToolKit/GTKList.h
-%%LOCALLIBRARY%%/Headers/GToolKit/GTKListItem.h
-%%LOCALLIBRARY%%/Headers/GToolKit/GTKMain.h
-%%LOCALLIBRARY%%/Headers/GToolKit/GTKMenu.h
-%%LOCALLIBRARY%%/Headers/GToolKit/GTKMenuBar.h
-%%LOCALLIBRARY%%/Headers/GToolKit/GTKMenuFactory.h
-%%LOCALLIBRARY%%/Headers/GToolKit/GTKMenuItem.h
-%%LOCALLIBRARY%%/Headers/GToolKit/GTKMenuShell.h
-%%LOCALLIBRARY%%/Headers/GToolKit/GTKMisc.h
-%%LOCALLIBRARY%%/Headers/GToolKit/GTKNotebook.h
-%%LOCALLIBRARY%%/Headers/GToolKit/GTKObject.h
-%%LOCALLIBRARY%%/Headers/GToolKit/GTKOptionMenu.h
-%%LOCALLIBRARY%%/Headers/GToolKit/GTKPacker.h
-%%LOCALLIBRARY%%/Headers/GToolKit/GTKPaned.h
-%%LOCALLIBRARY%%/Headers/GToolKit/GTKPixmap.h
-%%LOCALLIBRARY%%/Headers/GToolKit/GTKPlug.h
-%%LOCALLIBRARY%%/Headers/GToolKit/GTKPreview.h
-%%LOCALLIBRARY%%/Headers/GToolKit/GTKProgress.h
-%%LOCALLIBRARY%%/Headers/GToolKit/GTKProgressBar.h
-%%LOCALLIBRARY%%/Headers/GToolKit/GTKRadioButton.h
-%%LOCALLIBRARY%%/Headers/GToolKit/GTKRadioMenuItem.h
-%%LOCALLIBRARY%%/Headers/GToolKit/GTKRange.h
-%%LOCALLIBRARY%%/Headers/GToolKit/GTKRuler.h
-%%LOCALLIBRARY%%/Headers/GToolKit/GTKScale.h
-%%LOCALLIBRARY%%/Headers/GToolKit/GTKScrollbar.h
-%%LOCALLIBRARY%%/Headers/GToolKit/GTKScrolledWindow.h
-%%LOCALLIBRARY%%/Headers/GToolKit/GTKSeparator.h
-%%LOCALLIBRARY%%/Headers/GToolKit/GTKSocket.h
-%%LOCALLIBRARY%%/Headers/GToolKit/GTKSpinButton.h
-%%LOCALLIBRARY%%/Headers/GToolKit/GTKStatusbar.h
-%%LOCALLIBRARY%%/Headers/GToolKit/GTKStyle.h
-%%LOCALLIBRARY%%/Headers/GToolKit/GTKTable.h
-%%LOCALLIBRARY%%/Headers/GToolKit/GTKTearoffMenuItem.h
-%%LOCALLIBRARY%%/Headers/GToolKit/GTKText.h
-%%LOCALLIBRARY%%/Headers/GToolKit/GTKTipsQuery.h
-%%LOCALLIBRARY%%/Headers/GToolKit/GTKToggleButton.h
-%%LOCALLIBRARY%%/Headers/GToolKit/GTKToolbar.h
-%%LOCALLIBRARY%%/Headers/GToolKit/GTKTooltips.h
-%%LOCALLIBRARY%%/Headers/GToolKit/GTKTree.h
-%%LOCALLIBRARY%%/Headers/GToolKit/GTKTreeItem.h
-%%LOCALLIBRARY%%/Headers/GToolKit/GTKVBox.h
-%%LOCALLIBRARY%%/Headers/GToolKit/GTKVButtonBox.h
-%%LOCALLIBRARY%%/Headers/GToolKit/GTKVPaned.h
-%%LOCALLIBRARY%%/Headers/GToolKit/GTKVRuler.h
-%%LOCALLIBRARY%%/Headers/GToolKit/GTKVScale.h
-%%LOCALLIBRARY%%/Headers/GToolKit/GTKVScrollbar.h
-%%LOCALLIBRARY%%/Headers/GToolKit/GTKVSeparator.h
-%%LOCALLIBRARY%%/Headers/GToolKit/GTKViewport.h
-%%LOCALLIBRARY%%/Headers/GToolKit/GTKWidget.h
-%%LOCALLIBRARY%%/Headers/GToolKit/GTKWindow.h
-%%LOCALLIBRARY%%/Headers/GToolKit/GToolKit.h
-%%LOCALLIBRARY%%/Libraries/%%NOFLAT%%libGToolKit.so
-%%LOCALLIBRARY%%/Libraries/%%NOFLAT%%libGToolKit.so.%%MAJORVERSION%%
-%%LOCALLIBRARY%%/Libraries/%%NOFLAT%%libGToolKit.so.%%VERSION%%
+Local/Library/Headers/GToolKit/GTK.h
+Local/Library/Headers/GToolKit/GTKAccelGroup.h
+Local/Library/Headers/GToolKit/GTKAccelLabel.h
+Local/Library/Headers/GToolKit/GTKAction.h
+Local/Library/Headers/GToolKit/GTKAdjustment.h
+Local/Library/Headers/GToolKit/GTKAlignment.h
+Local/Library/Headers/GToolKit/GTKApplication.h
+Local/Library/Headers/GToolKit/GTKArrow.h
+Local/Library/Headers/GToolKit/GTKAspectFrame.h
+Local/Library/Headers/GToolKit/GTKBin.h
+Local/Library/Headers/GToolKit/GTKBox.h
+Local/Library/Headers/GToolKit/GTKButton.h
+Local/Library/Headers/GToolKit/GTKButtonBox.h
+Local/Library/Headers/GToolKit/GTKCList.h
+Local/Library/Headers/GToolKit/GTKCTree.h
+Local/Library/Headers/GToolKit/GTKCalendar.h
+Local/Library/Headers/GToolKit/GTKCheckButton.h
+Local/Library/Headers/GToolKit/GTKCheckMenuItem.h
+Local/Library/Headers/GToolKit/GTKColorSelection.h
+Local/Library/Headers/GToolKit/GTKColorSelectionDialog.h
+Local/Library/Headers/GToolKit/GTKCombo.h
+Local/Library/Headers/GToolKit/GTKContainer.h
+Local/Library/Headers/GToolKit/GTKCurve.h
+Local/Library/Headers/GToolKit/GTKData.h
+Local/Library/Headers/GToolKit/GTKDialog.h
+Local/Library/Headers/GToolKit/GTKDrawingArea.h
+Local/Library/Headers/GToolKit/GTKEditable.h
+Local/Library/Headers/GToolKit/GTKEntry.h
+Local/Library/Headers/GToolKit/GTKEventBox.h
+Local/Library/Headers/GToolKit/GTKFileSelection.h
+Local/Library/Headers/GToolKit/GTKFixed.h
+Local/Library/Headers/GToolKit/GTKFontSelection.h
+Local/Library/Headers/GToolKit/GTKFontSelectionDialog.h
+Local/Library/Headers/GToolKit/GTKFrame.h
+Local/Library/Headers/GToolKit/GTKGammaCurve.h
+Local/Library/Headers/GToolKit/GTKGladeXML.h
+Local/Library/Headers/GToolKit/GTKHBox.h
+Local/Library/Headers/GToolKit/GTKHButtonBox.h
+Local/Library/Headers/GToolKit/GTKHPaned.h
+Local/Library/Headers/GToolKit/GTKHRuler.h
+Local/Library/Headers/GToolKit/GTKHScale.h
+Local/Library/Headers/GToolKit/GTKHScrollbar.h
+Local/Library/Headers/GToolKit/GTKHSeparator.h
+Local/Library/Headers/GToolKit/GTKHandleBox.h
+Local/Library/Headers/GToolKit/GTKImage.h
+Local/Library/Headers/GToolKit/GTKInputDialog.h
+Local/Library/Headers/GToolKit/GTKInvisible.h
+Local/Library/Headers/GToolKit/GTKItem.h
+Local/Library/Headers/GToolKit/GTKItemFactory.h
+Local/Library/Headers/GToolKit/GTKLabel.h
+Local/Library/Headers/GToolKit/GTKLayout.h
+Local/Library/Headers/GToolKit/GTKList.h
+Local/Library/Headers/GToolKit/GTKListItem.h
+Local/Library/Headers/GToolKit/GTKMain.h
+Local/Library/Headers/GToolKit/GTKMenu.h
+Local/Library/Headers/GToolKit/GTKMenuBar.h
+Local/Library/Headers/GToolKit/GTKMenuFactory.h
+Local/Library/Headers/GToolKit/GTKMenuItem.h
+Local/Library/Headers/GToolKit/GTKMenuShell.h
+Local/Library/Headers/GToolKit/GTKMisc.h
+Local/Library/Headers/GToolKit/GTKNotebook.h
+Local/Library/Headers/GToolKit/GTKObject.h
+Local/Library/Headers/GToolKit/GTKOptionMenu.h
+Local/Library/Headers/GToolKit/GTKPacker.h
+Local/Library/Headers/GToolKit/GTKPaned.h
+Local/Library/Headers/GToolKit/GTKPixmap.h
+Local/Library/Headers/GToolKit/GTKPlug.h
+Local/Library/Headers/GToolKit/GTKPreview.h
+Local/Library/Headers/GToolKit/GTKProgress.h
+Local/Library/Headers/GToolKit/GTKProgressBar.h
+Local/Library/Headers/GToolKit/GTKRadioButton.h
+Local/Library/Headers/GToolKit/GTKRadioMenuItem.h
+Local/Library/Headers/GToolKit/GTKRange.h
+Local/Library/Headers/GToolKit/GTKRuler.h
+Local/Library/Headers/GToolKit/GTKScale.h
+Local/Library/Headers/GToolKit/GTKScrollbar.h
+Local/Library/Headers/GToolKit/GTKScrolledWindow.h
+Local/Library/Headers/GToolKit/GTKSeparator.h
+Local/Library/Headers/GToolKit/GTKSocket.h
+Local/Library/Headers/GToolKit/GTKSpinButton.h
+Local/Library/Headers/GToolKit/GTKStatusbar.h
+Local/Library/Headers/GToolKit/GTKStyle.h
+Local/Library/Headers/GToolKit/GTKTable.h
+Local/Library/Headers/GToolKit/GTKTearoffMenuItem.h
+Local/Library/Headers/GToolKit/GTKText.h
+Local/Library/Headers/GToolKit/GTKTipsQuery.h
+Local/Library/Headers/GToolKit/GTKToggleButton.h
+Local/Library/Headers/GToolKit/GTKToolbar.h
+Local/Library/Headers/GToolKit/GTKTooltips.h
+Local/Library/Headers/GToolKit/GTKTree.h
+Local/Library/Headers/GToolKit/GTKTreeItem.h
+Local/Library/Headers/GToolKit/GTKVBox.h
+Local/Library/Headers/GToolKit/GTKVButtonBox.h
+Local/Library/Headers/GToolKit/GTKVPaned.h
+Local/Library/Headers/GToolKit/GTKVRuler.h
+Local/Library/Headers/GToolKit/GTKVScale.h
+Local/Library/Headers/GToolKit/GTKVScrollbar.h
+Local/Library/Headers/GToolKit/GTKVSeparator.h
+Local/Library/Headers/GToolKit/GTKViewport.h
+Local/Library/Headers/GToolKit/GTKWidget.h
+Local/Library/Headers/GToolKit/GTKWindow.h
+Local/Library/Headers/GToolKit/GToolKit.h
+Local/Library/Libraries/libGToolKit.so
+Local/Library/Libraries/libGToolKit.so.%%MAJORVERSION%%
+Local/Library/Libraries/libGToolKit.so.%%VERSION%%
 System/Makefiles/gtk-tool.make
-%%GNUSTEP_STABLE%%@dirrm %%LOCALLIBRARY%%/Libraries/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu
-%%GNUSTEP_STABLE%%@dirrm %%LOCALLIBRARY%%/Libraries/%%GNU_ARCH%%/%%OPSYS%%
-%%GNUSTEP_STABLE%%@dirrm %%LOCALLIBRARY%%/Libraries/%%GNU_ARCH%%
-@dirrm %%LOCALLIBRARY%%/Libraries
-@dirrm %%LOCALLIBRARY%%/Headers/GToolKit
-@dirrm %%LOCALLIBRARY%%/Headers
-%%GNUSTEP_DEVEL%%@dirrm %%LOCALLIBRARY%%
+@dirrm Local/Library/Libraries
+@dirrm Local/Library/Headers/GToolKit
+@dirrm Local/Library/Headers
+@dirrm Local/Library