6 files changed, 58 insertions, 21 deletions

diff --git a/games/xteddy/Makefile b/games/xteddy/Makefile
index 1ae4640c701e..4e4b3452943f 100644
--- a/games/xteddy/Makefile
+++ b/games/xteddy/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	xteddy
-PORTVERSION=	1.1
+PORTVERSION=	2.0.1
 CATEGORIES=	games
 MASTER_SITES=	http://www.itn.liu.se/~stegu/xteddy/
 
@@ -20,15 +20,13 @@ USE_REINPLACE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${X11BASE}/include" \
 		LDFLAGS="-L${X11BASE}/lib"
+USE_GNOME=	imlib
 
 MAN1=		xteddy.1
 
 post-patch:
-.for file in configure Makefile.in xteddy.1
-	@${REINPLACE_CMD} -e 's|include/X11|share/xteddy|g' ${WRKSRC}/${file}
+.for f in xteddy.c Makefile.in xteddy_test
+	@${REINPLACE_CMD} -e 's,%%DATADIR%%,${DATADIR},g' ${WRKSRC}/${f}
 .endfor
 
-pre-install:
-	@${MKDIR} ${DATADIR}/pixmaps
-
 .include <bsd.port.mk>
diff --git a/games/xteddy/distinfo b/games/xteddy/distinfo
index 3ce616721931..bf8ebe5ce86a 100644
--- a/games/xteddy/distinfo
+++ b/games/xteddy/distinfo
@@ -1,2 +1,3 @@
-MD5 (xteddy-1.1.tar.gz) = 24a91f882f9113cbbc1c1d44b00f6d61
-SIZE (xteddy-1.1.tar.gz) = 117141
+MD5 (xteddy-2.0.1.tar.gz) = d33bfe05f18259a3f7fd17ae256c5644
+SHA256 (xteddy-2.0.1.tar.gz) = d1f4bc525f292709714b0d1be401967090a3d1ae1e89ff3ccaf4080d5eae94f1
+SIZE (xteddy-2.0.1.tar.gz) = 348055
diff --git a/games/xteddy/files/patch-Makefile.in b/games/xteddy/files/patch-Makefile.in
new file mode 100644
index 000000000000..5a5eee83fdd6
--- /dev/null
+++ b/games/xteddy/files/patch-Makefile.in
@@ -0,0 +1,11 @@
+--- 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
new file mode 100644
index 000000000000..eb6be3ed38de
--- /dev/null
+++ b/games/xteddy/files/patch-xteddy.c
@@ -0,0 +1,11 @@
+--- 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
new file mode 100644
index 000000000000..da245c7c9d67
--- /dev/null
+++ b/games/xteddy/files/patch-xteddy_test
@@ -0,0 +1,15 @@
+--- xteddy_test.orig	Mon Nov 14 23:33:19 2005
++++ xteddy_test	Mon Nov 14 23:33:37 2005
+@@ -1,9 +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
+     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
diff --git a/games/xteddy/pkg-plist b/games/xteddy/pkg-plist
index aee0b0bf4218..bb99d12bd584 100644
--- a/games/xteddy/pkg-plist
+++ b/games/xteddy/pkg-plist
@@ -1,15 +1,16 @@
 bin/xteddy
-%%DATADIR%%/pixmaps/teddy_bw.xbm
-%%DATADIR%%/pixmaps/teddy_color.xpm
-%%DATADIR%%/pixmaps/teddy_icon.xbm
-%%DATADIR%%/pixmaps/teddy_mask.xbm
-%%DATADIR%%/pixmaps/xpenguin_bw.xbm
-%%DATADIR%%/pixmaps/xpenguin_color.xpm
-%%DATADIR%%/pixmaps/xpenguin_icon.xbm
-%%DATADIR%%/pixmaps/xpenguin_mask.xbm
-%%DATADIR%%/pixmaps/xteddy_bw.xbm
-%%DATADIR%%/pixmaps/xteddy_color.xpm
-%%DATADIR%%/pixmaps/xteddy_icon.xbm
-%%DATADIR%%/pixmaps/xteddy_mask.xbm
-@dirrm %%DATADIR%%/pixmaps
+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%%