Changes 1.11.2:

   * Support for GNUstep.conf and relocation of the filesystem is much
     improved in this release.

   * The WM_QUIT message is now intercepted to allow an application to
     terminate cleanly.

   * NSMessagePort was implemented on Windows platforms.

   * Deprecated support for system-wide GNUsteprc files has been
     removed.

   * Some support for keeping user defaults in the Windows registry
     implemented.

6 files changed, 28 insertions, 30 deletions

diff --git a/devel/gnustep-base/Makefile b/devel/gnustep-base/Makefile
index c36df05b81e..3c3d62cb5b6 100644
--- a/devel/gnustep-base/Makefile
+++ b/devel/gnustep-base/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.28 2005/12/05 20:50:04 rillig Exp $
+# $NetBSD: Makefile,v 1.29 2006/01/17 07:38:34 adam Exp $
 
-DISTNAME=	gnustep-base-1.11.1
+DISTNAME=	gnustep-base-1.11.2
 CATEGORIES=	devel gnustep
 MASTER_SITES=	${MASTER_SITE_GNUSTEP:=core/}
 
@@ -10,16 +10,17 @@ COMMENT=	GNUstep foundation classes
 
 PTHREAD_LIBS=		-lpthread
 
+GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--exec-prefix=${PREFIX}/libexec/GNUstep
 CONFIGURE_ENV+=		INSTALL_PROGRAM=${INSTALL_SCRIPT:Q}
 
+SUBST_CLASSES+=		pthread
+SUBST_STAGE.pthread=	pre-configure
+SUBST_FILES.pthread=	configure base.make.in
+SUBST_SED.pthread=	-e 's|@PTHREAD_LIBS@|${PTHREAD_LIBS}|g'
+
 pre-configure:
 	${SED} 's|@PREFIX@|${PREFIX}|g' <${FILESDIR}/openapp >${WRKDIR}/openapp
-.for pfile in configure base.make.in
-	${CP} ${WRKSRC}/${pfile} ${WRKSRC}/${pfile}.tmpl
-	${SED} 's|@PTHREAD_LIBS@|${PTHREAD_LIBS}|g'			\
-		<${WRKSRC}/${pfile}.tmpl >${WRKSRC}/${pfile}
-.endfor
 
 post-install:
 	${INSTALL_SCRIPT} ${WRKDIR}/openapp ${PREFIX}/bin
diff --git a/devel/gnustep-base/PLIST b/devel/gnustep-base/PLIST
index 5b24c92a36d..0e0e60eabef 100644
--- a/devel/gnustep-base/PLIST
+++ b/devel/gnustep-base/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.13 2005/09/30 23:13:57 rh Exp $
+@comment $NetBSD: PLIST,v 1.14 2006/01/17 07:38:34 adam Exp $
 bin/openapp
 share/GNUstep/System/Library/Bundles/SSL.bundle/Resources/Info-gnustep.plist
 share/GNUstep/System/Library/Bundles/SSL.bundle/SSL
@@ -10,6 +10,7 @@ share/GNUstep/System/Library/DTDs/gsdoc-1_0_0.dtd
 share/GNUstep/System/Library/DTDs/gsdoc-1_0_1.dtd
 share/GNUstep/System/Library/DTDs/gsdoc-1_0_1.rnc
 share/GNUstep/System/Library/DTDs/gsdoc-1_0_2.dtd
+share/GNUstep/System/Library/DTDs/gsdoc-1_0_3.dtd
 share/GNUstep/System/Library/DTDs/plist-0_9.dtd
 share/GNUstep/System/Library/Documentation/man/man1/autogsdoc.1
 share/GNUstep/System/Library/Documentation/man/man1/cvtenc.1
@@ -106,8 +107,6 @@ share/GNUstep/System/Library/Headers/GNUstepBase/GSLocale.h
 share/GNUstep/System/Library/Headers/GNUstepBase/GSLock.h
 share/GNUstep/System/Library/Headers/GNUstepBase/GSMime.h
 share/GNUstep/System/Library/Headers/GNUstepBase/GSObjCRuntime.h
-share/GNUstep/System/Library/Headers/GNUstepBase/GSRunLoopCtxt.h
-share/GNUstep/System/Library/Headers/GNUstepBase/GSRunLoopWatcher.h
 share/GNUstep/System/Library/Headers/GNUstepBase/GSUnion.h
 share/GNUstep/System/Library/Headers/GNUstepBase/GSXML.h
 share/GNUstep/System/Library/Headers/GNUstepBase/Unicode.h
@@ -132,8 +131,6 @@ share/GNUstep/System/Library/Headers/gnustep/base/GSLocale.h
 share/GNUstep/System/Library/Headers/gnustep/base/GSLock.h
 share/GNUstep/System/Library/Headers/gnustep/base/GSMime.h
 share/GNUstep/System/Library/Headers/gnustep/base/GSObjCRuntime.h
-share/GNUstep/System/Library/Headers/gnustep/base/GSRunLoopCtxt.h
-share/GNUstep/System/Library/Headers/gnustep/base/GSRunLoopWatcher.h
 share/GNUstep/System/Library/Headers/gnustep/base/GSUnion.h
 share/GNUstep/System/Library/Headers/gnustep/base/GSXML.h
 share/GNUstep/System/Library/Headers/gnustep/base/Unicode.h
diff --git a/devel/gnustep-base/buildlink3.mk b/devel/gnustep-base/buildlink3.mk
index 0f9bd56fdc3..4ffd1d66111 100644
--- a/devel/gnustep-base/buildlink3.mk
+++ b/devel/gnustep-base/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2005/07/29 12:58:37 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2006/01/17 07:38:34 adam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 GNUSTEP_BASE_BUILDLINK3_MK:=	${GNUSTEP_BASE_BUILDLINK3_MK}+
@@ -61,4 +61,4 @@ PRINT_PLIST_AWK+=	/^@exec \$${MKDIR} %D\/share\/GNUstep\/System\/Library\/Librar
 .include "../../security/openssl/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
 
-BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
diff --git a/devel/gnustep-base/distinfo b/devel/gnustep-base/distinfo
index c50779238a1..fa8c574aadb 100644
--- a/devel/gnustep-base/distinfo
+++ b/devel/gnustep-base/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.17 2005/10/13 14:00:51 joerg Exp $
+$NetBSD: distinfo,v 1.18 2006/01/17 07:38:34 adam Exp $
 
-SHA1 (gnustep-base-1.11.1.tar.gz) = c0c284d434a101e321b035ebbe12049bd251b1d3
-RMD160 (gnustep-base-1.11.1.tar.gz) = dc367da814719643b3ea0465c809f7f0dfef38b2
-Size (gnustep-base-1.11.1.tar.gz) = 2006854 bytes
-SHA1 (patch-aa) = 3ffaf85eb43ac0be31790e7ec9602ff08cdbc7ae
+SHA1 (gnustep-base-1.11.2.tar.gz) = 4c9ffbf9a24a8ac227fe3ef0250bb92adcf2c0c3
+RMD160 (gnustep-base-1.11.2.tar.gz) = 70ac09640cbc451fa2a8667f6617e89a70621ec8
+Size (gnustep-base-1.11.2.tar.gz) = 2048903 bytes
+SHA1 (patch-aa) = 402525587117e9bca6c7c38479adbb39ad45d906
 SHA1 (patch-ab) = 51b4273874c6f66a4c6ee6c7e78de7eadc9e7c95
 SHA1 (patch-ac) = 0fe1b14c0d016e9279df84aaa26142b8ed06e63f
 SHA1 (patch-ae) = f249ee724e9b1eb7aa2967a8f5d3993e0bbcca46
-SHA1 (patch-af) = 90c356ccaac3b4ad1869548769a252c1d69e7aa4
+SHA1 (patch-af) = 16db471d87a5e12a818779a5ceae6519cd75e3b1
diff --git a/devel/gnustep-base/patches/patch-aa b/devel/gnustep-base/patches/patch-aa
index a503bb6ca31..bac0b02d35b 100644
--- a/devel/gnustep-base/patches/patch-aa
+++ b/devel/gnustep-base/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.8 2005/07/29 12:58:37 adam Exp $
+$NetBSD: patch-aa,v 1.9 2006/01/17 07:38:34 adam Exp $
 
---- configure.orig	2005-03-18 09:42:53.000000000 +0000
+--- configure.orig	2005-12-06 06:50:25.000000000 +0100
 +++ configure
-@@ -2728,12 +2728,12 @@ echo $ECHO_N "checking the Objective-C r
+@@ -2948,12 +2948,12 @@ echo $ECHO_N "checking the Objective-C r
  if test "$OBJC_RUNTIME_LIB" = "nx" -o "$OBJC_RUNTIME_LIB" = "apple"; then
    echo "$as_me:$LINENO: result: NeXT" >&5
  echo "${ECHO_T}NeXT" >&6
@@ -17,12 +17,12 @@ $NetBSD: patch-aa,v 1.8 2005/07/29 12:58:37 adam Exp $
    OBJCFLAGS="-fgnu-runtime"
  fi
  
-@@ -2757,7 +2757,7 @@ fi
+@@ -2977,7 +2977,7 @@ fi
  # $GNUSTEP_HDIR are used before the standard ones
  #
- CPPFLAGS="$CPPFLAGS -I$GNUSTEP_HDIR"
--LDFLAGS="$LDFLAGS -L$GNUSTEP_LDIR/$LIBRARY_COMBO -L$GNUSTEP_LDIR"
-+LDFLAGS="$LDFLAGS -L$GNUSTEP_LDIR/$LIBRARY_COMBO -Wl,-R$GNUSTEP_LDIR/$LIBRARY_COMBO -L$GNUSTEP_LDIR -Wl,-R$GNUSTEP_LDIR"
+ INCLUDE_FLAGS="$INCLUDE_FLAGS -I$GNUSTEP_HDIR"
+-LDIR_FLAGS="$LDIR_FLAGS -L$GNUSTEP_LDIR/$LIBRARY_COMBO -L$GNUSTEP_LDIR"
++LDIR_FLAGS="$LDIR_FLAGS -L$GNUSTEP_LDIR/$LIBRARY_COMBO -Wl,-R$GNUSTEP_LDIR/$LIBRARY_COMBO -L$GNUSTEP_LDIR -Wl,-R$GNUSTEP_LDIR"
  
  #--------------------------------------------------------------------
  # Check if Objective-C is installed
diff --git a/devel/gnustep-base/patches/patch-af b/devel/gnustep-base/patches/patch-af
index 4699d7c5493..b2964c3bf3a 100644
--- a/devel/gnustep-base/patches/patch-af
+++ b/devel/gnustep-base/patches/patch-af
@@ -1,8 +1,8 @@
-$NetBSD: patch-af,v 1.1 2005/10/13 14:00:51 joerg Exp $
+$NetBSD: patch-af,v 1.2 2006/01/17 07:38:34 adam Exp $
 
---- Source/GSHTTPURLHandle.m.orig	2005-07-22 17:32:11.000000000 +0000
+--- Source/GSHTTPURLHandle.m.orig	2005-11-05 06:58:43.000000000 +0100
 +++ Source/GSHTTPURLHandle.m
-@@ -1039,8 +1039,6 @@ static void debugWrite(GSHTTPURLHandle *
+@@ -1152,8 +1152,6 @@ static void debugWrite(GSHTTPURLHandle *
  	}
        if (sock == nil)
  	{