5 files changed, 44 insertions, 76 deletions

diff --git a/games/wmminichess/Makefile b/games/wmminichess/Makefile
index 9351167dda6d..7627d918e973 100644
--- a/games/wmminichess/Makefile
+++ b/games/wmminichess/Makefile
@@ -1,13 +1,9 @@
-# New ports collection makefile for:	(wm)miniCHESS
-# Date created:		24 Sep 1999
-# Whom:			Will Andrews <andrews@technologist.com>
-#
+# Created by: Will Andrews <andrews@technologist.com>
 # $FreeBSD$
-#
 
 PORTNAME=	wmminichess
 PORTVERSION=	0.8
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	games
 MASTER_SITES=	http://web.cs.mun.ca/~gstarkes/wmaker/dockapps/files/
 DISTNAME=	miniCHESS-${PORTVERSION}
@@ -16,14 +12,30 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Window Maker chess dockapp game
 
 LICENSE=	GPLv2 # (or later)
-LICENSE_FILE=	${WRKSRC}/COPYING
 
 RUN_DEPENDS=	${LOCALBASE}/bin/gnuchess:${PORTSDIR}/games/gnuchess
 
-USE_GMAKE=	YES
 USE_XORG=	xpm
-MAKE_ENV=	INSTALL_PROGRAM="${INSTALL_PROGRAM}" \
-		LOCAL="${LOCALBASE}" MKDIR="${MKDIR}" \
-		INSTALL_DATA="${INSTALL_DATA}"
+
+CPPFLAGS+=	-I${LOCALBASE}/include -DENGINE=\"${LOCALBASE}/bin/gnuchessx\"
+LDFLAGS+=	-L${LOCALBASE}/lib -lXpm -lXext -lX11
+
+PORTDOCS=	README TODO
+PLIST_FILES=	bin/minichess
+
+.include <bsd.port.options.mk>
+
+do-build:
+	(cd ${WRKSRC} \
+		&& ${CC} ${CFLAGS} ${CPPFLAGS} -o minichess *.c ${LDFLAGS})
+
+do-install:
+	(cd ${WRKSRC} && ${INSTALL_PROGRAM} minichess ${PREFIX}/bin)
+.if ${PORT_OPTIONS:MDOCS}
+	@${MKDIR} ${DOCSDIR}
+.for i in ${PORTDOCS}
+	(cd ${WRKSRC} && ${INSTALL_DATA} ${i} ${DOCSDIR})
+.endfor
+.endif
 
 .include <bsd.port.mk>
diff --git a/games/wmminichess/files/patch-aa b/games/wmminichess/files/patch-aa
deleted file mode 100644
index 7f68bd6d8e3f..000000000000
--- a/games/wmminichess/files/patch-aa
+++ /dev/null
@@ -1,60 +0,0 @@
---- Makefile.orig	Wed Jul 28 21:59:39 1999
-+++ Makefile	Wed Sep 29 20:13:10 1999
-@@ -20,34 +20,43 @@
- # (See COPYING / GPL-2.0)
- #
- 
-+# PREFIX on FreeBSD
-+PREFIX ?= /usr/X11R6
-+LOCAL = ${LOCALBASE}
-+
-+# Other stuff.
-+SHARE_DIR = $(PREFIX)/share/wmminichess
-+#INSTALL_DATA = install -c -o root -g wheel -m 644
-+#INSTALL_PROGRAM = install -c -s -o root -g wheel -m 755
- 
- # Specify the location of gnuchessx on your system.
--GNUCHESS = /usr/local/bin/gnuchessx
-+GNUCHESS = $(LOCAL)/bin/gnuchessx
- 
- # Where do you want the binary installed?
--DESTDIR = /usr/local/bin
-+DESTDIR = $(PREFIX)/bin
- 
- # What do you want to name the binary?
- BIN_NAME = minichess
- 
--# Uncomment this line if your using Solaris.
--#SOLARIS_LIBS = -lsocket
--
--CFLAGS = -ansi -I/usr/X11R6/include
--LIBDIR = -L/usr/X11R6/lib
--LIBS   = -lXpm -lXext -lX11 $(SOLARIS_LIBS)
-+CFLAGS += -I$(PREFIX)/include
-+LIBDIR = -L$(PREFIX)/lib
-+LIBS   = -lXpm -lXext -lX11
- OBJS   = chess.o xgen.o
- 
- .c.o:
--	gcc $(CFLAGS) -DENGINE=\"$(GNUCHESS)\" -c $< -o $*.o
-+	${CC} $(CFLAGS) -DENGINE=\"$(GNUCHESS)\" -c $< -o $*.o
-+
-+all: $(BIN_NAME)
- 
- $(BIN_NAME): $(OBJS)
--	gcc $(CFLAGS) -o $(BIN_NAME) $(OBJS) $(LIBDIR) $(LIBS)
-+	${CC} $(CFLAGS) -o $(BIN_NAME) $(OBJS) $(LIBDIR) $(LIBS)
- 
- clean:
- 	rm -f $(OBJS) $(BIN_NAME)
- 
--install:
--	cp -f $(BIN_NAME) $(DESTDIR)
--	chmod 755 $(DESTDIR)/$(BIN_NAME)
--
-+install: $(BIN_NAME)
-+	$(MKDIR) $(SHARE_DIR)
-+	$(INSTALL_PROGRAM) $(BIN_NAME) $(DESTDIR)
-+	$(INSTALL_DATA) README $(SHARE_DIR)
-+	$(INSTALL_DATA) TODO $(SHARE_DIR)
-+	$(INSTALL_DATA) COPYING $(SHARE_DIR)
diff --git a/games/wmminichess/files/patch-chess.c b/games/wmminichess/files/patch-chess.c
new file mode 100644
index 000000000000..5afa87b99557
--- /dev/null
+++ b/games/wmminichess/files/patch-chess.c
@@ -0,0 +1,11 @@
+--- chess.c.bak	1999-09-14 02:15:50.000000000 +0900
++++ chess.c	2012-10-24 03:04:11.000000000 +0900
+@@ -1972,7 +1972,7 @@
+  *
+  * RETURNS: N/A
+  */
+-void main(int argc, char* argv[])
++int main(int argc, char* argv[])
+     {
+     int toChild[2];
+     int fromChild[2];
diff --git a/games/wmminichess/files/patch-xgen.c b/games/wmminichess/files/patch-xgen.c
new file mode 100644
index 000000000000..0fa4a73f7b84
--- /dev/null
+++ b/games/wmminichess/files/patch-xgen.c
@@ -0,0 +1,10 @@
+--- xgen.c.orig	1999-07-29 14:00:50.000000000 +0900
++++ xgen.c	2012-10-24 03:05:24.000000000 +0900
+@@ -30,6 +30,7 @@
+  */
+ 
+ #include <stdio.h>
++#include <stdlib.h>
+ #include <string.h>
+ #include <X11/Xlib.h>
+ #include <X11/xpm.h>
diff --git a/games/wmminichess/pkg-plist b/games/wmminichess/pkg-plist
deleted file mode 100644
index f41eb27b72dc..000000000000
--- a/games/wmminichess/pkg-plist
+++ /dev/null
@@ -1,5 +0,0 @@
-bin/minichess
-share/wmminichess/README
-share/wmminichess/COPYING
-share/wmminichess/TODO
-@dirrm share/wmminichess