3 files changed, 39 insertions, 33 deletions

diff --git a/games/xvmines/Makefile b/games/xvmines/Makefile
index f1f1e19da962..e034bbd4961b 100644
--- a/games/xvmines/Makefile
+++ b/games/xvmines/Makefile
@@ -1,31 +1,37 @@
-# New ports collection makefile for:	xvmines
-# Date created:				18 March 1998
-# Whom:					Andrey Zakhvatov
-#
+# Created by: Andrey Zakhvatov
 # $FreeBSD$
-#
 
 PORTNAME=	xvmines
 PORTVERSION=	1.0
 PORTREVISION=	2
 CATEGORIES=	games
-MASTER_SITES=	ftp://ftp.x.org/R5contrib/
+MASTER_SITES=	XCONTRIB/../R5contrib
 EXTRACT_SUFX=	.tar.Z
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Simple minesweeper game for X Window System
 
-LIB_DEPENDS=	xview.3:${PORTSDIR}/x11-toolkits/xview
+LIB_DEPENDS=	xview:${PORTSDIR}/x11-toolkits/xview
+
+OPTIONS_DEFINE=	DOCS
 
-USE_IMAKE=	yes
 USE_XORG=	x11
-MAN6=		xvmines.6
+USE_IMAKE=	yes
+MAKE_JOBS_SAFE=	yes
+
 MANCOMPRESSED=	no
+MAN6=		xvmines.6
+PORTDOCS=	Copyright
+PLIT_FILES=	bin/xvmines
+
+.include <bsd.port.options.mk>
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/xvmines ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/xvmines.man ${PREFIX}/man/man6/xvmines.6
-	@${MKDIR} ${PREFIX}/share/doc/xvmines
-	${INSTALL_DATA} ${WRKSRC}/Copyright ${PREFIX}/share/doc/xvmines
+	${INSTALL_MAN} ${WRKSRC}/xvmines.man ${MAN6PREFIX}/man/man6/xvmines.6
+.if ${PORT_OPTIONS:MDOCS}
+	@${MKDIR} ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/Copyright ${DOCSDIR}
+.endif
 
 .include <bsd.port.mk>
diff --git a/games/xvmines/pkg-descr b/games/xvmines/pkg-descr
index b65a9ebdb679..9e607bdb1446 100644
--- a/games/xvmines/pkg-descr
+++ b/games/xvmines/pkg-descr
@@ -1,18 +1,21 @@
-   XVmines is a simple minesweeper game for X Window System.
-   xvmines creates a rectangle on the screen, divided into  equally
-sized cells. Each cell may contain a mine (hence the name xvmines),
-contain a number  indicating  the  number of  mines  present in the 
-8-neighboring cells or be empty.
-   Initially,  all  cells  are  covered  with  tiles. A tile can be
-removed,  uncovering  the  cell  below, by  clicking the left mouse
-button on it. In addition,a cell can be marked as containing a mine
-by clicking the right mouse button on it. Note however that marking
-a cell as containing a mine does not necessarily mean that the cell
-really contains a mine!
-   Clicking  the  middle  mouse  button  on a tile, marks it with a
-question mark, acting as a reminder mechanism. The user can use the
-numbers in the uncovered  cells  to  find  (or sometimes guess ...)
-which cells contain mines and which do not.
-   A game  ends  when  all  cells  not  containing  mines have been 
-uncovered and all cells containing mines have  been marked, or when
-a cell containing a mine is uncovered.
+XVmines is a simple minesweeper game for X Window System.
+
+xvmines creates a rectangle on the screen, divided into equally sized
+cells. Each cell may contain a mine (hence the name xvmines), contain a
+number indicating the number of mines present in the 8-neighboring cells
+or be empty.
+
+Initially, all cells are covered with tiles. A tile can be removed,
+uncovering the cell below, by clicking the left mouse button on it. In
+addition, a cell can be marked as containing a mine by clicking the
+right mouse button on it. Note however that marking a cell as containing
+a mine does not necessarily mean that the cell really contains a mine!
+
+Clicking the middle mouse button on a tile, marks it with a question
+mark, acting as a reminder mechanism. The user can use the numbers in
+the uncovered cells to find (or sometimes guess ...) which cells contain
+mines and which do not.
+
+A game ends when all cells not containing mines have been uncovered and
+all cells containing mines have been marked, or when a cell containing a
+mine is uncovered.
diff --git a/games/xvmines/pkg-plist b/games/xvmines/pkg-plist
deleted file mode 100644
index f32cbd1fafb2..000000000000
--- a/games/xvmines/pkg-plist
+++ /dev/null
@@ -1,3 +0,0 @@
-bin/xvmines
-share/doc/xvmines/Copyright
-@dirrm share/doc/xvmines