5 files changed, 23 insertions, 75 deletions

diff --git a/games/xbomb/Makefile b/games/xbomb/Makefile
index 6d58f4aefa77..6cf711205e44 100644
--- a/games/xbomb/Makefile
+++ b/games/xbomb/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	xbomb
-PORTVERSION=	2.1a
-PORTREVISION=	1
+PORTVERSION=	2.2
 CATEGORIES=	games
 MASTER_SITES=	http://www.gedanken.demon.co.uk/download-xbomb/
 EXTRACT_SUFX=	.tgz
@@ -15,17 +14,32 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Minesweeper with a couple of grid types
 
-USE_X_PREFIX=	yes
+USE_XORG=	xaw
+
 MAN6=		xbomb.6
+PLIST_FILES=	bin/xbomb \
+		lib/X11/app-defaults/XBomb \
+		lib/X11/xbomb/xbomb3.hi \
+		lib/X11/xbomb/xbomb4.hi \
+		lib/X11/xbomb/xbomb6.hi
+PLIST_DIRS=	lib/X11/xbomb
+
+do-build:
+	cd ${BUILD_WRKSRC} && ${CC} ${CFLAGS} -DX11BASE=\"${X11BASE}\" \
+		`pkg-config --cflags xaw8` *.c -o xbomb \
+		`pkg-config --libs xaw8`
 
-post-install:
+do-install:
+	${INSTALL_PROGRAM} ${WRKSRC}/xbomb ${PREFIX}/bin/xbomb
+	@${CHOWN} root:games ${PREFIX}/bin/xbomb
+	@${CHMOD} 2755 ${PREFIX}/bin/xbomb
+	${INSTALL_MAN} ${WRKSRC}/xbomb.6 ${MANPREFIX}/man/man6/xbomb.6
+	${INSTALL_DATA} ${WRKSRC}/xbomb.ad ${PREFIX}/lib/X11/app-defaults/XBomb
 	@${MKDIR} ${PREFIX}/lib/X11/xbomb
 	@${TOUCH} ${PREFIX}/lib/X11/xbomb/xbomb3.hi
 	@${TOUCH} ${PREFIX}/lib/X11/xbomb/xbomb4.hi
 	@${TOUCH} ${PREFIX}/lib/X11/xbomb/xbomb6.hi
 	@${CHOWN} root:games ${PREFIX}/lib/X11/xbomb/xbomb?.hi
 	@${CHMOD} 664 ${PREFIX}/lib/X11/xbomb/xbomb?.hi
-	@${CHOWN} root:games ${PREFIX}/bin/xbomb
-	@${CHMOD} 2755 ${PREFIX}/bin/xbomb
 
 .include <bsd.port.mk>
diff --git a/games/xbomb/distinfo b/games/xbomb/distinfo
index 9e4f7383e747..10b7487a28d5 100644
--- a/games/xbomb/distinfo
+++ b/games/xbomb/distinfo
@@ -1,3 +1,3 @@
-MD5 (xbomb-2.1a.tgz) = a7bb9f99d922f6f1b6aa0b4b903c19e7
-SHA256 (xbomb-2.1a.tgz) = ab4f0220ba9bf808270c8876e24d9b6792a829f85a4abee31d1f64259b98c8fb
-SIZE (xbomb-2.1a.tgz) = 23942
+MD5 (xbomb-2.2.tgz) = 01a4e19e9585e52522c0c8acf1511274
+SHA256 (xbomb-2.2.tgz) = e65282c80a88a831f2e264263ba76fff6826aaedc67317d4df037d7983b1683d
+SIZE (xbomb-2.2.tgz) = 24872
diff --git a/games/xbomb/files/patch-aa b/games/xbomb/files/patch-aa
deleted file mode 100644
index 26c5356a4dab..000000000000
--- a/games/xbomb/files/patch-aa
+++ /dev/null
@@ -1,60 +0,0 @@
---- Makefile.orig	Sat Jan 20 16:02:46 1996
-+++ Makefile	Thu Jan 25 22:20:42 2007
-@@ -12,33 +12,28 @@
- # for conditions under which this file may be redistributed.
- #
- 
--CC=gcc
--CFLAGS=-O2
--
--INCLUDES=
-+#CC=gcc
-+CFLAGS+= -I${X11BASE}/include -DX11BASE=\"${X11BASE}\"
- 
- LIB=
- 
--XLIB=-L/usr/X11R6/lib -lXaw -lXmu -lXt -lX11
--
--COMPILE=$(CC) -c $(CFLAGS)
-+XLIB=-L${X11BASE}/lib -lXaw -lXmu -lXt -lX11 -lcompat
-+XLIB+=	-Wl,-rpath,${X11BASE}/lib
- 
- LINK=$(CC)
- 
- OBJ=xbomb.o xwindow.o hiscore.o
- 
--INSTDIR=/usr/local
-+INSTDIR=${PREFIX}
- 
- ########
-+all: xbomb
- 
- xbomb : $(OBJ)
- 	$(LINK) $(OBJ) -o $@ $(LIB) $(XLIB)
- 
- ########
- 
--%.o : %.c
--	$(COMPILE) $< -o $@ $(INCLUDES)
--
- xbomb.o   : xbomb.c   xbomb.h
- xwindow.o : xwindow.c xbomb.h icon.h
- hiscore.o : hiscore.c xbomb.h
-@@ -51,10 +46,10 @@
- ########
- 
- install :
--	strip xbomb
--	install -d $(INSTDIR)/bin
--	install -d $(INSTDIR)/man/man6
--	install -d $(INSTDIR)/lib/app-defaults
--	install -m 755 xbomb $(INSTDIR)/bin
--	install -m 644 xbomb.6 $(INSTDIR)/man/man6
--	install -m 644 xbomb.ad $(INSTDIR)/lib/app-defaults/XBomb
-+#	strip xbomb
-+#	install -d $(INSTDIR)/bin
-+#	install -d $(INSTDIR)/man/man6
-+#	install -d $(INSTDIR)/lib/app-defaults
-+	${BSD_INSTALL_PROGRAM} xbomb $(INSTDIR)/bin
-+	${BSD_INSTALL_MAN} xbomb.6 $(INSTDIR)/man/man6
-+	${BSD_INSTALL_DATA} xbomb.ad $(INSTDIR)/lib/X11/app-defaults/XBomb
diff --git a/games/xbomb/files/patch-ab b/games/xbomb/files/patch-hiscore.c
index 5ea85294a405..5ea85294a405 100644
--- a/games/xbomb/files/patch-ab
+++ b/games/xbomb/files/patch-hiscore.c
diff --git a/games/xbomb/pkg-plist b/games/xbomb/pkg-plist
deleted file mode 100644
index b330b6309a33..000000000000
--- a/games/xbomb/pkg-plist
+++ /dev/null
@@ -1,6 +0,0 @@
-bin/xbomb
-lib/X11/app-defaults/XBomb
-lib/X11/xbomb/xbomb3.hi
-lib/X11/xbomb/xbomb4.hi
-lib/X11/xbomb/xbomb6.hi
-@dirrm lib/X11/xbomb