Date: Sun, 10 Feb 2008 03:00:46 +0900 From: KATO Tsuguru <tkato432@yahoo.com> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/120476: Update port: games/xbomb to 2.2 Message-ID: <20080210030046.ce6c9ceb.tkato432@yahoo.com> Resent-Message-ID: <200802091810.m19IA4CA017242@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 120476 >Category: ports >Synopsis: Update port: games/xbomb to 2.2 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Sat Feb 09 18:10:03 UTC 2008 >Closed-Date: >Last-Modified: >Originator: KATO Tsuguru >Release: FreeBSD 6.3-RELEASE i386 >Organization: >Environment: >Description: - Update to version 2.2 New file: files/patch-hiscore.c Remove file: files/patch-aa files/patch-ab pkg-plist >How-To-Repeat: >Fix: diff -urN /usr/ports/games/xbomb/Makefile games/xbomb/Makefile --- /usr/ports/games/xbomb/Makefile 2007-05-20 13:50:45.000000000 +0900 +++ games/xbomb/Makefile 2008-01-26 23:41:53.000000000 +0900 @@ -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 @@ 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 -urN /usr/ports/games/xbomb/distinfo games/xbomb/distinfo --- /usr/ports/games/xbomb/distinfo 2005-11-25 13:35:27.000000000 +0900 +++ games/xbomb/distinfo 2008-01-26 23:17:31.000000000 +0900 @@ -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 -urN /usr/ports/games/xbomb/files/patch-aa games/xbomb/files/patch-aa --- /usr/ports/games/xbomb/files/patch-aa 2007-01-30 21:35:07.000000000 +0900 +++ games/xbomb/files/patch-aa 1970-01-01 09:00:00.000000000 +0900 @@ -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 -urN /usr/ports/games/xbomb/files/patch-ab games/xbomb/files/patch-ab --- /usr/ports/games/xbomb/files/patch-ab 1998-02-20 18:31:38.000000000 +0900 +++ games/xbomb/files/patch-ab 1970-01-01 09:00:00.000000000 +0900 @@ -1,13 +0,0 @@ ---- 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"}; diff -urN /usr/ports/games/xbomb/files/patch-hiscore.c games/xbomb/files/patch-hiscore.c --- /usr/ports/games/xbomb/files/patch-hiscore.c 1970-01-01 09:00:00.000000000 +0900 +++ games/xbomb/files/patch-hiscore.c 2008-01-26 23:28:20.000000000 +0900 @@ -0,0 +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]={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"}; diff -urN /usr/ports/games/xbomb/pkg-plist games/xbomb/pkg-plist --- /usr/ports/games/xbomb/pkg-plist 1998-08-13 11:23:11.000000000 +0900 +++ games/xbomb/pkg-plist 1970-01-01 09:00:00.000000000 +0900 @@ -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 >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20080210030046.ce6c9ceb.tkato432>