Fix the port after ftp.freesoftware.com went away.

Submitted by:	Cyrille Lefevre <clefevre@citeweb.net>

9 files changed, 29 insertions, 49 deletions

diff --git a/games/xneko/Makefile b/games/xneko/Makefile
index 7788f8b5a91a..092e65e764ad 100644
--- a/games/xneko/Makefile
+++ b/games/xneko/Makefile
@@ -6,18 +6,17 @@
 #
 
 PORTNAME=	xneko
-PORTVERSION=	4.4
+PORTVERSION=	1.0
+PORTEPOCH=	1
 CATEGORIES=	games
-MASTER_SITES=	ftp://ftp.freesoftware.com/pub/4.4BSD-Lite/4.4BSD-Lite/usr/src/games/
+MASTER_SITES=	${MASTER_SITE_XCONTRIB}
+MASTER_SITE_SUBDIR=	../R5contrib
 DISTNAME=	${PORTNAME}
 
 MAINTAINER=	markm@FreeBSD.org
 
+NO_WRKSUBDIR=	yes
+USE_IMAKE=	yes
 MAN6=		xneko.6
-MANCOMPRESSED=	maybe
-
-USE_X_PREFIX=	yes
-IGNOREFILES=	${DISTFILES}
-WRKSRC=		${WRKDIR}/pub/bsd-sources/4.4BSD-Lite/usr/src/games/xneko
 
 .include <bsd.port.mk>
diff --git a/games/xneko/distinfo b/games/xneko/distinfo
index 9b7b21f65590..3ab9e571b55f 100644
--- a/games/xneko/distinfo
+++ b/games/xneko/distinfo
@@ -1 +1 @@
-MD5 (xneko.tar.gz) = IGNORE
+MD5 (xneko.tar.gz) = f69ee710279c0097f2057d5acf1831f6
diff --git a/games/xneko/files/patch-Imakefile b/games/xneko/files/patch-Imakefile
new file mode 100644
index 000000000000..0b9eacc9922d
--- /dev/null
+++ b/games/xneko/files/patch-Imakefile
@@ -0,0 +1,10 @@
+--- Imakefile.orig	Sun Sep  2 05:28:44 1990
++++ Imakefile	Wed Sep 12 16:54:29 2001
+@@ -1,5 +1,7 @@
+ LOCAL_LIBRARIES = -lX11 -lm
+ 
++MANSUFFIX = 6
++
+ SimpleProgramTarget(xneko)
+ 
+ install:: install.man
diff --git a/games/xneko/files/patch-aa b/games/xneko/files/patch-aa
deleted file mode 100644
index 483988a15c8c..000000000000
--- a/games/xneko/files/patch-aa
+++ /dev/null
@@ -1,37 +0,0 @@
-diff -udr ../xneko.BSD/Makefile ./Makefile
---- ../xneko.BSD/Makefile	Tue Jun  1 03:46:11 1993
-+++ ./Makefile	Fri Dec 22 19:16:13 1995
-@@ -1,8 +1,17 @@
- #	@(#)Makefile	8.1 (Berkeley) 5/31/93
- 
- PROG=	xneko
--MAN6=	xneko.0
--DPADD=	${LIBX} ${LIBM}
--LDADD=	-lX11/X11 -lm
-+MAN6=	xneko.6
-+
-+DPADD+=		${X11BASE}/lib/libX11.a ${LIBM}
-+CFLAGS+=	-I${X11BASE}/include
-+LDDESTDIR+=	-L${X11BASE}/lib
-+LDADD+=		-lX11 -lm
-+
-+MANDIR=        ${X11BASE}/man/man
-+
-+BINOWN=        bin
-+BINDIR=        ${X11BASE}/bin
-+BINMODE=       755
- 
- .include <bsd.prog.mk>
-diff -udr ../xneko.BSD/xneko.c ./xneko.c
---- ../xneko.BSD/xneko.c	Tue Jun  1 03:46:10 1993
-+++ ./xneko.c	Fri Dec 22 19:10:44 1995
-@@ -139,6 +139,9 @@
- 
- #include <stdio.h>
- 
-+#include <stdlib.h>
-+#include <string.h>
-+
- #include <signal.h>
- #include <math.h>
- #include <sys/time.h>
diff --git a/games/xneko/files/patch-xneko.man b/games/xneko/files/patch-xneko.man
new file mode 100644
index 000000000000..61bec89db82e
--- /dev/null
+++ b/games/xneko/files/patch-xneko.man
@@ -0,0 +1,8 @@
+--- xneko.man.orig	Sun Sep  2 05:27:21 1990
++++ xneko.man	Wed Sep 12 16:54:38 2001
+@@ -1,4 +1,4 @@
+-.TH xneko SIPB "1 September 1990" "X Version 11"
++.TH xneko 6 "1 September 1990" "X Version 11"
+ .SH NAME
+ xneko \- cat-and-mouse chase in an X window
+ .SH SYNOPSIS
diff --git a/games/xneko/pkg-comment b/games/xneko/pkg-comment
index c90b39cc08bd..d499d6a96d0b 100644
--- a/games/xneko/pkg-comment
+++ b/games/xneko/pkg-comment
@@ -1 +1 @@
-The classic BSD4.4 cat-and-mouse
+The classic cat-and-mouse
diff --git a/games/xneko/pkg-descr b/games/xneko/pkg-descr
index 4a9ba4db2b5e..86547d8ba7e4 100644
--- a/games/xneko/pkg-descr
+++ b/games/xneko/pkg-descr
@@ -1,5 +1,4 @@
-Xneko  displays a  window  in  which  a  cat  chases your ``mouse''
-cursor.
+Xneko displays a window in which a cat chases your ``mouse'' cursor.
 
 The word ``neko'' means ``cat'' in Japanese.
 
diff --git a/games/xneko/pkg-plist b/games/xneko/pkg-plist
index c9ef73d07936..d6a830f636ba 100644
--- a/games/xneko/pkg-plist
+++ b/games/xneko/pkg-plist
@@ -1 +1,2 @@
+@comment $FreeBSD$
 bin/xneko
diff --git a/games/xroach/Makefile b/games/xroach/Makefile
index c87a6fe500d8..6f594e622af0 100644
--- a/games/xroach/Makefile
+++ b/games/xroach/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	xroach
 PORTVERSION=	4.4
 CATEGORIES=	games
-MASTER_SITES=	ftp://ftp.freesoftware.com/pub/4.4BSD-Lite/4.4BSD-Lite/usr/src/games/
+MASTER_SITES=	${MASTER_SITE_BACKUP}
 DISTNAME=	${PORTNAME}
 
 MAINTAINER=	markm@FreeBSD.org