Remove some GNOME1 packages that are unmaintained upstream and/or in

pkgsrc, in preparation for gnome1-libs removal(*).

There was no feedback for keeping these packages after my
HEADS UP mail to pkgsrc-users a week ago.

(*) More to come before that can happen, though.

14 files changed, 1 insertions, 343 deletions

diff --git a/x11/Makefile b/x11/Makefile
index 47ad56fd173..746ed7286d7 100644
--- a/x11/Makefile
+++ b/x11/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.499 2007/05/09 10:22:51 tnn Exp $
+# $NetBSD: Makefile,v 1.500 2007/05/13 14:39:17 wiz Exp $
 #
 
 COMMENT=	Packages to support the X window system
@@ -48,7 +48,6 @@ SUBDIR+=	fontsproto
 SUBDIR+=	fox
 SUBDIR+=	fspanel
 SUBDIR+=	fvwm-wharf
-SUBDIR+=	gdkxft
 SUBDIR+=	gdm
 SUBDIR+=	ggiterm
 SUBDIR+=	glproto
@@ -85,7 +84,6 @@ SUBDIR+=	gtkmm
 SUBDIR+=	gtksourceview
 SUBDIR+=	gtkstep
 SUBDIR+=	gtkterm2
-SUBDIR+=	gtoolkit
 SUBDIR+=	hanterm
 SUBDIR+=	hot-babe
 SUBDIR+=	hsetroot
diff --git a/x11/gdkxft/DESCR b/x11/gdkxft/DESCR
deleted file mode 100644
index 24c151ffdfb..00000000000
--- a/x11/gdkxft/DESCR
+++ /dev/null
@@ -1,4 +0,0 @@
-  Gdkxft transparently adds anti-aliased font support to gtk+-1.2.x under
-XFree86-4.0 or higher.  Once you have installed gdkxft, you can run any
-(well, nearly any) existing gtk+ binary and see anti-aliased fonts in the
-gtk widgets.  You don't need to recompile gtk+ or your applications.
diff --git a/x11/gdkxft/Makefile b/x11/gdkxft/Makefile
deleted file mode 100644
index 48e5b352917..00000000000
--- a/x11/gdkxft/Makefile
+++ /dev/null
@@ -1,38 +0,0 @@
-# $NetBSD: Makefile,v 1.34 2006/12/15 20:33:04 joerg Exp $
-#
-
-DISTNAME=		gdkxft-1.5
-PKGREVISION=		11
-CATEGORIES=		x11
-MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=gdkxft/}
-
-MAINTAINER=		pkgsrc-users@NetBSD.org
-HOMEPAGE=		http://gdkxft.sourceforge.net/
-COMMENT=		Transparently add anti-aliased font support to gtk+ applications
-
-.include "../../mk/bsd.prefs.mk"
-
-USE_DIRS+=		xdg-1.1
-USE_X11BASE=		YES
-USE_LIBTOOL=		YES
-USE_TOOLS+=		perl:run
-
-GNU_CONFIGURE=		YES
-CONFIGURE_ARGS+=	--enable-static
-
-CPPFLAGS+=		-I${LOCALBASE}/include/libcapplet1
-
-post-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/gdkxft
-.for doc in AUTHORS COPYING ChangeLog INSTALL NEWS README
-	${INSTALL_DATA} ${WRKSRC}/${doc} ${PREFIX}/share/doc/gdkxft
-.endfor
-
-.include "../../converters/libiconv/buildlink3.mk"
-.include "../../devel/libglade/buildlink3.mk"
-.include "../../graphics/freetype2/buildlink3.mk"
-.include "../../x11/control-center/buildlink3.mk"
-.include "../../x11/gtk/buildlink3.mk"
-.include "../../x11/libXft/buildlink3.mk"
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/x11/gdkxft/PLIST b/x11/gdkxft/PLIST
deleted file mode 100644
index 25e2d7cbd1b..00000000000
--- a/x11/gdkxft/PLIST
+++ /dev/null
@@ -1,17 +0,0 @@
-@comment $NetBSD: PLIST,v 1.3 2004/09/22 08:09:58 jlam Exp $
-bin/gdkxft-capplet
-etc/gdkxft.conf
-lib/libgdkxft.la
-man/man8/gdkxft_sysinstall.8
-sbin/gdkxft_sysinstall
-share/control-center/UIOptions/gdkxft.desktop
-share/doc/gdkxft/AUTHORS
-share/doc/gdkxft/COPYING
-share/doc/gdkxft/ChangeLog
-share/doc/gdkxft/INSTALL
-share/doc/gdkxft/NEWS
-share/doc/gdkxft/README
-share/gdkxft-capplet.glade
-share/gnome/apps/Settings/UIOptions/gdkxft.desktop
-share/pixmaps/gdkxft.png
-@dirrm share/doc/gdkxft
diff --git a/x11/gdkxft/distinfo b/x11/gdkxft/distinfo
deleted file mode 100644
index 2d17a1149a4..00000000000
--- a/x11/gdkxft/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.3 2005/02/23 17:36:10 wiz Exp $
-
-SHA1 (gdkxft-1.5.tar.gz) = 03ba38e129123d18423582219a5d365691547c92
-RMD160 (gdkxft-1.5.tar.gz) = b88a89c096c2f33adc9a2356e932b6f59eb36cea
-Size (gdkxft-1.5.tar.gz) = 213224 bytes
diff --git a/x11/gtoolkit/DESCR b/x11/gtoolkit/DESCR
deleted file mode 100644
index 897fd9035f4..00000000000
--- a/x11/gtoolkit/DESCR
+++ /dev/null
@@ -1,10 +0,0 @@
-  GToolKit is an Objective-C interface library to the GTK+ widget set.
-GTK+, which stands for the Gimp Toolkit, is a library for creating
-graphical user interfaces for the X Window System and MS Win32.
-
-  There are already a number of different Objective-C interface libraries
-around and each one has its own features, so you have to decide for
-yourself which one to try and use.  This package uses NSObject as its
-base class and requires a Foundation implementation.  Almost all source
-files are automatically generated from the GTK include files, so
-upgrading to newer versions of GTK should not be a problem.
diff --git a/x11/gtoolkit/Makefile b/x11/gtoolkit/Makefile
deleted file mode 100644
index 852915389c5..00000000000
--- a/x11/gtoolkit/Makefile
+++ /dev/null
@@ -1,17 +0,0 @@
-# $NetBSD: Makefile,v 1.15 2006/07/22 05:10:55 rillig Exp $
-#
-.include "Makefile.common"
-PKGREVISION=		10
-
-COMMENT=		Objective-C interface to the GTK+ widget set
-
-USE_LANGUAGES=		objc
-
-BUILD_DIRS=		${WRKSRC}/GToolKit
-
-.include "../../x11/gtk/buildlink3.mk"
-.include "../../x11/gnustep-back/buildlink3.mk"
-.include "../../devel/libglade/buildlink3.mk"
-.include "../../devel/gnustep-make/gnustep.mk"
-.include "../../mk/pthread.buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/x11/gtoolkit/Makefile.common b/x11/gtoolkit/Makefile.common
deleted file mode 100644
index 18ac9d3198f..00000000000
--- a/x11/gtoolkit/Makefile.common
+++ /dev/null
@@ -1,13 +0,0 @@
-# $NetBSD: Makefile.common,v 1.13 2007/01/15 19:31:52 joerg Exp $
-#
-
-DISTNAME=		gtoolkit-0.9.5
-CATEGORIES?=		x11
-MASTER_SITES?=		ftp://ftp.inf.uos.de/pub/elmar/gtk/objc-gtoolkit/
-
-MAINTAINER?=		pkgsrc-users@NetBSD.org
-HOMEPAGE?=		http://www.informatik.uni-osnabrueck.de/elmar/projects/gtoolkit/
-
-USE_LIBTOOL=		yes
-CONFIGURE_ARGS+=	--with-gnustep
-GNUSTEP_MAKEFILE=	Makefile.gnustep
diff --git a/x11/gtoolkit/PLIST b/x11/gtoolkit/PLIST
deleted file mode 100644
index 21c7c1f7d6c..00000000000
--- a/x11/gtoolkit/PLIST
+++ /dev/null
@@ -1,107 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2004/04/17 00:26:48 rh Exp $
-share/GNUstep/Local/Library/Headers/GToolKit/GTK.h
-share/GNUstep/Local/Library/Headers/GToolKit/GTKAccelGroup.h
-share/GNUstep/Local/Library/Headers/GToolKit/GTKAccelLabel.h
-share/GNUstep/Local/Library/Headers/GToolKit/GTKAction.h
-share/GNUstep/Local/Library/Headers/GToolKit/GTKAdjustment.h
-share/GNUstep/Local/Library/Headers/GToolKit/GTKAlignment.h
-share/GNUstep/Local/Library/Headers/GToolKit/GTKApplication.h
-share/GNUstep/Local/Library/Headers/GToolKit/GTKArrow.h
-share/GNUstep/Local/Library/Headers/GToolKit/GTKAspectFrame.h
-share/GNUstep/Local/Library/Headers/GToolKit/GTKBin.h
-share/GNUstep/Local/Library/Headers/GToolKit/GTKBox.h
-share/GNUstep/Local/Library/Headers/GToolKit/GTKButton.h
-share/GNUstep/Local/Library/Headers/GToolKit/GTKButtonBox.h
-share/GNUstep/Local/Library/Headers/GToolKit/GTKCList.h
-share/GNUstep/Local/Library/Headers/GToolKit/GTKCTree.h
-share/GNUstep/Local/Library/Headers/GToolKit/GTKCalendar.h
-share/GNUstep/Local/Library/Headers/GToolKit/GTKCheckButton.h
-share/GNUstep/Local/Library/Headers/GToolKit/GTKCheckMenuItem.h
-share/GNUstep/Local/Library/Headers/GToolKit/GTKColorSelection.h
-share/GNUstep/Local/Library/Headers/GToolKit/GTKColorSelectionDialog.h
-share/GNUstep/Local/Library/Headers/GToolKit/GTKCombo.h
-share/GNUstep/Local/Library/Headers/GToolKit/GTKContainer.h
-share/GNUstep/Local/Library/Headers/GToolKit/GTKCurve.h
-share/GNUstep/Local/Library/Headers/GToolKit/GTKData.h
-share/GNUstep/Local/Library/Headers/GToolKit/GTKDialog.h
-share/GNUstep/Local/Library/Headers/GToolKit/GTKDrawingArea.h
-share/GNUstep/Local/Library/Headers/GToolKit/GTKEditable.h
-share/GNUstep/Local/Library/Headers/GToolKit/GTKEntry.h
-share/GNUstep/Local/Library/Headers/GToolKit/GTKEventBox.h
-share/GNUstep/Local/Library/Headers/GToolKit/GTKFileSelection.h
-share/GNUstep/Local/Library/Headers/GToolKit/GTKFixed.h
-share/GNUstep/Local/Library/Headers/GToolKit/GTKFontSelection.h
-share/GNUstep/Local/Library/Headers/GToolKit/GTKFontSelectionDialog.h
-share/GNUstep/Local/Library/Headers/GToolKit/GTKFrame.h
-share/GNUstep/Local/Library/Headers/GToolKit/GTKGammaCurve.h
-share/GNUstep/Local/Library/Headers/GToolKit/GTKGladeXML.h
-share/GNUstep/Local/Library/Headers/GToolKit/GTKHBox.h
-share/GNUstep/Local/Library/Headers/GToolKit/GTKHButtonBox.h
-share/GNUstep/Local/Library/Headers/GToolKit/GTKHPaned.h
-share/GNUstep/Local/Library/Headers/GToolKit/GTKHRuler.h
-share/GNUstep/Local/Library/Headers/GToolKit/GTKHScale.h
-share/GNUstep/Local/Library/Headers/GToolKit/GTKHScrollbar.h
-share/GNUstep/Local/Library/Headers/GToolKit/GTKHSeparator.h
-share/GNUstep/Local/Library/Headers/GToolKit/GTKHandleBox.h
-share/GNUstep/Local/Library/Headers/GToolKit/GTKImage.h
-share/GNUstep/Local/Library/Headers/GToolKit/GTKInputDialog.h
-share/GNUstep/Local/Library/Headers/GToolKit/GTKInvisible.h
-share/GNUstep/Local/Library/Headers/GToolKit/GTKItem.h
-share/GNUstep/Local/Library/Headers/GToolKit/GTKItemFactory.h
-share/GNUstep/Local/Library/Headers/GToolKit/GTKLabel.h
-share/GNUstep/Local/Library/Headers/GToolKit/GTKLayout.h
-share/GNUstep/Local/Library/Headers/GToolKit/GTKList.h
-share/GNUstep/Local/Library/Headers/GToolKit/GTKListItem.h
-share/GNUstep/Local/Library/Headers/GToolKit/GTKMain.h
-share/GNUstep/Local/Library/Headers/GToolKit/GTKMenu.h
-share/GNUstep/Local/Library/Headers/GToolKit/GTKMenuBar.h
-share/GNUstep/Local/Library/Headers/GToolKit/GTKMenuFactory.h
-share/GNUstep/Local/Library/Headers/GToolKit/GTKMenuItem.h
-share/GNUstep/Local/Library/Headers/GToolKit/GTKMenuShell.h
-share/GNUstep/Local/Library/Headers/GToolKit/GTKMisc.h
-share/GNUstep/Local/Library/Headers/GToolKit/GTKNotebook.h
-share/GNUstep/Local/Library/Headers/GToolKit/GTKObject.h
-share/GNUstep/Local/Library/Headers/GToolKit/GTKOptionMenu.h
-share/GNUstep/Local/Library/Headers/GToolKit/GTKPacker.h
-share/GNUstep/Local/Library/Headers/GToolKit/GTKPaned.h
-share/GNUstep/Local/Library/Headers/GToolKit/GTKPixmap.h
-share/GNUstep/Local/Library/Headers/GToolKit/GTKPlug.h
-share/GNUstep/Local/Library/Headers/GToolKit/GTKPreview.h
-share/GNUstep/Local/Library/Headers/GToolKit/GTKProgress.h
-share/GNUstep/Local/Library/Headers/GToolKit/GTKProgressBar.h
-share/GNUstep/Local/Library/Headers/GToolKit/GTKRadioButton.h
-share/GNUstep/Local/Library/Headers/GToolKit/GTKRadioMenuItem.h
-share/GNUstep/Local/Library/Headers/GToolKit/GTKRange.h
-share/GNUstep/Local/Library/Headers/GToolKit/GTKRuler.h
-share/GNUstep/Local/Library/Headers/GToolKit/GTKScale.h
-share/GNUstep/Local/Library/Headers/GToolKit/GTKScrollbar.h
-share/GNUstep/Local/Library/Headers/GToolKit/GTKScrolledWindow.h
-share/GNUstep/Local/Library/Headers/GToolKit/GTKSeparator.h
-share/GNUstep/Local/Library/Headers/GToolKit/GTKSocket.h
-share/GNUstep/Local/Library/Headers/GToolKit/GTKSpinButton.h
-share/GNUstep/Local/Library/Headers/GToolKit/GTKStatusbar.h
-share/GNUstep/Local/Library/Headers/GToolKit/GTKStyle.h
-share/GNUstep/Local/Library/Headers/GToolKit/GTKTable.h
-share/GNUstep/Local/Library/Headers/GToolKit/GTKTearoffMenuItem.h
-share/GNUstep/Local/Library/Headers/GToolKit/GTKText.h
-share/GNUstep/Local/Library/Headers/GToolKit/GTKTipsQuery.h
-share/GNUstep/Local/Library/Headers/GToolKit/GTKToggleButton.h
-share/GNUstep/Local/Library/Headers/GToolKit/GTKToolbar.h
-share/GNUstep/Local/Library/Headers/GToolKit/GTKTooltips.h
-share/GNUstep/Local/Library/Headers/GToolKit/GTKTree.h
-share/GNUstep/Local/Library/Headers/GToolKit/GTKTreeItem.h
-share/GNUstep/Local/Library/Headers/GToolKit/GTKVBox.h
-share/GNUstep/Local/Library/Headers/GToolKit/GTKVButtonBox.h
-share/GNUstep/Local/Library/Headers/GToolKit/GTKVPaned.h
-share/GNUstep/Local/Library/Headers/GToolKit/GTKVRuler.h
-share/GNUstep/Local/Library/Headers/GToolKit/GTKVScale.h
-share/GNUstep/Local/Library/Headers/GToolKit/GTKVScrollbar.h
-share/GNUstep/Local/Library/Headers/GToolKit/GTKVSeparator.h
-share/GNUstep/Local/Library/Headers/GToolKit/GTKViewport.h
-share/GNUstep/Local/Library/Headers/GToolKit/GTKWidget.h
-share/GNUstep/Local/Library/Headers/GToolKit/GTKWindow.h
-share/GNUstep/Local/Library/Headers/GToolKit/GToolKit.h
-share/GNUstep/Local/Library/Libraries/libGToolKit.so
-share/GNUstep/Local/Library/Libraries/libGToolKit.so.${PKGVERSION}
-share/GNUstep/System/Library/Makefiles/gtk-tool.make
-@dirrm share/GNUstep/Local/Library/Headers/GToolKit
diff --git a/x11/gtoolkit/buildlink3.mk b/x11/gtoolkit/buildlink3.mk
deleted file mode 100644
index 8f34d58b3ce..00000000000
--- a/x11/gtoolkit/buildlink3.mk
+++ /dev/null
@@ -1,25 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.11 2006/07/08 23:11:14 jlam Exp $
-
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-GTOOLKIT_BUILDLINK3_MK:=	${GTOOLKIT_BUILDLINK3_MK}+
-
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	gtoolkit
-.endif
-
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngtoolkit}
-BUILDLINK_PACKAGES+=	gtoolkit
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gtoolkit
-
-.if !empty(GTOOLKIT_BUILDLINK3_MK:M+)
-BUILDLINK_API_DEPENDS.gtoolkit+=	gtoolkit>=0.9.5nb5
-BUILDLINK_ABI_DEPENDS.gtoolkit+=gtoolkit>=0.9.5nb7
-BUILDLINK_ABI_DEPENDS.gtoolkit?=	gtoolkit>=0.9.5nb10
-BUILDLINK_PKGSRCDIR.gtoolkit?=	../../x11/gtoolkit
-.endif	# GTOOLKIT_BUILDLINK3_MK
-
-.include "../../x11/gtk/buildlink3.mk"
-.include "../../x11/gnustep-back/buildlink3.mk"
-.include "../../devel/libglade/buildlink3.mk"
-
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
diff --git a/x11/gtoolkit/distinfo b/x11/gtoolkit/distinfo
deleted file mode 100644
index dfcae875805..00000000000
--- a/x11/gtoolkit/distinfo
+++ /dev/null
@@ -1,8 +0,0 @@
-$NetBSD: distinfo,v 1.5 2005/09/22 01:10:55 minskim Exp $
-
-SHA1 (gtoolkit-0.9.5.tar.gz) = 8e1acfec076637983dd2875ce124c0001a4a9077
-RMD160 (gtoolkit-0.9.5.tar.gz) = be597546cebc9ee9bdd4f4fc6c48e97ad8705652
-Size (gtoolkit-0.9.5.tar.gz) = 385203 bytes
-SHA1 (patch-aa) = 60b3a30cfa621e236e61bbbf3a09d99d715388f1
-SHA1 (patch-ab) = 0f481852dca3da71cec150825664daea09e7b832
-SHA1 (patch-ac) = 5e2be3ad68e91f1956dea025ad5faf6191f036c1
diff --git a/x11/gtoolkit/patches/patch-aa b/x11/gtoolkit/patches/patch-aa
deleted file mode 100644
index 34f1175bce5..00000000000
--- a/x11/gtoolkit/patches/patch-aa
+++ /dev/null
@@ -1,62 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2004/04/17 00:26:48 rh Exp $
-
---- GToolKit/GToolKit.m.orig	2002-02-22 01:43:52.000000000 +1000
-+++ GToolKit/GToolKit.m
-@@ -2550,6 +2550,17 @@
- #include <GToolKit/GTKWidget.h>
- #include <GToolKit/GTKAccelGroup.h>
- 
-+#ifdef HAVE_CONFIG_H
-+#include "config.h"
-+#endif
-+
-+#include <stdio.h>
-+#include <string.h>
-+#include <Foundation/NSAutoreleasePool.h>
-+#if defined (DEBUG) && defined (HAVE_OBJC_OBJC_API_H)
-+#include <objc/objc-api.h>
-+#endif
-+
- @implementation GTKItemFactory
- + (GtkType) getType
- {
-@@ -2651,17 +2662,6 @@
- {
-     gtk_item_factory_set_translate_func(gtk, func , data , notify);
- }
--#ifdef HAVE_CONFIG_H
--#include "config.h"
--#endif
--
--#include <stdio.h>
--#include <string.h>
--#include <Foundation/NSAutoreleasePool.h>
--#if defined (DEBUG) && defined (HAVE_OBJC_OBJC_API_H)
--#include <objc/objc-api.h>
--#endif
--
- 
- static void item_forward_signal (gpointer data, guint action, GtkWidget *widget)
- {
-@@ -6376,6 +6376,10 @@ static void destroy_notify (GTKObject *s
- #include <GToolKit/GTKWidget.h>
- #include <GToolKit/GTKAccelGroup.h>
- 
-+#include <gtk/gtksignal.h>
-+#include <Foundation/NSAutoreleasePool.h>
-+#include <Foundation/NSNotification.h>
-+
- @implementation GTKWindow
- + (GtkType) getType
- {
-@@ -6437,10 +6441,6 @@ static void destroy_notify (GTKObject *s
- {
-     gtk_window_set_modal(gtk, modal);
- }
--#include <gtk/gtksignal.h>
--#include <Foundation/NSAutoreleasePool.h>
--#include <Foundation/NSNotification.h>
--
- 
- NSString *GTKWindowDidBecomeMainNotification = @"GTKWindowDidBecomeMain";
- NSString *GTKWindowDidResignMainNotification = @"GTKWindowDidResignMain";
diff --git a/x11/gtoolkit/patches/patch-ab b/x11/gtoolkit/patches/patch-ab
deleted file mode 100644
index 6c3a5924d95..00000000000
--- a/x11/gtoolkit/patches/patch-ab
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2005/09/17 17:22:41 minskim Exp $
-
---- GToolKit/Makefile.gnustep.orig	2002-03-07 00:31:40.000000000 -0800
-+++ GToolKit/Makefile.gnustep
-@@ -48,10 +48,10 @@ $(LIBRARY_NAME)_HEADER_FILES_DIR =		.
- $(LIBRARY_NAME)_HEADER_FILES_INSTALL_DIR =	GToolKit
- 
- -include $(top_builddir)/config.mk
--include $(GNUSTEP_SYSTEM_ROOT)/Makefiles/common.make
-+include $(GNUSTEP_MAKEFILES)/common.make
- 
- -include Makefile.preamble
--include $(GNUSTEP_SYSTEM_ROOT)/Makefiles/library.make
-+include $(GNUSTEP_MAKEFILES)/library.make
- -include Makefile.postamble
- #>		--- do not remove this line ---
- 
diff --git a/x11/gtoolkit/patches/patch-ac b/x11/gtoolkit/patches/patch-ac
deleted file mode 100644
index 8cf7de0bb52..00000000000
--- a/x11/gtoolkit/patches/patch-ac
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2005/09/22 01:10:55 minskim Exp $
-
---- Examples/Makefile.gnustep.orig	2002-03-07 00:04:29.000000000 -0800
-+++ Examples/Makefile.gnustep
-@@ -22,10 +22,10 @@ style_OBJC_FILES =	style.m
- windows_OBJC_FILES =	windows.m
- xml_OBJC_FILES =	xml.m
- 
--include $(GNUSTEP_SYSTEM_ROOT)/Makefiles/common.make
-+include $(GNUSTEP_MAKEFILES)/common.make
- 
- -include Makefile.preamble
--include $(GNUSTEP_SYSTEM_ROOT)/Makefiles/gtk-tool.make
-+include $(GNUSTEP_MAKEFILES)/gtk-tool.make
- -include Makefile.postamble
- #>		--- do not remove this line ---
-