Merge the changes (correct style) I made to the port.

Note that we don't need more copies of the GNU GPL license
in the system.

4 files changed, 32 insertions, 34 deletions

diff --git a/games/xnibbles/Makefile b/games/xnibbles/Makefile
index 840bac34390..fa24aa1861b 100644
--- a/games/xnibbles/Makefile
+++ b/games/xnibbles/Makefile
@@ -3,7 +3,7 @@
 # Date created:				2 March 1998
 # Whom:					Andrey Zakhvatov
 #
-# $Id$
+# $Id: Makefile,v 1.1.1.1 1998/03/15 20:38:35 steve Exp $
 #
 
 DISTNAME=	xnibbles-1.0BETA3
@@ -22,24 +22,25 @@ WRKSRC=		${WRKDIR}/xnibbles
 
 MAN6=		xnibbles.6
 
+CFLAGS+=	-I ${X11BASE}/include -L ${X11BASE}/lib
+
 do-install:
-	@ ${INSTALL_PROGRAM} ${WRKSRC}/xnibbles ${PREFIX}/bin
-	@ ${INSTALL_MAN} ${WRKSRC}/xnibbles.6 ${PREFIX}/man/man6
-	@ ${MKDIR} ${PREFIX}/share/xnibbles/sounds
-	@ ${INSTALL_DATA} ${WRKSRC}/sounds/*.ub ${PREFIX}/share/xnibbles/sounds
-	@ ${MKDIR} ${PREFIX}/share/xnibbles/levels
-	@ if [ -f ${PREFIX}/share/xnibbles/levels/LEVELS ]; then \
+	@${INSTALL_PROGRAM} ${WRKSRC}/xnibbles ${PREFIX}/bin
+	@${INSTALL_MAN} ${WRKSRC}/xnibbles.6 ${PREFIX}/man/man6
+	@${MKDIR} ${PREFIX}/share/xnibbles/sounds
+	@${INSTALL_DATA} ${WRKSRC}/sounds/*.ub ${PREFIX}/share/xnibbles/sounds
+	@${MKDIR} ${PREFIX}/share/xnibbles/levels
+	@if [ -f ${PREFIX}/share/xnibbles/levels/LEVELS ]; then \
 		${RM} ${PREFIX}/share/xnibbles/levels/LEVELS; \
-	  fi
-	@ ${TOUCH} ${PREFIX}/share/xnibbles/levels/LEVELS
+	 fi
+	@${TOUCH} ${PREFIX}/share/xnibbles/levels/LEVELS
 .for file in 001 002 003 004 005 006 007 008 009 010 011 012
-	@ ${ECHO} ${PREFIX}/share/xnibbles/levels/level${file}.xnl >> ${PREFIX}/share/xnibbles/levels/LEVELS
-	@ ${INSTALL_DATA} ${WRKSRC}/levels/*.xnl ${PREFIX}/share/xnibbles/levels
-.endfor
-	@ ${MKDIR} ${PREFIX}/share/doc/xnibbles
-.for file in COPYING README TODO
-	@ ${INSTALL_DATA} ${WRKSRC}/${file} ${PREFIX}/share/doc/xnibbles
+	@${ECHO} ${PREFIX}/share/xnibbles/levels/level${file}.xnl >> ${PREFIX}/share/xnibbles/levels/LEVELS
+	@${INSTALL_DATA} ${WRKSRC}/levels/*.xnl ${PREFIX}/share/xnibbles/levels
 .endfor
-	@ ${INSTALL_DATA} ${WRKSRC}/levels/README ${PREFIX}/share/doc/xnibbles/README.levels
+	@${MKDIR} ${PREFIX}/share/doc/xnibbles
+	@${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/xnibbles
+	@${INSTALL_DATA} ${WRKSRC}/TODO ${PREFIX}/share/doc/xnibbles
+	@${INSTALL_DATA} ${WRKSRC}/levels/README ${PREFIX}/share/doc/xnibbles/README.levels
 
 .include <bsd.port.mk>
diff --git a/games/xnibbles/pkg-comment b/games/xnibbles/pkg-comment
index a0b01155677..e0a4ed9dbfa 100644
--- a/games/xnibbles/pkg-comment
+++ b/games/xnibbles/pkg-comment
@@ -1 +1 @@
-simple X11 snake game
+A simple X11 snake game, like one seen in MS-DOS's qbasic.
diff --git a/games/xnibbles/pkg-descr b/games/xnibbles/pkg-descr
index c3c5a1a2f1f..7a8e364e1ed 100644
--- a/games/xnibbles/pkg-descr
+++ b/games/xnibbles/pkg-descr
@@ -1,21 +1,19 @@
-   XNibbles is a game for X11R6.  It is conceptually  based on 
-nibbles, which was a program that came with qbasic for MS-DOS.
+XNibbles is a game for X11R6.  It is conceptually based on
+the nibbles program that came with qbasic for MS-DOS and was
+in turn very similar to the game RunRound found on some XTs.
 
-   XNibbles is  actually  written  in C++, and  shares no code 
-with qbasic nibbles.  For  those of  you  who  have played the
-game before, you  can  attest to the fact that it is extremely
+Nibbles is actually written in C++, and shares no code
+with qbasic nibbles.  For those of you who have played the
+game before, you can attest to the fact that it is extremely
 fun and addictive.
 
-   The  goal  of  the  game  is  to  work your way through the
-levels, which become harder and harder. You do this by running
-your snake over the  blue  diamonds. For every 10 diamonds you
-acquire, you  move up  one  level.  Along the way, a number of
-other diamonds will be encountered.  Gold doubles your length,
-and  red  halves  your  length, both giving you points.  Green
-gives you an extra life. You die if you run into yourself or a
-wall. Question marks serve as warps.
+The goal of the game is to work your way through the levels,
+which become harder and harder.  You do this by running
+your snake over the blue diamonds.  For every 10 diamonds you
+acquire, you move up one level.  Other diamonds will increase
+your length, give you an extra life, or give you points.
 
-   The authors of XNibbles  are  Ian Peters (ipeters@acm.org),
+The authors of XNibbles are Ian Peters (ipeters@acm.org),
 and Sean MacIsaac (sjm@acm.org).
-   XNibbles  is  Copyleft'd under the GNU Public License.  See
-the file COPYING for information.
+
+XNibbles is under the GNU Public License.
diff --git a/games/xnibbles/pkg-plist b/games/xnibbles/pkg-plist
index f1430456542..ab8869a3f90 100644
--- a/games/xnibbles/pkg-plist
+++ b/games/xnibbles/pkg-plist
@@ -1,6 +1,5 @@
 bin/xnibbles
 man/man6/xnibbles.6.gz
-share/doc/xnibbles/COPYING
 share/doc/xnibbles/README
 share/doc/xnibbles/README.levels
 share/doc/xnibbles/TODO