diff options
author | xtraeme <xtraeme@pkgsrc.org> | 2004-04-20 09:59:11 +0000 |
---|---|---|
committer | xtraeme <xtraeme@pkgsrc.org> | 2004-04-20 09:59:11 +0000 |
commit | a2c839e460c94ab9aced74ff448e2b4c60e6d8c8 (patch) | |
tree | 4d8787a20f8bc85b22a676b3d7bd625a431b408d /x11 | |
parent | 383a171192ebb2a5046c7adb90d6729e1c54a03d (diff) | |
download | pkgsrc-a2c839e460c94ab9aced74ff448e2b4c60e6d8c8.tar.gz |
Remove gtk10, this is quit old and unmaintained actually, ok'ed by
silence in packages@.
Diffstat (limited to 'x11')
-rw-r--r-- | x11/Makefile | 3 | ||||
-rw-r--r-- | x11/gtk10/DESCR | 2 | ||||
-rw-r--r-- | x11/gtk10/Makefile | 27 | ||||
-rw-r--r-- | x11/gtk10/PLIST | 125 | ||||
-rw-r--r-- | x11/gtk10/distinfo | 16 | ||||
-rw-r--r-- | x11/gtk10/patches/patch-aa | 21 | ||||
-rw-r--r-- | x11/gtk10/patches/patch-ab | 21 | ||||
-rw-r--r-- | x11/gtk10/patches/patch-ac | 75 | ||||
-rw-r--r-- | x11/gtk10/patches/patch-ad | 45 | ||||
-rw-r--r-- | x11/gtk10/patches/patch-ae | 58 | ||||
-rw-r--r-- | x11/gtk10/patches/patch-af | 115 | ||||
-rw-r--r-- | x11/gtk10/patches/patch-ag | 17 | ||||
-rw-r--r-- | x11/gtk10/patches/patch-ah | 87 | ||||
-rw-r--r-- | x11/gtk10/patches/patch-ai | 33 | ||||
-rw-r--r-- | x11/gtk10/patches/patch-aj | 32 | ||||
-rw-r--r-- | x11/gtk10/patches/patch-ak | 32 | ||||
-rw-r--r-- | x11/gtk10/patches/patch-al | 25 |
17 files changed, 1 insertions, 733 deletions
diff --git a/x11/Makefile b/x11/Makefile index 539df704fa1..316ff6fc250 100644 --- a/x11/Makefile +++ b/x11/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.347 2004/04/19 17:29:40 xtraeme Exp $ +# $NetBSD: Makefile,v 1.348 2004/04/20 09:59:11 xtraeme Exp $ # COMMENT= Packages to support the X window system @@ -66,7 +66,6 @@ SUBDIR+= gtk+extra SUBDIR+= gtk-- SUBDIR+= gtk-engines SUBDIR+= gtk-thinice-engine -SUBDIR+= gtk10 SUBDIR+= gtk2 SUBDIR+= gtk2-engines SUBDIR+= gtk2-engines-bluecurve diff --git a/x11/gtk10/DESCR b/x11/gtk10/DESCR deleted file mode 100644 index 2aa4205daab..00000000000 --- a/x11/gtk10/DESCR +++ /dev/null @@ -1,2 +0,0 @@ -The gimp toolkit. A set of libraries for building complex X11 -user interfaces. So far only used by The Gimp. diff --git a/x11/gtk10/Makefile b/x11/gtk10/Makefile deleted file mode 100644 index d2a2738c506..00000000000 --- a/x11/gtk10/Makefile +++ /dev/null @@ -1,27 +0,0 @@ -# $NetBSD: Makefile,v 1.17 2003/10/22 01:20:30 grant Exp $ - -DISTNAME= gtk+-1.0.6 -PKGNAME= gtk10-1.0.6 -CATEGORIES= x11 -MASTER_SITES= ftp://ftp.gtk.org/pub/gtk/v1.0/ - -MAINTAINER= bsieker@techfak.uni-bielefeld.de -HOMEPAGE= http://www.gtk.org/ -COMMENT= The GIMP Toolkit - libraries for building X11 user interfaces - -CONFLICTS= gtk+-1.0.* - -USE_BUILDLINK2= yes -USE_LIBTOOL= yes -USE_MAKEINFO= yes -USE_X11BASE= yes - -GNU_CONFIGURE= yes -CONFIGURE_ARGS= --includedir=${PREFIX}/include/gtk10 - -INFO_FILES= gdk10.info glib10.info gtk10.info - -post-extract: - cd ${WRKSRC}/docs && ${RM} -f ${INFO_FILES} - -.include "../../mk/bsd.pkg.mk" diff --git a/x11/gtk10/PLIST b/x11/gtk10/PLIST deleted file mode 100644 index a6257bbdab8..00000000000 --- a/x11/gtk10/PLIST +++ /dev/null @@ -1,125 +0,0 @@ -@comment $NetBSD: PLIST,v 1.4 2004/03/11 16:00:04 seb Exp $ -bin/gtk10-config -include/gtk10/gdk/gdk.h -include/gtk10/gdk/gdkcursors.h -include/gtk10/gdk/gdki18n.h -include/gtk10/gdk/gdkkeysyms.h -include/gtk10/gdk/gdkprivate.h -include/gtk10/gdk/gdktypes.h -include/gtk10/gdk/gdkx.h -include/gtk10/glib.h -include/gtk10/glibconfig.h -include/gtk10/gtk/gtk.h -include/gtk10/gtk/gtkaccelerator.h -include/gtk10/gtk/gtkadjustment.h -include/gtk10/gtk/gtkalignment.h -include/gtk10/gtk/gtkarrow.h -include/gtk10/gtk/gtkaspectframe.h -include/gtk10/gtk/gtkbbox.h -include/gtk10/gtk/gtkbin.h -include/gtk10/gtk/gtkbox.h -include/gtk10/gtk/gtkbutton.h -include/gtk10/gtk/gtkcheckbutton.h -include/gtk10/gtk/gtkcheckmenuitem.h -include/gtk10/gtk/gtkclist.h -include/gtk10/gtk/gtkcolorsel.h -include/gtk10/gtk/gtkcombo.h -include/gtk10/gtk/gtkcontainer.h -include/gtk10/gtk/gtkcurve.h -include/gtk10/gtk/gtkdata.h -include/gtk10/gtk/gtkdebug.h -include/gtk10/gtk/gtkdialog.h -include/gtk10/gtk/gtkdrawingarea.h -include/gtk10/gtk/gtkeditable.h -include/gtk10/gtk/gtkentry.h -include/gtk10/gtk/gtkenums.h -include/gtk10/gtk/gtkeventbox.h -include/gtk10/gtk/gtkfeatures.h -include/gtk10/gtk/gtkfilesel.h -include/gtk10/gtk/gtkfixed.h -include/gtk10/gtk/gtkframe.h -include/gtk10/gtk/gtkgamma.h -include/gtk10/gtk/gtkgc.h -include/gtk10/gtk/gtkhandlebox.h -include/gtk10/gtk/gtkhbbox.h -include/gtk10/gtk/gtkhbox.h -include/gtk10/gtk/gtkhpaned.h -include/gtk10/gtk/gtkhruler.h -include/gtk10/gtk/gtkhscale.h -include/gtk10/gtk/gtkhscrollbar.h -include/gtk10/gtk/gtkhseparator.h -include/gtk10/gtk/gtkimage.h -include/gtk10/gtk/gtkinputdialog.h -include/gtk10/gtk/gtkitem.h -include/gtk10/gtk/gtklabel.h -include/gtk10/gtk/gtklist.h -include/gtk10/gtk/gtklistitem.h -include/gtk10/gtk/gtkmain.h -include/gtk10/gtk/gtkmenu.h -include/gtk10/gtk/gtkmenubar.h -include/gtk10/gtk/gtkmenufactory.h -include/gtk10/gtk/gtkmenuitem.h -include/gtk10/gtk/gtkmenushell.h -include/gtk10/gtk/gtkmisc.h -include/gtk10/gtk/gtknotebook.h -include/gtk10/gtk/gtkobject.h -include/gtk10/gtk/gtkoptionmenu.h -include/gtk10/gtk/gtkpaned.h -include/gtk10/gtk/gtkpixmap.h -include/gtk10/gtk/gtkpreview.h -include/gtk10/gtk/gtkprivate.h -include/gtk10/gtk/gtkprogressbar.h -include/gtk10/gtk/gtkradiobutton.h -include/gtk10/gtk/gtkradiomenuitem.h -include/gtk10/gtk/gtkrange.h -include/gtk10/gtk/gtkrc.h -include/gtk10/gtk/gtkruler.h -include/gtk10/gtk/gtkscale.h -include/gtk10/gtk/gtkscrollbar.h -include/gtk10/gtk/gtkscrolledwindow.h -include/gtk10/gtk/gtkselection.h -include/gtk10/gtk/gtkseparator.h -include/gtk10/gtk/gtksignal.h -include/gtk10/gtk/gtkspinbutton.h -include/gtk10/gtk/gtkstatusbar.h -include/gtk10/gtk/gtkstyle.h -include/gtk10/gtk/gtktable.h -include/gtk10/gtk/gtktext.h -include/gtk10/gtk/gtktipsquery.h -include/gtk10/gtk/gtktogglebutton.h -include/gtk10/gtk/gtktoolbar.h -include/gtk10/gtk/gtktooltips.h -include/gtk10/gtk/gtktree.h -include/gtk10/gtk/gtktreeitem.h -include/gtk10/gtk/gtktypebuiltins.h -include/gtk10/gtk/gtktypeutils.h -include/gtk10/gtk/gtkvbbox.h -include/gtk10/gtk/gtkvbox.h -include/gtk10/gtk/gtkviewport.h -include/gtk10/gtk/gtkvpaned.h -include/gtk10/gtk/gtkvruler.h -include/gtk10/gtk/gtkvscale.h -include/gtk10/gtk/gtkvscrollbar.h -include/gtk10/gtk/gtkvseparator.h -include/gtk10/gtk/gtkwidget.h -include/gtk10/gtk/gtkwindow.h -lib/libgdk10.a -lib/libgdk10.la -lib/libgdk10.so -lib/libgdk10.so.1 -lib/libgdk10.so.1.6 -lib/libglib10.a -lib/libglib10.la -lib/libglib10.so -lib/libglib10.so.1 -lib/libglib10.so.1.6 -lib/libgtk10.a -lib/libgtk10.la -lib/libgtk10.so -lib/libgtk10.so.1 -lib/libgtk10.so.1.6 -man/man1/gtk10-config.1 -share/aclocal/gtk10.m4 -@dirrm include/gtk10/gtk -@dirrm include/gtk10/gdk -@dirrm include/gtk10 diff --git a/x11/gtk10/distinfo b/x11/gtk10/distinfo deleted file mode 100644 index 1c101ff4006..00000000000 --- a/x11/gtk10/distinfo +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: distinfo,v 1.2 2001/04/19 11:07:39 skrll Exp $ - -SHA1 (gtk+-1.0.6.tar.gz) = 41a144ccbcafe974d2b1adc7adc8e6857654e146 -Size (gtk+-1.0.6.tar.gz) = 1299144 bytes -SHA1 (patch-aa) = 9bd430722cab37b31bf8dfb7d5f3b6f6d4457ed9 -SHA1 (patch-ab) = f27544bda9926ab783891d2cd75aa305a71c6a7c -SHA1 (patch-ac) = 5e97cc40be37bdf3b2b273d5feabb009d0732d8f -SHA1 (patch-ad) = d4ebbb0f25d1fa3a25be004d4f3aee229a7208f4 -SHA1 (patch-ae) = 396a31bd363f2dff136a18b8d9e5834dacd8427d -SHA1 (patch-af) = 5af7e7222be319f7ba79afecfa821e2c539dc4c4 -SHA1 (patch-ag) = 4bc3ebbfe11d1ae72428acb516e23ddba60a29a1 -SHA1 (patch-ah) = f0e4571fc16837e989c2926706ffc28121353959 -SHA1 (patch-ai) = d503beba3275db751b92eb84f8c5b1cbb020e4b1 -SHA1 (patch-aj) = fb45c945871a560e30b4724c00be5e73fd88bf32 -SHA1 (patch-ak) = cb1271901f639542d561a618eff3746922433f24 -SHA1 (patch-al) = a7cb6ad4267f919ffff1e5cc53552ddd114906a1 diff --git a/x11/gtk10/patches/patch-aa b/x11/gtk10/patches/patch-aa deleted file mode 100644 index 4065b983dcf..00000000000 --- a/x11/gtk10/patches/patch-aa +++ /dev/null @@ -1,21 +0,0 @@ -$NetBSD: patch-aa,v 1.2 1999/11/27 21:46:38 rh Exp $ - ---- configure.orig Mon Sep 21 04:41:13 1998 -+++ configure Sat Nov 27 22:38:50 1999 -@@ -1235,6 +1235,7 @@ - echo "$ac_t""no" 1>&6 - fi - -+if false; then - # Always use our own libtool. - LIBTOOL='$(SHELL) $(top_builddir)/libtool' - -@@ -1280,7 +1281,7 @@ - ${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig \ - $libtool_flags --no-verify $ac_aux_dir/ltmain.sh $host \ - || { echo "configure: error: libtool configure failed" 1>&2; exit 1; } -- -+fi - - echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6 - echo "configure:1287: checking whether to enable maintainer-specific portions of Makefiles" >&5 diff --git a/x11/gtk10/patches/patch-ab b/x11/gtk10/patches/patch-ab deleted file mode 100644 index 75f33445024..00000000000 --- a/x11/gtk10/patches/patch-ab +++ /dev/null @@ -1,21 +0,0 @@ -$NetBSD: patch-ab,v 1.2 1999/11/27 21:46:38 rh Exp $ - ---- glib/configure.orig Mon Sep 21 04:41:11 1998 -+++ glib/configure Sat Nov 27 22:40:41 1999 -@@ -1212,6 +1212,7 @@ - echo "$ac_t""no" 1>&6 - fi - -+if false; then - # Always use our own libtool. - LIBTOOL='$(SHELL) $(top_builddir)/libtool' - -@@ -1257,7 +1258,7 @@ - ${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig \ - $libtool_flags --no-verify $ac_aux_dir/ltmain.sh $host \ - || { echo "configure: error: libtool configure failed" 1>&2; exit 1; } -- -+fi - - echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6 - echo "configure:1264: checking whether to enable maintainer-specific portions of Makefiles" >&5 diff --git a/x11/gtk10/patches/patch-ac b/x11/gtk10/patches/patch-ac deleted file mode 100644 index 234395b77c3..00000000000 --- a/x11/gtk10/patches/patch-ac +++ /dev/null @@ -1,75 +0,0 @@ -$NetBSD: patch-ac,v 1.2 1999/02/19 14:22:47 rh Exp $ - ---- glib/Makefile.in.orig Mon Sep 21 06:20:33 1998 -+++ glib/Makefile.in Tue Feb 16 15:04:10 1999 -@@ -74,11 +74,11 @@ - RANLIB = @RANLIB@ - VERSION = @VERSION@ - --configincludedir = $(pkglibdir)/include -+configincludedir = @includedir@ - --lib_LTLIBRARIES = libglib.la -+lib_LTLIBRARIES = libglib10.la - --libglib_la_SOURCES = \ -+libglib10_la_SOURCES = \ - garray.c \ - gcache.c \ - gerror.c \ -@@ -100,12 +100,12 @@ - configinclude_DATA = \ - glibconfig.h - --libglib_la_LDFLAGS = -version-info $(GLIB_MAJOR_VERSION):$(GLIB_MICRO_VERSION):0 -+libglib10_la_LDFLAGS = -version-info $(GLIB_MAJOR_VERSION):$(GLIB_MICRO_VERSION):0 - - INCLUDES = -I$(top_srcdir) - - noinst_PROGRAMS = testglib --testglib_LDADD = libglib.la -+testglib_LDADD = libglib10.la - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs - CONFIG_HEADER = glibconfig.h -@@ -117,15 +117,15 @@ - CPPFLAGS = @CPPFLAGS@ - LDFLAGS = @LDFLAGS@ - LIBS = @LIBS@ --libglib_la_LIBADD = --libglib_la_OBJECTS = garray.lo gcache.lo gerror.lo ghash.lo glist.lo \ -+libglib10_la_LIBADD = -+libglib10_la_OBJECTS = garray.lo gcache.lo gerror.lo ghash.lo glist.lo \ - gmem.lo gmessages.lo gprimes.lo gslist.lo gtimer.lo gtree.lo gstring.lo \ - gscanner.lo gutils.lo - PROGRAMS = $(noinst_PROGRAMS) - - testglib_SOURCES = testglib.c - testglib_OBJECTS = testglib.o --testglib_DEPENDENCIES = libglib.la -+testglib_DEPENDENCIES = libglib10.la - testglib_LDFLAGS = - CFLAGS = @CFLAGS@ - COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -@@ -145,8 +145,8 @@ - - TAR = tar - GZIP = --best --SOURCES = $(libglib_la_SOURCES) testglib.c --OBJECTS = $(libglib_la_OBJECTS) testglib.o -+SOURCES = $(libglib10_la_SOURCES) testglib.c -+OBJECTS = $(libglib10_la_OBJECTS) testglib.o - - all: Makefile $(LTLIBRARIES) $(PROGRAMS) $(DATA) $(HEADERS) glibconfig.h - -@@ -251,8 +251,8 @@ - - maintainer-clean-libtool: - --libglib.la: $(libglib_la_OBJECTS) $(libglib_la_DEPENDENCIES) -- $(LINK) -rpath $(libdir) $(libglib_la_LDFLAGS) $(libglib_la_OBJECTS) $(libglib_la_LIBADD) $(LIBS) -+libglib10.la: $(libglib10_la_OBJECTS) $(libglib10_la_DEPENDENCIES) -+ $(LINK) -rpath $(libdir) $(libglib10_la_LDFLAGS) $(libglib10_la_OBJECTS) $(libglib10_la_LIBADD) $(LIBS) - - mostlyclean-noinstPROGRAMS: - diff --git a/x11/gtk10/patches/patch-ad b/x11/gtk10/patches/patch-ad deleted file mode 100644 index dbdcc367f17..00000000000 --- a/x11/gtk10/patches/patch-ad +++ /dev/null @@ -1,45 +0,0 @@ -$NetBSD: patch-ad,v 1.1 1999/02/19 14:22:47 rh Exp $ - ---- Makefile.in.orig Mon Sep 21 06:20:30 1998 -+++ Makefile.in Tue Feb 16 15:42:59 1999 -@@ -82,11 +82,11 @@ - SRC_SUBDIRS = glib gdk gtk - SUBDIRS = $(SRC_SUBDIRS) docs - --bin_SCRIPTS = gtk-config -+bin_SCRIPTS = gtk10-config - - EXTRA_DIST = \ - gtk+.spec \ -- gtk.m4 \ -+ gtk10.m4 \ - makecopyright \ - TODO \ - examples/README.1ST \ -@@ -151,11 +151,11 @@ - examples/find-examples.sh - - m4datadir = $(datadir)/aclocal --m4data_DATA = gtk.m4 -+m4data_DATA = gtk10.m4 - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs - CONFIG_HEADER = config.h --CONFIG_CLEAN_FILES = gtk-config -+CONFIG_CLEAN_FILES = gtk10-config - SCRIPTS = $(bin_SCRIPTS) - - DATA = $(m4data_DATA) -@@ -210,6 +210,12 @@ - maintainer-clean-hdr: - gtk-config: $(top_builddir)/config.status gtk-config.in - cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= ./config.status -+ -+gtk10-config: gtk-config -+ cp gtk-config gtk10-config -+ -+gtk10.m4: gtk.m4 -+ cp gtk.m4 gtk10.m4 - - install-binSCRIPTS: $(bin_SCRIPTS) - @$(NORMAL_INSTALL) diff --git a/x11/gtk10/patches/patch-ae b/x11/gtk10/patches/patch-ae deleted file mode 100644 index cfc92670610..00000000000 --- a/x11/gtk10/patches/patch-ae +++ /dev/null @@ -1,58 +0,0 @@ -$NetBSD: patch-ae,v 1.1 1999/02/19 14:22:47 rh Exp $ - ---- gdk/Makefile.in.orig Mon Sep 21 06:20:35 1998 -+++ gdk/Makefile.in Tue Feb 16 15:09:06 1999 -@@ -81,9 +81,9 @@ - - gdkincludedir = $(includedir)/gdk - --lib_LTLIBRARIES = libgdk.la -+lib_LTLIBRARIES = libgdk10.la - --libgdk_la_SOURCES = \ -+libgdk10_la_SOURCES = \ - gdk.c \ - gdkcc.c \ - gdkcolor.c \ -@@ -122,7 +122,7 @@ - gdktypes.h \ - gdkx.h - --libgdk_la_LDFLAGS = -version-info $(GTK_MAJOR_VERSION):$(GTK_MICRO_VERSION):0 \ -+libgdk10_la_LDFLAGS = -version-info $(GTK_MAJOR_VERSION):$(GTK_MICRO_VERSION):0 \ - @x_ldflags@ @x_libs@ - - INCLUDES = -I$(top_srcdir) -I../glib -I$(top_srcdir)/glib @x_cflags@ -@@ -155,8 +155,8 @@ - X_LIBS = @X_LIBS@ - X_EXTRA_LIBS = @X_EXTRA_LIBS@ - X_PRE_LIBS = @X_PRE_LIBS@ --libgdk_la_LIBADD = --libgdk_la_OBJECTS = gdk.lo gdkcc.lo gdkcolor.lo gdkcursor.lo gdkdnd.lo \ -+libgdk10_la_LIBADD = -+libgdk10_la_OBJECTS = gdk.lo gdkcc.lo gdkcolor.lo gdkcursor.lo gdkdnd.lo \ - gdkdraw.lo gdkfont.lo gdkgc.lo gdkglobals.lo gdkimage.lo gdkinput.lo \ - gdkpixmap.lo gdkproperty.lo gdkrectangle.lo gdkregion.lo \ - gdkselection.lo gdkvisual.lo gdkwindow.lo gdkxid.lo gxid_lib.lo -@@ -178,8 +178,8 @@ - - TAR = tar - GZIP = --best --SOURCES = $(libgdk_la_SOURCES) $(gxid_SOURCES) --OBJECTS = $(libgdk_la_OBJECTS) $(gxid_OBJECTS) -+SOURCES = $(libgdk10_la_SOURCES) $(gxid_SOURCES) -+OBJECTS = $(libgdk10_la_OBJECTS) $(gxid_OBJECTS) - - all: Makefile $(LTLIBRARIES) $(PROGRAMS) $(HEADERS) - -@@ -256,8 +256,8 @@ - - maintainer-clean-libtool: - --libgdk.la: $(libgdk_la_OBJECTS) $(libgdk_la_DEPENDENCIES) -- $(LINK) -rpath $(libdir) $(libgdk_la_LDFLAGS) $(libgdk_la_OBJECTS) $(libgdk_la_LIBADD) $(LIBS) -+libgdk10.la: $(libgdk10_la_OBJECTS) $(libgdk10_la_DEPENDENCIES) -+ $(LINK) -rpath $(libdir) $(libgdk10_la_LDFLAGS) $(libgdk10_la_OBJECTS) $(libgdk10_la_LIBADD) $(LIBS) - - mostlyclean-binPROGRAMS: - diff --git a/x11/gtk10/patches/patch-af b/x11/gtk10/patches/patch-af deleted file mode 100644 index afbfc6b5548..00000000000 --- a/x11/gtk10/patches/patch-af +++ /dev/null @@ -1,115 +0,0 @@ -$NetBSD: patch-af,v 1.1 1999/02/19 14:22:47 rh Exp $ - ---- gtk/Makefile.in.orig Mon Sep 21 06:20:39 1998 -+++ gtk/Makefile.in Tue Feb 16 15:13:16 1999 -@@ -81,9 +81,9 @@ - - gtkincludedir = $(includedir)/gtk - --lib_LTLIBRARIES = libgtk.la -+lib_LTLIBRARIES = libgtk10.la - --libgtk_la_SOURCES = \ -+libgtk10_la_SOURCES = \ - gtkaccelerator.c \ - gtkadjustment.c \ - gtkaspectframe.c \ -@@ -271,7 +271,7 @@ - gtkwindow.h \ - gtktypebuiltins.h - --libgtk_la_LDFLAGS = -version-info $(GTK_MAJOR_VERSION):$(GTK_MICRO_VERSION):0 -+libgtk10_la_LDFLAGS = -version-info $(GTK_MAJOR_VERSION):$(GTK_MICRO_VERSION):0 - - EXTRA_DIST = \ - line-arrow.xbm \ -@@ -299,41 +299,41 @@ - noinst_PROGRAMS = testgtk testinput testselection simple - - testgtk_LDADD = \ -- libgtk.la \ -- $(top_builddir)/gdk/libgdk.la \ -+ libgtk10.la \ -+ $(top_builddir)/gdk/libgdk10.la \ - @x_ldflags@ \ - @x_libs@ \ -- $(top_builddir)/glib/libglib.la \ -+ $(top_builddir)/glib/libglib10.la \ - -lm - - testinput_LDADD = \ -- libgtk.la \ -- $(top_builddir)/gdk/libgdk.la \ -+ libgtk10.la \ -+ $(top_builddir)/gdk/libgdk10.la \ - @x_ldflags@ \ - @x_libs@ \ -- $(top_builddir)/glib/libglib.la \ -+ $(top_builddir)/glib/libglib10.la \ - -lm - - testselection_LDADD = \ -- libgtk.la \ -- $(top_builddir)/gdk/libgdk.la \ -+ libgtk10.la \ -+ $(top_builddir)/gdk/libgdk10.la \ - @x_ldflags@ \ - @x_libs@ \ -- $(top_builddir)/glib/libglib.la \ -+ $(top_builddir)/glib/libglib10.la \ - -lm - - simple_LDADD = \ -- libgtk.la \ -- $(top_builddir)/gdk/libgdk.la \ -+ libgtk10.la \ -+ $(top_builddir)/gdk/libgdk10.la \ - @x_ldflags@ \ - @x_libs@ \ -- $(top_builddir)/glib/libglib.la \ -+ $(top_builddir)/glib/libglib10.la \ - -lm - - DEPS = \ -- libgtk.la \ -- $(top_builddir)/gdk/libgdk.la \ -- $(top_builddir)/glib/libglib.la -+ libgtk10.la \ -+ $(top_builddir)/gdk/libgdk10.la \ -+ $(top_builddir)/glib/libglib10.la - - testgtk_DEPENDENCIES = $(DEPS) - testinput_DEPENDENCIES = $(DEPS) -@@ -353,8 +353,8 @@ - X_LIBS = @X_LIBS@ - X_EXTRA_LIBS = @X_EXTRA_LIBS@ - X_PRE_LIBS = @X_PRE_LIBS@ --libgtk_la_LIBADD = --libgtk_la_OBJECTS = gtkaccelerator.lo gtkadjustment.lo \ -+libgtk10_la_LIBADD = -+libgtk10_la_OBJECTS = gtkaccelerator.lo gtkadjustment.lo \ - gtkaspectframe.lo gtkalignment.lo gtkarrow.lo gtkbin.lo gtkbbox.lo \ - gtkbox.lo gtkbutton.lo gtkcheckbutton.lo gtkcheckmenuitem.lo \ - gtkclist.lo gtkcolorsel.lo gtkcombo.lo gtkcontainer.lo gtkcurve.lo \ -@@ -401,8 +401,8 @@ - - TAR = tar - GZIP = --best --SOURCES = $(libgtk_la_SOURCES) testgtk.c testinput.c testselection.c simple.c --OBJECTS = $(libgtk_la_OBJECTS) testgtk.o testinput.o testselection.o simple.o -+SOURCES = $(libgtk10_la_SOURCES) testgtk.c testinput.c testselection.c simple.c -+OBJECTS = $(libgtk10_la_OBJECTS) testgtk.o testinput.o testselection.o simple.o - - all: Makefile $(LTLIBRARIES) $(PROGRAMS) $(HEADERS) - -@@ -481,8 +481,8 @@ - - maintainer-clean-libtool: - --libgtk.la: $(libgtk_la_OBJECTS) $(libgtk_la_DEPENDENCIES) -- $(LINK) -rpath $(libdir) $(libgtk_la_LDFLAGS) $(libgtk_la_OBJECTS) $(libgtk_la_LIBADD) $(LIBS) -+libgtk10.la: $(libgtk10_la_OBJECTS) $(libgtk10_la_DEPENDENCIES) -+ $(LINK) -rpath $(libdir) $(libgtk10_la_LDFLAGS) $(libgtk10_la_OBJECTS) $(libgtk10_la_LIBADD) $(LIBS) - - mostlyclean-noinstPROGRAMS: - diff --git a/x11/gtk10/patches/patch-ag b/x11/gtk10/patches/patch-ag deleted file mode 100644 index 47aacdcc6cc..00000000000 --- a/x11/gtk10/patches/patch-ag +++ /dev/null @@ -1,17 +0,0 @@ -$NetBSD: patch-ag,v 1.2 1999/05/27 15:10:54 kleink Exp $ - ---- gtk-config.in.orig Mon Apr 6 06:31:14 1998 -+++ gtk-config.in Tue Feb 16 15:28:19 1999 -@@ -42,10 +42,10 @@ - if test @includedir@ != /usr/include ; then - includes=-I@includedir@ - fi -- echo -I@libdir@/glib/include $includes @x_cflags@ -+ echo $includes @x_cflags@ - ;; - --libs) -- echo -L@libdir@ @x_ldflags@ -lgtk -lgdk -lglib @x_libs@ -lm -+ echo -L@libdir@ -Wl,-R@libdir@ @x_ldflags@ -lgtk10 -lgdk10 -lglib10 @x_libs@ -lm - ;; - *) - echo "${usage}" 1>&2 diff --git a/x11/gtk10/patches/patch-ah b/x11/gtk10/patches/patch-ah deleted file mode 100644 index 0ee5615189d..00000000000 --- a/x11/gtk10/patches/patch-ah +++ /dev/null @@ -1,87 +0,0 @@ -$NetBSD: patch-ah,v 1.1 1999/02/19 14:22:47 rh Exp $ - ---- docs/Makefile.in.orig Mon Sep 21 06:20:43 1998 -+++ docs/Makefile.in Thu Feb 18 11:29:24 1999 -@@ -79,9 +79,9 @@ - x_libs = @x_libs@ - xinput_progs = @xinput_progs@ - --info_TEXINFOS = gdk.texi gtk.texi glib.texi -+info_TEXINFOS = gdk10.texi gtk10.texi glib10.texi - --man_MANS = gtk-config.1 -+man_MANS = gtk10-config.1 - - EXTRA_DIST = \ - texinfo.tex \ -@@ -107,9 +107,9 @@ - CONFIG_CLEAN_FILES = - TEXI2DVI = texi2dvi - TEXINFO_TEX = $(srcdir)/texinfo.tex --INFO_DEPS = gdk.info gtk.info glib.info --DVIS = gdk.dvi gtk.dvi glib.dvi --TEXINFOS = gdk.texi gtk.texi glib.texi -+INFO_DEPS = gdk10.info gtk10.info glib10.info -+DVIS = gdk10.dvi gtk10.dvi glib10.dvi -+TEXINFOS = gdk10.texi gtk10.texi glib10.texi - man1dir = $(mandir)/man1 - MANS = $(man_MANS) - -@@ -133,16 +133,27 @@ - && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status - - --gdk.info: gdk.texi --gdk.dvi: gdk.texi -+gdk10.texi: gdk.texi -+ cp gdk.texi gdk10.texi - -+gdk10.info: gdk10.texi -+gdk10.dvi: gdk10.texi - --gtk.info: gtk.texi --gtk.dvi: gtk.texi -+gtk10.texi: gtk.texi -+ cp gtk.texi gtk10.texi - -+gtk10.info: gtk10.texi -+gtk10.dvi: gtk10.texi - --glib.info: glib.texi --glib.dvi: glib.texi -+ -+glib10.texi: glib.texi -+ cp glib.texi glib10.texi -+ -+glib10.info: glib10.texi -+glib10.dvi: glib10.texi -+ -+gtk10-config.1: gtk-config.1 -+ cp gtk-config.1 gtk10-config.1 - - - DVIPS = dvips -@@ -204,22 +215,12 @@ - done; \ - done - @$(POST_INSTALL) -- @if $(SHELL) -c 'install-info --version | sed 1q | fgrep -s -v -i debian' >/dev/null 2>&1; then \ -- for file in $(INFO_DEPS); do \ -- echo " install-info --info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/$$file";\ -- install-info --info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/$$file || :;\ -- done; \ -- else : ; fi - - uninstall-info: - $(PRE_UNINSTALL) - @if $(SHELL) -c 'install-info --version | sed 1q | fgrep -s -v -i debian' >/dev/null 2>&1; then \ - ii=yes; \ -- else ii=; fi; \ -- for file in $(INFO_DEPS); do \ -- test -z "$ii" \ -- || install-info --info-dir=$(DESTDIR)$(infodir) --remove $$file; \ -- done -+ else ii=; fi - @$(NORMAL_UNINSTALL) - for file in $(INFO_DEPS); do \ - (cd $(DESTDIR)$(infodir) && rm -f $$file $$file-[0-9] $$file-[0-9][0-9]); \ diff --git a/x11/gtk10/patches/patch-ai b/x11/gtk10/patches/patch-ai deleted file mode 100644 index 90d3cc08d42..00000000000 --- a/x11/gtk10/patches/patch-ai +++ /dev/null @@ -1,33 +0,0 @@ -$NetBSD: patch-ai,v 1.1 1999/02/19 14:22:47 rh Exp $ - ---- docs/gtk.texi.orig Fri Mar 13 20:18:13 1998 -+++ docs/gtk.texi Thu Feb 18 11:28:01 1999 -@@ -2,8 +2,8 @@ - @c Copyright (C) 1996 by Peter Mattis. All rights reserved. - @c - @c %**start of header --@setfilename gtk.info --@settitle GTK -+@setfilename gtk10.info -+@settitle GTK10 - @setchapternewpage odd - @include macros.texi - @c %**end of header -@@ -13,7 +13,7 @@ - @set update-month January 1998 - - @ifinfo --This file documents GTK, the GIMP Toolkit -+This file documents GTK10, the GIMP Toolkit Version 1.0 - - Copyright (C) 1996 Peter Mattis - Copyright (C) 1997 Peter Mattis -@@ -69,7 +69,7 @@ - - @dircategory User Interface Toolkit - @direntry --* GTK: (gtk). The GIMP Toolkit -+* GTK10: (gtk10). The GIMP Toolkit, Version 1.0 - @end direntry - - @node Top, Copying, (dir), (dir) diff --git a/x11/gtk10/patches/patch-aj b/x11/gtk10/patches/patch-aj deleted file mode 100644 index cd1db857faf..00000000000 --- a/x11/gtk10/patches/patch-aj +++ /dev/null @@ -1,32 +0,0 @@ -$NetBSD: patch-aj,v 1.1 1999/02/19 14:22:47 rh Exp $ - ---- docs/gdk.texi.orig Sun Mar 1 21:24:38 1998 -+++ docs/gdk.texi Thu Feb 18 11:26:37 1999 -@@ -1,7 +1,7 @@ - \input texinfo @c -*-texinfo-*- - @c %**start of header --@setfilename gdk.info --@settitle GDK -+@setfilename gdk10.info -+@settitle GDK10 - @setchapternewpage odd - @c %**end of header - -@@ -10,7 +10,7 @@ - @set update-month May 1996 - - @ifinfo --This file documents GDK, the General Drawing Kit -+This file documents GDK10, the General Drawing Kit Version 1.0 - - Copyright (C) 1996 Peter Mattis - -@@ -63,7 +63,7 @@ - - @dircategory User Interface Toolkit - @direntry --* GDK: (gdk). The General Drawing Kit -+* GDK10: (gdk10). The General Drawing Kit, Version 1.0 - @end direntry - - @node Top, Copying, (dir), (dir) diff --git a/x11/gtk10/patches/patch-ak b/x11/gtk10/patches/patch-ak deleted file mode 100644 index 2905b806851..00000000000 --- a/x11/gtk10/patches/patch-ak +++ /dev/null @@ -1,32 +0,0 @@ -$NetBSD: patch-ak,v 1.1 1999/02/19 14:22:48 rh Exp $ - ---- docs/glib.texi.orig Sun Mar 1 21:24:39 1998 -+++ docs/glib.texi Thu Feb 18 11:25:12 1999 -@@ -1,7 +1,7 @@ - \input texinfo @c -*-texinfo-*- - @c %**start of header --@setfilename glib.info --@settitle GLIB -+@setfilename glib10.info -+@settitle GLIB10 - @setchapternewpage odd - - @set edition 1.0 -@@ -10,7 +10,7 @@ - @c %**end of header - - @ifinfo --This file documents GLIB, A library of useful routines for C programming -+This file documents GLIB10, a library of useful routines for C programming - - Copyright (C) 1998 Gregory A McLean - -@@ -63,7 +63,7 @@ - - @dircategory Library of useful routines for 'C' programing - @direntry --* GLIB: (glib). useful routines for 'C' programming -+* GLIB10: (glib10). useful routines for 'C' programming, Version 1.0 - @end direntry - - @node Top, Copying, (dir), (dir) diff --git a/x11/gtk10/patches/patch-al b/x11/gtk10/patches/patch-al deleted file mode 100644 index 51feb949d6a..00000000000 --- a/x11/gtk10/patches/patch-al +++ /dev/null @@ -1,25 +0,0 @@ -$NetBSD: patch-al,v 1.1 1999/02/19 14:22:48 rh Exp $ - ---- gtk.m4.orig Sun May 10 06:17:23 1998 -+++ gtk.m4 Thu Feb 18 12:09:43 1999 -@@ -18,17 +18,17 @@ - if test x$gtk_config_exec_prefix != x ; then - gtk_config_args="$gtk_config_args --exec-prefix=$gtk_config_exec_prefix" - if test x${GTK_CONFIG+set} != xset ; then -- GTK_CONFIG=$gtk_config_exec_prefix/bin/gtk-config -+ GTK_CONFIG=$gtk_config_exec_prefix/bin/gtk10-config - fi - fi - if test x$gtk_config_prefix != x ; then - gtk_config_args="$gtk_config_args --prefix=$gtk_config_prefix" - if test x${GTK_CONFIG+set} != xset ; then -- GTK_CONFIG=$gtk_config_prefix/bin/gtk-config -+ GTK_CONFIG=$gtk_config_prefix/bin/gtk10-config - fi - fi - -- AC_PATH_PROG(GTK_CONFIG, gtk-config, no) -+ AC_PATH_PROG(GTK_CONFIG, gtk10-config, no) - min_gtk_version=ifelse([$1], ,0.99.7,$1) - AC_MSG_CHECKING(for GTK - version >= $min_gtk_version) - no_gtk="" |