Backport a change from 1.5.22 to 1.5.18 that fixes some issues withtv_libtool_1_5_18_tmpdirfix

temp dir creation when using relink-based finalization.

14 files changed, 0 insertions, 489 deletions

diff --git a/x11/gtk/DESCR b/x11/gtk/DESCR
deleted file mode 100644
index e1707ba806e..00000000000
--- a/x11/gtk/DESCR
+++ /dev/null
@@ -1,9 +0,0 @@
-GTK+ is a multi-platform toolkit for creating graphical user
-interfaces. Offering a complete set of widgets, GTK+ is suitable for
-projects ranging from small one-off tools to complete application
-suites.
-
-GTK+ has been designed from the ground up to support a range of
-languages, not only C/C++. Using GTK+ from languages such as Perl and
-Python (especially in combination with the Glade GUI builder) provides
-an effective method of rapid application development.
diff --git a/x11/gtk/INSTALL b/x11/gtk/INSTALL
deleted file mode 100644
index bd87789dd77..00000000000
--- a/x11/gtk/INSTALL
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/sh
-#
-# $NetBSD: INSTALL,v 1.1 2004/01/18 01:11:40 jlam Exp $
-
-case ${STAGE} in
-POST-INSTALL)
-	if [ "${PKG_PREFIX}" != "${LOCALBASE}" ]; then
-		${LN} -fs ${PREFIX}/share/aclocal/gtk.m4 \
-			${LOCALBASE}/share/aclocal/gtk.m4
-	fi
-	;;
-DEINSTALL)
-	if [ "${PKG_PREFIX}" != "${LOCALBASE}" ]; then
-		${RM} -f ${LOCALBASE}/share/aclocal/gtk.m4
-	fi
-	;;
-esac
diff --git a/x11/gtk/Makefile b/x11/gtk/Makefile
deleted file mode 100644
index d74273e3222..00000000000
--- a/x11/gtk/Makefile
+++ /dev/null
@@ -1,76 +0,0 @@
-# $NetBSD: Makefile,v 1.110 2005/07/16 01:19:26 jlam Exp $
-
-DISTNAME=		gtk+-1.2.10
-PKGREVISION=		8
-CATEGORIES=		x11
-MASTER_SITES=		ftp://ftp.gtk.org/pub/gtk/v1.2/ \
-			ftp://ftp.cs.umn.edu/pub/gimp/gtk/v1.2/ \
-			${MASTER_SITE_GNOME:=sources/gtk+/1.2/}
-
-MAINTAINER=		tech-pkg@NetBSD.org
-HOMEPAGE=		http://www.gtk.org/
-COMMENT=		GIMP Toolkit v1 - libraries for building X11 user interfaces
-
-PKG_INSTALLATION_TYPES=	overwrite pkgviews
-
-
-.include "../../mk/bsd.prefs.mk"
-
-BUILD_USES_MSGFMT=	yes
-USE_DIRS+=		xdg-1.1
-USE_X11BASE=		yes
-USE_TOOLS+=		gmake perl
-USE_PKGLOCALEDIR=	yes
-USE_LIBTOOL=		yes
-PKGCONFIG_OVERRIDE=	gdk.pc.in
-PKGCONFIG_OVERRIDE+=	gtk+.pc.in
-
-GNU_CONFIGURE=		yes
-CONFIGURE_ARGS+=	--with-xinput=xfree \
-			--with-native-locale=yes \
-			--sysconfdir=${PREFIX}/share
-CONFIGURE_ENV+=		X_LDFLAGS="${X_LDFLAGS}"
-
-INFO_FILES=		gdk.info gtk.info
-
-MAKE_ENV+=		PKGLOCALEDIR="${PKGLOCALEDIR}"
-PLIST_SUBST+=		LOCALBASE=${LOCALBASE}
-
-# The following ensures that `gtk-config --libs' includes the correct linker
-# flags for linking the X11 libs.
-#
-X_LDFLAGS=		${X11_LDFLAGS}
-
-GTK_VERSION=		${DISTNAME:S/gtk+-//}
-GTK_MAJOR_VERSION=	${GTK_VERSION:C/\..*//}
-GTK_MINOR_VERSION=	${GTK_VERSION:C/[^.]*\.//:C/\..*//}
-GTK_MICRO_VERSION=	${GTK_VERSION:C/.*\.//}
-
-.if ${PKG_INSTALLATION_TYPE} == "overwrite"
-USE_PKGINSTALL=		yes
-DEINSTALL_EXTRA_TMPL=	${PKGDIR}/INSTALL
-INSTALL_EXTRA_TMPL=	${PKGDIR}/INSTALL
-.endif
-
-# We patch the version info in the configure scripts for reasons related to
-# shared library numbering, but we don't want it to leak into the various
-# installed files.  Explicitly replace the version number with the correct
-# one derived from the package name.
-#
-pre-configure:
-	@cd ${WRKSRC};							\
-	files="gtk-config.in docs/gtk-config.1.in gdk.pc.in gtk+.pc.in gtk/gtkfeatures.h.in"; \
-	for file in $${files}; do					\
-		${MV} -f $${file} $${file}.fixme;			\
-		${SED}	-e "s|@GTK_MAJOR_VERSION@|${GTK_MAJOR_VERSION}|g" \
-			-e "s|@GTK_MINOR_VERSION@|${GTK_MINOR_VERSION}|g" \
-			-e "s|@GTK_MICRO_VERSION@|${GTK_MICRO_VERSION}|g" \
-			-e "s|@VERSION@|${GTK_VERSION}|g"		\
-			$${file}.fixme > $${file};			\
-		${RM} $${file}.fixme;					\
-	done
-
-.include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../devel/glib/buildlink3.mk"
-.include "../../mk/x11.buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/x11/gtk/PLIST b/x11/gtk/PLIST
deleted file mode 100644
index 0812e85cee4..00000000000
--- a/x11/gtk/PLIST
+++ /dev/null
@@ -1,225 +0,0 @@
-@comment $NetBSD: PLIST,v 1.11 2004/09/22 08:09:58 jlam Exp $
-bin/gtk-config
-share/gtk/gtkrc.az
-share/gtk/gtkrc.be
-share/gtk/gtkrc.cp1251
-share/gtk/gtkrc.cs
-share/gtk/gtkrc.hr
-share/gtk/gtkrc.hu
-share/gtk/gtkrc.mi
-share/gtk/gtkrc.pl
-share/gtk/gtkrc.sk
-share/gtk/gtkrc.sl
-share/gtk/gtkrc.ja
-share/gtk/gtkrc.ko
-share/gtk/gtkrc.ru
-share/gtk/gtkrc.iso-8859-2
-share/gtk/gtkrc.bg
-share/gtk/gtkrc.el
-share/gtk/gtkrc.eo
-share/gtk/gtkrc.he
-share/gtk/gtkrc.hy
-share/gtk/gtkrc.tr
-share/gtk/gtkrc.th
-share/gtk/gtkrc.uk
-share/gtk/gtkrc.iso-8859-5
-share/gtk/gtkrc.iso-8859-13
-share/gtk/gtkrc.iso-8859-14
-share/gtk/gtkrc.iso-8859-15
-share/gtk/gtkrc.zh_CN
-share/gtk/gtkrc.zh_TW.big5
-share/gtk/gtkrc.ka_GE.georgianacademy
-share/gtk/gtkrc.ka_GE.georgianps
-share/gtk/gtkrc.vi_VN.tcvn
-share/gtk/gtkrc.vi_VN.viscii
-share/gtk/gtkrc.ro
-share/gtk/gtkrc.sq
-share/gtk/gtkrc.bg_BG.iso88595
-share/gtk/gtkrc.mk
-share/gtk/gtkrc.sr
-share/gtk/gtkrc.ru_RU.iso88595
-share/gtk/gtkrc.lt
-share/gtk/gtkrc.cy
-share/gtk/gtkrc.ga
-share/gtk/gtkrc.et
-share/gtk/gtkrc.ka
-share/gtk/gtkrc.vi_VN.viscii111
-share/gtk/gtkrc.vi
-share/gtk/gtkrc.cp1255
-share/gtk/gtkrc.sp
-share/gtk/gtkrc.he_IL.cp1255
-share/gtk/gtkrc.he_IL.microsoftcp1255
-share/gtk/gtkrc.yi
-share/gtk/gtkrc.lv
-include/gtk-1.2/gdk/gdk.h
-include/gtk-1.2/gdk/gdkrgb.h
-include/gtk-1.2/gdk/gdkcursors.h
-include/gtk-1.2/gdk/gdki18n.h
-include/gtk-1.2/gdk/gdkkeysyms.h
-include/gtk-1.2/gdk/gdkprivate.h
-include/gtk-1.2/gdk/gdktypes.h
-include/gtk-1.2/gdk/gdkx.h
-include/gtk-1.2/gtk/gtk.h
-include/gtk-1.2/gtk/gtkaccelgroup.h
-include/gtk-1.2/gtk/gtkaccellabel.h
-include/gtk-1.2/gtk/gtkadjustment.h
-include/gtk-1.2/gtk/gtkalignment.h
-include/gtk-1.2/gtk/gtkarg.h
-include/gtk-1.2/gtk/gtkarrow.h
-include/gtk-1.2/gtk/gtkaspectframe.h
-include/gtk-1.2/gtk/gtkbbox.h
-include/gtk-1.2/gtk/gtkbin.h
-include/gtk-1.2/gtk/gtkbindings.h
-include/gtk-1.2/gtk/gtkbox.h
-include/gtk-1.2/gtk/gtkbutton.h
-include/gtk-1.2/gtk/gtkcalendar.h
-include/gtk-1.2/gtk/gtkcheckbutton.h
-include/gtk-1.2/gtk/gtkcheckmenuitem.h
-include/gtk-1.2/gtk/gtkclist.h
-include/gtk-1.2/gtk/gtkcolorsel.h
-include/gtk-1.2/gtk/gtkcombo.h
-include/gtk-1.2/gtk/gtkcontainer.h
-include/gtk-1.2/gtk/gtkctree.h
-include/gtk-1.2/gtk/gtkcurve.h
-include/gtk-1.2/gtk/gtkdata.h
-include/gtk-1.2/gtk/gtkdebug.h
-include/gtk-1.2/gtk/gtkdialog.h
-include/gtk-1.2/gtk/gtkdnd.h
-include/gtk-1.2/gtk/gtkdrawingarea.h
-include/gtk-1.2/gtk/gtkeditable.h
-include/gtk-1.2/gtk/gtkentry.h
-include/gtk-1.2/gtk/gtkenums.h
-include/gtk-1.2/gtk/gtkeventbox.h
-include/gtk-1.2/gtk/gtkfeatures.h
-include/gtk-1.2/gtk/gtkfilesel.h
-include/gtk-1.2/gtk/gtkfixed.h
-include/gtk-1.2/gtk/gtkfontsel.h
-include/gtk-1.2/gtk/gtkframe.h
-include/gtk-1.2/gtk/gtkgamma.h
-include/gtk-1.2/gtk/gtkgc.h
-include/gtk-1.2/gtk/gtkhandlebox.h
-include/gtk-1.2/gtk/gtkhbbox.h
-include/gtk-1.2/gtk/gtkhbox.h
-include/gtk-1.2/gtk/gtkhpaned.h
-include/gtk-1.2/gtk/gtkhruler.h
-include/gtk-1.2/gtk/gtkhscale.h
-include/gtk-1.2/gtk/gtkhscrollbar.h
-include/gtk-1.2/gtk/gtkhseparator.h
-include/gtk-1.2/gtk/gtkimage.h
-include/gtk-1.2/gtk/gtkinputdialog.h
-include/gtk-1.2/gtk/gtkinvisible.h
-include/gtk-1.2/gtk/gtkitem.h
-include/gtk-1.2/gtk/gtkitemfactory.h
-include/gtk-1.2/gtk/gtklabel.h
-include/gtk-1.2/gtk/gtklist.h
-include/gtk-1.2/gtk/gtklistitem.h
-include/gtk-1.2/gtk/gtkmain.h
-include/gtk-1.2/gtk/gtkmarshal.h
-include/gtk-1.2/gtk/gtkmenu.h
-include/gtk-1.2/gtk/gtkmenubar.h
-include/gtk-1.2/gtk/gtkmenufactory.h
-include/gtk-1.2/gtk/gtkmenuitem.h
-include/gtk-1.2/gtk/gtkmenushell.h
-include/gtk-1.2/gtk/gtkmisc.h
-include/gtk-1.2/gtk/gtknotebook.h
-include/gtk-1.2/gtk/gtkobject.h
-include/gtk-1.2/gtk/gtkoptionmenu.h
-include/gtk-1.2/gtk/gtkpacker.h
-include/gtk-1.2/gtk/gtkpaned.h
-include/gtk-1.2/gtk/gtkpixmap.h
-include/gtk-1.2/gtk/gtkpreview.h
-include/gtk-1.2/gtk/gtkprivate.h
-include/gtk-1.2/gtk/gtkprogress.h
-include/gtk-1.2/gtk/gtkprogressbar.h
-include/gtk-1.2/gtk/gtkradiobutton.h
-include/gtk-1.2/gtk/gtkradiomenuitem.h
-include/gtk-1.2/gtk/gtkrange.h
-include/gtk-1.2/gtk/gtkrc.h
-include/gtk-1.2/gtk/gtkruler.h
-include/gtk-1.2/gtk/gtkscale.h
-include/gtk-1.2/gtk/gtkscrollbar.h
-include/gtk-1.2/gtk/gtkscrolledwindow.h
-include/gtk-1.2/gtk/gtkselection.h
-include/gtk-1.2/gtk/gtkseparator.h
-include/gtk-1.2/gtk/gtksignal.h
-include/gtk-1.2/gtk/gtkspinbutton.h
-include/gtk-1.2/gtk/gtkstatusbar.h
-include/gtk-1.2/gtk/gtkstyle.h
-include/gtk-1.2/gtk/gtktable.h
-include/gtk-1.2/gtk/gtktearoffmenuitem.h
-include/gtk-1.2/gtk/gtktext.h
-include/gtk-1.2/gtk/gtktipsquery.h
-include/gtk-1.2/gtk/gtktogglebutton.h
-include/gtk-1.2/gtk/gtktoolbar.h
-include/gtk-1.2/gtk/gtktooltips.h
-include/gtk-1.2/gtk/gtktree.h
-include/gtk-1.2/gtk/gtktreeitem.h
-include/gtk-1.2/gtk/gtktypebuiltins.h
-include/gtk-1.2/gtk/gtktypeutils.h
-include/gtk-1.2/gtk/gtkvbbox.h
-include/gtk-1.2/gtk/gtkvbox.h
-include/gtk-1.2/gtk/gtkviewport.h
-include/gtk-1.2/gtk/gtkvpaned.h
-include/gtk-1.2/gtk/gtkvruler.h
-include/gtk-1.2/gtk/gtkvscale.h
-include/gtk-1.2/gtk/gtkvscrollbar.h
-include/gtk-1.2/gtk/gtkvseparator.h
-include/gtk-1.2/gtk/gtkwidget.h
-include/gtk-1.2/gtk/gtkwindow.h
-include/gtk-1.2/gtk/gtkcompat.h
-include/gtk-1.2/gtk/gtklayout.h
-include/gtk-1.2/gtk/gtkplug.h
-include/gtk-1.2/gtk/gtksocket.h
-include/gtk-1.2/gtk/gtkthemes.h
-lib/libgdk.la
-lib/libgtk.la
-lib/pkgconfig/gdk.pc
-lib/pkgconfig/gtk+.pc
-man/man1/gtk-config.1
-share/aclocal/gtk.m4
-${PKGLOCALEDIR}/locale/az/LC_MESSAGES/gtk+.mo
-${PKGLOCALEDIR}/locale/nn/LC_MESSAGES/gtk+.mo
-${PKGLOCALEDIR}/locale/sp/LC_MESSAGES/gtk+.mo
-${PKGLOCALEDIR}/locale/sr/LC_MESSAGES/gtk+.mo
-${PKGLOCALEDIR}/locale/tr/LC_MESSAGES/gtk+.mo
-${PKGLOCALEDIR}/locale/zh_CN.GB2312/LC_MESSAGES/gtk+.mo
-${PKGLOCALEDIR}/locale/gl/LC_MESSAGES/gtk+.mo
-${PKGLOCALEDIR}/locale/lt/LC_MESSAGES/gtk+.mo
-${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/gtk+.mo
-${PKGLOCALEDIR}/locale/da/LC_MESSAGES/gtk+.mo
-${PKGLOCALEDIR}/locale/pt_BR/LC_MESSAGES/gtk+.mo
-${PKGLOCALEDIR}/locale/ro/LC_MESSAGES/gtk+.mo
-${PKGLOCALEDIR}/locale/el/LC_MESSAGES/gtk+.mo
-${PKGLOCALEDIR}/locale/eu/LC_MESSAGES/gtk+.mo
-${PKGLOCALEDIR}/locale/ga/LC_MESSAGES/gtk+.mo
-${PKGLOCALEDIR}/locale/et/LC_MESSAGES/gtk+.mo
-${PKGLOCALEDIR}/locale/uk/LC_MESSAGES/gtk+.mo
-${PKGLOCALEDIR}/locale/ko/LC_MESSAGES/gtk+.mo
-${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/gtk+.mo
-${PKGLOCALEDIR}/locale/de/LC_MESSAGES/gtk+.mo
-${PKGLOCALEDIR}/locale/no/LC_MESSAGES/gtk+.mo
-${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/gtk+.mo
-${PKGLOCALEDIR}/locale/pt/LC_MESSAGES/gtk+.mo
-${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/gtk+.mo
-${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/gtk+.mo
-${PKGLOCALEDIR}/locale/cs/LC_MESSAGES/gtk+.mo
-${PKGLOCALEDIR}/locale/es/LC_MESSAGES/gtk+.mo
-${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/gtk+.mo
-${PKGLOCALEDIR}/locale/hu/LC_MESSAGES/gtk+.mo
-${PKGLOCALEDIR}/locale/it/LC_MESSAGES/gtk+.mo
-${PKGLOCALEDIR}/locale/zh_TW.Big5/LC_MESSAGES/gtk+.mo
-${PKGLOCALEDIR}/locale/ca/LC_MESSAGES/gtk+.mo
-${PKGLOCALEDIR}/locale/fi/LC_MESSAGES/gtk+.mo
-${PKGLOCALEDIR}/locale/sk/LC_MESSAGES/gtk+.mo
-${PKGLOCALEDIR}/locale/wa/LC_MESSAGES/gtk+.mo
-${PKGLOCALEDIR}/locale/hr/LC_MESSAGES/gtk+.mo
-${PKGLOCALEDIR}/locale/sl/LC_MESSAGES/gtk+.mo
-${PKGLOCALEDIR}/locale/vi/LC_MESSAGES/gtk+.mo
-share/themes/Default/gtk/gtkrc
-@unexec ${RMDIR} %D/share/aclocal 2>/dev/null || ${TRUE}
-@dirrm share/themes/Default/gtk
-@unexec ${RMDIR} %D/share/themes/Default 2>/dev/null || ${TRUE}
-@dirrm include/gtk-1.2/gtk
-@dirrm include/gtk-1.2/gdk
-@dirrm include/gtk-1.2
-@dirrm share/gtk
diff --git a/x11/gtk/buildlink3.mk b/x11/gtk/buildlink3.mk
deleted file mode 100644
index 98bd873830f..00000000000
--- a/x11/gtk/buildlink3.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.12 2005/06/01 18:03:29 jlam Exp $
-
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-GTK_BUILDLINK3_MK:=	${GTK_BUILDLINK3_MK}+
-
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	gtk
-.endif
-
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngtk}
-BUILDLINK_PACKAGES+=	gtk
-
-.if !empty(GTK_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gtk+=		gtk+>=1.2.10
-BUILDLINK_RECOMMENDED.gtk+=	gtk+>=1.2.10nb8
-BUILDLINK_PKGSRCDIR.gtk?=	../../x11/gtk
-.endif	# GTK_BUILDLINK3_MK
-
-.include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../devel/glib/buildlink3.mk"
-.include "../../mk/x11.buildlink3.mk"
-
-BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
diff --git a/x11/gtk/distinfo b/x11/gtk/distinfo
deleted file mode 100644
index cae38165dc5..00000000000
--- a/x11/gtk/distinfo
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: distinfo,v 1.9 2005/04/27 09:03:59 wiz Exp $
-
-SHA1 (gtk+-1.2.10.tar.gz) = a5adcb909257da01ae4d4761e1d41081d06e4d7c
-RMD160 (gtk+-1.2.10.tar.gz) = 9b38310d2768e947c4f6173db009243dd11db288
-Size (gtk+-1.2.10.tar.gz) = 2868322 bytes
-SHA1 (patch-aa) = cbbc16d2086e948e438ae11f5377e169ff79407c
-SHA1 (patch-ab) = 17db6fd368e0bc63437f3f0a3d47ca9042cffea9
-SHA1 (patch-ac) = 4f7ffd7dbca81740e8b0304f96f7b3ce592404db
-SHA1 (patch-ad) = 86c29afeaf008e0412298047da6e7cb545c8fc60
-SHA1 (patch-ae) = 8ad654085ee8688d083e00b5f968dd732285ff9c
-SHA1 (patch-af) = 22846f1bd14d6ba7f071d98afb2910ea4cb528c0
-SHA1 (patch-ag) = fb08ae3210a6994c633b45f15bbe5adcb26c4284
-SHA1 (patch-ah) = a7277734c5cf0f858f78a454a02b0069036c3155
diff --git a/x11/gtk/patches/patch-aa b/x11/gtk/patches/patch-aa
deleted file mode 100644
index 505ea5b1fd8..00000000000
--- a/x11/gtk/patches/patch-aa
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-aa,v 1.22 2001/04/26 17:42:55 rh Exp $
-
---- configure.orig	Wed Mar 28 23:11:45 2001
-+++ configure
-@@ -22,8 +22,8 @@
- #
- GTK_MAJOR_VERSION=1
- GTK_MINOR_VERSION=2
--GTK_MICRO_VERSION=10
--GTK_INTERFACE_AGE=1
-+GTK_MICRO_VERSION=22
-+GTK_INTERFACE_AGE=10
- GTK_BINARY_AGE=10
- GTK_VERSION=$GTK_MAJOR_VERSION.$GTK_MINOR_VERSION.$GTK_MICRO_VERSION
- ac_help="$ac_help
-@@ -4106,7 +4106,7 @@
- 
- # AM_GTK_GNU_GETTEXT above substs $DATADIRNAME
- # this is the directory where the *.{mo,gmo} files are installed
--gtklocaledir='${prefix}/${DATADIRNAME}/locale'
-+gtklocaledir='${prefix}/${PKGLOCALEDIR}/locale'
- 
- 
- echo $ac_n "checking for extra flags to get ANSI library prototypes""... $ac_c" 1>&6
diff --git a/x11/gtk/patches/patch-ab b/x11/gtk/patches/patch-ab
deleted file mode 100644
index de96d58fedc..00000000000
--- a/x11/gtk/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.12 2001/03/10 10:50:38 drochner Exp $
-
---- gdk/Makefile.in.orig	Fri Mar  2 20:49:25 2001
-+++ gdk/Makefile.in	Wed Mar  7 21:54:58 2001
-@@ -135,7 +135,7 @@
- 
- # libtool stuff: set version and export symbols for resolving
- libgdkincludedir = $(includedir)/gtk-1.2/gdk
--libgdk_la_LDFLAGS = @STRIP_BEGIN@ 	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) 	-release $(LT_RELEASE) 	-export-dynamic 	@GLIB_DEPLIBS@		@x_ldflags@		@x_libs@		-lm		@STRIP_END@
-+libgdk_la_LDFLAGS = @STRIP_BEGIN@ 	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)	-export-dynamic 	@GLIB_DEPLIBS@		@x_ldflags@		@x_libs@		-lm		@STRIP_END@
- 
- 
- #
diff --git a/x11/gtk/patches/patch-ac b/x11/gtk/patches/patch-ac
deleted file mode 100644
index d5821ac3ee0..00000000000
--- a/x11/gtk/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.11 2001/03/10 10:50:38 drochner Exp $
-
---- gtk/Makefile.in.orig	Fri Mar  2 20:49:26 2001
-+++ gtk/Makefile.in	Wed Mar  7 21:58:19 2001
-@@ -135,7 +135,7 @@
- 
- # libtool stuff: set version and export symbols for resolving
- libgtkincludedir = $(includedir)/gtk-1.2/gtk
--libgtk_la_LDFLAGS = @STRIP_BEGIN@ 	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)		-release $(LT_RELEASE) 						-export-dynamic							@GLIB_DEPLIBS@ 							@x_ldflags@							@x_libs@ 							-lm							@STRIP_END@
-+libgtk_la_LDFLAGS = @STRIP_BEGIN@ 	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)	-export-dynamic							@GLIB_DEPLIBS@ 							@x_ldflags@							@x_libs@ 							-lm							@STRIP_END@
- 
- #	$(top_builddir)/gdk/libgdk.la
- 
diff --git a/x11/gtk/patches/patch-ad b/x11/gtk/patches/patch-ad
deleted file mode 100644
index b7de74cb3dc..00000000000
--- a/x11/gtk/patches/patch-ad
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ad,v 1.7 2002/09/01 14:52:30 tron Exp $
-
---- po/Makefile.in.in.orig	Wed Mar 28 23:11:42 2001
-+++ po/Makefile.in.in	Sun Sep  1 16:32:12 2002
-@@ -19,8 +19,8 @@
- prefix = @prefix@
- exec_prefix = @exec_prefix@
- datadir = $(prefix)/@DATADIRNAME@
--localedir = $(datadir)/locale
--gnulocaledir = $(prefix)/share/locale
-+localedir = $(prefix)/${PKGLOCALEDIR}/locale
-+gnulocaledir = $(prefix)/${PKGLOCALEDIR}/locale
- gettextsrcdir = $(prefix)/share/gettext/po
- subdir = po
- 
diff --git a/x11/gtk/patches/patch-ae b/x11/gtk/patches/patch-ae
deleted file mode 100644
index 769e0666abd..00000000000
--- a/x11/gtk/patches/patch-ae
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-ae,v 1.4 2001/04/26 17:42:55 rh Exp $
-
---- gtk/gtkwindow.c.orig	Sat Mar 10 00:39:16 2001
-+++ gtk/gtkwindow.c
-@@ -985,7 +985,13 @@
-       break;
-     case EnterNotify:
-     case LeaveNotify:
--      if (xev->xcrossing.detail != NotifyInferior &&
-+      /* We only track the actual destination of keyboard events for real
-+       * toplevels, not for embedded toplevels such as GtkPlug. The reason for
-+       * this is that GtkPlug redirects events so the widget may effectively not
-+       * have the focus even if it actually has the focus.
-+       */
-+      if (gdk_window_get_parent (GTK_WIDGET (window)->window) == GDK_ROOT_PARENT () &&
-+	  xev->xcrossing.detail != NotifyInferior &&
- 	  xev->xcrossing.focus && !window->window_has_focus)
- 	{
- 	  window->window_has_pointer_focus = (xev->xany.type == EnterNotify) ? TRUE : FALSE;
diff --git a/x11/gtk/patches/patch-af b/x11/gtk/patches/patch-af
deleted file mode 100644
index 600f53ae5f7..00000000000
--- a/x11/gtk/patches/patch-af
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-af,v 1.3 2003/10/04 18:03:26 danw Exp $
-
---- gtk-config.in.orig	Tue Feb  2 00:17:38 1999
-+++ gtk-config.in	Thu Apr 29 12:13:36 1999
-@@ -104,9 +104,9 @@
- 
- if test "$echo_libs" = "yes"; then
-       my_glib_libs=
--      libdirs=-L@libdir@
-+      libdirs="-L@libdir@ -Wl,-R@libdir@"
-       for i in $glib_libs ; do
--        if test $i != -L@libdir@ ; then
-+        if test $i != -L@libdir@ -a x$i != x-Wl,-R@libdir@ ; then
-           if test -z "$my_glib_libs" ; then
-             my_glib_libs="$i"
-           else
diff --git a/x11/gtk/patches/patch-ag b/x11/gtk/patches/patch-ag
deleted file mode 100644
index c66ccf59a85..00000000000
--- a/x11/gtk/patches/patch-ag
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ag,v 1.4 2003/10/04 18:03:26 danw Exp $
-
---- gdk/gdkimage.c.orig	Tue Sep 16 05:41:17 2003
-+++ gdk/gdkimage.c	Tue Sep 16 05:41:23 2003
-@@ -30,7 +30,7 @@
- #include <stdlib.h>
- #include <sys/types.h>
- 
--#if defined (HAVE_IPC_H) && defined (HAVE_SHM_H) && defined (HAVE_XSHM_H)
-+#if defined (HAVE_IPC_H) && defined (HAVE_SHM_H) && defined (HAVE_XSHM_H) && !defined (__APPLE__)
- #define USE_SHM
- #endif
- 
diff --git a/x11/gtk/patches/patch-ah b/x11/gtk/patches/patch-ah
deleted file mode 100644
index 33df39ad580..00000000000
--- a/x11/gtk/patches/patch-ah
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ah,v 1.4 2005/04/27 09:03:59 wiz Exp $
-
---- gtk.m4.orig	1999-02-18 17:43:35.000000000 +0100
-+++ gtk.m4
-@@ -4,7 +4,7 @@
- dnl AM_PATH_GTK([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]])
- dnl Test for GTK, and define GTK_CFLAGS and GTK_LIBS
- dnl
--AC_DEFUN(AM_PATH_GTK,
-+AC_DEFUN([AM_PATH_GTK],
- [dnl 
- dnl Get the cflags and libraries from the gtk-config script
- dnl