Index: head/x11-toolkits/gtoolkit/Makefile
===================================================================
--- head/x11-toolkits/gtoolkit/Makefile	(revision 71840)
+++ head/x11-toolkits/gtoolkit/Makefile	(revision 71841)
@@ -1,78 +1,74 @@
 # New ports collection makefile for:   gtoolkit
 # Date created:        13 Jan 2002
 # Whom:                Miguel Mendez <flynn@energyhq.homeip.net>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	gtoolkit
 PORTVERSION=	0.9.5
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	ftp://ftp.inf.uos.de/pub/elmar/gtk/objc-gtoolkit/
 
 MAINTAINER=	dinoex@FreeBSD.org
 
 BUILD_DEPENDS=  ${COMBOLIBDIR}/libgnustep-base.so:${PORTSDIR}/lang/gnustep-base
 RUN_DEPENDS=    ${COMBOLIBDIR}/libgnustep-base.so:${PORTSDIR}/lang/gnustep-base
 
 PREFIX=		${LOCALBASE}/GNUstep
 USE_GMAKE=	yes
 USE_GNOMENG=	yes
 USE_GNOME=	gtk12
 GNU_CONFIGURE=	yes
 NO_MTREE=	yes
 
 MAKE_ARGS=	GNUSTEP_SYSTEM_ROOT=$(PREFIX)/System
 CONFIGURE_ARGS+=	--with-gnustep
 INSTALLS_SHLIB=	yes
 WRKSRC= 	${WRKDIR}/${DISTNAME}/GToolKit
 CONFIGURE_WRKSRC=	${WRKDIR}/${DISTNAME}
 
 post-patch:
 	@${MV} ${CONFIGURE_WRKSRC}/configure ${CONFIGURE_WRKSRC}/configure.sed
 	${SED} -e 's#gtk-config#gtk12-config#g' \
 		${CONFIGURE_WRKSRC}/configure.sed \
 		> ${CONFIGURE_WRKSRC}/configure
 	${CHMOD} +x ${CONFIGURE_WRKSRC}/configure
 
 do-configure:
 	@(cd ${CONFIGURE_WRKSRC}; . ${PREFIX}/System/Makefiles/GNUstep.sh; \
 	    if ! ${SETENV} CC="${CC}" CXX="${CXX}" \
 		CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" \
 		INSTALL="/usr/bin/install -c -o ${BINOWN} -g ${BINGRP}" \
 		INSTALL_DATA="${INSTALL} -c" \
 		INSTALL_PROGRAM="${INSTALL} -c" \
 		INSTALL_SCRIPT="${INSTALL_SCRIPT}" \
 		${CONFIGURE_ENV} ./${CONFIGURE_SCRIPT} ${CONFIGURE_ARGS}; then \
 		    ${ECHO} "===>  Script \"${CONFIGURE_SCRIPT}\" failed: here are the contents of \"${CONFIGURE_LOG}\""; \
 		    ${CAT} ${CONFIGURE_LOG}; \
 		    ${ECHO} "(end of \"${CONFIGURE_LOG}\")"; \
 		    ${FALSE}; \
 	    fi)
 
 do-build:
 	@(cd ${WRKSRC}; . ${PREFIX}/System/Makefiles/GNUstep.sh; \
 		${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${ALL_TARGET})
 
 do-install:
 	@(cd ${WRKSRC}; . ${PREFIX}/System/Makefiles/GNUstep.sh; \
 		${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${INSTALL_TARGET})
 
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} > 500030
-BROKEN=		conflicts with new gcc, method definition not in class context
-.endif
-
 .if ${MACHINE_ARCH} == "i386"
 GNU_ARCH=	ix86
 .else
 GNU_ARCH=	${MACHINE_ARCH}
 .endif
 PLIST_SUB+=	GNU_ARCH=${GNU_ARCH} OPSYS=${OPSYS:L} VERSION=${PORTVERSION}
 
 SYSTEMDIR=	${PREFIX}/System
 SYSLIBDIR=	${SYSTEMDIR}/Libraries/${GNU_ARCH}/${OPSYS:L}
 COMBOLIBDIR=	${SYSLIBDIR}/gnu-gnu-gnu
 
 .include <bsd.port.post.mk>

Property changes on: head/x11-toolkits/gtoolkit/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.9
\ No newline at end of property
+1.10
\ No newline at end of property
Index: head/x11-toolkits/gtoolkit/files/patch-GToolKit.m
===================================================================
--- head/x11-toolkits/gtoolkit/files/patch-GToolKit.m	(nonexistent)
+++ head/x11-toolkits/gtoolkit/files/patch-GToolKit.m	(revision 71841)
@@ -0,0 +1,58 @@
+--- GToolKit.m.orig	Thu Feb 21 16:43:52 2002
++++ GToolKit.m	Wed Dec 25 11:12:44 2002
+@@ -2550,6 +2550,17 @@
+ #include <GToolKit/GTKWidget.h>
+ #include <GToolKit/GTKAccelGroup.h>
+ 
++#ifdef HAVE_CONFIG_H
++#include "config.h"
++#endif
++
++#include <stdio.h>
++#include <string.h>
++#include <Foundation/NSAutoreleasePool.h>
++#if defined (DEBUG) && defined (HAVE_OBJC_OBJC_API_H)
++#include <objc/objc-api.h>
++#endif
++
+ @implementation GTKItemFactory
+ + (GtkType) getType
+ {
+@@ -2651,16 +2662,6 @@
+ {
+     gtk_item_factory_set_translate_func(gtk, func , data , notify);
+ }
+-#ifdef HAVE_CONFIG_H
+-#include "config.h"
+-#endif
+-
+-#include <stdio.h>
+-#include <string.h>
+-#include <Foundation/NSAutoreleasePool.h>
+-#if defined (DEBUG) && defined (HAVE_OBJC_OBJC_API_H)
+-#include <objc/objc-api.h>
+-#endif
+ 
+ 
+ static void item_forward_signal (gpointer data, guint action, GtkWidget *widget)
+@@ -6376,6 +6377,10 @@
+ #include <GToolKit/GTKWidget.h>
+ #include <GToolKit/GTKAccelGroup.h>
+ 
++#include <gtk/gtksignal.h>
++#include <Foundation/NSAutoreleasePool.h>
++#include <Foundation/NSNotification.h>
++
+ @implementation GTKWindow
+ + (GtkType) getType
+ {
+@@ -6437,9 +6442,6 @@
+ {
+     gtk_window_set_modal(gtk, modal);
+ }
+-#include <gtk/gtksignal.h>
+-#include <Foundation/NSAutoreleasePool.h>
+-#include <Foundation/NSNotification.h>
+ 
+ 
+ NSString *GTKWindowDidBecomeMainNotification = @"GTKWindowDidBecomeMain";

Property changes on: head/x11-toolkits/gtoolkit/files/patch-GToolKit.m
___________________________________________________________________
Added: cvs2svn:cvs-rev
## -0,0 +1 ##
+1.1
\ No newline at end of property
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property