Update gnustep-back to 0.16.0. This makes the backend more hier(7)

compliant.  Changes also include gui rendering improvements and other
bug fixes.

4 files changed, 67 insertions, 54 deletions

diff --git a/x11/gnustep-back/Makefile b/x11/gnustep-back/Makefile
index d03cf8f3367..7a386ab2a17 100644
--- a/x11/gnustep-back/Makefile
+++ b/x11/gnustep-back/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.44 2008/11/25 12:52:33 adam Exp $
+# $NetBSD: Makefile,v 1.45 2009/04/13 12:21:37 rh Exp $
 
-DISTNAME=	gnustep-back-0.14.0
+DISTNAME=	gnustep-back-0.16.0
 CATEGORIES=	x11 gnustep
 MASTER_SITES=	${MASTER_SITE_GNUSTEP:=core/}
 
@@ -8,17 +8,21 @@ MAINTAINER=	rh@NetBSD.org
 HOMEPAGE=	http://www.gnustep.org/
 COMMENT=	X11 AppKit backend for GNUstep
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
+LICENSE=		gnu-gpl-v3
+
 USE_LANGUAGES=		objc
 USE_TOOLS+=		pkg-config
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--exec-prefix=${PREFIX}/libexec/GNUstep
 MAKE_FILE=		GNUmakefile
+MAKE_JOBS_SAFE=		no
 
 pre-install:
-	${INSTALL_DATA_DIR} ${GNUSTEP_SYSTEM_ROOT}/Library/Fonts
+	${INSTALL_DATA_DIR} ${DESTDIR}${GNUSTEP_ROOT}/lib/GNUstep/Fonts
 
 .include "../../graphics/MesaLib/buildlink3.mk"
-.include "../../graphics/cairo/buildlink3.mk"
 .include "../../graphics/libart/buildlink3.mk"
 .include "../../x11/gnustep-gui/buildlink3.mk"
 .include "../../x11/libXext/buildlink3.mk"
diff --git a/x11/gnustep-back/PLIST b/x11/gnustep-back/PLIST
index fbf7ba900ab..6575289fde2 100644
--- a/x11/gnustep-back/PLIST
+++ b/x11/gnustep-back/PLIST
@@ -1,42 +1,41 @@
-@comment $NetBSD: PLIST,v 1.13 2008/11/25 12:52:33 adam Exp $
-share/GNUstep/System/Library/Bundles/libgnustep-back-014.bundle/Resources/English.lproj/nfontFaceNames.strings
-share/GNUstep/System/Library/Bundles/libgnustep-back-014.bundle/Resources/Info-gnustep.plist
-share/GNUstep/System/Library/Bundles/libgnustep-back-014.bundle/Resources/Swedish.lproj/nfontFaceNames.strings
-share/GNUstep/System/Library/Bundles/libgnustep-back-014.bundle/libgnustep-back-014
-share/GNUstep/System/Library/Bundles/libgnustep-back-014.bundle/stamp.make
-share/GNUstep/System/Library/Documentation/man/man1/gpbs.1
-share/GNUstep/System/Library/Fonts/Helvetica.nfont/FontInfo.plist
-share/GNUstep/System/Library/Fonts/Helvetica.nfont/n019003l.afm
-share/GNUstep/System/Library/Fonts/Helvetica.nfont/n019003l.pfb
-share/GNUstep/System/Library/Fonts/Helvetica.nfont/n019003l.pfm
-share/GNUstep/System/Library/Fonts/Helvetica.nfont/n019004l.afm
-share/GNUstep/System/Library/Fonts/Helvetica.nfont/n019004l.pfb
-share/GNUstep/System/Library/Fonts/Helvetica.nfont/n019004l.pfm
-share/GNUstep/System/Library/Fonts/Helvetica.nfont/n019023l.afm
-share/GNUstep/System/Library/Fonts/Helvetica.nfont/n019023l.pfb
-share/GNUstep/System/Library/Fonts/Helvetica.nfont/n019023l.pfm
-share/GNUstep/System/Library/Fonts/Helvetica.nfont/n019024l.afm
-share/GNUstep/System/Library/Fonts/Helvetica.nfont/n019024l.pfb
-share/GNUstep/System/Library/Fonts/Helvetica.nfont/n019024l.pfm
-share/GNUstep/System/Library/Fonts/Helvetica.nfont/n019043l.afm
-share/GNUstep/System/Library/Fonts/Helvetica.nfont/n019043l.pfb
-share/GNUstep/System/Library/Fonts/Helvetica.nfont/n019043l.pfm
-share/GNUstep/System/Library/Fonts/Helvetica.nfont/n019044l.afm
-share/GNUstep/System/Library/Fonts/Helvetica.nfont/n019044l.pfb
-share/GNUstep/System/Library/Fonts/Helvetica.nfont/n019044l.pfm
-share/GNUstep/System/Library/Fonts/Helvetica.nfont/n019063l.afm
-share/GNUstep/System/Library/Fonts/Helvetica.nfont/n019063l.pfb
-share/GNUstep/System/Library/Fonts/Helvetica.nfont/n019063l.pfm
-share/GNUstep/System/Library/Fonts/Helvetica.nfont/n019064l.afm
-share/GNUstep/System/Library/Fonts/Helvetica.nfont/n019064l.pfb
-share/GNUstep/System/Library/Fonts/Helvetica.nfont/n019064l.pfm
-share/GNUstep/System/Tools/gpbs
-@comment in devel/gnustep-make: @dirrm share/GNUstep/System/Tools
-@comment in devel/gnustep-base: @dirrm share/GNUstep/System/Library/Documentation/man/man1
-@dirrm share/GNUstep/System/Library/Fonts/Helvetica.nfont
-@comment in devel/gnustep-make: @dirrm share/GNUstep/System/Library/Fonts
-@comment in devel/gnustep-make: @dirrm share/GNUstep/System/Library/Bundles
-@dirrm share/GNUstep/System/Library/Bundles/libgnustep-back-014.bundle/Resources/Swedish.lproj
-@dirrm share/GNUstep/System/Library/Bundles/libgnustep-back-014.bundle/Resources/English.lproj
-@dirrm share/GNUstep/System/Library/Bundles/libgnustep-back-014.bundle/Resources
-@dirrm share/GNUstep/System/Library/Bundles/libgnustep-back-014.bundle
+@comment $NetBSD: PLIST,v 1.14 2009/04/13 12:21:37 rh Exp $
+bin/gpbs
+lib/GNUstep/Bundles/libgnustep-back-016.bundle/Resources/English.lproj/nfontFaceNames.strings
+lib/GNUstep/Bundles/libgnustep-back-016.bundle/Resources/Info-gnustep.plist
+lib/GNUstep/Bundles/libgnustep-back-016.bundle/Resources/Swedish.lproj/nfontFaceNames.strings
+lib/GNUstep/Bundles/libgnustep-back-016.bundle/libgnustep-back-016
+lib/GNUstep/Bundles/libgnustep-back-016.bundle/stamp.make
+lib/GNUstep/Fonts/Helvetica.nfont/FontInfo.plist
+lib/GNUstep/Fonts/Helvetica.nfont/n019003l.afm
+lib/GNUstep/Fonts/Helvetica.nfont/n019003l.pfb
+lib/GNUstep/Fonts/Helvetica.nfont/n019003l.pfm
+lib/GNUstep/Fonts/Helvetica.nfont/n019004l.afm
+lib/GNUstep/Fonts/Helvetica.nfont/n019004l.pfb
+lib/GNUstep/Fonts/Helvetica.nfont/n019004l.pfm
+lib/GNUstep/Fonts/Helvetica.nfont/n019023l.afm
+lib/GNUstep/Fonts/Helvetica.nfont/n019023l.pfb
+lib/GNUstep/Fonts/Helvetica.nfont/n019023l.pfm
+lib/GNUstep/Fonts/Helvetica.nfont/n019024l.afm
+lib/GNUstep/Fonts/Helvetica.nfont/n019024l.pfb
+lib/GNUstep/Fonts/Helvetica.nfont/n019024l.pfm
+lib/GNUstep/Fonts/Helvetica.nfont/n019043l.afm
+lib/GNUstep/Fonts/Helvetica.nfont/n019043l.pfb
+lib/GNUstep/Fonts/Helvetica.nfont/n019043l.pfm
+lib/GNUstep/Fonts/Helvetica.nfont/n019044l.afm
+lib/GNUstep/Fonts/Helvetica.nfont/n019044l.pfb
+lib/GNUstep/Fonts/Helvetica.nfont/n019044l.pfm
+lib/GNUstep/Fonts/Helvetica.nfont/n019063l.afm
+lib/GNUstep/Fonts/Helvetica.nfont/n019063l.pfb
+lib/GNUstep/Fonts/Helvetica.nfont/n019063l.pfm
+lib/GNUstep/Fonts/Helvetica.nfont/n019064l.afm
+lib/GNUstep/Fonts/Helvetica.nfont/n019064l.pfb
+lib/GNUstep/Fonts/Helvetica.nfont/n019064l.pfm
+man/man1/gpbs.1
+@dirrm lib/GNUstep/Fonts/Helvetica.nfont
+@dirrm lib/GNUstep/Fonts
+@dirrm lib/GNUstep/Bundles/libgnustep-back-016.bundle/Resources/Swedish.lproj
+@dirrm lib/GNUstep/Bundles/libgnustep-back-016.bundle/Resources/English.lproj
+@dirrm lib/GNUstep/Bundles/libgnustep-back-016.bundle/Resources
+@dirrm lib/GNUstep/Bundles/libgnustep-back-016.bundle
+@comment in x11/gnustep-gui: @dirrm lib/GNUstep/Bundles
+@comment in devel/gnustep-base: @dirrm lib/GNUstep
diff --git a/x11/gnustep-back/buildlink3.mk b/x11/gnustep-back/buildlink3.mk
index 1f47ebbae53..a9ee7fed11e 100644
--- a/x11/gnustep-back/buildlink3.mk
+++ b/x11/gnustep-back/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.17 2009/03/20 19:25:41 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.18 2009/04/13 12:21:37 rh Exp $
 
 BUILDLINK_TREE+=	gnustep-back
 
@@ -9,10 +9,20 @@ BUILDLINK_API_DEPENDS.gnustep-back+=	gnustep-back>=0.9.2
 BUILDLINK_ABI_DEPENDS.gnustep-back+=	gnustep-back>=0.12.0nb1
 BUILDLINK_PKGSRCDIR.gnustep-back?=	../../x11/gnustep-back
 
-.include "../../graphics/cairo/buildlink3.mk"
-.include "../../graphics/libart/buildlink3.mk"
+PRINT_PLIST_AWK+=	/^@dirrm lib\/GNUstep\/Bundles\/libgnustep-back-016.bundle$$/ { print "@comment in x11/gnustep-back: " $$0; next; }
+PRINT_PLIST_AWK+=	/^@dirrm lib\/GNUstep\/Bundles\/libgnustep-back-016.bundle\/Resources$$/ { print "@comment in x11/gnustep-back: " $$0; next; }
+PRINT_PLIST_AWK+=	/^@dirrm lib\/GNUstep\/Bundles\/libgnustep-back-016.bundle\/Resources\/English.lproj$$/ { print "@comment in x11/gnustep-back: " $$0; next; }
+PRINT_PLIST_AWK+=	/^@dirrm lib\/GNUstep\/Bundles\/libgnustep-back-016.bundle\/Resources\/Swedish.lproj$$/ { print "@comment in x11/gnustep-back: " $$0; next; }
+PRINT_PLIST_AWK+=	/^@dirrm lib\/GNUstep\/Fonts$$/ { print "@comment in x11/gnustep-back: " $$0; next; }
+PRINT_PLIST_AWK+=	/^@dirrm lib\/GNUstep\/Fonts\/Helvetica.nfont$$/ { print "@comment in x11/gnustep-back: " $$0; next; }
+PRINT_PLIST_AWK+=	/^@exec \$${MKDIR} %D\/lib\/GNUstep\/Bundles\/libgnustep-back-016.bundle$$/ { next; }
+PRINT_PLIST_AWK+=	/^@exec \$${MKDIR} %D\/lib\/GNUstep\/Bundles\/libgnustep-back-016.bundle\/Resources$$/ { next; }
+PRINT_PLIST_AWK+=	/^@exec \$${MKDIR} %D\/lib\/GNUstep\/Bundles\/libgnustep-back-016.bundle\/Resources\/English.lproj$$/ { next; }
+PRINT_PLIST_AWK+=	/^@exec \$${MKDIR} %D\/lib\/GNUstep\/Bundles\/libgnustep-back-016.bundle\/Resources\/Swedish.lproj$$/ { next; }
+PRINT_PLIST_AWK+=	/^@exec \$${MKDIR} %D\/lib\/GNUstep\/Fonts$$/ { next; }
+PRINT_PLIST_AWK+=	/^@exec \$${MKDIR} %D\/lib\/GNUstep\/Fonts\/Helvetica.nfont$$/ { next; }
+
 .include "../../x11/gnustep-gui/buildlink3.mk"
-.include "../../x11/libXft/buildlink3.mk"
 .endif # GNUSTEP_BACK_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-gnustep-back
diff --git a/x11/gnustep-back/distinfo b/x11/gnustep-back/distinfo
index 2a678a4e07e..b42b368fd46 100644
--- a/x11/gnustep-back/distinfo
+++ b/x11/gnustep-back/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.19 2008/11/25 12:52:33 adam Exp $
+$NetBSD: distinfo,v 1.20 2009/04/13 12:21:37 rh Exp $
 
-SHA1 (gnustep-back-0.14.0.tar.gz) = 4c461f932dade905b1bc922d2650951a3618fd84
-RMD160 (gnustep-back-0.14.0.tar.gz) = 1282ed4f592f9614c502605aa9d371da6b682dc8
-Size (gnustep-back-0.14.0.tar.gz) = 880765 bytes
+SHA1 (gnustep-back-0.16.0.tar.gz) = e3bb755117b12c7eef65fd781650b7f5dbe02147
+RMD160 (gnustep-back-0.16.0.tar.gz) = 099c10aea9435c738973f774a7673a8d640097d7
+Size (gnustep-back-0.16.0.tar.gz) = 886104 bytes
 SHA1 (patch-aa) = 1a419bfd5317fa05da5cb60f427d1643eb88c4aa