*Update to version 2.1

*Fix "`" error in header of Makefile
*Use GNU_CONFIGURE instead of HAS_CONFIGURE to fix needing to pass
--prefix as the configure_arg
*Take out unneeded pre-build and post-install targets
*Update descrption file

PR:		28192
Submitted by:	maintainer

4 files changed, 56 insertions, 20 deletions

diff --git a/games/xpenguins/Makefile b/games/xpenguins/Makefile
index 176d400..cb0a5e4 100644
--- a/games/xpenguins/Makefile
+++ b/games/xpenguins/Makefile
@@ -1,29 +1,21 @@
 # New ports collection makefile for:	xpenguins
 # Date created:				24 January 2001
-# Whom:				`	lyngbol@candid.dk
+# Whom:					lyngbol@candid.dk
 #
 # $FreeBSD$
 #
 
 PORTNAME=	xpenguins
-PORTVERSION=	1.2
+PORTVERSION=	2.1
 CATEGORIES=	games
 MASTER_SITES=	http://xpenguins.seul.org/
 
-MAINTAINER=	lyngbol@candid.dk
+MAINTAINER=	lyngbol@wheel.dk
 
 USE_X_PREFIX=	yes
 USE_XPM=	yes
-USE_GMAKE=	yes
+GNU_CONFIGURE=	yes
 
 MAN1=		xpenguins.1
 
-pre-build:
-	${PERL} -pi.orig -e "s@-L/usr/local/lib@@g; \
-			     s@-I/usr/local/include@@g" ${WRKSRC}/Makefile
-
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/xpenguins $(PREFIX)/bin
-	${INSTALL_MAN} ${WRKSRC}/xpenguins.1 $(PREFIX)/man/man1
-
 .include <bsd.port.mk>
diff --git a/games/xpenguins/distinfo b/games/xpenguins/distinfo
index 80a3d5f..d92e1b3 100644
--- a/games/xpenguins/distinfo
+++ b/games/xpenguins/distinfo
@@ -1 +1 @@
-MD5 (xpenguins-1.2.tar.gz) = d87aabddc455d12d9ccffbe491fa3b5d
+MD5 (xpenguins-2.1.tar.gz) = d55f1b72b8606c3c5e207f0dae1b7142
diff --git a/games/xpenguins/pkg-descr b/games/xpenguins/pkg-descr
index 53bd25d..c85ecf1 100644
--- a/games/xpenguins/pkg-descr
+++ b/games/xpenguins/pkg-descr
@@ -1,10 +1,9 @@
-XPenguins animates a friendly family of penguins  in  your
-root window. They drop in from the top of the screen, walk
-along the tops of your windows, up the side of  your  win-
-dows,  up the side of the screen, and sometimes even levi-
-tate with their genetically-modified go-go-gadget  'copter
-ability.  Be  careful  when you move windows as the little
-guys squash easily. If you send the  program  an  interupt
+XPenguins is a program for animating cute cartoons/animals in your
+root window. By default it will be penguins - they fall from the top
+of the screen, walk along the top of windows, up the side of windows
+and do various other stuff. Other themes in the base package are
+"Classic Penguins", reproducing XPenguins version 1.2, and "Turtles".
+More themes can be downloaded from the XPenguins web site
 
 WWW: http://xpenguins.seul.org/
 
diff --git a/games/xpenguins/pkg-plist b/games/xpenguins/pkg-plist
index 8323c11..86fd6dc 100644
--- a/games/xpenguins/pkg-plist
+++ b/games/xpenguins/pkg-plist
@@ -1 +1,46 @@
 bin/xpenguins
+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/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/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/Penguins
+@dirrm share/xpenguins/themes/Classic_Penguins
+@dirrm share/xpenguins/themes/Turtles
+@dirrm share/xpenguins/themes
+@dirrm share/xpenguins