diff options
author | Chris D. Faulhaber <jedgar@FreeBSD.org> | 2000-01-19 13:28:26 +0000 |
---|---|---|
committer | Chris D. Faulhaber <jedgar@FreeBSD.org> | 2000-01-19 13:28:26 +0000 |
commit | 9039bedd890cfbaaa2eca53c721fb6aa76050001 (patch) | |
tree | d89081a7894df6b8253b9a15cc8d3fdfa4492e04 /games | |
parent | Update port to 0.6.1 (diff) |
* Resolve conflict between the port's 'clock' variable and -current's
'clock' in times.h
* Correct portlint nit in the port's Makefile
PR: 16187
Submitted by: Alexander Langer <alex@cichlids.com>
Notes
Notes:
svn path=/head/; revision=24832
Diffstat (limited to 'games')
-rw-r--r-- | games/wmtimebomb/Makefile | 2 | ||||
-rw-r--r-- | games/wmtimebomb/files/patch-ab | 107 |
2 files changed, 108 insertions, 1 deletions
diff --git a/games/wmtimebomb/Makefile b/games/wmtimebomb/Makefile index a111a9bc9898..1b755b42a529 100644 --- a/games/wmtimebomb/Makefile +++ b/games/wmtimebomb/Makefile @@ -18,7 +18,7 @@ LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm \ jpeg.9:${PORTSDIR}/graphics/jpeg \ gif.5:${PORTSDIR}/graphics/giflib \ png.3:${PORTSDIR}/graphics/png -BUILD_DEPENDS= ${PREFIX}/lib/libWMaker.a:${PORTSDIR}/x11-wm/windowmaker +BUILD_DEPENDS= ${X11BASE}/lib/libWMaker.a:${PORTSDIR}/x11-wm/windowmaker WRKSRC= ${WRKDIR}/wmtimebomb.app USE_IMAKE= yes diff --git a/games/wmtimebomb/files/patch-ab b/games/wmtimebomb/files/patch-ab new file mode 100644 index 000000000000..89361c7aae91 --- /dev/null +++ b/games/wmtimebomb/files/patch-ab @@ -0,0 +1,107 @@ +--- timebomb.c.old Tue Jan 18 20:02:14 2000 ++++ timebomb.c Tue Jan 18 20:05:03 2000 +@@ -94,7 +94,7 @@ + XpmIcon rbuttonb; + XpmIcon id; + XpmIcon timebombicon; +-XpmIcon clock; ++XpmIcon iconclock; + XpmIcon title; + XpmIcon about; + int abouttick; +@@ -1049,9 +1049,9 @@ + about.attributes.width=256; + about.attributes.height=256; + about.attributes.valuemask=(XpmSize); +- clock.attributes.width=200; +- clock.attributes.height=BS; +- clock.attributes.valuemask=XpmSize; ++ iconclock.attributes.width=200; ++ iconclock.attributes.height=BS; ++ iconclock.attributes.valuemask=XpmSize; + countbar.attributes.width=160; + countbar.attributes.height=BS; + countbar.attributes.valuemask=XpmSize; +@@ -1081,7 +1081,7 @@ + XpmCreatePixmapFromData(display,window, rbuttonb_xpm, + &rbuttonb.pixmap, &rbuttonb.mask, &rbuttonb.attributes); + XpmCreatePixmapFromData(display,window, clock_xpm, +- &clock.pixmap, &clock.mask, &clock.attributes); ++ &iconclock.pixmap, &iconclock.mask, &iconclock.attributes); + XpmCreatePixmapFromData(display,window, countbar_xpm, + &countbar.pixmap, &countbar.mask, &countbar.attributes); + +@@ -1175,27 +1175,27 @@ + } + + void redraw_iconwin(){ +- XCopyArea(display,clock.pixmap,iconwin,igc,clockn/100*BS,0,BS,BS,0,BS); +- XCopyArea(display,clock.pixmap,iconwin,igc,(clockn%100)/10*BS,0,BS,BS,BS,BS); +- XCopyArea(display,clock.pixmap,iconwin,igc,clockn%10*BS,0,BS,BS,BSx2,BS); ++ XCopyArea(display,iconclock.pixmap,iconwin,igc,clockn/100*BS,0,BS,BS,0,BS); ++ XCopyArea(display,iconclock.pixmap,iconwin,igc,(clockn%100)/10*BS,0,BS,BS,BS,BS); ++ XCopyArea(display,iconclock.pixmap,iconwin,igc,clockn%10*BS,0,BS,BS,BSx2,BS); + if(windowswitch[0]){ + XCopyArea(display,title.pixmap,window,gc,(tb.x-4)*BS,BS,BSx3,BS,(tb.x-4)*BS,BS); + if(clockn/1000){ +- XCopyArea(display,clock.pixmap,window,igc,clockn/1000*BS,0,BS,BS,(tb.x-4)*BS,BS); +- XCopyArea(display,clock.pixmap,window,igc,(clockn%1000)/100*BS,0,BS,BS,(tb.x-3)*BS,BS); +- XCopyArea(display,clock.pixmap,window,igc,(clockn%100)/10*BS,0,BS,BS,(tb.x-2)*BS,BS); +- XCopyArea(display,clock.pixmap,window,igc,clockn%10*BS,0,BS,BS,(tb.x-1)*BS,BS); ++ XCopyArea(display,iconclock.pixmap,window,igc,clockn/1000*BS,0,BS,BS,(tb.x-4)*BS,BS); ++ XCopyArea(display,iconclock.pixmap,window,igc,(clockn%1000)/100*BS,0,BS,BS,(tb.x-3)*BS,BS); ++ XCopyArea(display,iconclock.pixmap,window,igc,(clockn%100)/10*BS,0,BS,BS,(tb.x-2)*BS,BS); ++ XCopyArea(display,iconclock.pixmap,window,igc,clockn%10*BS,0,BS,BS,(tb.x-1)*BS,BS); + } + else if((clockn%1000)/100){ +- XCopyArea(display,clock.pixmap,window,igc,(clockn%1000)/100*BS,0,BS,BS,(tb.x-3)*BS,BS); +- XCopyArea(display,clock.pixmap,window,igc,(clockn%100)/10*BS,0,BS,BS,(tb.x-2)*BS,BS); +- XCopyArea(display,clock.pixmap,window,igc,clockn%10*BS,0,BS,BS,(tb.x-1)*BS,BS); ++ XCopyArea(display,iconclock.pixmap,window,igc,(clockn%1000)/100*BS,0,BS,BS,(tb.x-3)*BS,BS); ++ XCopyArea(display,iconclock.pixmap,window,igc,(clockn%100)/10*BS,0,BS,BS,(tb.x-2)*BS,BS); ++ XCopyArea(display,iconclock.pixmap,window,igc,clockn%10*BS,0,BS,BS,(tb.x-1)*BS,BS); + } + else if((clockn%100)/10){ +- XCopyArea(display,clock.pixmap,window,igc,(clockn%100)/10*BS,0,BS,BS,(tb.x-2)*BS,BS); +- XCopyArea(display,clock.pixmap,window,igc,clockn%10*BS,0,BS,BS,(tb.x-1)*BS,BS); ++ XCopyArea(display,iconclock.pixmap,window,igc,(clockn%100)/10*BS,0,BS,BS,(tb.x-2)*BS,BS); ++ XCopyArea(display,iconclock.pixmap,window,igc,clockn%10*BS,0,BS,BS,(tb.x-1)*BS,BS); + } +- else XCopyArea(display,clock.pixmap,window,igc,clockn%10*BS,0,BS,BS,(tb.x-1)*BS,BS); ++ else XCopyArea(display,iconclock.pixmap,window,igc,clockn%10*BS,0,BS,BS,(tb.x-1)*BS,BS); + } + if(!(iconswitch[SW_RESTART]||iconswitch[SW_RESETTIME]||iconswitch[SW_CHEAT])){ + XCopyArea(display,sbutton.pixmap,iconwin,igc,0,0,BS,BS,0,0); +@@ -1210,21 +1210,21 @@ + if(windowswitch[1]){ + XCopyArea(display,title.pixmap,window,gc,(tb.x-4)*BS,0,BSx3,BS,(tb.x-4)*BS,0); + if(bombcount/1000){ +- XCopyArea(display,clock.pixmap,window,igc,bombcount/1000*BS,0,BS,BS,(tb.x-4)*BS,0); +- XCopyArea(display,clock.pixmap,window,igc,(bombcount%1000)/100*BS,0,BS,BS,(tb.x-3)*BS,0); +- XCopyArea(display,clock.pixmap,window,igc,(bombcount%100)/10*BS,0,BS,BS,(tb.x-2)*BS,0); +- XCopyArea(display,clock.pixmap,window,igc,bombcount%10*BS,0,BS,BS,(tb.x-1)*BS,0); ++ XCopyArea(display,iconclock.pixmap,window,igc,bombcount/1000*BS,0,BS,BS,(tb.x-4)*BS,0); ++ XCopyArea(display,iconclock.pixmap,window,igc,(bombcount%1000)/100*BS,0,BS,BS,(tb.x-3)*BS,0); ++ XCopyArea(display,iconclock.pixmap,window,igc,(bombcount%100)/10*BS,0,BS,BS,(tb.x-2)*BS,0); ++ XCopyArea(display,iconclock.pixmap,window,igc,bombcount%10*BS,0,BS,BS,(tb.x-1)*BS,0); + } + else if((bombcount%1000)/100){ +- XCopyArea(display,clock.pixmap,window,igc,(bombcount%1000)/100*BS,0,BS,BS,(tb.x-3)*BS,0); +- XCopyArea(display,clock.pixmap,window,igc,(bombcount%100)/10*BS,0,BS,BS,(tb.x-2)*BS,0); +- XCopyArea(display,clock.pixmap,window,igc,bombcount%10*BS,0,BS,BS,(tb.x-1)*BS,0); ++ XCopyArea(display,iconclock.pixmap,window,igc,(bombcount%1000)/100*BS,0,BS,BS,(tb.x-3)*BS,0); ++ XCopyArea(display,iconclock.pixmap,window,igc,(bombcount%100)/10*BS,0,BS,BS,(tb.x-2)*BS,0); ++ XCopyArea(display,iconclock.pixmap,window,igc,bombcount%10*BS,0,BS,BS,(tb.x-1)*BS,0); + } + else if((bombcount%100)/10){ +- XCopyArea(display,clock.pixmap,window,igc,(bombcount%100)/10*BS,0,BS,BS,(tb.x-2)*BS,0); +- XCopyArea(display,clock.pixmap,window,igc,bombcount%10*BS,0,BS,BS,(tb.x-1)*BS,0); ++ XCopyArea(display,iconclock.pixmap,window,igc,(bombcount%100)/10*BS,0,BS,BS,(tb.x-2)*BS,0); ++ XCopyArea(display,iconclock.pixmap,window,igc,bombcount%10*BS,0,BS,BS,(tb.x-1)*BS,0); + } +- else XCopyArea(display,clock.pixmap,window,igc,bombcount%10*BS,0,BS,BS,(tb.x-1)*BS,0); ++ else XCopyArea(display,iconclock.pixmap,window,igc,bombcount%10*BS,0,BS,BS,(tb.x-1)*BS,0); + } + redraw_iconwin(); + } + |