diff --git a/devel/gconf/Makefile b/devel/gconf/Makefile
index 4d3c2ca5282..88f50a7a6fa 100644
--- a/devel/gconf/Makefile
+++ b/devel/gconf/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.4 2001/09/18 14:22:14 naddy Exp $
+# $OpenBSD: Makefile,v 1.5 2001/09/20 18:39:12 naddy Exp $
 
 COMMENT=		"configuration database system written for GNOME"
 V=			1.0.1
@@ -23,7 +23,6 @@ PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
 USE_X11=		Yes
-USE_GMAKE=		Yes
 CONFIGURE_STYLE= 	autoconf
 CONFIGURE_ARGS+= 	${CONFIGURE_SHARED}
 CONFIGURE_ENV=  	CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/devel/glade/Makefile b/devel/glade/Makefile
index 256a6cbbe66..0c26f956081 100644
--- a/devel/glade/Makefile
+++ b/devel/glade/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.2 2001/09/14 14:41:29 todd Exp $
+# $OpenBSD: Makefile,v 1.3 2001/09/20 18:39:13 naddy Exp $
 
 COMMENT=		"free user interface builder for GTK+ and GNOME"
 V=			0.5.11
@@ -24,7 +24,6 @@ PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
 USE_X11=		Yes
-USE_GMAKE=		Yes
 CONFIGURE_STYLE= 	gnu
 CONFIGURE_ARGS+= 	${CONFIGURE_SHARED}
 CONFIGURE_ENV=  	CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/devel/libglade/Makefile b/devel/libglade/Makefile
index af704247944..2c8b5286c08 100644
--- a/devel/libglade/Makefile
+++ b/devel/libglade/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.4 2001/09/16 22:18:59 heko Exp $
+# $OpenBSD: Makefile,v 1.5 2001/09/20 18:39:13 naddy Exp $
 
 COMMENT=		"library for loading GLADE interface files at runtime"
 V=			0.16
@@ -24,7 +24,6 @@ LIB_DEPENDS=		intl.1::devel/gettext \
 			gtk.1.2::x11/gtk+
 
 USE_X11=		Yes
-USE_GMAKE=		Yes
 CONFIGURE_STYLE= 	gnu
 CONFIGURE_ARGS+= 	${CONFIGURE_SHARED}
 CONFIGURE_ENV=		CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/devel/libglade/patches/patch-doc_Makefile_in b/devel/libglade/patches/patch-doc_Makefile_in
new file mode 100644
index 00000000000..21ccbe5a201
--- /dev/null
+++ b/devel/libglade/patches/patch-doc_Makefile_in
@@ -0,0 +1,12 @@
+$OpenBSD: patch-doc_Makefile_in,v 1.1 2001/09/20 18:39:13 naddy Exp $
+--- doc/Makefile.in.orig	Thu Sep 20 17:57:24 2001
++++ doc/Makefile.in	Thu Sep 20 17:58:14 2001
+@@ -322,7 +322,7 @@ install-data-local: 
+ 	    $(INSTALL_DATA) $$i $(DESTDIR)$(TARGET_DIR); \
+ 	  done; \
+ 	  echo '-- Installing $(srcdir)/html/index.sgml' ; \
+-	  $(INSTALL_DATA) $(srcdir)/html/index.sgml $(TARGET_DIR); \
++	  $(INSTALL_DATA) $(srcdir)/html/index.sgml $(TARGET_DIR) || true; \
+ 	  echo '-- Fixing Crossreferences' ; \
+ 	  gtkdoc-fixxref --module=$(DOC_MODULE) --html-dir=$(HTML_DIR) || true; \
+ 	fi)
diff --git a/devel/libgtop/Makefile b/devel/libgtop/Makefile
index 8a15d085015..23be8101f9b 100644
--- a/devel/libgtop/Makefile
+++ b/devel/libgtop/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.4 2001/09/19 14:37:49 naddy Exp $
+# $OpenBSD: Makefile,v 1.5 2001/09/20 18:39:13 naddy Exp $
 
 COMMENT=		"portable library for obtaining system information"
 V=			1.0.12
@@ -21,7 +21,6 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
-USE_GMAKE=		Yes
 CONFIGURE_STYLE= 	gnu
 CONFIGURE_ARGS+= 	${CONFIGURE_SHARED}
 CONFIGURE_ENV=  	CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/devel/libgtop/patches/patch-Makefile_in b/devel/libgtop/patches/patch-Makefile_in
new file mode 100644
index 00000000000..a8305abdaee
--- /dev/null
+++ b/devel/libgtop/patches/patch-Makefile_in
@@ -0,0 +1,39 @@
+$OpenBSD: patch-Makefile_in,v 1.1 2001/09/20 18:39:13 naddy Exp $
+--- Makefile.in.orig	Tue Feb 27 15:01:54 2001
++++ Makefile.in	Thu Sep 20 15:29:58 2001
+@@ -552,13 +552,13 @@ dist-hook:
+ release:
+ 	$(MAKE) dist distdir=$(PACKAGE)-$(VERSION)
+ 
+- include macros/macros.dep
+-macros/macros.dep: macros/Makefile.am
+-	cd macros && $(MAKE) macros.dep
++# include macros/macros.dep
++#macros/macros.dep: macros/Makefile.am
++#	cd macros && $(MAKE) macros.dep
+ 
+ $(top_srcdir)/aclocal.m4: libgtop-sysdeps.m4 LIBGTOP-VERSION
+ 
+-libgtopConf.sh: libgtopConf.sh.in Makefile
++$(top_builddir)/libgtopConf.sh: libgtopConf.sh.in Makefile
+ 	sed -e 's#\@LIBGTOP_LIBDIR\@#$(libdir)#g' \
+ 	  -e 's#\@LIBGTOP_INCLUDEDIR\@#$(includedir)#g' \
+ 	  -e 's#\@LIBGTOP_DATADIR\@#$(datadir)#g' \
+@@ -587,14 +587,14 @@ libgtopConf.sh: libgtopConf.sh.in Makefi
+ 	      < $(srcdir)/libgtopConf.sh.in > libgtopConf.tmp \
+ 	  && mv libgtopConf.tmp libgtopConf.sh
+ 
+-libgtop-config: libgtop-config.in Makefile
++$(top_builddir)/libgtop-config: libgtop-config.in Makefile
+ 	sed -e 's#\@LIBGTOP_LIBDIR\@#$(libdir)#g' \
+ 	      < $(srcdir)/libgtop-config.in > libgtop-config.tmp \
+ 	  && mv libgtop-config.tmp libgtop-config && \
+ 		chmod 755 libgtop-config
+ 
+-libgtop-features.def: features.def
+-	@LN_S@ $< $@
++$(top_builddir)/libgtop-features.def: features.def
++	@LN_S@ $? $@
+ 
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/devel/libgtop/patches/patch-sysdeps_guile_Makefile_in b/devel/libgtop/patches/patch-sysdeps_guile_Makefile_in
new file mode 100644
index 00000000000..d3a69ace6ac
--- /dev/null
+++ b/devel/libgtop/patches/patch-sysdeps_guile_Makefile_in
@@ -0,0 +1,12 @@
+$OpenBSD: patch-sysdeps_guile_Makefile_in,v 1.1 2001/09/20 18:39:13 naddy Exp $
+--- sysdeps/guile/Makefile.in.orig	Thu Sep 20 15:39:55 2001
++++ sysdeps/guile/Makefile.in	Thu Sep 20 15:40:08 2001
+@@ -529,7 +529,7 @@ guile.c: guile.pl $(top_builddir)/config
+ 	mv gnc-t guile.c
+ 
+ guile.x: guile.c
+-	guile-snarf $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $< > $@
++	guile-snarf $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $? > $@
+ 
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/devel/libgtop/patches/patch-sysdeps_guile_names_Makefile_in b/devel/libgtop/patches/patch-sysdeps_guile_names_Makefile_in
new file mode 100644
index 00000000000..2c8db0fe1aa
--- /dev/null
+++ b/devel/libgtop/patches/patch-sysdeps_guile_names_Makefile_in
@@ -0,0 +1,12 @@
+$OpenBSD: patch-sysdeps_guile_names_Makefile_in,v 1.1 2001/09/20 18:39:13 naddy Exp $
+--- sysdeps/guile/names/Makefile.in.orig	Thu Sep 20 15:39:58 2001
++++ sysdeps/guile/names/Makefile.in	Thu Sep 20 15:40:17 2001
+@@ -454,7 +454,7 @@ guile-names.c: guile-names.pl $(top_buil
+ 	mv gnc-t guile-names.c
+ 
+ guile-names.x: guile-names.c
+-	guile-snarf $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $< > $@
++	guile-snarf $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $? > $@
+ 
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/net/gnomeicu/Makefile b/net/gnomeicu/Makefile
index 9711c97ddb0..f19c347350d 100644
--- a/net/gnomeicu/Makefile
+++ b/net/gnomeicu/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.4 2001/09/20 00:38:20 naddy Exp $
+# $OpenBSD: Makefile,v 1.5 2001/09/20 18:39:13 naddy Exp $
 
 COMMENT=		"GNOME ICQ client"
 V=			0.96.1
@@ -20,7 +20,6 @@ PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
 USE_X11=		Yes
-USE_GMAKE=		Yes
 CONFIGURE_STYLE= 	autoconf
 CONFIGURE_ARGS= 	${CONFIGURE_SHARED}
 CONFIGURE_ENV=  	CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/sysutils/bubblemon/Makefile b/sysutils/bubblemon/Makefile
index 54428e7ba56..a54c52f9d1b 100644
--- a/sysutils/bubblemon/Makefile
+++ b/sysutils/bubblemon/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.2 2001/09/14 14:41:30 todd Exp $
+# $OpenBSD: Makefile,v 1.3 2001/09/20 18:39:13 naddy Exp $
 
 COMMENT=		"GNOME panel applet that displays the CPU + memory load"
 V=			1.0.5
@@ -20,7 +20,6 @@ PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
 USE_X11=		Yes
-USE_GMAKE=		Yes
 CONFIGURE_STYLE= 	gnu
 CONFIGURE_ARGS+= 	${CONFIGURE_SHARED}
 CONFIGURE_ENV=  	CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/textproc/scrollkeeper/Makefile b/textproc/scrollkeeper/Makefile
index 2986fa28a57..ed07f13f569 100644
--- a/textproc/scrollkeeper/Makefile
+++ b/textproc/scrollkeeper/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.4 2001/09/20 01:32:03 naddy Exp $
+# $OpenBSD: Makefile,v 1.5 2001/09/20 18:39:13 naddy Exp $
 
 COMMENT=		"Scrollkeeper Open Documentation Cataloging System"
 V=			0.2
@@ -18,7 +18,6 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
-USE_GMAKE=	 	Yes
 CONFIGURE_STYLE= 	gnu
 CONFIGURE_ARGS+= 	${CONFIGURE_SHARED}
 CONFIGURE_ARGS+= 	--localstatedir=/var
diff --git a/x11/gnome/applets/Makefile b/x11/gnome/applets/Makefile
index d62b7dcd429..9bc2677b4b1 100644
--- a/x11/gnome/applets/Makefile
+++ b/x11/gnome/applets/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.4 2001/09/19 16:28:58 naddy Exp $
+# $OpenBSD: Makefile,v 1.5 2001/09/20 18:39:13 naddy Exp $
 
 COMMENT=		"applets for use with the GNOME panel"
 V=			1.4.0.1
@@ -21,7 +21,6 @@ PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
 USE_X11=		Yes
-USE_GMAKE=		Yes
 CONFIGURE_STYLE= 	gnu
 CONFIGURE_ARGS+= 	${CONFIGURE_SHARED}
 CONFIGURE_ENV=  	CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/x11/gnome/controlcenter/Makefile b/x11/gnome/controlcenter/Makefile
index 3ecfa7d0b1d..a60aa962329 100644
--- a/x11/gnome/controlcenter/Makefile
+++ b/x11/gnome/controlcenter/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.5 2001/09/20 01:32:03 naddy Exp $
+# $OpenBSD: Makefile,v 1.6 2001/09/20 18:39:13 naddy Exp $
 
 COMMENT=		"GNOME control center"
 V=			1.4.0.1
@@ -23,7 +23,6 @@ PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
 USE_X11=		Yes
-USE_GMAKE=		Yes
 CONFIGURE_STYLE= 	gnu
 CONFIGURE_ARGS+= 	${CONFIGURE_SHARED}
 CONFIGURE_ARGS+= 	--localstatedir=/var/gnome
diff --git a/x11/gnome/controlcenter/patches/patch-configure b/x11/gnome/controlcenter/patches/patch-configure
index b8a456859ac..614111a61a1 100644
--- a/x11/gnome/controlcenter/patches/patch-configure
+++ b/x11/gnome/controlcenter/patches/patch-configure
@@ -1,14 +1,26 @@
-$OpenBSD: patch-configure,v 1.3 2001/09/20 01:32:03 naddy Exp $
+$OpenBSD: patch-configure,v 1.4 2001/09/20 18:39:13 naddy Exp $
 --- configure.orig	Wed Mar 28 21:46:14 2001
-+++ configure	Thu Sep 20 03:10:59 2001
-@@ -4382,6 +4382,10 @@ fi
++++ configure	Thu Sep 20 18:45:18 2001
+@@ -871,7 +871,10 @@ XML_I18N_MERGE_OAF_RULE='\%.oaf : \%.oaf
+ XML_I18N_MERGE_KEYS_RULE='\%.keys : \%.keys.in $(top_builddir)/xml-i18n-merge $(top_srcdir)/po/*.po\
+ 	$(top_builddir)/xml-i18n-merge -k $(top_srcdir)/po $< $*.keys'
  
- 	   fi
+-XML_I18N_MERGE_DESKTOP_RULE='\%.desktop : \%.desktop.in $(top_builddir)/xml-i18n-merge $(top_srcdir)/po/*.po\
++#XML_I18N_MERGE_DESKTOP_RULE='\%.desktop : \%.desktop.in $(top_builddir)/xml-i18n-merge $(top_srcdir)/po/*.po\
++#	$(top_builddir)/xml-i18n-merge -d $(top_srcdir)/po $< $*.desktop'
++XML_I18N_MERGE_DESKTOP_RULE='.SUFFIXES: .desktop .desktop.in\
++.desktop.in.desktop: $(top_builddir)/xml-i18n-merge $(top_srcdir)/po/*.po\
+ 	$(top_builddir)/xml-i18n-merge -d $(top_srcdir)/po $< $*.desktop'
+ 
+ XML_I18N_MERGE_DIRECTORY_RULE='\%.directory : \%.directory.in $(top_builddir)/xml-i18n-merge $(top_srcdir)/po/*.po\
+@@ -4380,6 +4383,10 @@ else
+   echo "$ac_t""no" 1>&6
+ fi
  
-+	   if test "$gt_cv_func_gettext_libintl" = "yes"; then
-+	     LIBS="$LIBS -lintl";
 +	   fi
 +
++	   if test "$gt_cv_func_gettext_libintl" = "yes"; then
++	     LIBS="$LIBS -lintl";
+ 	   fi
+ 
  	   if test "$gt_cv_func_gettext_libc" = "yes" \
- 	      || test "$gt_cv_func_gettext_libintl" = "yes"; then
- 	      cat >> confdefs.h <<\EOF
diff --git a/x11/gnome/controlcenter/patches/patch-control-center_Makefile_in b/x11/gnome/controlcenter/patches/patch-control-center_Makefile_in
new file mode 100644
index 00000000000..3a9d6dd46d0
--- /dev/null
+++ b/x11/gnome/controlcenter/patches/patch-control-center_Makefile_in
@@ -0,0 +1,13 @@
+$OpenBSD: patch-control-center_Makefile_in,v 1.1 2001/09/20 18:39:13 naddy Exp $
+--- control-center/Makefile.in.orig	Thu Sep 20 18:32:49 2001
++++ control-center/Makefile.in	Thu Sep 20 18:33:54 2001
+@@ -164,8 +164,7 @@ splash_DATA = ccsplash.png
+ EXTRA_DIST = gnomecc.desktop.in cappletConf.sh.in $(appicon_DATA) $(splash_DATA)
+ 
+ sysdir = $(datadir)/gnome/apps/Settings
+-sys_in_files = gnomecc.desktop.in
+-sys_DATA = $(sys_in_files:.desktop.in=.desktop)
++sys_DATA = gnomecc.desktop
+ 
+ confexecdir = $(libdir)
+ confexec_DATA = cappletConf.sh
diff --git a/x11/gnome/core/Makefile b/x11/gnome/core/Makefile
index f6c2633639a..42de95b0c99 100644
--- a/x11/gnome/core/Makefile
+++ b/x11/gnome/core/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.4 2001/09/19 13:37:58 naddy Exp $
+# $OpenBSD: Makefile,v 1.5 2001/09/20 18:39:13 naddy Exp $
 
 COMMENT=		"core GNOME system"
 V=			1.4.0.4
@@ -27,7 +27,6 @@ PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
 USE_X11=		Yes
-USE_GMAKE=		Yes
 CONFIGURE_STYLE= 	gnu
 CONFIGURE_ARGS+= 	${CONFIGURE_SHARED}
 CONFIGURE_ARGS+= 	--with-kde-datadir=${LOCALBASE}/share
diff --git a/x11/gnome/core/patches/patch-help-browser_Makefile_in b/x11/gnome/core/patches/patch-help-browser_Makefile_in
new file mode 100644
index 00000000000..54aca926ecd
--- /dev/null
+++ b/x11/gnome/core/patches/patch-help-browser_Makefile_in
@@ -0,0 +1,12 @@
+$OpenBSD: patch-help-browser_Makefile_in,v 1.1 2001/09/20 18:39:13 naddy Exp $
+--- help-browser/Makefile.in.orig	Thu Sep 20 15:49:00 2001
++++ help-browser/Makefile.in	Thu Sep 20 15:49:13 2001
+@@ -602,7 +602,7 @@ mostlyclean distclean maintainer-clean
+ $(ORBIT_GENERATED_SOURCEFILES): my_help_browser_idl
+ 
+ my_help_browser_idl: $(top_srcdir)/idl/help-browser.idl $(ORBIT_IDL)
+-	$(ORBIT_IDL) $<
++	$(ORBIT_IDL) $(top_srcdir)/idl/help-browser.idl
+ 	touch my_help_browser_idl
+ 
+ help-caller.o gnome-help-browser.o: help-browser.h
diff --git a/x11/gnome/core/patches/patch-panel_Makefile_in b/x11/gnome/core/patches/patch-panel_Makefile_in
new file mode 100644
index 00000000000..cb79f3edce7
--- /dev/null
+++ b/x11/gnome/core/patches/patch-panel_Makefile_in
@@ -0,0 +1,12 @@
+$OpenBSD: patch-panel_Makefile_in,v 1.1 2001/09/20 18:39:13 naddy Exp $
+--- panel/Makefile.in.orig	Thu Sep 20 15:59:42 2001
++++ panel/Makefile.in	Thu Sep 20 16:00:08 2001
+@@ -1071,7 +1071,7 @@ maintainer-clean-generic clean mostlycle
+ $(CORBA_SRCLIST): my_gnome_panel_idl
+ 
+ my_gnome_panel_idl: $(top_srcdir)/idl/gnome-panel.idl $(ORBIT_IDL)
+-	if $(ORBIT_IDL) `@GNOME_CONFIG@ --cflags idl` $< ; then touch my_gnome_panel_idl; else /bin/false; fi
++	if $(ORBIT_IDL) `@GNOME_CONFIG@ --cflags idl` $(top_srcdir)/idl/gnome-panel.idl ; then touch my_gnome_panel_idl; else /bin/false; fi
+ 
+ # We need explicit dependencies here for people building out
+ # of the tarballs.
diff --git a/x11/gnome/core/patches/patch-panel_doc_Makefile_in b/x11/gnome/core/patches/patch-panel_doc_Makefile_in
new file mode 100644
index 00000000000..f402c60137b
--- /dev/null
+++ b/x11/gnome/core/patches/patch-panel_doc_Makefile_in
@@ -0,0 +1,12 @@
+$OpenBSD: patch-panel_doc_Makefile_in,v 1.1 2001/09/20 18:39:13 naddy Exp $
+--- panel/doc/Makefile.in.orig	Thu Sep 20 18:03:48 2001
++++ panel/doc/Makefile.in	Thu Sep 20 18:04:15 2001
+@@ -363,7 +363,7 @@ install-data-local:
+ 	    $(INSTALL_DATA) $$i $(DESTDIR)$(TARGET_DIR); \
+ 	  done; \
+ 	  echo '-- Installing $(srcdir)/html/index.sgml' ; \
+-	  $(INSTALL_DATA) $(srcdir)/html/index.sgml $(DESTDIR)$(TARGET_DIR); \
++	  $(INSTALL_DATA) $(srcdir)/html/index.sgml $(DESTDIR)$(TARGET_DIR) || true; \
+ 	  echo '-- Fixing Crossreferences' ; \
+ 	  gtkdoc-fixxref --module=$(DOC_MODULE) --html-dir=$(HTML_DIR)|| true; \
+ 	fi)
diff --git a/x11/gnome/libs/Makefile b/x11/gnome/libs/Makefile
index 2acf7681f49..66735f8e7e1 100644
--- a/x11/gnome/libs/Makefile
+++ b/x11/gnome/libs/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.6 2001/09/18 21:42:04 naddy Exp $
+# $OpenBSD: Makefile,v 1.7 2001/09/20 18:39:13 naddy Exp $
 
 COMMENT=		"libraries for the GNOME project"
 V=			1.2.13
@@ -22,7 +22,6 @@ PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
 USE_X11=		Yes
-USE_GMAKE=		Yes
 CONFIGURE_STYLE= 	autoconf
 
 CONFIGURE_ARGS+= 	${CONFIGURE_SHARED}
diff --git a/x11/gnome/libs/patches/patch-libgnorba_Makefile_in b/x11/gnome/libs/patches/patch-libgnorba_Makefile_in
new file mode 100644
index 00000000000..4ae28b208cf
--- /dev/null
+++ b/x11/gnome/libs/patches/patch-libgnorba_Makefile_in
@@ -0,0 +1,12 @@
+$OpenBSD: patch-libgnorba_Makefile_in,v 1.1 2001/09/20 18:39:13 naddy Exp $
+--- libgnorba/Makefile.in.orig	Thu Sep 20 16:30:17 2001
++++ libgnorba/Makefile.in	Thu Sep 20 16:30:42 2001
+@@ -1068,7 +1068,7 @@ $(table_built): $(top_srcdir)/idl/Table.
+ 	$(ORBIT_IDL) $(IDL_FLAGS) $(top_srcdir)/idl/Table.idl
+ 
+ install-data-hook:
+-	$(RM) -f $(DESTDIR)$(bindir)/new-object
++	rm -f $(DESTDIR)$(bindir)/new-object
+ 	$(LN_S) goad-browser $(DESTDIR)$(bindir)/new-object
+ 
+ clean-local:
diff --git a/x11/gnome/libs/patches/patch-zvt_Makefile_in b/x11/gnome/libs/patches/patch-zvt_Makefile_in
new file mode 100644
index 00000000000..ed5b887b69e
--- /dev/null
+++ b/x11/gnome/libs/patches/patch-zvt_Makefile_in
@@ -0,0 +1,12 @@
+$OpenBSD: patch-zvt_Makefile_in,v 1.1 2001/09/20 18:39:13 naddy Exp $
+--- zvt/Makefile.in.orig	Thu Sep 20 16:25:17 2001
++++ zvt/Makefile.in	Thu Sep 20 16:26:02 2001
+@@ -520,7 +520,7 @@ mostlyclean distclean maintainer-clean
+ 
+ # We really dont want $(LIBS) linked in with this
+ gnome-pty-helper: gnome-pty-helper.o gnome-login-support.o gnome-utmp.o
+-	$(CC) -o $@ $^ $(UTIL_LIBS)
++	$(CC) -o $@ $> $(UTIL_LIBS)
+ 
+ install-exec-local:
+ 	-file=$(DESTDIR)$(sbindir)/gnome-pty-helper; \
diff --git a/x11/gnome/oaf/Makefile b/x11/gnome/oaf/Makefile
index a20499004a8..48a7be0c0b3 100644
--- a/x11/gnome/oaf/Makefile
+++ b/x11/gnome/oaf/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.4 2001/09/20 01:32:03 naddy Exp $
+# $OpenBSD: Makefile,v 1.5 2001/09/20 18:39:13 naddy Exp $
 
 COMMENT=		"Object Activation Framework for GNOME"
 V=			0.6.5
@@ -21,7 +21,6 @@ PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
 USE_X11=		Yes
-USE_GMAKE=		Yes
 CONFIGURE_STYLE= 	gnu
 CONFIGURE_ARGS+= 	${CONFIGURE_SHARED}
 CONFIGURE_ENV=  	CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/x11/gnome/oaf/patches/patch-test_Makefile_in b/x11/gnome/oaf/patches/patch-test_Makefile_in
new file mode 100644
index 00000000000..f21b99620b5
--- /dev/null
+++ b/x11/gnome/oaf/patches/patch-test_Makefile_in
@@ -0,0 +1,12 @@
+$OpenBSD: patch-test_Makefile_in,v 1.1 2001/09/20 18:39:13 naddy Exp $
+--- test/Makefile.in.orig	Thu Sep 20 17:21:30 2001
++++ test/Makefile.in	Thu Sep 20 17:21:40 2001
+@@ -468,7 +468,7 @@ empty_built: empty.idl $(ORBIT_IDL)
+ 	touch empty_built
+ 
+ oaf-slay: $(srcdir)/oaf-slay.tmpl
+-	sed 's|@oafdir@|'$(pkgdatadir)'|g' < $< > $@
++	sed 's|@oafdir@|'$(pkgdatadir)'|g' < $? > $@
+ 
+ check:
+ 	OAF_INFO_PATH="$(top_srcdir)/test:$$OAF_INFO_PATH" PATH="$(top_builddir)/test:$$PATH" $(top_builddir)/test/oaf-test-client
diff --git a/x11/gnome/vfs/Makefile b/x11/gnome/vfs/Makefile
index 532ebafa73c..5fb011a2495 100644
--- a/x11/gnome/vfs/Makefile
+++ b/x11/gnome/vfs/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.6 2001/09/20 01:32:03 naddy Exp $
+# $OpenBSD: Makefile,v 1.7 2001/09/20 18:39:13 naddy Exp $
 
 COMMENT=		"GNOME Virtual File System"
 V=			1.0.1
@@ -23,7 +23,6 @@ PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
 USE_X11=		Yes
-USE_GMAKE=		Yes
 CONFIGURE_STYLE= 	gnu
 CONFIGURE_ARGS+= 	${CONFIGURE_SHARED}
 CONFIGURE_ENV=  	CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/gtk-1.2 -D_POSIX_THREAD_SYSCALL_SOFT=1" \
diff --git a/x11/gnome/vfs/patches/patch-Makefile_in b/x11/gnome/vfs/patches/patch-Makefile_in
new file mode 100644
index 00000000000..9a211699426
--- /dev/null
+++ b/x11/gnome/vfs/patches/patch-Makefile_in
@@ -0,0 +1,12 @@
+$OpenBSD: patch-Makefile_in,v 1.1 2001/09/20 18:39:13 naddy Exp $
+--- Makefile.in.orig	Tue May  8 01:12:50 2001
++++ Makefile.in	Thu Sep 20 17:45:55 2001
+@@ -530,7 +530,7 @@ vfspthreadConf.sh: vfspthreadConf.sh.in 
+ 	      < $(srcdir)/vfspthreadConf.sh.in > vfspthreadConf.tmp \
+ 	  && mv vfspthreadConf.tmp vfspthreadConf.sh
+ 
+-gnome-vfs-config: gnome-vfs-config.in Makefile
++$(top_builddir)/gnome-vfs-config: gnome-vfs-config.in Makefile
+ 	sed -e 's?\@LIBDIR\@?$(libdir)?g' \
+ 	    -e 's?\@VFS_LIBDIR\@?$(VFS_LIBDIR)?g' \
+ 	    -e 's?\@VFS_INCLUDEDIR\@?$(VFS_INCLUDEDIR)?g' \
diff --git a/x11/gtk-engines/Makefile b/x11/gtk-engines/Makefile
index 5a63ba3e9f3..c62def3faf7 100644
--- a/x11/gtk-engines/Makefile
+++ b/x11/gtk-engines/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.3 2001/09/20 01:08:11 naddy Exp $
+# $OpenBSD: Makefile,v 1.4 2001/09/20 18:39:13 naddy Exp $
 
 COMMENT=		"sample theme engines for GTK+ provided with GNOME"
 V=			0.12
@@ -19,7 +19,6 @@ PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
 USE_X11=		Yes
-USE_GMAKE=		Yes
 CONFIGURE_STYLE= 	gnu
 CONFIGURE_ARGS+= 	${CONFIGURE_SHARED}
 
diff --git a/x11/gtop/Makefile b/x11/gtop/Makefile
index e9731e47228..dc6070835a4 100644
--- a/x11/gtop/Makefile
+++ b/x11/gtop/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.4 2001/09/19 14:54:41 naddy Exp $
+# $OpenBSD: Makefile,v 1.5 2001/09/20 18:39:13 naddy Exp $
 
 COMMENT=		"GNOME version of top"
 V=			1.0.13
@@ -20,7 +20,6 @@ PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
 USE_X11=		Yes
-USE_GMAKE=		Yes
 CONFIGURE_STYLE= 	gnu
 CONFIGURE_ARGS+= 	${CONFIGURE_SHARED}
 CONFIGURE_ENV=  	CPPFLAGS="-I${LOCALBASE}/include" \