Index: head/games/xbomb/Makefile
===================================================================
--- head/games/xbomb/Makefile	(revision 405599)
+++ head/games/xbomb/Makefile	(revision 405600)
@@ -1,29 +1,32 @@
 # Created by: Thomas Gellekum <tg@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	xbomb
 PORTVERSION=	2.2b
 CATEGORIES=	games
 MASTER_SITES=	http://www.gedanken.org.uk/software/xbomb/download/
 
 MAINTAINER=	danilo@FreeBSD.org
 COMMENT=	Minesweeper with a couple of grid types
 
+LICENSE=	GPLv2 # or later
+LICENSE_FILE=	${WRKSRC}/COPYING
+
 USES=		pkgconfig tar:tgz
 USE_XORG=	xaw7
 
 do-build:
 	cd ${BUILD_WRKSRC} && ${CC} ${CFLAGS} -DLOCALBASE=\"${LOCALBASE}\" \
 		`pkg-config --cflags xaw7` *.c -o xbomb \
 		`pkg-config --libs xaw7`
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/xbomb ${STAGEDIR}${PREFIX}/bin/xbomb
 	${INSTALL_MAN} ${WRKSRC}/xbomb.6 ${STAGEDIR}${MANPREFIX}/man/man6/xbomb.6
 	${INSTALL_DATA} ${WRKSRC}/xbomb.ad ${STAGEDIR}${PREFIX}/lib/X11/app-defaults/XBomb
-	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/X11/xbomb
-	@${TOUCH} ${STAGEDIR}${PREFIX}/lib/X11/xbomb/xbomb3.hi
-	@${TOUCH} ${STAGEDIR}${PREFIX}/lib/X11/xbomb/xbomb4.hi
-	@${TOUCH} ${STAGEDIR}${PREFIX}/lib/X11/xbomb/xbomb6.hi
+	@${MKDIR} ${STAGEDIR}/var/games/xbomb
+	@${TOUCH} ${STAGEDIR}/var/games/xbomb/xbomb3.hi.sample
+	@${TOUCH} ${STAGEDIR}/var/games/xbomb/xbomb4.hi.sample
+	@${TOUCH} ${STAGEDIR}/var/games/xbomb/xbomb6.hi.sample
 
 .include <bsd.port.mk>
Index: head/games/xbomb/files/patch-hiscore.c
===================================================================
--- head/games/xbomb/files/patch-hiscore.c	(revision 405599)
+++ head/games/xbomb/files/patch-hiscore.c	(revision 405600)
@@ -1,13 +1,13 @@
 --- hiscore.c.orig	Fri Jan 16 20:50:39 1998
 +++ hiscore.c	Fri Feb 20 10:23:20 1998
 @@ -47,7 +47,9 @@
             nbombs[NLEVELS];     /*+ number of bombs. +*/
  
  /*+ The names of the high score tables. +*/
 -static char *filenames[NTYPES]={"/var/tmp/xbomb6.hi","/var/tmp/xbomb4.hi","/var/tmp/xbomb3.hi"};
-+static char *filenames[NTYPES]={LOCALBASE"/lib/X11/xbomb/xbomb6.hi",
-+                                LOCALBASE"/lib/X11/xbomb/xbomb4.hi",
-+                                LOCALBASE"/lib/X11/xbomb/xbomb3.hi"};
++static char *filenames[NTYPES]={"/var/games/xbomb/xbomb6.hi",
++                                "/var/games/xbomb/xbomb4.hi",
++                                "/var/games/xbomb/xbomb3.hi"};
  
  /*+ The names of the positions in the high score tables. +*/
  static char pos[11][5]={"Top","2nd","3rd","4th","5th","6th","7th","8th","9th","10th","Lost"};
Index: head/games/xbomb/pkg-plist
===================================================================
--- head/games/xbomb/pkg-plist	(revision 405599)
+++ head/games/xbomb/pkg-plist	(revision 405600)
@@ -1,15 +1,7 @@
-@group games
-@mode 2755
-bin/xbomb
-@mode
-@group
+@(,games,2755) bin/xbomb
 man/man6/xbomb.6.gz
 lib/X11/app-defaults/XBomb
-@group games
-@mode 664
-lib/X11/xbomb/xbomb3.hi
-lib/X11/xbomb/xbomb4.hi
-lib/X11/xbomb/xbomb6.hi
-@mode
-@group
-@dirrmtry lib/X11/xbomb
+@sample(,games,664) /var/games/xbomb/xbomb3.hi.sample
+@sample(,games,664) /var/games/xbomb/xbomb4.hi.sample
+@sample(,games,664) /var/games/xbomb/xbomb6.hi.sample
+@dir /var/games/xbomb