amiwm: update to 0.21pl2

"New features include internationalization (support for locales with
multi-byte character encodings) and support for AmigaOS 3.5 style icons."
This commit is contained in:
nia 2021-07-13 08:16:17 +00:00
parent 842a38ec08
commit 5a9e7a7bec
7 changed files with 12 additions and 102 deletions

View file

@ -1,8 +1,3 @@
amiwm is an X window manager that tries to make your display look and feel
like an Amiga Workbench screen. It is fully functional and can do all the
usual window manager stuff, like moving and resizing windows.
The purpose of amiwm is to make life more pleasant for Amiga-freaks who
has/wants to use UNIX workstations once in a while. It can also be used
on the Amiga with the AmiWin X server, although this part needs some more
work.

View file

@ -1,10 +1,9 @@
# $NetBSD: Makefile,v 1.33 2020/01/26 17:32:20 rillig Exp $
# $NetBSD: Makefile,v 1.34 2021/07/13 08:16:17 nia Exp $
#
DISTNAME= amiwm0.20pl48
PKGNAME= amiwm-0.20p48
PKGREVISION= 3
CATEGORIES= x11 wm
DISTNAME= amiwm0.21pl2
PKGNAME= amiwm-0.21pl2
CATEGORIES= wm x11
MASTER_SITES= ftp://ftp.lysator.liu.se/pub/X11/wm/amiwm/
MAINTAINER= pkgsrc-users@NetBSD.org
@ -12,29 +11,16 @@ HOMEPAGE= https://www.lysator.liu.se/~marcus/amiwm.html
COMMENT= X window manager with Amiga look and feel
LICENSE= amiwm-license
RESTRICTED= Distribution limited to non-commercial purposes, unmodified binaries only.
RESTRICTED= Distribution limited to non-commercial purposes, unmodified source only.
NO_BIN_ON_CDROM= ${RESTRICTED}
NO_BIN_ON_FTP= ${RESTRICTED}
NO_SRC_ON_CDROM= ${RESTRICTED}
NO_BIN_ON_CDROM= ${RESTRICTED}
# Extensive use of 32-bit values to hold pointers
BROKEN_ON_PLATFORM+= ${LP64PLATFORMS}
USE_TOOLS+= ksh:run yacc lex
REPLACE_KSH= Xsession.in Xsession2.in
.include "../../mk/bsd.prefs.mk"
GNU_CONFIGURE= yes
CFLAGS+= -DHAVE_X11_EXTENSIONS_SHAPE_H=1
CFLAGS+= -O
CONFIGURE_ENV+= CFLAGS=${CFLAGS:M*:Q}
CONFIGURE_ENV+= X_PRE_LIBS=${X_PRE_LIBS:Q}
CONFIGURE_ENV+= X_EXTRA_LIBS=-lXt
X_PRE_LIBS= ${COMPILER_RPATH_FLAG}${X11BASE}/lib -L${X11BASE}/lib
INSTALLATION_DIRS= bin
MAKE_JOBS_SAFE= no
INSTALL_MAKE_FLAGS+= prefix=${DESTDIR}${PREFIX} \
mandir=${DESTDIR}${PREFIX}/${PKGMANDIR}

View file

@ -1,10 +1,6 @@
$NetBSD: distinfo,v 1.8 2017/01/05 09:40:00 jperkin Exp $
$NetBSD: distinfo,v 1.9 2021/07/13 08:16:17 nia Exp $
SHA1 (amiwm0.20pl48.tar.gz) = 6cf5f7197403a9519ea1f3b272e67a8de4fdca43
RMD160 (amiwm0.20pl48.tar.gz) = abb5922a84501a28a73684c9e056dba6ac6969b7
SHA512 (amiwm0.20pl48.tar.gz) = 7f05b9494bb0e4c4fe1c8e85dc4b2202c8998a34551e6405864b5bd0dfa8c83d67a8d8c06c79f09dd34013e7c1b8100b20bf1a04bd58f03131cd1345fe75e2fe
Size (amiwm0.20pl48.tar.gz) = 141542 bytes
SHA1 (patch-Makefile.in) = 8428fd6533ead1ebe955da4d7df6ba6673639f7d
SHA1 (patch-aa) = 4927276af44a0c2257eb723959002eef90db6aaf
SHA1 (patch-ab) = 0079bf1da97dbf70ae3d7a215e2fec2ff0ffe797
SHA1 (patch-kbdlexer.l) = 2608c0fa1c471110a589f9e34b94e461d681aa91
SHA1 (amiwm0.21pl2.tar.gz) = 770082049158a47e7171a5d74e82eeea7957b36e
RMD160 (amiwm0.21pl2.tar.gz) = 3f135fb5ca0e945bcd7035485a9a886012b43db7
SHA512 (amiwm0.21pl2.tar.gz) = 6504a4fd4c30a571b0c501b46fdc442fcc993c27b4595753f7bfa12a38c0b997a01d939c7a35e6c499aa0f8972bc0fda7cc88a9fe77091f363f8cd5a9e8d50de
Size (amiwm0.21pl2.tar.gz) = 195128 bytes

View file

@ -1,24 +0,0 @@
$NetBSD: patch-Makefile.in,v 1.1 2013/11/06 21:33:44 dholland Exp $
Fix MAKE_JOBS build.
--- Makefile.in~ 1998-03-15 21:28:46.000000000 +0000
+++ Makefile.in
@@ -55,7 +55,7 @@ lib :
menu.o : menu.c
$(CC) -c $(CPPFLAGS) $(ALL_CFLAGS) -DAMIWM_HOME=\"$(AMIWM_HOME)\" $<
-rc.o : rc.c
+rc.o : rc.c gram.h
$(CC) -c $(CPPFLAGS) $(ALL_CFLAGS) -DAMIWM_HOME=\"$(AMIWM_HOME)\" $<
diskobject.o : diskobject.c
@@ -72,6 +72,8 @@ gram.h gram.c: gram.y
lex.c : lex.l
$(LEX) -t lex.l > lex.c
+lex.o: gram.h
+
kbdmodule.h kbdmodule.c: kbdmodule.y
$(YACC) $(YFLAGS) kbdmodule.y
mv y.tab.c kbdmodule.c

View file

@ -1,13 +0,0 @@
$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);

View file

@ -1,16 +0,0 @@
$NetBSD: patch-ab,v 1.2 2017/01/05 09:40:00 jperkin Exp $
Ensure the local yywrap is used.
--- lex.l.orig 1997-12-12 17:21:58.000000000 +0000
+++ lex.l
@@ -6,7 +6,8 @@ extern int ParseError;
extern FILE *rcfile;
#undef yyin
#define yyin rcfile
-#define yywrap() 1
+#undef yywrap
+static int yywrap(void) { return 1; }
extern int parse_keyword(char *);
void fixup_string(char *, char *);
%}

View file

@ -1,14 +0,0 @@
$NetBSD: patch-kbdlexer.l,v 1.1 2017/01/05 09:40:00 jperkin Exp $
Ensure the local yywrap is used.
--- kbdlexer.l.orig 1998-03-15 19:46:16.000000000 +0000
+++ kbdlexer.l
@@ -10,6 +10,7 @@ extern char *progname;
#ifdef FLEX_SCANNER
+#undef yywrap
#undef YY_INPUT
#define YY_INPUT(buf,result,size) ((result) = doinput((buf),(size)))
int doinput (char *buf, int size)