xteddy2: Update to 2.2

2009-02-25:
  * Ported to Imlib2 (Thanks to Peter De Wachter <pdewacht@gmail.com>)

8 files changed, 62 insertions, 48 deletions

diff --git a/x11/xteddy2/Makefile b/x11/xteddy2/Makefile
index 44a078e920f..0d3c24ec93f 100644
--- a/x11/xteddy2/Makefile
+++ b/x11/xteddy2/Makefile
@@ -1,19 +1,19 @@
-# $NetBSD: Makefile,v 1.46 2020/06/05 12:49:18 jperkin Exp $
+# $NetBSD: Makefile,v 1.47 2020/11/24 10:12:48 nia Exp $
 
-DISTNAME=	xteddy-2.0.1
-PKGREVISION=	24
+DISTNAME=	xteddy-2.2
 CATEGORIES=	x11 games
 MASTER_SITES=	http://staffwww.itn.liu.se/~stegu/xteddy/
 
 MAINTAINER=	johnam@mail.kemper.org
 HOMEPAGE=	http://staffwww.itn.liu.se/~stegu/xteddy/
 COMMENT=	Teddy bear for your desktop
+LICENSE=	gnu-gpl-v2
 
 CONFLICTS+=	xteddy-1.*
 
 GNU_CONFIGURE=	yes
 
-USE_TOOLS+=	ksh:run
+USE_TOOLS+=	ksh:run pkg-config
 
 REPLACE_KSH+=	xtoys
 
@@ -22,7 +22,7 @@ SUBST_STAGE.prefix=	pre-configure
 SUBST_FILES.prefix=	configure xteddy_test xtoys
 SUBST_VARS.prefix=	PREFIX
 
-.include "../../graphics/imlib/buildlink3.mk"
+.include "../../graphics/imlib2/buildlink3.mk"
 .include "../../x11/libSM/buildlink3.mk"
 .include "../../x11/libXext/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/xteddy2/PLIST b/x11/xteddy2/PLIST
index e48b53c21cb..08759671fce 100644
--- a/x11/xteddy2/PLIST
+++ b/x11/xteddy2/PLIST
@@ -1,17 +1,21 @@
-@comment $NetBSD: PLIST,v 1.2 2009/06/14 18:25:19 joerg Exp $
+@comment $NetBSD: PLIST,v 1.3 2020/11/24 10:12:48 nia Exp $
 bin/xteddy
 bin/xteddy_test
 bin/xtoys
-man/man1/xteddy.1
+man/man6/xteddy.6
 share/xteddy/teddy.png
 share/xteddy/xalex.png
 share/xteddy/xbobo.png
 share/xteddy/xbrummi.png
+share/xteddy/xcherubino.png
 share/xteddy/xduck.png
+share/xteddy/xhedgehog.png
 share/xteddy/xklitze.png
 share/xteddy/xnamu.png
 share/xteddy/xorca.png
 share/xteddy/xpenguin.png
+share/xteddy/xpuppy.png
 share/xteddy/xruessel.png
 share/xteddy/xteddy.png
+share/xteddy/xtrouble.png
 share/xteddy/xtuxxy.png
diff --git a/x11/xteddy2/distinfo b/x11/xteddy2/distinfo
index 86ca4e9df93..0379995d05e 100644
--- a/x11/xteddy2/distinfo
+++ b/x11/xteddy2/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.7 2015/11/04 03:29:12 agc Exp $
+$NetBSD: distinfo,v 1.8 2020/11/24 10:12:48 nia Exp $
 
-SHA1 (xteddy-2.0.1.tar.gz) = 371810d7a509cbf6ffd3a4d94c87412ae68022d8
-RMD160 (xteddy-2.0.1.tar.gz) = 20d5f696e5815bf81cf9f2eba0d6ff83313181e2
-SHA512 (xteddy-2.0.1.tar.gz) = d70b41cbbe3910a80dc3e2c6bcd5664cbd4f21e044d5f84c190c63285b15db540be7546ce1183fc7d35daa261def5074ebc131c0c7ee505b3bcfd9aea07dca88
-Size (xteddy-2.0.1.tar.gz) = 348055 bytes
-SHA1 (patch-aa) = 69425a7ccae41c7852c2ccfed7d029a7b93ada6c
-SHA1 (patch-ab) = af66f8f31baf8581b7b9a115eab6f513cd0c5e5e
-SHA1 (patch-ac) = 6d09bef66d1cb78f842349afa7dcad9ed47add89
+SHA1 (xteddy-2.2.tar.gz) = 4fcf2efc6e0f2e02ce32597d2ccfbfb2bf057199
+RMD160 (xteddy-2.2.tar.gz) = 8395ce8c9a1af208ec44bd9a773fda3b5d1c6df2
+SHA512 (xteddy-2.2.tar.gz) = e48f1f616980b747b3e528a7bb3a46605986e87e05cbad1385992931098acd8857cdd9fa7c38bca94007e74d1ab13cfd567fe6e502eecf8691e24272bd98159b
+Size (xteddy-2.2.tar.gz) = 867005 bytes
+SHA1 (patch-configure) = bd6c4c09e2d127f03751c236cdc9b8ce6e37b353
+SHA1 (patch-xteddy__test) = fe4a3e022cada079365240e1f49290276f571edb
+SHA1 (patch-xtoys) = 77800782ba73498a674b2c78fdec10e3db0a4476
diff --git a/x11/xteddy2/patches/patch-aa b/x11/xteddy2/patches/patch-aa
deleted file mode 100644
index b635453b0c8..00000000000
--- a/x11/xteddy2/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2000/12/05 22:54:03 hubertf Exp $
-
---- configure	Mon Aug  2 01:08:06 1999
-+++ configure	Wed Sep  8 21:53:59 1999
-@@ -1957,7 +1957,7 @@
- fi
- 
- 
--PIXMAP_PATH="/usr/share/xteddy"
-+PIXMAP_PATH="@PREFIX@/share/xteddy"
- 
- 
- trap '' 1 2 15
diff --git a/x11/xteddy2/patches/patch-ac b/x11/xteddy2/patches/patch-ac
deleted file mode 100644
index ec4554c6346..00000000000
--- a/x11/xteddy2/patches/patch-ac
+++ /dev/null
@@ -1,11 +0,0 @@
-$NetBSD: patch-ac,v 1.2 2006/03/09 14:50:32 ghen Exp $
-
---- xtoys.orig	2006-03-09 15:44:03.000000000 +0100
-+++ xtoys
-@@ -1,5 +1,5 @@
- #!/bin/bash
--ximg="`ls /usr/share/xteddy` `ls /usr/local/share/xteddy`"
-+ximg="`ls @PREFIX@/share/xteddy`"
- NUM=0
- for i in $ximg ; do
-   NUM=`expr $NUM + 1`
diff --git a/x11/xteddy2/patches/patch-configure b/x11/xteddy2/patches/patch-configure
new file mode 100644
index 00000000000..e79f0572346
--- /dev/null
+++ b/x11/xteddy2/patches/patch-configure
@@ -0,0 +1,15 @@
+$NetBSD: patch-configure,v 1.1 2020/11/24 10:12:48 nia Exp $
+
+Don't hardcode the installation prefix.
+
+--- configure.orig	2009-03-09 07:24:39.000000000 +0000
++++ configure
+@@ -5052,7 +5052,7 @@ echo "${ECHO_T}yes" >&6; }
+ 	:
+ fi
+ 
+-PIXMAP_PATH="/usr/share/xteddy"
++PIXMAP_PATH="@PREFIX@/share/xteddy"
+ 
+ 
+ ac_config_files="$ac_config_files Makefile html/Makefile images/Makefile"
diff --git a/x11/xteddy2/patches/patch-ab b/x11/xteddy2/patches/patch-xteddy__test
index 49ba68c0b00..3045ccd178b 100644
--- a/x11/xteddy2/patches/patch-ab
+++ b/x11/xteddy2/patches/patch-xteddy__test
@@ -1,8 +1,10 @@
-$NetBSD: patch-ab,v 1.1.1.1 2000/12/05 22:54:03 hubertf Exp $
+$NetBSD: patch-xteddy__test,v 1.1 2020/11/24 10:12:48 nia Exp $
 
---- xteddy_test.orig	Mon Mar 29 16:04:35 1999
+Don't hardcode the installation prefix.
+
+--- xteddy_test.orig	2009-02-07 20:48:26.000000000 +0000
 +++ xteddy_test
-@@ -1,15 +1,8 @@
+@@ -1,15 +1,9 @@
  #!/bin/sh
  i=0
 -if [ -d /usr/share/xteddy ] ; then
@@ -11,13 +13,13 @@ $NetBSD: patch-ab,v 1.1.1.1 2000/12/05 22:54:03 hubertf Exp $
 +  for img in `ls @PREFIX@/share/xteddy` ; do
      i=`expr $i + 50`
 -    xteddy -F/usr/share/xteddy/$img -geometry +$i+$i &
-+    xteddy -F@PREFIX@/share/xteddy/$img -geometry +$i+$i &
-   done
- fi
+-  done
+-fi
 -if [ -d /usr/local/share/xteddy ] ; then
 -  for img in `ls /usr/local/share/xteddy` ; do
 -    i=`expr $i + 50`
 -    xteddy -F/usr/local/share/xteddy/$img -geometry +$i+$i &
--  done
--fi
--
++    xteddy -F@PREFIX@/share/xteddy/$img -geometry +$i+$i &
+   done
+ fi
+ 
diff --git a/x11/xteddy2/patches/patch-xtoys b/x11/xteddy2/patches/patch-xtoys
new file mode 100644
index 00000000000..d67a88d7099
--- /dev/null
+++ b/x11/xteddy2/patches/patch-xtoys
@@ -0,0 +1,17 @@
+$NetBSD: patch-xtoys,v 1.1 2020/11/24 10:12:48 nia Exp $
+
+Don't hardcode the installation prefix.
+
+--- xtoys.orig	2009-02-07 20:48:26.000000000 +0000
++++ xtoys
+@@ -5,8 +5,8 @@
+ # Thanks to Andrew Stribblehill <a.d.stribblehill@dur.ac.uk>
+ # who supported this script
+ #
+-if [ -d /usr/local/share/xteddy ] ; then
+-  images=(`ls /usr/share/xteddy` `ls /usr/local/share/xteddy 2> /dev/null`)
++if [ -d @PREFIX@/share/xteddy ] ; then
++  images=(`ls @PREFIX@/share/xteddy` `ls @PREFIX@/share/xteddy 2> /dev/null`)
+ else
+   images=(`ls /usr/share/xteddy`)
+ fi