Attachment #84477 for bug #120476

View | Details | Raw Unified | Return to bug 120476
Collapse All | Expand All




#

PORTNAME=	xbomb
PORTVERSION=	2.2
PORTREVISION=	1
CATEGORIES=	games
MASTER_SITES=	http://www.gedanken.demon.co.uk/download-xbomb/
EXTRACT_SUFX=	.tgz

MAINTAINER=	ports@FreeBSD.org
COMMENT=	Minesweeper with a couple of grid types

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`

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>

Lines 1-3 Link Here

(-)games/xbomb/distinfo (-3 / +3 lines)
1	MD5 (xbomb-2.1a.tgz) = a7bb9f99d922f6f1b6aa0b4b903c19e7	1	MD5 (xbomb-2.2.tgz) = 01a4e19e9585e52522c0c8acf1511274
2	SHA256 (xbomb-2.1a.tgz) = ab4f0220ba9bf808270c8876e24d9b6792a829f85a4abee31d1f64259b98c8fb	2	SHA256 (xbomb-2.2.tgz) = e65282c80a88a831f2e264263ba76fff6826aaedc67317d4df037d7983b1683d
3	SIZE (xbomb-2.1a.tgz) = 23942	3	SIZE (xbomb-2.2.tgz) = 24872




--- 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




--- 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]={X11BASE"/lib/X11/xbomb/xbomb6.hi",
+                                X11BASE"/lib/X11/xbomb/xbomb4.hi",
+                                X11BASE"/lib/X11/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"};




--- 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]={X11BASE"/lib/X11/xbomb/xbomb6.hi",
+                                X11BASE"/lib/X11/xbomb/xbomb4.hi",
+                                X11BASE"/lib/X11/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"};

Lines 1-6 Link Here

(-)games/xbomb/pkg-plist (-6 lines)
1	bin/xbomb
2	lib/X11/app-defaults/XBomb
3	lib/X11/xbomb/xbomb3.hi
4	lib/X11/xbomb/xbomb4.hi
5	lib/X11/xbomb/xbomb6.hi
6	@dirrm lib/X11/xbomb

Return to bug 120476

Lines 6-13 Link Here

(-)games/xbomb/Makefile (-6 / +20 lines)
6	#	6	#
7		7
8	PORTNAME= xbomb	8	PORTNAME= xbomb
9	PORTVERSION= 2.1a	9	PORTVERSION= 2.2
10	PORTREVISION= 1
11	CATEGORIES= games	10	CATEGORIES= games
12	MASTER_SITES= http://www.gedanken.demon.co.uk/download-xbomb/	11	MASTER_SITES= http://www.gedanken.demon.co.uk/download-xbomb/
13	EXTRACT_SUFX= .tgz	12	EXTRACT_SUFX= .tgz
Lines 15-31 Link Here
15	MAINTAINER= ports@FreeBSD.org	14	MAINTAINER= ports@FreeBSD.org
16	COMMENT= Minesweeper with a couple of grid types	15	COMMENT= Minesweeper with a couple of grid types
17		16
18	USE_X_PREFIX= yes	17	USE_XORG= xaw
		18
19	MAN6= xbomb.6	19	MAN6= xbomb.6
		20	PLIST_FILES= bin/xbomb \
		21	lib/X11/app-defaults/XBomb \
		22	lib/X11/xbomb/xbomb3.hi \
		23	lib/X11/xbomb/xbomb4.hi \
		24	lib/X11/xbomb/xbomb6.hi
		25	PLIST_DIRS= lib/X11/xbomb
		26
		27	do-build:
		28	cd ${BUILD_WRKSRC} && ${CC} ${CFLAGS} -DX11BASE=\"${X11BASE}\" \
		29	`pkg-config --cflags xaw8` *.c -o xbomb \
		30	`pkg-config --libs xaw8`
20		31
21	post-install:	32	do-install:
		33	${INSTALL_PROGRAM} ${WRKSRC}/xbomb ${PREFIX}/bin/xbomb
		34	@${CHOWN} root:games ${PREFIX}/bin/xbomb
		35	@${CHMOD} 2755 ${PREFIX}/bin/xbomb
		36	${INSTALL_MAN} ${WRKSRC}/xbomb.6 ${MANPREFIX}/man/man6/xbomb.6
		37	${INSTALL_DATA} ${WRKSRC}/xbomb.ad ${PREFIX}/lib/X11/app-defaults/XBomb
22	@${MKDIR} ${PREFIX}/lib/X11/xbomb	38	@${MKDIR} ${PREFIX}/lib/X11/xbomb
23	@${TOUCH} ${PREFIX}/lib/X11/xbomb/xbomb3.hi	39	@${TOUCH} ${PREFIX}/lib/X11/xbomb/xbomb3.hi
24	@${TOUCH} ${PREFIX}/lib/X11/xbomb/xbomb4.hi	40	@${TOUCH} ${PREFIX}/lib/X11/xbomb/xbomb4.hi
25	@${TOUCH} ${PREFIX}/lib/X11/xbomb/xbomb6.hi	41	@${TOUCH} ${PREFIX}/lib/X11/xbomb/xbomb6.hi
26	@${CHOWN} root:games ${PREFIX}/lib/X11/xbomb/xbomb?.hi	42	@${CHOWN} root:games ${PREFIX}/lib/X11/xbomb/xbomb?.hi
27	@${CHMOD} 664 ${PREFIX}/lib/X11/xbomb/xbomb?.hi	43	@${CHMOD} 664 ${PREFIX}/lib/X11/xbomb/xbomb?.hi
28	@${CHOWN} root:games ${PREFIX}/bin/xbomb
29	@${CHMOD} 2755 ${PREFIX}/bin/xbomb
30		44
31	.include <bsd.port.mk>	45	.include <bsd.port.mk>

Lines 1-60 Link Here

(-)games/xbomb/files/patch-aa (-60 lines)
1	--- Makefile.orig Sat Jan 20 16:02:46 1996
2	+++ Makefile Thu Jan 25 22:20:42 2007
3	@@ -12,33 +12,28 @@
4	# for conditions under which this file may be redistributed.
5	#
6
7	-CC=gcc
8	-CFLAGS=-O2
9	-
10	-INCLUDES=
11	+#CC=gcc
12	+CFLAGS+= -I${X11BASE}/include -DX11BASE=\"${X11BASE}\"
13
14	LIB=
15
16	-XLIB=-L/usr/X11R6/lib -lXaw -lXmu -lXt -lX11
17	-
18	-COMPILE=$(CC) -c $(CFLAGS)
19	+XLIB=-L${X11BASE}/lib -lXaw -lXmu -lXt -lX11 -lcompat
20	+XLIB+= -Wl,-rpath,${X11BASE}/lib
21
22	LINK=$(CC)
23
24	OBJ=xbomb.o xwindow.o hiscore.o
25
26	-INSTDIR=/usr/local
27	+INSTDIR=${PREFIX}
28
29	########
30	+all: xbomb
31
32	xbomb : $(OBJ)
33	$(LINK) $(OBJ) -o $@ $(LIB) $(XLIB)
34
35	########
36
37	-%.o : %.c
38	- $(COMPILE) $< -o $@ $(INCLUDES)
39	-
40	xbomb.o : xbomb.c xbomb.h
41	xwindow.o : xwindow.c xbomb.h icon.h
42	hiscore.o : hiscore.c xbomb.h
43	@@ -51,10 +46,10 @@
44	########
45
46	install :
47	- strip xbomb
48	- install -d $(INSTDIR)/bin
49	- install -d $(INSTDIR)/man/man6
50	- install -d $(INSTDIR)/lib/app-defaults
51	- install -m 755 xbomb $(INSTDIR)/bin
52	- install -m 644 xbomb.6 $(INSTDIR)/man/man6
53	- install -m 644 xbomb.ad $(INSTDIR)/lib/app-defaults/XBomb
54	+# strip xbomb
55	+# install -d $(INSTDIR)/bin
56	+# install -d $(INSTDIR)/man/man6
57	+# install -d $(INSTDIR)/lib/app-defaults
58	+ ${BSD_INSTALL_PROGRAM} xbomb $(INSTDIR)/bin
59	+ ${BSD_INSTALL_MAN} xbomb.6 $(INSTDIR)/man/man6
60	+ ${BSD_INSTALL_DATA} xbomb.ad $(INSTDIR)/lib/X11/app-defaults/XBomb

Lines 1-13 Link Here

(-)games/xbomb/files/patch-ab (-13 lines)
1	--- hiscore.c.orig Fri Jan 16 20:50:39 1998
2	+++ hiscore.c Fri Feb 20 10:23:20 1998
3	@@ -47,7 +47,9 @@
4	nbombs[NLEVELS]; /+ number of bombs. +/
5
6	/+ The names of the high score tables. +/
7	-static char *filenames[NTYPES]={"/var/tmp/xbomb6.hi","/var/tmp/xbomb4.hi","/var/tmp/xbomb3.hi"};
8	+static char *filenames[NTYPES]={X11BASE"/lib/X11/xbomb/xbomb6.hi",
9	+ X11BASE"/lib/X11/xbomb/xbomb4.hi",
10	+ X11BASE"/lib/X11/xbomb/xbomb3.hi"};
11
12	/+ The names of the positions in the high score tables. +/
13	static char pos[11][5]={"Top","2nd","3rd","4th","5th","6th","7th","8th","9th","10th","Lost"};

Line 0 Link Here

(-)games/xbomb/files/patch-hiscore.c (+13 lines)
	1	--- hiscore.c.orig Fri Jan 16 20:50:39 1998
	2	+++ hiscore.c Fri Feb 20 10:23:20 1998
	3	@@ -47,7 +47,9 @@
	4	nbombs[NLEVELS]; /+ number of bombs. +/
	5
	6	/+ The names of the high score tables. +/
	7	-static char *filenames[NTYPES]={"/var/tmp/xbomb6.hi","/var/tmp/xbomb4.hi","/var/tmp/xbomb3.hi"};
	8	+static char *filenames[NTYPES]={X11BASE"/lib/X11/xbomb/xbomb6.hi",
	9	+ X11BASE"/lib/X11/xbomb/xbomb4.hi",
	10	+ X11BASE"/lib/X11/xbomb/xbomb3.hi"};
	11
	12	/+ The names of the positions in the high score tables. +/
	13	static char pos[11][5]={"Top","2nd","3rd","4th","5th","6th","7th","8th","9th","10th","Lost"};