aboutsummaryrefslogtreecommitdiff
path: root/games/xteddy
diff options
context:
space:
mode:
authorArmin Pirkovitsch <sperber@FreeBSD.org>2012-07-19 17:39:58 +0000
committerArmin Pirkovitsch <sperber@FreeBSD.org>2012-07-19 17:39:58 +0000
commit91ff003b69ffe07e915e52dec5edcbe9498b6412 (patch)
tree1946c1d2bf4f7aced05d35bf57963398bd33eb38 /games/xteddy
parent64c8e0c6ab181452d66ae2e4487040d76880441e (diff)
downloadports-91ff003b69ffe07e915e52dec5edcbe9498b6412.tar.gz
ports-91ff003b69ffe07e915e52dec5edcbe9498b6412.zip
Notes
Diffstat (limited to 'games/xteddy')
-rw-r--r--games/xteddy/Makefile29
-rw-r--r--games/xteddy/distinfo4
-rw-r--r--games/xteddy/files/patch-Makefile.in11
-rw-r--r--games/xteddy/files/patch-xteddy.c11
-rw-r--r--games/xteddy/files/patch-xteddy_test20
-rw-r--r--games/xteddy/files/patch-xtoys29
-rw-r--r--games/xteddy/pkg-descr2
-rw-r--r--games/xteddy/pkg-plist16
8 files changed, 67 insertions, 55 deletions
diff --git a/games/xteddy/Makefile b/games/xteddy/Makefile
index f68c3d6bf010..57504ffbe3cf 100644
--- a/games/xteddy/Makefile
+++ b/games/xteddy/Makefile
@@ -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@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>
diff --git a/games/xteddy/distinfo b/games/xteddy/distinfo
index 2803c8d74a14..a8c8e25c4ab0 100644
--- a/games/xteddy/distinfo
+++ b/games/xteddy/distinfo
@@ -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
diff --git a/games/xteddy/files/patch-Makefile.in b/games/xteddy/files/patch-Makefile.in
deleted file mode 100644
index 5a5eee83fdd6..000000000000
--- a/games/xteddy/files/patch-Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.in.orig Mon Aug 2 16:11:08 1999
-+++ Makefile.in Mon Nov 14 23:31:25 2005
-@@ -73,7 +73,7 @@
- man_MANS = xteddy.1
- bin_SCRIPTS = xtoys xteddy_test
-
--DEFS = -DPIXMAP_PATH=\"@PIXMAP_PATH@\" -Wall
-+DEFS = -DPIXMAP_PATH=\"%%DATADIR%%\" -Wall
-
- SUBDIRS = html images
- EXTRA_DIST = $(man_MANS) $(bin_SCRIPTS) README xteddy.README xtuxxy.credit configure autogen.sh
diff --git a/games/xteddy/files/patch-xteddy.c b/games/xteddy/files/patch-xteddy.c
deleted file mode 100644
index eb6be3ed38de..000000000000
--- a/games/xteddy/files/patch-xteddy.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- xteddy.c.orig Mon Nov 14 23:21:26 2005
-+++ xteddy.c Mon Nov 14 23:22:09 2005
-@@ -17,7 +17,7 @@
- /* Changes: use Imlib instead of libxpm and load *
- * different image formats */
-
--#define DEFAULT_IMAGE_DIR "/usr/share/xteddy"
-+#define DEFAULT_IMAGE_DIR "%%DATADIR%%"
-
- #include <X11/Xlib.h>
- #include <X11/Xutil.h>
diff --git a/games/xteddy/files/patch-xteddy_test b/games/xteddy/files/patch-xteddy_test
index da245c7c9d67..990d54c96e68 100644
--- a/games/xteddy/files/patch-xteddy_test
+++ b/games/xteddy/files/patch-xteddy_test
@@ -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
+
diff --git a/games/xteddy/files/patch-xtoys b/games/xteddy/files/patch-xtoys
new file mode 100644
index 000000000000..94886bd2873a
--- /dev/null
+++ b/games/xteddy/files/patch-xtoys
@@ -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@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]} $*
diff --git a/games/xteddy/pkg-descr b/games/xteddy/pkg-descr
index a34bf78d5cb3..422052498abd 100644
--- a/games/xteddy/pkg-descr
+++ b/games/xteddy/pkg-descr
@@ -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/
diff --git a/games/xteddy/pkg-plist b/games/xteddy/pkg-plist
deleted file mode 100644
index bb99d12bd584..000000000000
--- a/games/xteddy/pkg-plist
+++ /dev/null
@@ -1,16 +0,0 @@
-bin/xteddy
-bin/xtoys
-bin/xteddy_test
-%%DATADIR%%/teddy.png
-%%DATADIR%%/xteddy.png
-%%DATADIR%%/xpenguin.png
-%%DATADIR%%/xduck.png
-%%DATADIR%%/xtuxxy.png
-%%DATADIR%%/xalex.png
-%%DATADIR%%/xbobo.png
-%%DATADIR%%/xklitze.png
-%%DATADIR%%/xruessel.png
-%%DATADIR%%/xnamu.png
-%%DATADIR%%/xbrummi.png
-%%DATADIR%%/xorca.png
-@dirrm %%DATADIR%%