2 files changed, 108 insertions, 107 deletions

diff --git a/x11-toolkits/gtoolkit/Makefile b/x11-toolkits/gtoolkit/Makefile
index 51b85bbe013f..a9c5c76b9a7b 100644
--- a/x11-toolkits/gtoolkit/Makefile
+++ b/x11-toolkits/gtoolkit/Makefile
@@ -19,10 +19,11 @@ NO_MTREE=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gtk12
 GNU_CONFIGURE=	yes
+LDCONFIG_DIRS=	${LOCALLIBDIR}
+INSTALLS_SHLIB=	yes
 
 MAKE_ARGS+=	GNUSTEP_SYSTEM_ROOT=${PREFIX}/System
 CONFIGURE_ARGS+=	--with-gnustep
-INSTALLS_SHLIB=	yes
 WRKSRC=		${WRKDIR}/${DISTNAME}/GToolKit
 CONFIGURE_WRKSRC=	${WRKDIR}/${DISTNAME}
 
diff --git a/x11-toolkits/gtoolkit/pkg-plist b/x11-toolkits/gtoolkit/pkg-plist
index fd38ff98a6a4..1db19c9c11f5 100644
--- a/x11-toolkits/gtoolkit/pkg-plist
+++ b/x11-toolkits/gtoolkit/pkg-plist
@@ -1,107 +1,107 @@
-Local/Libraries/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu/libGToolKit.so
-Local/Libraries/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu/libGToolKit.so.0
-Local/Libraries/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu/libGToolKit.so.%%VERSION%%
+%%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/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu/libGToolKit.so
+%%LOCALLIBRARY%%/Libraries/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu/libGToolKit.so.%%MAJORVERSION%%
+%%LOCALLIBRARY%%/Libraries/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu/libGToolKit.so.%%VERSION%%
 System/Makefiles/gtk-tool.make
-Local/Headers/GToolKit/GTKRuler.h
-Local/Headers/GToolKit/GTKGladeXML.h
-Local/Headers/GToolKit/GTKObject.h
-Local/Headers/GToolKit/GTKLabel.h
-Local/Headers/GToolKit/GTKAction.h
-Local/Headers/GToolKit/GTKToolbar.h
-Local/Headers/GToolKit/GTKRadioMenuItem.h
-Local/Headers/GToolKit/GTKTreeItem.h
-Local/Headers/GToolKit/GTKVBox.h
-Local/Headers/GToolKit/GTKPreview.h
-Local/Headers/GToolKit/GTKHPaned.h
-Local/Headers/GToolKit/GTKDialog.h
-Local/Headers/GToolKit/GTKHButtonBox.h
-Local/Headers/GToolKit/GTKHScrollbar.h
-Local/Headers/GToolKit/GTKFixed.h
-Local/Headers/GToolKit/GTKFrame.h
-Local/Headers/GToolKit/GTKAccelLabel.h
-Local/Headers/GToolKit/GTKCTree.h
-Local/Headers/GToolKit/GToolKit.h
-Local/Headers/GToolKit/GTKEventBox.h
-Local/Headers/GToolKit/GTKHRuler.h
-Local/Headers/GToolKit/GTKText.h
-Local/Headers/GToolKit/GTKCheckButton.h
-Local/Headers/GToolKit/GTKPlug.h
-Local/Headers/GToolKit/GTKScrollbar.h
-Local/Headers/GToolKit/GTKCurve.h
-Local/Headers/GToolKit/GTKHSeparator.h
-Local/Headers/GToolKit/GTKTree.h
-Local/Headers/GToolKit/GTKScrolledWindow.h
-Local/Headers/GToolKit/GTKInputDialog.h
-Local/Headers/GToolKit/GTKCombo.h
-Local/Headers/GToolKit/GTKOptionMenu.h
-Local/Headers/GToolKit/GTKColorSelectionDialog.h
-Local/Headers/GToolKit/GTKHScale.h
-Local/Headers/GToolKit/GTKImage.h
-Local/Headers/GToolKit/GTKButton.h
-Local/Headers/GToolKit/GTKFontSelectionDialog.h
-Local/Headers/GToolKit/GTKMenuFactory.h
-Local/Headers/GToolKit/GTKColorSelection.h
-Local/Headers/GToolKit/GTKTearoffMenuItem.h
-Local/Headers/GToolKit/GTKButtonBox.h
-Local/Headers/GToolKit/GTKSeparator.h
-Local/Headers/GToolKit/GTKEntry.h
-Local/Headers/GToolKit/GTKCheckMenuItem.h
-Local/Headers/GToolKit/GTKItem.h
-Local/Headers/GToolKit/GTKVScale.h
-Local/Headers/GToolKit/GTKScale.h
-Local/Headers/GToolKit/GTKMenuItem.h
-Local/Headers/GToolKit/GTKBin.h
-Local/Headers/GToolKit/GTKTooltips.h
-Local/Headers/GToolKit/GTKTable.h
-Local/Headers/GToolKit/GTKToggleButton.h
-Local/Headers/GToolKit/GTKAccelGroup.h
-Local/Headers/GToolKit/GTKRange.h
-Local/Headers/GToolKit/GTKListItem.h
-Local/Headers/GToolKit/GTKArrow.h
-Local/Headers/GToolKit/GTKMenuBar.h
-Local/Headers/GToolKit/GTKDrawingArea.h
-Local/Headers/GToolKit/GTKLayout.h
-Local/Headers/GToolKit/GTKWindow.h
-Local/Headers/GToolKit/GTKFontSelection.h
-Local/Headers/GToolKit/GTKHandleBox.h
-Local/Headers/GToolKit/GTKMisc.h
-Local/Headers/GToolKit/GTKEditable.h
-Local/Headers/GToolKit/GTKAspectFrame.h
-Local/Headers/GToolKit/GTKVSeparator.h
-Local/Headers/GToolKit/GTKBox.h
-Local/Headers/GToolKit/GTKGammaCurve.h
-Local/Headers/GToolKit/GTKPaned.h
-Local/Headers/GToolKit/GTKProgress.h
-Local/Headers/GToolKit/GTKNotebook.h
-Local/Headers/GToolKit/GTKRadioButton.h
-Local/Headers/GToolKit/GTKMain.h
-Local/Headers/GToolKit/GTKStyle.h
-Local/Headers/GToolKit/GTKProgressBar.h
-Local/Headers/GToolKit/GTKItemFactory.h
-Local/Headers/GToolKit/GTKStatusbar.h
-Local/Headers/GToolKit/GTKViewport.h
-Local/Headers/GToolKit/GTKApplication.h
-Local/Headers/GToolKit/GTKMenuShell.h
-Local/Headers/GToolKit/GTKCList.h
-Local/Headers/GToolKit/GTKAlignment.h
-Local/Headers/GToolKit/GTK.h
-Local/Headers/GToolKit/GTKVRuler.h
-Local/Headers/GToolKit/GTKMenu.h
-Local/Headers/GToolKit/GTKList.h
-Local/Headers/GToolKit/GTKWidget.h
-Local/Headers/GToolKit/GTKHBox.h
-Local/Headers/GToolKit/GTKVPaned.h
-Local/Headers/GToolKit/GTKPixmap.h
-Local/Headers/GToolKit/GTKFileSelection.h
-Local/Headers/GToolKit/GTKVScrollbar.h
-Local/Headers/GToolKit/GTKVButtonBox.h
-Local/Headers/GToolKit/GTKPacker.h
-Local/Headers/GToolKit/GTKTipsQuery.h
-Local/Headers/GToolKit/GTKCalendar.h
-Local/Headers/GToolKit/GTKAdjustment.h
-Local/Headers/GToolKit/GTKSpinButton.h
-Local/Headers/GToolKit/GTKData.h
-Local/Headers/GToolKit/GTKSocket.h
-Local/Headers/GToolKit/GTKInvisible.h
-Local/Headers/GToolKit/GTKContainer.h
-@dirrm Local/Headers/GToolKit
+@dirrm %%LOCALLIBRARY%%/Headers/GToolKit