CVS commit: pkgsrc/x11/xteddy2

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Tue Nov 24 10:12:48 UTC 2020

Modified Files:
        pkgsrc/x11/xteddy2: Makefile PLIST distinfo
Added Files:
        pkgsrc/x11/xteddy2/patches: patch-configure patch-xteddy__test
            patch-xtoys
Removed Files:
        pkgsrc/x11/xteddy2/patches: patch-aa patch-ab patch-ac

Log Message:
xteddy2: Update to 2.2

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


To generate a diff of this commit:
cvs rdiff -u -r1.46 -r1.47 pkgsrc/x11/xteddy2/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/x11/xteddy2/PLIST
cvs rdiff -u -r1.7 -r1.8 pkgsrc/x11/xteddy2/distinfo
cvs rdiff -u -r1.1.1.1 -r0 pkgsrc/x11/xteddy2/patches/patch-aa \
    pkgsrc/x11/xteddy2/patches/patch-ab
cvs rdiff -u -r1.2 -r0 pkgsrc/x11/xteddy2/patches/patch-ac
cvs rdiff -u -r0 -r1.1 pkgsrc/x11/xteddy2/patches/patch-configure \
    pkgsrc/x11/xteddy2/patches/patch-xteddy__test \
    pkgsrc/x11/xteddy2/patches/patch-xtoys

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/x11/xteddy2/Makefile
diff -u pkgsrc/x11/xteddy2/Makefile:1.46 pkgsrc/x11/xteddy2/Makefile:1.47
--- pkgsrc/x11/xteddy2/Makefile:1.46    Fri Jun  5 12:49:18 2020
+++ pkgsrc/x11/xteddy2/Makefile Tue Nov 24 10:12:48 2020
@@ -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@localhost
 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"

Index: pkgsrc/x11/xteddy2/PLIST
diff -u pkgsrc/x11/xteddy2/PLIST:1.2 pkgsrc/x11/xteddy2/PLIST:1.3
--- pkgsrc/x11/xteddy2/PLIST:1.2        Sun Jun 14 18:25:19 2009
+++ pkgsrc/x11/xteddy2/PLIST    Tue Nov 24 10:12:48 2020
@@ -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

Index: pkgsrc/x11/xteddy2/distinfo
diff -u pkgsrc/x11/xteddy2/distinfo:1.7 pkgsrc/x11/xteddy2/distinfo:1.8
--- pkgsrc/x11/xteddy2/distinfo:1.7     Wed Nov  4 03:29:12 2015
+++ pkgsrc/x11/xteddy2/distinfo Tue Nov 24 10:12:48 2020
@@ -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

Added files:

Index: pkgsrc/x11/xteddy2/patches/patch-configure
diff -u /dev/null pkgsrc/x11/xteddy2/patches/patch-configure:1.1
--- /dev/null   Tue Nov 24 10:12:48 2020
+++ pkgsrc/x11/xteddy2/patches/patch-configure  Tue Nov 24 10:12:48 2020
@@ -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"
Index: pkgsrc/x11/xteddy2/patches/patch-xteddy__test
diff -u /dev/null pkgsrc/x11/xteddy2/patches/patch-xteddy__test:1.1
--- /dev/null   Tue Nov 24 10:12:48 2020
+++ pkgsrc/x11/xteddy2/patches/patch-xteddy__test       Tue Nov 24 10:12:48 2020
@@ -0,0 +1,25 @@
+$NetBSD: patch-xteddy__test,v 1.1 2020/11/24 10:12:48 nia Exp $
+
+Don't hardcode the installation prefix.
+
+--- xteddy_test.orig   2009-02-07 20:48:26.000000000 +0000
++++ xteddy_test
+@@ -1,15 +1,9 @@
+ #!/bin/sh
+ i=0
+-if [ -d /usr/share/xteddy ] ; then
+-  for img in `ls /usr/share/xteddy` ; do
++if [ -d @PREFIX@/share/xteddy ] ; then
++  for img in `ls @PREFIX@/share/xteddy` ; do
+     i=`expr $i + 50`
+-    xteddy -F/usr/share/xteddy/$img -geometry +$i+$i &
+-  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 &
++    xteddy -F@PREFIX@/share/xteddy/$img -geometry +$i+$i &
+   done
+ fi
+ 
Index: pkgsrc/x11/xteddy2/patches/patch-xtoys
diff -u /dev/null pkgsrc/x11/xteddy2/patches/patch-xtoys:1.1
--- /dev/null   Tue Nov 24 10:12:48 2020
+++ pkgsrc/x11/xteddy2/patches/patch-xtoys      Tue Nov 24 10:12:48 2020
@@ -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@localhost>
+ # 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