Updated to version 1.0.24.

Addresses PR pkg/21595 by Juan RP.

Changes:

- install README file
- install files in cleaner way
- DESCR has 80 columns

1.0.24:
=======
- Added Rob Eberts patch which changes the size of the titlebar, adds some
  keybindings to switch desktops with alt+number keys.

1.0.23:
=======
- Menu correctly gets DEF_FONT (but not yet opt_font)

5 files changed, 24 insertions, 24 deletions

diff --git a/wm/aewm++/DESCR b/wm/aewm++/DESCR
index 19957717b67..27c30789900 100644
--- a/wm/aewm++/DESCR
+++ b/wm/aewm++/DESCR
@@ -1,6 +1,4 @@
-The aewm++ window manager is a fork of the popular minimal
-window manager aewm for the X Windows System. What makes
-it different is its codebase, feature set and focus. The
-name was created by using the first two letters in the word
-aesthetic, the wm is for window manager and the ++ is for
-its C++ code.
+The aewm++ window manager is a fork of the popular minimal window manager aewm
+for the X Windows System.  What makes it different is its codebase, feature
+set and focus.  The name was created by using the first two letters in the
+word aesthetic, the wm is for window manager and the ++ is for its C++ code.
diff --git a/wm/aewm++/Makefile b/wm/aewm++/Makefile
index 065094c5670..689c2abca32 100644
--- a/wm/aewm++/Makefile
+++ b/wm/aewm++/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2003/03/12 03:21:37 jschauma Exp $
+# $NetBSD: Makefile,v 1.2 2003/05/16 09:02:36 salo Exp $
 #
 
-DISTNAME=	aewm++-1.0.22
-CATEGORIES=	wm
+DISTNAME=	aewm++-1.0.24
+CATEGORIES=	wm x11
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=sapphire/}
 EXTRACT_SUFX=	.tar.bz2
 
@@ -13,7 +13,4 @@ COMMENT=	Fork of the popular minimal window manager aewm
 USE_BUILDLINK2=	YES
 USE_X11=	YES
 
-pre-install:
-	${MV} ${WRKSRC}/aewm++.1x ${WRKSRC}/aewm++.1
-
 .include "../../mk/bsd.pkg.mk"
diff --git a/wm/aewm++/PLIST b/wm/aewm++/PLIST
index b01b70ab681..7020c6f5c19 100644
--- a/wm/aewm++/PLIST
+++ b/wm/aewm++/PLIST
@@ -1,3 +1,5 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2003/03/12 03:21:37 jschauma Exp $
+@comment $NetBSD: PLIST,v 1.2 2003/05/16 09:02:36 salo Exp $
 bin/aewm++
 man/man1/aewm++.1
+share/doc/aewm++/README
+@dirrm share/doc/aewm++
diff --git a/wm/aewm++/distinfo b/wm/aewm++/distinfo
index e08f34567e5..9f5e2a41dff 100644
--- a/wm/aewm++/distinfo
+++ b/wm/aewm++/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.1.1.1 2003/03/12 03:21:37 jschauma Exp $
+$NetBSD: distinfo,v 1.2 2003/05/16 09:02:36 salo Exp $
 
-SHA1 (aewm++-1.0.22.tar.bz2) = 49fb1aac02ec64896f607513d786a8e2628ac2a5
-Size (aewm++-1.0.22.tar.bz2) = 42517 bytes
-SHA1 (patch-aa) = 1a0efa88f1b6d3f4582b0ca1acc8670a42d6521e
+SHA1 (aewm++-1.0.24.tar.bz2) = 366da85a5edf47e3214c772007aebb2daf7d18d0
+Size (aewm++-1.0.24.tar.bz2) = 36642 bytes
+SHA1 (patch-aa) = 9bf23b24a371c6a75c1bc8a6d64688af38f876a3
diff --git a/wm/aewm++/patches/patch-aa b/wm/aewm++/patches/patch-aa
index d76140205e7..2a35d8b004e 100644
--- a/wm/aewm++/patches/patch-aa
+++ b/wm/aewm++/patches/patch-aa
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.1.1.1 2003/03/12 03:21:38 jschauma Exp $
+$NetBSD: patch-aa,v 1.2 2003/05/16 09:02:37 salo Exp $
 
---- Makefile.orig	Fri Nov 15 18:28:08 2002
-+++ Makefile	Tue Mar 11 22:07:31 2003
+--- Makefile.orig	2002-11-16 00:28:08.000000000 +0100
++++ Makefile	2003-05-16 10:48:03.000000000 +0200
 @@ -1,11 +1,13 @@
 -CC       = g++
 -CFLAGS   = -g -O2 -Wall
@@ -35,11 +35,14 @@ $NetBSD: patch-aa,v 1.1.1.1 2003/03/12 03:21:38 jschauma Exp $
 +	$(CXX) $(CXXFLAGS) $(DEFINES) $(INCLUDES) -c $< -o $@
  
  install: all
- 	mkdir -p $(DESTDIR)$(prefix)/bin
- 	mkdir -p $(DESTDIR)$(prefix)/man/man1
- 	install -s aewm++ $(DESTDIR)$(prefix)/bin
+-	mkdir -p $(DESTDIR)$(prefix)/bin
+-	mkdir -p $(DESTDIR)$(prefix)/man/man1
+-	install -s aewm++ $(DESTDIR)$(prefix)/bin
 -	install -m 644 aewm++.1x  $(DESTDIR)$(prefix)/man/man1
-+	install -m 644 aewm++.1  $(DESTDIR)$(prefix)/man/man1
++	${BSD_INSTALL_PROGRAM} aewm++ $(DESTDIR)$(prefix)/bin
++	${BSD_INSTALL_MAN} aewm++.1x  $(DESTDIR)$(prefix)/man/man1/aewm++.1
++	${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(prefix)/share/doc/aewm++
++	${BSD_INSTALL_DATA} README $(DESTDIR)$(prefix)/share/doc/aewm++
  	
  clean:
  	rm -f aewm++ $(OBJS) core