 @@ -1,40 +1,42 @@
-# $NetBSD: Makefile,v 1.20 2010/01/24 13:26:12 wiz Exp $
+# $NetBSD: Makefile,v 1.21 2012/10/22 23:47:15 rh Exp $
+#
 DISTNAME=	burn-0.4.1
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	sysutils gnustep
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=gsburn/}
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://gsburn.sourceforge.net/
 COMMENT=	GNUstep based CD burning program
 LICENSE=	gnu-gpl-v2
 DEPENDS+=	cdparanoia>=3.0.9.8:../../audio/cdparanoia
 DEPENDS+=	cdrtools>=1.10:../../sysutils/cdrtools
 DEPENDS+=	cdrdao>=1.1.5:../../sysutils/cdrdao
 DEPENDS+=	gworkspace-[0-9]*:../../sysutils/gworkspace
 PKG_DESTDIR_SUPPORT=	user-destdir
 NO_CONFIGURE=	YES
 MAKE_FILE=	GNUmakefile
 USE_TOOLS+=	gmake
 USE_LANGUAGES=	objc
 WRKSRC=		${WRKDIR}/Burn
 MAKE_JOBS_SAFE=	no
 MAKE_ENV+=	ADDITIONAL_CPPFLAGS=-D_POSIX_SOURCE
 MAKE_ENV+=	ADDITIONAL_LDFLAGS=-lutil
 FIX_GNUSTEP_INSTALLATION_DIR=	yes
 SUBST_FILES.gnustep_installation_dir+=	Bundles/CDparanoia/GNUmakefile
 SUBST_FILES.gnustep_installation_dir+=	Bundles/CDrecord/GNUmakefile
 SUBST_FILES.gnustep_installation_dir+=	Bundles/MkIsoFs/GNUmakefile
 .include "../../devel/gnustep-make/gnustep.mk"
 do-configure:
 	${LN} -s AudioCD ${BUILDLINK_DIR.cdplayer}/include/CDPlayer
 .include "../../audio/cdplayer/buildlink3.mk"
 .include "../../x11/gnustep-back/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

 @@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.2 2009/04/25 12:07:04 rh Exp $
+$NetBSD: distinfo,v 1.3 2012/10/22 23:47:15 rh Exp $
 SHA1 (burn-0.4.1.tar.gz) = 7beb4610a8ca8ff6eb84e905f962d71dcc28a59b
 RMD160 (burn-0.4.1.tar.gz) = 9b2b794b2e607d7a627e23ee45bf61dd74e0074a
 Size (burn-0.4.1.tar.gz) = 554243 bytes
-SHA1 (patch-aa) = 5c306e0fe5a7bc154494c04fd00d6c888388f30a
+SHA1 (patch-aa) = 7276928e9c9a590810ba6eb9294701780ce42f25
-SHA1 (patch-ab) = 0d22bb31aa041e656f317f4ce68bf6b9d937bc32
+SHA1 (patch-ab) = 465cd737ba5b24390599de3c8b6587088e6b3030
-SHA1 (patch-ac) = bdc2e026e1ae6192f1df6a902a3e3ca3f2797b5c
+SHA1 (patch-ac) = 8202a3aa5398c01d5665c78d710c8641562db403

 @@ -1,16 +1,36 @@
-$NetBSD: patch-aa,v 1.1 2009/04/25 12:07:04 rh Exp $
+$NetBSD: patch-aa,v 1.2 2012/10/22 23:47:15 rh Exp $
---- ExtProgressIndicator.m.orig	2005-05-13 01:58:49.000000000 +1000
+Make this compile with recent versions of GNUstep.
 --- ExtProgressIndicator.m.orig	2005-05-12 15:58:49.000000000 +0000
 +++ ExtProgressIndicator.m
 @@ -22,8 +22,11 @@
   */
  #include <AppKit/NSColor.h>
 +#include <AppKit/NSGraphics.h>
  #include <AppKit/NSParagraphStyle.h>
 +#include <AppKit/NSAttributedString.h>
  #include <Foundation/Foundation.h>
 +#include <GNUstepGUI/GSTheme.h>
  #include "ExtProgressIndicator.h"
@@ -79,7 +82,7 @@
      // Calculate the inside rect to be drawn
  	if (_isBezeled) {
 -		NSSize borderSize = _sizeForBorderType (NSBezelBorder);
 +		NSSize borderSize = [[GSTheme theme] sizeForBorderType: NSBezelBorder];
  		origRect = NSInsetRect(_bounds, borderSize.width, borderSize.height);
  	} else
  		origRect = _bounds;
@@ -96,7 +99,7 @@
              if (value > _maxValue)
                  value = _maxValue;
 -            if (_isVertical){
 +            if ([self isVertical]){
                  fillRect.size.height = 1;
                  fillRect.origin.y += NSHeight(origRect) * (value / (_maxValue - _minValue));
              } else {

 @@ -1,12 +1,23 @@
-$NetBSD: patch-ab,v 1.1 2009/04/25 12:07:04 rh Exp $
+$NetBSD: patch-ab,v 1.2 2012/10/22 23:47:15 rh Exp $
---- WorkInProgress.m.orig	2005-05-13 01:58:49.000000000 +1000
+Make this work with recent versions of GNUstep.
 --- WorkInProgress.m.orig	2005-05-12 15:58:49.000000000 +0000
 +++ WorkInProgress.m
 @@ -23,6 +23,7 @@
  #include <Foundation/Foundation.h>
  #include <AppKit/AppKit.h>
 +#include <GNUstepGUI/GSTheme.h>
  #include "Functions.h"
  #include "Constants.h"
@@ -77,7 +78,7 @@ static NSString *nibName = @"WorkInProgr
      [super drawRect: rect];
      // Calculate the inside rect to be drawn
 -	NSSize borderSize = _sizeForBorderType (NSBezelBorder);
 +	NSSize borderSize = [[GSTheme theme] sizeForBorderType: NSBezelBorder];
  	r = NSInsetRect(_bounds, borderSize.width, borderSize.height);
      value = [self doubleValue];

 @@ -1,13 +1,15 @@
-$NetBSD: patch-ac,v 1.1 2009/04/25 12:07:04 rh Exp $
+$NetBSD: patch-ac,v 1.2 2012/10/22 23:47:15 rh Exp $
 Prevent a crash if item is nil.
 --- DriversPrefs.m.orig	2005-05-13 01:58:49.000000000 +1000
 +++ DriversPrefs.m
 @@ -198,7 +198,7 @@ static DriversPrefs *singleInstance = ni
  - (BOOL) outlineView: (NSOutlineView *)outlineView
  	isItemExpandable: (id) item
+ {
 -	if ([availableDrives objectForKey: ((DriversTableItem*)item)->display]) {
 +	if (item && [availableDrives objectForKey: ((DriversTableItem*)item)->display]) {
  		return YES;
+ 	}
  	return NO;