diff options
author | vanilla <vanilla@FreeBSD.org> | 1999-01-05 08:58:09 +0800 |
---|---|---|
committer | vanilla <vanilla@FreeBSD.org> | 1999-01-05 08:58:09 +0800 |
commit | 7948e7d7c0b0293243378e3921a071e82f775037 (patch) | |
tree | ddf0fd8032bc37d31734334ecc36fd798488815c /x11-toolkits | |
parent | 138213c1423d6af153016849b74142ab099c7493 (diff) | |
download | freebsd-ports-gnome-7948e7d7c0b0293243378e3921a071e82f775037.tar.gz freebsd-ports-gnome-7948e7d7c0b0293243378e3921a071e82f775037.tar.zst freebsd-ports-gnome-7948e7d7c0b0293243378e3921a071e82f775037.zip |
Upgrade to 1.1.12, and I wont upgrade glib11d & gtk11d until I finish all
ports of GNOME.
Diffstat (limited to 'x11-toolkits')
-rw-r--r-- | x11-toolkits/gtk12/Makefile | 8 | ||||
-rw-r--r-- | x11-toolkits/gtk12/distinfo | 2 | ||||
-rw-r--r-- | x11-toolkits/gtk12/files/patch-aa | 35 | ||||
-rw-r--r-- | x11-toolkits/gtk12/files/patch-ad | 71 | ||||
-rw-r--r-- | x11-toolkits/gtk13/Makefile | 8 | ||||
-rw-r--r-- | x11-toolkits/gtk13/distinfo | 2 | ||||
-rw-r--r-- | x11-toolkits/gtk13/files/patch-ad | 71 | ||||
-rw-r--r-- | x11-toolkits/gtk20/Makefile | 8 | ||||
-rw-r--r-- | x11-toolkits/gtk20/distinfo | 2 | ||||
-rw-r--r-- | x11-toolkits/gtk20/files/patch-ad | 71 | ||||
-rw-r--r-- | x11-toolkits/gtk30/Makefile | 8 | ||||
-rw-r--r-- | x11-toolkits/gtk30/distinfo | 2 | ||||
-rw-r--r-- | x11-toolkits/gtk30/files/patch-ad | 71 |
13 files changed, 158 insertions, 201 deletions
diff --git a/x11-toolkits/gtk12/Makefile b/x11-toolkits/gtk12/Makefile index 12d36108ce3a..07a69d4a3f5f 100644 --- a/x11-toolkits/gtk12/Makefile +++ b/x11-toolkits/gtk12/Makefile @@ -1,13 +1,13 @@ # New ports collection makefile for: gtk11-devel -# Version required: 1.1.11 +# Version required: 1.1.12 # Date Created: 28 Sep 1997 # Whom: Vanilla I. Shu <vanilla@MinJe.com.TW> # -# $Id: Makefile,v 1.39 1999/01/01 02:32:05 vanilla Exp $ +# $Id: Makefile,v 1.40 1999/01/04 08:43:06 vanilla Exp $ # -DISTNAME= gtk+-1.1.11 -PKGNAME= gtk-1.1.11 +DISTNAME= gtk+-1.1.12 +PKGNAME= gtk-1.1.12 CATEGORIES= x11-toolkits MASTER_SITES= ftp://ftp.gimp.org/pub/gtk/v1.1/ \ ftp://ftp.cs.umn.edu/pub/gimp/gtk/v1.1/ \ diff --git a/x11-toolkits/gtk12/distinfo b/x11-toolkits/gtk12/distinfo index d1184aa610f3..1c7540bf3766 100644 --- a/x11-toolkits/gtk12/distinfo +++ b/x11-toolkits/gtk12/distinfo @@ -1 +1 @@ -MD5 (gtk+-1.1.11.tar.gz) = 2a0279653501da12e9645944c1293d39 +MD5 (gtk+-1.1.12.tar.gz) = e8430577fe750e463db2238d6190281e diff --git a/x11-toolkits/gtk12/files/patch-aa b/x11-toolkits/gtk12/files/patch-aa index 2d24e5ae0c4f..1339d60e30ee 100644 --- a/x11-toolkits/gtk12/files/patch-aa +++ b/x11-toolkits/gtk12/files/patch-aa @@ -1,5 +1,5 @@ ---- Makefile.in.orig Thu Dec 31 10:00:04 1998 -+++ Makefile.in Fri Jan 1 01:19:24 1999 +--- Makefile.in.orig Mon Jan 4 17:55:18 1999 ++++ Makefile.in Tue Jan 5 07:34:01 1999 @@ -118,9 +118,9 @@ xinput_progs = @xinput_progs@ @@ -104,8 +104,8 @@ uninstall-am install-exec install-data install uninstall all \ installdirs mostlyclean-generic distclean-generic clean-generic \ maintainer-clean-generic clean mostlyclean distclean maintainer-clean ---- gdk/Makefile.in.orig Thu Dec 31 10:00:08 1998 -+++ gdk/Makefile.in Fri Jan 1 01:19:24 1999 +--- gdk/Makefile.in.orig Mon Jan 4 17:55:21 1999 ++++ gdk/Makefile.in Tue Jan 5 07:34:01 1999 @@ -119,7 +119,7 @@ gdkincludedir = $(includedir)/gdk @@ -168,8 +168,8 @@ mostlyclean-binPROGRAMS: ---- gtk/Makefile.in.orig Thu Dec 31 10:00:10 1998 -+++ gtk/Makefile.in Fri Jan 1 01:22:40 1999 +--- gtk/Makefile.in.orig Mon Jan 4 17:55:25 1999 ++++ gtk/Makefile.in Tue Jan 5 07:37:26 1999 @@ -121,7 +121,7 @@ gtkincludedir = $(includedir)/gtk @@ -188,18 +188,19 @@ $(static_SOURCES) \ gtkmarshal.c -@@ -368,8 +368,8 @@ +@@ -369,9 +369,8 @@ ../gdk/gdktypes.h \ ../gdk/gdkrgb.h -libgtk_la_LDFLAGS = \ -- -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -release $(LT_RELEASE) \ +- -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \ +- -release $(LT_RELEASE) \ +libgtk11d_la_LDFLAGS = \ + -version-info 1:2:0 \ - @GLIB_LIBS@ \ - @x_ldflags@ \ - @x_libs@ \ -@@ -422,12 +422,12 @@ + @GLIB_LIBS@ \ + @x_ldflags@ \ + @x_libs@ \ +@@ -424,12 +423,12 @@ # testthreads DEPS = \ @@ -216,7 +217,7 @@ @x_ldflags@ \ @x_libs@ \ @GLIB_LIBS@ \ -@@ -462,8 +462,8 @@ +@@ -464,8 +463,8 @@ X_LIBS = @X_LIBS@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ @@ -227,7 +228,7 @@ gtkalignment.lo gtkarg.lo gtkarrow.lo gtkaspectframe.lo gtkbin.lo \ gtkbindings.lo gtkbbox.lo gtkbox.lo gtkbutton.lo gtkcalendar.lo \ gtkcheckbutton.lo gtkcheckmenuitem.lo gtkclist.lo gtkcolorsel.lo \ -@@ -519,10 +519,10 @@ +@@ -521,10 +520,10 @@ TAR = tar GZIP = --best @@ -241,7 +242,7 @@ .SUFFIXES: .SUFFIXES: .S .c .lo .o .s -@@ -599,8 +599,8 @@ +@@ -601,8 +600,8 @@ maintainer-clean-libtool: @@ -252,8 +253,8 @@ mostlyclean-noinstPROGRAMS: ---- po/Makefile.in.in.orig Sun Jan 3 13:09:51 1999 -+++ po/Makefile.in.in Sun Jan 3 13:10:02 1999 +--- po/Makefile.in.in.orig Mon Jan 4 17:54:31 1999 ++++ po/Makefile.in.in Tue Jan 5 07:34:01 1999 @@ -18,7 +18,7 @@ prefix = @prefix@ diff --git a/x11-toolkits/gtk12/files/patch-ad b/x11-toolkits/gtk12/files/patch-ad index 1625a6dfc3bd..e0851a1a730f 100644 --- a/x11-toolkits/gtk12/files/patch-ad +++ b/x11-toolkits/gtk12/files/patch-ad @@ -1,56 +1,45 @@ ---- gtk/gtkrc.c.orig Fri Dec 18 10:47:54 1998 -+++ gtk/gtkrc.c Fri Jan 1 02:30:53 1999 -@@ -229,13 +229,13 @@ +--- gtk/gtkrc.c.orig Mon Jan 4 17:33:28 1999 ++++ gtk/gtkrc.c Tue Jan 5 07:41:04 1999 +@@ -223,9 +223,9 @@ + var = getenv("GTK_EXE_PREFIX"); if (var) - { -- path = g_malloc(strlen(var) + strlen("/lib/gtk/themes/engines") +1); -- sprintf(path, "%s%s", var, "/lib/gtk/themes/engines"); -+ path = g_malloc(strlen(var) + strlen("/share/themes/engines") +1); -+ sprintf(path, "%s%s", var, "/share/themes/engines"); - } +- path = g_strdup_printf("%s%s", var, "/lib/gtk/themes/engines"); ++ path = g_strdup_printf("%s%s", var, "/share/themes/engines"); else - { -- path = g_malloc(strlen(GTK_EXE_PREFIX) + strlen("/lib/gtk/themes/engines") +1); -- sprintf(path, "%s%s", GTK_EXE_PREFIX, "/lib/gtk/themes/engines"); -+ path = g_malloc(strlen(GTK_EXE_PREFIX) + strlen("/share/themes/engines") +1); -+ sprintf(path, "%s%s", GTK_EXE_PREFIX, "/share/themes/engines"); - } +- path = g_strdup_printf("%s%s", GTK_EXE_PREFIX, "/lib/gtk/themes/engines"); ++ path = g_strdup_printf("%s%s", GTK_EXE_PREFIX, "/share/themes/engines"); + return path; } -@@ -249,13 +249,13 @@ +@@ -238,9 +238,9 @@ + var = getenv("GTK_DATA_PREFIX"); if (var) - { -- path = g_malloc(strlen(var) + strlen("/share/gtk/themes") +1); -- sprintf(path, "%s%s", var, "/share/gtk/themes"); -+ path = g_malloc(strlen(var) + strlen("/share/themes") +1); -+ sprintf(path, "%s%s", var, "/share/themes"); - } +- path = g_strdup_printf("%s%s", var, "/share/gtk/themes"); ++ path = g_strdup_printf("%s%s", var, "/share/themes"); else - { -- path = g_malloc(strlen(GTK_DATA_PREFIX) + strlen("/share/gtk/themes") +1); -- sprintf(path, "%s%s", GTK_DATA_PREFIX, "/share/gtk/themes"); -+ path = g_malloc(strlen(GTK_DATA_PREFIX) + strlen("/share/themes") +1); -+ sprintf(path, "%s%s", GTK_DATA_PREFIX, "/share/themes"); - } +- path = g_strdup_printf("%s%s", GTK_DATA_PREFIX, "/share/gtk/themes"); ++ path = g_strdup_printf("%s%s", GTK_DATA_PREFIX, "/share/themes"); for (n = 0; pixmap_path[n]; n++) ; -@@ -291,13 +291,13 @@ + if (n >= GTK_RC_MAX_PIXMAP_PATHS - 1) +@@ -274,15 +274,15 @@ + var = getenv("GTK_EXE_PREFIX"); if (var) - { -- path = g_malloc(strlen(var) + strlen("/lib/gtk/themes/engines") +1); -- sprintf(path, "%s%s", var, "/lib/gtk/themes/engines"); -+ path = g_malloc(strlen(var) + strlen("/share/themes/engines") +1); -+ sprintf(path, "%s%s", var, "/share/themes/engines"); - } +- path = g_strdup_printf("%s%s", var, "/lib/gtk/themes/engines"); ++ path = g_strdup_printf("%s%s", var, "/share/themes/engines"); else - { -- path = g_malloc(strlen(GTK_EXE_PREFIX) + strlen("/lib/gtk/themes/engines") +1); -- sprintf(path, "%s%s", GTK_EXE_PREFIX, "/lib/gtk/themes/engines"); -+ path = g_malloc(strlen(GTK_EXE_PREFIX) + strlen("/share/themes/engines") +1); -+ sprintf(path, "%s%s", GTK_EXE_PREFIX, "/share/themes/engines"); - } +- path = g_strdup_printf("%s%s", GTK_EXE_PREFIX, "/lib/gtk/themes/engines"); ++ path = g_strdup_printf("%s%s", GTK_EXE_PREFIX, "/share/themes/engines"); + module_path[n++] = g_strdup(path); + g_free(path); + + var = getenv("HOME"); + if (var) +- path = g_strdup_printf("%s%s", var, ".gtk/lib/themes/engines"); ++ path = g_strdup_printf("%s%s", var, ".gtk/themes/engines"); module_path[n++] = g_strdup(path); + module_path[n] = NULL; g_free(path); diff --git a/x11-toolkits/gtk13/Makefile b/x11-toolkits/gtk13/Makefile index 12d36108ce3a..07a69d4a3f5f 100644 --- a/x11-toolkits/gtk13/Makefile +++ b/x11-toolkits/gtk13/Makefile @@ -1,13 +1,13 @@ # New ports collection makefile for: gtk11-devel -# Version required: 1.1.11 +# Version required: 1.1.12 # Date Created: 28 Sep 1997 # Whom: Vanilla I. Shu <vanilla@MinJe.com.TW> # -# $Id: Makefile,v 1.39 1999/01/01 02:32:05 vanilla Exp $ +# $Id: Makefile,v 1.40 1999/01/04 08:43:06 vanilla Exp $ # -DISTNAME= gtk+-1.1.11 -PKGNAME= gtk-1.1.11 +DISTNAME= gtk+-1.1.12 +PKGNAME= gtk-1.1.12 CATEGORIES= x11-toolkits MASTER_SITES= ftp://ftp.gimp.org/pub/gtk/v1.1/ \ ftp://ftp.cs.umn.edu/pub/gimp/gtk/v1.1/ \ diff --git a/x11-toolkits/gtk13/distinfo b/x11-toolkits/gtk13/distinfo index d1184aa610f3..1c7540bf3766 100644 --- a/x11-toolkits/gtk13/distinfo +++ b/x11-toolkits/gtk13/distinfo @@ -1 +1 @@ -MD5 (gtk+-1.1.11.tar.gz) = 2a0279653501da12e9645944c1293d39 +MD5 (gtk+-1.1.12.tar.gz) = e8430577fe750e463db2238d6190281e diff --git a/x11-toolkits/gtk13/files/patch-ad b/x11-toolkits/gtk13/files/patch-ad index 1625a6dfc3bd..e0851a1a730f 100644 --- a/x11-toolkits/gtk13/files/patch-ad +++ b/x11-toolkits/gtk13/files/patch-ad @@ -1,56 +1,45 @@ ---- gtk/gtkrc.c.orig Fri Dec 18 10:47:54 1998 -+++ gtk/gtkrc.c Fri Jan 1 02:30:53 1999 -@@ -229,13 +229,13 @@ +--- gtk/gtkrc.c.orig Mon Jan 4 17:33:28 1999 ++++ gtk/gtkrc.c Tue Jan 5 07:41:04 1999 +@@ -223,9 +223,9 @@ + var = getenv("GTK_EXE_PREFIX"); if (var) - { -- path = g_malloc(strlen(var) + strlen("/lib/gtk/themes/engines") +1); -- sprintf(path, "%s%s", var, "/lib/gtk/themes/engines"); -+ path = g_malloc(strlen(var) + strlen("/share/themes/engines") +1); -+ sprintf(path, "%s%s", var, "/share/themes/engines"); - } +- path = g_strdup_printf("%s%s", var, "/lib/gtk/themes/engines"); ++ path = g_strdup_printf("%s%s", var, "/share/themes/engines"); else - { -- path = g_malloc(strlen(GTK_EXE_PREFIX) + strlen("/lib/gtk/themes/engines") +1); -- sprintf(path, "%s%s", GTK_EXE_PREFIX, "/lib/gtk/themes/engines"); -+ path = g_malloc(strlen(GTK_EXE_PREFIX) + strlen("/share/themes/engines") +1); -+ sprintf(path, "%s%s", GTK_EXE_PREFIX, "/share/themes/engines"); - } +- path = g_strdup_printf("%s%s", GTK_EXE_PREFIX, "/lib/gtk/themes/engines"); ++ path = g_strdup_printf("%s%s", GTK_EXE_PREFIX, "/share/themes/engines"); + return path; } -@@ -249,13 +249,13 @@ +@@ -238,9 +238,9 @@ + var = getenv("GTK_DATA_PREFIX"); if (var) - { -- path = g_malloc(strlen(var) + strlen("/share/gtk/themes") +1); -- sprintf(path, "%s%s", var, "/share/gtk/themes"); -+ path = g_malloc(strlen(var) + strlen("/share/themes") +1); -+ sprintf(path, "%s%s", var, "/share/themes"); - } +- path = g_strdup_printf("%s%s", var, "/share/gtk/themes"); ++ path = g_strdup_printf("%s%s", var, "/share/themes"); else - { -- path = g_malloc(strlen(GTK_DATA_PREFIX) + strlen("/share/gtk/themes") +1); -- sprintf(path, "%s%s", GTK_DATA_PREFIX, "/share/gtk/themes"); -+ path = g_malloc(strlen(GTK_DATA_PREFIX) + strlen("/share/themes") +1); -+ sprintf(path, "%s%s", GTK_DATA_PREFIX, "/share/themes"); - } +- path = g_strdup_printf("%s%s", GTK_DATA_PREFIX, "/share/gtk/themes"); ++ path = g_strdup_printf("%s%s", GTK_DATA_PREFIX, "/share/themes"); for (n = 0; pixmap_path[n]; n++) ; -@@ -291,13 +291,13 @@ + if (n >= GTK_RC_MAX_PIXMAP_PATHS - 1) +@@ -274,15 +274,15 @@ + var = getenv("GTK_EXE_PREFIX"); if (var) - { -- path = g_malloc(strlen(var) + strlen("/lib/gtk/themes/engines") +1); -- sprintf(path, "%s%s", var, "/lib/gtk/themes/engines"); -+ path = g_malloc(strlen(var) + strlen("/share/themes/engines") +1); -+ sprintf(path, "%s%s", var, "/share/themes/engines"); - } +- path = g_strdup_printf("%s%s", var, "/lib/gtk/themes/engines"); ++ path = g_strdup_printf("%s%s", var, "/share/themes/engines"); else - { -- path = g_malloc(strlen(GTK_EXE_PREFIX) + strlen("/lib/gtk/themes/engines") +1); -- sprintf(path, "%s%s", GTK_EXE_PREFIX, "/lib/gtk/themes/engines"); -+ path = g_malloc(strlen(GTK_EXE_PREFIX) + strlen("/share/themes/engines") +1); -+ sprintf(path, "%s%s", GTK_EXE_PREFIX, "/share/themes/engines"); - } +- path = g_strdup_printf("%s%s", GTK_EXE_PREFIX, "/lib/gtk/themes/engines"); ++ path = g_strdup_printf("%s%s", GTK_EXE_PREFIX, "/share/themes/engines"); + module_path[n++] = g_strdup(path); + g_free(path); + + var = getenv("HOME"); + if (var) +- path = g_strdup_printf("%s%s", var, ".gtk/lib/themes/engines"); ++ path = g_strdup_printf("%s%s", var, ".gtk/themes/engines"); module_path[n++] = g_strdup(path); + module_path[n] = NULL; g_free(path); diff --git a/x11-toolkits/gtk20/Makefile b/x11-toolkits/gtk20/Makefile index 12d36108ce3a..07a69d4a3f5f 100644 --- a/x11-toolkits/gtk20/Makefile +++ b/x11-toolkits/gtk20/Makefile @@ -1,13 +1,13 @@ # New ports collection makefile for: gtk11-devel -# Version required: 1.1.11 +# Version required: 1.1.12 # Date Created: 28 Sep 1997 # Whom: Vanilla I. Shu <vanilla@MinJe.com.TW> # -# $Id: Makefile,v 1.39 1999/01/01 02:32:05 vanilla Exp $ +# $Id: Makefile,v 1.40 1999/01/04 08:43:06 vanilla Exp $ # -DISTNAME= gtk+-1.1.11 -PKGNAME= gtk-1.1.11 +DISTNAME= gtk+-1.1.12 +PKGNAME= gtk-1.1.12 CATEGORIES= x11-toolkits MASTER_SITES= ftp://ftp.gimp.org/pub/gtk/v1.1/ \ ftp://ftp.cs.umn.edu/pub/gimp/gtk/v1.1/ \ diff --git a/x11-toolkits/gtk20/distinfo b/x11-toolkits/gtk20/distinfo index d1184aa610f3..1c7540bf3766 100644 --- a/x11-toolkits/gtk20/distinfo +++ b/x11-toolkits/gtk20/distinfo @@ -1 +1 @@ -MD5 (gtk+-1.1.11.tar.gz) = 2a0279653501da12e9645944c1293d39 +MD5 (gtk+-1.1.12.tar.gz) = e8430577fe750e463db2238d6190281e diff --git a/x11-toolkits/gtk20/files/patch-ad b/x11-toolkits/gtk20/files/patch-ad index 1625a6dfc3bd..e0851a1a730f 100644 --- a/x11-toolkits/gtk20/files/patch-ad +++ b/x11-toolkits/gtk20/files/patch-ad @@ -1,56 +1,45 @@ ---- gtk/gtkrc.c.orig Fri Dec 18 10:47:54 1998 -+++ gtk/gtkrc.c Fri Jan 1 02:30:53 1999 -@@ -229,13 +229,13 @@ +--- gtk/gtkrc.c.orig Mon Jan 4 17:33:28 1999 ++++ gtk/gtkrc.c Tue Jan 5 07:41:04 1999 +@@ -223,9 +223,9 @@ + var = getenv("GTK_EXE_PREFIX"); if (var) - { -- path = g_malloc(strlen(var) + strlen("/lib/gtk/themes/engines") +1); -- sprintf(path, "%s%s", var, "/lib/gtk/themes/engines"); -+ path = g_malloc(strlen(var) + strlen("/share/themes/engines") +1); -+ sprintf(path, "%s%s", var, "/share/themes/engines"); - } +- path = g_strdup_printf("%s%s", var, "/lib/gtk/themes/engines"); ++ path = g_strdup_printf("%s%s", var, "/share/themes/engines"); else - { -- path = g_malloc(strlen(GTK_EXE_PREFIX) + strlen("/lib/gtk/themes/engines") +1); -- sprintf(path, "%s%s", GTK_EXE_PREFIX, "/lib/gtk/themes/engines"); -+ path = g_malloc(strlen(GTK_EXE_PREFIX) + strlen("/share/themes/engines") +1); -+ sprintf(path, "%s%s", GTK_EXE_PREFIX, "/share/themes/engines"); - } +- path = g_strdup_printf("%s%s", GTK_EXE_PREFIX, "/lib/gtk/themes/engines"); ++ path = g_strdup_printf("%s%s", GTK_EXE_PREFIX, "/share/themes/engines"); + return path; } -@@ -249,13 +249,13 @@ +@@ -238,9 +238,9 @@ + var = getenv("GTK_DATA_PREFIX"); if (var) - { -- path = g_malloc(strlen(var) + strlen("/share/gtk/themes") +1); -- sprintf(path, "%s%s", var, "/share/gtk/themes"); -+ path = g_malloc(strlen(var) + strlen("/share/themes") +1); -+ sprintf(path, "%s%s", var, "/share/themes"); - } +- path = g_strdup_printf("%s%s", var, "/share/gtk/themes"); ++ path = g_strdup_printf("%s%s", var, "/share/themes"); else - { -- path = g_malloc(strlen(GTK_DATA_PREFIX) + strlen("/share/gtk/themes") +1); -- sprintf(path, "%s%s", GTK_DATA_PREFIX, "/share/gtk/themes"); -+ path = g_malloc(strlen(GTK_DATA_PREFIX) + strlen("/share/themes") +1); -+ sprintf(path, "%s%s", GTK_DATA_PREFIX, "/share/themes"); - } +- path = g_strdup_printf("%s%s", GTK_DATA_PREFIX, "/share/gtk/themes"); ++ path = g_strdup_printf("%s%s", GTK_DATA_PREFIX, "/share/themes"); for (n = 0; pixmap_path[n]; n++) ; -@@ -291,13 +291,13 @@ + if (n >= GTK_RC_MAX_PIXMAP_PATHS - 1) +@@ -274,15 +274,15 @@ + var = getenv("GTK_EXE_PREFIX"); if (var) - { -- path = g_malloc(strlen(var) + strlen("/lib/gtk/themes/engines") +1); -- sprintf(path, "%s%s", var, "/lib/gtk/themes/engines"); -+ path = g_malloc(strlen(var) + strlen("/share/themes/engines") +1); -+ sprintf(path, "%s%s", var, "/share/themes/engines"); - } +- path = g_strdup_printf("%s%s", var, "/lib/gtk/themes/engines"); ++ path = g_strdup_printf("%s%s", var, "/share/themes/engines"); else - { -- path = g_malloc(strlen(GTK_EXE_PREFIX) + strlen("/lib/gtk/themes/engines") +1); -- sprintf(path, "%s%s", GTK_EXE_PREFIX, "/lib/gtk/themes/engines"); -+ path = g_malloc(strlen(GTK_EXE_PREFIX) + strlen("/share/themes/engines") +1); -+ sprintf(path, "%s%s", GTK_EXE_PREFIX, "/share/themes/engines"); - } +- path = g_strdup_printf("%s%s", GTK_EXE_PREFIX, "/lib/gtk/themes/engines"); ++ path = g_strdup_printf("%s%s", GTK_EXE_PREFIX, "/share/themes/engines"); + module_path[n++] = g_strdup(path); + g_free(path); + + var = getenv("HOME"); + if (var) +- path = g_strdup_printf("%s%s", var, ".gtk/lib/themes/engines"); ++ path = g_strdup_printf("%s%s", var, ".gtk/themes/engines"); module_path[n++] = g_strdup(path); + module_path[n] = NULL; g_free(path); diff --git a/x11-toolkits/gtk30/Makefile b/x11-toolkits/gtk30/Makefile index 12d36108ce3a..07a69d4a3f5f 100644 --- a/x11-toolkits/gtk30/Makefile +++ b/x11-toolkits/gtk30/Makefile @@ -1,13 +1,13 @@ # New ports collection makefile for: gtk11-devel -# Version required: 1.1.11 +# Version required: 1.1.12 # Date Created: 28 Sep 1997 # Whom: Vanilla I. Shu <vanilla@MinJe.com.TW> # -# $Id: Makefile,v 1.39 1999/01/01 02:32:05 vanilla Exp $ +# $Id: Makefile,v 1.40 1999/01/04 08:43:06 vanilla Exp $ # -DISTNAME= gtk+-1.1.11 -PKGNAME= gtk-1.1.11 +DISTNAME= gtk+-1.1.12 +PKGNAME= gtk-1.1.12 CATEGORIES= x11-toolkits MASTER_SITES= ftp://ftp.gimp.org/pub/gtk/v1.1/ \ ftp://ftp.cs.umn.edu/pub/gimp/gtk/v1.1/ \ diff --git a/x11-toolkits/gtk30/distinfo b/x11-toolkits/gtk30/distinfo index d1184aa610f3..1c7540bf3766 100644 --- a/x11-toolkits/gtk30/distinfo +++ b/x11-toolkits/gtk30/distinfo @@ -1 +1 @@ -MD5 (gtk+-1.1.11.tar.gz) = 2a0279653501da12e9645944c1293d39 +MD5 (gtk+-1.1.12.tar.gz) = e8430577fe750e463db2238d6190281e diff --git a/x11-toolkits/gtk30/files/patch-ad b/x11-toolkits/gtk30/files/patch-ad index 1625a6dfc3bd..e0851a1a730f 100644 --- a/x11-toolkits/gtk30/files/patch-ad +++ b/x11-toolkits/gtk30/files/patch-ad @@ -1,56 +1,45 @@ ---- gtk/gtkrc.c.orig Fri Dec 18 10:47:54 1998 -+++ gtk/gtkrc.c Fri Jan 1 02:30:53 1999 -@@ -229,13 +229,13 @@ +--- gtk/gtkrc.c.orig Mon Jan 4 17:33:28 1999 ++++ gtk/gtkrc.c Tue Jan 5 07:41:04 1999 +@@ -223,9 +223,9 @@ + var = getenv("GTK_EXE_PREFIX"); if (var) - { -- path = g_malloc(strlen(var) + strlen("/lib/gtk/themes/engines") +1); -- sprintf(path, "%s%s", var, "/lib/gtk/themes/engines"); -+ path = g_malloc(strlen(var) + strlen("/share/themes/engines") +1); -+ sprintf(path, "%s%s", var, "/share/themes/engines"); - } +- path = g_strdup_printf("%s%s", var, "/lib/gtk/themes/engines"); ++ path = g_strdup_printf("%s%s", var, "/share/themes/engines"); else - { -- path = g_malloc(strlen(GTK_EXE_PREFIX) + strlen("/lib/gtk/themes/engines") +1); -- sprintf(path, "%s%s", GTK_EXE_PREFIX, "/lib/gtk/themes/engines"); -+ path = g_malloc(strlen(GTK_EXE_PREFIX) + strlen("/share/themes/engines") +1); -+ sprintf(path, "%s%s", GTK_EXE_PREFIX, "/share/themes/engines"); - } +- path = g_strdup_printf("%s%s", GTK_EXE_PREFIX, "/lib/gtk/themes/engines"); ++ path = g_strdup_printf("%s%s", GTK_EXE_PREFIX, "/share/themes/engines"); + return path; } -@@ -249,13 +249,13 @@ +@@ -238,9 +238,9 @@ + var = getenv("GTK_DATA_PREFIX"); if (var) - { -- path = g_malloc(strlen(var) + strlen("/share/gtk/themes") +1); -- sprintf(path, "%s%s", var, "/share/gtk/themes"); -+ path = g_malloc(strlen(var) + strlen("/share/themes") +1); -+ sprintf(path, "%s%s", var, "/share/themes"); - } +- path = g_strdup_printf("%s%s", var, "/share/gtk/themes"); ++ path = g_strdup_printf("%s%s", var, "/share/themes"); else - { -- path = g_malloc(strlen(GTK_DATA_PREFIX) + strlen("/share/gtk/themes") +1); -- sprintf(path, "%s%s", GTK_DATA_PREFIX, "/share/gtk/themes"); -+ path = g_malloc(strlen(GTK_DATA_PREFIX) + strlen("/share/themes") +1); -+ sprintf(path, "%s%s", GTK_DATA_PREFIX, "/share/themes"); - } +- path = g_strdup_printf("%s%s", GTK_DATA_PREFIX, "/share/gtk/themes"); ++ path = g_strdup_printf("%s%s", GTK_DATA_PREFIX, "/share/themes"); for (n = 0; pixmap_path[n]; n++) ; -@@ -291,13 +291,13 @@ + if (n >= GTK_RC_MAX_PIXMAP_PATHS - 1) +@@ -274,15 +274,15 @@ + var = getenv("GTK_EXE_PREFIX"); if (var) - { -- path = g_malloc(strlen(var) + strlen("/lib/gtk/themes/engines") +1); -- sprintf(path, "%s%s", var, "/lib/gtk/themes/engines"); -+ path = g_malloc(strlen(var) + strlen("/share/themes/engines") +1); -+ sprintf(path, "%s%s", var, "/share/themes/engines"); - } +- path = g_strdup_printf("%s%s", var, "/lib/gtk/themes/engines"); ++ path = g_strdup_printf("%s%s", var, "/share/themes/engines"); else - { -- path = g_malloc(strlen(GTK_EXE_PREFIX) + strlen("/lib/gtk/themes/engines") +1); -- sprintf(path, "%s%s", GTK_EXE_PREFIX, "/lib/gtk/themes/engines"); -+ path = g_malloc(strlen(GTK_EXE_PREFIX) + strlen("/share/themes/engines") +1); -+ sprintf(path, "%s%s", GTK_EXE_PREFIX, "/share/themes/engines"); - } +- path = g_strdup_printf("%s%s", GTK_EXE_PREFIX, "/lib/gtk/themes/engines"); ++ path = g_strdup_printf("%s%s", GTK_EXE_PREFIX, "/share/themes/engines"); + module_path[n++] = g_strdup(path); + g_free(path); + + var = getenv("HOME"); + if (var) +- path = g_strdup_printf("%s%s", var, ".gtk/lib/themes/engines"); ++ path = g_strdup_printf("%s%s", var, ".gtk/themes/engines"); module_path[n++] = g_strdup(path); + module_path[n] = NULL; g_free(path); |