Changes 0.10.0:

   * Nib loading supports window auto-positioning

   * Keyed encoding is supported in many classes.

6 files changed, 15 insertions, 100 deletions

diff --git a/x11/gnustep-gui/Makefile b/x11/gnustep-gui/Makefile
index 1abff14cdb6..84b16535a83 100644
--- a/x11/gnustep-gui/Makefile
+++ b/x11/gnustep-gui/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.23 2005/06/01 18:03:29 jlam Exp $
+# $NetBSD: Makefile,v 1.24 2005/07/29 12:59:25 adam Exp $
 
-DISTNAME=	gnustep-gui-0.9.5
+DISTNAME=	gnustep-gui-0.10.0
 CATEGORIES=	x11 gnustep
 MASTER_SITES=	${MASTER_SITE_GNUSTEP:=core/}
 
@@ -13,20 +13,9 @@ CONFIGURE_ARGS+=	--exec-prefix=${PREFIX}/libexec/GNUstep
 .include "../../audio/libaudiofile/buildlink3.mk"
 .include "../../devel/gnustep-base/buildlink3.mk"
 .include "../../graphics/jpeg/buildlink3.mk"
+.include "../../graphics/libungif/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
-
-.include "../../mk/ossaudio.buildlink3.mk"
-
-.if !empty(HAVE_OSS:M[Nn][Oo]) && !exists(/usr/include/soundcard.h) && \
-    !exists(/usr/include/sys/soundcard.h) &&				\
-    !exists(/usr/include/machine/soundcard.h)
-CONFIGURE_ARGS+=--disable-gsnd
-PLIST_SUBST+=	GSND="@comment "
-.else
-PLIST_SUBST+=	GSND=
-.endif
-
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/x11.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/gnustep-gui/PLIST b/x11/gnustep-gui/PLIST
index 4a934badc90..bede9f8bbeb 100644
--- a/x11/gnustep-gui/PLIST
+++ b/x11/gnustep-gui/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.10 2005/04/12 15:54:21 adam Exp $
+@comment $NetBSD: PLIST,v 1.11 2005/07/29 12:59:25 adam Exp $
 share/GNUstep/System/Library/Bundles/GSPrinting/GSLPR.bundle/GSLPR
 share/GNUstep/System/Library/Bundles/GSPrinting/GSLPR.bundle/Resources/Info-gnustep.plist
 share/GNUstep/System/Library/Bundles/GSPrinting/GSLPR.bundle/stamp.make
@@ -367,7 +367,6 @@ share/GNUstep/System/Library/PostScript/GSProlog.ps
 share/GNUstep/System/Library/PostScript/PPD/English.lproj/Generic-PostScript_Printer-Postscript.ppd
 share/GNUstep/System/Library/Services/GSspell.service/GSspell
 share/GNUstep/System/Library/Services/GSspell.service/Resources/Info-gnustep.plist
-${GSND}share/GNUstep/System/Tools/gnustep_sndd
 share/GNUstep/System/Tools/gopen
 share/GNUstep/System/Tools/make_services
 share/GNUstep/System/Tools/set_show_service
diff --git a/x11/gnustep-gui/buildlink3.mk b/x11/gnustep-gui/buildlink3.mk
index 158436e68e8..a8771e321d0 100644
--- a/x11/gnustep-gui/buildlink3.mk
+++ b/x11/gnustep-gui/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2004/12/28 23:18:21 reed Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2005/07/29 12:59:25 adam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 GNUSTEP_GUI_BUILDLINK3_MK:=	${GNUSTEP_GUI_BUILDLINK3_MK}+
@@ -45,6 +45,7 @@ PRINT_PLIST_AWK+=	/^@exec \$${MKDIR} %D\/share\/GNUstep\/System\/Library\/Servic
 .include "../../audio/libaudiofile/buildlink3.mk"
 .include "../../devel/gnustep-base/buildlink3.mk"
 .include "../../graphics/jpeg/buildlink3.mk"
+.include "../../graphics/libungif/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
 
diff --git a/x11/gnustep-gui/distinfo b/x11/gnustep-gui/distinfo
index 31fb01844cc..bdaee29ff32 100644
--- a/x11/gnustep-gui/distinfo
+++ b/x11/gnustep-gui/distinfo
@@ -1,8 +1,7 @@
-$NetBSD: distinfo,v 1.10 2005/04/12 15:54:21 adam Exp $
+$NetBSD: distinfo,v 1.11 2005/07/29 12:59:25 adam Exp $
 
-SHA1 (gnustep-gui-0.9.5.tar.gz) = 43081179826d08651a21ddb3a84a2edd9eff8a80
-RMD160 (gnustep-gui-0.9.5.tar.gz) = 1a185500af2708deb94a575ef6513e8cbef406fa
-Size (gnustep-gui-0.9.5.tar.gz) = 1876715 bytes
-SHA1 (patch-aa) = 90a11283fdfe30abbf6205a40c62054a3b80f840
+SHA1 (gnustep-gui-0.10.0.tar.gz) = 5b8937fee3cf3d9fa3c70c5f833290d1fab94559
+RMD160 (gnustep-gui-0.10.0.tar.gz) = 7ea9dc01ad4f287db8c93ec1e5fea1dedd06e351
+Size (gnustep-gui-0.10.0.tar.gz) = 1488765 bytes
 SHA1 (patch-ab) = 3a0aad91274707c1f935db754dda90b1f6f04d3b
-SHA1 (patch-ac) = 3e30333d462613faf2cedcc6a0b92638aabdc1d6
+SHA1 (patch-ac) = ad486b1e2a751475c2f8bb118f8452c38273053a
diff --git a/x11/gnustep-gui/patches/patch-aa b/x11/gnustep-gui/patches/patch-aa
deleted file mode 100644
index fd3dbf93260..00000000000
--- a/x11/gnustep-gui/patches/patch-aa
+++ /dev/null
@@ -1,73 +0,0 @@
-$NetBSD: patch-aa,v 1.3 2005/04/12 15:54:21 adam Exp $
-
---- Tools/gsnd/portaudio/pa_unix_oss/pa_unix_oss.c.orig	2005-03-21 16:25:28.000000000 +0000
-+++ Tools/gsnd/portaudio/pa_unix_oss/pa_unix_oss.c
-@@ -580,8 +580,10 @@ static int PaHost_CanaryProc( PaHostSoun
- static PaError PaHost_WatchDogProc( PaHostSoundControl   *pahsc )
- {
-     PaError               result = 0;
-+#ifndef _PTH_PTHREAD_H_
-     struct sched_param    schp = { 0 };
-     int                   maxPri;
-+#endif
- 
- #ifdef GNUSTEP
-     GSRegisterCurrentThread(); /* SB20010904 */
-@@ -589,6 +591,7 @@ static PaError PaHost_WatchDogProc( PaHo
-     
- /* Run at a priority level above audio thread so we can still run if it hangs. */
- /* Rise more than 1 because of rumored off-by-one scheduler bugs. */
-+#ifndef _PTH_PTHREAD_H_
-     schp.sched_priority = pahsc->pahsc_AudioPriority + 4;
-     maxPri = sched_get_priority_max(SCHEDULER_POLICY);
-     if( schp.sched_priority > maxPri ) schp.sched_priority = maxPri;
-@@ -598,6 +601,7 @@ static PaError PaHost_WatchDogProc( PaHo
-         ERR_RPT(("PaHost_WatchDogProc: cannot set watch dog priority!\n"));
-         goto killAudio;
-     }
-+#endif
-     
-     /* Compare watchdog time with audio and canary thread times. */
-     /* Sleep for a while or until thread cancelled. */
-@@ -633,6 +637,7 @@ static PaError PaHost_WatchDogProc( PaHo
-     return 0;
-     
- lowerAudio:
-+#ifndef _PTH_PTHREAD_H_
-     {
-         struct sched_param    schat = { 0 };
-         if( sched_setscheduler(pahsc->pahsc_AudioThreadPID, SCHED_OTHER, &schat) != 0)
-@@ -646,6 +651,7 @@ lowerAudio:
-             goto cleanup;
-         }
-     }
-+#endif
-     
- killAudio:
-     ERR_RPT(("PaHost_WatchDogProc: killing hung audio thread!\n"));
-@@ -740,7 +746,9 @@ static PaError PaHost_BoostPriority( int
- {
-     PaHostSoundControl  *pahsc;
-     PaError              result = paNoError;
-+#ifndef _PTH_PTHREAD_H_
-     struct sched_param   schp = { 0 };
-+#endif
-     
-     pahsc = (PaHostSoundControl *) past->past_DeviceData;
-     if( pahsc == NULL ) return paInternalError;
-@@ -748,6 +756,7 @@ static PaError PaHost_BoostPriority( int
-     pahsc->pahsc_AudioThreadPID = getpid();
-     DBUG(("PaHost_BoostPriority: audio PID = %d\n", pahsc->pahsc_AudioThreadPID ));
-     
-+#ifndef _PTH_PTHREAD_H_
-     /* Choose a priority in the middle of the range. */
-     pahsc->pahsc_AudioPriority = (sched_get_priority_max(SCHEDULER_POLICY) -
-                                   sched_get_priority_min(SCHEDULER_POLICY)) / 2;
-@@ -763,6 +772,7 @@ static PaError PaHost_BoostPriority( int
-         /* We are running at high priority so we should have a watchdog in case audio goes wild. */
-         result = PaHost_StartWatchDog( pahsc );
-     }
-+#endif
-     
-     return result;
- }
diff --git a/x11/gnustep-gui/patches/patch-ac b/x11/gnustep-gui/patches/patch-ac
index d0d7e37b658..510e12fe796 100644
--- a/x11/gnustep-gui/patches/patch-ac
+++ b/x11/gnustep-gui/patches/patch-ac
@@ -1,9 +1,9 @@
-$NetBSD: patch-ac,v 1.1.1.1 2002/09/27 15:24:36 rh Exp $
+$NetBSD: patch-ac,v 1.2 2005/07/29 12:59:25 adam Exp $
 
---- Tools/gsnd/GNUmakefile.preamble.orig	Wed Jul 31 07:19:05 2002
+--- Tools/gsnd/GNUmakefile.preamble.orig	2005-07-01 20:54:03.000000000 +0000
 +++ Tools/gsnd/GNUmakefile.preamble
-@@ -24,7 +24,7 @@
- ADDITIONAL_INCLUDE_DIRS += -Iportaudio/pa_common
+@@ -26,7 +26,7 @@
+ #ADDITIONAL_INCLUDE_DIRS +=
  
  # Additional LDFLAGS to pass to the linker
 -#ADDITIONAL_LDFLAGS +=