Update xpenguins to version 2.1

* Version 2.1 (26 May 2001)
- Found a WM that requires vroot.h: amiwm - replaced vroot.h functionality
- Detects KDE, Enlightenment & Nautilus desktops & draws to them (at last!)
- Sends expose event to background window so that KDE icons reappear
- ToonErase does not erase whole screen on first call
- No longer segfaults if display not found (new bug in 2.0)
- Can override root window detection using `--id'
- Use `--nice' to respond to system load by killing toons

* Version 2.0 (7 May 2001)
- Minor changes to error reporting

* Version 1.9 (1 May 2001)
- Code modularisation and separation into lots of different files
- A massive rewrite of xpenguins_*.c code (toon_*.c functions mostly unchanged)
- Themability added and some default themes written
- Now use automake and autoconf
- Removed use of vroot.h - I really don't know what it did anyway

6 files changed, 60 insertions, 51 deletions

diff --git a/x11/xpenguins/Makefile b/x11/xpenguins/Makefile
index 795e6c06c66..48992cffd09 100644
--- a/x11/xpenguins/Makefile
+++ b/x11/xpenguins/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.5 2001/02/17 17:07:21 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2001/06/11 22:26:56 zuntum Exp $
 #
 
-DISTNAME=	xpenguins-1.2
+DISTNAME=	xpenguins-2.1
 CATEGORIES=	games x11
 MASTER_SITES=	http://xpenguins.seul.org/
 
@@ -10,9 +10,8 @@ HOMEPAGE=	http://xpenguins.seul.org/
 COMMENT=	Little penguins walking along the tops of your windows
 
 USE_XPM=	YES
+USE_X11=	YES
 
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/xpenguins	 ${PREFIX}/bin
-	${INSTALL_MAN}     ${WRKSRC}/xpenguins.1 ${PREFIX}/man/man1
+GNU_CONFIGURE=	YES
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/xpenguins/distinfo b/x11/xpenguins/distinfo
index bf5b27ed974..b398b0c35ca 100644
--- a/x11/xpenguins/distinfo
+++ b/x11/xpenguins/distinfo
@@ -1,6 +1,4 @@
-$NetBSD: distinfo,v 1.2 2001/04/19 11:07:58 skrll Exp $
+$NetBSD: distinfo,v 1.3 2001/06/11 22:26:56 zuntum Exp $
 
-SHA1 (xpenguins-1.2.tar.gz) = d0666c727d01582c6d6c767e452f6f4189f128dc
-Size (xpenguins-1.2.tar.gz) = 44076 bytes
-SHA1 (patch-aa) = dac1dd56c09b4b744335ca4c4e2217a443b6feb7
-SHA1 (patch-ab) = 753bc8721efa246c4b82dd622f2738641a30c1ad
+SHA1 (xpenguins-2.1.tar.gz) = e0c544c90c9026eb55f1f479ec245325ef51f479
+Size (xpenguins-2.1.tar.gz) = 156550 bytes
diff --git a/x11/xpenguins/patches/patch-aa b/x11/xpenguins/patches/patch-aa
deleted file mode 100644
index aad0a4b752b..00000000000
--- a/x11/xpenguins/patches/patch-aa
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2000/05/30 01:35:07 hubertf Exp $
-
---- Makefile.BAK	Wed May 17 23:00:20 2000
-+++ Makefile	Tue May 30 03:19:32 2000
-@@ -6,8 +6,8 @@
- CFLAGS = -Wall $(RPM_OPT_FLAGS) 
- 
- XLIBS = -lX11 -lXpm -lXext
--XLIBDIR = -L/usr/X11R6/lib -L/usr/local/lib 
--XINCLUDEDIRS = -I/usr/X11R6/include -I/usr/local/include 
-+XLIBDIR = -L${X11BASE}/lib -Wl,-R${X11BASE}/lib
-+XINCLUDEDIRS = -I${X11BASE}/include
- 
- OBJS = xpenguins.o toon.o
- PROGRAM = xpenguins
-@@ -17,7 +17,7 @@
- $(PROGRAM): $(OBJS)
- 	$(CC) $(CFLAGS) $(XLIBDIR) $(XLIBS) $(OBJS) -o $(PROGRAM)
- 
--%.o: %.c
-+.c.o:
- 	$(CC) $(CFLAGS) $(XINCLUDEDIRS) -c $<
- 
- clean:
diff --git a/x11/xpenguins/patches/patch-ab b/x11/xpenguins/patches/patch-ab
deleted file mode 100644
index 1824aefd7c4..00000000000
--- a/x11/xpenguins/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2000/08/18 18:34:23 wiz Exp $
-
---- toon.c.orig	Tue May 23 10:07:29 2000
-+++ toon.c
-@@ -182,6 +182,8 @@
- {
-    int i, status;
-    XpmAttributes attributes;
-+
-+   memset(&attributes, 0, sizeof(attributes));
-    for (i=0;i<n;i++) {
-       attributes.valuemask |= (XpmReturnPixels
-                 | XpmReturnExtensions | XpmExactColors | XpmCloseness);
diff --git a/x11/xpenguins/pkg/DESCR b/x11/xpenguins/pkg/DESCR
index dfc13d46aec..35c197a2aa6 100644
--- a/x11/xpenguins/pkg/DESCR
+++ b/x11/xpenguins/pkg/DESCR
@@ -2,6 +2,10 @@ XPenguins is a simple program that animates a number of penguins that
 fall from the top of the screen, walk along the top of windows, up
 the side of windows, up the side of the screen, and sometimes even
 levitate with their genetically-modified go-go-gadget 'copter
-ability. Use the `-h' option to see a list of current options -
-currently you can specify the display to send the penguins to, the
-delay between frames and the number of penguins that are created.
+ability.
+
+Version 2 is themeable, so if you're bored of penguins you can try
+`xpenguins --theme "Turtles"' to get some nice turtles images
+(by Mayuko Nagata), or download some extra themes. Most of the default
+penguin images were taken from Pingus, a free lemmings clone for Linux,
+although more have been created for XPenguins version 2.
diff --git a/x11/xpenguins/pkg/PLIST b/x11/xpenguins/pkg/PLIST
index 2558f7060e5..a3662e845b4 100644
--- a/x11/xpenguins/pkg/PLIST
+++ b/x11/xpenguins/pkg/PLIST
@@ -1,3 +1,48 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2000/05/30 01:35:06 hubertf Exp $
+@comment $NetBSD: PLIST,v 1.2 2001/06/11 22:27:00 zuntum Exp $
 bin/xpenguins
 man/man1/xpenguins.1
+share/xpenguins/themes/Classic_Penguins/about
+share/xpenguins/themes/Classic_Penguins/bomber.xpm
+share/xpenguins/themes/Classic_Penguins/climber.xpm
+share/xpenguins/themes/Classic_Penguins/config
+share/xpenguins/themes/Classic_Penguins/explosion.xpm
+share/xpenguins/themes/Classic_Penguins/faller.xpm
+share/xpenguins/themes/Classic_Penguins/floater.xpm
+share/xpenguins/themes/Classic_Penguins/sitter.png
+share/xpenguins/themes/Classic_Penguins/tumbler.xpm
+share/xpenguins/themes/Classic_Penguins/walker.xpm
+share/xpenguins/themes/Penguins/about
+share/xpenguins/themes/Penguins/angel.xpm
+share/xpenguins/themes/Penguins/ballooner.xpm
+share/xpenguins/themes/Penguins/bomber.xpm
+share/xpenguins/themes/Penguins/climber.xpm
+share/xpenguins/themes/Penguins/climber_skateboarder.xpm
+share/xpenguins/themes/Penguins/config
+share/xpenguins/themes/Penguins/digger.xpm
+share/xpenguins/themes/Penguins/exit.xpm
+share/xpenguins/themes/Penguins/explosion.xpm
+share/xpenguins/themes/Penguins/faller.xpm
+share/xpenguins/themes/Penguins/floater.xpm
+share/xpenguins/themes/Penguins/penguin.png
+share/xpenguins/themes/Penguins/reader.xpm
+share/xpenguins/themes/Penguins/skateboarder.xpm
+share/xpenguins/themes/Penguins/splat.xpm
+share/xpenguins/themes/Penguins/superpenguin.xpm
+share/xpenguins/themes/Penguins/tumbler.xpm
+share/xpenguins/themes/Penguins/walker.xpm
+share/xpenguins/themes/Penguins/zapped.xpm
+share/xpenguins/themes/Turtles/about
+share/xpenguins/themes/Turtles/bomber.xpm
+share/xpenguins/themes/Turtles/climber.xpm
+share/xpenguins/themes/Turtles/config
+share/xpenguins/themes/Turtles/explosion.xpm
+share/xpenguins/themes/Turtles/faller.xpm
+share/xpenguins/themes/Turtles/floater.xpm
+share/xpenguins/themes/Turtles/tumbler.xpm
+share/xpenguins/themes/Turtles/turtle.png
+share/xpenguins/themes/Turtles/walker.xpm
+@dirrm share/xpenguins/themes/Turtles
+@dirrm share/xpenguins/themes/Penguins
+@dirrm share/xpenguins/themes/Classic_Penguins
+@dirrm share/xpenguins/themes
+@dirrm share/xpenguins