Update to 2.0.2; Aleksander Piotrowski <aleksander.piotrowski@nic.com.pl>

* GPL license. set *_CDROM to Yes
 * perl instead of sed in post-patch. It's shorter
 * new xtoys. Old one didn't work for me
fixes a disappeared distfile issue too

games/xteddy/Makefile

@@ -1,31 +1,32 @@
-# $OpenBSD: Makefile,v 1.12 2002/12/29 15:10:08 fgsch Exp $
+# $OpenBSD: Makefile,v 1.13 2004/01/31 21:32:18 pvalchev Exp $
 
 COMMENT=	"cuddlesome teddy for the X11 desktop"
 
-DISTNAME=	xteddy-2.0.1
+DISTNAME=	xteddy-2.0.2
 CATEGORIES=	games
 MASTER_SITES=	http://www.ITN.LiU.SE/~stegu/xteddy/
 
 LIB_DEPENDS=	Imlib.19::graphics/imlib
 
-PERMIT_PACKAGE_CDROM=	"no fee"
+# GPL
+PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
-PERMIT_DISTFILES_CDROM=	"no fee"
+PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
 CONFIGURE_STYLE= gnu
 CONFIGURE_ENV=  CPPFLAGS="-I${X11BASE}/include -I${LOCALBASE}/include" \
 		LDFLAGS="-L${X11BASE}/lib -L${LOCALBASE}/lib"
 
+NO_REGRESS=	Yes
+
 post-patch:
 .for f in configure xteddy.c
-	@cd ${WRKSRC} && sed -e \
-		s#/usr/share/xteddy#${PREFIX}/share/xteddy#g \
-		< ${f} > ${f}.new && mv -f ${f}.new ${f}
+	@perl -pi -e 's#/usr/share/xteddy#${PREFIX}/share/xteddy#g' \
+		${WRKSRC}/${f}
+.endfor
+.for f in xtoys xteddy_test
+	@perl -pi -e 's#!!PREFIX!!#${PREFIX}#g' ${WRKSRC}/${f}
 .endfor
-	@chmod 755 ${WRKSRC}/configure
-	@cd ${WRKSRC} && sed -e \
-		s#!!PREFIX!!#${PREFIX}#g < xtoys > xtoys.new && \
-		mv -f xtoys.new xtoys
 
 .include <bsd.port.mk>

games/xteddy/distinfo

@@ -1,3 +1,3 @@
-MD5 (xteddy-2.0.1.tar.gz) = d33bfe05f18259a3f7fd17ae256c5644
-RMD160 (xteddy-2.0.1.tar.gz) = 20d5f696e5815bf81cf9f2eba0d6ff83313181e2
-SHA1 (xteddy-2.0.1.tar.gz) = 371810d7a509cbf6ffd3a4d94c87412ae68022d8
+MD5 (xteddy-2.0.2.tar.gz) = c197253b5116db5dc4e32b58dd36160e
+RMD160 (xteddy-2.0.2.tar.gz) = f7b9160f17bb3405c4c360abbab4238ce33e7445
+SHA1 (xteddy-2.0.2.tar.gz) = 612e01792b243d8f512c955fa95561e5dca03a87

games/xteddy/patches/patch-xteddy_test

@@ -0,0 +1,22 @@
+$OpenBSD: patch-xteddy_test,v 1.1 2004/01/31 21:32:19 pvalchev Exp $
+--- xteddy_test.orig	1999-03-29 16:04:35.000000000 +0200
++++ xteddy_test	2004-01-30 23:54:52.000000000 +0100
+@@ -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
+ 

games/xteddy/patches/patch-xtoys

@@ -1,10 +1,28 @@
---- xtoys.orig	Mon Aug  2 02:11:02 1999
-+++ xtoys	Wed Oct  4 01:42:50 2000
-@@ -1,5 +1,5 @@
+--- xtoys.orig	2003-06-30 08:36:35.000000000 +0200
++++ xtoys	2004-01-31 19:26:36.000000000 +0100
+@@ -1,17 +1,16 @@
 -#!/bin/bash
--ximg="`ls /usr/share/xteddy` `ls /usr/local/share/xteddy`"
 +#!/bin/sh
-+ximg="`ls !!PREFIX!!/share/xteddy`"
- NUM=0
- for i in $ximg ; do
-   NUM=`expr $NUM + 1`
+ #
+ # /usr/bin/X11/xtoys -- puts a random cuddly toy onto desktop
+ #
+ # 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`)
+-else
+-  images=(`ls /usr/share/xteddy`)
+-fi
++i=0
++for img in `ls !!PREFIX!!/share/xteddy`; do
++	images[$i]=$img
++	i=`expr $i + 1`
++done
+ 
+-num=${#images[*]}
+-choice=`expr $RANDOM % $num`
++choice=`expr $RANDOM % $i`
+ 
+-/usr/games/xteddy -F${images[choice]} $*
++!!PREFIX!!/bin/xteddy -F${images[choice]} $*

games/xteddy/pkg/PLIST

@@ -1,7 +1,8 @@
-@comment $OpenBSD: PLIST,v 1.3 2000/07/24 14:58:08 kevlo Exp $
+@comment $OpenBSD: PLIST,v 1.4 2004/01/31 21:32:19 pvalchev Exp $
 bin/xteddy
 bin/xteddy_test
 bin/xtoys
+man/man6/xteddy.6
 share/xteddy/teddy.png
 share/xteddy/xalex.png
 share/xteddy/xbobo.png
@@ -14,5 +15,4 @@ share/xteddy/xpenguin.png
 share/xteddy/xruessel.png
 share/xteddy/xteddy.png
 share/xteddy/xtuxxy.png
-man/man1/xteddy.1
 @dirrm share/xteddy