7 files changed, 34 insertions, 82 deletions

diff --git a/games/xteddy/Makefile b/games/xteddy/Makefile
index d3c7784afc92..1ae4640c701e 100644
--- a/games/xteddy/Makefile
+++ b/games/xteddy/Makefile
@@ -6,24 +6,29 @@
 #
 
 PORTNAME=	xteddy
-PORTVERSION=	1.0
+PORTVERSION=	1.1
 CATEGORIES=	games
-MASTER_SITES=	# disappeared
+MASTER_SITES=	http://www.itn.liu.se/~stegu/xteddy/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A cuddlesome teddy for the X desktop
 
-BROKEN=		"does not fetch"
-DEPRECATED=	${BROKEN}
-EXPIRATION_DATE=	2005-12-09
-
 NO_CDROM=	"Can only be distributed for free"
 
-USE_IMAKE=	yes
-USE_XPM=	yes
+USE_X_PREFIX=	yes
+USE_REINPLACE=	yes
+GNU_CONFIGURE=	yes
+CONFIGURE_ENV=	CPPFLAGS="-I${X11BASE}/include" \
+		LDFLAGS="-L${X11BASE}/lib"
+
 MAN1=		xteddy.1
-PLIST_FILES=	bin/xteddy
 
-post-install:
-		${STRIP_CMD} ${PREFIX}/bin/xteddy
+post-patch:
+.for file in configure Makefile.in xteddy.1
+	@${REINPLACE_CMD} -e 's|include/X11|share/xteddy|g' ${WRKSRC}/${file}
+.endfor
+
+pre-install:
+	@${MKDIR} ${DATADIR}/pixmaps
+
 .include <bsd.port.mk>
diff --git a/games/xteddy/distinfo b/games/xteddy/distinfo
index ea6bd8481528..3ce616721931 100644
--- a/games/xteddy/distinfo
+++ b/games/xteddy/distinfo
@@ -1,2 +1,2 @@
-MD5 (xteddy-1.0.tar.gz) = ec01c374400d56536137e2f3bffd3f25
-SIZE (xteddy-1.0.tar.gz) = 42279
+MD5 (xteddy-1.1.tar.gz) = 24a91f882f9113cbbc1c1d44b00f6d61
+SIZE (xteddy-1.1.tar.gz) = 117141
diff --git a/games/xteddy/files/patch-aa b/games/xteddy/files/patch-aa
deleted file mode 100644
index 042c100ece27..000000000000
--- a/games/xteddy/files/patch-aa
+++ /dev/null
@@ -1,11 +0,0 @@
---- Imakefile.orig	Mon Jan 31 20:12:14 1994
-+++ Imakefile	Wed Jun  3 17:14:29 1998
-@@ -1,6 +1,6 @@
-   SYS_LIBRARIES = -lX11 -lXext
-- EXTRA_INCLUDES = -I$(HOME)/include/X11
--EXTRA_LIBRARIES = -L$(HOME)/lib -lXpm
-+ EXTRA_INCLUDES = -I$(INCROOT)/X11
-+EXTRA_LIBRARIES = -L$(USRLIBDIR) -lXpm
-            SRCS = xteddy.c
-            OBJS = xteddy.o
- 
diff --git a/games/xteddy/files/patch-ab b/games/xteddy/files/patch-ab
deleted file mode 100644
index 645113b6fa7c..000000000000
--- a/games/xteddy/files/patch-ab
+++ /dev/null
@@ -1,16 +0,0 @@
---- xteddy.man.orig	Wed Jun  3 17:23:30 1998
-+++ xteddy.man	Wed Jun  3 17:08:40 1998
-@@ -0,0 +1,13 @@
-+.Dd Jun 03, 1998
-+.Dt XTEDDY 1
-+.Os
-+.Sh NAME
-+.Nm xteddy
-+.Nd shows a cuddlesome teddy on the X desktop
-+.Sh SYNOPSIS
-+.Nm xteddy
-+.Sh DESCRIPTION
-+.Nm xteddy 
-+shows a very cuddlesome teddy on the X desktop. The teddy can be removed
-+by moving the mouse cursor over the teddy and typing "q" or "Q". But it's
-+not advised to do that.
diff --git a/games/xteddy/files/patch-ac b/games/xteddy/files/patch-ac
deleted file mode 100644
index 715282d49b69..000000000000
--- a/games/xteddy/files/patch-ac
+++ /dev/null
@@ -1,37 +0,0 @@
---- xteddy.c.orig	Mon Jan 31 20:12:15 1994
-+++ xteddy.c	Wed Jun  3 17:09:27 1998
-@@ -19,7 +19,7 @@
- #include <X11/cursorfont.h>
- 
- #ifndef NOXPM
--#include <xpm.h>
-+#include <X11/xpm.h>
- #endif
- 
- #include <stdio.h>
-@@ -33,6 +33,14 @@
- #include "xteddy_color.xpm"
- #endif
- 
-+#ifndef TRUE
-+#define TRUE 1
-+#endif /* TRUE */
-+
-+#ifndef FALSE
-+#define FALSE 0
-+#endif /* FALSE */
-+
- #include "patchlevel.h"
- 
- static char *progname;
-@@ -335,8 +343,8 @@
- 	  break;
- 	case KeyPress:
- 	  /* Exit on "q" or "Q" */
--	  charcount = XLookupString(&report, buffer, bufsize,
--				    &keysym, &compose);
-+	  charcount = XLookupString(&report.xkey, 
-+				    buffer, bufsize, &keysym, &compose);
- 	  if((keysym == XK_Q) || (keysym == XK_q))
- 	    {
- 	      XCloseDisplay(display);
diff --git a/games/xteddy/pkg-descr b/games/xteddy/pkg-descr
index 4ade19666c7c..a34bf78d5cb3 100644
--- a/games/xteddy/pkg-descr
+++ b/games/xteddy/pkg-descr
@@ -1,8 +1,4 @@
 This is _the_ toy for the X desktop, a must for all plush lovers: a very,
 very cuddlesome teddy.
 
-Thanks to Felix Schroeter (felix@openbsd.org) for helpful hints to create
-this port.
-
-- Eckart Hofmann
-Isegrim@Wunder-Nett.org
+WWW: http://www.itn.liu.se/~stegu/xteddy/
diff --git a/games/xteddy/pkg-plist b/games/xteddy/pkg-plist
new file mode 100644
index 000000000000..aee0b0bf4218
--- /dev/null
+++ b/games/xteddy/pkg-plist
@@ -0,0 +1,15 @@
+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
+@dirrm %%DATADIR%%