Fri Apr 25 02:16:11 2008 UTC ()
Add patch so  amiwm won't immediately exit without lucida font.
I also sent upstream, but I don't know if this is maintained.
(If you use this window manager, please let me know.)


(reed)
diff -r1.21 -r1.22 pkgsrc/wm/amiwm/Makefile
diff -r1.3 -r1.4 pkgsrc/wm/amiwm/distinfo
diff -r0 -r1.1 pkgsrc/wm/amiwm/patches/patch-aa
cvs diff -r1.21 -r1.22 pkgsrc/wm/amiwm/Makefile (expand / switch to unified diff)

--- pkgsrc/wm/amiwm/Makefile 2008/04/14 23:31:29 1.21
+++ pkgsrc/wm/amiwm/Makefile 2008/04/25 02:16:11 1.22
@@ -1,19 +1,19 @@ @@ -1,19 +1,19 @@
1# $NetBSD: Makefile,v 1.21 2008/04/14 23:31:29 rh Exp $ 1# $NetBSD: Makefile,v 1.22 2008/04/25 02:16:11 reed Exp $
2# 2#
3 3
4DISTNAME= amiwm0.20pl48 4DISTNAME= amiwm0.20pl48
5PKGNAME= amiwm-0.20p48 5PKGNAME= amiwm-0.20p48
6PKGREVISION= 2 6PKGREVISION= 3
7CATEGORIES= x11 wm 7CATEGORIES= x11 wm
8MASTER_SITES= ftp://ftp.lysator.liu.se/pub/X11/wm/amiwm/ 8MASTER_SITES= ftp://ftp.lysator.liu.se/pub/X11/wm/amiwm/
9 9
10MAINTAINER= pkgsrc-users@NetBSD.org 10MAINTAINER= pkgsrc-users@NetBSD.org
11HOMEPAGE= http://www.lysator.liu.se/~marcus/amiwm.html 11HOMEPAGE= http://www.lysator.liu.se/~marcus/amiwm.html
12COMMENT= X window manager with Amiga look and feel 12COMMENT= X window manager with Amiga look and feel
13 13
14LICENSE= amiwm-license 14LICENSE= amiwm-license
15RESTRICTED= Restrictive copyright (non-commerical use only) 15RESTRICTED= Restrictive copyright (non-commerical use only)
16NO_SRC_ON_CDROM= ${RESTRICTED} 16NO_SRC_ON_CDROM= ${RESTRICTED}
17NO_BIN_ON_CDROM= ${RESTRICTED} 17NO_BIN_ON_CDROM= ${RESTRICTED}
18 18
19USE_TOOLS+= ksh:run yacc lex 19USE_TOOLS+= ksh:run yacc lex
cvs diff -r1.3 -r1.4 pkgsrc/wm/amiwm/distinfo (expand / switch to unified diff)

--- pkgsrc/wm/amiwm/distinfo 2005/02/23 18:43:53 1.3
+++ pkgsrc/wm/amiwm/distinfo 2008/04/25 02:16:11 1.4
@@ -1,5 +1,6 @@ @@ -1,5 +1,6 @@
1$NetBSD: distinfo,v 1.3 2005/02/23 18:43:53 wiz Exp $ 1$NetBSD: distinfo,v 1.4 2008/04/25 02:16:11 reed Exp $
2 2
3SHA1 (amiwm0.20pl48.tar.gz) = 6cf5f7197403a9519ea1f3b272e67a8de4fdca43 3SHA1 (amiwm0.20pl48.tar.gz) = 6cf5f7197403a9519ea1f3b272e67a8de4fdca43
4RMD160 (amiwm0.20pl48.tar.gz) = abb5922a84501a28a73684c9e056dba6ac6969b7 4RMD160 (amiwm0.20pl48.tar.gz) = abb5922a84501a28a73684c9e056dba6ac6969b7
5Size (amiwm0.20pl48.tar.gz) = 141542 bytes 5Size (amiwm0.20pl48.tar.gz) = 141542 bytes
 6SHA1 (patch-aa) = 4927276af44a0c2257eb723959002eef90db6aaf
File Added: pkgsrc/wm/amiwm/patches/Attic/patch-aa
$NetBSD: patch-aa,v 1.1 2008/04/25 02:16:11 reed Exp $

--- libami/drawinfo.c.orig	2008-04-05 16:38:47.000000000 -0500
+++ libami/drawinfo.c	2008-04-05 16:39:26.000000000 -0500
@@ -143,7 +143,7 @@
     if(!(dri->dri_Font = XLoadQueryFont(dpy, default_screenfont))) {
       fprintf(stderr, "%s: cannot open font %s\n", progname,
 	      default_screenfont);
-      exit(1);
+      dri->dri_Font = XLoadQueryFont(dpy, "fixed");
     }
   if(override)
     setdriprop(dpy, driatom, dritypatom, root, dri);