Upgrade to 1.1.9.

4 files changed, 79 insertions, 10 deletions

diff --git a/x11-toolkits/gtk20/Makefile b/x11-toolkits/gtk20/Makefile
index b1baf0547860..820c07883343 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.7
+# Version required:		1.1.9
 # Date Created:			28 Sep 1997
 # Whom:				Vanilla I. Shu <vanilla@MinJe.com.TW>
 #
-# $Id: Makefile,v 1.34 1998/12/22 07:56:14 asami Exp $
+# $Id: Makefile,v 1.35 1998/12/22 09:06:28 asami Exp $
 #
 
-DISTNAME=	gtk+-1.1.7
-PKGNAME=	gtk-1.1.7
+DISTNAME=	gtk+-1.1.9
+PKGNAME=	gtk-1.1.9
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	ftp://ftp.gimp.org/pub/gtk/v1.1/ \
 		ftp://ftp.cs.umn.edu/pub/gimp/gtk/v1.1/ \
@@ -15,17 +15,19 @@ MASTER_SITES=	ftp://ftp.gimp.org/pub/gtk/v1.1/ \
 
 MAINTAINER=	vanilla@FreeBSD.ORG
 
+RUN_DEPENDS=	gettext:${PORTSDIR}/devel/gettext
 LIB_DEPENDS=	glib11d.1:${PORTSDIR}/devel/glib11-devel
 
 USE_X_PREFIX=	yes
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} <= 300000
-BROKEN=		requires perl5
+USE_PERL5=	yes
 .endif
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	INSTALL='$${INSTALL} -c' \
-		GLIB_CONFIG="${LOCALBASE}/bin/glib11d-config"
+		GLIB_CONFIG="${LOCALBASE}/bin/glib11d-config" \
+		CPPFLAGS="-I${LOCALBASE}/include"
 CONFIGURE_ARGS=	--includedir=${PREFIX}/include/gtk11d
 
 post-install:
diff --git a/x11-toolkits/gtk20/distinfo b/x11-toolkits/gtk20/distinfo
index 072f73bca142..8e06e730ee13 100644
--- a/x11-toolkits/gtk20/distinfo
+++ b/x11-toolkits/gtk20/distinfo
@@ -1 +1 @@
-MD5 (gtk+-1.1.7.tar.gz) = 751cbeb13fb579626b7fec33ff9a10ee
+MD5 (gtk+-1.1.9.tar.gz) = dc66f1faba2462f6b6b9e3c0f9a43805
diff --git a/x11-toolkits/gtk20/files/patch-ad b/x11-toolkits/gtk20/files/patch-ad
new file mode 100644
index 000000000000..4825e812d250
--- /dev/null
+++ b/x11-toolkits/gtk20/files/patch-ad
@@ -0,0 +1,67 @@
+--- gtk/gtkrc.c.orig	Wed Dec 16 09:42:10 1998
++++ gtk/gtkrc.c	Sun Dec 27 01:04:11 1998
+@@ -26,6 +26,10 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ 
++#ifdef X_LOCALE
++#include <locale.h>
++#endif
++
+ #include "gtkrc.h"
+ #include "gtkbindings.h"
+ #include "gtkthemes.h"
+@@ -228,13 +232,13 @@
+   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");
+     }
+   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");
+     }
+   return path;
+ }
+@@ -248,13 +252,13 @@
+   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");
+     }
+   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");
+     }
+   
+   for (n = 0; pixmap_path[n]; n++) ;
+@@ -290,13 +294,13 @@
+   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");
+     }
+   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");
+     }
+   module_path[n++] = g_strdup(path);
+   g_free(path);
diff --git a/x11-toolkits/gtk20/pkg-plist b/x11-toolkits/gtk20/pkg-plist
index 4bbc747f9bf4..8793d6985823 100644
--- a/x11-toolkits/gtk20/pkg-plist
+++ b/x11-toolkits/gtk20/pkg-plist
@@ -35,7 +35,6 @@ include/gtk11d/gtk/gtkdebug.h
 include/gtk11d/gtk/gtkdialog.h
 include/gtk11d/gtk/gtkdnd.h
 include/gtk11d/gtk/gtkdrawingarea.h
-include/gtk11d/gtk/gtkdrawwindow.h
 include/gtk11d/gtk/gtkeditable.h
 include/gtk11d/gtk/gtkentry.h
 include/gtk11d/gtk/gtkenums.h
@@ -58,6 +57,7 @@ include/gtk11d/gtk/gtkhseparator.h
 include/gtk11d/gtk/gtkimage.h
 include/gtk11d/gtk/gtkinputdialog.h
 include/gtk11d/gtk/gtkinvisible.h
+include/gtk11d/gtk/gtkintl.h
 include/gtk11d/gtk/gtkitem.h
 include/gtk11d/gtk/gtkitemfactory.h
 include/gtk11d/gtk/gtklabel.h
@@ -123,11 +123,11 @@ include/gtk11d/gtk/gtkwindow.h
 lib/libgdk11d.a
 lib/libgdk11d.la
 lib/libgdk11d.so
-lib/libgdk11d.so.1
+lib/libgdk11d.so.1.1
 lib/libgtk11d.a
 lib/libgtk11d.la
 lib/libgtk11d.so
-lib/libgtk11d.so.1
+lib/libgtk11d.so.1.1
 @unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
 @exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
 share/themes/Default/gtk/gtkrc