svn commit: r301175 - in head/games/xteddy: . files

[Armin Pirkovitsch]

Author: sperber
Date: Thu Jul 19 17:39:58 2012
New Revision: 301175
URL: http://svn.freebsd.org/changeset/ports/301175

Log:
  - Update to version 2.2
  - Update WWW: line
  - Add LICENSE
  
  PR:           ports/169417
  Submitted by: KATO Tsuguru <tkato432 _at_ yahoo.com>
  Approved by:  beat (mentor)

Added:
  head/games/xteddy/files/patch-xtoys   (contents, props changed)
Deleted:
  head/games/xteddy/files/patch-Makefile.in
  head/games/xteddy/files/patch-xteddy.c
  head/games/xteddy/pkg-plist
Modified:
  head/games/xteddy/Makefile   (contents, props changed)
  head/games/xteddy/distinfo   (contents, props changed)
  head/games/xteddy/files/patch-xteddy_test   (contents, props changed)
  head/games/xteddy/pkg-descr   (contents, props changed)

Modified: head/games/xteddy/Makefile
==============================================================================
--- head/games/xteddy/Makefile	Thu Jul 19 17:39:10 2012	(r301174)
+++ head/games/xteddy/Makefile	Thu Jul 19 17:39:58 2012	(r301175)
@@ -6,26 +6,41 @@
 #    $MCom: ports/games/xteddy/Makefile,v 1.1 2006/10/04 13:16:56 ahze Exp $
 
 PORTNAME=	xteddy
-PORTVERSION=	2.0.2
-PORTREVISION=	8
+PORTVERSION=	2.2
 CATEGORIES=	games
-MASTER_SITES=	http://staffwww.itn.liu.se/~stegu/xteddy/
+MASTER_SITES=	http://webstaff.itn.liu.se/~stegu/xteddy/
 
 MAINTAINER=	ports at FreeBSD.org
 COMMENT=	A cuddlesome teddy for the X desktop
 
-NO_CDROM=	Can only be distributed for free
+LICENSE=	GPLv2
 
+USE_EFL=	imlib2
 GNU_CONFIGURE=	yes
+
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
-USE_GNOME=	imlib
 
 MAN6=		xteddy.6
+PLIST_FILES=	bin/xteddy bin/xteddy_test bin/xtoys \
+		%%DATADIR%%/teddy.png %%DATADIR%%/xalex.png \
+		%%DATADIR%%/xbobo.png %%DATADIR%%/xbrummi.png \
+		%%DATADIR%%/xcherubino.png %%DATADIR%%/xduck.png \
+		%%DATADIR%%/xhedgehog.png %%DATADIR%%/xklitze.png \
+		%%DATADIR%%/xnamu.png %%DATADIR%%/xorca.png \
+		%%DATADIR%%/xpenguin.png %%DATADIR%%/xpuppy.png \
+		%%DATADIR%%/xruessel.png %%DATADIR%%/xteddy.png \
+		%%DATADIR%%/xtrouble.png %%DATADIR%%/xtuxxy.png
+PLIST_DIRS=	%%DATADIR%%
 
 post-patch:
-.for f in xteddy.c Makefile.in xteddy_test
-	@${REINPLACE_CMD} -e 's,%%DATADIR%%,${DATADIR},g' ${WRKSRC}/${f}
+.for f in configure xteddy.c
+	@${REINPLACE_CMD} -e \
+		's|/usr/share/xteddy|${DATADIR}|' ${WRKSRC}/${f}
+.endfor
+.for f in xteddy_test xtoys
+	@${REINPLACE_CMD} -e \
+		's|%%PREFIX%%|${PREFIX}|' ${WRKSRC}/${f}
 .endfor
 
 .include <bsd.port.mk>

Modified: head/games/xteddy/distinfo
==============================================================================
--- head/games/xteddy/distinfo	Thu Jul 19 17:39:10 2012	(r301174)
+++ head/games/xteddy/distinfo	Thu Jul 19 17:39:58 2012	(r301175)
@@ -1,2 +1,2 @@
-SHA256 (xteddy-2.0.2.tar.gz) = 4c137049c94a827c642a11711c101b241c203a97dad5eb6917387a6465078363
-SIZE (xteddy-2.0.2.tar.gz) = 355490
+SHA256 (xteddy-2.2.tar.gz) = d8885a1e2e08787cb469857a9404619cadab9bddcae7fa398a565d53633291e2
+SIZE (xteddy-2.2.tar.gz) = 867005

Modified: head/games/xteddy/files/patch-xteddy_test
==============================================================================
--- head/games/xteddy/files/patch-xteddy_test	Thu Jul 19 17:39:10 2012	(r301174)
+++ head/games/xteddy/files/patch-xteddy_test	Thu Jul 19 17:39:58 2012	(r301175)
@@ -1,15 +1,21 @@
---- xteddy_test.orig	Mon Nov 14 23:33:19 2005
-+++ xteddy_test	Mon Nov 14 23:33:37 2005
-@@ -1,9 +1,9 @@
+--- xteddy_test.orig	2009-02-08 05:48:26.000000000 +0900
++++ xteddy_test	2012-06-21 16:03:21.000000000 +0900
+@@ -1,15 +1,9 @@
  #!/bin/sh
  i=0
 -if [ -d /usr/share/xteddy ] ; then
 -  for img in `ls /usr/share/xteddy` ; do
-+if [ -d %%DATADIR%% ] ; then
-+  for img in `ls %%DATADIR%%` ; 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 &
-+    xteddy -F%%DATADIR%%/$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
- if [ -d /usr/local/share/xteddy ] ; then
+ 

Added: head/games/xteddy/files/patch-xtoys
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/games/xteddy/files/patch-xtoys	Thu Jul 19 17:39:58 2012	(r301175)
@@ -0,0 +1,29 @@
+--- xtoys.orig	2009-02-08 05:48:26.000000000 +0900
++++ xtoys	2012-06-21 16:03:49.000000000 +0900
+@@ -1,17 +1,16 @@
+-#!/bin/bash
++#!/bin/sh
+ #
+-# /usr/bin/X11/xtoys -- puts a random cuddly toy onto desktop
++# %%PREFIX%%/bin/xtoys -- puts a random cuddly toy onto desktop
+ #
+ # Thanks to Andrew Stribblehill <a.d.stribblehill at 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]} $*

Modified: head/games/xteddy/pkg-descr
==============================================================================
--- head/games/xteddy/pkg-descr	Thu Jul 19 17:39:10 2012	(r301174)
+++ head/games/xteddy/pkg-descr	Thu Jul 19 17:39:58 2012	(r301175)
@@ -1,4 +1,4 @@
 This is _the_ toy for the X desktop, a must for all plush lovers: a very,
 very cuddlesome teddy.
 
-WWW: http://www.itn.liu.se/~stegu/xteddy/
+WWW: http://webstaff.itn.liu.se/~stegu/xteddy/