From 6374c2347c876bdb88027b493fb54c42e4bc0fe1 Mon Sep 17 00:00:00 2001 From: adamw Date: Mon, 28 Jul 2014 19:39:50 +0000 Subject: Rename all 10,000 games/ patch-xy patches to reflect the files they modify. --- games/3dc/files/patch-Makefile | 35 +++++ games/3dc/files/patch-aa | 35 ----- games/3dc/files/patch-ab | 11 -- games/3dc/files/patch-include_machine.h | 11 ++ games/KnightCap/files/patch-Makefile | 57 +++++++++ games/KnightCap/files/patch-aa | 57 --------- games/KnightCap/files/patch-ab | 14 -- games/KnightCap/files/patch-knightcap.c | 14 ++ games/acm/files/patch-01 | 17 --- games/acm/files/patch-02 | 11 -- games/acm/files/patch-03 | 60 --------- games/acm/files/patch-04 | 28 ---- games/acm/files/patch-05 | 18 --- games/acm/files/patch-06 | 14 -- games/acm/files/patch-07 | 14 -- games/acm/files/patch-08 | 10 -- games/acm/files/patch-09 | 24 ---- games/acm/files/patch-configure | 60 +++++++++ games/acm/files/patch-dis_lib_xdr_var_array.c | 24 ++++ games/acm/files/patch-dis_server_sites.c | 14 ++ games/acm/files/patch-dis_test_Makefile.in | 28 ++++ games/acm/files/patch-src_Makefile.in | 17 +++ games/acm/files/patch-src_acm.man | 11 ++ games/acm/files/patch-src_chaser.c | 14 ++ games/acm/files/patch-src_interpolate.h | 10 ++ games/acm/files/patch-src_main.c | 18 +++ games/antipolix/files/patch-Imakefile | 19 +++ games/antipolix/files/patch-aa | 19 --- games/antipolix/files/patch-ab | 14 -- games/antipolix/files/patch-ac | 14 -- games/antipolix/files/patch-ad | 14 -- games/antipolix/files/patch-ae | 14 -- games/antipolix/files/patch-client.c | 14 ++ games/antipolix/files/patch-creation.c | 14 ++ games/antipolix/files/patch-messages.c | 14 ++ games/antipolix/files/patch-server.c | 14 ++ games/awele/Makefile | 3 +- games/awele/files/patch-Imakefile | 43 +++++++ games/awele/files/patch-aa | 43 ------- games/awele/files/patch-ab | 57 --------- games/awele/files/patch-ac | 8 -- games/awele/files/patch-tkAppInit.c | 57 +++++++++ games/awele/files/patch-xawele | 8 ++ games/blockade/files/patch-Makefile | 22 ++++ games/blockade/files/patch-aa | 22 ---- games/blockade/files/patch-ab | 99 -------------- games/blockade/files/patch-blockade.c | 99 ++++++++++++++ games/bugsx/Makefile | 3 +- games/bugsx/files/patch-Imakefile | 19 +++ games/bugsx/files/patch-aa | 19 --- games/columns/files/patch-ab | 27 ---- games/columns/files/patch-ac | 10 -- games/columns/files/patch-columns.cc | 27 ++++ games/columns/files/patch-configure | 10 ++ games/cosmo/files/patch-Imakefile | 45 +++++++ games/cosmo/files/patch-aa | 45 ------- games/cosmo/files/patch-ab | 78 ----------- games/cosmo/files/patch-setup.c | 78 +++++++++++ games/cowsay/files/patch-aa | 35 ----- games/cowsay/files/patch-cowsay | 35 +++++ games/cursive/Makefile | 2 +- games/cursive/files/patch-Makefile | 23 ++++ games/cursive/files/patch-aa | 23 ---- games/cursive/files/patch-ab | 11 -- games/cursive/files/patch-ac | 11 -- games/cursive/files/patch-cursive.6 | 11 ++ games/cursive/files/patch-cursive.c | 11 ++ games/drm/Makefile | 4 +- games/drm/files/patch-Makefile | 24 ++++ games/drm/files/patch-aa | 24 ---- games/editss/files/patch-aa | 10 -- games/editss/files/patch-ab | 19 --- games/editss/files/patch-ac | 10 -- games/editss/files/patch-actions.c | 10 ++ games/editss/files/patch-editss.c | 19 +++ games/editss/files/patch-xstuff.c | 10 ++ games/flying/files/patch-Imakefile | 28 ++++ games/flying/files/patch-aa | 28 ---- games/flying/files/patch-ab | 11 -- games/flying/files/patch-ac | 20 --- games/flying/files/patch-ad | 11 -- games/flying/files/patch-ae | 11 -- games/flying/files/patch-af | 20 --- games/flying/files/patch-carrom.C | 11 ++ games/flying/files/patch-main.C | 11 ++ games/flying/files/patch-pool8.C | 20 +++ games/flying/files/patch-xgraph.C | 20 +++ games/flying/files/patch-xmover.C | 11 ++ games/gnugo/files/patch-ab | 10 -- games/gnugo/files/patch-configure | 10 ++ games/gracer/Makefile | 4 +- games/gracer/files/patch-aa | 33 ----- games/gracer/files/patch-ac | 10 -- games/gracer/files/patch-configure.in | 33 +++++ games/gracer/files/patch-src_glbind.c | 10 ++ games/heretic/files/patch-Makefile | 91 +++++++++++++ games/heretic/files/patch-aa | 91 ------------- games/heretic/files/patch-ac | 19 --- games/heretic/files/patch-ad | 11 -- games/heretic/files/patch-ae | 11 -- games/heretic/files/patch-af | 11 -- games/heretic/files/patch-ag | 11 -- games/heretic/files/patch-ah | 9 -- games/heretic/files/patch-aj | 11 -- games/heretic/files/patch-ak | 11 -- games/heretic/files/patch-al | 11 -- games/heretic/files/patch-i_udp.c | 11 ++ games/heretic/files/patch-opengl_gl_fonts.c | 9 ++ games/heretic/files/patch-opengl_gl_struct.h | 11 ++ .../files/patch-opengl_sgi-si_libtess_memalloc.h | 11 ++ games/heretic/files/patch-sndserv_Makefile | 11 ++ games/heretic/files/patch-sndserv_linux.c | 11 ++ games/heretic/files/patch-sndserv_soundsrv.c | 11 ++ games/heretic/files/patch-sndserv_wadread.c | 11 ++ games/heretic/files/patch-w_wad.c | 19 +++ games/hex/files/patch-Makefile | 26 ++++ games/hex/files/patch-aa | 12 -- games/hex/files/patch-ab | 12 -- games/hex/files/patch-ac | 26 ---- games/hex/files/patch-hex.c | 12 ++ games/hex/files/patch-hex.h | 12 ++ games/imaze/files/patch-aa | 20 --- games/imaze/files/patch-ab | 11 -- games/imaze/files/patch-ac | 11 -- games/imaze/files/patch-ad | 11 -- games/imaze/files/patch-source_Makefile.in | 20 +++ games/imaze/files/patch-source_configure | 11 ++ games/imaze/files/patch-source_fbsd_joystick.c | 11 ++ games/imaze/files/patch-source_voxware_audio.c | 11 ++ games/inform/files/patch-aa | 11 -- games/inform/files/patch-header.h | 11 ++ games/ladder/files/patch-Makefile | 34 +++++ games/ladder/files/patch-aa | 11 -- games/ladder/files/patch-ab | 34 ----- games/ladder/files/patch-ac | 11 -- games/ladder/files/patch-ad | 29 ----- games/ladder/files/patch-ae | 40 ------ games/ladder/files/patch-af | 10 -- games/ladder/files/patch-ag | 8 -- games/ladder/files/patch-ladder.c_1 | 11 ++ games/ladder/files/patch-ladder.c_2 | 11 ++ games/ladder/files/patch-ladder.h | 8 ++ games/ladder/files/patch-lplay.c | 29 +++++ games/ladder/files/patch-lscore.c | 40 ++++++ games/ladder/files/patch-ltime.c | 10 ++ games/lbreakout/files/patch-Makefile.in | 11 ++ games/lbreakout/files/patch-aa | 11 -- games/lbreakout/files/patch-ab | 10 -- games/lbreakout/files/patch-ac | 21 --- games/lbreakout/files/patch-ad | 11 -- games/lbreakout/files/patch-ae | 13 -- games/lbreakout/files/patch-configure | 13 ++ games/lbreakout/files/patch-lbreakout_Makefile.in | 11 ++ games/lbreakout/files/patch-lbreakout_breakout.cpp | 10 ++ games/lbreakout/files/patch-lbreakout_game.cpp | 21 +++ games/mindfocus/Makefile | 8 +- games/mindfocus/files/patch-Imakefile | 8 ++ games/mindfocus/files/patch-aa | 24 ---- games/mindfocus/files/patch-ab | 8 -- games/mindfocus/files/patch-ac | 11 -- games/mindfocus/files/patch-configure.h | 24 ++++ games/mindfocus/files/patch-mindfocus_Imakefile | 11 ++ games/mindfocus/pkg-plist | 100 +++++++-------- games/mindguard/files/patch-Makefile | 16 +++ games/mindguard/files/patch-aa | 16 --- games/mindguard/files/patch-ab | 18 --- games/mindguard/files/patch-mindguard.c | 18 +++ games/miscom/files/patch-ab | 14 -- games/miscom/files/patch-ac | 14 -- games/miscom/files/patch-ad | 13 -- games/miscom/files/patch-ae | 14 -- games/miscom/files/patch-ag | 12 -- games/miscom/files/patch-draw.c | 14 ++ games/miscom/files/patch-fire.c | 14 ++ games/miscom/files/patch-level.c | 13 ++ games/miscom/files/patch-main.c | 14 ++ games/miscom/files/patch-unix.c | 12 ++ games/nadar/files/patch-Makefile.mk | 24 ++++ games/nadar/files/patch-aa | 24 ---- games/netris/files/patch-Configure | 29 +++++ games/netris/files/patch-aa | 29 ----- games/newvox/files/patch-aa | 20 --- games/newvox/files/patch-configure | 20 +++ games/nonsense/Makefile | 2 - games/nonsense/files/patch-aa | 59 --------- games/nonsense/files/patch-nonsense | 59 +++++++++ games/omega/files/patch-Makefile | 61 +++++++++ games/omega/files/patch-aa | 61 --------- games/omega/files/patch-ab | 24 ---- games/omega/files/patch-ac | 15 --- games/omega/files/patch-ad | 12 -- games/omega/files/patch-ae | 26 ---- games/omega/files/patch-af | 15 --- games/omega/files/patch-ag | 15 --- games/omega/files/patch-defs.h | 24 ++++ games/omega/files/patch-file.c | 15 +++ games/omega/files/patch-fixstr.c | 12 ++ games/omega/files/patch-genclr.c | 26 ++++ games/omega/files/patch-inv.c | 15 +++ games/omega/files/patch-scr.c | 15 +++ games/oonsoo/files/patch-Makefile.common | 20 +++ games/oonsoo/files/patch-UI_BasicWidget.hxx | 15 +++ games/oonsoo/files/patch-ab | 20 --- games/oonsoo/files/patch-ac | 15 --- games/seabattle/files/patch-Makefile | 28 ++++ games/seabattle/files/patch-aa | 28 ---- games/seabattle/files/patch-ab | 11 -- games/seabattle/files/patch-ac | 31 ----- games/seabattle/files/patch-ad | 23 ---- games/seabattle/files/patch-batt.h | 11 ++ games/seabattle/files/patch-bdb.c | 31 +++++ games/seabattle/files/patch-binp.c | 23 ++++ games/smiley/files/patch-Makefile | 23 ++++ games/smiley/files/patch-aa | 23 ---- games/sol/Makefile | 2 +- games/sol/files/patch-Makefile | 56 ++++++++ games/sol/files/patch-aa | 56 -------- games/spellcast/files/patch-Makefile | 17 +++ games/spellcast/files/patch-aa | 17 --- games/speyes/files/patch-Imakefile | 8 ++ games/speyes/files/patch-aa | 8 -- games/spider/files/patch-Imakefile | 50 ++++++++ games/spider/files/patch-ab | 50 -------- games/spider/files/patch-ac | 11 -- games/spider/files/patch-ad | 13 -- games/spider/files/patch-globals.h | 13 ++ games/spider/files/patch-spider.man | 11 ++ games/sxsame/files/patch-Imakefile | 43 +++++++ games/sxsame/files/patch-aa | 43 ------- games/sxsame/files/patch-ad | 86 ------------- games/sxsame/files/patch-ae | 11 -- games/sxsame/files/patch-af | 39 ------ games/sxsame/files/patch-ag | 71 ----------- games/sxsame/files/patch-ah | 85 ------------ games/sxsame/files/patch-hiscore.c | 86 +++++++++++++ games/sxsame/files/patch-inifile.c | 11 ++ games/sxsame/files/patch-loadbmp.c | 39 ++++++ games/sxsame/files/patch-loaddata.c | 71 +++++++++++ games/sxsame/files/patch-sxsame.c | 85 ++++++++++++ games/taipan/files/patch-ab | 11 -- games/taipan/files/patch-taipan.c | 11 ++ games/tank/files/patch-MESA | 107 ++++++++++++++++ games/tank/files/patch-aa | 107 ---------------- games/tkmoo/files/patch-Makefile | 24 ++++ games/tkmoo/files/patch-aa | 24 ---- games/wmshuffle/files/patch-Makefile | 30 +++++ games/wmshuffle/files/patch-aa | 30 ----- games/wmtictactoe/files/patch-Makefile | 30 +++++ games/wmtictactoe/files/patch-aa | 30 ----- games/xataxx/files/patch-Imakefile | 27 ++++ games/xataxx/files/patch-aa | 27 ---- games/xbat/files/patch-Imakefile | 34 +++++ games/xbat/files/patch-aa | 34 ----- games/xblood/files/patch-Makefile | 30 +++++ games/xblood/files/patch-aa | 30 ----- games/xbomber/files/patch-aa | 28 ---- games/xbomber/files/patch-ac | 84 ------------ games/xbomber/files/patch-makefile | 28 ++++ games/xbomber/files/patch-xbomber.c | 84 ++++++++++++ games/xchadance/Makefile | 14 +- games/xchadance/files/patch-Makefile | 27 ++++ games/xchadance/files/patch-aa | 27 ---- games/xchadance/pkg-plist | 6 +- games/xchomp/files/patch-Imakefile | 17 +++ games/xchomp/files/patch-aa | 17 --- games/xdeblock/files/patch-Imakefile | 57 +++++++++ games/xdeblock/files/patch-aa | 57 --------- games/xdeblock/files/patch-ab | 19 --- games/xdeblock/files/patch-ac | 36 ------ games/xdeblock/files/patch-dialog.c | 36 ++++++ games/xdeblock/files/patch-main.c | 19 +++ games/xdigger/files/patch-Imakefile | 38 ++++++ games/xdigger/files/patch-aa | 13 -- games/xdigger/files/patch-ab | 72 ----------- games/xdigger/files/patch-ac | 50 -------- games/xdigger/files/patch-ad | 38 ------ games/xdigger/files/patch-ae | 14 -- games/xdigger/files/patch-configure.h | 13 ++ games/xdigger/files/patch-drawpixmaps.c | 14 ++ games/xdigger/files/patch-sound.c | 72 +++++++++++ games/xdigger/files/patch-xdigger.c | 50 ++++++++ games/xevil/files/patch-aa | 35 ----- games/xevil/files/patch-ad | 30 ----- games/xevil/files/patch-config.mk | 35 +++++ games/xevil/files/patch-makefile | 30 +++++ games/xfireworks/files/patch-Makefile | 27 ++++ games/xfireworks/files/patch-aa | 27 ---- games/xfrisk/files/patch-Makefile | 30 +++++ games/xfrisk/files/patch-ab | 30 ----- games/xgalaga/files/patch-Makefile.in | 67 ++++++++++ games/xgalaga/files/patch-aa | 67 ---------- games/xgalaga/files/patch-ab | 141 -------------------- games/xgalaga/files/patch-ac | 11 -- games/xgalaga/files/patch-ad | 15 --- games/xgalaga/files/patch-ae | 18 --- games/xgalaga/files/patch-configure | 11 ++ games/xgalaga/files/patch-main.c | 18 +++ games/xgalaga/files/patch-struct.h | 15 +++ games/xgalaga/files/patch-xgal.sndsrv.freebsd.c | 141 ++++++++++++++++++++ games/xhime/Makefile | 4 +- games/xhime/files/patch-Imakefile | 22 ++++ games/xhime/files/patch-aa | 22 ---- games/xhime/files/patch-ab | 111 ---------------- games/xhime/files/patch-xhime.c | 111 ++++++++++++++++ games/xinfocom/files/patch-Imakefile | 8 ++ games/xinfocom/files/patch-aa | 8 -- games/xinvaders3d/files/patch-Makefile | 25 ++++ games/xinvaders3d/files/patch-aa | 25 ---- games/xisola/files/patch-Imakefile | 15 +++ games/xisola/files/patch-aa | 15 --- games/xjig/files/patch-Makefile.Linux | 33 +++++ games/xjig/files/patch-aa | 33 ----- games/xjig/files/patch-ab | 72 ----------- games/xjig/files/patch-ac | 10 -- games/xjig/files/patch-ad | 10 -- games/xjig/files/patch-ae | 60 --------- games/xjig/files/patch-af | 10 -- games/xjig/files/patch-ag | 73 ----------- games/xjig/files/patch-ah | 72 ----------- games/xjig/files/patch-ai | 89 ------------- games/xjig/files/patch-gifx_image.C | 72 +++++++++++ games/xjig/files/patch-gifx_image.H | 10 ++ games/xjig/files/patch-imgbuff.C | 10 ++ games/xjig/files/patch-objects.C | 60 +++++++++ games/xjig/files/patch-options.H | 10 ++ games/xjig/files/patch-reset_image.H | 73 +++++++++++ games/xjig/files/patch-rotate.H | 72 +++++++++++ games/xjig/files/patch-xjig.C | 89 +++++++++++++ games/xlaby/files/patch-Imakefile | 24 ++++ games/xlaby/files/patch-aa | 24 ---- games/xmastermind/files/patch-ab | 13 -- games/xmastermind/files/patch-configure.h | 13 ++ games/xmemory/files/patch-Imakefile | 27 ++++ games/xmemory/files/patch-aa | 27 ---- games/xmemory/files/patch-ab | 15 --- games/xmemory/files/patch-xmemory.C | 15 +++ games/xmine/files/patch-Imakefile | 11 ++ games/xmine/files/patch-aa | 57 --------- games/xmine/files/patch-ab | 11 -- games/xmine/files/patch-ac | 8 -- games/xmine/files/patch-ad | 18 --- games/xmine/files/patch-ae | 142 --------------------- games/xmine/files/patch-xmine.c | 57 +++++++++ games/xmine/files/patch-xmine.c_1 | 18 +++ games/xmine/files/patch-xmine.c_2 | 142 +++++++++++++++++++++ games/xmine/files/patch-xmine.man | 8 ++ games/xmines/files/patch-Makefile | 41 ++++++ games/xmines/files/patch-aa | 41 ------ games/xmines/files/patch-ab | 12 -- games/xmines/files/patch-score.c | 12 ++ games/xmulti/Makefile | 4 - games/xmulti/files/patch-aa | 29 ----- games/xmulti/files/patch-config.tmpl | 29 +++++ games/xoids/files/patch-Imakefile | 46 +++++++ games/xoids/files/patch-aa | 46 ------- games/xoj/Makefile | 3 +- games/xoj/files/patch-Imakefile | 12 ++ games/xoj/files/patch-aa | 38 ------ games/xoj/files/patch-ab | 12 -- games/xoj/files/patch-xoj.c | 38 ++++++ games/xosmulti/files/patch-Makefile | 35 +++++ games/xosmulti/files/patch-aa | 35 ----- games/xpipeman/Makefile | 3 +- games/xpipeman/files/patch-Imakefile | 27 ++++ games/xpipeman/files/patch-aa | 31 ----- games/xpipeman/files/patch-ab | 27 ---- games/xpipeman/files/patch-ac | 43 ------- games/xpipeman/files/patch-main.c | 43 +++++++ games/xpipeman/files/patch-score.c | 31 +++++ games/xpuyopuyo/files/patch-Makefile.in | 11 ++ games/xpuyopuyo/files/patch-aa | 11 -- games/xpuyopuyo/files/patch-ab | 11 -- games/xpuyopuyo/files/patch-pgame_Makefile.in | 11 ++ games/xpuzzletama/files/patch-Imakefile | 17 +++ games/xpuzzletama/files/patch-aa | 17 --- games/xrisk/files/patch-aa | 11 -- games/xrisk/files/patch-ab | 8 -- games/xrisk/files/patch-ac | 11 -- games/xrisk/files/patch-doc_Imakefile | 8 ++ games/xrisk/files/patch-lib_Imakefile | 11 ++ games/xrisk/files/patch-xrisk.def | 11 ++ games/xroach/files/patch-Makefile | 24 ++++ games/xroach/files/patch-aa | 24 ---- games/xroach/files/patch-ab | 58 --------- games/xroach/files/patch-xroach.c | 58 +++++++++ games/xroads/files/patch-Makefile | 52 ++++++++ games/xroads/files/patch-aa | 52 -------- games/xroads/files/patch-ab | 11 -- games/xroads/files/patch-config.h | 11 ++ games/xsokoban/files/patch-Imakefile | 19 +++ games/xsokoban/files/patch-aa | 19 --- games/xsokoban/files/patch-ab | 53 -------- games/xsokoban/files/patch-ac | 19 --- games/xsokoban/files/patch-ad | 14 -- games/xsokoban/files/patch-config.h | 53 ++++++++ games/xsokoban/files/patch-config_local.h | 19 +++ games/xsokoban/files/patch-externs.h | 14 ++ games/xsoldier/files/patch-ab | 22 ---- games/xsoldier/files/patch-ac | 22 ---- games/xsoldier/files/patch-main.c | 22 ++++ games/xsoldier/files/patch-manage.c | 22 ++++ games/xspacewarp/files/patch-Imakefile | 23 ++++ games/xspacewarp/files/patch-aa | 11 -- games/xspacewarp/files/patch-ab | 101 --------------- games/xspacewarp/files/patch-ac | 15 --- games/xspacewarp/files/patch-ad | 23 ---- games/xspacewarp/files/patch-c_endever.hh | 11 ++ games/xspacewarp/files/patch-c_jovian.cc | 15 +++ games/xspacewarp/files/patch-xprep.hh | 101 +++++++++++++++ games/xspringies/files/patch-01 | 23 ---- games/xspringies/files/patch-phys.c | 23 ++++ games/xtet42/files/patch-Makefile.in | 20 +++ games/xtet42/files/patch-aa | 20 --- games/xtet42/files/patch-ab | 31 ----- games/xtet42/files/patch-xtete42.c | 31 +++++ games/xtic/files/patch-aa | 8 -- games/xtic/files/patch-ab | 11 -- games/xtic/files/patch-configure.h | 8 ++ games/xtic/files/patch-src_Imakefile | 11 ++ games/xtron/files/patch-Makefile | 18 +++ games/xtron/files/patch-aa | 18 --- games/xtron/files/patch-ab | 13 -- games/xtron/files/patch-ac | 11 -- games/xtron/files/patch-resource.c | 13 ++ games/xtron/files/patch-xtronrc | 11 ++ games/xtruco/files/patch-Makefile | 33 +++++ games/xtruco/files/patch-aa | 33 ----- games/xtux/files/patch-Makefile | 57 +++++++++ games/xtux/files/patch-aa | 57 --------- games/xtux/files/patch-ab | 10 -- games/xtux/files/patch-af | 15 --- games/xtux/files/patch-src_client_misc.c | 10 ++ games/xtux/files/patch-src_common_timing.c | 15 +++ games/xvmines/files/patch-Imakefile | 22 ++++ games/xvmines/files/patch-aa | 22 ---- games/xworm/files/patch-ab | 35 ----- games/xworm/files/patch-xworm.c | 35 +++++ games/yahtzee/Makefile | 4 +- games/yahtzee/files/patch-Makefile | 21 +++ games/yahtzee/files/patch-aa | 21 --- games/yahtzee/files/patch-ab | 12 -- games/yahtzee/files/patch-ac | 75 ----------- games/yahtzee/files/patch-config.h | 12 ++ games/yahtzee/files/patch-main.c | 75 +++++++++++ games/yahtzee/pkg-plist | 3 +- 445 files changed, 6063 insertions(+), 6078 deletions(-) create mode 100644 games/3dc/files/patch-Makefile delete mode 100644 games/3dc/files/patch-aa delete mode 100644 games/3dc/files/patch-ab create mode 100644 games/3dc/files/patch-include_machine.h create mode 100644 games/KnightCap/files/patch-Makefile delete mode 100644 games/KnightCap/files/patch-aa delete mode 100644 games/KnightCap/files/patch-ab create mode 100644 games/KnightCap/files/patch-knightcap.c delete mode 100644 games/acm/files/patch-01 delete mode 100644 games/acm/files/patch-02 delete mode 100644 games/acm/files/patch-03 delete mode 100644 games/acm/files/patch-04 delete mode 100644 games/acm/files/patch-05 delete mode 100644 games/acm/files/patch-06 delete mode 100644 games/acm/files/patch-07 delete mode 100644 games/acm/files/patch-08 delete mode 100644 games/acm/files/patch-09 create mode 100644 games/acm/files/patch-configure create mode 100644 games/acm/files/patch-dis_lib_xdr_var_array.c create mode 100644 games/acm/files/patch-dis_server_sites.c create mode 100644 games/acm/files/patch-dis_test_Makefile.in create mode 100644 games/acm/files/patch-src_Makefile.in create mode 100644 games/acm/files/patch-src_acm.man create mode 100644 games/acm/files/patch-src_chaser.c create mode 100644 games/acm/files/patch-src_interpolate.h create mode 100644 games/acm/files/patch-src_main.c create mode 100644 games/antipolix/files/patch-Imakefile delete mode 100644 games/antipolix/files/patch-aa delete mode 100644 games/antipolix/files/patch-ab delete mode 100644 games/antipolix/files/patch-ac delete mode 100644 games/antipolix/files/patch-ad delete mode 100644 games/antipolix/files/patch-ae create mode 100644 games/antipolix/files/patch-client.c create mode 100644 games/antipolix/files/patch-creation.c create mode 100644 games/antipolix/files/patch-messages.c create mode 100644 games/antipolix/files/patch-server.c create mode 100644 games/awele/files/patch-Imakefile delete mode 100644 games/awele/files/patch-aa delete mode 100644 games/awele/files/patch-ab delete mode 100644 games/awele/files/patch-ac create mode 100644 games/awele/files/patch-tkAppInit.c create mode 100644 games/awele/files/patch-xawele create mode 100644 games/blockade/files/patch-Makefile delete mode 100644 games/blockade/files/patch-aa delete mode 100644 games/blockade/files/patch-ab create mode 100644 games/blockade/files/patch-blockade.c create mode 100644 games/bugsx/files/patch-Imakefile delete mode 100644 games/bugsx/files/patch-aa delete mode 100644 games/columns/files/patch-ab delete mode 100644 games/columns/files/patch-ac create mode 100644 games/columns/files/patch-columns.cc create mode 100644 games/columns/files/patch-configure create mode 100644 games/cosmo/files/patch-Imakefile delete mode 100644 games/cosmo/files/patch-aa delete mode 100644 games/cosmo/files/patch-ab create mode 100644 games/cosmo/files/patch-setup.c delete mode 100644 games/cowsay/files/patch-aa create mode 100644 games/cowsay/files/patch-cowsay create mode 100644 games/cursive/files/patch-Makefile delete mode 100644 games/cursive/files/patch-aa delete mode 100644 games/cursive/files/patch-ab delete mode 100644 games/cursive/files/patch-ac create mode 100644 games/cursive/files/patch-cursive.6 create mode 100644 games/cursive/files/patch-cursive.c create mode 100644 games/drm/files/patch-Makefile delete mode 100644 games/drm/files/patch-aa delete mode 100644 games/editss/files/patch-aa delete mode 100644 games/editss/files/patch-ab delete mode 100644 games/editss/files/patch-ac create mode 100644 games/editss/files/patch-actions.c create mode 100644 games/editss/files/patch-editss.c create mode 100644 games/editss/files/patch-xstuff.c create mode 100644 games/flying/files/patch-Imakefile delete mode 100644 games/flying/files/patch-aa delete mode 100644 games/flying/files/patch-ab delete mode 100644 games/flying/files/patch-ac delete mode 100644 games/flying/files/patch-ad delete mode 100644 games/flying/files/patch-ae delete mode 100644 games/flying/files/patch-af create mode 100644 games/flying/files/patch-carrom.C create mode 100644 games/flying/files/patch-main.C create mode 100644 games/flying/files/patch-pool8.C create mode 100644 games/flying/files/patch-xgraph.C create mode 100644 games/flying/files/patch-xmover.C delete mode 100644 games/gnugo/files/patch-ab create mode 100644 games/gnugo/files/patch-configure delete mode 100644 games/gracer/files/patch-aa delete mode 100644 games/gracer/files/patch-ac create mode 100644 games/gracer/files/patch-configure.in create mode 100644 games/gracer/files/patch-src_glbind.c create mode 100644 games/heretic/files/patch-Makefile delete mode 100644 games/heretic/files/patch-aa delete mode 100644 games/heretic/files/patch-ac delete mode 100644 games/heretic/files/patch-ad delete mode 100644 games/heretic/files/patch-ae delete mode 100644 games/heretic/files/patch-af delete mode 100644 games/heretic/files/patch-ag delete mode 100644 games/heretic/files/patch-ah delete mode 100644 games/heretic/files/patch-aj delete mode 100644 games/heretic/files/patch-ak delete mode 100644 games/heretic/files/patch-al create mode 100644 games/heretic/files/patch-i_udp.c create mode 100644 games/heretic/files/patch-opengl_gl_fonts.c create mode 100644 games/heretic/files/patch-opengl_gl_struct.h create mode 100644 games/heretic/files/patch-opengl_sgi-si_libtess_memalloc.h create mode 100644 games/heretic/files/patch-sndserv_Makefile create mode 100644 games/heretic/files/patch-sndserv_linux.c create mode 100644 games/heretic/files/patch-sndserv_soundsrv.c create mode 100644 games/heretic/files/patch-sndserv_wadread.c create mode 100644 games/heretic/files/patch-w_wad.c create mode 100644 games/hex/files/patch-Makefile delete mode 100644 games/hex/files/patch-aa delete mode 100644 games/hex/files/patch-ab delete mode 100644 games/hex/files/patch-ac create mode 100644 games/hex/files/patch-hex.c create mode 100644 games/hex/files/patch-hex.h delete mode 100644 games/imaze/files/patch-aa delete mode 100644 games/imaze/files/patch-ab delete mode 100644 games/imaze/files/patch-ac delete mode 100644 games/imaze/files/patch-ad create mode 100644 games/imaze/files/patch-source_Makefile.in create mode 100644 games/imaze/files/patch-source_configure create mode 100644 games/imaze/files/patch-source_fbsd_joystick.c create mode 100644 games/imaze/files/patch-source_voxware_audio.c delete mode 100644 games/inform/files/patch-aa create mode 100644 games/inform/files/patch-header.h create mode 100644 games/ladder/files/patch-Makefile delete mode 100644 games/ladder/files/patch-aa delete mode 100644 games/ladder/files/patch-ab delete mode 100644 games/ladder/files/patch-ac delete mode 100644 games/ladder/files/patch-ad delete mode 100644 games/ladder/files/patch-ae delete mode 100644 games/ladder/files/patch-af delete mode 100644 games/ladder/files/patch-ag create mode 100644 games/ladder/files/patch-ladder.c_1 create mode 100644 games/ladder/files/patch-ladder.c_2 create mode 100644 games/ladder/files/patch-ladder.h create mode 100644 games/ladder/files/patch-lplay.c create mode 100644 games/ladder/files/patch-lscore.c create mode 100644 games/ladder/files/patch-ltime.c create mode 100644 games/lbreakout/files/patch-Makefile.in delete mode 100644 games/lbreakout/files/patch-aa delete mode 100644 games/lbreakout/files/patch-ab delete mode 100644 games/lbreakout/files/patch-ac delete mode 100644 games/lbreakout/files/patch-ad delete mode 100644 games/lbreakout/files/patch-ae create mode 100644 games/lbreakout/files/patch-configure create mode 100644 games/lbreakout/files/patch-lbreakout_Makefile.in create mode 100644 games/lbreakout/files/patch-lbreakout_breakout.cpp create mode 100644 games/lbreakout/files/patch-lbreakout_game.cpp create mode 100644 games/mindfocus/files/patch-Imakefile delete mode 100644 games/mindfocus/files/patch-aa delete mode 100644 games/mindfocus/files/patch-ab delete mode 100644 games/mindfocus/files/patch-ac create mode 100644 games/mindfocus/files/patch-configure.h create mode 100644 games/mindfocus/files/patch-mindfocus_Imakefile create mode 100644 games/mindguard/files/patch-Makefile delete mode 100644 games/mindguard/files/patch-aa delete mode 100644 games/mindguard/files/patch-ab create mode 100644 games/mindguard/files/patch-mindguard.c delete mode 100644 games/miscom/files/patch-ab delete mode 100644 games/miscom/files/patch-ac delete mode 100644 games/miscom/files/patch-ad delete mode 100644 games/miscom/files/patch-ae delete mode 100644 games/miscom/files/patch-ag create mode 100644 games/miscom/files/patch-draw.c create mode 100644 games/miscom/files/patch-fire.c create mode 100644 games/miscom/files/patch-level.c create mode 100644 games/miscom/files/patch-main.c create mode 100644 games/miscom/files/patch-unix.c create mode 100644 games/nadar/files/patch-Makefile.mk delete mode 100644 games/nadar/files/patch-aa create mode 100644 games/netris/files/patch-Configure delete mode 100644 games/netris/files/patch-aa delete mode 100644 games/newvox/files/patch-aa create mode 100644 games/newvox/files/patch-configure delete mode 100644 games/nonsense/files/patch-aa create mode 100644 games/nonsense/files/patch-nonsense create mode 100644 games/omega/files/patch-Makefile delete mode 100644 games/omega/files/patch-aa delete mode 100644 games/omega/files/patch-ab delete mode 100644 games/omega/files/patch-ac delete mode 100644 games/omega/files/patch-ad delete mode 100644 games/omega/files/patch-ae delete mode 100644 games/omega/files/patch-af delete mode 100644 games/omega/files/patch-ag create mode 100644 games/omega/files/patch-defs.h create mode 100644 games/omega/files/patch-file.c create mode 100644 games/omega/files/patch-fixstr.c create mode 100644 games/omega/files/patch-genclr.c create mode 100644 games/omega/files/patch-inv.c create mode 100644 games/omega/files/patch-scr.c create mode 100644 games/oonsoo/files/patch-Makefile.common create mode 100644 games/oonsoo/files/patch-UI_BasicWidget.hxx delete mode 100644 games/oonsoo/files/patch-ab delete mode 100644 games/oonsoo/files/patch-ac create mode 100644 games/seabattle/files/patch-Makefile delete mode 100644 games/seabattle/files/patch-aa delete mode 100644 games/seabattle/files/patch-ab delete mode 100644 games/seabattle/files/patch-ac delete mode 100644 games/seabattle/files/patch-ad create mode 100644 games/seabattle/files/patch-batt.h create mode 100644 games/seabattle/files/patch-bdb.c create mode 100644 games/seabattle/files/patch-binp.c create mode 100644 games/smiley/files/patch-Makefile delete mode 100644 games/smiley/files/patch-aa create mode 100644 games/sol/files/patch-Makefile delete mode 100644 games/sol/files/patch-aa create mode 100644 games/spellcast/files/patch-Makefile delete mode 100644 games/spellcast/files/patch-aa create mode 100644 games/speyes/files/patch-Imakefile delete mode 100644 games/speyes/files/patch-aa create mode 100644 games/spider/files/patch-Imakefile delete mode 100644 games/spider/files/patch-ab delete mode 100644 games/spider/files/patch-ac delete mode 100644 games/spider/files/patch-ad create mode 100644 games/spider/files/patch-globals.h create mode 100644 games/spider/files/patch-spider.man create mode 100644 games/sxsame/files/patch-Imakefile delete mode 100644 games/sxsame/files/patch-aa delete mode 100644 games/sxsame/files/patch-ad delete mode 100644 games/sxsame/files/patch-ae delete mode 100644 games/sxsame/files/patch-af delete mode 100644 games/sxsame/files/patch-ag delete mode 100644 games/sxsame/files/patch-ah create mode 100644 games/sxsame/files/patch-hiscore.c create mode 100644 games/sxsame/files/patch-inifile.c create mode 100644 games/sxsame/files/patch-loadbmp.c create mode 100644 games/sxsame/files/patch-loaddata.c create mode 100644 games/sxsame/files/patch-sxsame.c delete mode 100644 games/taipan/files/patch-ab create mode 100644 games/taipan/files/patch-taipan.c create mode 100644 games/tank/files/patch-MESA delete mode 100644 games/tank/files/patch-aa create mode 100644 games/tkmoo/files/patch-Makefile delete mode 100644 games/tkmoo/files/patch-aa create mode 100644 games/wmshuffle/files/patch-Makefile delete mode 100644 games/wmshuffle/files/patch-aa create mode 100644 games/wmtictactoe/files/patch-Makefile delete mode 100644 games/wmtictactoe/files/patch-aa create mode 100644 games/xataxx/files/patch-Imakefile delete mode 100644 games/xataxx/files/patch-aa create mode 100644 games/xbat/files/patch-Imakefile delete mode 100644 games/xbat/files/patch-aa create mode 100644 games/xblood/files/patch-Makefile delete mode 100644 games/xblood/files/patch-aa delete mode 100644 games/xbomber/files/patch-aa delete mode 100644 games/xbomber/files/patch-ac create mode 100644 games/xbomber/files/patch-makefile create mode 100644 games/xbomber/files/patch-xbomber.c create mode 100644 games/xchadance/files/patch-Makefile delete mode 100644 games/xchadance/files/patch-aa create mode 100644 games/xchomp/files/patch-Imakefile delete mode 100644 games/xchomp/files/patch-aa create mode 100644 games/xdeblock/files/patch-Imakefile delete mode 100644 games/xdeblock/files/patch-aa delete mode 100644 games/xdeblock/files/patch-ab delete mode 100644 games/xdeblock/files/patch-ac create mode 100644 games/xdeblock/files/patch-dialog.c create mode 100644 games/xdeblock/files/patch-main.c create mode 100644 games/xdigger/files/patch-Imakefile delete mode 100644 games/xdigger/files/patch-aa delete mode 100644 games/xdigger/files/patch-ab delete mode 100644 games/xdigger/files/patch-ac delete mode 100644 games/xdigger/files/patch-ad delete mode 100644 games/xdigger/files/patch-ae create mode 100644 games/xdigger/files/patch-configure.h create mode 100644 games/xdigger/files/patch-drawpixmaps.c create mode 100644 games/xdigger/files/patch-sound.c create mode 100644 games/xdigger/files/patch-xdigger.c delete mode 100644 games/xevil/files/patch-aa delete mode 100644 games/xevil/files/patch-ad create mode 100644 games/xevil/files/patch-config.mk create mode 100644 games/xevil/files/patch-makefile create mode 100644 games/xfireworks/files/patch-Makefile delete mode 100644 games/xfireworks/files/patch-aa create mode 100644 games/xfrisk/files/patch-Makefile delete mode 100644 games/xfrisk/files/patch-ab create mode 100644 games/xgalaga/files/patch-Makefile.in delete mode 100644 games/xgalaga/files/patch-aa delete mode 100644 games/xgalaga/files/patch-ab delete mode 100644 games/xgalaga/files/patch-ac delete mode 100644 games/xgalaga/files/patch-ad delete mode 100644 games/xgalaga/files/patch-ae create mode 100644 games/xgalaga/files/patch-configure create mode 100644 games/xgalaga/files/patch-main.c create mode 100644 games/xgalaga/files/patch-struct.h create mode 100644 games/xgalaga/files/patch-xgal.sndsrv.freebsd.c create mode 100644 games/xhime/files/patch-Imakefile delete mode 100644 games/xhime/files/patch-aa delete mode 100644 games/xhime/files/patch-ab create mode 100644 games/xhime/files/patch-xhime.c create mode 100644 games/xinfocom/files/patch-Imakefile delete mode 100644 games/xinfocom/files/patch-aa create mode 100644 games/xinvaders3d/files/patch-Makefile delete mode 100644 games/xinvaders3d/files/patch-aa create mode 100644 games/xisola/files/patch-Imakefile delete mode 100644 games/xisola/files/patch-aa create mode 100644 games/xjig/files/patch-Makefile.Linux delete mode 100644 games/xjig/files/patch-aa delete mode 100644 games/xjig/files/patch-ab delete mode 100644 games/xjig/files/patch-ac delete mode 100644 games/xjig/files/patch-ad delete mode 100644 games/xjig/files/patch-ae delete mode 100644 games/xjig/files/patch-af delete mode 100644 games/xjig/files/patch-ag delete mode 100644 games/xjig/files/patch-ah delete mode 100644 games/xjig/files/patch-ai create mode 100644 games/xjig/files/patch-gifx_image.C create mode 100644 games/xjig/files/patch-gifx_image.H create mode 100644 games/xjig/files/patch-imgbuff.C create mode 100644 games/xjig/files/patch-objects.C create mode 100644 games/xjig/files/patch-options.H create mode 100644 games/xjig/files/patch-reset_image.H create mode 100644 games/xjig/files/patch-rotate.H create mode 100644 games/xjig/files/patch-xjig.C create mode 100644 games/xlaby/files/patch-Imakefile delete mode 100644 games/xlaby/files/patch-aa delete mode 100644 games/xmastermind/files/patch-ab create mode 100644 games/xmastermind/files/patch-configure.h create mode 100644 games/xmemory/files/patch-Imakefile delete mode 100644 games/xmemory/files/patch-aa delete mode 100644 games/xmemory/files/patch-ab create mode 100644 games/xmemory/files/patch-xmemory.C create mode 100644 games/xmine/files/patch-Imakefile delete mode 100644 games/xmine/files/patch-aa delete mode 100644 games/xmine/files/patch-ab delete mode 100644 games/xmine/files/patch-ac delete mode 100644 games/xmine/files/patch-ad delete mode 100644 games/xmine/files/patch-ae create mode 100644 games/xmine/files/patch-xmine.c create mode 100644 games/xmine/files/patch-xmine.c_1 create mode 100644 games/xmine/files/patch-xmine.c_2 create mode 100644 games/xmine/files/patch-xmine.man create mode 100644 games/xmines/files/patch-Makefile delete mode 100644 games/xmines/files/patch-aa delete mode 100644 games/xmines/files/patch-ab create mode 100644 games/xmines/files/patch-score.c delete mode 100644 games/xmulti/files/patch-aa create mode 100644 games/xmulti/files/patch-config.tmpl create mode 100644 games/xoids/files/patch-Imakefile delete mode 100644 games/xoids/files/patch-aa create mode 100644 games/xoj/files/patch-Imakefile delete mode 100644 games/xoj/files/patch-aa delete mode 100644 games/xoj/files/patch-ab create mode 100644 games/xoj/files/patch-xoj.c create mode 100644 games/xosmulti/files/patch-Makefile delete mode 100644 games/xosmulti/files/patch-aa create mode 100644 games/xpipeman/files/patch-Imakefile delete mode 100644 games/xpipeman/files/patch-aa delete mode 100644 games/xpipeman/files/patch-ab delete mode 100644 games/xpipeman/files/patch-ac create mode 100644 games/xpipeman/files/patch-main.c create mode 100644 games/xpipeman/files/patch-score.c create mode 100644 games/xpuyopuyo/files/patch-Makefile.in delete mode 100644 games/xpuyopuyo/files/patch-aa delete mode 100644 games/xpuyopuyo/files/patch-ab create mode 100644 games/xpuyopuyo/files/patch-pgame_Makefile.in create mode 100644 games/xpuzzletama/files/patch-Imakefile delete mode 100644 games/xpuzzletama/files/patch-aa delete mode 100644 games/xrisk/files/patch-aa delete mode 100644 games/xrisk/files/patch-ab delete mode 100644 games/xrisk/files/patch-ac create mode 100644 games/xrisk/files/patch-doc_Imakefile create mode 100644 games/xrisk/files/patch-lib_Imakefile create mode 100644 games/xrisk/files/patch-xrisk.def create mode 100644 games/xroach/files/patch-Makefile delete mode 100644 games/xroach/files/patch-aa delete mode 100644 games/xroach/files/patch-ab create mode 100644 games/xroach/files/patch-xroach.c create mode 100644 games/xroads/files/patch-Makefile delete mode 100644 games/xroads/files/patch-aa delete mode 100644 games/xroads/files/patch-ab create mode 100644 games/xroads/files/patch-config.h create mode 100644 games/xsokoban/files/patch-Imakefile delete mode 100644 games/xsokoban/files/patch-aa delete mode 100644 games/xsokoban/files/patch-ab delete mode 100644 games/xsokoban/files/patch-ac delete mode 100644 games/xsokoban/files/patch-ad create mode 100644 games/xsokoban/files/patch-config.h create mode 100644 games/xsokoban/files/patch-config_local.h create mode 100644 games/xsokoban/files/patch-externs.h delete mode 100644 games/xsoldier/files/patch-ab delete mode 100644 games/xsoldier/files/patch-ac create mode 100644 games/xsoldier/files/patch-main.c create mode 100644 games/xsoldier/files/patch-manage.c create mode 100644 games/xspacewarp/files/patch-Imakefile delete mode 100644 games/xspacewarp/files/patch-aa delete mode 100644 games/xspacewarp/files/patch-ab delete mode 100644 games/xspacewarp/files/patch-ac delete mode 100644 games/xspacewarp/files/patch-ad create mode 100644 games/xspacewarp/files/patch-c_endever.hh create mode 100644 games/xspacewarp/files/patch-c_jovian.cc create mode 100644 games/xspacewarp/files/patch-xprep.hh delete mode 100644 games/xspringies/files/patch-01 create mode 100644 games/xspringies/files/patch-phys.c create mode 100644 games/xtet42/files/patch-Makefile.in delete mode 100644 games/xtet42/files/patch-aa delete mode 100644 games/xtet42/files/patch-ab create mode 100644 games/xtet42/files/patch-xtete42.c delete mode 100644 games/xtic/files/patch-aa delete mode 100644 games/xtic/files/patch-ab create mode 100644 games/xtic/files/patch-configure.h create mode 100644 games/xtic/files/patch-src_Imakefile create mode 100644 games/xtron/files/patch-Makefile delete mode 100644 games/xtron/files/patch-aa delete mode 100644 games/xtron/files/patch-ab delete mode 100644 games/xtron/files/patch-ac create mode 100644 games/xtron/files/patch-resource.c create mode 100644 games/xtron/files/patch-xtronrc create mode 100644 games/xtruco/files/patch-Makefile delete mode 100644 games/xtruco/files/patch-aa create mode 100644 games/xtux/files/patch-Makefile delete mode 100644 games/xtux/files/patch-aa delete mode 100644 games/xtux/files/patch-ab delete mode 100644 games/xtux/files/patch-af create mode 100644 games/xtux/files/patch-src_client_misc.c create mode 100644 games/xtux/files/patch-src_common_timing.c create mode 100644 games/xvmines/files/patch-Imakefile delete mode 100644 games/xvmines/files/patch-aa delete mode 100644 games/xworm/files/patch-ab create mode 100644 games/xworm/files/patch-xworm.c create mode 100644 games/yahtzee/files/patch-Makefile delete mode 100644 games/yahtzee/files/patch-aa delete mode 100644 games/yahtzee/files/patch-ab delete mode 100644 games/yahtzee/files/patch-ac create mode 100644 games/yahtzee/files/patch-config.h create mode 100644 games/yahtzee/files/patch-main.c diff --git a/games/3dc/files/patch-Makefile b/games/3dc/files/patch-Makefile new file mode 100644 index 0000000..791668f --- /dev/null +++ b/games/3dc/files/patch-Makefile @@ -0,0 +1,35 @@ +--- Makefile.orig Thu Apr 11 16:23:53 1996 ++++ Makefile Fri Jan 26 23:23:12 2007 +@@ -13,7 +13,7 @@ + # If your system doesn't have a unique define already, define one here. + + # Linux +-CONFIGS=-DHAVE_UNISTD_H -DHAVE_ULIMIT_H ++CONFIGS=-DHAVE_UNISTD_H + # OSF/Digital Unix/HPUX + #CONFIGS=-fPIC -DHAVE_UNISTD_H -DHAVE_ULIMIT_H + # Sun +@@ -27,19 +27,19 @@ + # can send me opinions at mailto:paulh@euristix.ie + PREFS=-DUNDO_ANY_MOVE + +-CC=gcc ++#CC=gcc + #DEBUG=-g -Wall -DDEBUG + DEBUG= +-COPTIONS=-O2 -fstrength-reduce -fpcc-struct-return -DVERSION=\"${VERSION}\" ++COPTIONS=-DVERSION=\"${VERSION}\" + +-CFLAGS=${COPTIONS} ${DEBUG} ${CONFIGS} ${PREFS} -I../include ++CFLAGS+=${COPTIONS} ${DEBUG} ${CONFIGS} ${PREFS} -I../include -I${LOCALBASE}/include + LDOPTIONS= + + # LDLIBS should include the name of your X library path if not /usr/lib; + # and I definitely recommend getting Xaw3d. The extra appearance doesn't + # appear much but it looks much better when it does. + # Linux +-LDLIBS=-L/usr/X11R6/lib -lXpm -lXaw3d -lXmu -lXext -lXt -lX11 ++LDLIBS=-L${LOCALBASE}/lib -lXpm -lXaw3d -lXmu -lXext -lXt -lX11 -Wl,-rpath,${LOCALBASE}/lib + # Sun + #LDLIBS=-lXpm -lXaw -lXmu -lXext -lXt -lX11 -lm + diff --git a/games/3dc/files/patch-aa b/games/3dc/files/patch-aa deleted file mode 100644 index 791668f..0000000 --- a/games/3dc/files/patch-aa +++ /dev/null @@ -1,35 +0,0 @@ ---- Makefile.orig Thu Apr 11 16:23:53 1996 -+++ Makefile Fri Jan 26 23:23:12 2007 -@@ -13,7 +13,7 @@ - # If your system doesn't have a unique define already, define one here. - - # Linux --CONFIGS=-DHAVE_UNISTD_H -DHAVE_ULIMIT_H -+CONFIGS=-DHAVE_UNISTD_H - # OSF/Digital Unix/HPUX - #CONFIGS=-fPIC -DHAVE_UNISTD_H -DHAVE_ULIMIT_H - # Sun -@@ -27,19 +27,19 @@ - # can send me opinions at mailto:paulh@euristix.ie - PREFS=-DUNDO_ANY_MOVE - --CC=gcc -+#CC=gcc - #DEBUG=-g -Wall -DDEBUG - DEBUG= --COPTIONS=-O2 -fstrength-reduce -fpcc-struct-return -DVERSION=\"${VERSION}\" -+COPTIONS=-DVERSION=\"${VERSION}\" - --CFLAGS=${COPTIONS} ${DEBUG} ${CONFIGS} ${PREFS} -I../include -+CFLAGS+=${COPTIONS} ${DEBUG} ${CONFIGS} ${PREFS} -I../include -I${LOCALBASE}/include - LDOPTIONS= - - # LDLIBS should include the name of your X library path if not /usr/lib; - # and I definitely recommend getting Xaw3d. The extra appearance doesn't - # appear much but it looks much better when it does. - # Linux --LDLIBS=-L/usr/X11R6/lib -lXpm -lXaw3d -lXmu -lXext -lXt -lX11 -+LDLIBS=-L${LOCALBASE}/lib -lXpm -lXaw3d -lXmu -lXext -lXt -lX11 -Wl,-rpath,${LOCALBASE}/lib - # Sun - #LDLIBS=-lXpm -lXaw -lXmu -lXext -lXt -lX11 -lm - diff --git a/games/3dc/files/patch-ab b/games/3dc/files/patch-ab deleted file mode 100644 index 8342b7c..0000000 --- a/games/3dc/files/patch-ab +++ /dev/null @@ -1,11 +0,0 @@ ---- ../include/machine.h.orig Mon May 31 12:57:09 1999 -+++ ../include/machine.h Mon May 31 12:57:36 1999 -@@ -35,7 +35,7 @@ - #include - #endif - --#ifdef __alpha__ -+#if defined(__alpha__) && !defined(__FreeBSD__) - #include - #endif /* __alpha__ */ - diff --git a/games/3dc/files/patch-include_machine.h b/games/3dc/files/patch-include_machine.h new file mode 100644 index 0000000..8342b7c --- /dev/null +++ b/games/3dc/files/patch-include_machine.h @@ -0,0 +1,11 @@ +--- ../include/machine.h.orig Mon May 31 12:57:09 1999 ++++ ../include/machine.h Mon May 31 12:57:36 1999 +@@ -35,7 +35,7 @@ + #include + #endif + +-#ifdef __alpha__ ++#if defined(__alpha__) && !defined(__FreeBSD__) + #include + #endif /* __alpha__ */ + diff --git a/games/KnightCap/files/patch-Makefile b/games/KnightCap/files/patch-Makefile new file mode 100644 index 0000000..3a4bc2c --- /dev/null +++ b/games/KnightCap/files/patch-Makefile @@ -0,0 +1,57 @@ +--- Makefile.orig Sun May 17 16:09:21 1998 ++++ Makefile Thu Nov 6 15:07:34 2003 +@@ -2,11 +2,11 @@ + + # what C compiler? It better be Ansi-C. Use gcc if you have it. + # you may find that KnightCap is very slow if you don't use gcc +-CC = gcc ++CC ?= gcc + + # What compiler switches do you want? These ones work well with gcc + #OPT = -O2 -fshort-enums -Wall +-OPT = -g -fshort-enums -Wall ++# OPT = -g -fshort-enums -Wall + + # If you don't have gcc then perhaps try this instead. You only need + # the null definition for inline if your C compiler doesn't know about +@@ -21,23 +21,23 @@ + # display (or you don't have OpenGL and Glut libraries) + # If you do have these libs then make sure the first three + # lines point at the right places +-MESA = /usr/local/Mesa-2.1 +-GLUT = /usr/local/Mesa-2.1/glut-3.2 +-X11 = /usr/X11R6 +-GLUT_LIBS = -L$(GLUT)/lib/glut -lglut +-MESA_LIBS = -L$(MESA)/lib -lMesaGLU -lMesaGL -lm ++MESA = ${LOCALBASE} ++GLUT = ${LOCALBASE} ++X11 = ${LOCALBASE} ++GLUT_LIBS = -L$(GLUT)/lib -lglut ++MESA_LIBS = -L$(MESA)/lib -lGLU -lGL -lm + XLIBS = -L$(X11)/lib -lXmu -lXt -lXext -lX11 -lXi +-DISPLAYFLAGS = -I$(MESA)/include -I$(GLUT) -DRENDERED_DISPLAY=1 ++DISPLAYFLAGS = -I$(X11)/include -I$(MESA)/include -I$(GLUT)/include -DRENDERED_DISPLAY=1 + + # comment out the following line if you don't want KnightCap's + # evaluation function learning turned on. +-LEARNFLAGS = -DLEARN_EVAL=1 ++#LEARNFLAGS = -DLEARN_EVAL=1 + + # you shouldn't need to edit anything below this line. Unless + # something goes wrong. + + INCLUDE = $(DISPLAYFLAGS) +-CFLAGS = $(OPT) $(INCLUDE) $(LEARNFLAGS) ++CFLAGS += $(OPT) $(INCLUDE) $(LEARNFLAGS) + + LIBS = $(GLUT_LIBS) $(MESA_LIBS) $(XLIBS) + +@@ -45,7 +45,7 @@ + + OBJS = knightcap.o trackball.o move.o util.o generate.o eval.o movement.o \ + ordering.o hash.o board.o log.o prog.o timer.o ics.o display.o \ +- testsuite.o brain.o td.o tactics.o ++ testsuite.o brain.o td.o tactics.o epd.o epdglue.o + + $(TARGET): $(OBJS) + -mv $@ $@.old diff --git a/games/KnightCap/files/patch-aa b/games/KnightCap/files/patch-aa deleted file mode 100644 index 3a4bc2c..0000000 --- a/games/KnightCap/files/patch-aa +++ /dev/null @@ -1,57 +0,0 @@ ---- Makefile.orig Sun May 17 16:09:21 1998 -+++ Makefile Thu Nov 6 15:07:34 2003 -@@ -2,11 +2,11 @@ - - # what C compiler? It better be Ansi-C. Use gcc if you have it. - # you may find that KnightCap is very slow if you don't use gcc --CC = gcc -+CC ?= gcc - - # What compiler switches do you want? These ones work well with gcc - #OPT = -O2 -fshort-enums -Wall --OPT = -g -fshort-enums -Wall -+# OPT = -g -fshort-enums -Wall - - # If you don't have gcc then perhaps try this instead. You only need - # the null definition for inline if your C compiler doesn't know about -@@ -21,23 +21,23 @@ - # display (or you don't have OpenGL and Glut libraries) - # If you do have these libs then make sure the first three - # lines point at the right places --MESA = /usr/local/Mesa-2.1 --GLUT = /usr/local/Mesa-2.1/glut-3.2 --X11 = /usr/X11R6 --GLUT_LIBS = -L$(GLUT)/lib/glut -lglut --MESA_LIBS = -L$(MESA)/lib -lMesaGLU -lMesaGL -lm -+MESA = ${LOCALBASE} -+GLUT = ${LOCALBASE} -+X11 = ${LOCALBASE} -+GLUT_LIBS = -L$(GLUT)/lib -lglut -+MESA_LIBS = -L$(MESA)/lib -lGLU -lGL -lm - XLIBS = -L$(X11)/lib -lXmu -lXt -lXext -lX11 -lXi --DISPLAYFLAGS = -I$(MESA)/include -I$(GLUT) -DRENDERED_DISPLAY=1 -+DISPLAYFLAGS = -I$(X11)/include -I$(MESA)/include -I$(GLUT)/include -DRENDERED_DISPLAY=1 - - # comment out the following line if you don't want KnightCap's - # evaluation function learning turned on. --LEARNFLAGS = -DLEARN_EVAL=1 -+#LEARNFLAGS = -DLEARN_EVAL=1 - - # you shouldn't need to edit anything below this line. Unless - # something goes wrong. - - INCLUDE = $(DISPLAYFLAGS) --CFLAGS = $(OPT) $(INCLUDE) $(LEARNFLAGS) -+CFLAGS += $(OPT) $(INCLUDE) $(LEARNFLAGS) - - LIBS = $(GLUT_LIBS) $(MESA_LIBS) $(XLIBS) - -@@ -45,7 +45,7 @@ - - OBJS = knightcap.o trackball.o move.o util.o generate.o eval.o movement.o \ - ordering.o hash.o board.o log.o prog.o timer.o ics.o display.o \ -- testsuite.o brain.o td.o tactics.o -+ testsuite.o brain.o td.o tactics.o epd.o epdglue.o - - $(TARGET): $(OBJS) - -mv $@ $@.old diff --git a/games/KnightCap/files/patch-ab b/games/KnightCap/files/patch-ab deleted file mode 100644 index 01dba41..0000000 --- a/games/KnightCap/files/patch-ab +++ /dev/null @@ -1,14 +0,0 @@ ---- knightcap.c Wed Mar 11 21:51:58 1998 -+++ /home/andy/tmp/wrk/knightcap.c Sun May 10 09:54:22 1998 -@@ -934,7 +934,11 @@ - reset_board(); - init_movements(); - -+#ifdef __FreeBSD__ -+ signal(SIGCHLD, SIG_IGN); -+#else - signal(SIGCLD, SIG_IGN); -+#endif - - pid1 = getpid(); - diff --git a/games/KnightCap/files/patch-knightcap.c b/games/KnightCap/files/patch-knightcap.c new file mode 100644 index 0000000..01dba41 --- /dev/null +++ b/games/KnightCap/files/patch-knightcap.c @@ -0,0 +1,14 @@ +--- knightcap.c Wed Mar 11 21:51:58 1998 ++++ /home/andy/tmp/wrk/knightcap.c Sun May 10 09:54:22 1998 +@@ -934,7 +934,11 @@ + reset_board(); + init_movements(); + ++#ifdef __FreeBSD__ ++ signal(SIGCHLD, SIG_IGN); ++#else + signal(SIGCLD, SIG_IGN); ++#endif + + pid1 = getpid(); + diff --git a/games/acm/files/patch-01 b/games/acm/files/patch-01 deleted file mode 100644 index 0e8b044..0000000 --- a/games/acm/files/patch-01 +++ /dev/null @@ -1,17 +0,0 @@ ---- src/Makefile.in~ Wed Dec 9 21:53:42 1998 -+++ src/Makefile.in Sun May 20 10:32:43 2007 -@@ -17,12 +17,12 @@ - -I../dis - TOPDIR = .. - CLEAN_THESE = flight-state black_box_input black_box_output bitmap.h TAGS tags -- manext = 1 -+ manext = 6 - MAKEDEPEND = makedepend - - PROGRAMS = acm - DEFINES = -DSRCDIR=\"$(srcdir)\" -DACM_LIBRARY=\"@OBVDIR@\" -- CFLAGS = $(DEFINES) @CFLAGS@ @DEFS@ $(STD_INCLUDES) -+ CFLAGS = $(STD_INCLUDES) $(DEFINES) @CFLAGS@ @DEFS@ - LDFLAGS = @LDFLAGS@ - SRCS = main.c pm.c gear.c flaps.c drone.c init.c aim9m.c box.c \ - aim120.c ccip.c \ diff --git a/games/acm/files/patch-02 b/games/acm/files/patch-02 deleted file mode 100644 index 46cc789..0000000 --- a/games/acm/files/patch-02 +++ /dev/null @@ -1,11 +0,0 @@ -*** src/acm.man~ Fri Aug 14 16:58:20 1998 ---- src/acm.man Mon Feb 1 18:05:28 1999 -*************** -*** 1,3 **** -! .TH ACM l "August 1, 1998" - .SH NAME - acm \- an aerial combat simulator for X ---- 1,3 ---- -! .TH ACM 6 "October 1, 1995" - .SH NAME - acm \- an aerial combat simulator for X diff --git a/games/acm/files/patch-03 b/games/acm/files/patch-03 deleted file mode 100644 index 79dd7dd..0000000 --- a/games/acm/files/patch-03 +++ /dev/null @@ -1,60 +0,0 @@ -*** configure~ Mon Aug 17 20:15:13 1998 ---- configure Mon Feb 1 18:42:53 1999 -*************** -*** 529,535 **** - - if test -d /usr/lib/games ; then -! OBVDIR="/usr/lib/games/acm" - else -! OBVDIR=\$\(prefix\)/games/acm - fi - ---- 529,535 ---- - - if test -d /usr/lib/games ; then -! OBVDIR="/usr/lib/games/acm/" - else -! OBVDIR=\$\(prefix\)/games/acm/ - fi - -*************** -*** 557,560 **** ---- 557,567 ---- - fi - -+ # *BSD -+ BSD=0 -+ if uname -s | grep BSD > /dev/null ; then -+ BSD=1 -+ OBVDIR=${prefix}/share/acm/ -+ fi -+ - # Extract the first word of "gcc", so it can be a program name with args. - set dummy gcc; ac_word=$2 -*************** -*** 769,773 **** - - -! if test "$LINUX" = "0" ; then - echo $ac_n "checking for elf_end in -lelf""... $ac_c" 1>&6 - echo "configure:774: checking for elf_end in -lelf" >&5 ---- 776,780 ---- - - -! if test "$LINUX" = "0" -a "$BSD" = "0"; then - echo $ac_n "checking for elf_end in -lelf""... $ac_c" 1>&6 - echo "configure:774: checking for elf_end in -lelf" >&5 -*************** -*** 1129,1133 **** - done - -! if test "$LINUX" = "0" ; then - ac_safe=`echo "elf.h" | sed 'y%./+-%__p_%'` - echo $ac_n "checking for elf.h""... $ac_c" 1>&6 ---- 1136,1141 ---- - done - -! -! if test "$LINUX" = "0" -a "$BSD" = "0" ; then - ac_safe=`echo "elf.h" | sed 'y%./+-%__p_%'` - echo $ac_n "checking for elf.h""... $ac_c" 1>&6 diff --git a/games/acm/files/patch-04 b/games/acm/files/patch-04 deleted file mode 100644 index 229d8a8..0000000 --- a/games/acm/files/patch-04 +++ /dev/null @@ -1,28 +0,0 @@ -*** dis/test/Makefile.in~ Fri Aug 14 23:20:24 1998 ---- dis/test/Makefile.in Mon Feb 1 18:48:38 1999 -*************** -*** 1,5 **** - srcdir = @srcdir@ -! VPATH = @srcdir@ -! CFLAGS = -I$(srcdir)/.. -I.. -I../lib -I$(srcdir)/../../V/lib @CFLAGS@ - CC = @CC@ - SRCS = disscope.c simxtest.c tglobe.c ---- 1,5 ---- - srcdir = @srcdir@ -! VPATH = @srcdir@ -! CFLAGS = -I$(srcdir)/.. -I.. -I../lib -I$(srcdir)/../../V/lib @CFLAGS@ - CC = @CC@ - SRCS = disscope.c simxtest.c tglobe.c -*************** -*** 7,11 **** - SIMXTEST_OBJS = simxtest.o - TGLOBE_OBJS = tglobe.o -! DECOY_OBJS = decoy.o - LIBS = -L../lib -ldis -L../../V/lib -lV @LIBS@ - ---- 7,11 ---- - SIMXTEST_OBJS = simxtest.o - TGLOBE_OBJS = tglobe.o -! DECOY_OBJS = decoy.o - LIBS = -L../lib -ldis -L../../V/lib -lV @LIBS@ - diff --git a/games/acm/files/patch-05 b/games/acm/files/patch-05 deleted file mode 100644 index 580ff93..0000000 --- a/games/acm/files/patch-05 +++ /dev/null @@ -1,18 +0,0 @@ -*** src/main.c~ Wed Dec 23 23:29:00 1998 ---- src/main.c Mon Feb 1 19:14:05 1999 -*************** -*** 444,448 **** - #endif - -! init("."); - - dpy = XOpenDisplay(display); ---- 444,451 ---- - #endif - -! #ifndef ACM_LIBRARY -! #define ACM_LIBRARY "." -! #endif -! init(ACM_LIBRARY "/"); - - dpy = XOpenDisplay(display); diff --git a/games/acm/files/patch-06 b/games/acm/files/patch-06 deleted file mode 100644 index 3401ced..0000000 --- a/games/acm/files/patch-06 +++ /dev/null @@ -1,14 +0,0 @@ ---- src/chaser.c~ Tue May 12 05:43:03 1998 -+++ src/chaser.c Sat Nov 24 14:47:05 2001 -@@ -20,7 +20,11 @@ - #include "pm.h" - #include - #include -+#ifdef HAVE_STDLIB_H -+#include -+#else - #include -+#endif - - #define MAX_MAPPED_STRING_LEN 20 - #define MAX_POPUP_STRING_LEN 40 diff --git a/games/acm/files/patch-07 b/games/acm/files/patch-07 deleted file mode 100644 index 47a96da..0000000 --- a/games/acm/files/patch-07 +++ /dev/null @@ -1,14 +0,0 @@ ---- dis/server/sites.c~ Sat Nov 24 14:46:24 2001 -+++ dis/server/sites.c Sat Nov 24 14:46:03 2001 -@@ -27,7 +27,11 @@ - * README file. - */ - #include -+#ifdef HAVE_STDLIB_H -+#include -+#else - #include -+#endif - #include - #ifdef HAVE_NDBM - #include diff --git a/games/acm/files/patch-08 b/games/acm/files/patch-08 deleted file mode 100644 index 8eb76ed..0000000 --- a/games/acm/files/patch-08 +++ /dev/null @@ -1,10 +0,0 @@ ---- src/interpolate.h~ Tue May 12 05:43:04 1998 -+++ src/interpolate.h Sat May 24 12:03:04 2003 -@@ -30,6 +30,7 @@ - */ - - #include -+#define float_t ACM_float_t - - typedef float float_t; - diff --git a/games/acm/files/patch-09 b/games/acm/files/patch-09 deleted file mode 100644 index d0ce1c2..0000000 --- a/games/acm/files/patch-09 +++ /dev/null @@ -1,24 +0,0 @@ ---- dis/lib/xdr_var_array.c~ Mon May 11 20:58:55 1998 -+++ dis/lib/xdr_var_array.c Sun Jul 6 03:21:47 2003 -@@ -75,6 +75,12 @@ - - #include - #include -+#include -+#if __FreeBSD_Version__ >= 500113 -+# include -+#else -+# include -+#endif - #include - #include - -@@ -104,7 +110,7 @@ - register u_int nodesize; - - c = size; -- if ((c > maxsize) && (xdrs->x_op != XDR_FREE)) { -+ if ((c > maxsize || c > UINT_MAX/elsize) && (xdrs->x_op != XDR_FREE)) { - return (FALSE); - } - nodesize = c * elsize; diff --git a/games/acm/files/patch-configure b/games/acm/files/patch-configure new file mode 100644 index 0000000..79dd7dd --- /dev/null +++ b/games/acm/files/patch-configure @@ -0,0 +1,60 @@ +*** configure~ Mon Aug 17 20:15:13 1998 +--- configure Mon Feb 1 18:42:53 1999 +*************** +*** 529,535 **** + + if test -d /usr/lib/games ; then +! OBVDIR="/usr/lib/games/acm" + else +! OBVDIR=\$\(prefix\)/games/acm + fi + +--- 529,535 ---- + + if test -d /usr/lib/games ; then +! OBVDIR="/usr/lib/games/acm/" + else +! OBVDIR=\$\(prefix\)/games/acm/ + fi + +*************** +*** 557,560 **** +--- 557,567 ---- + fi + ++ # *BSD ++ BSD=0 ++ if uname -s | grep BSD > /dev/null ; then ++ BSD=1 ++ OBVDIR=${prefix}/share/acm/ ++ fi ++ + # Extract the first word of "gcc", so it can be a program name with args. + set dummy gcc; ac_word=$2 +*************** +*** 769,773 **** + + +! if test "$LINUX" = "0" ; then + echo $ac_n "checking for elf_end in -lelf""... $ac_c" 1>&6 + echo "configure:774: checking for elf_end in -lelf" >&5 +--- 776,780 ---- + + +! if test "$LINUX" = "0" -a "$BSD" = "0"; then + echo $ac_n "checking for elf_end in -lelf""... $ac_c" 1>&6 + echo "configure:774: checking for elf_end in -lelf" >&5 +*************** +*** 1129,1133 **** + done + +! if test "$LINUX" = "0" ; then + ac_safe=`echo "elf.h" | sed 'y%./+-%__p_%'` + echo $ac_n "checking for elf.h""... $ac_c" 1>&6 +--- 1136,1141 ---- + done + +! +! if test "$LINUX" = "0" -a "$BSD" = "0" ; then + ac_safe=`echo "elf.h" | sed 'y%./+-%__p_%'` + echo $ac_n "checking for elf.h""... $ac_c" 1>&6 diff --git a/games/acm/files/patch-dis_lib_xdr_var_array.c b/games/acm/files/patch-dis_lib_xdr_var_array.c new file mode 100644 index 0000000..d0ce1c2 --- /dev/null +++ b/games/acm/files/patch-dis_lib_xdr_var_array.c @@ -0,0 +1,24 @@ +--- dis/lib/xdr_var_array.c~ Mon May 11 20:58:55 1998 ++++ dis/lib/xdr_var_array.c Sun Jul 6 03:21:47 2003 +@@ -75,6 +75,12 @@ + + #include + #include ++#include ++#if __FreeBSD_Version__ >= 500113 ++# include ++#else ++# include ++#endif + #include + #include + +@@ -104,7 +110,7 @@ + register u_int nodesize; + + c = size; +- if ((c > maxsize) && (xdrs->x_op != XDR_FREE)) { ++ if ((c > maxsize || c > UINT_MAX/elsize) && (xdrs->x_op != XDR_FREE)) { + return (FALSE); + } + nodesize = c * elsize; diff --git a/games/acm/files/patch-dis_server_sites.c b/games/acm/files/patch-dis_server_sites.c new file mode 100644 index 0000000..47a96da --- /dev/null +++ b/games/acm/files/patch-dis_server_sites.c @@ -0,0 +1,14 @@ +--- dis/server/sites.c~ Sat Nov 24 14:46:24 2001 ++++ dis/server/sites.c Sat Nov 24 14:46:03 2001 +@@ -27,7 +27,11 @@ + * README file. + */ + #include ++#ifdef HAVE_STDLIB_H ++#include ++#else + #include ++#endif + #include + #ifdef HAVE_NDBM + #include diff --git a/games/acm/files/patch-dis_test_Makefile.in b/games/acm/files/patch-dis_test_Makefile.in new file mode 100644 index 0000000..229d8a8 --- /dev/null +++ b/games/acm/files/patch-dis_test_Makefile.in @@ -0,0 +1,28 @@ +*** dis/test/Makefile.in~ Fri Aug 14 23:20:24 1998 +--- dis/test/Makefile.in Mon Feb 1 18:48:38 1999 +*************** +*** 1,5 **** + srcdir = @srcdir@ +! VPATH = @srcdir@ +! CFLAGS = -I$(srcdir)/.. -I.. -I../lib -I$(srcdir)/../../V/lib @CFLAGS@ + CC = @CC@ + SRCS = disscope.c simxtest.c tglobe.c +--- 1,5 ---- + srcdir = @srcdir@ +! VPATH = @srcdir@ +! CFLAGS = -I$(srcdir)/.. -I.. -I../lib -I$(srcdir)/../../V/lib @CFLAGS@ + CC = @CC@ + SRCS = disscope.c simxtest.c tglobe.c +*************** +*** 7,11 **** + SIMXTEST_OBJS = simxtest.o + TGLOBE_OBJS = tglobe.o +! DECOY_OBJS = decoy.o + LIBS = -L../lib -ldis -L../../V/lib -lV @LIBS@ + +--- 7,11 ---- + SIMXTEST_OBJS = simxtest.o + TGLOBE_OBJS = tglobe.o +! DECOY_OBJS = decoy.o + LIBS = -L../lib -ldis -L../../V/lib -lV @LIBS@ + diff --git a/games/acm/files/patch-src_Makefile.in b/games/acm/files/patch-src_Makefile.in new file mode 100644 index 0000000..0e8b044 --- /dev/null +++ b/games/acm/files/patch-src_Makefile.in @@ -0,0 +1,17 @@ +--- src/Makefile.in~ Wed Dec 9 21:53:42 1998 ++++ src/Makefile.in Sun May 20 10:32:43 2007 +@@ -17,12 +17,12 @@ + -I../dis + TOPDIR = .. + CLEAN_THESE = flight-state black_box_input black_box_output bitmap.h TAGS tags +- manext = 1 ++ manext = 6 + MAKEDEPEND = makedepend + + PROGRAMS = acm + DEFINES = -DSRCDIR=\"$(srcdir)\" -DACM_LIBRARY=\"@OBVDIR@\" +- CFLAGS = $(DEFINES) @CFLAGS@ @DEFS@ $(STD_INCLUDES) ++ CFLAGS = $(STD_INCLUDES) $(DEFINES) @CFLAGS@ @DEFS@ + LDFLAGS = @LDFLAGS@ + SRCS = main.c pm.c gear.c flaps.c drone.c init.c aim9m.c box.c \ + aim120.c ccip.c \ diff --git a/games/acm/files/patch-src_acm.man b/games/acm/files/patch-src_acm.man new file mode 100644 index 0000000..46cc789 --- /dev/null +++ b/games/acm/files/patch-src_acm.man @@ -0,0 +1,11 @@ +*** src/acm.man~ Fri Aug 14 16:58:20 1998 +--- src/acm.man Mon Feb 1 18:05:28 1999 +*************** +*** 1,3 **** +! .TH ACM l "August 1, 1998" + .SH NAME + acm \- an aerial combat simulator for X +--- 1,3 ---- +! .TH ACM 6 "October 1, 1995" + .SH NAME + acm \- an aerial combat simulator for X diff --git a/games/acm/files/patch-src_chaser.c b/games/acm/files/patch-src_chaser.c new file mode 100644 index 0000000..3401ced --- /dev/null +++ b/games/acm/files/patch-src_chaser.c @@ -0,0 +1,14 @@ +--- src/chaser.c~ Tue May 12 05:43:03 1998 ++++ src/chaser.c Sat Nov 24 14:47:05 2001 +@@ -20,7 +20,11 @@ + #include "pm.h" + #include + #include ++#ifdef HAVE_STDLIB_H ++#include ++#else + #include ++#endif + + #define MAX_MAPPED_STRING_LEN 20 + #define MAX_POPUP_STRING_LEN 40 diff --git a/games/acm/files/patch-src_interpolate.h b/games/acm/files/patch-src_interpolate.h new file mode 100644 index 0000000..8eb76ed --- /dev/null +++ b/games/acm/files/patch-src_interpolate.h @@ -0,0 +1,10 @@ +--- src/interpolate.h~ Tue May 12 05:43:04 1998 ++++ src/interpolate.h Sat May 24 12:03:04 2003 +@@ -30,6 +30,7 @@ + */ + + #include ++#define float_t ACM_float_t + + typedef float float_t; + diff --git a/games/acm/files/patch-src_main.c b/games/acm/files/patch-src_main.c new file mode 100644 index 0000000..580ff93 --- /dev/null +++ b/games/acm/files/patch-src_main.c @@ -0,0 +1,18 @@ +*** src/main.c~ Wed Dec 23 23:29:00 1998 +--- src/main.c Mon Feb 1 19:14:05 1999 +*************** +*** 444,448 **** + #endif + +! init("."); + + dpy = XOpenDisplay(display); +--- 444,451 ---- + #endif + +! #ifndef ACM_LIBRARY +! #define ACM_LIBRARY "." +! #endif +! init(ACM_LIBRARY "/"); + + dpy = XOpenDisplay(display); diff --git a/games/antipolix/files/patch-Imakefile b/games/antipolix/files/patch-Imakefile new file mode 100644 index 0000000..6d3422d --- /dev/null +++ b/games/antipolix/files/patch-Imakefile @@ -0,0 +1,19 @@ +--- Imakefile.orig Fri Aug 4 07:29:38 1995 ++++ Imakefile Fri Apr 14 19:05:38 2000 +@@ -1,11 +1,11 @@ +-EXTRA_LIBRARIES=-lX11 -lm -lsocket +-CC=gcc +-CDEBUGFLAGS = -g ++EXTRA_LIBRARIES=-lX11 -lm ++XCOMM CC=gcc ++XCOMM CDEBUGFLAGS = -g + + PROGRAMS = client server + +-OBJS1 = creation.o game.o messages.o client.c +-SRCS1 = creation.c game.c messages.c ++OBJS1 = creation.o game.o messages.o client.o ++SRCS1 = creation.c game.c messages.c client.c + + OBJS2 = creation.o game.o messages.o server.o + SRCS2 = creation.c game.c messages.c server.c diff --git a/games/antipolix/files/patch-aa b/games/antipolix/files/patch-aa deleted file mode 100644 index 6d3422d..0000000 --- a/games/antipolix/files/patch-aa +++ /dev/null @@ -1,19 +0,0 @@ ---- Imakefile.orig Fri Aug 4 07:29:38 1995 -+++ Imakefile Fri Apr 14 19:05:38 2000 -@@ -1,11 +1,11 @@ --EXTRA_LIBRARIES=-lX11 -lm -lsocket --CC=gcc --CDEBUGFLAGS = -g -+EXTRA_LIBRARIES=-lX11 -lm -+XCOMM CC=gcc -+XCOMM CDEBUGFLAGS = -g - - PROGRAMS = client server - --OBJS1 = creation.o game.o messages.o client.c --SRCS1 = creation.c game.c messages.c -+OBJS1 = creation.o game.o messages.o client.o -+SRCS1 = creation.c game.c messages.c client.c - - OBJS2 = creation.o game.o messages.o server.o - SRCS2 = creation.c game.c messages.c server.c diff --git a/games/antipolix/files/patch-ab b/games/antipolix/files/patch-ab deleted file mode 100644 index 1dc899b..0000000 --- a/games/antipolix/files/patch-ab +++ /dev/null @@ -1,14 +0,0 @@ ---- client.c Thu Aug 3 22:29:37 1995 -+++ /home/andy/tmp/wrk/client.c Wed Dec 2 21:05:02 1998 -@@ -5,7 +5,11 @@ - #include - #include - #include -+#ifdef __FreeBSD__ -+#include -+#else - #include -+#endif - #include - #include - #include diff --git a/games/antipolix/files/patch-ac b/games/antipolix/files/patch-ac deleted file mode 100644 index b55890d..0000000 --- a/games/antipolix/files/patch-ac +++ /dev/null @@ -1,14 +0,0 @@ ---- creation.c Thu Aug 3 22:29:37 1995 -+++ /home/andy/tmp/wrk/creation.c Wed Dec 2 21:02:24 1998 -@@ -1,7 +1,11 @@ - #include "creation.h" - #include "game.h" - -+#ifdef __FreeBSD__ -+#include -+#else - #include -+#endif - - void CreateUniverse(Univers *U, int NbNiveaux, int Taille) - { diff --git a/games/antipolix/files/patch-ad b/games/antipolix/files/patch-ad deleted file mode 100644 index f2b4925..0000000 --- a/games/antipolix/files/patch-ad +++ /dev/null @@ -1,14 +0,0 @@ ---- messages.c Thu Aug 3 22:29:37 1995 -+++ /home/andy/tmp/wrk/messages.c Wed Dec 2 21:03:17 1998 -@@ -3,7 +3,11 @@ - #include - #include - #include -+#ifdef __FreeBSD__ -+#include -+#else - #include -+#endif - #include - #include - #include diff --git a/games/antipolix/files/patch-ae b/games/antipolix/files/patch-ae deleted file mode 100644 index a1c2285..0000000 --- a/games/antipolix/files/patch-ae +++ /dev/null @@ -1,14 +0,0 @@ ---- server.c Thu Aug 3 22:29:37 1995 -+++ /home/andy/tmp/wrk/server.c Wed Dec 2 21:04:18 1998 -@@ -9,7 +9,11 @@ - #include - #include - #include -+#ifdef __FreeBSD__ -+#include -+#else - #include -+#endif - - #include "messages.h" - #include "creation.h" diff --git a/games/antipolix/files/patch-client.c b/games/antipolix/files/patch-client.c new file mode 100644 index 0000000..1dc899b --- /dev/null +++ b/games/antipolix/files/patch-client.c @@ -0,0 +1,14 @@ +--- client.c Thu Aug 3 22:29:37 1995 ++++ /home/andy/tmp/wrk/client.c Wed Dec 2 21:05:02 1998 +@@ -5,7 +5,11 @@ + #include + #include + #include ++#ifdef __FreeBSD__ ++#include ++#else + #include ++#endif + #include + #include + #include diff --git a/games/antipolix/files/patch-creation.c b/games/antipolix/files/patch-creation.c new file mode 100644 index 0000000..b55890d --- /dev/null +++ b/games/antipolix/files/patch-creation.c @@ -0,0 +1,14 @@ +--- creation.c Thu Aug 3 22:29:37 1995 ++++ /home/andy/tmp/wrk/creation.c Wed Dec 2 21:02:24 1998 +@@ -1,7 +1,11 @@ + #include "creation.h" + #include "game.h" + ++#ifdef __FreeBSD__ ++#include ++#else + #include ++#endif + + void CreateUniverse(Univers *U, int NbNiveaux, int Taille) + { diff --git a/games/antipolix/files/patch-messages.c b/games/antipolix/files/patch-messages.c new file mode 100644 index 0000000..f2b4925 --- /dev/null +++ b/games/antipolix/files/patch-messages.c @@ -0,0 +1,14 @@ +--- messages.c Thu Aug 3 22:29:37 1995 ++++ /home/andy/tmp/wrk/messages.c Wed Dec 2 21:03:17 1998 +@@ -3,7 +3,11 @@ + #include + #include + #include ++#ifdef __FreeBSD__ ++#include ++#else + #include ++#endif + #include + #include + #include diff --git a/games/antipolix/files/patch-server.c b/games/antipolix/files/patch-server.c new file mode 100644 index 0000000..a1c2285 --- /dev/null +++ b/games/antipolix/files/patch-server.c @@ -0,0 +1,14 @@ +--- server.c Thu Aug 3 22:29:37 1995 ++++ /home/andy/tmp/wrk/server.c Wed Dec 2 21:04:18 1998 +@@ -9,7 +9,11 @@ + #include + #include + #include ++#ifdef __FreeBSD__ ++#include ++#else + #include ++#endif + + #include "messages.h" + #include "creation.h" diff --git a/games/awele/Makefile b/games/awele/Makefile index b7f5026..75ef3af 100644 --- a/games/awele/Makefile +++ b/games/awele/Makefile @@ -7,14 +7,13 @@ PORTREVISION= 4 CATEGORIES= games tk MASTER_SITES= XCONTRIB/games DISTNAME= ${PORTNAME}${PORTVERSION} -EXTRACT_SUFX= .tgz MAINTAINER= ports@FreeBSD.org COMMENT= African board game WRKSRC= ${WRKDIR}/${PORTNAME} -USES= imake tk +USES= imake tk tar:tgz USE_XORG= x11 MAKE_ARGS= AWELE_DIR=${STAGEDIR}${PREFIX}/bin diff --git a/games/awele/files/patch-Imakefile b/games/awele/files/patch-Imakefile new file mode 100644 index 0000000..cf14711 --- /dev/null +++ b/games/awele/files/patch-Imakefile @@ -0,0 +1,43 @@ +--- Imakefile.orig Sat Dec 9 00:35:38 1995 ++++ Imakefile Wed Nov 1 06:58:15 2000 +@@ -2,31 +2,31 @@ + + + XCOMM install directory +- AWELE_DIR = /user/berroir/src/awele/install ++ AWELE_DIR = $(BINDIR) + XCOMM tcl/tk script + AWELE_SCRIPT = xawele + XCOMM libs, includes + XCOMM TK_LIB AND TK_INCLUDE stand for tk and tcl +- TK_LIB = -L/usr/local/lib -ltk -ltcl ++ TK_LIB = -L%%LOCALBASE%%/lib -ltk%%TK_VER%% -ltcl%%TCL_VER%% + XCOMM TK_LIB = -L/usr/local/lib -ltk4.0 -ltcl7.4 +- TK_INCLUDE = -I/usr/local/include ++ TK_INCLUDE = -I%%TK_INCLUDEDIR%% -I%%TCL_INCLUDEDIR%% + DEFINES = $(TK_INCLUDE) + LOCAL_LIBRARIES = $(TK_LIB) -lX11 -lm + XCOMM ANSI-C compiler +- CC = gcc ++XCOMM CC = gcc + + XCOMM Please don't change anything below this point + + DEPLIBS = $(DEPXLIB) + +- SRCS1 = tkAppInit.c awelewish.c alphabeta.c move.c util.c +- OBJS1 = tkAppInit.o awelewish.o alphabeta.o move.o util.o ++ SRCS = tkAppInit.c awelewish.c alphabeta.c move.c util.c ++ OBJS = tkAppInit.o awelewish.o alphabeta.o move.o util.o + + PROGRAMS = awelewish ++ MANSUFFIX = 6 + +-all:: $(PROGRAMS) +- +-ComplexProgramTarget_1($(PROGRAMS), $(LOCAL_LIBRARIES), ) ++ComplexProgramTargetNoMan($(PROGRAMS)) ++InstallManPage(xawele,$(MANDIR)) + + install:: $(PROGRAMS) $(AWELE_SCRIPT) + @echo "AWELE directory is " $(AWELE_DIR) diff --git a/games/awele/files/patch-aa b/games/awele/files/patch-aa deleted file mode 100644 index cf14711..0000000 --- a/games/awele/files/patch-aa +++ /dev/null @@ -1,43 +0,0 @@ ---- Imakefile.orig Sat Dec 9 00:35:38 1995 -+++ Imakefile Wed Nov 1 06:58:15 2000 -@@ -2,31 +2,31 @@ - - - XCOMM install directory -- AWELE_DIR = /user/berroir/src/awele/install -+ AWELE_DIR = $(BINDIR) - XCOMM tcl/tk script - AWELE_SCRIPT = xawele - XCOMM libs, includes - XCOMM TK_LIB AND TK_INCLUDE stand for tk and tcl -- TK_LIB = -L/usr/local/lib -ltk -ltcl -+ TK_LIB = -L%%LOCALBASE%%/lib -ltk%%TK_VER%% -ltcl%%TCL_VER%% - XCOMM TK_LIB = -L/usr/local/lib -ltk4.0 -ltcl7.4 -- TK_INCLUDE = -I/usr/local/include -+ TK_INCLUDE = -I%%TK_INCLUDEDIR%% -I%%TCL_INCLUDEDIR%% - DEFINES = $(TK_INCLUDE) - LOCAL_LIBRARIES = $(TK_LIB) -lX11 -lm - XCOMM ANSI-C compiler -- CC = gcc -+XCOMM CC = gcc - - XCOMM Please don't change anything below this point - - DEPLIBS = $(DEPXLIB) - -- SRCS1 = tkAppInit.c awelewish.c alphabeta.c move.c util.c -- OBJS1 = tkAppInit.o awelewish.o alphabeta.o move.o util.o -+ SRCS = tkAppInit.c awelewish.c alphabeta.c move.c util.c -+ OBJS = tkAppInit.o awelewish.o alphabeta.o move.o util.o - - PROGRAMS = awelewish -+ MANSUFFIX = 6 - --all:: $(PROGRAMS) -- --ComplexProgramTarget_1($(PROGRAMS), $(LOCAL_LIBRARIES), ) -+ComplexProgramTargetNoMan($(PROGRAMS)) -+InstallManPage(xawele,$(MANDIR)) - - install:: $(PROGRAMS) $(AWELE_SCRIPT) - @echo "AWELE directory is " $(AWELE_DIR) diff --git a/games/awele/files/patch-ab b/games/awele/files/patch-ab deleted file mode 100644 index f205006..0000000 --- a/games/awele/files/patch-ab +++ /dev/null @@ -1,57 +0,0 @@ ---- tkAppInit.c.orig Fri Dec 8 16:35:38 1995 -+++ tkAppInit.c Thu Mar 15 08:44:13 2007 -@@ -9,12 +9,10 @@ - * - * See the file "license.terms" for information on usage and redistribution - * of this file, and for a DISCLAIMER OF ALL WARRANTIES. -+ * -+ * SCCS: @(#) tkAppInit.c 1.22 96/05/29 09:47:08 - */ - --#ifndef lint --static char sccsid[] = "@(#) tkAppInit.c 1.15 95/06/28 13:14:28"; --#endif /* not lint */ -- - #include "tk.h" - - extern void create_commands(Tcl_Interp *,Tk_Window); -@@ -25,9 +23,7 @@ - * Sun shared libraries to be used for Tcl. - */ - --extern int matherr(); --int *tclDummyMathPtr = (int *) matherr; -- -+ - /* - *---------------------------------------------------------------------- - * -@@ -77,14 +73,13 @@ - Tcl_AppInit(interp) - Tcl_Interp *interp; /* Interpreter for application. */ - { -- Tk_Window main; -- - if (Tcl_Init(interp) == TCL_ERROR) { - return TCL_ERROR; - } - if (Tk_Init(interp) == TCL_ERROR) { - return TCL_ERROR; - } -+ Tcl_StaticPackage(interp, "Tk", Tk_Init, Tk_SafeInit); - - /* - * Call the init procedures for included packages. Each call should -@@ -110,10 +105,7 @@ - * where "app" is the name of the application. If this line is deleted - * then no user-specific startup file will be run under any conditions. - */ --#ifdef DEFAULT_TCL_SCRIPT -- tcl_RcFileName = DEFAULT_TCL_SCRIPT ; --#else -- tcl_RcFileName = "~/.wishrc"; --#endif -+ -+ Tcl_SetVar(interp, "tcl_rcFileName", "~/.wishrc", TCL_GLOBAL_ONLY); - return TCL_OK; - } diff --git a/games/awele/files/patch-ac b/games/awele/files/patch-ac deleted file mode 100644 index aff2a69..0000000 --- a/games/awele/files/patch-ac +++ /dev/null @@ -1,8 +0,0 @@ ---- xawele.orig Fri Dec 8 16:35:38 1995 -+++ xawele Fri May 1 09:46:54 1998 -@@ -1,4 +1,4 @@ --#!/a/air/alpha-bin/awelewish -f -+#!/usr/bin/env awelewish - - # variables connues de C et de TCL - set levelname "REGULAR" diff --git a/games/awele/files/patch-tkAppInit.c b/games/awele/files/patch-tkAppInit.c new file mode 100644 index 0000000..f205006 --- /dev/null +++ b/games/awele/files/patch-tkAppInit.c @@ -0,0 +1,57 @@ +--- tkAppInit.c.orig Fri Dec 8 16:35:38 1995 ++++ tkAppInit.c Thu Mar 15 08:44:13 2007 +@@ -9,12 +9,10 @@ + * + * See the file "license.terms" for information on usage and redistribution + * of this file, and for a DISCLAIMER OF ALL WARRANTIES. ++ * ++ * SCCS: @(#) tkAppInit.c 1.22 96/05/29 09:47:08 + */ + +-#ifndef lint +-static char sccsid[] = "@(#) tkAppInit.c 1.15 95/06/28 13:14:28"; +-#endif /* not lint */ +- + #include "tk.h" + + extern void create_commands(Tcl_Interp *,Tk_Window); +@@ -25,9 +23,7 @@ + * Sun shared libraries to be used for Tcl. + */ + +-extern int matherr(); +-int *tclDummyMathPtr = (int *) matherr; +- ++ + /* + *---------------------------------------------------------------------- + * +@@ -77,14 +73,13 @@ + Tcl_AppInit(interp) + Tcl_Interp *interp; /* Interpreter for application. */ + { +- Tk_Window main; +- + if (Tcl_Init(interp) == TCL_ERROR) { + return TCL_ERROR; + } + if (Tk_Init(interp) == TCL_ERROR) { + return TCL_ERROR; + } ++ Tcl_StaticPackage(interp, "Tk", Tk_Init, Tk_SafeInit); + + /* + * Call the init procedures for included packages. Each call should +@@ -110,10 +105,7 @@ + * where "app" is the name of the application. If this line is deleted + * then no user-specific startup file will be run under any conditions. + */ +-#ifdef DEFAULT_TCL_SCRIPT +- tcl_RcFileName = DEFAULT_TCL_SCRIPT ; +-#else +- tcl_RcFileName = "~/.wishrc"; +-#endif ++ ++ Tcl_SetVar(interp, "tcl_rcFileName", "~/.wishrc", TCL_GLOBAL_ONLY); + return TCL_OK; + } diff --git a/games/awele/files/patch-xawele b/games/awele/files/patch-xawele new file mode 100644 index 0000000..aff2a69 --- /dev/null +++ b/games/awele/files/patch-xawele @@ -0,0 +1,8 @@ +--- xawele.orig Fri Dec 8 16:35:38 1995 ++++ xawele Fri May 1 09:46:54 1998 +@@ -1,4 +1,4 @@ +-#!/a/air/alpha-bin/awelewish -f ++#!/usr/bin/env awelewish + + # variables connues de C et de TCL + set levelname "REGULAR" diff --git a/games/blockade/files/patch-Makefile b/games/blockade/files/patch-Makefile new file mode 100644 index 0000000..7c2444b --- /dev/null +++ b/games/blockade/files/patch-Makefile @@ -0,0 +1,22 @@ +--- Makefile.orig Mon May 24 22:19:40 1999 ++++ Makefile Fri Nov 24 14:47:40 2006 +@@ -1,7 +1,7 @@ + # Add -I and -L options as necessary to make it find your X stuff.... + + #DESTDIR = /opt/blockade +-DESTDIR = /usr/local ++DESTDIR = $(PREFIX) + BINDIR = $(DESTDIR)/bin + MANDIR = $(DESTDIR)/man/man6 + +@@ -22,8 +22,8 @@ + #LDFLAGS = -s -L/usr/lib/X11R4 -lX11 + + # Linux +-CFLAGS = -DSYSV -I/usr/include/X11 -Wall +-LDFLAGS = -L/usr/X11R6/lib -lX11 ++CFLAGS += -I$(LOCALBASE)/include ++LDFLAGS = -L$(LOCALBASE)/lib -lX11 + + SOUND = blockade-snd.o + SOUNDH = blockade-snd.h diff --git a/games/blockade/files/patch-aa b/games/blockade/files/patch-aa deleted file mode 100644 index 7c2444b..0000000 --- a/games/blockade/files/patch-aa +++ /dev/null @@ -1,22 +0,0 @@ ---- Makefile.orig Mon May 24 22:19:40 1999 -+++ Makefile Fri Nov 24 14:47:40 2006 -@@ -1,7 +1,7 @@ - # Add -I and -L options as necessary to make it find your X stuff.... - - #DESTDIR = /opt/blockade --DESTDIR = /usr/local -+DESTDIR = $(PREFIX) - BINDIR = $(DESTDIR)/bin - MANDIR = $(DESTDIR)/man/man6 - -@@ -22,8 +22,8 @@ - #LDFLAGS = -s -L/usr/lib/X11R4 -lX11 - - # Linux --CFLAGS = -DSYSV -I/usr/include/X11 -Wall --LDFLAGS = -L/usr/X11R6/lib -lX11 -+CFLAGS += -I$(LOCALBASE)/include -+LDFLAGS = -L$(LOCALBASE)/lib -lX11 - - SOUND = blockade-snd.o - SOUNDH = blockade-snd.h diff --git a/games/blockade/files/patch-ab b/games/blockade/files/patch-ab deleted file mode 100644 index da2cb67..0000000 --- a/games/blockade/files/patch-ab +++ /dev/null @@ -1,99 +0,0 @@ ---- blockade.c.orig Mon May 24 16:16:10 1999 -+++ blockade.c Fri Aug 29 17:10:26 2003 -@@ -10,7 +10,7 @@ - #include - #include - #include --#include -+#include - #include - #include - -@@ -22,7 +22,6 @@ - #include - #include - --char *malloc(); - #define NEW(t) ((t *)malloc(sizeof(t))) - #define OLD(v) free((char *)(v)) - -@@ -34,8 +33,6 @@ - - char **argvec; - --char *getenv(); -- - XrmDatabase db; - char *defaults = "\ - *Background: black\n\ -@@ -285,15 +282,12 @@ - /********************************************************************/ - /********************************************************************/ - --void bugchk(va_alist) --va_dcl -+void bugchk(char *fmt, ...) - { - va_list ap; -- char *fmt; - - fprintf(stderr,"INTERNAL ERROR: "); -- va_start(ap); -- fmt = va_arg(ap,char *); -+ va_start(ap, fmt); - vfprintf(stderr,fmt,ap); - va_end(ap); - fprintf(stderr,"\n"); -@@ -1060,24 +1054,22 @@ - winshadow.font = None; /* ie, the default font */ - } - --void setup_gc(va_alist) --va_dcl -+void setup_gc(long int bit, ...) - { - va_list ap; -- long int bit; - int setdeffont; - unsigned long int gcmask; - GC gc; - XGCValues *shadow; - XGCValues gcval; - -- va_start(ap); -+ va_start(ap, bit); - gc = wingc; - shadow = &winshadow; - setdeffont = 0; - gcmask = 0; - while (1) -- { bit = va_arg(ap,long int); -+ { - switch (bit) - { default: - fprintf(stderr,"Bad bit 0x%lx to setup_gc\n",bit); -@@ -1125,6 +1117,7 @@ - } - break; - } -+ bit = va_arg(ap,long int); - } - } - -@@ -2831,14 +2824,11 @@ - XMoveResizeWindow(disp,msgwin,(topw-msg_w)/2,gamey+(gameh-msg_h)/2,msg_w,msg_h); - } - --void popmsg(va_alist) --va_dcl -+void popmsg(char *fmt, ...) - { - va_list ap; -- char *fmt; - -- va_start(ap); -- fmt = va_arg(ap,char *); -+ va_start(ap, fmt); - vsprintf(&msg_buf[0],fmt,ap); - msg_len = strlen(&msg_buf[0]); - va_end(ap); diff --git a/games/blockade/files/patch-blockade.c b/games/blockade/files/patch-blockade.c new file mode 100644 index 0000000..da2cb67 --- /dev/null +++ b/games/blockade/files/patch-blockade.c @@ -0,0 +1,99 @@ +--- blockade.c.orig Mon May 24 16:16:10 1999 ++++ blockade.c Fri Aug 29 17:10:26 2003 +@@ -10,7 +10,7 @@ + #include + #include + #include +-#include ++#include + #include + #include + +@@ -22,7 +22,6 @@ + #include + #include + +-char *malloc(); + #define NEW(t) ((t *)malloc(sizeof(t))) + #define OLD(v) free((char *)(v)) + +@@ -34,8 +33,6 @@ + + char **argvec; + +-char *getenv(); +- + XrmDatabase db; + char *defaults = "\ + *Background: black\n\ +@@ -285,15 +282,12 @@ + /********************************************************************/ + /********************************************************************/ + +-void bugchk(va_alist) +-va_dcl ++void bugchk(char *fmt, ...) + { + va_list ap; +- char *fmt; + + fprintf(stderr,"INTERNAL ERROR: "); +- va_start(ap); +- fmt = va_arg(ap,char *); ++ va_start(ap, fmt); + vfprintf(stderr,fmt,ap); + va_end(ap); + fprintf(stderr,"\n"); +@@ -1060,24 +1054,22 @@ + winshadow.font = None; /* ie, the default font */ + } + +-void setup_gc(va_alist) +-va_dcl ++void setup_gc(long int bit, ...) + { + va_list ap; +- long int bit; + int setdeffont; + unsigned long int gcmask; + GC gc; + XGCValues *shadow; + XGCValues gcval; + +- va_start(ap); ++ va_start(ap, bit); + gc = wingc; + shadow = &winshadow; + setdeffont = 0; + gcmask = 0; + while (1) +- { bit = va_arg(ap,long int); ++ { + switch (bit) + { default: + fprintf(stderr,"Bad bit 0x%lx to setup_gc\n",bit); +@@ -1125,6 +1117,7 @@ + } + break; + } ++ bit = va_arg(ap,long int); + } + } + +@@ -2831,14 +2824,11 @@ + XMoveResizeWindow(disp,msgwin,(topw-msg_w)/2,gamey+(gameh-msg_h)/2,msg_w,msg_h); + } + +-void popmsg(va_alist) +-va_dcl ++void popmsg(char *fmt, ...) + { + va_list ap; +- char *fmt; + +- va_start(ap); +- fmt = va_arg(ap,char *); ++ va_start(ap, fmt); + vsprintf(&msg_buf[0],fmt,ap); + msg_len = strlen(&msg_buf[0]); + va_end(ap); diff --git a/games/bugsx/Makefile b/games/bugsx/Makefile index 1ae2a55..0e0afc0 100644 --- a/games/bugsx/Makefile +++ b/games/bugsx/Makefile @@ -8,14 +8,13 @@ CATEGORIES= games MASTER_SITES= ${MASTER_SITE_XCONTRIB} MASTER_SITE_SUBDIR= applications DISTNAME= bugsx108 -EXTRACT_SUFX= .tgz MAINTAINER= ports@FreeBSD.org COMMENT= Breed bugs using genetic algorithms LICENSE= GPLv1 -USES= imake +USES= imake tar:tgz USE_XORG= x11 xext WRKSRC= ${WRKDIR}/bugsx PLIST_FILES= bin/bugsx man/man1/bugsx.1.gz diff --git a/games/bugsx/files/patch-Imakefile b/games/bugsx/files/patch-Imakefile new file mode 100644 index 0000000..b5cc62e --- /dev/null +++ b/games/bugsx/files/patch-Imakefile @@ -0,0 +1,19 @@ +*** Imakefile.orig Tue Sep 2 22:33:16 1997 +--- Imakefile Thu Dec 18 04:24:33 1997 +*************** +*** 36,42 **** + ############################################################################## + + OBJS = bugsx.o xbutil.o util.o breed.o grow.o noise.o +! SRCS = bugsx.c xbutil.o util.c breed.c grow.c noise.c + + INCLUDES = -I$(TOP) -I$(TOP)/X11 + +--- 36,42 ---- + ############################################################################## + + OBJS = bugsx.o xbutil.o util.o breed.o grow.o noise.o +! SRCS = bugsx.c xbutil.c util.c breed.c grow.c noise.c + + INCLUDES = -I$(TOP) -I$(TOP)/X11 + diff --git a/games/bugsx/files/patch-aa b/games/bugsx/files/patch-aa deleted file mode 100644 index b5cc62e..0000000 --- a/games/bugsx/files/patch-aa +++ /dev/null @@ -1,19 +0,0 @@ -*** Imakefile.orig Tue Sep 2 22:33:16 1997 ---- Imakefile Thu Dec 18 04:24:33 1997 -*************** -*** 36,42 **** - ############################################################################## - - OBJS = bugsx.o xbutil.o util.o breed.o grow.o noise.o -! SRCS = bugsx.c xbutil.o util.c breed.c grow.c noise.c - - INCLUDES = -I$(TOP) -I$(TOP)/X11 - ---- 36,42 ---- - ############################################################################## - - OBJS = bugsx.o xbutil.o util.o breed.o grow.o noise.o -! SRCS = bugsx.c xbutil.c util.c breed.c grow.c noise.c - - INCLUDES = -I$(TOP) -I$(TOP)/X11 - diff --git a/games/columns/files/patch-ab b/games/columns/files/patch-ab deleted file mode 100644 index 340e665..0000000 --- a/games/columns/files/patch-ab +++ /dev/null @@ -1,27 +0,0 @@ - -$FreeBSD$ - ---- columns.cc.orig 2000-03-17 04:52:55.000000000 +0400 -+++ columns.cc 2013-06-13 15:21:46.472644056 +0400 -@@ -22,10 +22,12 @@ - #include - #include - #include -+#ifndef __STDC__ - #include -+#endif - #include - #include --#include -+#include - - #define HIGHSCORE_X 10 - #define HIGHSCORE_Y 30 -@@ -1365,6 +1367,7 @@ void eval_args(int argc, char **argv) - } - } - -+int - main (int argc, char **argv) - { - eval_args(argc, argv); diff --git a/games/columns/files/patch-ac b/games/columns/files/patch-ac deleted file mode 100644 index f7623db..0000000 --- a/games/columns/files/patch-ac +++ /dev/null @@ -1,10 +0,0 @@ ---- configure.orig Fri Mar 17 08:33:59 2000 -+++ configure Sat Oct 28 03:23:44 2000 -@@ -1292,6 +1292,7 @@ - rm -f conf.sdltest - - CFLAGS="$CFLAGS $SDL_CFLAGS" -+CXXFLAGS="$CXXFLAGS $SDL_CFLAGS" - LIBS="$LIBS $SDL_LIBS" - - # Finally create all the generated files diff --git a/games/columns/files/patch-columns.cc b/games/columns/files/patch-columns.cc new file mode 100644 index 0000000..340e665 --- /dev/null +++ b/games/columns/files/patch-columns.cc @@ -0,0 +1,27 @@ + +$FreeBSD$ + +--- columns.cc.orig 2000-03-17 04:52:55.000000000 +0400 ++++ columns.cc 2013-06-13 15:21:46.472644056 +0400 +@@ -22,10 +22,12 @@ + #include + #include + #include ++#ifndef __STDC__ + #include ++#endif + #include + #include +-#include ++#include + + #define HIGHSCORE_X 10 + #define HIGHSCORE_Y 30 +@@ -1365,6 +1367,7 @@ void eval_args(int argc, char **argv) + } + } + ++int + main (int argc, char **argv) + { + eval_args(argc, argv); diff --git a/games/columns/files/patch-configure b/games/columns/files/patch-configure new file mode 100644 index 0000000..f7623db --- /dev/null +++ b/games/columns/files/patch-configure @@ -0,0 +1,10 @@ +--- configure.orig Fri Mar 17 08:33:59 2000 ++++ configure Sat Oct 28 03:23:44 2000 +@@ -1292,6 +1292,7 @@ + rm -f conf.sdltest + + CFLAGS="$CFLAGS $SDL_CFLAGS" ++CXXFLAGS="$CXXFLAGS $SDL_CFLAGS" + LIBS="$LIBS $SDL_LIBS" + + # Finally create all the generated files diff --git a/games/cosmo/files/patch-Imakefile b/games/cosmo/files/patch-Imakefile new file mode 100644 index 0000000..94a1bf8 --- /dev/null +++ b/games/cosmo/files/patch-Imakefile @@ -0,0 +1,45 @@ +--- Imakefile.orig Sat May 11 16:06:00 1996 ++++ Imakefile Wed Oct 18 08:09:08 2000 +@@ -1,21 +1,22 @@ +-BINDIR = /usr/local/games ++XCOMM BINDIR = /usr/local/games + PAD = # -DUSE_PAD ++CHOWN = /usr/sbin/chown + CHMOD = /bin/chmod + MKDIR = /bin/mkdir + +-CC = gcc ++XCOMM CC = gcc + REGULATE_TIMER = -DREG_TIMER +-DATADIR = $(BINDIR)/cosmodir ++DATADIR = $(LIBDIR)/cosmo + DATAFILE = $(DATADIR)/best.dat + PROTO_DEFINES = -DRANK_FILE=\"$(DATAFILE)\" $(PAD) $(REGULATE_TIMER) $(SIGNAL) +-CDEBUGFLAGS = -O2 # -g ++XCOMM CDEBUGFLAGS = -O2 # -g + LOCAL_LIBRARIES = $(XLIB) + TAR = /bin/tar + + SRCS = main.c animation.c cosmo.c ex.c pixmap.c score.c setup.c tiff.c timer.c title.c pad.c + OBJS = $(SRCS:.c=.o) + +-ComplexProgramTarget(cosmo) ++ComplexProgramTargetNoMan(cosmo) + + hd: hd.c + $(CC) -o hd hd.c +@@ -27,11 +28,12 @@ + + install:: + @if [ -d $(DATADIR) ]; then echo cosmodir exists, not created.;\ +- else $(MKDIR) $(DATADIR); fi ++ else $(MKDIRHIER) $(DATADIR); fi + $(CHMOD) 711 $(DATADIR) + @if [ -f $(DATAFILE) ]; then echo ranking file exists, not created.;\ + else echo > $(DATAFILE); fi +- $(CHMOD) 666 $(DATAFILE) ++ $(CHOWN) root:games $(DATAFILE) ++ $(CHMOD) 664 $(DATAFILE) + + pack:: + $(TAR) cfz cosmo.tgz *.c *.h Imakefile chara.dat *.doc diff --git a/games/cosmo/files/patch-aa b/games/cosmo/files/patch-aa deleted file mode 100644 index 94a1bf8..0000000 --- a/games/cosmo/files/patch-aa +++ /dev/null @@ -1,45 +0,0 @@ ---- Imakefile.orig Sat May 11 16:06:00 1996 -+++ Imakefile Wed Oct 18 08:09:08 2000 -@@ -1,21 +1,22 @@ --BINDIR = /usr/local/games -+XCOMM BINDIR = /usr/local/games - PAD = # -DUSE_PAD -+CHOWN = /usr/sbin/chown - CHMOD = /bin/chmod - MKDIR = /bin/mkdir - --CC = gcc -+XCOMM CC = gcc - REGULATE_TIMER = -DREG_TIMER --DATADIR = $(BINDIR)/cosmodir -+DATADIR = $(LIBDIR)/cosmo - DATAFILE = $(DATADIR)/best.dat - PROTO_DEFINES = -DRANK_FILE=\"$(DATAFILE)\" $(PAD) $(REGULATE_TIMER) $(SIGNAL) --CDEBUGFLAGS = -O2 # -g -+XCOMM CDEBUGFLAGS = -O2 # -g - LOCAL_LIBRARIES = $(XLIB) - TAR = /bin/tar - - SRCS = main.c animation.c cosmo.c ex.c pixmap.c score.c setup.c tiff.c timer.c title.c pad.c - OBJS = $(SRCS:.c=.o) - --ComplexProgramTarget(cosmo) -+ComplexProgramTargetNoMan(cosmo) - - hd: hd.c - $(CC) -o hd hd.c -@@ -27,11 +28,12 @@ - - install:: - @if [ -d $(DATADIR) ]; then echo cosmodir exists, not created.;\ -- else $(MKDIR) $(DATADIR); fi -+ else $(MKDIRHIER) $(DATADIR); fi - $(CHMOD) 711 $(DATADIR) - @if [ -f $(DATAFILE) ]; then echo ranking file exists, not created.;\ - else echo > $(DATAFILE); fi -- $(CHMOD) 666 $(DATAFILE) -+ $(CHOWN) root:games $(DATAFILE) -+ $(CHMOD) 664 $(DATAFILE) - - pack:: - $(TAR) cfz cosmo.tgz *.c *.h Imakefile chara.dat *.doc diff --git a/games/cosmo/files/patch-ab b/games/cosmo/files/patch-ab deleted file mode 100644 index 2e69f9d..0000000 --- a/games/cosmo/files/patch-ab +++ /dev/null @@ -1,78 +0,0 @@ ---- setup.c.orig Sat May 11 15:48:32 1996 -+++ setup.c Sat Aug 3 17:06:39 2002 -@@ -106,7 +106,8 @@ - { - i++; - if(i>=ac) break; -- strcpy(display,av[i]); -+ strncpy(display,av[i],sizeof(display)); -+ display[sizeof(display) - 1] = '\0'; - } - else if(!strcmp(av[i],"-cmap")) - { -@@ -120,7 +121,8 @@ - { - i++; - if(i>=ac) show_usage(); -- strcpy(bgfn,av[i]); -+ strncpy(bgfn,av[i],sizeof(bgfn)); -+ bgfn[sizeof(bgfn) - 1] = '\0'; - } - else if(!strcmp(av[i],"-rough")) - { -@@ -139,7 +141,7 @@ - { - i++; - if(i>=ac) show_usage(); -- if(strcmp(av[i],"no")) strcpy(pad_dev,av[i]); -+ if(strcmp(av[i],"no")) strncpy(pad_dev,av[i],sizeof(pad_dev)); pad_dev[sizeof(pad_dev) - 1] = '\0'; - else upad=0; - } - #endif -@@ -154,10 +156,14 @@ - - user.uid=getuid(); - p=getpwuid(user.uid); -- strcpy(user.name,p->pw_name); -- strcpy(home_dir,p->pw_dir); -+ strncpy(user.name,p->pw_name,sizeof(user.name)); -+ user.name[sizeof(user.name) - 1] = '\0'; -+ -+ strncpy(home_dir,p->pw_dir,sizeof(home_dir)); -+ home_dir[sizeof(home_dir) -1] = '\0'; - if( home_dir[strlen(home_dir)-1] != '/' ) strcat(home_dir,"/"); -- strcpy(rc_file,home_dir); -+ strncpy(rc_file,home_dir,sizeof(rc_file)); -+ rc_file[sizeof(rc_file) - 1 ] = '\0'; - strcat(rc_file,".cosmorc"); - } - -@@ -195,14 +201,16 @@ - show_error("Too Few Arguments",buf,line,2); - return; - } -- strcpy(colorname,p); -+ strncpy(colorname,p,sizeof(colorname)); -+ colorname[sizeof(colorname) - 1] = '\0'; - - if( (p=getnword(buf,2))==NULL ) - { - show_error("Too Few Arguments",buf,line,3); - return; - } -- strcpy(color,p); -+ strncpy(color,p,sizeof(color)); -+ color[sizeof(color)] = '\0'; - - if( !strcmp(colorname,"Background") ) strcpy(colors[Back],color); - else if( !strcmp(colorname,"Foreground") ) strcpy(colors[Fore],color); -@@ -298,7 +306,8 @@ - i=1; - while(p[i]!='/'&&p[i]!='\0') name[i-1]=p[i++]; - name[i-1]='\0'; -- if(i==1) strcpy(name,user.name); -+ if(i==1) strncpy(name,user.name,sizeof(name)); -+ name[sizeof(name) -1] = '\0'; - - do - { diff --git a/games/cosmo/files/patch-setup.c b/games/cosmo/files/patch-setup.c new file mode 100644 index 0000000..2e69f9d --- /dev/null +++ b/games/cosmo/files/patch-setup.c @@ -0,0 +1,78 @@ +--- setup.c.orig Sat May 11 15:48:32 1996 ++++ setup.c Sat Aug 3 17:06:39 2002 +@@ -106,7 +106,8 @@ + { + i++; + if(i>=ac) break; +- strcpy(display,av[i]); ++ strncpy(display,av[i],sizeof(display)); ++ display[sizeof(display) - 1] = '\0'; + } + else if(!strcmp(av[i],"-cmap")) + { +@@ -120,7 +121,8 @@ + { + i++; + if(i>=ac) show_usage(); +- strcpy(bgfn,av[i]); ++ strncpy(bgfn,av[i],sizeof(bgfn)); ++ bgfn[sizeof(bgfn) - 1] = '\0'; + } + else if(!strcmp(av[i],"-rough")) + { +@@ -139,7 +141,7 @@ + { + i++; + if(i>=ac) show_usage(); +- if(strcmp(av[i],"no")) strcpy(pad_dev,av[i]); ++ if(strcmp(av[i],"no")) strncpy(pad_dev,av[i],sizeof(pad_dev)); pad_dev[sizeof(pad_dev) - 1] = '\0'; + else upad=0; + } + #endif +@@ -154,10 +156,14 @@ + + user.uid=getuid(); + p=getpwuid(user.uid); +- strcpy(user.name,p->pw_name); +- strcpy(home_dir,p->pw_dir); ++ strncpy(user.name,p->pw_name,sizeof(user.name)); ++ user.name[sizeof(user.name) - 1] = '\0'; ++ ++ strncpy(home_dir,p->pw_dir,sizeof(home_dir)); ++ home_dir[sizeof(home_dir) -1] = '\0'; + if( home_dir[strlen(home_dir)-1] != '/' ) strcat(home_dir,"/"); +- strcpy(rc_file,home_dir); ++ strncpy(rc_file,home_dir,sizeof(rc_file)); ++ rc_file[sizeof(rc_file) - 1 ] = '\0'; + strcat(rc_file,".cosmorc"); + } + +@@ -195,14 +201,16 @@ + show_error("Too Few Arguments",buf,line,2); + return; + } +- strcpy(colorname,p); ++ strncpy(colorname,p,sizeof(colorname)); ++ colorname[sizeof(colorname) - 1] = '\0'; + + if( (p=getnword(buf,2))==NULL ) + { + show_error("Too Few Arguments",buf,line,3); + return; + } +- strcpy(color,p); ++ strncpy(color,p,sizeof(color)); ++ color[sizeof(color)] = '\0'; + + if( !strcmp(colorname,"Background") ) strcpy(colors[Back],color); + else if( !strcmp(colorname,"Foreground") ) strcpy(colors[Fore],color); +@@ -298,7 +306,8 @@ + i=1; + while(p[i]!='/'&&p[i]!='\0') name[i-1]=p[i++]; + name[i-1]='\0'; +- if(i==1) strcpy(name,user.name); ++ if(i==1) strncpy(name,user.name,sizeof(name)); ++ name[sizeof(name) -1] = '\0'; + + do + { diff --git a/games/cowsay/files/patch-aa b/games/cowsay/files/patch-aa deleted file mode 100644 index 7bf70197..0000000 --- a/games/cowsay/files/patch-aa +++ /dev/null @@ -1,35 +0,0 @@ -$NetBSD: patch-aa,v 1.1.1.1 2000/03/25 20:13:24 jlam Exp $ - ---- cowsay.orig Thu Nov 4 11:29:53 1999 -+++ cowsay Sat Mar 25 12:07:09 2000 -@@ -7,7 +7,7 @@ - ## - - use Text::Tabs qw(expand); --use Text::Wrap qw(wrap fill $columns); -+use Text::Wrap qw(wrap $columns); - use File::Basename; - use Getopt::Std; - use Cwd; -@@ -180,4 +180,21 @@ - Usage: $progname [-bdgpstwy] [-h] [-e eyes] [-f cowfile] - [-l] [-n] [-T tongue] [-W wrapcolumn] [message] - EOF -+} -+ -+sub fill { -+ my ($ip, $xp, @raw) = @_; -+ my @para; -+ my $pp; -+ -+ for $pp (split(/\n\s+/, join("\n",@raw))) { -+ $pp =~ s/\s+/ /g; -+ my $x = wrap($ip, $xp, $pp); -+ push(@para, $x); -+ } -+ -+ # if paragraph_indent is the same as line_indent, -+ # separate paragraphs with blank lines -+ -+ return join ($ip eq $xp ? "\n\n" : "\n", @para); - } diff --git a/games/cowsay/files/patch-cowsay b/games/cowsay/files/patch-cowsay new file mode 100644 index 0000000..7bf70197 --- /dev/null +++ b/games/cowsay/files/patch-cowsay @@ -0,0 +1,35 @@ +$NetBSD: patch-aa,v 1.1.1.1 2000/03/25 20:13:24 jlam Exp $ + +--- cowsay.orig Thu Nov 4 11:29:53 1999 ++++ cowsay Sat Mar 25 12:07:09 2000 +@@ -7,7 +7,7 @@ + ## + + use Text::Tabs qw(expand); +-use Text::Wrap qw(wrap fill $columns); ++use Text::Wrap qw(wrap $columns); + use File::Basename; + use Getopt::Std; + use Cwd; +@@ -180,4 +180,21 @@ + Usage: $progname [-bdgpstwy] [-h] [-e eyes] [-f cowfile] + [-l] [-n] [-T tongue] [-W wrapcolumn] [message] + EOF ++} ++ ++sub fill { ++ my ($ip, $xp, @raw) = @_; ++ my @para; ++ my $pp; ++ ++ for $pp (split(/\n\s+/, join("\n",@raw))) { ++ $pp =~ s/\s+/ /g; ++ my $x = wrap($ip, $xp, $pp); ++ push(@para, $x); ++ } ++ ++ # if paragraph_indent is the same as line_indent, ++ # separate paragraphs with blank lines ++ ++ return join ($ip eq $xp ? "\n\n" : "\n", @para); + } diff --git a/games/cursive/Makefile b/games/cursive/Makefile index d024390..0be21b6 100644 --- a/games/cursive/Makefile +++ b/games/cursive/Makefile @@ -6,11 +6,11 @@ PORTVERSION= 1.0 CATEGORIES= games MASTER_SITES= ftp://puck.nether.net/pub/janc/ DISTNAME= ${PORTNAME} -EXTRACT_SUFX= .tgz MAINTAINER= ports@FreeBSD.org COMMENT= Create ASCII character cursive handwriting +USES= tar:tgz PLIST_FILES= bin/cursive \ man/man6/cursive.6.gz diff --git a/games/cursive/files/patch-Makefile b/games/cursive/files/patch-Makefile new file mode 100644 index 0000000..cc69375 --- /dev/null +++ b/games/cursive/files/patch-Makefile @@ -0,0 +1,23 @@ +--- Makefile.old Sun Oct 20 01:13:47 1991 ++++ Makefile Thu Apr 4 08:24:44 2002 +@@ -1,7 +1,9 @@ +-CFLAGS = -g ++CFLAGS += -g ++ ++all: cursive + + cursive: cursive.o x.o xs.o +- cc -g -o cursive cursive.o x.o xs.o ++ ${CC} -g -o cursive cursive.o x.o xs.o + + x.c: font.c + xstr font.c +@@ -13,7 +15,7 @@ + # the same, but is slightly bigger. + + lcursive: cursive.o font.o +- cc -g -o lcursive cursive.o font.o ++ ${CC} -g -o lcursive cursive.o font.o + + cursive.shar: cursive.c font.c cursive.h cursive.6 Makefile shar + shar cursive.c font.c cursive.h cursive.6 Makefile shar > cursive.shar diff --git a/games/cursive/files/patch-aa b/games/cursive/files/patch-aa deleted file mode 100644 index cc69375..0000000 --- a/games/cursive/files/patch-aa +++ /dev/null @@ -1,23 +0,0 @@ ---- Makefile.old Sun Oct 20 01:13:47 1991 -+++ Makefile Thu Apr 4 08:24:44 2002 -@@ -1,7 +1,9 @@ --CFLAGS = -g -+CFLAGS += -g -+ -+all: cursive - - cursive: cursive.o x.o xs.o -- cc -g -o cursive cursive.o x.o xs.o -+ ${CC} -g -o cursive cursive.o x.o xs.o - - x.c: font.c - xstr font.c -@@ -13,7 +15,7 @@ - # the same, but is slightly bigger. - - lcursive: cursive.o font.o -- cc -g -o lcursive cursive.o font.o -+ ${CC} -g -o lcursive cursive.o font.o - - cursive.shar: cursive.c font.c cursive.h cursive.6 Makefile shar - shar cursive.c font.c cursive.h cursive.6 Makefile shar > cursive.shar diff --git a/games/cursive/files/patch-ab b/games/cursive/files/patch-ab deleted file mode 100644 index 8a3e553..0000000 --- a/games/cursive/files/patch-ab +++ /dev/null @@ -1,11 +0,0 @@ ---- cursive.c.orig Sat Dec 4 17:20:55 1999 -+++ cursive.c Sat Dec 4 17:21:32 1999 -@@ -128,7 +128,7 @@ - else - { - /* Message from standard input */ -- while (gets(message) != NULL) -+ while (fgets(message, sizeof(message), stdin) != NULL) - prline(message); - } - } diff --git a/games/cursive/files/patch-ac b/games/cursive/files/patch-ac deleted file mode 100644 index fcf82cf..0000000 --- a/games/cursive/files/patch-ac +++ /dev/null @@ -1,11 +0,0 @@ ---- cursive.6.orig Sat Dec 4 17:31:42 1999 -+++ cursive.6 Sat Dec 4 17:32:03 1999 -@@ -3,7 +3,7 @@ - .SH NAME - cursive \- print text in cursive script - .SH SYNOPSIS --.B /usr/games/cursive -+.B cursive - [ - .BI \-i n - ] diff --git a/games/cursive/files/patch-cursive.6 b/games/cursive/files/patch-cursive.6 new file mode 100644 index 0000000..fcf82cf --- /dev/null +++ b/games/cursive/files/patch-cursive.6 @@ -0,0 +1,11 @@ +--- cursive.6.orig Sat Dec 4 17:31:42 1999 ++++ cursive.6 Sat Dec 4 17:32:03 1999 +@@ -3,7 +3,7 @@ + .SH NAME + cursive \- print text in cursive script + .SH SYNOPSIS +-.B /usr/games/cursive ++.B cursive + [ + .BI \-i n + ] diff --git a/games/cursive/files/patch-cursive.c b/games/cursive/files/patch-cursive.c new file mode 100644 index 0000000..8a3e553 --- /dev/null +++ b/games/cursive/files/patch-cursive.c @@ -0,0 +1,11 @@ +--- cursive.c.orig Sat Dec 4 17:20:55 1999 ++++ cursive.c Sat Dec 4 17:21:32 1999 +@@ -128,7 +128,7 @@ + else + { + /* Message from standard input */ +- while (gets(message) != NULL) ++ while (fgets(message, sizeof(message), stdin) != NULL) + prline(message); + } + } diff --git a/games/drm/Makefile b/games/drm/Makefile index 90463ef..bf2eed7 100644 --- a/games/drm/Makefile +++ b/games/drm/Makefile @@ -7,12 +7,12 @@ CATEGORIES= games MASTER_SITES= ${MASTER_SITE_SUNSITE} MASTER_SITE_SUBDIR= games/arcade DISTNAME= dr_mario -EXTRACT_SUFX= .tar.Z MAINTAINER= ports@FreeBSD.org -COMMENT= Very simple Tetris-style game +COMMENT= Very simple Tetris-style game ALL_TARGET= +USES= tar:Z OPTIONS_DEFINE= DOCS diff --git a/games/drm/files/patch-Makefile b/games/drm/files/patch-Makefile new file mode 100644 index 0000000..282df43 --- /dev/null +++ b/games/drm/files/patch-Makefile @@ -0,0 +1,24 @@ +--- Makefile Tue Jun 16 03:13:11 1992 ++++ /home/andy/tmp/wrk/Makefile Tue Aug 4 17:02:23 1998 +@@ -1,17 +1,17 @@ + #makefile for BUGS I - SRN 7/12/91 + # modified for Linux on 6/15/92 Ken Corey + +-CC= gcc +-CFLAGS= -O3 ++#CC= gcc ++#CFLAGS= -O3 + OBJS= main.o startup.o loop.o meat.o + + #bugs : & $(OBJS) + bugs : $(OBJS) + #use above line if parallel processing is not supported +- ${CC} ${CFLAGS} -o bugs $(OBJS) -lcurses -ltermcap ++ ${CC} ${CFLAGS} -o bugs $(OBJS) -lcurses + + main.o: main.c info.h +- ${CC} ${CFLAGS} -DLINUX -o main.o main.c ++ ${CC} ${CFLAGS} -o main.o -c main.c + + $(OBJS): info.h + diff --git a/games/drm/files/patch-aa b/games/drm/files/patch-aa deleted file mode 100644 index 282df43..0000000 --- a/games/drm/files/patch-aa +++ /dev/null @@ -1,24 +0,0 @@ ---- Makefile Tue Jun 16 03:13:11 1992 -+++ /home/andy/tmp/wrk/Makefile Tue Aug 4 17:02:23 1998 -@@ -1,17 +1,17 @@ - #makefile for BUGS I - SRN 7/12/91 - # modified for Linux on 6/15/92 Ken Corey - --CC= gcc --CFLAGS= -O3 -+#CC= gcc -+#CFLAGS= -O3 - OBJS= main.o startup.o loop.o meat.o - - #bugs : & $(OBJS) - bugs : $(OBJS) - #use above line if parallel processing is not supported -- ${CC} ${CFLAGS} -o bugs $(OBJS) -lcurses -ltermcap -+ ${CC} ${CFLAGS} -o bugs $(OBJS) -lcurses - - main.o: main.c info.h -- ${CC} ${CFLAGS} -DLINUX -o main.o main.c -+ ${CC} ${CFLAGS} -o main.o -c main.c - - $(OBJS): info.h - diff --git a/games/editss/files/patch-aa b/games/editss/files/patch-aa deleted file mode 100644 index 368be1b..0000000 --- a/games/editss/files/patch-aa +++ /dev/null @@ -1,10 +0,0 @@ ---- actions.c.orig Sat Sep 7 16:41:31 2002 -+++ actions.c Sat Sep 7 16:41:49 2002 -@@ -32,7 +32,6 @@ - - #include /* usual include stuff */ - #include --#include - #include - #include - #include diff --git a/games/editss/files/patch-ab b/games/editss/files/patch-ab deleted file mode 100644 index 854005f..0000000 --- a/games/editss/files/patch-ab +++ /dev/null @@ -1,19 +0,0 @@ ---- editss.c.orig Wed Mar 22 19:39:59 2000 -+++ editss.c Thu Oct 10 14:39:00 2002 -@@ -28,7 +28,6 @@ - - #include - #include --#include - #include - #include - #include -@@ -509,7 +508,7 @@ - while (getoneshipdef(a,fin)) { - nrships+=1; - } -- fclose(fin); -+ if (fin!=NULL) fclose(fin); - if (nrships<1) i1=1; else i1=nrships; - - a[0]='\0'; diff --git a/games/editss/files/patch-ac b/games/editss/files/patch-ac deleted file mode 100644 index 9383eea..0000000 --- a/games/editss/files/patch-ac +++ /dev/null @@ -1,10 +0,0 @@ ---- xstuff.c.orig Sat Sep 7 16:41:43 2002 -+++ xstuff.c Sat Sep 7 16:42:00 2002 -@@ -28,7 +28,6 @@ - - #include - #include --#include - #include - #include - #include diff --git a/games/editss/files/patch-actions.c b/games/editss/files/patch-actions.c new file mode 100644 index 0000000..368be1b --- /dev/null +++ b/games/editss/files/patch-actions.c @@ -0,0 +1,10 @@ +--- actions.c.orig Sat Sep 7 16:41:31 2002 ++++ actions.c Sat Sep 7 16:41:49 2002 +@@ -32,7 +32,6 @@ + + #include /* usual include stuff */ + #include +-#include + #include + #include + #include diff --git a/games/editss/files/patch-editss.c b/games/editss/files/patch-editss.c new file mode 100644 index 0000000..854005f --- /dev/null +++ b/games/editss/files/patch-editss.c @@ -0,0 +1,19 @@ +--- editss.c.orig Wed Mar 22 19:39:59 2000 ++++ editss.c Thu Oct 10 14:39:00 2002 +@@ -28,7 +28,6 @@ + + #include + #include +-#include + #include + #include + #include +@@ -509,7 +508,7 @@ + while (getoneshipdef(a,fin)) { + nrships+=1; + } +- fclose(fin); ++ if (fin!=NULL) fclose(fin); + if (nrships<1) i1=1; else i1=nrships; + + a[0]='\0'; diff --git a/games/editss/files/patch-xstuff.c b/games/editss/files/patch-xstuff.c new file mode 100644 index 0000000..9383eea --- /dev/null +++ b/games/editss/files/patch-xstuff.c @@ -0,0 +1,10 @@ +--- xstuff.c.orig Sat Sep 7 16:41:43 2002 ++++ xstuff.c Sat Sep 7 16:42:00 2002 +@@ -28,7 +28,6 @@ + + #include + #include +-#include + #include + #include + #include diff --git a/games/flying/files/patch-Imakefile b/games/flying/files/patch-Imakefile new file mode 100644 index 0000000..e0bd731 --- /dev/null +++ b/games/flying/files/patch-Imakefile @@ -0,0 +1,28 @@ +--- Imakefile.orig Tue Oct 3 16:01:36 1995 ++++ Imakefile Tue Nov 19 06:08:52 2002 +@@ -1,6 +1,6 @@ + + XCOMM ##### where to put temporary data and pixmap files ... +-DATA_DIRECTORY = \"/tmp\" ++DATA_DIRECTORY = \"/dev/null\" + + XCOMM ##### parameter type of the system call select(), which usually is + XCOMM ##### fd_set, but at least on HP-UX, it is int ... I am still +@@ -12,7 +12,7 @@ + XCOMM ##### There is an optimization bug in gcc-2.7.0. Therefore the CXX_NOOPT + XCOMM ##### macro should be set when using gcc-2.7.0 to create target + XCOMM ##### pball.o without optimization +-CXX = gcc ++XCOMM # CXX = gcc + XCOMM # CXX_NOOPT = -O0 + + XCOMM ####################################################################### +@@ -30,7 +30,7 @@ + CCOPTIONS = #-Wall -g + + LOCAL_LIBRARIES = -lX11 -lm +- ++all:: flying + flying: $(OBJS) $(DEPLIBS) + $(RM) $@ + $(CXX) -o $@ $(OBJS) $(LDOPTIONS) $(LOCAL_LIBRARIES) $(LDLIBS) $(EXTRA_LOAD_FLAGS) diff --git a/games/flying/files/patch-aa b/games/flying/files/patch-aa deleted file mode 100644 index e0bd731..0000000 --- a/games/flying/files/patch-aa +++ /dev/null @@ -1,28 +0,0 @@ ---- Imakefile.orig Tue Oct 3 16:01:36 1995 -+++ Imakefile Tue Nov 19 06:08:52 2002 -@@ -1,6 +1,6 @@ - - XCOMM ##### where to put temporary data and pixmap files ... --DATA_DIRECTORY = \"/tmp\" -+DATA_DIRECTORY = \"/dev/null\" - - XCOMM ##### parameter type of the system call select(), which usually is - XCOMM ##### fd_set, but at least on HP-UX, it is int ... I am still -@@ -12,7 +12,7 @@ - XCOMM ##### There is an optimization bug in gcc-2.7.0. Therefore the CXX_NOOPT - XCOMM ##### macro should be set when using gcc-2.7.0 to create target - XCOMM ##### pball.o without optimization --CXX = gcc -+XCOMM # CXX = gcc - XCOMM # CXX_NOOPT = -O0 - - XCOMM ####################################################################### -@@ -30,7 +30,7 @@ - CCOPTIONS = #-Wall -g - - LOCAL_LIBRARIES = -lX11 -lm -- -+all:: flying - flying: $(OBJS) $(DEPLIBS) - $(RM) $@ - $(CXX) -o $@ $(OBJS) $(LDOPTIONS) $(LOCAL_LIBRARIES) $(LDLIBS) $(EXTRA_LOAD_FLAGS) diff --git a/games/flying/files/patch-ab b/games/flying/files/patch-ab deleted file mode 100644 index 2b0002e..0000000 --- a/games/flying/files/patch-ab +++ /dev/null @@ -1,11 +0,0 @@ ---- carrom.C.orig Sun Jan 9 01:09:14 2000 -+++ carrom.C Sun Jan 9 01:09:37 2000 -@@ -114,7 +114,7 @@ - void Carrom::Setup( double x, double y ) - { - static int nc[5] = { 3, 4, 5, 4, 3 }; // Steine pro Spalte --static t[19] = { -1, 1, -2, // Steinverteilung -+static int t[19] = { -1, 1, -2, // Steinverteilung - 2, -3, 3, 4, - -4, 5, 0, -5, -6, - 6, -7, 7, 8, diff --git a/games/flying/files/patch-ac b/games/flying/files/patch-ac deleted file mode 100644 index 5df22e6..0000000 --- a/games/flying/files/patch-ac +++ /dev/null @@ -1,20 +0,0 @@ ---- xgraph.C.orig Mon Aug 7 23:26:57 1995 -+++ xgraph.C Tue Nov 19 06:05:22 2002 -@@ -603,7 +603,7 @@ - XSizeHints hints; - XEvent event; - static int offx=10; --const frame = 7; -+const int frame = 7; - - hints.flags = PPosition | PSize | PAspect | PMinSize | PMaxSize; - hints.x = DisplayWidth(dpy,scr) -offx-width-frame; -@@ -918,7 +918,7 @@ - XFillPolygon( dpy,win,gc_current,p,n,0,0); - - if (p!=buffer) delete p; -- va_end(arg_ptr); -+ va_end(argptr); - } - - void FillPoly( int n, Vec2 v[] ) { diff --git a/games/flying/files/patch-ad b/games/flying/files/patch-ad deleted file mode 100644 index ab80ac7..0000000 --- a/games/flying/files/patch-ad +++ /dev/null @@ -1,11 +0,0 @@ ---- main.C.orig Sun Jan 9 01:15:53 2000 -+++ main.C Sun Jan 9 01:15:55 2000 -@@ -366,7 +366,7 @@ - - if (in1) p1 = new PBall( game_pball, in1 ); - if (in2) p2 = new PBall( game_pball, in2 ); -- if (!demo_flag&&!p1) p1 = new PBall( game_pball, (disp)?disp:"" ); -+ if (!demo_flag&&!p1) p1 = new PBall( game_pball, (disp)?disp:(char *)"" ); - - - g->DrawBackground(); diff --git a/games/flying/files/patch-ae b/games/flying/files/patch-ae deleted file mode 100644 index 31c62dc..0000000 --- a/games/flying/files/patch-ae +++ /dev/null @@ -1,11 +0,0 @@ ---- xmover.C.orig Sun Jan 9 01:16:44 2000 -+++ xmover.C Sun Jan 9 01:16:51 2000 -@@ -101,7 +101,7 @@ - private: - int ws; // Bits klein - const int wl; // Bits gross -- static mtab[9]; -+ static int mtab[9]; - }; - - int Stuffer::mtab[9] = { 0x00, 0x01, 0x03, 0x07, 0x0f, 0x1f, 0x3f, 0x7f, 0xff }; diff --git a/games/flying/files/patch-af b/games/flying/files/patch-af deleted file mode 100644 index 535090b..0000000 --- a/games/flying/files/patch-af +++ /dev/null @@ -1,20 +0,0 @@ ---- pool8.C.orig Sun Jan 9 01:17:59 2000 -+++ pool8.C Sun Jan 9 01:18:18 2000 -@@ -56,7 +56,7 @@ - - void Pool8::Triangle( const Vec2 &vec ) - { --static t[15] = { 1, -+static int t[15] = { 1, - -1, -2, - 2, 0, 3, - -3, 4, -4, -5, -@@ -186,7 +186,7 @@ - - void Pool9::Triangle( const Vec2 &vec ) - { --static t[9] = { 1, -+static int t[9] = { 1, - 2, 3, - 4, -1, 5, - 6, 7, diff --git a/games/flying/files/patch-carrom.C b/games/flying/files/patch-carrom.C new file mode 100644 index 0000000..2b0002e --- /dev/null +++ b/games/flying/files/patch-carrom.C @@ -0,0 +1,11 @@ +--- carrom.C.orig Sun Jan 9 01:09:14 2000 ++++ carrom.C Sun Jan 9 01:09:37 2000 +@@ -114,7 +114,7 @@ + void Carrom::Setup( double x, double y ) + { + static int nc[5] = { 3, 4, 5, 4, 3 }; // Steine pro Spalte +-static t[19] = { -1, 1, -2, // Steinverteilung ++static int t[19] = { -1, 1, -2, // Steinverteilung + 2, -3, 3, 4, + -4, 5, 0, -5, -6, + 6, -7, 7, 8, diff --git a/games/flying/files/patch-main.C b/games/flying/files/patch-main.C new file mode 100644 index 0000000..ab80ac7 --- /dev/null +++ b/games/flying/files/patch-main.C @@ -0,0 +1,11 @@ +--- main.C.orig Sun Jan 9 01:15:53 2000 ++++ main.C Sun Jan 9 01:15:55 2000 +@@ -366,7 +366,7 @@ + + if (in1) p1 = new PBall( game_pball, in1 ); + if (in2) p2 = new PBall( game_pball, in2 ); +- if (!demo_flag&&!p1) p1 = new PBall( game_pball, (disp)?disp:"" ); ++ if (!demo_flag&&!p1) p1 = new PBall( game_pball, (disp)?disp:(char *)"" ); + + + g->DrawBackground(); diff --git a/games/flying/files/patch-pool8.C b/games/flying/files/patch-pool8.C new file mode 100644 index 0000000..535090b --- /dev/null +++ b/games/flying/files/patch-pool8.C @@ -0,0 +1,20 @@ +--- pool8.C.orig Sun Jan 9 01:17:59 2000 ++++ pool8.C Sun Jan 9 01:18:18 2000 +@@ -56,7 +56,7 @@ + + void Pool8::Triangle( const Vec2 &vec ) + { +-static t[15] = { 1, ++static int t[15] = { 1, + -1, -2, + 2, 0, 3, + -3, 4, -4, -5, +@@ -186,7 +186,7 @@ + + void Pool9::Triangle( const Vec2 &vec ) + { +-static t[9] = { 1, ++static int t[9] = { 1, + 2, 3, + 4, -1, 5, + 6, 7, diff --git a/games/flying/files/patch-xgraph.C b/games/flying/files/patch-xgraph.C new file mode 100644 index 0000000..5df22e6 --- /dev/null +++ b/games/flying/files/patch-xgraph.C @@ -0,0 +1,20 @@ +--- xgraph.C.orig Mon Aug 7 23:26:57 1995 ++++ xgraph.C Tue Nov 19 06:05:22 2002 +@@ -603,7 +603,7 @@ + XSizeHints hints; + XEvent event; + static int offx=10; +-const frame = 7; ++const int frame = 7; + + hints.flags = PPosition | PSize | PAspect | PMinSize | PMaxSize; + hints.x = DisplayWidth(dpy,scr) -offx-width-frame; +@@ -918,7 +918,7 @@ + XFillPolygon( dpy,win,gc_current,p,n,0,0); + + if (p!=buffer) delete p; +- va_end(arg_ptr); ++ va_end(argptr); + } + + void FillPoly( int n, Vec2 v[] ) { diff --git a/games/flying/files/patch-xmover.C b/games/flying/files/patch-xmover.C new file mode 100644 index 0000000..31c62dc --- /dev/null +++ b/games/flying/files/patch-xmover.C @@ -0,0 +1,11 @@ +--- xmover.C.orig Sun Jan 9 01:16:44 2000 ++++ xmover.C Sun Jan 9 01:16:51 2000 +@@ -101,7 +101,7 @@ + private: + int ws; // Bits klein + const int wl; // Bits gross +- static mtab[9]; ++ static int mtab[9]; + }; + + int Stuffer::mtab[9] = { 0x00, 0x01, 0x03, 0x07, 0x0f, 0x1f, 0x3f, 0x7f, 0xff }; diff --git a/games/gnugo/files/patch-ab b/games/gnugo/files/patch-ab deleted file mode 100644 index 0991db8..0000000 --- a/games/gnugo/files/patch-ab +++ /dev/null @@ -1,10 +0,0 @@ ---- configure.org Fri Apr 26 01:28:25 2002 -+++ configure Fri Apr 26 01:28:59 2002 -@@ -1306,6 +1306,7 @@ - AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"} - - MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"} -+MAKEINFO="$MAKEINFO --no-split" - - AMTAR=${AMTAR-"${am_missing_run}tar"} - diff --git a/games/gnugo/files/patch-configure b/games/gnugo/files/patch-configure new file mode 100644 index 0000000..0991db8 --- /dev/null +++ b/games/gnugo/files/patch-configure @@ -0,0 +1,10 @@ +--- configure.org Fri Apr 26 01:28:25 2002 ++++ configure Fri Apr 26 01:28:59 2002 +@@ -1306,6 +1306,7 @@ + AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"} + + MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"} ++MAKEINFO="$MAKEINFO --no-split" + + AMTAR=${AMTAR-"${am_missing_run}tar"} + diff --git a/games/gracer/Makefile b/games/gracer/Makefile index 69ab2db..c939780 100644 --- a/games/gracer/Makefile +++ b/games/gracer/Makefile @@ -25,10 +25,8 @@ LIBS+= -L${LOCALBASE}/lib # for plib (sound): CONFIGURE_ARGS+= --with-plib=${LOCALBASE}/plib -.include - pre-patch: @${REINPLACE_CMD} -i '' -e 's|||' \ ${WRKSRC}/common/gr_memory.h -.include +.include diff --git a/games/gracer/files/patch-aa b/games/gracer/files/patch-aa deleted file mode 100644 index 737df1e..0000000 --- a/games/gracer/files/patch-aa +++ /dev/null @@ -1,33 +0,0 @@ ---- configure.in.orig Wed Nov 24 04:33:25 1999 -+++ configure.in Mon Dec 27 18:07:12 1999 -@@ -237,7 +237,7 @@ - tcl_prefix=$with_tcl) - - for tcl_prefix in $tcl_prefix $exec_prefix /usr/local /usr NONE; do -- if test -r $tcl_prefix/lib/tclConfig.sh; then -+ if test -r $tcl_prefix/lib/tcl8.4/tclConfig.sh; then - break; - fi - done -@@ -246,18 +246,18 @@ - AC_MSG_ERROR([could't find tclConfig.sh]) - fi - --file=${tcl_prefix}/lib/tclConfig.sh -+file=${tcl_prefix}/lib/tcl8.4/tclConfig.sh - if test ! -r ${file}; then - AC_MSG_ERROR(tclConfig.sh doesn't exist) - fi --AC_MSG_RESULT([use tclConfig.sh in $tcl_prefix/lib]) -+AC_MSG_RESULT([use tclConfig.sh in $tcl_prefix/lib/tcl8.4]) - . $file - - if test $TCL_MAJOR_VERSION -lt 8; then - AC_MSG_ERROR([tcl version 8.0 or higher is required.]) - fi - --TCL_CFLAGS="-I$TCL_SRC_DIR" -+TCL_CFLAGS="-I$tcl_prefix/include/tcl8.4" - TCL_LDFLAGS="$TCL_LIB_SPEC" - AC_SUBST(TCL_CFLAGS) - AC_SUBST(TCL_LDFLAGS) diff --git a/games/gracer/files/patch-ac b/games/gracer/files/patch-ac deleted file mode 100644 index 3f189f5..0000000 --- a/games/gracer/files/patch-ac +++ /dev/null @@ -1,10 +0,0 @@ ---- src/glbind.c.orig Mon Mar 10 15:31:50 2003 -+++ src/glbind.c Mon Mar 10 15:31:52 2003 -@@ -20,6 +20,7 @@ - */ - - #include -+#define GL_GLEXT_LEGACY - #include - #include - #include diff --git a/games/gracer/files/patch-configure.in b/games/gracer/files/patch-configure.in new file mode 100644 index 0000000..737df1e --- /dev/null +++ b/games/gracer/files/patch-configure.in @@ -0,0 +1,33 @@ +--- configure.in.orig Wed Nov 24 04:33:25 1999 ++++ configure.in Mon Dec 27 18:07:12 1999 +@@ -237,7 +237,7 @@ + tcl_prefix=$with_tcl) + + for tcl_prefix in $tcl_prefix $exec_prefix /usr/local /usr NONE; do +- if test -r $tcl_prefix/lib/tclConfig.sh; then ++ if test -r $tcl_prefix/lib/tcl8.4/tclConfig.sh; then + break; + fi + done +@@ -246,18 +246,18 @@ + AC_MSG_ERROR([could't find tclConfig.sh]) + fi + +-file=${tcl_prefix}/lib/tclConfig.sh ++file=${tcl_prefix}/lib/tcl8.4/tclConfig.sh + if test ! -r ${file}; then + AC_MSG_ERROR(tclConfig.sh doesn't exist) + fi +-AC_MSG_RESULT([use tclConfig.sh in $tcl_prefix/lib]) ++AC_MSG_RESULT([use tclConfig.sh in $tcl_prefix/lib/tcl8.4]) + . $file + + if test $TCL_MAJOR_VERSION -lt 8; then + AC_MSG_ERROR([tcl version 8.0 or higher is required.]) + fi + +-TCL_CFLAGS="-I$TCL_SRC_DIR" ++TCL_CFLAGS="-I$tcl_prefix/include/tcl8.4" + TCL_LDFLAGS="$TCL_LIB_SPEC" + AC_SUBST(TCL_CFLAGS) + AC_SUBST(TCL_LDFLAGS) diff --git a/games/gracer/files/patch-src_glbind.c b/games/gracer/files/patch-src_glbind.c new file mode 100644 index 0000000..3f189f5 --- /dev/null +++ b/games/gracer/files/patch-src_glbind.c @@ -0,0 +1,10 @@ +--- src/glbind.c.orig Mon Mar 10 15:31:50 2003 ++++ src/glbind.c Mon Mar 10 15:31:52 2003 +@@ -20,6 +20,7 @@ + */ + + #include ++#define GL_GLEXT_LEGACY + #include + #include + #include diff --git a/games/heretic/files/patch-Makefile b/games/heretic/files/patch-Makefile new file mode 100644 index 0000000..8792e86 --- /dev/null +++ b/games/heretic/files/patch-Makefile @@ -0,0 +1,91 @@ +--- Makefile.orig Mon May 1 22:56:45 2000 ++++ Makefile Fri Aug 30 01:43:32 2002 +@@ -1,19 +1,19 @@ + # Makefile for Linux Heretic/GLHeretic + + # Comment the line below if you don't want to build GLHeretic. +-WANT_OGL = yes ++#WANT_OGL = yes + + # Comment this if you don't want to build GLHeretic + # with highest quality options. + # (Only if you have WANT_OGL !) +-WANT_NICE_OGL = yes ++#WANT_NICE_OGL = yes + + + # Uncomment the line below if you want to use GSI for sound. + # (doesn't really work yet. :-() + #WANT_GSI = yes + +-CC = gcc -pipe ++#CC = gcc -pipe + + # + # For old SVGALIB, comment out -D__NEWVGALIB__ +@@ -21,7 +21,7 @@ + CDEFS.ipx = -DUNIX -DHAVE_USLEEP -DHAVE_MATH_H -DHAVE_VALUES_H -DLINUX_MOUSE \ + -DIPX_PROTOCOL -DI_GGI_HERETIC -DNEED_SHMGETEVENTBASE \ + -D__NEWVGALIB__ # -DIPX_DEBUG -DEXTRA_WADS +-CDEFS.udp = -DUNIX -DHAVE_USLEEP -DHAVE_MATH_H -DHAVE_VALUES_H -DLINUX_MOUSE \ ++CDEFS.udp = -DUNIX -DHAVE_USLEEP -DHAVE_MATH_H -DLINUX_MOUSE \ + -DUDP_PROTOCOL -DI_GGI_HERETIC -DNEED_SHMGETEVENTBASE \ + -D__NEWVGALIB__ # -DEXTRA_WADS + +@@ -38,7 +38,7 @@ + + COPT.alpha = -O2 -D__64BIT__ -DHAVE_ALLOCA_H + +-COPT.FreeBSD = -m486 -O2 -malign-jumps=2 -malign-functions=2 -D__32BIT__ ++COPT.FreeBSD = -D__32BIT__ -DHOMEDIR='"\"${PREFIX}/share/heretic\""' + + COPT.arm = -O2 -D__32BIT__ -fsigned-char -fomit-frame-pointer \ + -DHAVE_ALLOCA_H -D__PACKED__=__attribute__\ \(\(packed\)\) +@@ -57,12 +57,12 @@ + endif + + # Change this to change the platform +-COPT.arch = $(COPT.x86) ++COPT.arch = $(COPT.FreeBSD) + + # If you want IPX-netcode compiled, replace $(CDEFS.udp) with $(CDEFS.ipx) + +-CFLAGS = -Wall $(CDEFS.udp) $(COPT.arch) \ +- -I. -I.. -I/usr/X11R6/include $(COPT.sound) $(COPT.opengl) ++CFLAGS += $(CDEFS.udp) $(COPT.arch) \ ++ -I. -I.. -I${LOCALBASE}/include -I${LOCALBASE}/include $(COPT.sound) $(COPT.opengl) + + # Uncomment the line below if you want to use original "[" and "]" keys + # for inventory access, instead of "k" and "l". +@@ -85,18 +85,18 @@ + COPT.sound = -D__DOSOUND__ -DSNDSERV -Isoundclient -D__DOMUSIC__ -DMUSSERV # -D_DEBUGSOUND + X11LIBS = -lXext -lX11 + +-MUSSERV = musserver ++#MUSSERV = musserver + SNDSERV = sndserver + + endif + +-X_LDFLAGS = -L/usr/X11R6/lib ++X_LDFLAGS = -L${LOCALBASE}/lib + + X11LIBS = -lXext -lX11 +-GLLIBS = -lSDL -lpthread ++GLLIBS = `${SDL_CONFIG} --libs` ${PTHREAD_LIBS} + GGILIBS = -lggi -lm + VGALIBS = -lvga +-SDLLIBS = -lSDL -lpthread ++SDLLIBS = `${SDL_CONFIG} --libs` ${PTHREAD_LIBS} + + OBJS = am_map.o ct_chat.o d_main.o d_net.o f_finale.o g_game.o \ + p_ceilng.o p_doors.o p_enemy.o p_floor.o p_inter.o p_lights.o \ +@@ -104,7 +104,7 @@ + p_spec.o p_switch.o p_telept.o p_tick.o p_user.o r_bsp.o r_data.o \ + r_draw.o r_plane.o r_segs.o r_things.o r_main.o mn_menu.o sb_bar.o \ + tables.o v_video.o w_wad.o z_zone.o in_lude.o \ +- info.o i_net.o i_system.o i_udp.o i_ipx.o i_main.o $(SOUND_OBJS) ++ info.o i_net.o i_system.o i_udp.o i_main.o $(SOUND_OBJS) + + GLOBJS = opengl/gl_effects.o opengl/gl_floorceil.o opengl/gl_fonts.o \ + opengl/gl_func.o opengl/gl_init.o opengl/gl_lights.o \ diff --git a/games/heretic/files/patch-aa b/games/heretic/files/patch-aa deleted file mode 100644 index 8792e86..0000000 --- a/games/heretic/files/patch-aa +++ /dev/null @@ -1,91 +0,0 @@ ---- Makefile.orig Mon May 1 22:56:45 2000 -+++ Makefile Fri Aug 30 01:43:32 2002 -@@ -1,19 +1,19 @@ - # Makefile for Linux Heretic/GLHeretic - - # Comment the line below if you don't want to build GLHeretic. --WANT_OGL = yes -+#WANT_OGL = yes - - # Comment this if you don't want to build GLHeretic - # with highest quality options. - # (Only if you have WANT_OGL !) --WANT_NICE_OGL = yes -+#WANT_NICE_OGL = yes - - - # Uncomment the line below if you want to use GSI for sound. - # (doesn't really work yet. :-() - #WANT_GSI = yes - --CC = gcc -pipe -+#CC = gcc -pipe - - # - # For old SVGALIB, comment out -D__NEWVGALIB__ -@@ -21,7 +21,7 @@ - CDEFS.ipx = -DUNIX -DHAVE_USLEEP -DHAVE_MATH_H -DHAVE_VALUES_H -DLINUX_MOUSE \ - -DIPX_PROTOCOL -DI_GGI_HERETIC -DNEED_SHMGETEVENTBASE \ - -D__NEWVGALIB__ # -DIPX_DEBUG -DEXTRA_WADS --CDEFS.udp = -DUNIX -DHAVE_USLEEP -DHAVE_MATH_H -DHAVE_VALUES_H -DLINUX_MOUSE \ -+CDEFS.udp = -DUNIX -DHAVE_USLEEP -DHAVE_MATH_H -DLINUX_MOUSE \ - -DUDP_PROTOCOL -DI_GGI_HERETIC -DNEED_SHMGETEVENTBASE \ - -D__NEWVGALIB__ # -DEXTRA_WADS - -@@ -38,7 +38,7 @@ - - COPT.alpha = -O2 -D__64BIT__ -DHAVE_ALLOCA_H - --COPT.FreeBSD = -m486 -O2 -malign-jumps=2 -malign-functions=2 -D__32BIT__ -+COPT.FreeBSD = -D__32BIT__ -DHOMEDIR='"\"${PREFIX}/share/heretic\""' - - COPT.arm = -O2 -D__32BIT__ -fsigned-char -fomit-frame-pointer \ - -DHAVE_ALLOCA_H -D__PACKED__=__attribute__\ \(\(packed\)\) -@@ -57,12 +57,12 @@ - endif - - # Change this to change the platform --COPT.arch = $(COPT.x86) -+COPT.arch = $(COPT.FreeBSD) - - # If you want IPX-netcode compiled, replace $(CDEFS.udp) with $(CDEFS.ipx) - --CFLAGS = -Wall $(CDEFS.udp) $(COPT.arch) \ -- -I. -I.. -I/usr/X11R6/include $(COPT.sound) $(COPT.opengl) -+CFLAGS += $(CDEFS.udp) $(COPT.arch) \ -+ -I. -I.. -I${LOCALBASE}/include -I${LOCALBASE}/include $(COPT.sound) $(COPT.opengl) - - # Uncomment the line below if you want to use original "[" and "]" keys - # for inventory access, instead of "k" and "l". -@@ -85,18 +85,18 @@ - COPT.sound = -D__DOSOUND__ -DSNDSERV -Isoundclient -D__DOMUSIC__ -DMUSSERV # -D_DEBUGSOUND - X11LIBS = -lXext -lX11 - --MUSSERV = musserver -+#MUSSERV = musserver - SNDSERV = sndserver - - endif - --X_LDFLAGS = -L/usr/X11R6/lib -+X_LDFLAGS = -L${LOCALBASE}/lib - - X11LIBS = -lXext -lX11 --GLLIBS = -lSDL -lpthread -+GLLIBS = `${SDL_CONFIG} --libs` ${PTHREAD_LIBS} - GGILIBS = -lggi -lm - VGALIBS = -lvga --SDLLIBS = -lSDL -lpthread -+SDLLIBS = `${SDL_CONFIG} --libs` ${PTHREAD_LIBS} - - OBJS = am_map.o ct_chat.o d_main.o d_net.o f_finale.o g_game.o \ - p_ceilng.o p_doors.o p_enemy.o p_floor.o p_inter.o p_lights.o \ -@@ -104,7 +104,7 @@ - p_spec.o p_switch.o p_telept.o p_tick.o p_user.o r_bsp.o r_data.o \ - r_draw.o r_plane.o r_segs.o r_things.o r_main.o mn_menu.o sb_bar.o \ - tables.o v_video.o w_wad.o z_zone.o in_lude.o \ -- info.o i_net.o i_system.o i_udp.o i_ipx.o i_main.o $(SOUND_OBJS) -+ info.o i_net.o i_system.o i_udp.o i_main.o $(SOUND_OBJS) - - GLOBJS = opengl/gl_effects.o opengl/gl_floorceil.o opengl/gl_fonts.o \ - opengl/gl_func.o opengl/gl_init.o opengl/gl_lights.o \ diff --git a/games/heretic/files/patch-ac b/games/heretic/files/patch-ac deleted file mode 100644 index 74df663..0000000 --- a/games/heretic/files/patch-ac +++ /dev/null @@ -1,19 +0,0 @@ ---- w_wad.c Sat Oct 23 05:02:21 1999 -+++ w_wad.c.new Sun Feb 13 03:52:25 2000 -@@ -15,7 +15,6 @@ - #include - #include - #include --#include - #include - #include - #include -@@ -26,8 +25,6 @@ - - #define O_BINARY 0 - #endif /* UNIX */ -- --#include - - #ifdef __GLIBC__ - #include diff --git a/games/heretic/files/patch-ad b/games/heretic/files/patch-ad deleted file mode 100644 index 1e6ec40..0000000 --- a/games/heretic/files/patch-ad +++ /dev/null @@ -1,11 +0,0 @@ ---- opengl/sgi-si/libtess/memalloc.h Wed Jan 26 05:30:44 2000 -+++ opengl/sgi-si/libtess/memalloc.h.new Sun Feb 13 03:54:46 2000 -@@ -42,7 +42,7 @@ - #ifndef __memalloc_simple_h_ - #define __memalloc_simple_h_ - --#include -+#include - - #define memRealloc realloc - #define memFree free diff --git a/games/heretic/files/patch-ae b/games/heretic/files/patch-ae deleted file mode 100644 index 009be36..0000000 --- a/games/heretic/files/patch-ae +++ /dev/null @@ -1,11 +0,0 @@ ---- opengl/gl_struct.h.orig Wed Jan 26 14:38:19 2000 -+++ opengl/gl_struct.h Sun Apr 2 16:43:51 2000 -@@ -2,7 +2,7 @@ - #define __GL_STRUCT_H__ - - #include --#include -+#include - #include - #include - #include diff --git a/games/heretic/files/patch-af b/games/heretic/files/patch-af deleted file mode 100644 index e744690..0000000 --- a/games/heretic/files/patch-af +++ /dev/null @@ -1,11 +0,0 @@ ---- sndserv/soundsrv.c Mon Mar 22 20:06:59 1999 -+++ sndserv/soundsrv.c.new Sun Feb 13 03:54:46 2000 -@@ -43,7 +43,7 @@ - #include - #include - #include --#include -+#include - #include - #include - diff --git a/games/heretic/files/patch-ag b/games/heretic/files/patch-ag deleted file mode 100644 index d878db7..0000000 --- a/games/heretic/files/patch-ag +++ /dev/null @@ -1,11 +0,0 @@ ---- sndserv/wadread.c Thu Nov 25 05:24:49 1999 -+++ sndserv/wadread.c.new Sun Feb 13 03:54:46 2000 -@@ -39,7 +39,7 @@ - */ - - --#include -+#include - #include - #include - #include diff --git a/games/heretic/files/patch-ah b/games/heretic/files/patch-ah deleted file mode 100644 index 26a1436..0000000 --- a/games/heretic/files/patch-ah +++ /dev/null @@ -1,9 +0,0 @@ ---- opengl/gl_fonts.c Sun Jan 30 05:58:21 2000 -+++ opengl/gl_fonts.c.new Sun Feb 13 03:54:46 2000 -@@ -1,5 +1,5 @@ - #include --#include -+#include - #include - #include - diff --git a/games/heretic/files/patch-aj b/games/heretic/files/patch-aj deleted file mode 100644 index 9293acc..0000000 --- a/games/heretic/files/patch-aj +++ /dev/null @@ -1,11 +0,0 @@ ---- sndserv/Makefile.orig Sat Oct 23 11:02:21 1999 -+++ sndserv/Makefile Thu Jan 10 19:34:23 2002 -@@ -1,6 +1,6 @@ --CC = gcc -+#CC = gcc - --CFLAGS= -Wall -Wstrict-prototypes $(COPT.arch) -+CFLAGS= -Wall -Wstrict-prototypes $(COPT.arch) -I/usr/include/sys - - LIBS= -lm - diff --git a/games/heretic/files/patch-ak b/games/heretic/files/patch-ak deleted file mode 100644 index 5aac936..0000000 --- a/games/heretic/files/patch-ak +++ /dev/null @@ -1,11 +0,0 @@ ---- sndserv/linux.c.orig Thu Jan 10 19:06:58 2002 -+++ sndserv/linux.c Thu Jan 10 19:07:06 2002 -@@ -32,7 +32,7 @@ - #include - #include - --#include -+#include - - #include "soundsrv.h" - diff --git a/games/heretic/files/patch-al b/games/heretic/files/patch-al deleted file mode 100644 index e7e198b..0000000 --- a/games/heretic/files/patch-al +++ /dev/null @@ -1,11 +0,0 @@ ---- i_udp.c.old Sun Oct 20 22:21:11 2002 -+++ i_udp.c Sun Oct 20 22:21:26 2002 -@@ -31,7 +31,7 @@ - - boolean server = 0; - --static int DOOMPORT = (IPPORT_USERRESERVED +0x1d ); -+static int DOOMPORT = (5000 +0x1d ); - - /* static int sendsocket; */ - /* static int insocket; */ diff --git a/games/heretic/files/patch-i_udp.c b/games/heretic/files/patch-i_udp.c new file mode 100644 index 0000000..e7e198b --- /dev/null +++ b/games/heretic/files/patch-i_udp.c @@ -0,0 +1,11 @@ +--- i_udp.c.old Sun Oct 20 22:21:11 2002 ++++ i_udp.c Sun Oct 20 22:21:26 2002 +@@ -31,7 +31,7 @@ + + boolean server = 0; + +-static int DOOMPORT = (IPPORT_USERRESERVED +0x1d ); ++static int DOOMPORT = (5000 +0x1d ); + + /* static int sendsocket; */ + /* static int insocket; */ diff --git a/games/heretic/files/patch-opengl_gl_fonts.c b/games/heretic/files/patch-opengl_gl_fonts.c new file mode 100644 index 0000000..26a1436 --- /dev/null +++ b/games/heretic/files/patch-opengl_gl_fonts.c @@ -0,0 +1,9 @@ +--- opengl/gl_fonts.c Sun Jan 30 05:58:21 2000 ++++ opengl/gl_fonts.c.new Sun Feb 13 03:54:46 2000 +@@ -1,5 +1,5 @@ + #include +-#include ++#include + #include + #include + diff --git a/games/heretic/files/patch-opengl_gl_struct.h b/games/heretic/files/patch-opengl_gl_struct.h new file mode 100644 index 0000000..009be36 --- /dev/null +++ b/games/heretic/files/patch-opengl_gl_struct.h @@ -0,0 +1,11 @@ +--- opengl/gl_struct.h.orig Wed Jan 26 14:38:19 2000 ++++ opengl/gl_struct.h Sun Apr 2 16:43:51 2000 +@@ -2,7 +2,7 @@ + #define __GL_STRUCT_H__ + + #include +-#include ++#include + #include + #include + #include diff --git a/games/heretic/files/patch-opengl_sgi-si_libtess_memalloc.h b/games/heretic/files/patch-opengl_sgi-si_libtess_memalloc.h new file mode 100644 index 0000000..1e6ec40 --- /dev/null +++ b/games/heretic/files/patch-opengl_sgi-si_libtess_memalloc.h @@ -0,0 +1,11 @@ +--- opengl/sgi-si/libtess/memalloc.h Wed Jan 26 05:30:44 2000 ++++ opengl/sgi-si/libtess/memalloc.h.new Sun Feb 13 03:54:46 2000 +@@ -42,7 +42,7 @@ + #ifndef __memalloc_simple_h_ + #define __memalloc_simple_h_ + +-#include ++#include + + #define memRealloc realloc + #define memFree free diff --git a/games/heretic/files/patch-sndserv_Makefile b/games/heretic/files/patch-sndserv_Makefile new file mode 100644 index 0000000..9293acc --- /dev/null +++ b/games/heretic/files/patch-sndserv_Makefile @@ -0,0 +1,11 @@ +--- sndserv/Makefile.orig Sat Oct 23 11:02:21 1999 ++++ sndserv/Makefile Thu Jan 10 19:34:23 2002 +@@ -1,6 +1,6 @@ +-CC = gcc ++#CC = gcc + +-CFLAGS= -Wall -Wstrict-prototypes $(COPT.arch) ++CFLAGS= -Wall -Wstrict-prototypes $(COPT.arch) -I/usr/include/sys + + LIBS= -lm + diff --git a/games/heretic/files/patch-sndserv_linux.c b/games/heretic/files/patch-sndserv_linux.c new file mode 100644 index 0000000..5aac936 --- /dev/null +++ b/games/heretic/files/patch-sndserv_linux.c @@ -0,0 +1,11 @@ +--- sndserv/linux.c.orig Thu Jan 10 19:06:58 2002 ++++ sndserv/linux.c Thu Jan 10 19:07:06 2002 +@@ -32,7 +32,7 @@ + #include + #include + +-#include ++#include + + #include "soundsrv.h" + diff --git a/games/heretic/files/patch-sndserv_soundsrv.c b/games/heretic/files/patch-sndserv_soundsrv.c new file mode 100644 index 0000000..e744690 --- /dev/null +++ b/games/heretic/files/patch-sndserv_soundsrv.c @@ -0,0 +1,11 @@ +--- sndserv/soundsrv.c Mon Mar 22 20:06:59 1999 ++++ sndserv/soundsrv.c.new Sun Feb 13 03:54:46 2000 +@@ -43,7 +43,7 @@ + #include + #include + #include +-#include ++#include + #include + #include + diff --git a/games/heretic/files/patch-sndserv_wadread.c b/games/heretic/files/patch-sndserv_wadread.c new file mode 100644 index 0000000..d878db7 --- /dev/null +++ b/games/heretic/files/patch-sndserv_wadread.c @@ -0,0 +1,11 @@ +--- sndserv/wadread.c Thu Nov 25 05:24:49 1999 ++++ sndserv/wadread.c.new Sun Feb 13 03:54:46 2000 +@@ -39,7 +39,7 @@ + */ + + +-#include ++#include + #include + #include + #include diff --git a/games/heretic/files/patch-w_wad.c b/games/heretic/files/patch-w_wad.c new file mode 100644 index 0000000..74df663 --- /dev/null +++ b/games/heretic/files/patch-w_wad.c @@ -0,0 +1,19 @@ +--- w_wad.c Sat Oct 23 05:02:21 1999 ++++ w_wad.c.new Sun Feb 13 03:52:25 2000 +@@ -15,7 +15,6 @@ + #include + #include + #include +-#include + #include + #include + #include +@@ -26,8 +25,6 @@ + + #define O_BINARY 0 + #endif /* UNIX */ +- +-#include + + #ifdef __GLIBC__ + #include diff --git a/games/hex/files/patch-Makefile b/games/hex/files/patch-Makefile new file mode 100644 index 0000000..7936e63 --- /dev/null +++ b/games/hex/files/patch-Makefile @@ -0,0 +1,26 @@ +--- Makefile.orig Fri Aug 6 20:56:10 1999 ++++ Makefile Wed Aug 9 03:01:56 2000 +@@ -1,16 +1,19 @@ +-CC = gcc -Wall -O6 -g ++#CC = gcc -Wall -O6 -g + + SRCS = main.c levels.c grid.c player.c touching.c gtkstuff.c plot.c graphics.c + OBJS = $(SRCS:.c=.o) +-LIBS = -lm -lgdk_imlib ++CFLAGS += -DGRAPHICPATH=\"${GRAPHICPATH}\" -DLEVELPATH=\"${LEVELPATH}\" ++#LIBS = -lm -lgdk_imlib ++GDK_IMLIB_CFLAGS = `imlib-config --cflags-gdk` ++GDK_IMLIB_LIBS = `imlib-config --libs-gdk` + + all: hex + + .c.o: +- $(CC) `gtk-config --cflags` -c $*.c -o $*.o ++ $(CC) $(CFLAGS) $(GDK_IMLIB_CFLAGS) -c $*.c -o $*.o + + hex: $(OBJS) +- $(CC) $(LIBS) `gtk-config --libs` $(OBJS) -o $@ ++ $(CC) $(LIBS) $(GDK_IMLIB_LIBS) $(OBJS) -o $@ + + clean: + rm -f *~ *.o hex diff --git a/games/hex/files/patch-aa b/games/hex/files/patch-aa deleted file mode 100644 index c00792c..0000000 --- a/games/hex/files/patch-aa +++ /dev/null @@ -1,12 +0,0 @@ ---- hex.c.orig Thu Aug 5 08:36:00 1999 -+++ hex.c Wed Aug 9 02:55:38 2000 -@@ -17,7 +17,9 @@ - #include - #include - -+#ifndef LEVELPATH - #define LEVELPATH "./levels/" -+#endif - - #define XSIZE 8 - #define YSIZE 12 diff --git a/games/hex/files/patch-ab b/games/hex/files/patch-ab deleted file mode 100644 index 023e818..0000000 --- a/games/hex/files/patch-ab +++ /dev/null @@ -1,12 +0,0 @@ ---- hex.h.orig Sat Aug 7 06:27:05 1999 -+++ hex.h Wed Aug 9 02:54:56 2000 -@@ -1,5 +1,9 @@ -+#ifndef GRAPHICPATH - #define GRAPHICPATH "./graphics/" -+#endif -+#ifndef LEVELPATH - #define LEVELPATH "./levels/" -+#endif - - #define XSIZE 8 - #define YSIZE 12 // add 1 for the ceiling line diff --git a/games/hex/files/patch-ac b/games/hex/files/patch-ac deleted file mode 100644 index 7936e63..0000000 --- a/games/hex/files/patch-ac +++ /dev/null @@ -1,26 +0,0 @@ ---- Makefile.orig Fri Aug 6 20:56:10 1999 -+++ Makefile Wed Aug 9 03:01:56 2000 -@@ -1,16 +1,19 @@ --CC = gcc -Wall -O6 -g -+#CC = gcc -Wall -O6 -g - - SRCS = main.c levels.c grid.c player.c touching.c gtkstuff.c plot.c graphics.c - OBJS = $(SRCS:.c=.o) --LIBS = -lm -lgdk_imlib -+CFLAGS += -DGRAPHICPATH=\"${GRAPHICPATH}\" -DLEVELPATH=\"${LEVELPATH}\" -+#LIBS = -lm -lgdk_imlib -+GDK_IMLIB_CFLAGS = `imlib-config --cflags-gdk` -+GDK_IMLIB_LIBS = `imlib-config --libs-gdk` - - all: hex - - .c.o: -- $(CC) `gtk-config --cflags` -c $*.c -o $*.o -+ $(CC) $(CFLAGS) $(GDK_IMLIB_CFLAGS) -c $*.c -o $*.o - - hex: $(OBJS) -- $(CC) $(LIBS) `gtk-config --libs` $(OBJS) -o $@ -+ $(CC) $(LIBS) $(GDK_IMLIB_LIBS) $(OBJS) -o $@ - - clean: - rm -f *~ *.o hex diff --git a/games/hex/files/patch-hex.c b/games/hex/files/patch-hex.c new file mode 100644 index 0000000..c00792c --- /dev/null +++ b/games/hex/files/patch-hex.c @@ -0,0 +1,12 @@ +--- hex.c.orig Thu Aug 5 08:36:00 1999 ++++ hex.c Wed Aug 9 02:55:38 2000 +@@ -17,7 +17,9 @@ + #include + #include + ++#ifndef LEVELPATH + #define LEVELPATH "./levels/" ++#endif + + #define XSIZE 8 + #define YSIZE 12 diff --git a/games/hex/files/patch-hex.h b/games/hex/files/patch-hex.h new file mode 100644 index 0000000..023e818 --- /dev/null +++ b/games/hex/files/patch-hex.h @@ -0,0 +1,12 @@ +--- hex.h.orig Sat Aug 7 06:27:05 1999 ++++ hex.h Wed Aug 9 02:54:56 2000 +@@ -1,5 +1,9 @@ ++#ifndef GRAPHICPATH + #define GRAPHICPATH "./graphics/" ++#endif ++#ifndef LEVELPATH + #define LEVELPATH "./levels/" ++#endif + + #define XSIZE 8 + #define YSIZE 12 // add 1 for the ceiling line diff --git a/games/imaze/files/patch-aa b/games/imaze/files/patch-aa deleted file mode 100644 index 32ae788..0000000 --- a/games/imaze/files/patch-aa +++ /dev/null @@ -1,20 +0,0 @@ ---- source/Makefile.in.orig Thu Dec 13 10:50:40 2001 -+++ source/Makefile.in Thu Dec 13 10:56:34 2001 -@@ -43,7 +43,7 @@ - @echo "run ./configure first, don't use this makefile" - #END configure output - --DEFINES=-DDEFAULT_SOUND_DIR=\"`pwd`/../sounds\" -+DEFINES=-DDEFAULT_SOUND_DIR=\"${SOUNDDIR}\" - # - # possible values: - # -@@ -66,7 +66,7 @@ - X11Libs=-lX11 - #AthenaLibs=-lXaw -lXt - AthenaLibs=-lXaw -lXt -lXmu --MotifLibs=-lXm -lXt -+MotifLibs=${MOTIFLIB} - XViewLibs=-lxview -lolgx - - # bis hier Optionen eintragen diff --git a/games/imaze/files/patch-ab b/games/imaze/files/patch-ab deleted file mode 100644 index 8d1d16c..0000000 --- a/games/imaze/files/patch-ab +++ /dev/null @@ -1,11 +0,0 @@ ---- source/fbsd_joystick.c.orig Sat Jun 28 15:55:30 2003 -+++ source/fbsd_joystick.c Sat Jun 28 15:56:01 2003 -@@ -44,7 +44,7 @@ - #include - #include - #include --#include -+#include - - #include "argv.h" - #include "global.h" diff --git a/games/imaze/files/patch-ac b/games/imaze/files/patch-ac deleted file mode 100644 index 950aa60..0000000 --- a/games/imaze/files/patch-ac +++ /dev/null @@ -1,11 +0,0 @@ ---- source/voxware_audio.c.orig Sat Jun 28 15:55:41 2003 -+++ source/voxware_audio.c Sat Jun 28 15:56:08 2003 -@@ -50,7 +50,7 @@ - #ifdef linux - #include - #else --#include -+#include - #endif - - #include "argv.h" diff --git a/games/imaze/files/patch-ad b/games/imaze/files/patch-ad deleted file mode 100644 index bc70380..0000000 --- a/games/imaze/files/patch-ad +++ /dev/null @@ -1,11 +0,0 @@ ---- source/configure.orig Thu Jul 24 22:06:46 2003 -+++ source/configure Thu Jul 24 22:10:31 2003 -@@ -54,7 +54,7 @@ - MakefileIn=Makefile.in - MakefileOut=Makefile - --SedQuote="s/[^=]*\$/'&'/" -+SedQuote="s/=\(.*\)/='\1'/" - - #---------- - # diff --git a/games/imaze/files/patch-source_Makefile.in b/games/imaze/files/patch-source_Makefile.in new file mode 100644 index 0000000..32ae788 --- /dev/null +++ b/games/imaze/files/patch-source_Makefile.in @@ -0,0 +1,20 @@ +--- source/Makefile.in.orig Thu Dec 13 10:50:40 2001 ++++ source/Makefile.in Thu Dec 13 10:56:34 2001 +@@ -43,7 +43,7 @@ + @echo "run ./configure first, don't use this makefile" + #END configure output + +-DEFINES=-DDEFAULT_SOUND_DIR=\"`pwd`/../sounds\" ++DEFINES=-DDEFAULT_SOUND_DIR=\"${SOUNDDIR}\" + # + # possible values: + # +@@ -66,7 +66,7 @@ + X11Libs=-lX11 + #AthenaLibs=-lXaw -lXt + AthenaLibs=-lXaw -lXt -lXmu +-MotifLibs=-lXm -lXt ++MotifLibs=${MOTIFLIB} + XViewLibs=-lxview -lolgx + + # bis hier Optionen eintragen diff --git a/games/imaze/files/patch-source_configure b/games/imaze/files/patch-source_configure new file mode 100644 index 0000000..bc70380 --- /dev/null +++ b/games/imaze/files/patch-source_configure @@ -0,0 +1,11 @@ +--- source/configure.orig Thu Jul 24 22:06:46 2003 ++++ source/configure Thu Jul 24 22:10:31 2003 +@@ -54,7 +54,7 @@ + MakefileIn=Makefile.in + MakefileOut=Makefile + +-SedQuote="s/[^=]*\$/'&'/" ++SedQuote="s/=\(.*\)/='\1'/" + + #---------- + # diff --git a/games/imaze/files/patch-source_fbsd_joystick.c b/games/imaze/files/patch-source_fbsd_joystick.c new file mode 100644 index 0000000..8d1d16c --- /dev/null +++ b/games/imaze/files/patch-source_fbsd_joystick.c @@ -0,0 +1,11 @@ +--- source/fbsd_joystick.c.orig Sat Jun 28 15:55:30 2003 ++++ source/fbsd_joystick.c Sat Jun 28 15:56:01 2003 +@@ -44,7 +44,7 @@ + #include + #include + #include +-#include ++#include + + #include "argv.h" + #include "global.h" diff --git a/games/imaze/files/patch-source_voxware_audio.c b/games/imaze/files/patch-source_voxware_audio.c new file mode 100644 index 0000000..950aa60 --- /dev/null +++ b/games/imaze/files/patch-source_voxware_audio.c @@ -0,0 +1,11 @@ +--- source/voxware_audio.c.orig Sat Jun 28 15:55:41 2003 ++++ source/voxware_audio.c Sat Jun 28 15:56:08 2003 +@@ -50,7 +50,7 @@ + #ifdef linux + #include + #else +-#include ++#include + #endif + + #include "argv.h" diff --git a/games/inform/files/patch-aa b/games/inform/files/patch-aa deleted file mode 100644 index f465a25..0000000 --- a/games/inform/files/patch-aa +++ /dev/null @@ -1,11 +0,0 @@ ---- header.h.orig Sun Jun 28 00:54:48 1998 -+++ header.h Sun Jun 28 00:58:25 1998 -@@ -68,7 +68,7 @@ - /* out a block of definitions like those below.) */ - /* ------------------------------------------------------------------------- */ - --/* #define UNIX */ -+#define UNIX - - /* ------------------------------------------------------------------------- */ - /* The first task is to include the ANSI header files, and typedef */ diff --git a/games/inform/files/patch-header.h b/games/inform/files/patch-header.h new file mode 100644 index 0000000..f465a25 --- /dev/null +++ b/games/inform/files/patch-header.h @@ -0,0 +1,11 @@ +--- header.h.orig Sun Jun 28 00:54:48 1998 ++++ header.h Sun Jun 28 00:58:25 1998 +@@ -68,7 +68,7 @@ + /* out a block of definitions like those below.) */ + /* ------------------------------------------------------------------------- */ + +-/* #define UNIX */ ++#define UNIX + + /* ------------------------------------------------------------------------- */ + /* The first task is to include the ANSI header files, and typedef */ diff --git a/games/ladder/files/patch-Makefile b/games/ladder/files/patch-Makefile new file mode 100644 index 0000000..0b36462 --- /dev/null +++ b/games/ladder/files/patch-Makefile @@ -0,0 +1,34 @@ +--- Makefile.orig 1997-10-27 07:15:08.000000000 +0800 ++++ Makefile 2014-06-07 23:36:53.767950530 +0800 +@@ -2,12 +2,13 @@ TARGET = ladder + SRCS = ladder.c lplay.c ltime.c lscore.c lscreens.c + OBJS = ladder.o lplay.o ltime.o lscore.o lscreens.o + +-CC = gcc +-CFLAGS = -O -pedantic -I/usr/include/ncurses ++CC ?= gcc ++CFLAGS ?= -O ++CFLAGS += -pedantic -Wall + LDFLAGS = -s + M4 = m4 + LIBS = -lncurses +-SCOREFILE = ./ladder.scores ++SCOREFILE = /var/games/ladder.scores + + .SUFFIXES: .o .c .m4 + +@@ -22,6 +23,14 @@ $(TARGET): $(OBJS) + + $(OBJS): ladder.h + ++clean: ++ -$(RM) $(OBJS) $(TARGET) *.core ++ ++all: $(TARGET) ++ ++install: ++ install -c -s -o root -g games -m 2555 ladder $(DESTDIR)${PREFIX}/bin ++ + # ladder.c: ladder.m4 + + # lscreens.c: lscreens.m4 diff --git a/games/ladder/files/patch-aa b/games/ladder/files/patch-aa deleted file mode 100644 index 2b082bb..0000000 --- a/games/ladder/files/patch-aa +++ /dev/null @@ -1,11 +0,0 @@ ---- ladder.c.org Wed Feb 18 19:26:47 1998 -+++ ladder.c Wed Feb 18 19:33:09 1998 -@@ -82,7 +82,7 @@ - mvaddstr(r,LM,"Version: n/a"); - mvaddstr(r,RM0,"Up = k|8 Down = j|2 Left = h|4 Right = l|6"); - r++; -- mvprintw(r,LM,"Terminal: %s",termname()); -+ mvprintw(r,LM,"Terminal: %s",getenv("TERM")); - mvaddstr(r,RM0,"Jump = Space Stop = Other"); - r++; - mvprintw(r,LM,"Play Speed: %d",speed + 1); diff --git a/games/ladder/files/patch-ab b/games/ladder/files/patch-ab deleted file mode 100644 index 0b36462..0000000 --- a/games/ladder/files/patch-ab +++ /dev/null @@ -1,34 +0,0 @@ ---- Makefile.orig 1997-10-27 07:15:08.000000000 +0800 -+++ Makefile 2014-06-07 23:36:53.767950530 +0800 -@@ -2,12 +2,13 @@ TARGET = ladder - SRCS = ladder.c lplay.c ltime.c lscore.c lscreens.c - OBJS = ladder.o lplay.o ltime.o lscore.o lscreens.o - --CC = gcc --CFLAGS = -O -pedantic -I/usr/include/ncurses -+CC ?= gcc -+CFLAGS ?= -O -+CFLAGS += -pedantic -Wall - LDFLAGS = -s - M4 = m4 - LIBS = -lncurses --SCOREFILE = ./ladder.scores -+SCOREFILE = /var/games/ladder.scores - - .SUFFIXES: .o .c .m4 - -@@ -22,6 +23,14 @@ $(TARGET): $(OBJS) - - $(OBJS): ladder.h - -+clean: -+ -$(RM) $(OBJS) $(TARGET) *.core -+ -+all: $(TARGET) -+ -+install: -+ install -c -s -o root -g games -m 2555 ladder $(DESTDIR)${PREFIX}/bin -+ - # ladder.c: ladder.m4 - - # lscreens.c: lscreens.m4 diff --git a/games/ladder/files/patch-ac b/games/ladder/files/patch-ac deleted file mode 100644 index 3dfe726..0000000 --- a/games/ladder/files/patch-ac +++ /dev/null @@ -1,11 +0,0 @@ ---- ladder.c.org Mon Oct 27 00:07:23 1997 -+++ ladder.c Wed Feb 18 22:33:55 1998 -@@ -14,7 +14,7 @@ - char *d = t; - int i; - -- for( ; *s; *s++ ) -+ for( ; *s; s++ ) - if( *s & 0200 ) - for( i = 210 - (unsigned char)*s; i; i-- ) - *d++ = ' '; diff --git a/games/ladder/files/patch-ad b/games/ladder/files/patch-ad deleted file mode 100644 index eef6d35..0000000 --- a/games/ladder/files/patch-ad +++ /dev/null @@ -1,29 +0,0 @@ ---- lplay.c.org Tue Nov 11 20:01:51 1997 -+++ lplay.c Wed Feb 18 22:33:56 1998 -@@ -54,7 +54,7 @@ - mvaddstr(row,0,t); - - /* find points of release */ -- for( s = t; s = strchr(s,CRELEAS); s++ ) -+ for( s = t; (s = strchr(s,CRELEAS)); s++ ) - { - rel->row = row; - rel->col = s - t; -@@ -67,7 +67,7 @@ - - /* find lad */ - for( row = 0; row < DIMROW; row++ ) -- for( s = t = bg[row]; s = strchr(s,CLAD); s++ ) -+ for( s = t = bg[row]; (s = strchr(s,CLAD)); s++ ) - { - /* nasty, check for CLAD's surrounded by CFREEs */ - if( s[-1] != CFREE || s[1] != CFREE ) -@@ -433,6 +433,8 @@ - else - dir = STOP; - break; -+ default: -+ break; - } - } - diff --git a/games/ladder/files/patch-ae b/games/ladder/files/patch-ae deleted file mode 100644 index f7545c8..0000000 --- a/games/ladder/files/patch-ae +++ /dev/null @@ -1,40 +0,0 @@ ---- lscore.c.org Mon Oct 27 00:07:24 1997 -+++ lscore.c Wed Feb 18 22:33:56 1998 -@@ -21,7 +21,7 @@ - FILE *lfp; - - for( i = 3; i; i-- ) -- if( lfp = fopen(lf,"r") ) -+ if( (lfp = fopen(lf,"r")) ) - { - fclose(lfp); - sleep(2); -@@ -47,7 +47,7 @@ - - lock_score(); - memset(scores,0,sizeof(scores)); -- if( sfp = fopen(sf,"r") ) -+ if( (sfp = fopen(sf,"r")) ) - { - for( scp = scores; scp < &scores[MAXSCORE]; scp++ ) - if( fscanf(sfp,"%d%d%d%d", -@@ -67,8 +67,8 @@ - SCORE *scp; - for( scp = &scores[MAXSCORE]; scp > scores; scp-- ) - if( scp[0].score > scp[-1].score || -- scp[0].score == scp[-1].score && -- scp[0].level >= scp[-1].level ) -+ (scp[0].score == scp[-1].score && -+ scp[0].level >= scp[-1].level )) - { - SCORE tmp = scp[0]; - scp[0] = scp[-1]; -@@ -113,7 +113,7 @@ - if( scores[i].score ) - { - printw("%5d00 %2d ",scores[i].score,scores[i].level + 1); -- if( pw = getpwuid(scores[i].uid) ) -+ if( (pw = getpwuid(scores[i].uid)) ) - addstr(pw->pw_name); - else - printw("UID %d",scores[i].uid); diff --git a/games/ladder/files/patch-af b/games/ladder/files/patch-af deleted file mode 100644 index c1f515e..0000000 --- a/games/ladder/files/patch-af +++ /dev/null @@ -1,10 +0,0 @@ ---- ltime.c.org Mon Oct 27 00:07:24 1997 -+++ ltime.c Wed Feb 18 22:33:56 1998 -@@ -2,6 +2,7 @@ - #include - #include - #include -+#include - - static void waittcs(unsigned int tcs) - { diff --git a/games/ladder/files/patch-ag b/games/ladder/files/patch-ag deleted file mode 100644 index ff629e0..0000000 --- a/games/ladder/files/patch-ag +++ /dev/null @@ -1,8 +0,0 @@ ---- ladder.h.org Wed Feb 18 19:19:51 1998 -+++ ladder.h Wed Feb 18 19:26:29 1998 -@@ -1,4 +1,4 @@ --#include -+#include - #include - #include - #include diff --git a/games/ladder/files/patch-ladder.c_1 b/games/ladder/files/patch-ladder.c_1 new file mode 100644 index 0000000..2b082bb --- /dev/null +++ b/games/ladder/files/patch-ladder.c_1 @@ -0,0 +1,11 @@ +--- ladder.c.org Wed Feb 18 19:26:47 1998 ++++ ladder.c Wed Feb 18 19:33:09 1998 +@@ -82,7 +82,7 @@ + mvaddstr(r,LM,"Version: n/a"); + mvaddstr(r,RM0,"Up = k|8 Down = j|2 Left = h|4 Right = l|6"); + r++; +- mvprintw(r,LM,"Terminal: %s",termname()); ++ mvprintw(r,LM,"Terminal: %s",getenv("TERM")); + mvaddstr(r,RM0,"Jump = Space Stop = Other"); + r++; + mvprintw(r,LM,"Play Speed: %d",speed + 1); diff --git a/games/ladder/files/patch-ladder.c_2 b/games/ladder/files/patch-ladder.c_2 new file mode 100644 index 0000000..3dfe726 --- /dev/null +++ b/games/ladder/files/patch-ladder.c_2 @@ -0,0 +1,11 @@ +--- ladder.c.org Mon Oct 27 00:07:23 1997 ++++ ladder.c Wed Feb 18 22:33:55 1998 +@@ -14,7 +14,7 @@ + char *d = t; + int i; + +- for( ; *s; *s++ ) ++ for( ; *s; s++ ) + if( *s & 0200 ) + for( i = 210 - (unsigned char)*s; i; i-- ) + *d++ = ' '; diff --git a/games/ladder/files/patch-ladder.h b/games/ladder/files/patch-ladder.h new file mode 100644 index 0000000..ff629e0 --- /dev/null +++ b/games/ladder/files/patch-ladder.h @@ -0,0 +1,8 @@ +--- ladder.h.org Wed Feb 18 19:19:51 1998 ++++ ladder.h Wed Feb 18 19:26:29 1998 +@@ -1,4 +1,4 @@ +-#include ++#include + #include + #include + #include diff --git a/games/ladder/files/patch-lplay.c b/games/ladder/files/patch-lplay.c new file mode 100644 index 0000000..eef6d35 --- /dev/null +++ b/games/ladder/files/patch-lplay.c @@ -0,0 +1,29 @@ +--- lplay.c.org Tue Nov 11 20:01:51 1997 ++++ lplay.c Wed Feb 18 22:33:56 1998 +@@ -54,7 +54,7 @@ + mvaddstr(row,0,t); + + /* find points of release */ +- for( s = t; s = strchr(s,CRELEAS); s++ ) ++ for( s = t; (s = strchr(s,CRELEAS)); s++ ) + { + rel->row = row; + rel->col = s - t; +@@ -67,7 +67,7 @@ + + /* find lad */ + for( row = 0; row < DIMROW; row++ ) +- for( s = t = bg[row]; s = strchr(s,CLAD); s++ ) ++ for( s = t = bg[row]; (s = strchr(s,CLAD)); s++ ) + { + /* nasty, check for CLAD's surrounded by CFREEs */ + if( s[-1] != CFREE || s[1] != CFREE ) +@@ -433,6 +433,8 @@ + else + dir = STOP; + break; ++ default: ++ break; + } + } + diff --git a/games/ladder/files/patch-lscore.c b/games/ladder/files/patch-lscore.c new file mode 100644 index 0000000..f7545c8 --- /dev/null +++ b/games/ladder/files/patch-lscore.c @@ -0,0 +1,40 @@ +--- lscore.c.org Mon Oct 27 00:07:24 1997 ++++ lscore.c Wed Feb 18 22:33:56 1998 +@@ -21,7 +21,7 @@ + FILE *lfp; + + for( i = 3; i; i-- ) +- if( lfp = fopen(lf,"r") ) ++ if( (lfp = fopen(lf,"r")) ) + { + fclose(lfp); + sleep(2); +@@ -47,7 +47,7 @@ + + lock_score(); + memset(scores,0,sizeof(scores)); +- if( sfp = fopen(sf,"r") ) ++ if( (sfp = fopen(sf,"r")) ) + { + for( scp = scores; scp < &scores[MAXSCORE]; scp++ ) + if( fscanf(sfp,"%d%d%d%d", +@@ -67,8 +67,8 @@ + SCORE *scp; + for( scp = &scores[MAXSCORE]; scp > scores; scp-- ) + if( scp[0].score > scp[-1].score || +- scp[0].score == scp[-1].score && +- scp[0].level >= scp[-1].level ) ++ (scp[0].score == scp[-1].score && ++ scp[0].level >= scp[-1].level )) + { + SCORE tmp = scp[0]; + scp[0] = scp[-1]; +@@ -113,7 +113,7 @@ + if( scores[i].score ) + { + printw("%5d00 %2d ",scores[i].score,scores[i].level + 1); +- if( pw = getpwuid(scores[i].uid) ) ++ if( (pw = getpwuid(scores[i].uid)) ) + addstr(pw->pw_name); + else + printw("UID %d",scores[i].uid); diff --git a/games/ladder/files/patch-ltime.c b/games/ladder/files/patch-ltime.c new file mode 100644 index 0000000..c1f515e --- /dev/null +++ b/games/ladder/files/patch-ltime.c @@ -0,0 +1,10 @@ +--- ltime.c.org Mon Oct 27 00:07:24 1997 ++++ ltime.c Wed Feb 18 22:33:56 1998 +@@ -2,6 +2,7 @@ + #include + #include + #include ++#include + + static void waittcs(unsigned int tcs) + { diff --git a/games/lbreakout/files/patch-Makefile.in b/games/lbreakout/files/patch-Makefile.in new file mode 100644 index 0000000..a44be7a --- /dev/null +++ b/games/lbreakout/files/patch-Makefile.in @@ -0,0 +1,11 @@ +--- Makefile.in.orig Wed Oct 18 17:27:21 2000 ++++ Makefile.in Fri Oct 20 09:57:40 2000 +@@ -46,7 +46,7 @@ + ACLOCAL = @ACLOCAL@ + AUTOCONF = @AUTOCONF@ + AUTOMAKE = @AUTOMAKE@ +-AUTOHEADER = @AUTOHEADER@ ++AUTOHEADER = true + + INSTALL = @INSTALL@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) diff --git a/games/lbreakout/files/patch-aa b/games/lbreakout/files/patch-aa deleted file mode 100644 index 3d8896c..0000000 --- a/games/lbreakout/files/patch-aa +++ /dev/null @@ -1,11 +0,0 @@ ---- lbreakout/Makefile.in 2000/10/20 06:56:24 1.1 -+++ lbreakout/Makefile.in 2000/10/20 06:56:47 -@@ -80,7 +80,7 @@ - - bin_PROGRAMS = lbreakout - lbreakout_SOURCES = hiscore.cpp dynlist.c level.cpp breakout.cpp sndsrv.c sdl.c menumanager.cpp menuitem.cpp menu.cpp game.cpp main.cpp --lbreakout_LDADD = -lpthread -lm @thread_flag@ -+lbreakout_LDADD = @thread_flag@ - - EXTRA_SUBDIRS = manual - diff --git a/games/lbreakout/files/patch-ab b/games/lbreakout/files/patch-ab deleted file mode 100644 index 341e2de..0000000 --- a/games/lbreakout/files/patch-ab +++ /dev/null @@ -1,10 +0,0 @@ ---- lbreakout/breakout.cpp 2000/10/20 07:01:37 1.1 -+++ lbreakout/breakout.cpp 2000/10/20 07:02:11 -@@ -19,6 +19,7 @@ - #include "level.h" - #include - #include -+#include - #include - #include - #include diff --git a/games/lbreakout/files/patch-ac b/games/lbreakout/files/patch-ac deleted file mode 100644 index b542dcb..0000000 --- a/games/lbreakout/files/patch-ac +++ /dev/null @@ -1,21 +0,0 @@ ---- lbreakout/game.cpp 2000/10/20 07:02:55 1.1 -+++ lbreakout/game.cpp 2000/10/20 07:03:35 -@@ -15,6 +15,7 @@ - * * - ***************************************************************************/ - -+#include - #include - #include - #include -@@ -22,6 +23,10 @@ - #include "breakout.h" - #include "menumanager.h" - #include "level.h" -+ -+extern "C" { -+ int ftime(struct timeb *tp); -+}; - - #ifdef SOUND - extern SndSrv sndsrv; diff --git a/games/lbreakout/files/patch-ad b/games/lbreakout/files/patch-ad deleted file mode 100644 index a44be7a..0000000 --- a/games/lbreakout/files/patch-ad +++ /dev/null @@ -1,11 +0,0 @@ ---- Makefile.in.orig Wed Oct 18 17:27:21 2000 -+++ Makefile.in Fri Oct 20 09:57:40 2000 -@@ -46,7 +46,7 @@ - ACLOCAL = @ACLOCAL@ - AUTOCONF = @AUTOCONF@ - AUTOMAKE = @AUTOMAKE@ --AUTOHEADER = @AUTOHEADER@ -+AUTOHEADER = true - - INSTALL = @INSTALL@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) diff --git a/games/lbreakout/files/patch-ae b/games/lbreakout/files/patch-ae deleted file mode 100644 index a7a54c9..0000000 --- a/games/lbreakout/files/patch-ae +++ /dev/null @@ -1,13 +0,0 @@ ---- configure 2000/10/20 06:57:57 1.1 -+++ configure 2000/10/20 06:58:16 -@@ -1783,8 +1783,8 @@ - - - --sdir=$datadir/games/lbreakout --hdir=/var/lib/games -+sdir=$datadir/lbreakout -+hdir=/var/games/lbreakout - inst_flag="-DSRC_DIR=\\\"$sdir/\\\"" - hi_inst_flag="-DHI_DIR=\\\"$hdir/\\\"" - diff --git a/games/lbreakout/files/patch-configure b/games/lbreakout/files/patch-configure new file mode 100644 index 0000000..a7a54c9 --- /dev/null +++ b/games/lbreakout/files/patch-configure @@ -0,0 +1,13 @@ +--- configure 2000/10/20 06:57:57 1.1 ++++ configure 2000/10/20 06:58:16 +@@ -1783,8 +1783,8 @@ + + + +-sdir=$datadir/games/lbreakout +-hdir=/var/lib/games ++sdir=$datadir/lbreakout ++hdir=/var/games/lbreakout + inst_flag="-DSRC_DIR=\\\"$sdir/\\\"" + hi_inst_flag="-DHI_DIR=\\\"$hdir/\\\"" + diff --git a/games/lbreakout/files/patch-lbreakout_Makefile.in b/games/lbreakout/files/patch-lbreakout_Makefile.in new file mode 100644 index 0000000..3d8896c --- /dev/null +++ b/games/lbreakout/files/patch-lbreakout_Makefile.in @@ -0,0 +1,11 @@ +--- lbreakout/Makefile.in 2000/10/20 06:56:24 1.1 ++++ lbreakout/Makefile.in 2000/10/20 06:56:47 +@@ -80,7 +80,7 @@ + + bin_PROGRAMS = lbreakout + lbreakout_SOURCES = hiscore.cpp dynlist.c level.cpp breakout.cpp sndsrv.c sdl.c menumanager.cpp menuitem.cpp menu.cpp game.cpp main.cpp +-lbreakout_LDADD = -lpthread -lm @thread_flag@ ++lbreakout_LDADD = @thread_flag@ + + EXTRA_SUBDIRS = manual + diff --git a/games/lbreakout/files/patch-lbreakout_breakout.cpp b/games/lbreakout/files/patch-lbreakout_breakout.cpp new file mode 100644 index 0000000..341e2de --- /dev/null +++ b/games/lbreakout/files/patch-lbreakout_breakout.cpp @@ -0,0 +1,10 @@ +--- lbreakout/breakout.cpp 2000/10/20 07:01:37 1.1 ++++ lbreakout/breakout.cpp 2000/10/20 07:02:11 +@@ -19,6 +19,7 @@ + #include "level.h" + #include + #include ++#include + #include + #include + #include diff --git a/games/lbreakout/files/patch-lbreakout_game.cpp b/games/lbreakout/files/patch-lbreakout_game.cpp new file mode 100644 index 0000000..b542dcb --- /dev/null +++ b/games/lbreakout/files/patch-lbreakout_game.cpp @@ -0,0 +1,21 @@ +--- lbreakout/game.cpp 2000/10/20 07:02:55 1.1 ++++ lbreakout/game.cpp 2000/10/20 07:03:35 +@@ -15,6 +15,7 @@ + * * + ***************************************************************************/ + ++#include + #include + #include + #include +@@ -22,6 +23,10 @@ + #include "breakout.h" + #include "menumanager.h" + #include "level.h" ++ ++extern "C" { ++ int ftime(struct timeb *tp); ++}; + + #ifdef SOUND + extern SndSrv sndsrv; diff --git a/games/mindfocus/Makefile b/games/mindfocus/Makefile index 0595814..8c84c5a 100644 --- a/games/mindfocus/Makefile +++ b/games/mindfocus/Makefile @@ -17,9 +17,7 @@ RESTRICTED= 'contains commercial character data' DOCSDIR= ${PREFIX}/share/doc/ja/${PORTNAME} -OPTIONS_DEFINE= DOCS - -.include +OPTIONS_DEFINE= DOCS EXAMPLES post-install: @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} @@ -36,13 +34,11 @@ post-install: ${INSTALL_DATA} ${WRKDIR}/pixmaps/$i ${STAGEDIR}${EXAMPLESDIR}/pixmaps .endfor -.if ${PORT_OPTIONS:MDOCS} - ${MKDIR} ${STAGEDIR}${DOCSDIR} + @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_MAN} ${WRKSRC}/doc/HISTORY.euc ${STAGEDIR}${DOCSDIR} ${INSTALL_MAN} ${WRKSRC}/doc/MFC.euc ${STAGEDIR}${DOCSDIR} ${INSTALL_MAN} ${WRKSRC}/doc/README.euc ${STAGEDIR}${DOCSDIR} ${INSTALL_MAN} ${WRKSRC}/doc/SCRIPT.euc ${STAGEDIR}${DOCSDIR} ${INSTALL_MAN} ${WRKSRC}/doc/TODO.euc ${STAGEDIR}${DOCSDIR} -.endif .include diff --git a/games/mindfocus/files/patch-Imakefile b/games/mindfocus/files/patch-Imakefile new file mode 100644 index 0000000..c800ef9 --- /dev/null +++ b/games/mindfocus/files/patch-Imakefile @@ -0,0 +1,8 @@ +--- Imakefile.orig Fri Nov 27 02:19:33 1998 ++++ Imakefile Thu Dec 3 06:17:15 1998 +@@ -18,3 +18,5 @@ + #define PassCDebugFlags 'CDEBUGFLAGS=$(CDEBUGFLAGS)' + + MakeSubdirs($(SUBDIRS)) ++ ++depend: diff --git a/games/mindfocus/files/patch-aa b/games/mindfocus/files/patch-aa deleted file mode 100644 index 07eac14..0000000 --- a/games/mindfocus/files/patch-aa +++ /dev/null @@ -1,24 +0,0 @@ ---- configure.h.orig Fri Dec 18 21:55:05 1998 -+++ configure.h Thu Feb 25 10:31:24 1999 -@@ -11,10 +11,10 @@ - */ - - /* インストールディレクトリ */ --#define INSTALLDIR ${HOME}/bin -+#define INSTALLDIR ${PREFIX}/bin - - /* デフォルトデータをインストールする場所 */ --#define DATADIR ${HOME}/share/mindfocus -+#define DATADIR ${PREFIX}/share/examples/mindfocus - - /* 個人環境保存ファイル(設定ファイル)の名前 */ - #define DOTFILENAME ".mindfocus" -@@ -32,7 +32,7 @@ - - /* XPMフォーマットに対応させるときは定義する。今のところ事実上必須。 */ - #define XPM --#define XPMLIBRARY -L/usr/local/X11R6/lib -lXpm -+#define XPMLIBRARY -L${PREFIX}/lib -lXpm - - - /* diff --git a/games/mindfocus/files/patch-ab b/games/mindfocus/files/patch-ab deleted file mode 100644 index c800ef9..0000000 --- a/games/mindfocus/files/patch-ab +++ /dev/null @@ -1,8 +0,0 @@ ---- Imakefile.orig Fri Nov 27 02:19:33 1998 -+++ Imakefile Thu Dec 3 06:17:15 1998 -@@ -18,3 +18,5 @@ - #define PassCDebugFlags 'CDEBUGFLAGS=$(CDEBUGFLAGS)' - - MakeSubdirs($(SUBDIRS)) -+ -+depend: diff --git a/games/mindfocus/files/patch-ac b/games/mindfocus/files/patch-ac deleted file mode 100644 index 7524fa8..0000000 --- a/games/mindfocus/files/patch-ac +++ /dev/null @@ -1,11 +0,0 @@ ---- mindfocus/Imakefile.orig Wed Jun 14 20:00:24 2000 -+++ mindfocus/Imakefile Wed Nov 1 07:25:08 2000 -@@ -27,7 +27,7 @@ - - CFLAGS += $(CDEFINES) - --ComplexProgramTarget(mindfocus) -+ComplexProgramTargetNoMan(mindfocus) - InstallNamedNonExec(../system.mindfocus,system.mindfocus,DATADIR) - - mindfocus.o:: ../lib/inifile/inifile.h mfc.h diff --git a/games/mindfocus/files/patch-configure.h b/games/mindfocus/files/patch-configure.h new file mode 100644 index 0000000..07eac14 --- /dev/null +++ b/games/mindfocus/files/patch-configure.h @@ -0,0 +1,24 @@ +--- configure.h.orig Fri Dec 18 21:55:05 1998 ++++ configure.h Thu Feb 25 10:31:24 1999 +@@ -11,10 +11,10 @@ + */ + + /* インストールディレクトリ */ +-#define INSTALLDIR ${HOME}/bin ++#define INSTALLDIR ${PREFIX}/bin + + /* デフォルトデータをインストールする場所 */ +-#define DATADIR ${HOME}/share/mindfocus ++#define DATADIR ${PREFIX}/share/examples/mindfocus + + /* 個人環境保存ファイル(設定ファイル)の名前 */ + #define DOTFILENAME ".mindfocus" +@@ -32,7 +32,7 @@ + + /* XPMフォーマットに対応させるときは定義する。今のところ事実上必須。 */ + #define XPM +-#define XPMLIBRARY -L/usr/local/X11R6/lib -lXpm ++#define XPMLIBRARY -L${PREFIX}/lib -lXpm + + + /* diff --git a/games/mindfocus/files/patch-mindfocus_Imakefile b/games/mindfocus/files/patch-mindfocus_Imakefile new file mode 100644 index 0000000..7524fa8 --- /dev/null +++ b/games/mindfocus/files/patch-mindfocus_Imakefile @@ -0,0 +1,11 @@ +--- mindfocus/Imakefile.orig Wed Jun 14 20:00:24 2000 ++++ mindfocus/Imakefile Wed Nov 1 07:25:08 2000 +@@ -27,7 +27,7 @@ + + CFLAGS += $(CDEFINES) + +-ComplexProgramTarget(mindfocus) ++ComplexProgramTargetNoMan(mindfocus) + InstallNamedNonExec(../system.mindfocus,system.mindfocus,DATADIR) + + mindfocus.o:: ../lib/inifile/inifile.h mfc.h diff --git a/games/mindfocus/pkg-plist b/games/mindfocus/pkg-plist index 9caee22..87e2c4c 100644 --- a/games/mindfocus/pkg-plist +++ b/games/mindfocus/pkg-plist @@ -1,57 +1,57 @@ bin/mindfocus -%%EXAMPLESDIR%%/akane.mfc -%%EXAMPLESDIR%%/misaki.mfc -%%EXAMPLESDIR%%/nanase.mfc -%%EXAMPLESDIR%%/mayu.mfc -%%EXAMPLESDIR%%/mio.mfc -%%EXAMPLESDIR%%/misaki2.mfc -%%EXAMPLESDIR%%/mizuka.mfc -%%EXAMPLESDIR%%/myu.mfc -%%EXAMPLESDIR%%/ryoko.mfc -%%EXAMPLESDIR%%/system.mindfocus -%%EXAMPLESDIR%%/pixmaps/akane0.xpm -%%EXAMPLESDIR%%/pixmaps/akane1.xpm -%%EXAMPLESDIR%%/pixmaps/akane2.xpm -%%EXAMPLESDIR%%/pixmaps/akane3.xpm -%%EXAMPLESDIR%%/pixmaps/misaki0.xpm -%%EXAMPLESDIR%%/pixmaps/misaki1.xpm -%%EXAMPLESDIR%%/pixmaps/misaki2.xpm -%%EXAMPLESDIR%%/pixmaps/misaki3.xpm -%%EXAMPLESDIR%%/pixmaps/nanase0.xpm -%%EXAMPLESDIR%%/pixmaps/nanase1.xpm -%%EXAMPLESDIR%%/pixmaps/nanase2.xpm -%%EXAMPLESDIR%%/pixmaps/nanase3.xpm -%%EXAMPLESDIR%%/pixmaps/mayu1.xpm -%%EXAMPLESDIR%%/pixmaps/mayu2.xpm -%%EXAMPLESDIR%%/pixmaps/mayu3.xpm -%%EXAMPLESDIR%%/pixmaps/mayu4.xpm -%%EXAMPLESDIR%%/pixmaps/mio1.xpm -%%EXAMPLESDIR%%/pixmaps/mio2.xpm -%%EXAMPLESDIR%%/pixmaps/mio3.xpm -%%EXAMPLESDIR%%/pixmaps/mio4.xpm -%%EXAMPLESDIR%%/pixmaps/misaki2-1.xpm -%%EXAMPLESDIR%%/pixmaps/misaki2-2.xpm -%%EXAMPLESDIR%%/pixmaps/misaki2-3.xpm -%%EXAMPLESDIR%%/pixmaps/misaki2-4.xpm -%%EXAMPLESDIR%%/pixmaps/mizuka1.xpm -%%EXAMPLESDIR%%/pixmaps/mizuka2.xpm -%%EXAMPLESDIR%%/pixmaps/mizuka3.xpm -%%EXAMPLESDIR%%/pixmaps/mizuka4.xpm -%%EXAMPLESDIR%%/pixmaps/myu1.xpm -%%EXAMPLESDIR%%/pixmaps/myu2.xpm -%%EXAMPLESDIR%%/pixmaps/myu3.xpm -%%EXAMPLESDIR%%/pixmaps/myu4.xpm -%%EXAMPLESDIR%%/pixmaps/ryoko1.xpm -%%EXAMPLESDIR%%/pixmaps/ryoko2.xpm -%%EXAMPLESDIR%%/pixmaps/ryoko3.xpm -%%EXAMPLESDIR%%/pixmaps/ryoko4.xpm -%%EXAMPLESDIR%%/scripts/eye.ms +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/akane.mfc +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/misaki.mfc +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/nanase.mfc +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/mayu.mfc +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/mio.mfc +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/misaki2.mfc +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/mizuka.mfc +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/myu.mfc +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ryoko.mfc +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/system.mindfocus +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pixmaps/akane0.xpm +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pixmaps/akane1.xpm +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pixmaps/akane2.xpm +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pixmaps/akane3.xpm +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pixmaps/misaki0.xpm +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pixmaps/misaki1.xpm +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pixmaps/misaki2.xpm +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pixmaps/misaki3.xpm +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pixmaps/nanase0.xpm +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pixmaps/nanase1.xpm +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pixmaps/nanase2.xpm +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pixmaps/nanase3.xpm +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pixmaps/mayu1.xpm +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pixmaps/mayu2.xpm +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pixmaps/mayu3.xpm +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pixmaps/mayu4.xpm +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pixmaps/mio1.xpm +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pixmaps/mio2.xpm +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pixmaps/mio3.xpm +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pixmaps/mio4.xpm +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pixmaps/misaki2-1.xpm +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pixmaps/misaki2-2.xpm +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pixmaps/misaki2-3.xpm +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pixmaps/misaki2-4.xpm +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pixmaps/mizuka1.xpm +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pixmaps/mizuka2.xpm +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pixmaps/mizuka3.xpm +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pixmaps/mizuka4.xpm +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pixmaps/myu1.xpm +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pixmaps/myu2.xpm +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pixmaps/myu3.xpm +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pixmaps/myu4.xpm +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pixmaps/ryoko1.xpm +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pixmaps/ryoko2.xpm +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pixmaps/ryoko3.xpm +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pixmaps/ryoko4.xpm +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/scripts/eye.ms %%PORTDOCS%%%%DOCSDIR%%/HISTORY.euc %%PORTDOCS%%%%DOCSDIR%%/MFC.euc %%PORTDOCS%%%%DOCSDIR%%/README.euc %%PORTDOCS%%%%DOCSDIR%%/SCRIPT.euc %%PORTDOCS%%%%DOCSDIR%%/TODO.euc -@dirrm %%EXAMPLESDIR%%/pixmaps -@dirrm %%EXAMPLESDIR%%/scripts -@dirrm %%EXAMPLESDIR%% +%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/pixmaps +%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/scripts +%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%% %%PORTDOCS%%@dirrm %%DOCSDIR%% diff --git a/games/mindguard/files/patch-Makefile b/games/mindguard/files/patch-Makefile new file mode 100644 index 0000000..a1d794d --- /dev/null +++ b/games/mindguard/files/patch-Makefile @@ -0,0 +1,16 @@ +--- Makefile.orig Fri Feb 7 20:54:25 2003 ++++ Makefile Wed Sep 7 23:21:34 2005 +@@ -2,10 +2,11 @@ + + BINDIR = /usr/local/bin + MGDIR = /usr/local/share/MindGuard +-CC = gcc ++CC ?= gcc ++CFLAGS ?= -O -pipe + + mindguard: mindguard.c mindguard.h +- $(CC) `gtk-config --cflags` mindguard.c -o mindguard `gtk-config --libs` ++ $(CC) -DLOCALBASE=\"${PREFIX}\" `${GTK_CONFIG} --cflags` ${CFLAGS} mindguard.c -o mindguard `${GTK_CONFIG} --libs` + + install: mindguard install-bin install-carriers install-docs + diff --git a/games/mindguard/files/patch-aa b/games/mindguard/files/patch-aa deleted file mode 100644 index a1d794d..0000000 --- a/games/mindguard/files/patch-aa +++ /dev/null @@ -1,16 +0,0 @@ ---- Makefile.orig Fri Feb 7 20:54:25 2003 -+++ Makefile Wed Sep 7 23:21:34 2005 -@@ -2,10 +2,11 @@ - - BINDIR = /usr/local/bin - MGDIR = /usr/local/share/MindGuard --CC = gcc -+CC ?= gcc -+CFLAGS ?= -O -pipe - - mindguard: mindguard.c mindguard.h -- $(CC) `gtk-config --cflags` mindguard.c -o mindguard `gtk-config --libs` -+ $(CC) -DLOCALBASE=\"${PREFIX}\" `${GTK_CONFIG} --cflags` ${CFLAGS} mindguard.c -o mindguard `${GTK_CONFIG} --libs` - - install: mindguard install-bin install-carriers install-docs - diff --git a/games/mindguard/files/patch-ab b/games/mindguard/files/patch-ab deleted file mode 100644 index 94079c9..0000000 --- a/games/mindguard/files/patch-ab +++ /dev/null @@ -1,18 +0,0 @@ ---- mindguard.c.orig Fri Feb 7 20:53:53 2003 -+++ mindguard.c Wed Sep 7 23:27:25 2005 -@@ -1381,7 +1381,7 @@ - sprintf(car_path, "%s/MindGuard/carriers/", getenv("HOME")); - break; - case 2: -- strcpy(car_path, "/usr/local/share/MindGuard/carriers/"); -+ strcpy(car_path, LOCALBASE "/share/mindguard/"); - break; - default: - break; -@@ -2799,4 +2799,4 @@ - } - - --/* ...And your mind lived happily ever after. The End */ -\ No newline at end of file -+/* ...And your mind lived happily ever after. The End */ diff --git a/games/mindguard/files/patch-mindguard.c b/games/mindguard/files/patch-mindguard.c new file mode 100644 index 0000000..94079c9 --- /dev/null +++ b/games/mindguard/files/patch-mindguard.c @@ -0,0 +1,18 @@ +--- mindguard.c.orig Fri Feb 7 20:53:53 2003 ++++ mindguard.c Wed Sep 7 23:27:25 2005 +@@ -1381,7 +1381,7 @@ + sprintf(car_path, "%s/MindGuard/carriers/", getenv("HOME")); + break; + case 2: +- strcpy(car_path, "/usr/local/share/MindGuard/carriers/"); ++ strcpy(car_path, LOCALBASE "/share/mindguard/"); + break; + default: + break; +@@ -2799,4 +2799,4 @@ + } + + +-/* ...And your mind lived happily ever after. The End */ +\ No newline at end of file ++/* ...And your mind lived happily ever after. The End */ diff --git a/games/miscom/files/patch-ab b/games/miscom/files/patch-ab deleted file mode 100644 index fa8ebf2..0000000 --- a/games/miscom/files/patch-ab +++ /dev/null @@ -1,14 +0,0 @@ ---- draw.c Sat Mar 15 08:10:31 1997 -+++ /home/andy/tmp/wrk/draw.c Wed Apr 28 16:35:40 1999 -@@ -4,7 +4,11 @@ - #include - #include - #include -+#ifdef __FreeBSD__ -+#include -+#else - #include -+#endif - - #include "global.h" - #include "unix.h" diff --git a/games/miscom/files/patch-ac b/games/miscom/files/patch-ac deleted file mode 100644 index 0c82037..0000000 --- a/games/miscom/files/patch-ac +++ /dev/null @@ -1,14 +0,0 @@ ---- fire.c Sat Mar 15 23:42:10 1997 -+++ /home/andy/tmp/wrk/fire.c Wed Apr 28 16:36:14 1999 -@@ -4,7 +4,11 @@ - #include - #include - #include -+#ifdef __FreeBSD__ -+#include -+#else - #include -+#endif - - #include "global.h" - #include "settings.h" diff --git a/games/miscom/files/patch-ad b/games/miscom/files/patch-ad deleted file mode 100644 index 327eba3..0000000 --- a/games/miscom/files/patch-ad +++ /dev/null @@ -1,13 +0,0 @@ ---- level.c Thu Jan 22 19:30:13 1998 -+++ /home/andy/tmp/wrk/level.c Wed Apr 28 16:37:41 1999 -@@ -1,6 +1,10 @@ - #include - #include -+#ifdef __FreeBSD__ -+#include -+#else - #include -+#endif - #include "global.h" - #include "settings.h" - #include "draw.h" diff --git a/games/miscom/files/patch-ae b/games/miscom/files/patch-ae deleted file mode 100644 index a2f133e..0000000 --- a/games/miscom/files/patch-ae +++ /dev/null @@ -1,14 +0,0 @@ ---- main.c Thu Jan 22 19:30:32 1998 -+++ /home/andy/tmp/wrk/main.c Wed Apr 28 16:34:52 1999 -@@ -24,7 +24,11 @@ - #include - #include - #include -+#ifdef __FreeBSD__ -+#include -+#else - #include -+#endif - #include "global.h" - #include "settings.h" - #include "draw.h" diff --git a/games/miscom/files/patch-ag b/games/miscom/files/patch-ag deleted file mode 100644 index 252404c..0000000 --- a/games/miscom/files/patch-ag +++ /dev/null @@ -1,12 +0,0 @@ ---- unix.c Sat Mar 15 20:00:27 1997 -+++ /home/andy/tmp/wrk/unix.c Wed Apr 28 16:36:56 1999 -@@ -1,5 +1,9 @@ - #include -+#ifdef __FreeBSD__ -+#include -+#else - #include -+#endif - #include - #include - #include diff --git a/games/miscom/files/patch-draw.c b/games/miscom/files/patch-draw.c new file mode 100644 index 0000000..fa8ebf2 --- /dev/null +++ b/games/miscom/files/patch-draw.c @@ -0,0 +1,14 @@ +--- draw.c Sat Mar 15 08:10:31 1997 ++++ /home/andy/tmp/wrk/draw.c Wed Apr 28 16:35:40 1999 +@@ -4,7 +4,11 @@ + #include + #include + #include ++#ifdef __FreeBSD__ ++#include ++#else + #include ++#endif + + #include "global.h" + #include "unix.h" diff --git a/games/miscom/files/patch-fire.c b/games/miscom/files/patch-fire.c new file mode 100644 index 0000000..0c82037 --- /dev/null +++ b/games/miscom/files/patch-fire.c @@ -0,0 +1,14 @@ +--- fire.c Sat Mar 15 23:42:10 1997 ++++ /home/andy/tmp/wrk/fire.c Wed Apr 28 16:36:14 1999 +@@ -4,7 +4,11 @@ + #include + #include + #include ++#ifdef __FreeBSD__ ++#include ++#else + #include ++#endif + + #include "global.h" + #include "settings.h" diff --git a/games/miscom/files/patch-level.c b/games/miscom/files/patch-level.c new file mode 100644 index 0000000..327eba3 --- /dev/null +++ b/games/miscom/files/patch-level.c @@ -0,0 +1,13 @@ +--- level.c Thu Jan 22 19:30:13 1998 ++++ /home/andy/tmp/wrk/level.c Wed Apr 28 16:37:41 1999 +@@ -1,6 +1,10 @@ + #include + #include ++#ifdef __FreeBSD__ ++#include ++#else + #include ++#endif + #include "global.h" + #include "settings.h" + #include "draw.h" diff --git a/games/miscom/files/patch-main.c b/games/miscom/files/patch-main.c new file mode 100644 index 0000000..a2f133e --- /dev/null +++ b/games/miscom/files/patch-main.c @@ -0,0 +1,14 @@ +--- main.c Thu Jan 22 19:30:32 1998 ++++ /home/andy/tmp/wrk/main.c Wed Apr 28 16:34:52 1999 +@@ -24,7 +24,11 @@ + #include + #include + #include ++#ifdef __FreeBSD__ ++#include ++#else + #include ++#endif + #include "global.h" + #include "settings.h" + #include "draw.h" diff --git a/games/miscom/files/patch-unix.c b/games/miscom/files/patch-unix.c new file mode 100644 index 0000000..252404c --- /dev/null +++ b/games/miscom/files/patch-unix.c @@ -0,0 +1,12 @@ +--- unix.c Sat Mar 15 20:00:27 1997 ++++ /home/andy/tmp/wrk/unix.c Wed Apr 28 16:36:56 1999 +@@ -1,5 +1,9 @@ + #include ++#ifdef __FreeBSD__ ++#include ++#else + #include ++#endif + #include + #include + #include diff --git a/games/nadar/files/patch-Makefile.mk b/games/nadar/files/patch-Makefile.mk new file mode 100644 index 0000000..da5f933 --- /dev/null +++ b/games/nadar/files/patch-Makefile.mk @@ -0,0 +1,24 @@ +--- Makefile.mk~ Mon Jan 27 17:00:47 2003 ++++ Makefile.mk Mon Jan 27 17:01:02 2003 +@@ -8,17 +8,17 @@ + # operate it, and destroy other tanks to survive! + ############################################################################### + +-PREFIX = /usr/X11R6 +-X11BASE = /usr/X11R6 ++#PREFIX = /usr/X11R6 ++#X11BASE = /usr/X11R6 + BINDIR = ${PREFIX}/bin + MANDIR = ${PREFIX}/man/man1 + PKGNAME = nadar-2.0 + VERSION = NADAR-2.0 + +-CC = cc ++#CC = cc + RM = rm -f + +-CFLAGS = -O2 -Wall ++#CFLAGS = -O2 -Wall + #CFLAGS = -g -Wall + CFLAGS += -DVERSION=\"$(VERSION)\" + diff --git a/games/nadar/files/patch-aa b/games/nadar/files/patch-aa deleted file mode 100644 index da5f933..0000000 --- a/games/nadar/files/patch-aa +++ /dev/null @@ -1,24 +0,0 @@ ---- Makefile.mk~ Mon Jan 27 17:00:47 2003 -+++ Makefile.mk Mon Jan 27 17:01:02 2003 -@@ -8,17 +8,17 @@ - # operate it, and destroy other tanks to survive! - ############################################################################### - --PREFIX = /usr/X11R6 --X11BASE = /usr/X11R6 -+#PREFIX = /usr/X11R6 -+#X11BASE = /usr/X11R6 - BINDIR = ${PREFIX}/bin - MANDIR = ${PREFIX}/man/man1 - PKGNAME = nadar-2.0 - VERSION = NADAR-2.0 - --CC = cc -+#CC = cc - RM = rm -f - --CFLAGS = -O2 -Wall -+#CFLAGS = -O2 -Wall - #CFLAGS = -g -Wall - CFLAGS += -DVERSION=\"$(VERSION)\" - diff --git a/games/netris/files/patch-Configure b/games/netris/files/patch-Configure new file mode 100644 index 0000000..7b61622 --- /dev/null +++ b/games/netris/files/patch-Configure @@ -0,0 +1,29 @@ +--- Configure.orig 2008-03-11 16:27:51.000000000 +0000 ++++ Configure 2008-03-11 16:31:27.000000000 +0000 +@@ -85,7 +85,7 @@ + echo "Checking for libraries" + echo 'main(){}' > test.c + LFLAGS="" +-for lib in -lcurses -lncurses; do ++for lib in -lncurses -lcurses; do + if $CC $CFLAGS $LEXTRA test.c $lib > /dev/null 2>&1; then + LFLAGS="$lib" + fi +@@ -204,7 +204,7 @@ + sed -e "s/-LFLAGS-/$_LFLAGS/g" -e "s/-SRCS-/$SRCS/g" \ + -e "s/-OBJS-/$OBJS/g" -e "s/-DISTFILES-/$DISTFILES/g" \ + -e "s/-COPT-/$_COPT/g" -e "s/-CEXTRA-/$_CEXTRA/g" \ +- -e "s/-LEXTRA-/$_LEXTRA/g" -e "s/-CC-/$CC/g" \ ++ -e "s/-LEXTRA-/$_LEXTRA/g" -e "s%-CC-%$CC%g" \ + << "END" > Makefile + # + # Automatically generated by ./Configure -- DO NOT EDIT! +@@ -285,7 +285,7 @@ + + install: + $(INSTALL) -o bin -g bin -s -m 755 $(PROG) $(DESTDIR) +- $(INSTALL) -o bin -g bin -s -m 755 sr $(DESTDIR) ++ $(INSTALL) -o bin -g bin -s -m 755 sr $(DESTDIR)/sample-robot + + ##### DO NOT EDIT OR DELETE THIS LINE, it's needed by make depend ##### + END diff --git a/games/netris/files/patch-aa b/games/netris/files/patch-aa deleted file mode 100644 index 7b61622..0000000 --- a/games/netris/files/patch-aa +++ /dev/null @@ -1,29 +0,0 @@ ---- Configure.orig 2008-03-11 16:27:51.000000000 +0000 -+++ Configure 2008-03-11 16:31:27.000000000 +0000 -@@ -85,7 +85,7 @@ - echo "Checking for libraries" - echo 'main(){}' > test.c - LFLAGS="" --for lib in -lcurses -lncurses; do -+for lib in -lncurses -lcurses; do - if $CC $CFLAGS $LEXTRA test.c $lib > /dev/null 2>&1; then - LFLAGS="$lib" - fi -@@ -204,7 +204,7 @@ - sed -e "s/-LFLAGS-/$_LFLAGS/g" -e "s/-SRCS-/$SRCS/g" \ - -e "s/-OBJS-/$OBJS/g" -e "s/-DISTFILES-/$DISTFILES/g" \ - -e "s/-COPT-/$_COPT/g" -e "s/-CEXTRA-/$_CEXTRA/g" \ -- -e "s/-LEXTRA-/$_LEXTRA/g" -e "s/-CC-/$CC/g" \ -+ -e "s/-LEXTRA-/$_LEXTRA/g" -e "s%-CC-%$CC%g" \ - << "END" > Makefile - # - # Automatically generated by ./Configure -- DO NOT EDIT! -@@ -285,7 +285,7 @@ - - install: - $(INSTALL) -o bin -g bin -s -m 755 $(PROG) $(DESTDIR) -- $(INSTALL) -o bin -g bin -s -m 755 sr $(DESTDIR) -+ $(INSTALL) -o bin -g bin -s -m 755 sr $(DESTDIR)/sample-robot - - ##### DO NOT EDIT OR DELETE THIS LINE, it's needed by make depend ##### - END diff --git a/games/newvox/files/patch-aa b/games/newvox/files/patch-aa deleted file mode 100644 index f68f771..0000000 --- a/games/newvox/files/patch-aa +++ /dev/null @@ -1,20 +0,0 @@ ---- configure.orig Thu Aug 23 05:17:29 2001 -+++ configure Thu Aug 23 05:19:36 2001 -@@ -1112,7 +1112,7 @@ - #include - #include - #include --#include -+#include - - char* - my_strdup (char *str) -@@ -1205,7 +1205,7 @@ - #include "confdefs.h" - - #include --#include -+#include - - int main() { - return 0; diff --git a/games/newvox/files/patch-configure b/games/newvox/files/patch-configure new file mode 100644 index 0000000..f68f771 --- /dev/null +++ b/games/newvox/files/patch-configure @@ -0,0 +1,20 @@ +--- configure.orig Thu Aug 23 05:17:29 2001 ++++ configure Thu Aug 23 05:19:36 2001 +@@ -1112,7 +1112,7 @@ + #include + #include + #include +-#include ++#include + + char* + my_strdup (char *str) +@@ -1205,7 +1205,7 @@ + #include "confdefs.h" + + #include +-#include ++#include + + int main() { + return 0; diff --git a/games/nonsense/Makefile b/games/nonsense/Makefile index 9fcf1c8..6591aef 100644 --- a/games/nonsense/Makefile +++ b/games/nonsense/Makefile @@ -13,8 +13,6 @@ COMMENT= Nonsense text generator NO_BUILD= yes NO_ARCH= yes -.include - post-configure: ${REINPLACE_CMD} -e "s,/usr/local,${PREFIX}," ${WRKSRC}/nonsense ${SED} -e "s^%%PREFIX%%^${PREFIX}^g" \ diff --git a/games/nonsense/files/patch-aa b/games/nonsense/files/patch-aa deleted file mode 100644 index b676817..0000000 --- a/games/nonsense/files/patch-aa +++ /dev/null @@ -1,59 +0,0 @@ ---- nonsense 2000/12/22 17:29:22 1.1.1.4 -+++ nonsense 2000/12/22 17:31:00 1.7 -@@ -40,6 +40,10 @@ - use POSIX qw( strftime ); # Just in case somebody needs the date - use CGI; - -+my $PREFIX = "/usr/local"; -+my $datadir = "$PREFIX/share/nonsense/data"; -+my $templatedir = "$PREFIX/share/nonsense/template"; -+ - my %pool; # Where the datafiles are slurped into - my %static; # Hash of persistent data (to maintain state) - -@@ -332,7 +336,8 @@ - sub LoadDataFile { - my $file = shift; - $file = SafeFile( $file ) if $cgi_mode; -- open IN, $file or die "Error opening $file... $!\n"; -+ open IN, $file or open IN, "$datadir/$file" -+ or die "Error opening $file... $!\n"; - local $/ = ''; - - SECTION: while( ) { -@@ -348,7 +353,8 @@ - my $file = shift; - my $m = ''; - $file = SafeFile( $file ) if $cgi_mode; -- open IN, $file or die "Error opening $file template... $!\n"; -+ open IN, $file or open IN, "$templatedir/$file" -+ or die "Error opening $file template... $!\n"; - local $/; undef $/; my $t = ; - close IN; - if( $t =~ /__BEGIN__/ ) { # Check for a header -@@ -365,10 +371,24 @@ - return $file; - } - -+sub ListUniq { -+ my ($v, $last) = (undef, undef); -+ my @l = (); -+ -+ foreach $v (@_) { -+ push (@l, $v) if (defined($last) && ($v ne $last)); -+ $last = $v; -+ } -+ return @l; -+} -+ - ### Return all of the datafiles in the current directory - sub GlobCurrentDirectory { - opendir(DIR, "."); - my @datafiles = grep { /\.data$/ } readdir(DIR); -+ closedir(DIR); -+ opendir(DIR, "$datadir"); -+ push(@datafiles, grep { /\.data$/ } readdir(DIR)); - closedir(DIR); -- return @datafiles; -+ return ListUniq(sort @datafiles); - } diff --git a/games/nonsense/files/patch-nonsense b/games/nonsense/files/patch-nonsense new file mode 100644 index 0000000..b676817 --- /dev/null +++ b/games/nonsense/files/patch-nonsense @@ -0,0 +1,59 @@ +--- nonsense 2000/12/22 17:29:22 1.1.1.4 ++++ nonsense 2000/12/22 17:31:00 1.7 +@@ -40,6 +40,10 @@ + use POSIX qw( strftime ); # Just in case somebody needs the date + use CGI; + ++my $PREFIX = "/usr/local"; ++my $datadir = "$PREFIX/share/nonsense/data"; ++my $templatedir = "$PREFIX/share/nonsense/template"; ++ + my %pool; # Where the datafiles are slurped into + my %static; # Hash of persistent data (to maintain state) + +@@ -332,7 +336,8 @@ + sub LoadDataFile { + my $file = shift; + $file = SafeFile( $file ) if $cgi_mode; +- open IN, $file or die "Error opening $file... $!\n"; ++ open IN, $file or open IN, "$datadir/$file" ++ or die "Error opening $file... $!\n"; + local $/ = ''; + + SECTION: while( ) { +@@ -348,7 +353,8 @@ + my $file = shift; + my $m = ''; + $file = SafeFile( $file ) if $cgi_mode; +- open IN, $file or die "Error opening $file template... $!\n"; ++ open IN, $file or open IN, "$templatedir/$file" ++ or die "Error opening $file template... $!\n"; + local $/; undef $/; my $t = ; + close IN; + if( $t =~ /__BEGIN__/ ) { # Check for a header +@@ -365,10 +371,24 @@ + return $file; + } + ++sub ListUniq { ++ my ($v, $last) = (undef, undef); ++ my @l = (); ++ ++ foreach $v (@_) { ++ push (@l, $v) if (defined($last) && ($v ne $last)); ++ $last = $v; ++ } ++ return @l; ++} ++ + ### Return all of the datafiles in the current directory + sub GlobCurrentDirectory { + opendir(DIR, "."); + my @datafiles = grep { /\.data$/ } readdir(DIR); ++ closedir(DIR); ++ opendir(DIR, "$datadir"); ++ push(@datafiles, grep { /\.data$/ } readdir(DIR)); + closedir(DIR); +- return @datafiles; ++ return ListUniq(sort @datafiles); + } diff --git a/games/omega/files/patch-Makefile b/games/omega/files/patch-Makefile new file mode 100644 index 0000000..b95523a --- /dev/null +++ b/games/omega/files/patch-Makefile @@ -0,0 +1,61 @@ +--- Makefile.orig Fri Jan 1 20:00:06 1999 ++++ Makefile Mon Jul 5 19:51:50 1999 +@@ -1,14 +1,14 @@ + # These two definitions are used if you 'make install' + # the value of LIBDIR should be the same as OMEGALIB in defs.h +-BINDIR = /home/sdossey/omega/ +-LIBDIR = /home/sdossey/omega/lib/ ++BINDIR = ${PREFIX}/bin ++LIBDIR = ${PREFIX}/share/omega + + # One of these should be uncommented, as appropriate, unless your compiler + # does it for you. You can test this by simply trying to 'make' omega - + # it will fail if none of them are defined. If you do uncomment + # one, make sure you comment out the other definition of CFLAGS lower down + +-CFLAGS = -DBSD -ggdb ++CFLAGS+= -DBSD -DOMEGALIB=\"${LIBDIR}/\" + #CFLAGS = -DSYSV -O + # I also had to define -cckr (K&R style C) for system V + #CFLAGS = -DMSDOS -O +@@ -17,14 +17,14 @@ + # CPP should contain the command to run the C preprocessor. + #CPP = cc -E + #CPP = /lib/cpp +-CPP = gcc -E ++CPP = ${CC} -E + + # If you have gcc and don't intend to hack around with the game, + # I recommend setting CC to gcc and using -O (as the CFLAGS). + + #CFLAGS = -O + #LDFLAGS = -s +-CC = gcc ++#CC = gcc + + # comment out one of the following two, after establishing whether your + # machine uses termcap (most BSD machines) or terminfo (System-V) +@@ -48,7 +48,10 @@ + omega: $(OBJ) + $(CC) $(LDFLAGS) $(OBJ) $(LIBS) -o omega + +-install: omega $(BINDIR) $(LIBDIR) ++install: omega ++ mkdir -p $(BINDIR) ++ mkdir -p $(LIBDIR) ++ chown games:games omega + cp omega $(BINDIR) + chmod 4711 $(BINDIR)/omega + - cp lib/* $(LIBDIR) +@@ -71,9 +74,9 @@ + + $(OBJ): clrgen.h defs.h extern.h glob.h + +-clrgen.h clrgen.c: genclr.c minit.h defs.h +- $(MAKE) genclr ++clrgen.c: genclr + $(CPP) -DOMEGA_CLRGEN *.[ch] | ./genclr clrgen.c clrgen.h ++clrgen.h: | clrgen.c + + genclr: genclr.o + $(CC) $(LDFLAGS) genclr.o -o genclr diff --git a/games/omega/files/patch-aa b/games/omega/files/patch-aa deleted file mode 100644 index b95523a..0000000 --- a/games/omega/files/patch-aa +++ /dev/null @@ -1,61 +0,0 @@ ---- Makefile.orig Fri Jan 1 20:00:06 1999 -+++ Makefile Mon Jul 5 19:51:50 1999 -@@ -1,14 +1,14 @@ - # These two definitions are used if you 'make install' - # the value of LIBDIR should be the same as OMEGALIB in defs.h --BINDIR = /home/sdossey/omega/ --LIBDIR = /home/sdossey/omega/lib/ -+BINDIR = ${PREFIX}/bin -+LIBDIR = ${PREFIX}/share/omega - - # One of these should be uncommented, as appropriate, unless your compiler - # does it for you. You can test this by simply trying to 'make' omega - - # it will fail if none of them are defined. If you do uncomment - # one, make sure you comment out the other definition of CFLAGS lower down - --CFLAGS = -DBSD -ggdb -+CFLAGS+= -DBSD -DOMEGALIB=\"${LIBDIR}/\" - #CFLAGS = -DSYSV -O - # I also had to define -cckr (K&R style C) for system V - #CFLAGS = -DMSDOS -O -@@ -17,14 +17,14 @@ - # CPP should contain the command to run the C preprocessor. - #CPP = cc -E - #CPP = /lib/cpp --CPP = gcc -E -+CPP = ${CC} -E - - # If you have gcc and don't intend to hack around with the game, - # I recommend setting CC to gcc and using -O (as the CFLAGS). - - #CFLAGS = -O - #LDFLAGS = -s --CC = gcc -+#CC = gcc - - # comment out one of the following two, after establishing whether your - # machine uses termcap (most BSD machines) or terminfo (System-V) -@@ -48,7 +48,10 @@ - omega: $(OBJ) - $(CC) $(LDFLAGS) $(OBJ) $(LIBS) -o omega - --install: omega $(BINDIR) $(LIBDIR) -+install: omega -+ mkdir -p $(BINDIR) -+ mkdir -p $(LIBDIR) -+ chown games:games omega - cp omega $(BINDIR) - chmod 4711 $(BINDIR)/omega - - cp lib/* $(LIBDIR) -@@ -71,9 +74,9 @@ - - $(OBJ): clrgen.h defs.h extern.h glob.h - --clrgen.h clrgen.c: genclr.c minit.h defs.h -- $(MAKE) genclr -+clrgen.c: genclr - $(CPP) -DOMEGA_CLRGEN *.[ch] | ./genclr clrgen.c clrgen.h -+clrgen.h: | clrgen.c - - genclr: genclr.o - $(CC) $(LDFLAGS) genclr.o -o genclr diff --git a/games/omega/files/patch-ab b/games/omega/files/patch-ab deleted file mode 100644 index 70b35e8..0000000 --- a/games/omega/files/patch-ab +++ /dev/null @@ -1,24 +0,0 @@ ---- defs.h Fri Jan 1 03:08:19 1999 -+++ /home/andy/tmp/wrk/defs.h Fri May 14 20:51:11 1999 -@@ -45,7 +45,9 @@ - This might usually be "/usr/games/lib/omegalib/", for unix, - or something like "c:\\games\\omega\\omegalib\\" for msdos */ - -+#ifndef OMEGALIB - #define OMEGALIB "./lib/" -+#endif - - /* Comment the following line out if you want users to be able to override */ - /* the OMEGALIB define, above, by setting the environment variable OMEGALIB */ -@@ -570,7 +572,11 @@ - /* WDT: thank goodness for that lack of implementation. */ - - #else -+#ifdef __FreeBSD__ -+#include -+#else - #include -+#endif - - #define COL_FG_BLINK A_BLINK - diff --git a/games/omega/files/patch-ac b/games/omega/files/patch-ac deleted file mode 100644 index 8a4c6ee..0000000 --- a/games/omega/files/patch-ac +++ /dev/null @@ -1,15 +0,0 @@ ---- file.c Fri Jan 1 03:08:26 1999 -+++ /home/andy/tmp/wrk/file.c Fri May 14 20:28:46 1999 -@@ -9,7 +9,11 @@ - # ifdef AMIGA - # include - # else --# include -+# ifdef __FreeBSD__ -+# include -+# else -+# include -+# endif - # endif - # include - # include diff --git a/games/omega/files/patch-ad b/games/omega/files/patch-ad deleted file mode 100644 index 9f72800..0000000 --- a/games/omega/files/patch-ad +++ /dev/null @@ -1,12 +0,0 @@ ---- fixstr.c Sat Aug 8 13:48:23 1998 -+++ /home/andy/tmp/wrk/fixstr.c Fri May 14 20:37:59 1999 -@@ -15,7 +15,9 @@ - Thus it can be broken. */ - - #include -+#ifndef __FreeBSD__ - #include -+#endif - - #define TMPFILE "fixtmp.c" - diff --git a/games/omega/files/patch-ae b/games/omega/files/patch-ae deleted file mode 100644 index 362d2f1..0000000 --- a/games/omega/files/patch-ae +++ /dev/null @@ -1,26 +0,0 @@ ---- genclr.c.orig Sat Aug 8 21:53:59 1998 -+++ genclr.c Thu Oct 16 20:38:27 2003 -@@ -281,16 +281,20 @@ - */ - fp = emitopen (cfile, argv); - fprintf (fp, "\ -+#ifdef __FreeBSD__\n\ -+#include \n\ -+#else\n\ - #include \n\ -+#endif\n\ - #include \n\ - #include \n\ -- -+\n\ - #include \"%s\"\n\ -- -+\n\ - void clrgen_init (void)\n\ - ""{\n\ - if (%d > COLOR_PAIRS - 1) {\n\ -- endwin(); -+ endwin();\n\ - fputs (\"Too many color pairs!\\n\", stderr);\n\ - exit (1);\n\ - }\n\ diff --git a/games/omega/files/patch-af b/games/omega/files/patch-af deleted file mode 100644 index 932cae6..0000000 --- a/games/omega/files/patch-af +++ /dev/null @@ -1,15 +0,0 @@ ---- inv.c Fri Jan 1 03:08:33 1999 -+++ /home/andy/tmp/wrk/inv.c Fri May 14 20:28:52 1999 -@@ -8,7 +8,11 @@ - # ifdef AMIGA - # include - # else --# include -+# ifdef __FreeBSD__ -+# include -+# else -+# include -+# endif - # endif - #endif - diff --git a/games/omega/files/patch-ag b/games/omega/files/patch-ag deleted file mode 100644 index 7602685..0000000 --- a/games/omega/files/patch-ag +++ /dev/null @@ -1,15 +0,0 @@ ---- scr.c Sat Jan 2 07:00:11 1999 -+++ /home/andy/tmp/wrk/scr.c Fri May 14 20:28:59 1999 -@@ -10,7 +10,11 @@ - # ifdef AMIGA - # include - # else --# include -+# ifdef __FreeBSD__ -+# include -+# else -+# include -+# endif - # endif - # include - #endif diff --git a/games/omega/files/patch-defs.h b/games/omega/files/patch-defs.h new file mode 100644 index 0000000..70b35e8 --- /dev/null +++ b/games/omega/files/patch-defs.h @@ -0,0 +1,24 @@ +--- defs.h Fri Jan 1 03:08:19 1999 ++++ /home/andy/tmp/wrk/defs.h Fri May 14 20:51:11 1999 +@@ -45,7 +45,9 @@ + This might usually be "/usr/games/lib/omegalib/", for unix, + or something like "c:\\games\\omega\\omegalib\\" for msdos */ + ++#ifndef OMEGALIB + #define OMEGALIB "./lib/" ++#endif + + /* Comment the following line out if you want users to be able to override */ + /* the OMEGALIB define, above, by setting the environment variable OMEGALIB */ +@@ -570,7 +572,11 @@ + /* WDT: thank goodness for that lack of implementation. */ + + #else ++#ifdef __FreeBSD__ ++#include ++#else + #include ++#endif + + #define COL_FG_BLINK A_BLINK + diff --git a/games/omega/files/patch-file.c b/games/omega/files/patch-file.c new file mode 100644 index 0000000..8a4c6ee --- /dev/null +++ b/games/omega/files/patch-file.c @@ -0,0 +1,15 @@ +--- file.c Fri Jan 1 03:08:26 1999 ++++ /home/andy/tmp/wrk/file.c Fri May 14 20:28:46 1999 +@@ -9,7 +9,11 @@ + # ifdef AMIGA + # include + # else +-# include ++# ifdef __FreeBSD__ ++# include ++# else ++# include ++# endif + # endif + # include + # include diff --git a/games/omega/files/patch-fixstr.c b/games/omega/files/patch-fixstr.c new file mode 100644 index 0000000..9f72800 --- /dev/null +++ b/games/omega/files/patch-fixstr.c @@ -0,0 +1,12 @@ +--- fixstr.c Sat Aug 8 13:48:23 1998 ++++ /home/andy/tmp/wrk/fixstr.c Fri May 14 20:37:59 1999 +@@ -15,7 +15,9 @@ + Thus it can be broken. */ + + #include ++#ifndef __FreeBSD__ + #include ++#endif + + #define TMPFILE "fixtmp.c" + diff --git a/games/omega/files/patch-genclr.c b/games/omega/files/patch-genclr.c new file mode 100644 index 0000000..362d2f1 --- /dev/null +++ b/games/omega/files/patch-genclr.c @@ -0,0 +1,26 @@ +--- genclr.c.orig Sat Aug 8 21:53:59 1998 ++++ genclr.c Thu Oct 16 20:38:27 2003 +@@ -281,16 +281,20 @@ + */ + fp = emitopen (cfile, argv); + fprintf (fp, "\ ++#ifdef __FreeBSD__\n\ ++#include \n\ ++#else\n\ + #include \n\ ++#endif\n\ + #include \n\ + #include \n\ +- ++\n\ + #include \"%s\"\n\ +- ++\n\ + void clrgen_init (void)\n\ + ""{\n\ + if (%d > COLOR_PAIRS - 1) {\n\ +- endwin(); ++ endwin();\n\ + fputs (\"Too many color pairs!\\n\", stderr);\n\ + exit (1);\n\ + }\n\ diff --git a/games/omega/files/patch-inv.c b/games/omega/files/patch-inv.c new file mode 100644 index 0000000..932cae6 --- /dev/null +++ b/games/omega/files/patch-inv.c @@ -0,0 +1,15 @@ +--- inv.c Fri Jan 1 03:08:33 1999 ++++ /home/andy/tmp/wrk/inv.c Fri May 14 20:28:52 1999 +@@ -8,7 +8,11 @@ + # ifdef AMIGA + # include + # else +-# include ++# ifdef __FreeBSD__ ++# include ++# else ++# include ++# endif + # endif + #endif + diff --git a/games/omega/files/patch-scr.c b/games/omega/files/patch-scr.c new file mode 100644 index 0000000..7602685 --- /dev/null +++ b/games/omega/files/patch-scr.c @@ -0,0 +1,15 @@ +--- scr.c Sat Jan 2 07:00:11 1999 ++++ /home/andy/tmp/wrk/scr.c Fri May 14 20:28:59 1999 +@@ -10,7 +10,11 @@ + # ifdef AMIGA + # include + # else +-# include ++# ifdef __FreeBSD__ ++# include ++# else ++# include ++# endif + # endif + # include + #endif diff --git a/games/oonsoo/files/patch-Makefile.common b/games/oonsoo/files/patch-Makefile.common new file mode 100644 index 0000000..4d61eb2 --- /dev/null +++ b/games/oonsoo/files/patch-Makefile.common @@ -0,0 +1,20 @@ +--- Makefile.common.orig Tue Jan 11 08:36:39 2000 ++++ Makefile.common Thu Feb 24 04:14:30 2000 +@@ -33,7 +33,7 @@ + echo ""; \ + echo "------ Building: $$dir"; \ + cd $$dir; \ +- make $(MAKEPARMS) MAKEPARMS="$(MAKEPARMS)" all; \ ++ $(MAKE) $(MAKEPARMS) MAKEPARMS="$(MAKEPARMS)" all; \ + if [ $$? -eq 0 ] ; \ + then \ + cd ..; \ +@@ -48,7 +48,7 @@ + echo ""; \ + echo "------ Cleaning: $$dir"; \ + cd $$dir; \ +- make $(MAKEPARMS) MAKEPARMS="$(MAKEPARMS)" clean; \ ++ $(MAKE) $(MAKEPARMS) MAKEPARMS="$(MAKEPARMS)" clean; \ + if [ $$? -eq 0 ] ; \ + then \ + cd ..; \ diff --git a/games/oonsoo/files/patch-UI_BasicWidget.hxx b/games/oonsoo/files/patch-UI_BasicWidget.hxx new file mode 100644 index 0000000..44f0ad5 --- /dev/null +++ b/games/oonsoo/files/patch-UI_BasicWidget.hxx @@ -0,0 +1,15 @@ +--- UI/BasicWidget.hxx.orig Sat Dec 21 01:48:54 2002 ++++ UI/BasicWidget.hxx Sat Dec 21 01:48:57 2002 +@@ -54,10 +54,10 @@ + int x, int y, int width, int height); + + // UIApplication needs access to the handleEvent and findWidget methods +- friend UIApplication; ++ friend class UIApplication; + + // ContainerWidget needs access to the findWidget method +- friend ContainerWidget; ++ friend class ContainerWidget; + + // Called whenever an event arrives for me + virtual void handleEvent(XEvent* event); diff --git a/games/oonsoo/files/patch-ab b/games/oonsoo/files/patch-ab deleted file mode 100644 index 4d61eb2..0000000 --- a/games/oonsoo/files/patch-ab +++ /dev/null @@ -1,20 +0,0 @@ ---- Makefile.common.orig Tue Jan 11 08:36:39 2000 -+++ Makefile.common Thu Feb 24 04:14:30 2000 -@@ -33,7 +33,7 @@ - echo ""; \ - echo "------ Building: $$dir"; \ - cd $$dir; \ -- make $(MAKEPARMS) MAKEPARMS="$(MAKEPARMS)" all; \ -+ $(MAKE) $(MAKEPARMS) MAKEPARMS="$(MAKEPARMS)" all; \ - if [ $$? -eq 0 ] ; \ - then \ - cd ..; \ -@@ -48,7 +48,7 @@ - echo ""; \ - echo "------ Cleaning: $$dir"; \ - cd $$dir; \ -- make $(MAKEPARMS) MAKEPARMS="$(MAKEPARMS)" clean; \ -+ $(MAKE) $(MAKEPARMS) MAKEPARMS="$(MAKEPARMS)" clean; \ - if [ $$? -eq 0 ] ; \ - then \ - cd ..; \ diff --git a/games/oonsoo/files/patch-ac b/games/oonsoo/files/patch-ac deleted file mode 100644 index 44f0ad5..0000000 --- a/games/oonsoo/files/patch-ac +++ /dev/null @@ -1,15 +0,0 @@ ---- UI/BasicWidget.hxx.orig Sat Dec 21 01:48:54 2002 -+++ UI/BasicWidget.hxx Sat Dec 21 01:48:57 2002 -@@ -54,10 +54,10 @@ - int x, int y, int width, int height); - - // UIApplication needs access to the handleEvent and findWidget methods -- friend UIApplication; -+ friend class UIApplication; - - // ContainerWidget needs access to the findWidget method -- friend ContainerWidget; -+ friend class ContainerWidget; - - // Called whenever an event arrives for me - virtual void handleEvent(XEvent* event); diff --git a/games/seabattle/files/patch-Makefile b/games/seabattle/files/patch-Makefile new file mode 100644 index 0000000..e7b3533 --- /dev/null +++ b/games/seabattle/files/patch-Makefile @@ -0,0 +1,28 @@ +--- Makefile.orig Wed May 14 02:53:34 1997 ++++ Makefile Fri Feb 2 04:20:41 2001 +@@ -8,7 +8,7 @@ + ############################################################## + + #Your compiler. If gcc doesn't work, try CC +-CC = gcc ++#CC = gcc + #CC = cc + + #On Suns, SGIs, and other Unix systems uncomment the following +@@ -17,12 +17,12 @@ + #C_OPTS = + #L_OPTS = -lcurses + +-#On Linux, uncomment the following ++#On FreeBSD/Linux, uncomment the following + # +-PLATFORM = Linux +-C_OPTS = -O2 -Wall ++PLATFORM = FreeBSD/Linux ++DATADIR = ${PREFIX}/share/seabattle ++C_OPTS = ${CFLAGS} -DDATADIR=\"${DATADIR}\" + L_OPTS = -lncurses +- + + #For Dos/Windows DJGPP (you need the curses lib) + #PLATFORM = DOS_DJGPP diff --git a/games/seabattle/files/patch-aa b/games/seabattle/files/patch-aa deleted file mode 100644 index e7b3533..0000000 --- a/games/seabattle/files/patch-aa +++ /dev/null @@ -1,28 +0,0 @@ ---- Makefile.orig Wed May 14 02:53:34 1997 -+++ Makefile Fri Feb 2 04:20:41 2001 -@@ -8,7 +8,7 @@ - ############################################################## - - #Your compiler. If gcc doesn't work, try CC --CC = gcc -+#CC = gcc - #CC = cc - - #On Suns, SGIs, and other Unix systems uncomment the following -@@ -17,12 +17,12 @@ - #C_OPTS = - #L_OPTS = -lcurses - --#On Linux, uncomment the following -+#On FreeBSD/Linux, uncomment the following - # --PLATFORM = Linux --C_OPTS = -O2 -Wall -+PLATFORM = FreeBSD/Linux -+DATADIR = ${PREFIX}/share/seabattle -+C_OPTS = ${CFLAGS} -DDATADIR=\"${DATADIR}\" - L_OPTS = -lncurses -- - - #For Dos/Windows DJGPP (you need the curses lib) - #PLATFORM = DOS_DJGPP diff --git a/games/seabattle/files/patch-ab b/games/seabattle/files/patch-ab deleted file mode 100644 index 57484ef..0000000 --- a/games/seabattle/files/patch-ab +++ /dev/null @@ -1,11 +0,0 @@ ---- batt.h.orig Wed May 14 04:58:17 1997 -+++ batt.h Fri Feb 2 04:18:06 2001 -@@ -2,7 +2,7 @@ - * batt.h Part of the SEABATTLE game by Vince Weaver * - ************************************************************************/ - --#include /* Slang support is good for rxvt in linux */ -+#include /* Slang support is good for rxvt in linux */ - #include - #include - #include diff --git a/games/seabattle/files/patch-ac b/games/seabattle/files/patch-ac deleted file mode 100644 index 65c6ab6..0000000 --- a/games/seabattle/files/patch-ac +++ /dev/null @@ -1,31 +0,0 @@ ---- bdb.c.orig Wed May 14 04:49:59 1997 -+++ bdb.c Fri Feb 2 04:22:00 2001 -@@ -325,8 +325,8 @@ - char names[10][100],text[100]; - int ch,scores[10],i; - /* If not there, create one */ -- if( (fff=fopen("hiscore.sea","r+"))==NULL ){ -- if ( (fff=fopen("hiscore.sea","a+"))!=NULL) { -+ if( (fff=fopen(DATADIR "/hiscore.sea","r+"))==NULL ){ -+ if ( (fff=fopen(DATADIR "/hiscore.sea","a+"))!=NULL) { - fprintf(fff,"Vince\n50\nMarie\n55\nJohn\n56\n"); - fprintf(fff,"Gus\n57\nLizann\n58\nKevin\n59\n"); - fprintf(fff,"Hal\n60\nHairold\n61\nChipper\n62\nBob\n63\n"); -@@ -335,7 +335,7 @@ - } - else fclose(fff); - -- if ( (fff=fopen("hiscore.sea","r"))!=NULL) { -+ if ( (fff=fopen(DATADIR "/hiscore.sea","r"))!=NULL) { - for(i=0;i<10;i++) - fscanf(fff,"%s%i",names[i],&scores[i]); - fclose(fff); -@@ -355,7 +355,7 @@ - set_color(C_WHITE,C_BOLD); - sprintf(text,"%s got a new High Score, #%i",name,i+1); - printxy(20,1,text); -- if ( (fff=fopen("hiscore.sea","w+"))!=NULL) { -+ if ( (fff=fopen(DATADIR "/hiscore.sea","w+"))!=NULL) { - for(i=0;i<10;i++) fprintf(fff,"%s\n%i",names[i],scores[i]); - fclose(fff); - } diff --git a/games/seabattle/files/patch-ad b/games/seabattle/files/patch-ad deleted file mode 100644 index fe9699e..0000000 --- a/games/seabattle/files/patch-ad +++ /dev/null @@ -1,23 +0,0 @@ ---- binp.c.orig Wed May 14 02:51:00 1997 -+++ binp.c Fri Feb 2 04:22:56 2001 -@@ -129,15 +129,15 @@ - /* Incomplete as of yet */ - if (which_one==1) - if (sound_device) -- if(rand()%2) system("cat hit1.au > /dev/audio "); -- else system("cat hit2.au > /dev/audio "); -+ if(rand()%2) system("cat " DATADIR "/hit1.au > /dev/audio "); -+ else system("cat " DATADIR "/hit2.au > /dev/audio "); - else beep(); - if (which_one==2) - if (sound_device) -- if(rand()%2) system("cat miss1.au > /dev/audio "); -- else system("cat miss2.au > /dev/audio "); -+ if(rand()%2) system("cat " DATADIR "/miss1.au > /dev/audio "); -+ else system("cat " DATADIR "/miss2.au > /dev/audio "); - if (which_one==3) -- if (sound_device) system("cat sunkit.au > /dev/audio "); -+ if (sound_device) system("cat " DATADIR "/sunkit.au > /dev/audio "); - else beep(); - } - diff --git a/games/seabattle/files/patch-batt.h b/games/seabattle/files/patch-batt.h new file mode 100644 index 0000000..57484ef --- /dev/null +++ b/games/seabattle/files/patch-batt.h @@ -0,0 +1,11 @@ +--- batt.h.orig Wed May 14 04:58:17 1997 ++++ batt.h Fri Feb 2 04:18:06 2001 +@@ -2,7 +2,7 @@ + * batt.h Part of the SEABATTLE game by Vince Weaver * + ************************************************************************/ + +-#include /* Slang support is good for rxvt in linux */ ++#include /* Slang support is good for rxvt in linux */ + #include + #include + #include diff --git a/games/seabattle/files/patch-bdb.c b/games/seabattle/files/patch-bdb.c new file mode 100644 index 0000000..65c6ab6 --- /dev/null +++ b/games/seabattle/files/patch-bdb.c @@ -0,0 +1,31 @@ +--- bdb.c.orig Wed May 14 04:49:59 1997 ++++ bdb.c Fri Feb 2 04:22:00 2001 +@@ -325,8 +325,8 @@ + char names[10][100],text[100]; + int ch,scores[10],i; + /* If not there, create one */ +- if( (fff=fopen("hiscore.sea","r+"))==NULL ){ +- if ( (fff=fopen("hiscore.sea","a+"))!=NULL) { ++ if( (fff=fopen(DATADIR "/hiscore.sea","r+"))==NULL ){ ++ if ( (fff=fopen(DATADIR "/hiscore.sea","a+"))!=NULL) { + fprintf(fff,"Vince\n50\nMarie\n55\nJohn\n56\n"); + fprintf(fff,"Gus\n57\nLizann\n58\nKevin\n59\n"); + fprintf(fff,"Hal\n60\nHairold\n61\nChipper\n62\nBob\n63\n"); +@@ -335,7 +335,7 @@ + } + else fclose(fff); + +- if ( (fff=fopen("hiscore.sea","r"))!=NULL) { ++ if ( (fff=fopen(DATADIR "/hiscore.sea","r"))!=NULL) { + for(i=0;i<10;i++) + fscanf(fff,"%s%i",names[i],&scores[i]); + fclose(fff); +@@ -355,7 +355,7 @@ + set_color(C_WHITE,C_BOLD); + sprintf(text,"%s got a new High Score, #%i",name,i+1); + printxy(20,1,text); +- if ( (fff=fopen("hiscore.sea","w+"))!=NULL) { ++ if ( (fff=fopen(DATADIR "/hiscore.sea","w+"))!=NULL) { + for(i=0;i<10;i++) fprintf(fff,"%s\n%i",names[i],scores[i]); + fclose(fff); + } diff --git a/games/seabattle/files/patch-binp.c b/games/seabattle/files/patch-binp.c new file mode 100644 index 0000000..fe9699e --- /dev/null +++ b/games/seabattle/files/patch-binp.c @@ -0,0 +1,23 @@ +--- binp.c.orig Wed May 14 02:51:00 1997 ++++ binp.c Fri Feb 2 04:22:56 2001 +@@ -129,15 +129,15 @@ + /* Incomplete as of yet */ + if (which_one==1) + if (sound_device) +- if(rand()%2) system("cat hit1.au > /dev/audio "); +- else system("cat hit2.au > /dev/audio "); ++ if(rand()%2) system("cat " DATADIR "/hit1.au > /dev/audio "); ++ else system("cat " DATADIR "/hit2.au > /dev/audio "); + else beep(); + if (which_one==2) + if (sound_device) +- if(rand()%2) system("cat miss1.au > /dev/audio "); +- else system("cat miss2.au > /dev/audio "); ++ if(rand()%2) system("cat " DATADIR "/miss1.au > /dev/audio "); ++ else system("cat " DATADIR "/miss2.au > /dev/audio "); + if (which_one==3) +- if (sound_device) system("cat sunkit.au > /dev/audio "); ++ if (sound_device) system("cat " DATADIR "/sunkit.au > /dev/audio "); + else beep(); + } + diff --git a/games/smiley/files/patch-Makefile b/games/smiley/files/patch-Makefile new file mode 100644 index 0000000..5c5adfc --- /dev/null +++ b/games/smiley/files/patch-Makefile @@ -0,0 +1,23 @@ +*** Makefile.orig Mon Nov 29 13:03:11 1993 +--- Makefile Sun Dec 16 10:44:42 2001 +*************** +*** 32,40 **** + ltoa.o \ + smiley.o + +! CFLAGS = -O + +! LDFLAGS = -s + + all: $(TARGET) + +--- 32,40 ---- + ltoa.o \ + smiley.o + +! CFLAGS = %CFLAGS% + +! LDFLAGS = + + all: $(TARGET) + diff --git a/games/smiley/files/patch-aa b/games/smiley/files/patch-aa deleted file mode 100644 index 5c5adfc..0000000 --- a/games/smiley/files/patch-aa +++ /dev/null @@ -1,23 +0,0 @@ -*** Makefile.orig Mon Nov 29 13:03:11 1993 ---- Makefile Sun Dec 16 10:44:42 2001 -*************** -*** 32,40 **** - ltoa.o \ - smiley.o - -! CFLAGS = -O - -! LDFLAGS = -s - - all: $(TARGET) - ---- 32,40 ---- - ltoa.o \ - smiley.o - -! CFLAGS = %CFLAGS% - -! LDFLAGS = - - all: $(TARGET) - diff --git a/games/sol/Makefile b/games/sol/Makefile index c360ffe..b37f705 100644 --- a/games/sol/Makefile +++ b/games/sol/Makefile @@ -23,7 +23,7 @@ USE_XORG= xpm x11 xaw OPTIONS_DEFINE= DOCS pre-build: - cd ${WRKSRC} && ${MAKE_CMD} readme.var + (cd ${WRKSRC} && ${MAKE_CMD} readme.var) do-install: ${INSTALL_PROGRAM} ${WRKSRC}/sol ${STAGEDIR}${PREFIX}/bin diff --git a/games/sol/files/patch-Makefile b/games/sol/files/patch-Makefile new file mode 100644 index 0000000..f94aa9f --- /dev/null +++ b/games/sol/files/patch-Makefile @@ -0,0 +1,56 @@ +--- Makefile.old Mon Aug 26 10:37:17 2002 ++++ Makefile Mon Aug 26 10:39:35 2002 +@@ -13,9 +13,8 @@ + # Where are shhmsg, shhopt, xalloc, shhcards, Xpm and X11? + + # GNU/Linux at home +-INCDIR = -I/usr/local/include -I/usr/X11R6/include \ +- -I/usr/local/include/X11 +-LIBDIR = -L/usr/local/lib -L/usr/X11R6/lib -L/usr/local/lib/X11 ++INCDIR = -I${LOCALBASE}/include ++LIBDIR = -L${LOCALBASE}/lib + EXTRA_LIBS = -lSM -lICE + + # Irix at Ifi +@@ -54,18 +53,18 @@ + endif + + # DEC Alpha at USIT +-ifeq ($(HOSTTYPE),alpha) +-INCDIR = -I$$HOME/include -I/usr/include/X11 \ +- -I/usr/local/X11R5/include +-LIBDIR = -L$$HOME/lib/$$HOSTTYPE -L/usr/lib/X11 -L/usr/local/X11R5/lib +-endif ++#ifeq ($(HOSTTYPE),alpha) ++#INCDIR = -I$$HOME/include -I/usr/include/X11 \ ++# -I/usr/local/X11R5/include ++#LIBDIR = -L$$HOME/lib/$$HOSTTYPE -L/usr/lib/X11 -L/usr/local/X11R5/lib ++#endif + + ########################################################################### + + # Where do you want to install the program and the highscore file? +-INSTLIBDIR = /var/local/lib/games +-INSTBINDIR = /usr/local/games +-INSTMANDIR = /usr/local/man/man6 ++INSTLIBDIR = ${PREFIX}/lib/games ++INSTBINDIR = ${PREFIX}/games ++INSTMANDIR = ${PREFIX}/man/man6 + #INSTLIBDIR = /hom/sverrehu/lib + #INSTBINDIR = /hom/sverrehu/bin/$$HOSTTYPE + #INSTMANDIR = /hom/sverrehu/man/man6 +@@ -85,11 +84,11 @@ + + ########################################################################### + +-CC = gcc ++#CC = gcc + + OPTIM = -s -O2 +-CCOPT = -Wall $(OPTIM) $(INCDIR) $(DEFINES) $(CFLAGS) +-LDOPT = -s $(LIBDIR) $(LDFLAGS) $(EXTRA_LD_OPT) ++CCOPT = $(INCDIR) $(DEFINES) $(CFLAGS) ++LDOPT = $(LIBDIR) $(LDFLAGS) $(EXTRA_LD_OPT) + + LIBS = -lshhopt -lshhmsg -lxalloc -lshhcards \ + -lXaw -lXt -lXpm -lXext -lXmu -lX11 $(EXTRA_LIBS) diff --git a/games/sol/files/patch-aa b/games/sol/files/patch-aa deleted file mode 100644 index f94aa9f..0000000 --- a/games/sol/files/patch-aa +++ /dev/null @@ -1,56 +0,0 @@ ---- Makefile.old Mon Aug 26 10:37:17 2002 -+++ Makefile Mon Aug 26 10:39:35 2002 -@@ -13,9 +13,8 @@ - # Where are shhmsg, shhopt, xalloc, shhcards, Xpm and X11? - - # GNU/Linux at home --INCDIR = -I/usr/local/include -I/usr/X11R6/include \ -- -I/usr/local/include/X11 --LIBDIR = -L/usr/local/lib -L/usr/X11R6/lib -L/usr/local/lib/X11 -+INCDIR = -I${LOCALBASE}/include -+LIBDIR = -L${LOCALBASE}/lib - EXTRA_LIBS = -lSM -lICE - - # Irix at Ifi -@@ -54,18 +53,18 @@ - endif - - # DEC Alpha at USIT --ifeq ($(HOSTTYPE),alpha) --INCDIR = -I$$HOME/include -I/usr/include/X11 \ -- -I/usr/local/X11R5/include --LIBDIR = -L$$HOME/lib/$$HOSTTYPE -L/usr/lib/X11 -L/usr/local/X11R5/lib --endif -+#ifeq ($(HOSTTYPE),alpha) -+#INCDIR = -I$$HOME/include -I/usr/include/X11 \ -+# -I/usr/local/X11R5/include -+#LIBDIR = -L$$HOME/lib/$$HOSTTYPE -L/usr/lib/X11 -L/usr/local/X11R5/lib -+#endif - - ########################################################################### - - # Where do you want to install the program and the highscore file? --INSTLIBDIR = /var/local/lib/games --INSTBINDIR = /usr/local/games --INSTMANDIR = /usr/local/man/man6 -+INSTLIBDIR = ${PREFIX}/lib/games -+INSTBINDIR = ${PREFIX}/games -+INSTMANDIR = ${PREFIX}/man/man6 - #INSTLIBDIR = /hom/sverrehu/lib - #INSTBINDIR = /hom/sverrehu/bin/$$HOSTTYPE - #INSTMANDIR = /hom/sverrehu/man/man6 -@@ -85,11 +84,11 @@ - - ########################################################################### - --CC = gcc -+#CC = gcc - - OPTIM = -s -O2 --CCOPT = -Wall $(OPTIM) $(INCDIR) $(DEFINES) $(CFLAGS) --LDOPT = -s $(LIBDIR) $(LDFLAGS) $(EXTRA_LD_OPT) -+CCOPT = $(INCDIR) $(DEFINES) $(CFLAGS) -+LDOPT = $(LIBDIR) $(LDFLAGS) $(EXTRA_LD_OPT) - - LIBS = -lshhopt -lshhmsg -lxalloc -lshhcards \ - -lXaw -lXt -lXpm -lXext -lXmu -lX11 $(EXTRA_LIBS) diff --git a/games/spellcast/files/patch-Makefile b/games/spellcast/files/patch-Makefile new file mode 100644 index 0000000..ef61d96 --- /dev/null +++ b/games/spellcast/files/patch-Makefile @@ -0,0 +1,17 @@ +--- Makefile.orig Sat Jan 15 07:41:10 1994 ++++ Makefile Fri Nov 10 19:25:53 2000 +@@ -22,11 +22,11 @@ + # all the time, try uncommenting the next line. + #OTHERLIBS = -lbsdmalloc + +-CFLAGS = -g -I/usr/local/include -I./bitmaps -DBODYFONT=$(FONT1) \ ++CFLAGS += -I${LOCALBASE}/include -I./bitmaps -DBODYFONT=$(FONT1) \ + -DBODYFONT_ALT=$(FONT2) -DBODYFONT_ALT2=$(FONT3) -DTRANSCRIPTDIR=$(LOGDIR) +-LFLAGS = -g ++LFLAGS = + +-XLIB = -L/usr/local/lib -lX11 ++XLIB = -L${LOCALBASE}/lib -lX11 + + OBJS = engine.o espells.o execute.o execute2.o emonster.o etran.o + XOBJS = main.o xtext.o xquery.o xloop.o xgest.o xbutton.o xtalk.o diff --git a/games/spellcast/files/patch-aa b/games/spellcast/files/patch-aa deleted file mode 100644 index ef61d96..0000000 --- a/games/spellcast/files/patch-aa +++ /dev/null @@ -1,17 +0,0 @@ ---- Makefile.orig Sat Jan 15 07:41:10 1994 -+++ Makefile Fri Nov 10 19:25:53 2000 -@@ -22,11 +22,11 @@ - # all the time, try uncommenting the next line. - #OTHERLIBS = -lbsdmalloc - --CFLAGS = -g -I/usr/local/include -I./bitmaps -DBODYFONT=$(FONT1) \ -+CFLAGS += -I${LOCALBASE}/include -I./bitmaps -DBODYFONT=$(FONT1) \ - -DBODYFONT_ALT=$(FONT2) -DBODYFONT_ALT2=$(FONT3) -DTRANSCRIPTDIR=$(LOGDIR) --LFLAGS = -g -+LFLAGS = - --XLIB = -L/usr/local/lib -lX11 -+XLIB = -L${LOCALBASE}/lib -lX11 - - OBJS = engine.o espells.o execute.o execute2.o emonster.o etran.o - XOBJS = main.o xtext.o xquery.o xloop.o xgest.o xbutton.o xtalk.o diff --git a/games/speyes/files/patch-Imakefile b/games/speyes/files/patch-Imakefile new file mode 100644 index 0000000..1bdef65 --- /dev/null +++ b/games/speyes/files/patch-Imakefile @@ -0,0 +1,8 @@ +--- Imakefile.orig Fri Nov 5 09:43:09 1999 ++++ Imakefile Wed Nov 1 07:59:39 2000 +@@ -8,4 +8,4 @@ + SRCS = speyes.c + OBJS = speyes.o getopt.o getopt1.o + +-ComplexProgramTarget(speyes) ++ComplexProgramTargetNoMan(speyes) diff --git a/games/speyes/files/patch-aa b/games/speyes/files/patch-aa deleted file mode 100644 index 1bdef65..0000000 --- a/games/speyes/files/patch-aa +++ /dev/null @@ -1,8 +0,0 @@ ---- Imakefile.orig Fri Nov 5 09:43:09 1999 -+++ Imakefile Wed Nov 1 07:59:39 2000 -@@ -8,4 +8,4 @@ - SRCS = speyes.c - OBJS = speyes.o getopt.o getopt1.o - --ComplexProgramTarget(speyes) -+ComplexProgramTargetNoMan(speyes) diff --git a/games/spider/files/patch-Imakefile b/games/spider/files/patch-Imakefile new file mode 100644 index 0000000..74689bc --- /dev/null +++ b/games/spider/files/patch-Imakefile @@ -0,0 +1,50 @@ +--- Imakefile.orig Sat Sep 28 19:46:02 1991 ++++ Imakefile Wed Oct 15 15:15:06 2003 +@@ -1,6 +1,6 @@ +-/**/# Run imake -DUseInstalled -I/usr/lib/X11/config to make a Makefile. +-/**/# This is an R5 style Imakefile, so will need the R5 config files to +-/**/# to make a Makefile. It also assume that X11 is installed in /usr/lib. ++# Run imake -DUseInstalled -I/usr/lib/X11/config to make a Makefile. ++# This is an R5 style Imakefile, so will need the R5 config files to ++# to make a Makefile. It also assume that X11 is installed in /usr/lib. + + SHAR = shar + COMPRESS = compress +@@ -8,7 +8,7 @@ + SPLIT = split + CAT = cat + /***** Note: probably want to define this to be something else *****/ +- HELPDIR = help ++ HELPDIR = LibDir/spider + + /***** Note: Used to over-ride some declarations in the default Imakefile + configurations. If you want to use some of these things, then +@@ -16,7 +16,7 @@ + definitions to what you would like them to be below. Delete + or comment out those you do not wish to use *****/ + #ifndef OverrideDefs +-#define OverrideDefs YES ++#define OverrideDefs NO + #endif + + #if OverrideDefs +@@ -94,8 +94,8 @@ + #endif + + #if CompileXView +-/**/# If these are not defined in the site.def file, define them now. +-/**/# set up compile time dependencies for XView clients. ++# If these are not defined in the site.def file, define them now. ++# set up compile time dependencies for XView clients. + XVTOP = $(XVIEWHOME) + XVLIBSRC = $(XVTOP)/lib + # if UseInstalled +@@ -253,7 +253,7 @@ + ComplexProgramTarget($(TARGET)) + + #ifdef SparcArchitecture +-/**/# SunOS4.0.3 sparc optimizer slimes this file ++# SunOS4.0.3 sparc optimizer slimes this file + util.o: util.c + $(CC) $(CPPFLAGS) $(DEFINES) $(INCLUDES) -c util.c + #endif diff --git a/games/spider/files/patch-ab b/games/spider/files/patch-ab deleted file mode 100644 index 74689bc..0000000 --- a/games/spider/files/patch-ab +++ /dev/null @@ -1,50 +0,0 @@ ---- Imakefile.orig Sat Sep 28 19:46:02 1991 -+++ Imakefile Wed Oct 15 15:15:06 2003 -@@ -1,6 +1,6 @@ --/**/# Run imake -DUseInstalled -I/usr/lib/X11/config to make a Makefile. --/**/# This is an R5 style Imakefile, so will need the R5 config files to --/**/# to make a Makefile. It also assume that X11 is installed in /usr/lib. -+# Run imake -DUseInstalled -I/usr/lib/X11/config to make a Makefile. -+# This is an R5 style Imakefile, so will need the R5 config files to -+# to make a Makefile. It also assume that X11 is installed in /usr/lib. - - SHAR = shar - COMPRESS = compress -@@ -8,7 +8,7 @@ - SPLIT = split - CAT = cat - /***** Note: probably want to define this to be something else *****/ -- HELPDIR = help -+ HELPDIR = LibDir/spider - - /***** Note: Used to over-ride some declarations in the default Imakefile - configurations. If you want to use some of these things, then -@@ -16,7 +16,7 @@ - definitions to what you would like them to be below. Delete - or comment out those you do not wish to use *****/ - #ifndef OverrideDefs --#define OverrideDefs YES -+#define OverrideDefs NO - #endif - - #if OverrideDefs -@@ -94,8 +94,8 @@ - #endif - - #if CompileXView --/**/# If these are not defined in the site.def file, define them now. --/**/# set up compile time dependencies for XView clients. -+# If these are not defined in the site.def file, define them now. -+# set up compile time dependencies for XView clients. - XVTOP = $(XVIEWHOME) - XVLIBSRC = $(XVTOP)/lib - # if UseInstalled -@@ -253,7 +253,7 @@ - ComplexProgramTarget($(TARGET)) - - #ifdef SparcArchitecture --/**/# SunOS4.0.3 sparc optimizer slimes this file -+# SunOS4.0.3 sparc optimizer slimes this file - util.o: util.c - $(CC) $(CPPFLAGS) $(DEFINES) $(INCLUDES) -c util.c - #endif diff --git a/games/spider/files/patch-ac b/games/spider/files/patch-ac deleted file mode 100644 index 6eb8eb3..0000000 --- a/games/spider/files/patch-ac +++ /dev/null @@ -1,11 +0,0 @@ ---- spider.man.orig Sun Sep 29 02:46:06 1991 -+++ spider.man Wed Jan 18 00:00:00 2000 -@@ -53,7 +53,7 @@ - Specifies the time (in microseconds) to pause between each move when - showing a Replay. The default is 200. - .TP 8 --.B "roundsCards (\fPclass\fB RoundCards)" -+.B "roundCards (\fPclass\fB RoundCards)" - Specifies whether to use rounded cards are not. Rounded cards look - better, but are considerably slower. The default is "on". - .TP 8 diff --git a/games/spider/files/patch-ad b/games/spider/files/patch-ad deleted file mode 100644 index 203be24..0000000 --- a/games/spider/files/patch-ad +++ /dev/null @@ -1,13 +0,0 @@ ---- globals.h.orig 1991-09-28 17:46:20.000000000 +0000 -+++ globals.h 2011-07-01 03:25:27.000000000 +0000 -@@ -96,6 +96,10 @@ - Bool can_get_help_files(); - #endif - -+#ifndef __FreeBSD__ - extern char *malloc(); - extern char *calloc(); - extern char *realloc(); -+#else -+#include -+#endif diff --git a/games/spider/files/patch-globals.h b/games/spider/files/patch-globals.h new file mode 100644 index 0000000..203be24 --- /dev/null +++ b/games/spider/files/patch-globals.h @@ -0,0 +1,13 @@ +--- globals.h.orig 1991-09-28 17:46:20.000000000 +0000 ++++ globals.h 2011-07-01 03:25:27.000000000 +0000 +@@ -96,6 +96,10 @@ + Bool can_get_help_files(); + #endif + ++#ifndef __FreeBSD__ + extern char *malloc(); + extern char *calloc(); + extern char *realloc(); ++#else ++#include ++#endif diff --git a/games/spider/files/patch-spider.man b/games/spider/files/patch-spider.man new file mode 100644 index 0000000..6eb8eb3 --- /dev/null +++ b/games/spider/files/patch-spider.man @@ -0,0 +1,11 @@ +--- spider.man.orig Sun Sep 29 02:46:06 1991 ++++ spider.man Wed Jan 18 00:00:00 2000 +@@ -53,7 +53,7 @@ + Specifies the time (in microseconds) to pause between each move when + showing a Replay. The default is 200. + .TP 8 +-.B "roundsCards (\fPclass\fB RoundCards)" ++.B "roundCards (\fPclass\fB RoundCards)" + Specifies whether to use rounded cards are not. Rounded cards look + better, but are considerably slower. The default is "on". + .TP 8 diff --git a/games/sxsame/files/patch-Imakefile b/games/sxsame/files/patch-Imakefile new file mode 100644 index 0000000..64f87b0 --- /dev/null +++ b/games/sxsame/files/patch-Imakefile @@ -0,0 +1,43 @@ +--- Imakefile.orig Sun May 5 04:10:27 1996 ++++ Imakefile Wed Nov 1 08:05:31 2000 +@@ -3,7 +3,7 @@ + # * Copyleft (c) 1994-1996 Software Research Academy * + # ************************************************************** + # +-SAMEDIR = /usr/local/games/sxsame ++SAMEDIR = $(LIBDIR)/sxsame + + #BINDIR = /usr/local/bin + #MANDIR = /usr/local/man/man1 +@@ -11,6 +11,7 @@ + #XPMLIB = -L/usr/local/lib/X11 -lXpm + #EXTRA_DEFINES = -DLOCAL_XPM_H -I/usr/local/include/X11 + ++INSTPGMFLAGS=-s -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} + + XPMLIB = -lXpm + LOCAL_LIBRARIES = $(XPMLIB) -lX11 +@@ -19,16 +20,19 @@ + DEFINES = -DSAME_DIR=\"$(SAMEDIR)\" + + #CDEBUGFLAGS = -O2 -Wall +-CDEBUGFLAGS = -g -Wall ++#CDEBUGFLAGS = -g -Wall + #CDEBUGFLAGS = -O2 +-ComplexProgramTarget(sxsame) +-InstallManPage(sxsame,$(MANDIR)) ++ComplexProgramTargetNoMan(sxsame) + + #sxsame.o:: sxsame.c config.h sxsame.h hiscore.h defdata.h + #hiscore.o:: hiscore.c config.h hiscore.h + #defdata.o:: defdata.c defdata.h + install.dir:: + $(MKDIRHIER) $(SAMEDIR) +- chmod 777 $(SAMEDIR) ++ chmod 2775 $(SAMEDIR) ++ chown ${BINOWN}:${BINGRP} $(SAMEDIR) + /bin/cp -pr contrib/?* $(SAMEDIR) ++ touch $(SAMEDIR)/hiscore ++ chmod 664 $(SAMEDIR)/hiscore ++ chown ${BINOWN}:${BINGRP} $(SAMEDIR)/hiscore + diff --git a/games/sxsame/files/patch-aa b/games/sxsame/files/patch-aa deleted file mode 100644 index 64f87b0..0000000 --- a/games/sxsame/files/patch-aa +++ /dev/null @@ -1,43 +0,0 @@ ---- Imakefile.orig Sun May 5 04:10:27 1996 -+++ Imakefile Wed Nov 1 08:05:31 2000 -@@ -3,7 +3,7 @@ - # * Copyleft (c) 1994-1996 Software Research Academy * - # ************************************************************** - # --SAMEDIR = /usr/local/games/sxsame -+SAMEDIR = $(LIBDIR)/sxsame - - #BINDIR = /usr/local/bin - #MANDIR = /usr/local/man/man1 -@@ -11,6 +11,7 @@ - #XPMLIB = -L/usr/local/lib/X11 -lXpm - #EXTRA_DEFINES = -DLOCAL_XPM_H -I/usr/local/include/X11 - -+INSTPGMFLAGS=-s -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} - - XPMLIB = -lXpm - LOCAL_LIBRARIES = $(XPMLIB) -lX11 -@@ -19,16 +20,19 @@ - DEFINES = -DSAME_DIR=\"$(SAMEDIR)\" - - #CDEBUGFLAGS = -O2 -Wall --CDEBUGFLAGS = -g -Wall -+#CDEBUGFLAGS = -g -Wall - #CDEBUGFLAGS = -O2 --ComplexProgramTarget(sxsame) --InstallManPage(sxsame,$(MANDIR)) -+ComplexProgramTargetNoMan(sxsame) - - #sxsame.o:: sxsame.c config.h sxsame.h hiscore.h defdata.h - #hiscore.o:: hiscore.c config.h hiscore.h - #defdata.o:: defdata.c defdata.h - install.dir:: - $(MKDIRHIER) $(SAMEDIR) -- chmod 777 $(SAMEDIR) -+ chmod 2775 $(SAMEDIR) -+ chown ${BINOWN}:${BINGRP} $(SAMEDIR) - /bin/cp -pr contrib/?* $(SAMEDIR) -+ touch $(SAMEDIR)/hiscore -+ chmod 664 $(SAMEDIR)/hiscore -+ chown ${BINOWN}:${BINGRP} $(SAMEDIR)/hiscore - diff --git a/games/sxsame/files/patch-ad b/games/sxsame/files/patch-ad deleted file mode 100644 index 34b7a81..0000000 --- a/games/sxsame/files/patch-ad +++ /dev/null @@ -1,86 +0,0 @@ ---- hiscore.c.orig Sun May 5 04:09:25 1996 -+++ hiscore.c Tue Jul 11 21:29:01 2000 -@@ -5,14 +5,16 @@ - * Copyleft (c) 1994-1996 Software Research Academy * - ************************************************************************/ - #include --#include --#include -+#include -+#include -+#include -+#include - #include "config.h" - #include "hiscore.h" - - static struct Hiscore hiscore[4]; - --static char *lockf = LOCK_FILE; -+static char *lockfn = LOCK_FILE; - static char *hiscoref = HISCORE_FILE; - extern char *same_dir; - static int lock_file( -@@ -30,12 +32,15 @@ - FILE *fp; - int i, j; - char *myname; -- char tmpf[256]; -+ char tmpf[MAXPATHLEN]; - int new = 0; - - myname = (char *)getenv("LOGNAME"); -- sprintf(tmpf, "%s/%s", same_dir, hiscoref); -- umask(0); -+ if (MAXPATHLEN <= snprintf(tmpf, MAXPATHLEN ,"%s/%s", same_dir, hiscoref) ) { -+ fprintf(stderr,"Error: hiscore file name too long.\n"); -+ return -1; -+ } -+ umask(002); - fp = fopen(tmpf,"rb"); - if(fp != NULL) - { -@@ -75,11 +80,11 @@ - break; - } - } -- if(i < 10 | new == 1) -+ if(i < 10 || new == 1) - { - if(lock_file(0) != 0) - return(-1); -- umask(0); -+ umask(002); - fp = fopen(tmpf, "wb"); - fwrite(hiscore, sizeof(hiscore), 1, fp); - fclose(fp); -@@ -95,10 +100,12 @@ - int cmd; - { - FILE *fp; -- char lkf[256]; -+ char lkf[MAXPATHLEN]; - int i; -- -- sprintf(lkf,"%s/%s", same_dir, lockf); -+ if (MAXPATHLEN <= snprintf(lkf, MAXPATHLEN, "%s/%s", same_dir, lockfn)) { -+ fprintf(stderr,"Error: lock file name too long.\n"); -+ return -1; -+ } - if(cmd == 1) - { - if(remove(lkf) != 0) -@@ -134,9 +141,12 @@ - struct Hiscore *hi; - { - FILE *fp; -- char tmpf[256]; -+ char tmpf[MAXPATHLEN]; - -- sprintf(tmpf, "%s/%s", same_dir, hiscoref); -+ if (MAXPATHLEN <= snprintf(tmpf, MAXPATHLEN, "%s/%s", same_dir, hiscoref)) { -+ fprintf(stderr,"Error: hiscore file name too long.\n"); -+ return -1; -+ } - fp = fopen(tmpf,"rb"); - if(fp == NULL) - return(-1); diff --git a/games/sxsame/files/patch-ae b/games/sxsame/files/patch-ae deleted file mode 100644 index 10ba162..0000000 --- a/games/sxsame/files/patch-ae +++ /dev/null @@ -1,11 +0,0 @@ ---- inifile.c.orig Sun May 5 04:09:25 1996 -+++ inifile.c Tue Jul 11 21:14:03 2000 -@@ -5,6 +5,8 @@ - * Copyleft (c) 1994-1996 Software Research Academy * - ************************************************************************/ - #include -+#include -+#include - - #include "sxsame.h" - diff --git a/games/sxsame/files/patch-af b/games/sxsame/files/patch-af deleted file mode 100644 index 9d193e2..0000000 --- a/games/sxsame/files/patch-af +++ /dev/null @@ -1,39 +0,0 @@ ---- loadbmp.c.orig Sun May 5 04:09:25 1996 -+++ loadbmp.c Tue Jul 11 21:30:24 2000 -@@ -5,6 +5,9 @@ - * Copyleft (c) 1994-1996 Software Research Academy * - ************************************************************************/ - #include -+#include -+#include -+#include - #include - #include "sxsame.h" - -@@ -37,17 +40,24 @@ - int c, c1,c2; - int width, height, planes, ncol; - int *col; -- char fname[256]; -+ char fname[MAXPATHLEN]; - - Pixmap w; - GC gc; - int i, j, k; - -+ if (MAXPATHLEN <= strlen(bmpname) ) { -+ fprintf(stderr,"Error: BMP file name too long.\n"); -+ return -1; -+ } - strcpy(fname,bmpname); - fp = fopen(fname,"rb"); - if(fp == NULL) - { -- sprintf(fname, "%s/%s", SAME_DIR, bmpname); -+ if (MAXPATHLEN <= snprintf(fname, MAXPATHLEN, "%s/%s", SAME_DIR, bmpname)) { -+ fprintf(stderr,"Error: BMP file name too long.\n"); -+ return -1; -+ } - fp = fopen(fname, "r"); - if(fp == NULL) - { diff --git a/games/sxsame/files/patch-ag b/games/sxsame/files/patch-ag deleted file mode 100644 index 7641c57..0000000 --- a/games/sxsame/files/patch-ag +++ /dev/null @@ -1,71 +0,0 @@ ---- loaddata.c.orig Sun May 5 04:09:25 1996 -+++ loaddata.c Tue Jul 11 21:32:34 2000 -@@ -5,6 +5,9 @@ - * Copyleft (c) 1994-1996 Software Research Academy * - ************************************************************************/ - #include -+#include -+#include -+#include - #include "config.h" - #include "sxsame.h" - -@@ -25,7 +28,7 @@ - DataFile ***data; - { - FILE *fp; -- char fname[256]; -+ char fname[MAXPATHLEN]; - char buf[256]; - char str1[256]; - char str2[256]; -@@ -34,11 +37,18 @@ - char *p; - int i; - -+ if (MAXPATHLEN <= strlen(entry_name)) { -+ fprintf(stderr,"Error: data file name too long.\n"); -+ return 0; -+ } - strcpy(fname,entry_name); - fp = fopen(fname, "r"); - if(fp == NULL) - { -- sprintf(fname, "%s/%s", SAME_DIR, entry_name); -+ if (MAXPATHLEN <= snprintf(fname, MAXPATHLEN ,"%s/%s", SAME_DIR, entry_name)) { -+ fprintf(stderr,"Error: data file name too long.\n"); -+ return 0; -+ } - fp = fopen(fname, "r"); - if(fp == NULL) - return(0); -@@ -81,7 +91,7 @@ - char *fname; - { - FILE *fp; -- char tmpfname[256]; -+ char tmpfname[MAXPATHLEN]; - char buf[256]; - char str1[256],str2[256]; - int val, i, j; -@@ -94,7 +104,7 @@ - { - for(j=0;j<5;j++) - { -- data->xpm_data[i][j] == 0; -+ data->xpm_data[i][j] = 0; - } - } - data->bg_data = 0; -@@ -103,7 +113,10 @@ - fp = fopen(fname,"r"); - if(fp == NULL) - { -- sprintf(tmpfname, "%s/%s", SAME_DIR, fname); -+ if (MAXPATHLEN <= snprintf(tmpfname, MAXPATHLEN, "%s/%s", SAME_DIR, fname)) { -+ fprintf(stderr,"Error: data file name too long.\n", fname); -+ return -1; -+ } - fp = fopen(tmpfname, "r"); - if(fp == NULL) - { diff --git a/games/sxsame/files/patch-ah b/games/sxsame/files/patch-ah deleted file mode 100644 index d4e6795..0000000 --- a/games/sxsame/files/patch-ah +++ /dev/null @@ -1,85 +0,0 @@ ---- sxsame.c.orig Sun May 5 04:09:26 1996 -+++ sxsame.c Tue Jul 11 21:35:38 2000 -@@ -12,6 +12,11 @@ - char *program_version = "3.02"; - - #include -+#include -+#include -+#include -+#include -+#include - #include - #include - #ifndef LOCAL_XPM_H -@@ -163,11 +168,21 @@ - int hisc_height = 80; - #endif /* !ENABLE_HISCORE */ - -- -+int ReadInitFile(int* width, int* height, int* same_pic); -+int SaveInitFile(int width, int height, int same_pic); - int CheckSameDataFile(DataFile ***); - int LoadBMPSameData(Display *dpy, Colormap cmap, SameGame *, char *); - int LoadSameData(ImportSameData *, char *); -+int CheckSelectSame(int sx, int sy); - -+static -+int -+Access(const char* path) -+{ -+ return access(path, R_OK); -+} -+ -+# define access(x) Access(x) - - void main(argc, argv) - int argc; -@@ -726,7 +741,7 @@ - { - ImportSameData data; - int i, j, val, ncol; -- char tmpfname[256]; -+ char tmpfname[MAXPATHLEN]; - - if(strlen(fname)>4) /* check Windows data file... */ - { -@@ -784,9 +799,13 @@ - { - if(!access(data.xpm_data[i][j])) - strcpy(tmpfname,data.xpm_data[i][j]); -- else -- sprintf(tmpfname,"%s/%s",same_dir, -- data.xpm_data[i][j]); -+ else { -+ if (MAXPATHLEN <= -+ snprintf(tmpfname, MAXPATHLEN, "%s/%s",same_dir, -+ data.xpm_data[i][j])) { -+ goto xpm_error; -+ } -+ } - val = XpmReadFileToPixmap(dpy, root, - tmpfname, &game.bits_xpm[i][j], - NULL, &xpm_attr); -@@ -804,7 +823,9 @@ - if(!access(data.bg_data)) - strcpy(tmpfname,data.bg_data); - else -- sprintf(tmpfname,"%s/%s",same_dir, data.bg_data); -+ if (MAXPATHLEN <= snprintf(tmpfname, MAXPATHLEN, "%s/%s",same_dir, data.bg_data)) { -+ goto xpm_error; -+ } - val = XpmReadFileToPixmap(dpy, root, tmpfname, - &game.bg_xpm, NULL, &xpm_attr); - free(data.bg_data); -@@ -815,6 +836,10 @@ - strcpy(tmpfname,data.frame_data); - else - sprintf(tmpfname,"%s/%s",same_dir, data.frame_data); -+ if (MAXPATHLEN <= snprintf(tmpfname, MAXPATHLEN, "%s/%s",same_dir, data.frame_data)) { -+ -+ goto xpm_error; -+ } - val = XpmReadFileToPixmap(dpy, root, tmpfname, - &game.frame_xpm, NULL, &xpm_attr); - free(data.frame_data); diff --git a/games/sxsame/files/patch-hiscore.c b/games/sxsame/files/patch-hiscore.c new file mode 100644 index 0000000..34b7a81 --- /dev/null +++ b/games/sxsame/files/patch-hiscore.c @@ -0,0 +1,86 @@ +--- hiscore.c.orig Sun May 5 04:09:25 1996 ++++ hiscore.c Tue Jul 11 21:29:01 2000 +@@ -5,14 +5,16 @@ + * Copyleft (c) 1994-1996 Software Research Academy * + ************************************************************************/ + #include +-#include +-#include ++#include ++#include ++#include ++#include + #include "config.h" + #include "hiscore.h" + + static struct Hiscore hiscore[4]; + +-static char *lockf = LOCK_FILE; ++static char *lockfn = LOCK_FILE; + static char *hiscoref = HISCORE_FILE; + extern char *same_dir; + static int lock_file( +@@ -30,12 +32,15 @@ + FILE *fp; + int i, j; + char *myname; +- char tmpf[256]; ++ char tmpf[MAXPATHLEN]; + int new = 0; + + myname = (char *)getenv("LOGNAME"); +- sprintf(tmpf, "%s/%s", same_dir, hiscoref); +- umask(0); ++ if (MAXPATHLEN <= snprintf(tmpf, MAXPATHLEN ,"%s/%s", same_dir, hiscoref) ) { ++ fprintf(stderr,"Error: hiscore file name too long.\n"); ++ return -1; ++ } ++ umask(002); + fp = fopen(tmpf,"rb"); + if(fp != NULL) + { +@@ -75,11 +80,11 @@ + break; + } + } +- if(i < 10 | new == 1) ++ if(i < 10 || new == 1) + { + if(lock_file(0) != 0) + return(-1); +- umask(0); ++ umask(002); + fp = fopen(tmpf, "wb"); + fwrite(hiscore, sizeof(hiscore), 1, fp); + fclose(fp); +@@ -95,10 +100,12 @@ + int cmd; + { + FILE *fp; +- char lkf[256]; ++ char lkf[MAXPATHLEN]; + int i; +- +- sprintf(lkf,"%s/%s", same_dir, lockf); ++ if (MAXPATHLEN <= snprintf(lkf, MAXPATHLEN, "%s/%s", same_dir, lockfn)) { ++ fprintf(stderr,"Error: lock file name too long.\n"); ++ return -1; ++ } + if(cmd == 1) + { + if(remove(lkf) != 0) +@@ -134,9 +141,12 @@ + struct Hiscore *hi; + { + FILE *fp; +- char tmpf[256]; ++ char tmpf[MAXPATHLEN]; + +- sprintf(tmpf, "%s/%s", same_dir, hiscoref); ++ if (MAXPATHLEN <= snprintf(tmpf, MAXPATHLEN, "%s/%s", same_dir, hiscoref)) { ++ fprintf(stderr,"Error: hiscore file name too long.\n"); ++ return -1; ++ } + fp = fopen(tmpf,"rb"); + if(fp == NULL) + return(-1); diff --git a/games/sxsame/files/patch-inifile.c b/games/sxsame/files/patch-inifile.c new file mode 100644 index 0000000..10ba162 --- /dev/null +++ b/games/sxsame/files/patch-inifile.c @@ -0,0 +1,11 @@ +--- inifile.c.orig Sun May 5 04:09:25 1996 ++++ inifile.c Tue Jul 11 21:14:03 2000 +@@ -5,6 +5,8 @@ + * Copyleft (c) 1994-1996 Software Research Academy * + ************************************************************************/ + #include ++#include ++#include + + #include "sxsame.h" + diff --git a/games/sxsame/files/patch-loadbmp.c b/games/sxsame/files/patch-loadbmp.c new file mode 100644 index 0000000..9d193e2 --- /dev/null +++ b/games/sxsame/files/patch-loadbmp.c @@ -0,0 +1,39 @@ +--- loadbmp.c.orig Sun May 5 04:09:25 1996 ++++ loadbmp.c Tue Jul 11 21:30:24 2000 +@@ -5,6 +5,9 @@ + * Copyleft (c) 1994-1996 Software Research Academy * + ************************************************************************/ + #include ++#include ++#include ++#include + #include + #include "sxsame.h" + +@@ -37,17 +40,24 @@ + int c, c1,c2; + int width, height, planes, ncol; + int *col; +- char fname[256]; ++ char fname[MAXPATHLEN]; + + Pixmap w; + GC gc; + int i, j, k; + ++ if (MAXPATHLEN <= strlen(bmpname) ) { ++ fprintf(stderr,"Error: BMP file name too long.\n"); ++ return -1; ++ } + strcpy(fname,bmpname); + fp = fopen(fname,"rb"); + if(fp == NULL) + { +- sprintf(fname, "%s/%s", SAME_DIR, bmpname); ++ if (MAXPATHLEN <= snprintf(fname, MAXPATHLEN, "%s/%s", SAME_DIR, bmpname)) { ++ fprintf(stderr,"Error: BMP file name too long.\n"); ++ return -1; ++ } + fp = fopen(fname, "r"); + if(fp == NULL) + { diff --git a/games/sxsame/files/patch-loaddata.c b/games/sxsame/files/patch-loaddata.c new file mode 100644 index 0000000..7641c57 --- /dev/null +++ b/games/sxsame/files/patch-loaddata.c @@ -0,0 +1,71 @@ +--- loaddata.c.orig Sun May 5 04:09:25 1996 ++++ loaddata.c Tue Jul 11 21:32:34 2000 +@@ -5,6 +5,9 @@ + * Copyleft (c) 1994-1996 Software Research Academy * + ************************************************************************/ + #include ++#include ++#include ++#include + #include "config.h" + #include "sxsame.h" + +@@ -25,7 +28,7 @@ + DataFile ***data; + { + FILE *fp; +- char fname[256]; ++ char fname[MAXPATHLEN]; + char buf[256]; + char str1[256]; + char str2[256]; +@@ -34,11 +37,18 @@ + char *p; + int i; + ++ if (MAXPATHLEN <= strlen(entry_name)) { ++ fprintf(stderr,"Error: data file name too long.\n"); ++ return 0; ++ } + strcpy(fname,entry_name); + fp = fopen(fname, "r"); + if(fp == NULL) + { +- sprintf(fname, "%s/%s", SAME_DIR, entry_name); ++ if (MAXPATHLEN <= snprintf(fname, MAXPATHLEN ,"%s/%s", SAME_DIR, entry_name)) { ++ fprintf(stderr,"Error: data file name too long.\n"); ++ return 0; ++ } + fp = fopen(fname, "r"); + if(fp == NULL) + return(0); +@@ -81,7 +91,7 @@ + char *fname; + { + FILE *fp; +- char tmpfname[256]; ++ char tmpfname[MAXPATHLEN]; + char buf[256]; + char str1[256],str2[256]; + int val, i, j; +@@ -94,7 +104,7 @@ + { + for(j=0;j<5;j++) + { +- data->xpm_data[i][j] == 0; ++ data->xpm_data[i][j] = 0; + } + } + data->bg_data = 0; +@@ -103,7 +113,10 @@ + fp = fopen(fname,"r"); + if(fp == NULL) + { +- sprintf(tmpfname, "%s/%s", SAME_DIR, fname); ++ if (MAXPATHLEN <= snprintf(tmpfname, MAXPATHLEN, "%s/%s", SAME_DIR, fname)) { ++ fprintf(stderr,"Error: data file name too long.\n", fname); ++ return -1; ++ } + fp = fopen(tmpfname, "r"); + if(fp == NULL) + { diff --git a/games/sxsame/files/patch-sxsame.c b/games/sxsame/files/patch-sxsame.c new file mode 100644 index 0000000..d4e6795 --- /dev/null +++ b/games/sxsame/files/patch-sxsame.c @@ -0,0 +1,85 @@ +--- sxsame.c.orig Sun May 5 04:09:26 1996 ++++ sxsame.c Tue Jul 11 21:35:38 2000 +@@ -12,6 +12,11 @@ + char *program_version = "3.02"; + + #include ++#include ++#include ++#include ++#include ++#include + #include + #include + #ifndef LOCAL_XPM_H +@@ -163,11 +168,21 @@ + int hisc_height = 80; + #endif /* !ENABLE_HISCORE */ + +- ++int ReadInitFile(int* width, int* height, int* same_pic); ++int SaveInitFile(int width, int height, int same_pic); + int CheckSameDataFile(DataFile ***); + int LoadBMPSameData(Display *dpy, Colormap cmap, SameGame *, char *); + int LoadSameData(ImportSameData *, char *); ++int CheckSelectSame(int sx, int sy); + ++static ++int ++Access(const char* path) ++{ ++ return access(path, R_OK); ++} ++ ++# define access(x) Access(x) + + void main(argc, argv) + int argc; +@@ -726,7 +741,7 @@ + { + ImportSameData data; + int i, j, val, ncol; +- char tmpfname[256]; ++ char tmpfname[MAXPATHLEN]; + + if(strlen(fname)>4) /* check Windows data file... */ + { +@@ -784,9 +799,13 @@ + { + if(!access(data.xpm_data[i][j])) + strcpy(tmpfname,data.xpm_data[i][j]); +- else +- sprintf(tmpfname,"%s/%s",same_dir, +- data.xpm_data[i][j]); ++ else { ++ if (MAXPATHLEN <= ++ snprintf(tmpfname, MAXPATHLEN, "%s/%s",same_dir, ++ data.xpm_data[i][j])) { ++ goto xpm_error; ++ } ++ } + val = XpmReadFileToPixmap(dpy, root, + tmpfname, &game.bits_xpm[i][j], + NULL, &xpm_attr); +@@ -804,7 +823,9 @@ + if(!access(data.bg_data)) + strcpy(tmpfname,data.bg_data); + else +- sprintf(tmpfname,"%s/%s",same_dir, data.bg_data); ++ if (MAXPATHLEN <= snprintf(tmpfname, MAXPATHLEN, "%s/%s",same_dir, data.bg_data)) { ++ goto xpm_error; ++ } + val = XpmReadFileToPixmap(dpy, root, tmpfname, + &game.bg_xpm, NULL, &xpm_attr); + free(data.bg_data); +@@ -815,6 +836,10 @@ + strcpy(tmpfname,data.frame_data); + else + sprintf(tmpfname,"%s/%s",same_dir, data.frame_data); ++ if (MAXPATHLEN <= snprintf(tmpfname, MAXPATHLEN, "%s/%s",same_dir, data.frame_data)) { ++ ++ goto xpm_error; ++ } + val = XpmReadFileToPixmap(dpy, root, tmpfname, + &game.frame_xpm, NULL, &xpm_attr); + free(data.frame_data); diff --git a/games/taipan/files/patch-ab b/games/taipan/files/patch-ab deleted file mode 100644 index 35a18b4..0000000 --- a/games/taipan/files/patch-ab +++ /dev/null @@ -1,11 +0,0 @@ ---- taipan.c.orig Fri Mar 15 15:05:41 2002 -+++ taipan.c Fri Mar 15 15:08:30 2002 -@@ -2572,7 +2572,7 @@ - amount = get_num(9); - if (amount == -1) - { -- amount = cash; -+ amount = repair_price; - } - if (amount <= cash) - { diff --git a/games/taipan/files/patch-taipan.c b/games/taipan/files/patch-taipan.c new file mode 100644 index 0000000..35a18b4 --- /dev/null +++ b/games/taipan/files/patch-taipan.c @@ -0,0 +1,11 @@ +--- taipan.c.orig Fri Mar 15 15:05:41 2002 ++++ taipan.c Fri Mar 15 15:08:30 2002 +@@ -2572,7 +2572,7 @@ + amount = get_num(9); + if (amount == -1) + { +- amount = cash; ++ amount = repair_price; + } + if (amount <= cash) + { diff --git a/games/tank/files/patch-MESA b/games/tank/files/patch-MESA new file mode 100644 index 0000000..837375c --- /dev/null +++ b/games/tank/files/patch-MESA @@ -0,0 +1,107 @@ +diff -ruN ../../OLD/tank-0.4a/./Makefile ./Makefile +--- ../../OLD/tank-0.4a/./Makefile Sun Feb 2 09:59:42 1997 ++++ ./Makefile Wed Mar 4 04:42:57 1998 +@@ -43,11 +43,11 @@ + "GLAUXINC = $(GLAUXINC)" linux-elf + + linux-mesa: +- cd Mesa; $(MAKE) linux ++ # cd Mesa; $(MAKE) linux + $(MAKE) -f Makefile.Linux.Mesa linux + + linux-mesa-elf: +- cd Mesa; $(MAKE) linux-elf ++ # cd Mesa; $(MAKE) linux-elf + $(MAKE) -f Makefile.Linux.Mesa linux-elf + + aix-opengl: +@@ -65,7 +65,7 @@ + $(MAKE) -f Makefile.Linux clean + + mesa-clean: +- cd Mesa; $(MAKE) clean ++ # cd Mesa; $(MAKE) clean + $(MAKE) -f Makefile.Linux clean + + backup: +diff -ruN ../../OLD/tank-0.4a/./collisions.c ./collisions.c +--- ../../OLD/tank-0.4a/./collisions.c Sun Feb 2 09:59:42 1997 ++++ ./collisions.c Wed Mar 4 04:42:57 1998 +@@ -10,7 +10,7 @@ + #include + #include + +-#ifdef MESA ++#ifdef USING_MESA + #include + #else + #include +diff -ruN ../../OLD/tank-0.4a/./daemon.c ./daemon.c +--- ../../OLD/tank-0.4a/./daemon.c Sun Feb 2 09:59:42 1997 ++++ ./daemon.c Wed Mar 4 04:42:57 1998 +@@ -24,7 +24,7 @@ + #include + #include + +-#ifdef MESA ++#ifdef USING_MESA + #include + #else + #include +diff -ruN ../../OLD/tank-0.4a/./defines.h ./defines.h +--- ../../OLD/tank-0.4a/./defines.h Sun Feb 2 09:59:42 1997 ++++ ./defines.h Wed Mar 4 04:44:12 1998 +@@ -15,7 +15,7 @@ + /* Definitions des variables du jeu */ + /* ------------------------------------------------*/ + +-#define TANK_HOME "/usr/games/tank-0.4a" ++#define TANK_HOME (PREFIX "/share/tank") + + /* ------------------------------------------------*/ + /* Definitions du nombre maximum d'objets */ +diff -ruN ../../OLD/tank-0.4a/./lists.c ./lists.c +--- ../../OLD/tank-0.4a/./lists.c Sun Feb 2 09:59:42 1997 ++++ ./lists.c Wed Mar 4 04:42:57 1998 +@@ -13,7 +13,7 @@ + #include + #include + +-#ifdef MESA ++#ifdef USING_MESA + #include + #else + #include +diff -ruN ../../OLD/tank-0.4a/./operations.c ./operations.c +--- ../../OLD/tank-0.4a/./operations.c Sun Feb 2 09:59:43 1997 ++++ ./operations.c Wed Mar 4 04:42:57 1998 +@@ -13,7 +13,7 @@ + #include "defines.h" + #include "operations.h" + +-#ifdef MESA ++#ifdef USING_MESA + #include + #else + #include +diff -ruN ../../OLD/tank-0.4a/./tank.c ./tank.c +--- ../../OLD/tank-0.4a/./tank.c Sun Feb 2 09:59:43 1997 ++++ ./tank.c Wed Mar 4 04:44:26 1998 +@@ -22,7 +22,7 @@ + #include + #include + +-#ifdef MESA ++#ifdef USING_MESA + #include + #else + #include +@@ -1383,7 +1383,7 @@ + + #ifdef SOUND + +- if(system("cat eatthis.au >/dev/audio &") != 0) { ++ if(system("/bin/cat " PREFIX "/share/tank/eatthis.au >/dev/audio &") != 0) { + + } + #endif diff --git a/games/tank/files/patch-aa b/games/tank/files/patch-aa deleted file mode 100644 index 837375c..0000000 --- a/games/tank/files/patch-aa +++ /dev/null @@ -1,107 +0,0 @@ -diff -ruN ../../OLD/tank-0.4a/./Makefile ./Makefile ---- ../../OLD/tank-0.4a/./Makefile Sun Feb 2 09:59:42 1997 -+++ ./Makefile Wed Mar 4 04:42:57 1998 -@@ -43,11 +43,11 @@ - "GLAUXINC = $(GLAUXINC)" linux-elf - - linux-mesa: -- cd Mesa; $(MAKE) linux -+ # cd Mesa; $(MAKE) linux - $(MAKE) -f Makefile.Linux.Mesa linux - - linux-mesa-elf: -- cd Mesa; $(MAKE) linux-elf -+ # cd Mesa; $(MAKE) linux-elf - $(MAKE) -f Makefile.Linux.Mesa linux-elf - - aix-opengl: -@@ -65,7 +65,7 @@ - $(MAKE) -f Makefile.Linux clean - - mesa-clean: -- cd Mesa; $(MAKE) clean -+ # cd Mesa; $(MAKE) clean - $(MAKE) -f Makefile.Linux clean - - backup: -diff -ruN ../../OLD/tank-0.4a/./collisions.c ./collisions.c ---- ../../OLD/tank-0.4a/./collisions.c Sun Feb 2 09:59:42 1997 -+++ ./collisions.c Wed Mar 4 04:42:57 1998 -@@ -10,7 +10,7 @@ - #include - #include - --#ifdef MESA -+#ifdef USING_MESA - #include - #else - #include -diff -ruN ../../OLD/tank-0.4a/./daemon.c ./daemon.c ---- ../../OLD/tank-0.4a/./daemon.c Sun Feb 2 09:59:42 1997 -+++ ./daemon.c Wed Mar 4 04:42:57 1998 -@@ -24,7 +24,7 @@ - #include - #include - --#ifdef MESA -+#ifdef USING_MESA - #include - #else - #include -diff -ruN ../../OLD/tank-0.4a/./defines.h ./defines.h ---- ../../OLD/tank-0.4a/./defines.h Sun Feb 2 09:59:42 1997 -+++ ./defines.h Wed Mar 4 04:44:12 1998 -@@ -15,7 +15,7 @@ - /* Definitions des variables du jeu */ - /* ------------------------------------------------*/ - --#define TANK_HOME "/usr/games/tank-0.4a" -+#define TANK_HOME (PREFIX "/share/tank") - - /* ------------------------------------------------*/ - /* Definitions du nombre maximum d'objets */ -diff -ruN ../../OLD/tank-0.4a/./lists.c ./lists.c ---- ../../OLD/tank-0.4a/./lists.c Sun Feb 2 09:59:42 1997 -+++ ./lists.c Wed Mar 4 04:42:57 1998 -@@ -13,7 +13,7 @@ - #include - #include - --#ifdef MESA -+#ifdef USING_MESA - #include - #else - #include -diff -ruN ../../OLD/tank-0.4a/./operations.c ./operations.c ---- ../../OLD/tank-0.4a/./operations.c Sun Feb 2 09:59:43 1997 -+++ ./operations.c Wed Mar 4 04:42:57 1998 -@@ -13,7 +13,7 @@ - #include "defines.h" - #include "operations.h" - --#ifdef MESA -+#ifdef USING_MESA - #include - #else - #include -diff -ruN ../../OLD/tank-0.4a/./tank.c ./tank.c ---- ../../OLD/tank-0.4a/./tank.c Sun Feb 2 09:59:43 1997 -+++ ./tank.c Wed Mar 4 04:44:26 1998 -@@ -22,7 +22,7 @@ - #include - #include - --#ifdef MESA -+#ifdef USING_MESA - #include - #else - #include -@@ -1383,7 +1383,7 @@ - - #ifdef SOUND - -- if(system("cat eatthis.au >/dev/audio &") != 0) { -+ if(system("/bin/cat " PREFIX "/share/tank/eatthis.au >/dev/audio &") != 0) { - - } - #endif diff --git a/games/tkmoo/files/patch-Makefile b/games/tkmoo/files/patch-Makefile new file mode 100644 index 0000000..4c308735 --- /dev/null +++ b/games/tkmoo/files/patch-Makefile @@ -0,0 +1,24 @@ +--- Makefile.orig Tue Nov 6 00:52:01 2001 ++++ Makefile Sun Dec 2 08:59:00 2001 +@@ -7,18 +7,18 @@ + # ... in the '.tkMOO-lite' directory under your home directory + # ** if you change this value then you'll need to set your TKMOO_LIB_DIR + # ** environment variable to the same value +-TKMOO_LIB_DIR = $(HOME)/.tkMOO-lite ++TKMOO_LIB_DIR ?= $(HOME)/.tkMOO-lite + + # where will the executable be installed? + # ... in the 'bin' directory under your home directory +-TKMOO_BIN_DIR = $(HOME)/bin ++TKMOO_BIN_DIR ?= $(HOME)/bin + + # which version of WISH will the client use? 'make' will warn you + # if WISH can't be found where you say it is. + WISH4.1 = /usr/local/bin/wish4.1 + WISH4.2 = /usr/local/bin/wish4.2 + WISH8.0 = /usr/local/bin/wish8.0 +-WISH8.3 = /usr/local/bin/wish8.3 ++WISH8.3 ?= /usr/local/bin/wish8.4 + WISH = $(WISH8.3) + + # ---------------- NO NEED TO CHANGE ANYTHING BELOW THIS LINE --------------- diff --git a/games/tkmoo/files/patch-aa b/games/tkmoo/files/patch-aa deleted file mode 100644 index 4c308735..0000000 --- a/games/tkmoo/files/patch-aa +++ /dev/null @@ -1,24 +0,0 @@ ---- Makefile.orig Tue Nov 6 00:52:01 2001 -+++ Makefile Sun Dec 2 08:59:00 2001 -@@ -7,18 +7,18 @@ - # ... in the '.tkMOO-lite' directory under your home directory - # ** if you change this value then you'll need to set your TKMOO_LIB_DIR - # ** environment variable to the same value --TKMOO_LIB_DIR = $(HOME)/.tkMOO-lite -+TKMOO_LIB_DIR ?= $(HOME)/.tkMOO-lite - - # where will the executable be installed? - # ... in the 'bin' directory under your home directory --TKMOO_BIN_DIR = $(HOME)/bin -+TKMOO_BIN_DIR ?= $(HOME)/bin - - # which version of WISH will the client use? 'make' will warn you - # if WISH can't be found where you say it is. - WISH4.1 = /usr/local/bin/wish4.1 - WISH4.2 = /usr/local/bin/wish4.2 - WISH8.0 = /usr/local/bin/wish8.0 --WISH8.3 = /usr/local/bin/wish8.3 -+WISH8.3 ?= /usr/local/bin/wish8.4 - WISH = $(WISH8.3) - - # ---------------- NO NEED TO CHANGE ANYTHING BELOW THIS LINE --------------- diff --git a/games/wmshuffle/files/patch-Makefile b/games/wmshuffle/files/patch-Makefile new file mode 100644 index 0000000..c121f42 --- /dev/null +++ b/games/wmshuffle/files/patch-Makefile @@ -0,0 +1,30 @@ +--- Makefile.orig Wed May 15 18:38:32 2002 ++++ Makefile Wed May 15 18:43:28 2002 +@@ -1,14 +1,17 @@ +-LIBDIR = -L/usr/X11R6/lib ++CC ?= gcc ++CFLAGS += -c -Wall ++INCDIR = -I${LOCALBASE}/include ++LIBDIR = -L${LOCALBASE}/lib + LIBS = -lXpm -lXext -lX11 + OBJS = wmshuffle.o ./wmgeneral/wmgeneral.o + + .c.o: +- cc -c -g -O2 -Wall $< -o $*.o ++ ${CC} ${CFLAGS} ${INCDIR} $< -o $*.o + + all: wmshuffle + + wmshuffle: $(OBJS) +- cc -o wmshuffle $^ $(LIBDIR) $(LIBS) ++ ${CC} -o wmshuffle $^ ${LIBDIR} ${LIBS} + + clean: + for i in $(OBJS) ; do \ +@@ -17,5 +20,4 @@ + rm -rf wmshuffle core *~ + + install: +- /usr/bin/install -c -o 0 -g 0 -s -m 755 wmshuffle /usr/local/bin/wmshuffle +- ++ @/usr/bin/install -c -s -m 755 wmshuffle ${DESTDIR}${PREFIX}/bin/wmshuffle diff --git a/games/wmshuffle/files/patch-aa b/games/wmshuffle/files/patch-aa deleted file mode 100644 index c121f42..0000000 --- a/games/wmshuffle/files/patch-aa +++ /dev/null @@ -1,30 +0,0 @@ ---- Makefile.orig Wed May 15 18:38:32 2002 -+++ Makefile Wed May 15 18:43:28 2002 -@@ -1,14 +1,17 @@ --LIBDIR = -L/usr/X11R6/lib -+CC ?= gcc -+CFLAGS += -c -Wall -+INCDIR = -I${LOCALBASE}/include -+LIBDIR = -L${LOCALBASE}/lib - LIBS = -lXpm -lXext -lX11 - OBJS = wmshuffle.o ./wmgeneral/wmgeneral.o - - .c.o: -- cc -c -g -O2 -Wall $< -o $*.o -+ ${CC} ${CFLAGS} ${INCDIR} $< -o $*.o - - all: wmshuffle - - wmshuffle: $(OBJS) -- cc -o wmshuffle $^ $(LIBDIR) $(LIBS) -+ ${CC} -o wmshuffle $^ ${LIBDIR} ${LIBS} - - clean: - for i in $(OBJS) ; do \ -@@ -17,5 +20,4 @@ - rm -rf wmshuffle core *~ - - install: -- /usr/bin/install -c -o 0 -g 0 -s -m 755 wmshuffle /usr/local/bin/wmshuffle -- -+ @/usr/bin/install -c -s -m 755 wmshuffle ${DESTDIR}${PREFIX}/bin/wmshuffle diff --git a/games/wmtictactoe/files/patch-Makefile b/games/wmtictactoe/files/patch-Makefile new file mode 100644 index 0000000..93830cb --- /dev/null +++ b/games/wmtictactoe/files/patch-Makefile @@ -0,0 +1,30 @@ +--- Makefile.orig Mon Mar 29 07:41:40 1999 ++++ Makefile Sat Jun 26 18:00:10 1999 +@@ -1,14 +1,17 @@ +-LIBDIR = -L/usr/X11R6/lib ++CC ?= gcc ++CFLAGS += -c -Wall ++INCLUDES = -I${LOCALBASE}/include ++LIBDIR = -L${LOCALBASE}/lib + LIBS = -lXpm -lXext -lX11 + OBJS = wmtictactoe.o ../wmgeneral/wmgeneral.o + + .c.o: +- cc -c -g -O2 -Wall $< -o $*.o ++ ${CC} ${CFLAGS} ${INCLUDES} $< -o $*.o + + all: wmtictactoe + + wmtictactoe: $(OBJS) +- cc -o wmtictactoe $^ $(LIBDIR) $(LIBS) ++ ${CC} -o wmtictactoe $^ ${LIBDIR} ${LIBS} + + clean: + for i in $(OBJS) ; do \ +@@ -17,5 +20,4 @@ + rm wmtictactoe + + install: +- /usr/bin/install -c -o 0 -g 0 -s -m 755 wmtictactoe /usr/local/bin/wmtictactoe +- ++ @/usr/bin/install -c -s -m 755 wmtictactoe ${DESTDIR}${PREFIX}/bin/wmtictactoe diff --git a/games/wmtictactoe/files/patch-aa b/games/wmtictactoe/files/patch-aa deleted file mode 100644 index 93830cb..0000000 --- a/games/wmtictactoe/files/patch-aa +++ /dev/null @@ -1,30 +0,0 @@ ---- Makefile.orig Mon Mar 29 07:41:40 1999 -+++ Makefile Sat Jun 26 18:00:10 1999 -@@ -1,14 +1,17 @@ --LIBDIR = -L/usr/X11R6/lib -+CC ?= gcc -+CFLAGS += -c -Wall -+INCLUDES = -I${LOCALBASE}/include -+LIBDIR = -L${LOCALBASE}/lib - LIBS = -lXpm -lXext -lX11 - OBJS = wmtictactoe.o ../wmgeneral/wmgeneral.o - - .c.o: -- cc -c -g -O2 -Wall $< -o $*.o -+ ${CC} ${CFLAGS} ${INCLUDES} $< -o $*.o - - all: wmtictactoe - - wmtictactoe: $(OBJS) -- cc -o wmtictactoe $^ $(LIBDIR) $(LIBS) -+ ${CC} -o wmtictactoe $^ ${LIBDIR} ${LIBS} - - clean: - for i in $(OBJS) ; do \ -@@ -17,5 +20,4 @@ - rm wmtictactoe - - install: -- /usr/bin/install -c -o 0 -g 0 -s -m 755 wmtictactoe /usr/local/bin/wmtictactoe -- -+ @/usr/bin/install -c -s -m 755 wmtictactoe ${DESTDIR}${PREFIX}/bin/wmtictactoe diff --git a/games/xataxx/files/patch-Imakefile b/games/xataxx/files/patch-Imakefile new file mode 100644 index 0000000..41f9e90 --- /dev/null +++ b/games/xataxx/files/patch-Imakefile @@ -0,0 +1,27 @@ +--- ./Imakefile.orig 1991-10-29 02:23:52.000000000 -0200 ++++ ./Imakefile 2013-11-16 00:46:31.000000000 -0200 +@@ -4,11 +4,13 @@ + # in the system default BINDIR + # BINDIR = + ++MANSUFFIX = 6 ++ + # !%^#* + DEPLIBS = + + /* DATADIR is where the boards and bitmaps will be installed */ +-DATADIR = /afs/andrew.cmu.edu/usr0/games/lib/xataxx ++DATADIR = $(LOCALBASE)/share/xataxx + + LOCAL_LIBRARIES = $(XLIB) + SRCS = bits.c board.c colbits.c demo.c display.c main.c nubot.c parse.c zot.c +@@ -19,6 +21,8 @@ + install:: install.lib + + install.lib: ++ @if [ -d $(DESTDIR)$(DATADIR) ]; then set +x; \ ++ else (set -x; $(MKDIRHIER) $(DESTDIR)$(DATADIR)); fi + for i in lib//**/*; do \ +- (set -x; install -c $$i $(DATADIR)); \ ++ (set -x; install -c $$i $(DESTDIR)$(DATADIR)); \ + done diff --git a/games/xataxx/files/patch-aa b/games/xataxx/files/patch-aa deleted file mode 100644 index 41f9e90..0000000 --- a/games/xataxx/files/patch-aa +++ /dev/null @@ -1,27 +0,0 @@ ---- ./Imakefile.orig 1991-10-29 02:23:52.000000000 -0200 -+++ ./Imakefile 2013-11-16 00:46:31.000000000 -0200 -@@ -4,11 +4,13 @@ - # in the system default BINDIR - # BINDIR = - -+MANSUFFIX = 6 -+ - # !%^#* - DEPLIBS = - - /* DATADIR is where the boards and bitmaps will be installed */ --DATADIR = /afs/andrew.cmu.edu/usr0/games/lib/xataxx -+DATADIR = $(LOCALBASE)/share/xataxx - - LOCAL_LIBRARIES = $(XLIB) - SRCS = bits.c board.c colbits.c demo.c display.c main.c nubot.c parse.c zot.c -@@ -19,6 +21,8 @@ - install:: install.lib - - install.lib: -+ @if [ -d $(DESTDIR)$(DATADIR) ]; then set +x; \ -+ else (set -x; $(MKDIRHIER) $(DESTDIR)$(DATADIR)); fi - for i in lib//**/*; do \ -- (set -x; install -c $$i $(DATADIR)); \ -+ (set -x; install -c $$i $(DESTDIR)$(DATADIR)); \ - done diff --git a/games/xbat/files/patch-Imakefile b/games/xbat/files/patch-Imakefile new file mode 100644 index 0000000..6165e9f --- /dev/null +++ b/games/xbat/files/patch-Imakefile @@ -0,0 +1,34 @@ +--- Imakefile.orig Mon Mar 17 12:32:22 1997 ++++ Imakefile Tue Jul 1 18:37:39 1997 +@@ -1,24 +1,24 @@ + # TOP10 DIR : directory for socre files + # +-SCORE_DIR = /usr/local/games/Xbat/Score ++SCORE_DIR = ${PREFIX}/lib/X11/Xbat/Score + + # IMAGE DIR : directory for image files +-IMAGE_DIR = /usr/local/games/Xbat/Image ++IMAGE_DIR = ${PREFIX}/lib/X11/Xbat/Image + + # MAP DIR : directory for map files +-MAP_DIR = /usr/local/games/Xbat/Map ++MAP_DIR = ${PREFIX}/lib/X11/Xbat/Map + + # DOMO_DIR : directory for domogram movement files +-DOMO_DIR = /usr/local/games/Xbat/Domo ++DOMO_DIR = ${PREFIX}/lib/X11/Xbat/Domo + + # UNION : Set 1 if you have Intel CPU or so. + # If you don't know whether you have Intel CPU or not, + # compile union_check.c and run. +-UNION = 0 +-#UNION = 1 ++#UNION = 0 ++UNION = 1 + + #BIN DIR +-BINDIR = /usr/local/bin ++BINDIR = ${PREFIX}/bin + + ####################################################################### + diff --git a/games/xbat/files/patch-aa b/games/xbat/files/patch-aa deleted file mode 100644 index 6165e9f..0000000 --- a/games/xbat/files/patch-aa +++ /dev/null @@ -1,34 +0,0 @@ ---- Imakefile.orig Mon Mar 17 12:32:22 1997 -+++ Imakefile Tue Jul 1 18:37:39 1997 -@@ -1,24 +1,24 @@ - # TOP10 DIR : directory for socre files - # --SCORE_DIR = /usr/local/games/Xbat/Score -+SCORE_DIR = ${PREFIX}/lib/X11/Xbat/Score - - # IMAGE DIR : directory for image files --IMAGE_DIR = /usr/local/games/Xbat/Image -+IMAGE_DIR = ${PREFIX}/lib/X11/Xbat/Image - - # MAP DIR : directory for map files --MAP_DIR = /usr/local/games/Xbat/Map -+MAP_DIR = ${PREFIX}/lib/X11/Xbat/Map - - # DOMO_DIR : directory for domogram movement files --DOMO_DIR = /usr/local/games/Xbat/Domo -+DOMO_DIR = ${PREFIX}/lib/X11/Xbat/Domo - - # UNION : Set 1 if you have Intel CPU or so. - # If you don't know whether you have Intel CPU or not, - # compile union_check.c and run. --UNION = 0 --#UNION = 1 -+#UNION = 0 -+UNION = 1 - - #BIN DIR --BINDIR = /usr/local/bin -+BINDIR = ${PREFIX}/bin - - ####################################################################### - diff --git a/games/xblood/files/patch-Makefile b/games/xblood/files/patch-Makefile new file mode 100644 index 0000000..11a7325 --- /dev/null +++ b/games/xblood/files/patch-Makefile @@ -0,0 +1,30 @@ +--- ./Makefile.orig 2000-02-26 19:02:52.000000000 -0200 ++++ ./Makefile 2013-11-12 23:55:39.000000000 -0200 +@@ -1,12 +1,12 @@ +-PREFIX = /usr/X11R6 +-X11BASE = /usr/X11R6 ++#PREFIX = /usr/X11R6 ++#X11BASE = /usr/X11R6 + INCLUDEDIR = $(X11BASE)/include + LIBDIR = $(X11BASE)/lib + BINDIR = $(PREFIX)/bin + MANDIR = $(PREFIX)/man/man1 +-CC = gcc ++#CC = gcc + RM = rm -f +-CFLAGS = -O ++#CFLAGS = -O + LIBS = -lX11 + PKGNAME = xblood-2.0 + VERSION = XBlood-2.0 +@@ -27,8 +27,8 @@ + $(RM) xblood.1.gz + + install : +- cp xblood $(BINDIR) +- cp xblood.1.gz $(MANDIR) ++ cp xblood ${DESTDIR}$(BINDIR) ++ cp xblood.1.gz ${DESTDIR}$(MANDIR) + + uninstall : + $(RM) $(BINDIR)/xblood diff --git a/games/xblood/files/patch-aa b/games/xblood/files/patch-aa deleted file mode 100644 index 11a7325..0000000 --- a/games/xblood/files/patch-aa +++ /dev/null @@ -1,30 +0,0 @@ ---- ./Makefile.orig 2000-02-26 19:02:52.000000000 -0200 -+++ ./Makefile 2013-11-12 23:55:39.000000000 -0200 -@@ -1,12 +1,12 @@ --PREFIX = /usr/X11R6 --X11BASE = /usr/X11R6 -+#PREFIX = /usr/X11R6 -+#X11BASE = /usr/X11R6 - INCLUDEDIR = $(X11BASE)/include - LIBDIR = $(X11BASE)/lib - BINDIR = $(PREFIX)/bin - MANDIR = $(PREFIX)/man/man1 --CC = gcc -+#CC = gcc - RM = rm -f --CFLAGS = -O -+#CFLAGS = -O - LIBS = -lX11 - PKGNAME = xblood-2.0 - VERSION = XBlood-2.0 -@@ -27,8 +27,8 @@ - $(RM) xblood.1.gz - - install : -- cp xblood $(BINDIR) -- cp xblood.1.gz $(MANDIR) -+ cp xblood ${DESTDIR}$(BINDIR) -+ cp xblood.1.gz ${DESTDIR}$(MANDIR) - - uninstall : - $(RM) $(BINDIR)/xblood diff --git a/games/xbomber/files/patch-aa b/games/xbomber/files/patch-aa deleted file mode 100644 index d4e650e..0000000 --- a/games/xbomber/files/patch-aa +++ /dev/null @@ -1,28 +0,0 @@ ---- makefile.orig Fri Jun 19 12:28:34 1998 -+++ makefile Sat Aug 12 02:54:15 2000 -@@ -11,21 +11,21 @@ - - # Makefile user-definable variables------------------------------------------ - --CC=gcc -+CC?=gcc - MATHLIB=-lm --CFLAGS=-I/usr/X11/include -+CFLAGS+=-I${LOCALBASE}/include -DDATADIR=\"${PREFIX}/share/xbomber\" - - # Change this to "touch" if your system doesn't have the "strip" command: - POSTPROCESS=strip - - # adjust according to target --XLIB=-L/usr/X11/lib -lX11 -+#XLIB=-L/usr/X11/lib -lX11 - - # uncomment for sunos/solaris - #XLIB=-L/usr/openwin/lib -lX11 - - # uncomment for FreeBSD --#XLIB=-L /usr/X11R6/lib -lX11 -lcompat -+XLIB=-L${LOCALBASE}/lib -lX11 -lcompat - - # End of makefile user-definable variables----------------------------------- - diff --git a/games/xbomber/files/patch-ac b/games/xbomber/files/patch-ac deleted file mode 100644 index 4b5ec3c..0000000 --- a/games/xbomber/files/patch-ac +++ /dev/null @@ -1,84 +0,0 @@ ---- xbomber.c.orig Sat Jun 20 11:09:35 1998 -+++ xbomber.c Sat Aug 12 03:09:36 2000 -@@ -1599,7 +1599,7 @@ - /* Get -color switch: */ - - use_color = 0; -- strcpy(graphicsset, "./pixmaps"); -+ strcpy(graphicsset, DATADIR "/pixmaps"); - - if (argc >= 2) - { -@@ -1683,7 +1683,7 @@ - - for (i = 0; i < NUM_SOUNDS; i++) - { -- sprintf(file, "sounds/%s.au", sound_names[i]); -+ sprintf(file, DATADIR "/sounds/%s.au", sound_names[i]); - - fi = fopen(file, "r"); - if (fi != NULL) -@@ -1720,7 +1720,7 @@ - - for (i = 0; i < NUM_NSOUNDS; i++) - { -- sprintf(file, "sounds/numbers/%s.au", nsound_names[i]); -+ sprintf(file, DATADIR "/sounds/numbers/%s.au", nsound_names[i]); - - fi = fopen(file, "r"); - if (fi != NULL) -@@ -2096,23 +2096,23 @@ - - /* Make cursor: */ - -- ret = XReadBitmapFile(display[pln], window[pln], "bitmaps/cursor.xbm", -+ ret = XReadBitmapFile(display[pln], window[pln], DATADIR "/bitmaps/cursor.xbm", - &tempint1, &tempint2, &cursor_pixmap[pln], - &tempint3, &tempint4); - - if (ret != BitmapSuccess) - { -- perror("bitmaps/cursor.xbm"); -+ perror(DATADIR "/bitmaps/cursor.xbm"); - exit(1); - } - -- ret = XReadBitmapFile(display[pln], window[pln], "bitmaps/cursor-mask.xbm", -+ ret = XReadBitmapFile(display[pln], window[pln], DATADIR "/bitmaps/cursor-mask.xbm", - &tempint1, &tempint2, &cursor_mask[pln], - &tempint3, &tempint4); - - if (ret != BitmapSuccess) - { -- perror("bitmaps/cursor-mask.xbm"); -+ perror(DATADIR "/bitmaps/cursor-mask.xbm"); - exit(1); - } - -@@ -2149,7 +2149,7 @@ - black[pln], - has_color[pln])); - -- sprintf(file, "bitmaps/%s.xbm", object_names[i]); -+ sprintf(file, DATADIR "/bitmaps/%s.xbm", object_names[i]); - - ret = XReadBitmapFile(display[pln], window[pln], file, - &tempint1, &tempint2, -@@ -2863,7 +2863,7 @@ - - /* Load level layout on top of this: */ - -- sprintf(filename, "levels/level%.2d.dat", level); -+ sprintf(filename, DATADIR "/levels/level%.2d.dat", level); - - fi = fopen(filename, "r"); - if (fi == NULL) -@@ -3303,7 +3303,7 @@ - { - c = '.'; - -- sprintf(file, "pixmaps/%s.ppm", object_names[i]); -+ sprintf(file, DATADIR "/pixmaps/%s.ppm", object_names[i]); - - fi = fopen(file, "r"); - if (fi == NULL) diff --git a/games/xbomber/files/patch-makefile b/games/xbomber/files/patch-makefile new file mode 100644 index 0000000..d4e650e --- /dev/null +++ b/games/xbomber/files/patch-makefile @@ -0,0 +1,28 @@ +--- makefile.orig Fri Jun 19 12:28:34 1998 ++++ makefile Sat Aug 12 02:54:15 2000 +@@ -11,21 +11,21 @@ + + # Makefile user-definable variables------------------------------------------ + +-CC=gcc ++CC?=gcc + MATHLIB=-lm +-CFLAGS=-I/usr/X11/include ++CFLAGS+=-I${LOCALBASE}/include -DDATADIR=\"${PREFIX}/share/xbomber\" + + # Change this to "touch" if your system doesn't have the "strip" command: + POSTPROCESS=strip + + # adjust according to target +-XLIB=-L/usr/X11/lib -lX11 ++#XLIB=-L/usr/X11/lib -lX11 + + # uncomment for sunos/solaris + #XLIB=-L/usr/openwin/lib -lX11 + + # uncomment for FreeBSD +-#XLIB=-L /usr/X11R6/lib -lX11 -lcompat ++XLIB=-L${LOCALBASE}/lib -lX11 -lcompat + + # End of makefile user-definable variables----------------------------------- + diff --git a/games/xbomber/files/patch-xbomber.c b/games/xbomber/files/patch-xbomber.c new file mode 100644 index 0000000..4b5ec3c --- /dev/null +++ b/games/xbomber/files/patch-xbomber.c @@ -0,0 +1,84 @@ +--- xbomber.c.orig Sat Jun 20 11:09:35 1998 ++++ xbomber.c Sat Aug 12 03:09:36 2000 +@@ -1599,7 +1599,7 @@ + /* Get -color switch: */ + + use_color = 0; +- strcpy(graphicsset, "./pixmaps"); ++ strcpy(graphicsset, DATADIR "/pixmaps"); + + if (argc >= 2) + { +@@ -1683,7 +1683,7 @@ + + for (i = 0; i < NUM_SOUNDS; i++) + { +- sprintf(file, "sounds/%s.au", sound_names[i]); ++ sprintf(file, DATADIR "/sounds/%s.au", sound_names[i]); + + fi = fopen(file, "r"); + if (fi != NULL) +@@ -1720,7 +1720,7 @@ + + for (i = 0; i < NUM_NSOUNDS; i++) + { +- sprintf(file, "sounds/numbers/%s.au", nsound_names[i]); ++ sprintf(file, DATADIR "/sounds/numbers/%s.au", nsound_names[i]); + + fi = fopen(file, "r"); + if (fi != NULL) +@@ -2096,23 +2096,23 @@ + + /* Make cursor: */ + +- ret = XReadBitmapFile(display[pln], window[pln], "bitmaps/cursor.xbm", ++ ret = XReadBitmapFile(display[pln], window[pln], DATADIR "/bitmaps/cursor.xbm", + &tempint1, &tempint2, &cursor_pixmap[pln], + &tempint3, &tempint4); + + if (ret != BitmapSuccess) + { +- perror("bitmaps/cursor.xbm"); ++ perror(DATADIR "/bitmaps/cursor.xbm"); + exit(1); + } + +- ret = XReadBitmapFile(display[pln], window[pln], "bitmaps/cursor-mask.xbm", ++ ret = XReadBitmapFile(display[pln], window[pln], DATADIR "/bitmaps/cursor-mask.xbm", + &tempint1, &tempint2, &cursor_mask[pln], + &tempint3, &tempint4); + + if (ret != BitmapSuccess) + { +- perror("bitmaps/cursor-mask.xbm"); ++ perror(DATADIR "/bitmaps/cursor-mask.xbm"); + exit(1); + } + +@@ -2149,7 +2149,7 @@ + black[pln], + has_color[pln])); + +- sprintf(file, "bitmaps/%s.xbm", object_names[i]); ++ sprintf(file, DATADIR "/bitmaps/%s.xbm", object_names[i]); + + ret = XReadBitmapFile(display[pln], window[pln], file, + &tempint1, &tempint2, +@@ -2863,7 +2863,7 @@ + + /* Load level layout on top of this: */ + +- sprintf(filename, "levels/level%.2d.dat", level); ++ sprintf(filename, DATADIR "/levels/level%.2d.dat", level); + + fi = fopen(filename, "r"); + if (fi == NULL) +@@ -3303,7 +3303,7 @@ + { + c = '.'; + +- sprintf(file, "pixmaps/%s.ppm", object_names[i]); ++ sprintf(file, DATADIR "/pixmaps/%s.ppm", object_names[i]); + + fi = fopen(file, "r"); + if (fi == NULL) diff --git a/games/xchadance/Makefile b/games/xchadance/Makefile index 8781360..af23e91 100644 --- a/games/xchadance/Makefile +++ b/games/xchadance/Makefile @@ -16,17 +16,17 @@ USE_XORG= x11 MAKEFILE= makefile NO_WRKSUBDIR= yes +OPTIONS_DEFINE= DOCS + RESTRICTED= 'contains commercial character data' post-patch: - @cd ${WRKSRC}; \ - ${PATCH} < ${WRKSRC}/xchada01.bug + @(cd ${WRKSRC}; \ + ${PATCH} < ${WRKSRC}/xchada01.bug) post-install: -.if !defined(NOPORTOCS) - @${MKDIR} ${STAGEDIR}${PREFIX}/share/doc/xchadance - @${INSTALL_DATA} ${WRKSRC}/README.jp ${STAGEDIR}${PREFIX}/share/doc/xchadance - @${INSTALL_DATA} ${WRKSRC}/README.eng ${STAGEDIR}${PREFIX}/share/doc/xchadance -.endif + @${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/README.jp ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/README.eng ${STAGEDIR}${DOCSDIR} .include diff --git a/games/xchadance/files/patch-Makefile b/games/xchadance/files/patch-Makefile new file mode 100644 index 0000000..6ebb43b --- /dev/null +++ b/games/xchadance/files/patch-Makefile @@ -0,0 +1,27 @@ +--- makefile.orig 1994-03-07 21:10:46.000000000 +0800 ++++ makefile 2014-06-08 11:28:02.677008487 +0800 +@@ -1,6 +1,7 @@ +-CC = gcc +-CFLAGS = -Wall -O +-BINDIR = /usr/local/bin/ ++#CC = gcc ++CFLAGS+= -I${PREFIX}/include ++LDFLAGS+= -L${PREFIX}/lib -lX11 ++BINDIR= ${PREFIX}/bin/ + + + all : xchadance +@@ -9,11 +10,11 @@ clean : + rm *.o *~ *.bak core.* a.out + + install : +- cp xchadance $(BINDIR) ++ install -c -s xchadance $(DESTDIR)$(BINDIR) + + + xchadance : xchadance.o chadata.o +- $(CC) xchadance.o chadata.o -o xchadance -lX11 ++ $(CC) xchadance.o chadata.o -o xchadance ${LDFLAGS} + + + xchadance.o : xchadance.c xchadance.h diff --git a/games/xchadance/files/patch-aa b/games/xchadance/files/patch-aa deleted file mode 100644 index 6ebb43b..0000000 --- a/games/xchadance/files/patch-aa +++ /dev/null @@ -1,27 +0,0 @@ ---- makefile.orig 1994-03-07 21:10:46.000000000 +0800 -+++ makefile 2014-06-08 11:28:02.677008487 +0800 -@@ -1,6 +1,7 @@ --CC = gcc --CFLAGS = -Wall -O --BINDIR = /usr/local/bin/ -+#CC = gcc -+CFLAGS+= -I${PREFIX}/include -+LDFLAGS+= -L${PREFIX}/lib -lX11 -+BINDIR= ${PREFIX}/bin/ - - - all : xchadance -@@ -9,11 +10,11 @@ clean : - rm *.o *~ *.bak core.* a.out - - install : -- cp xchadance $(BINDIR) -+ install -c -s xchadance $(DESTDIR)$(BINDIR) - - - xchadance : xchadance.o chadata.o -- $(CC) xchadance.o chadata.o -o xchadance -lX11 -+ $(CC) xchadance.o chadata.o -o xchadance ${LDFLAGS} - - - xchadance.o : xchadance.c xchadance.h diff --git a/games/xchadance/pkg-plist b/games/xchadance/pkg-plist index e286610..ecd3bac 100644 --- a/games/xchadance/pkg-plist +++ b/games/xchadance/pkg-plist @@ -1,4 +1,4 @@ bin/xchadance -share/doc/xchadance/README.eng -share/doc/xchadance/README.jp -@dirrm share/doc/xchadance +%%PORTDOCS%%%%DOCSDIR%%/README.eng +%%PORTDOCS%%%%DOCSDIR%%/README.jp +%%PORTDOCS%%@dirrm %%DOCSDIR%% diff --git a/games/xchomp/files/patch-Imakefile b/games/xchomp/files/patch-Imakefile new file mode 100644 index 0000000..97fc978 --- /dev/null +++ b/games/xchomp/files/patch-Imakefile @@ -0,0 +1,17 @@ +--- Imakefile.orig Fri Mar 18 14:16:10 1994 ++++ Imakefile Wed Nov 1 09:32:17 2000 +@@ -2,7 +2,7 @@ + #include BandAidCompiler + #endif + +-DEFINES = -DX11 ++DEFINES = -DX11 -DFRAME_DELAY=40000 + INCLUDES = -I$(TOP) -I$(TOP)/X11 + DEPLIBS = $(DEPXLIB) + LOCAL_LIBRARIES = $(XLIB) +@@ -11,4 +11,4 @@ + SRCS = contact.c demo.c drivers.c main.c maze.c props.c resources.c status.c + OBJS = contact.o demo.o drivers.o main.o maze.o props.o resources.o status.o + +-ComplexProgramTarget(xchomp) ++ComplexProgramTargetNoMan(xchomp) diff --git a/games/xchomp/files/patch-aa b/games/xchomp/files/patch-aa deleted file mode 100644 index 97fc978..0000000 --- a/games/xchomp/files/patch-aa +++ /dev/null @@ -1,17 +0,0 @@ ---- Imakefile.orig Fri Mar 18 14:16:10 1994 -+++ Imakefile Wed Nov 1 09:32:17 2000 -@@ -2,7 +2,7 @@ - #include BandAidCompiler - #endif - --DEFINES = -DX11 -+DEFINES = -DX11 -DFRAME_DELAY=40000 - INCLUDES = -I$(TOP) -I$(TOP)/X11 - DEPLIBS = $(DEPXLIB) - LOCAL_LIBRARIES = $(XLIB) -@@ -11,4 +11,4 @@ - SRCS = contact.c demo.c drivers.c main.c maze.c props.c resources.c status.c - OBJS = contact.o demo.o drivers.o main.o maze.o props.o resources.o status.o - --ComplexProgramTarget(xchomp) -+ComplexProgramTargetNoMan(xchomp) diff --git a/games/xdeblock/files/patch-Imakefile b/games/xdeblock/files/patch-Imakefile new file mode 100644 index 0000000..6abcf9a --- /dev/null +++ b/games/xdeblock/files/patch-Imakefile @@ -0,0 +1,57 @@ +*** Imakefile.orig 1996-11-16 13:06:36.000000000 +0900 +--- Imakefile 2011-04-15 01:51:45.000000000 +0900 +*************** +*** 10,16 **** + XCOMM Set xdeblock working directory. + XCOMM ===================================================================== + +! XDEBLO_DIR = . + + XCOMM ===================================================================== + XCOMM Set xpm. +--- 10,16 ---- + XCOMM Set xdeblock working directory. + XCOMM ===================================================================== + +! XDEBLO_DIR = $(LIBDIR)/xdeblock + + XCOMM ===================================================================== + XCOMM Set xpm. +*************** +*** 20,27 **** + XCOMM abc% find /usr -name xpm.h -print + XCOMM ===================================================================== + +! XPM_INC = -I/usr/include/X11 +! XPMLIB_DIR = -L/usr/lib + + XCOMM ===================================================================== + +--- 20,27 ---- + XCOMM abc% find /usr -name xpm.h -print + XCOMM ===================================================================== + +! XPM_INC = -I$(INCDIR)/X11 +! XPMLIB_DIR = -L$(USRLIBDIR) + + XCOMM ===================================================================== + +*************** +*** 46,53 **** + + PROGRAMS = xdeblo + +! CFLAGS = $(CDEBUGFLAGS) $(CCOPTIONS) $(THREADS_CFLAGS) $(ALLDEFINES)\ +! $(XPM_INC) $(DEBUG_D) $(ALLINCLUDES) + + all:: $(PROGRAMS) + +--- 46,53 ---- + + PROGRAMS = xdeblo + +! CFLAGS += $(CDEBUGFLAGS) $(CCOPTIONS) $(THREADS_CFLAGS) $(ALLDEFINES)\ +! $(XPM_INC) $(DEBUG_D) $(ALLINCLUDES) + + all:: $(PROGRAMS) + diff --git a/games/xdeblock/files/patch-aa b/games/xdeblock/files/patch-aa deleted file mode 100644 index 6abcf9a..0000000 --- a/games/xdeblock/files/patch-aa +++ /dev/null @@ -1,57 +0,0 @@ -*** Imakefile.orig 1996-11-16 13:06:36.000000000 +0900 ---- Imakefile 2011-04-15 01:51:45.000000000 +0900 -*************** -*** 10,16 **** - XCOMM Set xdeblock working directory. - XCOMM ===================================================================== - -! XDEBLO_DIR = . - - XCOMM ===================================================================== - XCOMM Set xpm. ---- 10,16 ---- - XCOMM Set xdeblock working directory. - XCOMM ===================================================================== - -! XDEBLO_DIR = $(LIBDIR)/xdeblock - - XCOMM ===================================================================== - XCOMM Set xpm. -*************** -*** 20,27 **** - XCOMM abc% find /usr -name xpm.h -print - XCOMM ===================================================================== - -! XPM_INC = -I/usr/include/X11 -! XPMLIB_DIR = -L/usr/lib - - XCOMM ===================================================================== - ---- 20,27 ---- - XCOMM abc% find /usr -name xpm.h -print - XCOMM ===================================================================== - -! XPM_INC = -I$(INCDIR)/X11 -! XPMLIB_DIR = -L$(USRLIBDIR) - - XCOMM ===================================================================== - -*************** -*** 46,53 **** - - PROGRAMS = xdeblo - -! CFLAGS = $(CDEBUGFLAGS) $(CCOPTIONS) $(THREADS_CFLAGS) $(ALLDEFINES)\ -! $(XPM_INC) $(DEBUG_D) $(ALLINCLUDES) - - all:: $(PROGRAMS) - ---- 46,53 ---- - - PROGRAMS = xdeblo - -! CFLAGS += $(CDEBUGFLAGS) $(CCOPTIONS) $(THREADS_CFLAGS) $(ALLDEFINES)\ -! $(XPM_INC) $(DEBUG_D) $(ALLINCLUDES) - - all:: $(PROGRAMS) - diff --git a/games/xdeblock/files/patch-ab b/games/xdeblock/files/patch-ab deleted file mode 100644 index d732280..0000000 --- a/games/xdeblock/files/patch-ab +++ /dev/null @@ -1,19 +0,0 @@ -*** main.c.orig Sat Nov 16 14:37:16 1996 ---- main.c Thu Jan 15 00:00:00 2000 -*************** -*** 66,72 **** - /*** set s_map ***/ - gameMainFlg.s_map = False; - nowDataRec.nowMap.gameSpeed = 90; -! nowDataRec.nowMap.dirname[0] == 0x00; - - for(i =1; i < argc; i++) - { ---- 66,72 ---- - /*** set s_map ***/ - gameMainFlg.s_map = False; - nowDataRec.nowMap.gameSpeed = 90; -! strcpy(nowDataRec.nowMap.dirname, "%%PREFIX%%/lib/X11/xdeblock/mapf"); - - for(i =1; i < argc; i++) - { diff --git a/games/xdeblock/files/patch-ac b/games/xdeblock/files/patch-ac deleted file mode 100644 index d89daf3..0000000 --- a/games/xdeblock/files/patch-ac +++ /dev/null @@ -1,36 +0,0 @@ -*** dialog.c.orig Sat Nov 16 14:37:15 1996 ---- dialog.c Fri Jan 15 00:00:00 2000 -*************** -*** 8,14 **** - - #include - #include -! #include - - #include "gameheader.h" - ---- 8,14 ---- - - #include - #include -! #include - - #include "gameheader.h" - -*************** -*** 430,436 **** - char *fflag; - { - DIR *dp; -! struct direct *dir; - struct stat sbuf; - char newname[256]; - register i = 0; ---- 430,436 ---- - char *fflag; - { - DIR *dp; -! struct dirent *dir; - struct stat sbuf; - char newname[256]; - register i = 0; diff --git a/games/xdeblock/files/patch-dialog.c b/games/xdeblock/files/patch-dialog.c new file mode 100644 index 0000000..d89daf3 --- /dev/null +++ b/games/xdeblock/files/patch-dialog.c @@ -0,0 +1,36 @@ +*** dialog.c.orig Sat Nov 16 14:37:15 1996 +--- dialog.c Fri Jan 15 00:00:00 2000 +*************** +*** 8,14 **** + + #include + #include +! #include + + #include "gameheader.h" + +--- 8,14 ---- + + #include + #include +! #include + + #include "gameheader.h" + +*************** +*** 430,436 **** + char *fflag; + { + DIR *dp; +! struct direct *dir; + struct stat sbuf; + char newname[256]; + register i = 0; +--- 430,436 ---- + char *fflag; + { + DIR *dp; +! struct dirent *dir; + struct stat sbuf; + char newname[256]; + register i = 0; diff --git a/games/xdeblock/files/patch-main.c b/games/xdeblock/files/patch-main.c new file mode 100644 index 0000000..d732280 --- /dev/null +++ b/games/xdeblock/files/patch-main.c @@ -0,0 +1,19 @@ +*** main.c.orig Sat Nov 16 14:37:16 1996 +--- main.c Thu Jan 15 00:00:00 2000 +*************** +*** 66,72 **** + /*** set s_map ***/ + gameMainFlg.s_map = False; + nowDataRec.nowMap.gameSpeed = 90; +! nowDataRec.nowMap.dirname[0] == 0x00; + + for(i =1; i < argc; i++) + { +--- 66,72 ---- + /*** set s_map ***/ + gameMainFlg.s_map = False; + nowDataRec.nowMap.gameSpeed = 90; +! strcpy(nowDataRec.nowMap.dirname, "%%PREFIX%%/lib/X11/xdeblock/mapf"); + + for(i =1; i < argc; i++) + { diff --git a/games/xdigger/files/patch-Imakefile b/games/xdigger/files/patch-Imakefile new file mode 100644 index 0000000..d50bef6 --- /dev/null +++ b/games/xdigger/files/patch-Imakefile @@ -0,0 +1,38 @@ +--- Imakefile.orig Sun Jul 4 18:47:11 1999 ++++ Imakefile Fri Oct 27 03:04:18 2000 +@@ -1,12 +1,12 @@ + #include "configure.h" + +-BINDIR=/usr/bin/X11 ++#BINDIR=/usr/bin/X11 + MANDIR=$(MANSOURCEPATH)6 + MANSUFFIX=6 +-ICONDIR=/usr/include/X11/pixmaps ++ICONDIR=$(INCDIR)/X11/pixmaps + + # Flags +-CDEBUGFLAGS = -Wall ++#CDEBUGFLAGS = -Wall + + #ifdef SOUND_RPLAY + RPLAYLIB = -lrplay +@@ -23,15 +23,13 @@ + + ComplexProgramTarget(xdigger) + InstallNonExecFile(xdigger.level,XDIGGER_LIB_DIR) +-#ifdef SOUND_RPLAY + InstallNamedNonExec(audio/diamond.au,diamond.au,XDIGGER_LIB_DIR) + InstallNamedNonExec(audio/step.au,step.au,XDIGGER_LIB_DIR) + InstallNamedNonExec(audio/stone.au,stone.au,XDIGGER_LIB_DIR) +-#endif +-InstallNamedNonExec(pixmaps/xdigger.xpm,xdigger.xpm,$(ICONDIR)) ++/* InstallNamedNonExec(pixmaps/xdigger.xpm,xdigger.xpm,$(ICONDIR)) */ + /* InstallNonExecFileNoClobber(xdigger.hiscore,XDIGGER_HISCORE_DIR) */ + + install:: +- $(MKDIRHIER) XDIGGER_HISCORE_DIR +- touch XDIGGER_HISCORE_DIR/xdigger.hiscore +- chmod a+w XDIGGER_HISCORE_DIR/xdigger.hiscore ++ $(MKDIRHIER) $(DESTDIR)XDIGGER_HISCORE_DIR ++ touch $(DESTDIR)XDIGGER_HISCORE_DIR/xdigger.hiscore ++ chmod a+w $(DESTDIR)XDIGGER_HISCORE_DIR/xdigger.hiscore diff --git a/games/xdigger/files/patch-aa b/games/xdigger/files/patch-aa deleted file mode 100644 index 13b379e..0000000 --- a/games/xdigger/files/patch-aa +++ /dev/null @@ -1,13 +0,0 @@ ---- configure.h.orig Sun Jul 4 18:50:04 1999 -+++ configure.h Thu Oct 26 04:40:37 2000 -@@ -19,8 +19,8 @@ - #define _CONFIGURE_H - - /* Directories */ --#define XDIGGER_LIB_DIR "/usr/lib/X11/xdigger" --#define XDIGGER_HISCORE_DIR "/var/X11R6/scores" -+#define XDIGGER_LIB_DIR "%%PREFIX%%/share/xdigger" -+#define XDIGGER_HISCORE_DIR "%%PREFIX%%/share/xdigger" - - #define SOUND_DSP_AUDIO - diff --git a/games/xdigger/files/patch-ab b/games/xdigger/files/patch-ab deleted file mode 100644 index 6cf40fad..0000000 --- a/games/xdigger/files/patch-ab +++ /dev/null @@ -1,72 +0,0 @@ ---- sound.c.orig Sun Jul 4 11:52:36 1999 -+++ sound.c Tue Nov 26 14:39:57 2002 -@@ -23,13 +23,13 @@ - #include - #include - #include -+#include - #include - #ifdef USE_PIPE - #else - #include - #endif - #include --#include - #include - #include - #include -@@ -39,6 +39,9 @@ - #ifdef linux - #include - #endif -+#ifdef __FreeBSD__ -+#include -+#endif - #ifdef SOUND_RPLAY - #include - #endif -@@ -147,7 +150,7 @@ - { - ton_typ = msgp.mtext[0]; - #endif --#ifdef linux -+#if ( defined(linux) || defined(__FreeBSD__) ) - if (sound_device == SD_DSP) - { - int rate = TON_DSP_RATE; -@@ -171,7 +174,7 @@ - else - done = True; - } --#ifdef linux -+#if ( defined(linux) || defined(__FreeBSD__) ) - if(sound_device == SD_DSP) - ioctl(fd, SNDCTL_DSP_RESET, 0); - #endif -@@ -248,7 +251,7 @@ - - } /* Fill_TonBuffer(int ton_low, int ton_high, int korrektur, Bool sndheader)*/ - --#ifdef linux -+#if ( defined(linux) || defined (__FreeBSD__) ) - Bool Check_DSP(Bool msg) - { - int fd; -@@ -374,7 +377,7 @@ - { - if (debug) fprintf(stderr, "%s: XDisplay is on localhost\n", progname); - #ifdef SOUND_DSP_AUDIO --#ifdef linux -+#if ( defined(linux) || defined(__FreeBSD__) ) - Check_DSP(False); - #endif - if (sound_device == SD_AUTO) Check_SUN_Audio(False); -@@ -400,7 +403,7 @@ - else - { - #ifdef SOUND_DSP_AUDIO --#ifdef linux -+#if ( defined(linux) || defined(__FreeBSD__) ) - if (sound_device == SD_DSP) - { - if (!Check_DSP(True)) sound_device = SD_NONE; diff --git a/games/xdigger/files/patch-ac b/games/xdigger/files/patch-ac deleted file mode 100644 index 35c655b..0000000 --- a/games/xdigger/files/patch-ac +++ /dev/null @@ -1,50 +0,0 @@ ---- xdigger.c Thu Jan 1 00:06:00 1998 -+++ /home/andy/tmp/wrk/xdigger.c Sat Jun 29 23:19:18 1996 -@@ -311,17 +315,29 @@ - - Fill_TonBuffer(TON_AUDIO_LOW, TON_AUDIO_HIGH, TON_AUDIO_RATE, True); - -+#ifdef __FreeBSD__ -+ fd = open(XDIGGER_LIB_DIR "/diamond.au", O_CREAT | O_WRONLY); -+#else - fd = open("audio/diamond.au", O_CREAT | O_WRONLY); -+#endif - fchmod(fd, 0644); - write(fd, &ton_buffer[TON_DIAMANT], ton_laenge[TON_DIAMANT]+24); - close(fd); - -+#ifdef __FreeBSD__ -+ fd = open(XDIGGER_LIB_DIR "/stone.au", O_CREAT | O_WRONLY); -+#else - fd = open("audio/stone.au", O_CREAT | O_WRONLY); -+#endif - fchmod(fd, 0644); - write(fd, &ton_buffer[TON_STEINE], ton_laenge[TON_STEINE]+24); - close(fd); - -+#ifdef __FreeBSD__ -+ fd = open(XDIGGER_LIB_DIR "/step.au", O_CREAT | O_WRONLY); -+#else - fd = open("audio/step.au", O_CREAT | O_WRONLY); -+#endif - fchmod(fd, 0644); - write(fd, &ton_buffer[TON_SCHRITT], ton_laenge[TON_SCHRITT]+24); - close(fd); -@@ -338,7 +354,7 @@ - { - printf("Usage: xdigger [-display display] [-1|2|3|...] [-noblink] [-noiconmove] [-vert240] [-sound "); - #ifdef SOUND_DSP_AUDIO --#ifdef linux -+#if ( defined(linux) || defined(__FreeBSD__) ) - printf("dsp|"); - #endif - printf("audio|"); -@@ -390,7 +406,7 @@ - } - #endif - #ifdef SOUND_DSP_AUDIO --#ifdef linux -+#if ( defined(linux) || defined(__FreeBSD__) ) - if(!strcmp(argv[i], "dsp")) sound_device = SD_DSP; else - #endif - if(!strcmp(argv[i], "audio")) sound_device = SD_AUDIO; else diff --git a/games/xdigger/files/patch-ad b/games/xdigger/files/patch-ad deleted file mode 100644 index d50bef6..0000000 --- a/games/xdigger/files/patch-ad +++ /dev/null @@ -1,38 +0,0 @@ ---- Imakefile.orig Sun Jul 4 18:47:11 1999 -+++ Imakefile Fri Oct 27 03:04:18 2000 -@@ -1,12 +1,12 @@ - #include "configure.h" - --BINDIR=/usr/bin/X11 -+#BINDIR=/usr/bin/X11 - MANDIR=$(MANSOURCEPATH)6 - MANSUFFIX=6 --ICONDIR=/usr/include/X11/pixmaps -+ICONDIR=$(INCDIR)/X11/pixmaps - - # Flags --CDEBUGFLAGS = -Wall -+#CDEBUGFLAGS = -Wall - - #ifdef SOUND_RPLAY - RPLAYLIB = -lrplay -@@ -23,15 +23,13 @@ - - ComplexProgramTarget(xdigger) - InstallNonExecFile(xdigger.level,XDIGGER_LIB_DIR) --#ifdef SOUND_RPLAY - InstallNamedNonExec(audio/diamond.au,diamond.au,XDIGGER_LIB_DIR) - InstallNamedNonExec(audio/step.au,step.au,XDIGGER_LIB_DIR) - InstallNamedNonExec(audio/stone.au,stone.au,XDIGGER_LIB_DIR) --#endif --InstallNamedNonExec(pixmaps/xdigger.xpm,xdigger.xpm,$(ICONDIR)) -+/* InstallNamedNonExec(pixmaps/xdigger.xpm,xdigger.xpm,$(ICONDIR)) */ - /* InstallNonExecFileNoClobber(xdigger.hiscore,XDIGGER_HISCORE_DIR) */ - - install:: -- $(MKDIRHIER) XDIGGER_HISCORE_DIR -- touch XDIGGER_HISCORE_DIR/xdigger.hiscore -- chmod a+w XDIGGER_HISCORE_DIR/xdigger.hiscore -+ $(MKDIRHIER) $(DESTDIR)XDIGGER_HISCORE_DIR -+ touch $(DESTDIR)XDIGGER_HISCORE_DIR/xdigger.hiscore -+ chmod a+w $(DESTDIR)XDIGGER_HISCORE_DIR/xdigger.hiscore diff --git a/games/xdigger/files/patch-ae b/games/xdigger/files/patch-ae deleted file mode 100644 index e526892..0000000 --- a/games/xdigger/files/patch-ae +++ /dev/null @@ -1,14 +0,0 @@ ---- drawpixmaps.c.orig Sun Jul 4 18:50:44 1999 -+++ drawpixmaps.c Thu Mar 30 04:00:13 2000 -@@ -14,7 +14,11 @@ - along with this program; see the file COPYING. If not, write to - the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ - -+#ifndef __STDC__ - #include -+#else -+#include -+#endif - #include - #include - #include diff --git a/games/xdigger/files/patch-configure.h b/games/xdigger/files/patch-configure.h new file mode 100644 index 0000000..13b379e --- /dev/null +++ b/games/xdigger/files/patch-configure.h @@ -0,0 +1,13 @@ +--- configure.h.orig Sun Jul 4 18:50:04 1999 ++++ configure.h Thu Oct 26 04:40:37 2000 +@@ -19,8 +19,8 @@ + #define _CONFIGURE_H + + /* Directories */ +-#define XDIGGER_LIB_DIR "/usr/lib/X11/xdigger" +-#define XDIGGER_HISCORE_DIR "/var/X11R6/scores" ++#define XDIGGER_LIB_DIR "%%PREFIX%%/share/xdigger" ++#define XDIGGER_HISCORE_DIR "%%PREFIX%%/share/xdigger" + + #define SOUND_DSP_AUDIO + diff --git a/games/xdigger/files/patch-drawpixmaps.c b/games/xdigger/files/patch-drawpixmaps.c new file mode 100644 index 0000000..e526892 --- /dev/null +++ b/games/xdigger/files/patch-drawpixmaps.c @@ -0,0 +1,14 @@ +--- drawpixmaps.c.orig Sun Jul 4 18:50:44 1999 ++++ drawpixmaps.c Thu Mar 30 04:00:13 2000 +@@ -14,7 +14,11 @@ + along with this program; see the file COPYING. If not, write to + the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ + ++#ifndef __STDC__ + #include ++#else ++#include ++#endif + #include + #include + #include diff --git a/games/xdigger/files/patch-sound.c b/games/xdigger/files/patch-sound.c new file mode 100644 index 0000000..6cf40fad --- /dev/null +++ b/games/xdigger/files/patch-sound.c @@ -0,0 +1,72 @@ +--- sound.c.orig Sun Jul 4 11:52:36 1999 ++++ sound.c Tue Nov 26 14:39:57 2002 +@@ -23,13 +23,13 @@ + #include + #include + #include ++#include + #include + #ifdef USE_PIPE + #else + #include + #endif + #include +-#include + #include + #include + #include +@@ -39,6 +39,9 @@ + #ifdef linux + #include + #endif ++#ifdef __FreeBSD__ ++#include ++#endif + #ifdef SOUND_RPLAY + #include + #endif +@@ -147,7 +150,7 @@ + { + ton_typ = msgp.mtext[0]; + #endif +-#ifdef linux ++#if ( defined(linux) || defined(__FreeBSD__) ) + if (sound_device == SD_DSP) + { + int rate = TON_DSP_RATE; +@@ -171,7 +174,7 @@ + else + done = True; + } +-#ifdef linux ++#if ( defined(linux) || defined(__FreeBSD__) ) + if(sound_device == SD_DSP) + ioctl(fd, SNDCTL_DSP_RESET, 0); + #endif +@@ -248,7 +251,7 @@ + + } /* Fill_TonBuffer(int ton_low, int ton_high, int korrektur, Bool sndheader)*/ + +-#ifdef linux ++#if ( defined(linux) || defined (__FreeBSD__) ) + Bool Check_DSP(Bool msg) + { + int fd; +@@ -374,7 +377,7 @@ + { + if (debug) fprintf(stderr, "%s: XDisplay is on localhost\n", progname); + #ifdef SOUND_DSP_AUDIO +-#ifdef linux ++#if ( defined(linux) || defined(__FreeBSD__) ) + Check_DSP(False); + #endif + if (sound_device == SD_AUTO) Check_SUN_Audio(False); +@@ -400,7 +403,7 @@ + else + { + #ifdef SOUND_DSP_AUDIO +-#ifdef linux ++#if ( defined(linux) || defined(__FreeBSD__) ) + if (sound_device == SD_DSP) + { + if (!Check_DSP(True)) sound_device = SD_NONE; diff --git a/games/xdigger/files/patch-xdigger.c b/games/xdigger/files/patch-xdigger.c new file mode 100644 index 0000000..35c655b --- /dev/null +++ b/games/xdigger/files/patch-xdigger.c @@ -0,0 +1,50 @@ +--- xdigger.c Thu Jan 1 00:06:00 1998 ++++ /home/andy/tmp/wrk/xdigger.c Sat Jun 29 23:19:18 1996 +@@ -311,17 +315,29 @@ + + Fill_TonBuffer(TON_AUDIO_LOW, TON_AUDIO_HIGH, TON_AUDIO_RATE, True); + ++#ifdef __FreeBSD__ ++ fd = open(XDIGGER_LIB_DIR "/diamond.au", O_CREAT | O_WRONLY); ++#else + fd = open("audio/diamond.au", O_CREAT | O_WRONLY); ++#endif + fchmod(fd, 0644); + write(fd, &ton_buffer[TON_DIAMANT], ton_laenge[TON_DIAMANT]+24); + close(fd); + ++#ifdef __FreeBSD__ ++ fd = open(XDIGGER_LIB_DIR "/stone.au", O_CREAT | O_WRONLY); ++#else + fd = open("audio/stone.au", O_CREAT | O_WRONLY); ++#endif + fchmod(fd, 0644); + write(fd, &ton_buffer[TON_STEINE], ton_laenge[TON_STEINE]+24); + close(fd); + ++#ifdef __FreeBSD__ ++ fd = open(XDIGGER_LIB_DIR "/step.au", O_CREAT | O_WRONLY); ++#else + fd = open("audio/step.au", O_CREAT | O_WRONLY); ++#endif + fchmod(fd, 0644); + write(fd, &ton_buffer[TON_SCHRITT], ton_laenge[TON_SCHRITT]+24); + close(fd); +@@ -338,7 +354,7 @@ + { + printf("Usage: xdigger [-display display] [-1|2|3|...] [-noblink] [-noiconmove] [-vert240] [-sound "); + #ifdef SOUND_DSP_AUDIO +-#ifdef linux ++#if ( defined(linux) || defined(__FreeBSD__) ) + printf("dsp|"); + #endif + printf("audio|"); +@@ -390,7 +406,7 @@ + } + #endif + #ifdef SOUND_DSP_AUDIO +-#ifdef linux ++#if ( defined(linux) || defined(__FreeBSD__) ) + if(!strcmp(argv[i], "dsp")) sound_device = SD_DSP; else + #endif + if(!strcmp(argv[i], "audio")) sound_device = SD_AUDIO; else diff --git a/games/xevil/files/patch-aa b/games/xevil/files/patch-aa deleted file mode 100644 index a786c4e..0000000 --- a/games/xevil/files/patch-aa +++ /dev/null @@ -1,35 +0,0 @@ ---- config.mk.orig Sun Mar 23 00:08:58 2003 -+++ config.mk Fri Nov 24 15:44:19 2006 -@@ -34,7 +34,7 @@ - # You can add -DNDEBUG to speed up a release build by removing the assert() - # calls. But, on a really obscure Linux machine, this caused Xlib to blow up - # internally, so you do so at your own risk. --DEBUG_OPT = -O #-DNDEBUG -+DEBUG_OPT = -DNDEBUG - - LINK_OPT = - -@@ -83,7 +83,9 @@ - #### Attempt to guesss the host architecture using the HOSTYPE and hostype - # variables. Then call self with the architecture name. - default: -- @if [ $${HOSTTYPE-bob} != bob ] ; then \ -+ @if [ $${OPSYS-bob} != bob ]; then \ -+ archit=$$OPSYS ; \ -+ elif [ $${HOSTTYPE-bob} != bob ] ; then \ - archit=$$HOSTTYPE ; \ - elif [ $${hosttype-bob} != bob ] ; then \ - archit=$$hosttype ; \ -@@ -161,9 +163,9 @@ - # The -DMSEC_PER_CLOCK=8 is kind of a hack, take it out if the game speed of - # XEvil is all screwed up. - freebsd: -- @$(MAKE) CC="c++" \ --CFLAGS="-DUSE_RANDOM -DPROTECTED_IS_PUBLIC -DMSEC_PER_CLOCK=8 -DUNAME_USR_BIN" \ --INCL_DIRS="-I/usr/X11R6/include" LIBS_DIRS="-L/usr/X11R6/lib" \ -+ @$(MAKE) CC="${CXX}" \ -+CFLAGS="-DUSE_RANDOM -DUSE_UINT_NET_LENGTH -DUNAME_USR_BIN ${CXXFLAGS}" \ -+INCL_DIRS="-I$(LOCALBASE)/include" LIBS_DIRS="-L$(LOCALBASE)/lib" \ - OBJ_DIR=$(DEPTH)/x11/FREEBSD PCKG_NAME="freebsd" \ - LIBS="-lXpm -lX11 -lm" $(TARGETS) - diff --git a/games/xevil/files/patch-ad b/games/xevil/files/patch-ad deleted file mode 100644 index ee41a16..0000000 --- a/games/xevil/files/patch-ad +++ /dev/null @@ -1,30 +0,0 @@ ---- makefile.orig 2012-05-27 06:39:04.000000000 +0900 -+++ makefile 2012-05-27 06:42:04.000000000 +0900 -@@ -42,9 +42,9 @@ - $(OBJ_DIR)/ui_cmn.o $(OBJ_DIR)/l_agreement_dlg.o $(OBJ_DIR)/viewport.o - - --xevil: $(OBJ_DIR)/xevil $(OBJ_DIR)/xevil$(VERSION).$(PCKG_NAME).tar.Z -+#xevil: $(OBJ_DIR)/xevil $(OBJ_DIR)/xevil$(VERSION).$(PCKG_NAME).tar.Z - #xevil: $(OBJ_DIR)/xevil$(VERSION).$(PCKG_NAME).tar.Z --#xevil: $(OBJ_DIR)/xevil -+xevil: $(OBJ_DIR)/xevil - - - # Build the xevil executable. -@@ -59,15 +59,9 @@ - cd $(DEPTH)/cmn; $(MAKE) - cd $(DEPTH)/x11; $(MAKE) - $(CC) $(LINK_FLAGS) $(LINK_OPT) $(LIBS_DIRS) -o $(OBJ_DIR)/xevil $(ALL_OBJS) $(LIBS) -- $(STRIP) $(OBJ_DIR)/xevil - - # Could also include serverping in the distribution - $(OBJ_DIR)/xevil$(VERSION).$(PCKG_NAME).tar.Z:: -- cp readme.txt $(OBJ_DIR) -- cp gpl.txt $(OBJ_DIR) -- cp -r instructions $(OBJ_DIR) -- (cd $(OBJ_DIR); tar cf xevil$(VERSION).$(PCKG_NAME).tar xevil readme.txt gpl.txt instructions) -- (cd $(OBJ_DIR); $(COMPRESS) -f xevil$(VERSION).$(PCKG_NAME).tar) - - ## Make a distribution file. - #dist: diff --git a/games/xevil/files/patch-config.mk b/games/xevil/files/patch-config.mk new file mode 100644 index 0000000..a786c4e --- /dev/null +++ b/games/xevil/files/patch-config.mk @@ -0,0 +1,35 @@ +--- config.mk.orig Sun Mar 23 00:08:58 2003 ++++ config.mk Fri Nov 24 15:44:19 2006 +@@ -34,7 +34,7 @@ + # You can add -DNDEBUG to speed up a release build by removing the assert() + # calls. But, on a really obscure Linux machine, this caused Xlib to blow up + # internally, so you do so at your own risk. +-DEBUG_OPT = -O #-DNDEBUG ++DEBUG_OPT = -DNDEBUG + + LINK_OPT = + +@@ -83,7 +83,9 @@ + #### Attempt to guesss the host architecture using the HOSTYPE and hostype + # variables. Then call self with the architecture name. + default: +- @if [ $${HOSTTYPE-bob} != bob ] ; then \ ++ @if [ $${OPSYS-bob} != bob ]; then \ ++ archit=$$OPSYS ; \ ++ elif [ $${HOSTTYPE-bob} != bob ] ; then \ + archit=$$HOSTTYPE ; \ + elif [ $${hosttype-bob} != bob ] ; then \ + archit=$$hosttype ; \ +@@ -161,9 +163,9 @@ + # The -DMSEC_PER_CLOCK=8 is kind of a hack, take it out if the game speed of + # XEvil is all screwed up. + freebsd: +- @$(MAKE) CC="c++" \ +-CFLAGS="-DUSE_RANDOM -DPROTECTED_IS_PUBLIC -DMSEC_PER_CLOCK=8 -DUNAME_USR_BIN" \ +-INCL_DIRS="-I/usr/X11R6/include" LIBS_DIRS="-L/usr/X11R6/lib" \ ++ @$(MAKE) CC="${CXX}" \ ++CFLAGS="-DUSE_RANDOM -DUSE_UINT_NET_LENGTH -DUNAME_USR_BIN ${CXXFLAGS}" \ ++INCL_DIRS="-I$(LOCALBASE)/include" LIBS_DIRS="-L$(LOCALBASE)/lib" \ + OBJ_DIR=$(DEPTH)/x11/FREEBSD PCKG_NAME="freebsd" \ + LIBS="-lXpm -lX11 -lm" $(TARGETS) + diff --git a/games/xevil/files/patch-makefile b/games/xevil/files/patch-makefile new file mode 100644 index 0000000..ee41a16 --- /dev/null +++ b/games/xevil/files/patch-makefile @@ -0,0 +1,30 @@ +--- makefile.orig 2012-05-27 06:39:04.000000000 +0900 ++++ makefile 2012-05-27 06:42:04.000000000 +0900 +@@ -42,9 +42,9 @@ + $(OBJ_DIR)/ui_cmn.o $(OBJ_DIR)/l_agreement_dlg.o $(OBJ_DIR)/viewport.o + + +-xevil: $(OBJ_DIR)/xevil $(OBJ_DIR)/xevil$(VERSION).$(PCKG_NAME).tar.Z ++#xevil: $(OBJ_DIR)/xevil $(OBJ_DIR)/xevil$(VERSION).$(PCKG_NAME).tar.Z + #xevil: $(OBJ_DIR)/xevil$(VERSION).$(PCKG_NAME).tar.Z +-#xevil: $(OBJ_DIR)/xevil ++xevil: $(OBJ_DIR)/xevil + + + # Build the xevil executable. +@@ -59,15 +59,9 @@ + cd $(DEPTH)/cmn; $(MAKE) + cd $(DEPTH)/x11; $(MAKE) + $(CC) $(LINK_FLAGS) $(LINK_OPT) $(LIBS_DIRS) -o $(OBJ_DIR)/xevil $(ALL_OBJS) $(LIBS) +- $(STRIP) $(OBJ_DIR)/xevil + + # Could also include serverping in the distribution + $(OBJ_DIR)/xevil$(VERSION).$(PCKG_NAME).tar.Z:: +- cp readme.txt $(OBJ_DIR) +- cp gpl.txt $(OBJ_DIR) +- cp -r instructions $(OBJ_DIR) +- (cd $(OBJ_DIR); tar cf xevil$(VERSION).$(PCKG_NAME).tar xevil readme.txt gpl.txt instructions) +- (cd $(OBJ_DIR); $(COMPRESS) -f xevil$(VERSION).$(PCKG_NAME).tar) + + ## Make a distribution file. + #dist: diff --git a/games/xfireworks/files/patch-Makefile b/games/xfireworks/files/patch-Makefile new file mode 100644 index 0000000..dd7d742 --- /dev/null +++ b/games/xfireworks/files/patch-Makefile @@ -0,0 +1,27 @@ +--- ./Makefile.orig 2000-08-06 04:00:44.000000000 +0200 ++++ ./Makefile 2008-04-13 01:15:22.000000000 +0200 +@@ -1,18 +1,18 @@ + VERSION = XFireworks-1.4 + PKGNAME = xfireworks-1.4 +-PREFIX = /usr/X11R6 +-X11BASE = /usr/X11R6 ++#PREFIX = /usr/X11R6 ++#X11BASE = /usr/X11R6 + + BINDIR = $(PREFIX)/bin + LIBDIR = $(PREFIX)/etc + MANDIR = $(PREFIX)/man/man1 + +-XINCLUDEDIR = $(X11BASE)/include +-XLIBDIR = $(X11BASE)/lib ++XINCLUDEDIR = $(LOCALBASE)/include ++XLIBDIR = $(LOCALBASE)/lib + +-CFLAGS = -O ++#CFLAGS = -O + LFLAGS = -lm -lX11 +-CC = cc ++#CC = cc + CP = cp + RM = rm -f + MKDIR = mkdir -p diff --git a/games/xfireworks/files/patch-aa b/games/xfireworks/files/patch-aa deleted file mode 100644 index dd7d742..0000000 --- a/games/xfireworks/files/patch-aa +++ /dev/null @@ -1,27 +0,0 @@ ---- ./Makefile.orig 2000-08-06 04:00:44.000000000 +0200 -+++ ./Makefile 2008-04-13 01:15:22.000000000 +0200 -@@ -1,18 +1,18 @@ - VERSION = XFireworks-1.4 - PKGNAME = xfireworks-1.4 --PREFIX = /usr/X11R6 --X11BASE = /usr/X11R6 -+#PREFIX = /usr/X11R6 -+#X11BASE = /usr/X11R6 - - BINDIR = $(PREFIX)/bin - LIBDIR = $(PREFIX)/etc - MANDIR = $(PREFIX)/man/man1 - --XINCLUDEDIR = $(X11BASE)/include --XLIBDIR = $(X11BASE)/lib -+XINCLUDEDIR = $(LOCALBASE)/include -+XLIBDIR = $(LOCALBASE)/lib - --CFLAGS = -O -+#CFLAGS = -O - LFLAGS = -lm -lX11 --CC = cc -+#CC = cc - CP = cp - RM = rm -f - MKDIR = mkdir -p diff --git a/games/xfrisk/files/patch-Makefile b/games/xfrisk/files/patch-Makefile new file mode 100644 index 0000000..77d10ba --- /dev/null +++ b/games/xfrisk/files/patch-Makefile @@ -0,0 +1,30 @@ +--- Makefile Sun Jan 23 14:01:55 2000 ++++ Makefile.new Mon May 29 23:12:10 2000 +@@ -55,9 +55,9 @@ + #################### + # C compiler options + # GNU gcc is recommended. +-CC=gcc ++CC?=gcc + # Use these with gcc +-CFLAGS=-g -Wall -W -fno-common -pedantic ++CFLAGS+= -Wall -W -fno-common -pedantic + + # If you don't have gcc, don't use -Wall -W -fno-common + #CFLAGS=-g +@@ -81,13 +81,13 @@ + + ## Installation prefix + # Adjust to taste. Stuff gets installed here. +-PREFIX=/usr/local ++PREFIX?=/usr/local + #PREFIX=/usr/local/X11 + + ## X11 location and options + # for X11R6 + # Point this at your X tree. +-XDIR=/usr/X11R6 ++XDIR?=/usr/local + #XDIR=/usr/local/X11 + #XDIR=/usr/openwin + diff --git a/games/xfrisk/files/patch-ab b/games/xfrisk/files/patch-ab deleted file mode 100644 index 77d10ba..0000000 --- a/games/xfrisk/files/patch-ab +++ /dev/null @@ -1,30 +0,0 @@ ---- Makefile Sun Jan 23 14:01:55 2000 -+++ Makefile.new Mon May 29 23:12:10 2000 -@@ -55,9 +55,9 @@ - #################### - # C compiler options - # GNU gcc is recommended. --CC=gcc -+CC?=gcc - # Use these with gcc --CFLAGS=-g -Wall -W -fno-common -pedantic -+CFLAGS+= -Wall -W -fno-common -pedantic - - # If you don't have gcc, don't use -Wall -W -fno-common - #CFLAGS=-g -@@ -81,13 +81,13 @@ - - ## Installation prefix - # Adjust to taste. Stuff gets installed here. --PREFIX=/usr/local -+PREFIX?=/usr/local - #PREFIX=/usr/local/X11 - - ## X11 location and options - # for X11R6 - # Point this at your X tree. --XDIR=/usr/X11R6 -+XDIR?=/usr/local - #XDIR=/usr/local/X11 - #XDIR=/usr/openwin - diff --git a/games/xgalaga/files/patch-Makefile.in b/games/xgalaga/files/patch-Makefile.in new file mode 100644 index 0000000..319d89a --- /dev/null +++ b/games/xgalaga/files/patch-Makefile.in @@ -0,0 +1,67 @@ +--- Makefile.in.orig 2008-03-06 06:58:16.000000000 +0900 ++++ Makefile.in 2014-02-01 11:53:20.000000000 +0900 +@@ -15,9 +15,9 @@ + bindir = $(exec_prefix) + libdir = $(prefix)/lib + infodir = $(prefix)/info +-#mandir = @mandir@ +-mandir = /usr/share/man +-creditsfile = @CREDITSFILE@ ++mandir = @mandir@ ++#mandir = /usr/share/man ++creditsfile = $(prefix)/CREDITS + distversion = 2.1.1.0 + + @SET_MAKE@ +@@ -65,8 +65,8 @@ + for i in levels/*.xgl; do $(INSTALL) $$i $(DESTDIR)$(prefix)/$$i ; done + for i in sounds/*.raw; do $(INSTALL) $$i $(DESTDIR)$(prefix)/$$i ; done + $(INSTALL) CREDITS $(DESTDIR)$(creditsfile) +- $(INSTALL) xgalaga.6x.gz $(mandir)/man6/xgalaga.6x.gz +- chmod 644 $(mandir)/man6/xgalaga.6x.gz ++ $(INSTALL) xgalaga.6x.gz $(DESTDIR)$(mandir)/man6/xgalaga.6x.gz ++# chmod 644 $(mandir)/man6/xgalaga.6x.gz + # touch $(prefix)/scores + # chmod 666 $(prefix)/scores + # chown ${GAMEOWN}:${GAMEGRP} $(prefix)/scores +@@ -74,14 +74,14 @@ + # chmod ${GAMEMODE} $(bindir)/$(TARGET) + # chmod ${GAMEDATAMODE} $(prefix)/scores + +-subdirs: +- for i in $(SUBDIRS); do cd $$i ; make ; done ++$(SUBDIRS):: ++ $(MAKE) -C $@ + +-$(TARGET): subdirs $(OBJS) ++$(TARGET): $(SUBDIRS) $(OBJS) + $(RM) $(TARGET) + $(CC) $(LDFLAGS) -o $(TARGET) $(OBJS) $(LIBS) + +-$(TARGET2): subdirs $(OBJS_HYPER) ++$(TARGET2): $(SUBDIRS) $(OBJS_HYPER) + $(RM) $(TARGET2) + $(CC) $(LDFLAGS) -o $(TARGET2) $(OBJS_HYPER) $(LIBS) + +@@ -98,17 +98,17 @@ + $(RM) core *.o $(OBJS) $(OBJS_HYPER) $(TARGET) $(TARGET2) $(MANPAGE) + + dist: clean +- cd libsprite;make clean ++ $(MAKE) -C libsprite clean + if test -d xgalaga-$(distverson) ; then echo -n; else mkdir xgalaga-$(distversion); fi + cp -rf $(SRCS) configure *.in *.sub *.guess images sounds xgal.sndsrv.*.c libsprite README* INSTALL CHANGES CREDITS xgalaga.6x *.h install-sh levels mkimgsrc* mkinstalldirs xgalaga-$(distversion) +- cd xgalaga-$(distversion); rm -f config.h +- cd xgalaga-$(distversion)/libsprite; make distclean ; rm -rf CVS ++ rm -f xgalaga-$(distversion)/config.h ++ $(MAKE) -C xgalaga-$(distversion)/libsprite distclean + find xgalaga-$(distversion) -name "CVS" -exec rm -rf {} \; -prune + tar czvf xgalaga-$(distversion).tar.gz xgalaga-$(distversion) + + distclean: clean + $(RM) Makefile config.h config.status config.cache config.log +- cd libsprite;$(MAKE) distclean ++ $(MAKE) -C libsprite distclean + + depend: + makedepend $(CFLAGS) $(SRCS) diff --git a/games/xgalaga/files/patch-aa b/games/xgalaga/files/patch-aa deleted file mode 100644 index 319d89a..0000000 --- a/games/xgalaga/files/patch-aa +++ /dev/null @@ -1,67 +0,0 @@ ---- Makefile.in.orig 2008-03-06 06:58:16.000000000 +0900 -+++ Makefile.in 2014-02-01 11:53:20.000000000 +0900 -@@ -15,9 +15,9 @@ - bindir = $(exec_prefix) - libdir = $(prefix)/lib - infodir = $(prefix)/info --#mandir = @mandir@ --mandir = /usr/share/man --creditsfile = @CREDITSFILE@ -+mandir = @mandir@ -+#mandir = /usr/share/man -+creditsfile = $(prefix)/CREDITS - distversion = 2.1.1.0 - - @SET_MAKE@ -@@ -65,8 +65,8 @@ - for i in levels/*.xgl; do $(INSTALL) $$i $(DESTDIR)$(prefix)/$$i ; done - for i in sounds/*.raw; do $(INSTALL) $$i $(DESTDIR)$(prefix)/$$i ; done - $(INSTALL) CREDITS $(DESTDIR)$(creditsfile) -- $(INSTALL) xgalaga.6x.gz $(mandir)/man6/xgalaga.6x.gz -- chmod 644 $(mandir)/man6/xgalaga.6x.gz -+ $(INSTALL) xgalaga.6x.gz $(DESTDIR)$(mandir)/man6/xgalaga.6x.gz -+# chmod 644 $(mandir)/man6/xgalaga.6x.gz - # touch $(prefix)/scores - # chmod 666 $(prefix)/scores - # chown ${GAMEOWN}:${GAMEGRP} $(prefix)/scores -@@ -74,14 +74,14 @@ - # chmod ${GAMEMODE} $(bindir)/$(TARGET) - # chmod ${GAMEDATAMODE} $(prefix)/scores - --subdirs: -- for i in $(SUBDIRS); do cd $$i ; make ; done -+$(SUBDIRS):: -+ $(MAKE) -C $@ - --$(TARGET): subdirs $(OBJS) -+$(TARGET): $(SUBDIRS) $(OBJS) - $(RM) $(TARGET) - $(CC) $(LDFLAGS) -o $(TARGET) $(OBJS) $(LIBS) - --$(TARGET2): subdirs $(OBJS_HYPER) -+$(TARGET2): $(SUBDIRS) $(OBJS_HYPER) - $(RM) $(TARGET2) - $(CC) $(LDFLAGS) -o $(TARGET2) $(OBJS_HYPER) $(LIBS) - -@@ -98,17 +98,17 @@ - $(RM) core *.o $(OBJS) $(OBJS_HYPER) $(TARGET) $(TARGET2) $(MANPAGE) - - dist: clean -- cd libsprite;make clean -+ $(MAKE) -C libsprite clean - if test -d xgalaga-$(distverson) ; then echo -n; else mkdir xgalaga-$(distversion); fi - cp -rf $(SRCS) configure *.in *.sub *.guess images sounds xgal.sndsrv.*.c libsprite README* INSTALL CHANGES CREDITS xgalaga.6x *.h install-sh levels mkimgsrc* mkinstalldirs xgalaga-$(distversion) -- cd xgalaga-$(distversion); rm -f config.h -- cd xgalaga-$(distversion)/libsprite; make distclean ; rm -rf CVS -+ rm -f xgalaga-$(distversion)/config.h -+ $(MAKE) -C xgalaga-$(distversion)/libsprite distclean - find xgalaga-$(distversion) -name "CVS" -exec rm -rf {} \; -prune - tar czvf xgalaga-$(distversion).tar.gz xgalaga-$(distversion) - - distclean: clean - $(RM) Makefile config.h config.status config.cache config.log -- cd libsprite;$(MAKE) distclean -+ $(MAKE) -C libsprite distclean - - depend: - makedepend $(CFLAGS) $(SRCS) diff --git a/games/xgalaga/files/patch-ab b/games/xgalaga/files/patch-ab deleted file mode 100644 index 49e7dcdf..0000000 --- a/games/xgalaga/files/patch-ab +++ /dev/null @@ -1,141 +0,0 @@ ---- xgal.sndsrv.freebsd.c.orig Sun Apr 12 08:03:21 1998 -+++ xgal.sndsrv.freebsd.c Sun Jul 21 19:10:18 2002 -@@ -12,20 +12,24 @@ - #include - #include - #include --#include -+#include - #include - #include - #include - - - --char *FILENAME[] = { -+static const char *FILENAME[] = { - "/explode.raw", - "/firetorp.raw", - "/shield.raw", - "/torphit.raw", - "/explode_big.raw", - "/ddloo.raw", -+/* Two more files are now expected by the xgalaga! -+\* The order is given in the sound.h -mi */ -+ "/warp.raw", -+ "/smart.raw" - }; - - #define NUM_SOUNDS (sizeof(FILENAME)/sizeof(char*)) -@@ -36,17 +40,15 @@ - - - /* Terminate: Signal Handler */ --void quit () -+static void quit () - { - exit (0); - } - -- -- --void init (int argc, char **argv) -+static void init (int argc, char **argv) - { - int i; -- char s[1024]; -+ char s[FILENAME_MAX]; - - if (argc != 3) - { -@@ -61,7 +63,7 @@ - if (s[(int)strlen(s) - 1] == '/') FILENAME[i]++; - strcat (s, FILENAME[i]); - FILENAME[i] = malloc ((int)strlen (s)); -- strcpy (FILENAME[i],s); -+ strcpy ((char *)FILENAME[i],s); - sound_buffer[i]=NULL; - sound_size[i]=0; - } -@@ -77,12 +79,12 @@ - Should set mono mode - Error checking - */ --int setup_dsp (char *dspdev,int *is_pcsp) -+static int setup_dsp (char *dspdev,int *is_pcsp) - { - int dsp, frag, value; - int mixer; - -- dsp = open(dspdev, O_RDWR); -+ dsp = open(dspdev, O_WRONLY); - if (dsp < 1) - { - fprintf (stderr, "xgal.sndsrv: Couldn't open DSP %s\n",dspdev); -@@ -133,13 +135,13 @@ - Eventually I'll look at the xgal signal handlers and - just trap this. - */ --int do_nothing(void) -+static int do_nothing(void) - { - fprintf(stderr,"xgal.sndsrv: doing nothing, something is broken\n"); - while(1) sleep (5); - } - --int read_sound(int k) -+static int read_sound(int k) - { - int i,fd,size; - -@@ -173,7 +175,7 @@ - } - - --void do_everything (int dsp, int is_pcsp) -+static void do_everything (int dsp, int is_pcsp) - { - char k; - int i, j ; -@@ -200,8 +202,14 @@ - /*fprintf(stderr,"terminating sound\n");*/ /*DEBUG*/ - terminate = 0; - } else { -- if(sound_size[k]==0) read_sound(k); -- if(sound_size[k]>0 && playnum<16) { -+ if(k>=NUM_SOUNDS) { -+ fprintf(stderr, -+ "Not that many sounds known (%d >= %d)\n", -+ (int)k, NUM_SOUNDS); -+ continue; -+ }; -+ if(sound_size[(int)k]==0) read_sound((int)k); -+ if(sound_size[(int)k]>0 && playnum<16) { - position[playnum]=0; - playing[playnum++]=k; - /*fprintf(stderr,"sound %d added to play queue\n",playnum-1);*/ /*DEBUG*/ -@@ -251,20 +259,18 @@ - } - } - -- -- --void main (argc, argv) -+int main (argc, argv) - int argc; - char **argv; - { -- int dsp, is_pcsp, ppid; -- char filename[512]; -+ int dsp, is_pcsp; - - fcntl(STDIN_FILENO,F_SETFL,O_NONBLOCK); - init (argc, argv); - dsp = setup_dsp (argv[2],&is_pcsp); - -- if (!dsp) do_nothing(); -+ if (dsp<0) do_nothing(); - - do_everything (dsp, is_pcsp); -+ return 0; - } diff --git a/games/xgalaga/files/patch-ac b/games/xgalaga/files/patch-ac deleted file mode 100644 index ddecdb0..0000000 --- a/games/xgalaga/files/patch-ac +++ /dev/null @@ -1,11 +0,0 @@ ---- configure.orig 2008-03-06 06:58:16.000000000 +0900 -+++ configure 2012-04-23 14:21:29.000000000 +0900 -@@ -4544,7 +4544,7 @@ - - { echo "$as_me:$LINENO: host os is detected as $host_os " >&5 - echo "$as_me: host os is detected as $host_os " >&6;} --if test -n "$sound-type"; then -+if test "$sound-type" != "no" ; then - case $host_os in - *linux*) - sound_type=native diff --git a/games/xgalaga/files/patch-ad b/games/xgalaga/files/patch-ad deleted file mode 100644 index 364d8f7..0000000 --- a/games/xgalaga/files/patch-ad +++ /dev/null @@ -1,15 +0,0 @@ ---- struct.h.orig Sun Oct 22 00:36:24 2000 -+++ struct.h Sun Oct 22 00:37:03 2000 -@@ -1,3 +1,6 @@ -+#ifndef __struct_h__ -+#define __struct_h__ -+ - #include "Wlib.h" - - struct torp { -@@ -38,3 +41,5 @@ - int count; - W_Image *shape; - }; -+ -+#endif /* __struct_h__ */ diff --git a/games/xgalaga/files/patch-ae b/games/xgalaga/files/patch-ae deleted file mode 100644 index dea2bd7..0000000 --- a/games/xgalaga/files/patch-ae +++ /dev/null @@ -1,18 +0,0 @@ ---- main.c.orig 2008-03-06 06:58:16.000000000 +0900 -+++ main.c 2012-04-23 14:26:03.000000000 +0900 -@@ -836,6 +836,7 @@ - if(gameOver) { - while(W_EventsPending()) { - W_NextEvent(&wev); -+ if (wev.key >= 256) wev.key -= 256; - - if(gameOver) - mouseControl = 1; -@@ -922,6 +923,7 @@ - - while(W_EventsPending()) { - W_NextEvent(&wev); -+ if (wev.key >= 256) wev.key -= 256; - - switch(wev.type) { - case W_EV_KEY_OFF: diff --git a/games/xgalaga/files/patch-configure b/games/xgalaga/files/patch-configure new file mode 100644 index 0000000..ddecdb0 --- /dev/null +++ b/games/xgalaga/files/patch-configure @@ -0,0 +1,11 @@ +--- configure.orig 2008-03-06 06:58:16.000000000 +0900 ++++ configure 2012-04-23 14:21:29.000000000 +0900 +@@ -4544,7 +4544,7 @@ + + { echo "$as_me:$LINENO: host os is detected as $host_os " >&5 + echo "$as_me: host os is detected as $host_os " >&6;} +-if test -n "$sound-type"; then ++if test "$sound-type" != "no" ; then + case $host_os in + *linux*) + sound_type=native diff --git a/games/xgalaga/files/patch-main.c b/games/xgalaga/files/patch-main.c new file mode 100644 index 0000000..dea2bd7 --- /dev/null +++ b/games/xgalaga/files/patch-main.c @@ -0,0 +1,18 @@ +--- main.c.orig 2008-03-06 06:58:16.000000000 +0900 ++++ main.c 2012-04-23 14:26:03.000000000 +0900 +@@ -836,6 +836,7 @@ + if(gameOver) { + while(W_EventsPending()) { + W_NextEvent(&wev); ++ if (wev.key >= 256) wev.key -= 256; + + if(gameOver) + mouseControl = 1; +@@ -922,6 +923,7 @@ + + while(W_EventsPending()) { + W_NextEvent(&wev); ++ if (wev.key >= 256) wev.key -= 256; + + switch(wev.type) { + case W_EV_KEY_OFF: diff --git a/games/xgalaga/files/patch-struct.h b/games/xgalaga/files/patch-struct.h new file mode 100644 index 0000000..364d8f7 --- /dev/null +++ b/games/xgalaga/files/patch-struct.h @@ -0,0 +1,15 @@ +--- struct.h.orig Sun Oct 22 00:36:24 2000 ++++ struct.h Sun Oct 22 00:37:03 2000 +@@ -1,3 +1,6 @@ ++#ifndef __struct_h__ ++#define __struct_h__ ++ + #include "Wlib.h" + + struct torp { +@@ -38,3 +41,5 @@ + int count; + W_Image *shape; + }; ++ ++#endif /* __struct_h__ */ diff --git a/games/xgalaga/files/patch-xgal.sndsrv.freebsd.c b/games/xgalaga/files/patch-xgal.sndsrv.freebsd.c new file mode 100644 index 0000000..49e7dcdf --- /dev/null +++ b/games/xgalaga/files/patch-xgal.sndsrv.freebsd.c @@ -0,0 +1,141 @@ +--- xgal.sndsrv.freebsd.c.orig Sun Apr 12 08:03:21 1998 ++++ xgal.sndsrv.freebsd.c Sun Jul 21 19:10:18 2002 +@@ -12,20 +12,24 @@ + #include + #include + #include +-#include ++#include + #include + #include + #include + + + +-char *FILENAME[] = { ++static const char *FILENAME[] = { + "/explode.raw", + "/firetorp.raw", + "/shield.raw", + "/torphit.raw", + "/explode_big.raw", + "/ddloo.raw", ++/* Two more files are now expected by the xgalaga! ++\* The order is given in the sound.h -mi */ ++ "/warp.raw", ++ "/smart.raw" + }; + + #define NUM_SOUNDS (sizeof(FILENAME)/sizeof(char*)) +@@ -36,17 +40,15 @@ + + + /* Terminate: Signal Handler */ +-void quit () ++static void quit () + { + exit (0); + } + +- +- +-void init (int argc, char **argv) ++static void init (int argc, char **argv) + { + int i; +- char s[1024]; ++ char s[FILENAME_MAX]; + + if (argc != 3) + { +@@ -61,7 +63,7 @@ + if (s[(int)strlen(s) - 1] == '/') FILENAME[i]++; + strcat (s, FILENAME[i]); + FILENAME[i] = malloc ((int)strlen (s)); +- strcpy (FILENAME[i],s); ++ strcpy ((char *)FILENAME[i],s); + sound_buffer[i]=NULL; + sound_size[i]=0; + } +@@ -77,12 +79,12 @@ + Should set mono mode + Error checking + */ +-int setup_dsp (char *dspdev,int *is_pcsp) ++static int setup_dsp (char *dspdev,int *is_pcsp) + { + int dsp, frag, value; + int mixer; + +- dsp = open(dspdev, O_RDWR); ++ dsp = open(dspdev, O_WRONLY); + if (dsp < 1) + { + fprintf (stderr, "xgal.sndsrv: Couldn't open DSP %s\n",dspdev); +@@ -133,13 +135,13 @@ + Eventually I'll look at the xgal signal handlers and + just trap this. + */ +-int do_nothing(void) ++static int do_nothing(void) + { + fprintf(stderr,"xgal.sndsrv: doing nothing, something is broken\n"); + while(1) sleep (5); + } + +-int read_sound(int k) ++static int read_sound(int k) + { + int i,fd,size; + +@@ -173,7 +175,7 @@ + } + + +-void do_everything (int dsp, int is_pcsp) ++static void do_everything (int dsp, int is_pcsp) + { + char k; + int i, j ; +@@ -200,8 +202,14 @@ + /*fprintf(stderr,"terminating sound\n");*/ /*DEBUG*/ + terminate = 0; + } else { +- if(sound_size[k]==0) read_sound(k); +- if(sound_size[k]>0 && playnum<16) { ++ if(k>=NUM_SOUNDS) { ++ fprintf(stderr, ++ "Not that many sounds known (%d >= %d)\n", ++ (int)k, NUM_SOUNDS); ++ continue; ++ }; ++ if(sound_size[(int)k]==0) read_sound((int)k); ++ if(sound_size[(int)k]>0 && playnum<16) { + position[playnum]=0; + playing[playnum++]=k; + /*fprintf(stderr,"sound %d added to play queue\n",playnum-1);*/ /*DEBUG*/ +@@ -251,20 +259,18 @@ + } + } + +- +- +-void main (argc, argv) ++int main (argc, argv) + int argc; + char **argv; + { +- int dsp, is_pcsp, ppid; +- char filename[512]; ++ int dsp, is_pcsp; + + fcntl(STDIN_FILENO,F_SETFL,O_NONBLOCK); + init (argc, argv); + dsp = setup_dsp (argv[2],&is_pcsp); + +- if (!dsp) do_nothing(); ++ if (dsp<0) do_nothing(); + + do_everything (dsp, is_pcsp); ++ return 0; + } diff --git a/games/xhime/Makefile b/games/xhime/Makefile index 1cf974d..e5ea8e5 100644 --- a/games/xhime/Makefile +++ b/games/xhime/Makefile @@ -27,8 +27,8 @@ post-install: #${GZIP_CMD} ${STAGEDIR}${PREFIX}/man/ja/man6/xhime.6 @${MKDIR} ${STAGEDIR}${PREFIX}/share/doc/ja/xhime @(cd ${WRKSRC};\ - ${INSTALL_DATA} xhime-doc.euc xhime.doc rh110-doc.euc \ - ${STAGEDIR}${PREFIX}/share/doc/ja/xhime; \ + ${INSTALL_DATA} xhime-doc.euc xhime.doc rh110-doc.euc \ + ${STAGEDIR}${PREFIX}/share/doc/ja/xhime; \ ) .include diff --git a/games/xhime/files/patch-Imakefile b/games/xhime/files/patch-Imakefile new file mode 100644 index 0000000..e7ccedd --- /dev/null +++ b/games/xhime/files/patch-Imakefile @@ -0,0 +1,22 @@ +--- Imakefile.orig Tue Sep 8 22:57:48 1998 ++++ Imakefile Mon Mar 8 01:48:11 1999 +@@ -5,9 +5,9 @@ + #define SHAPE + #undef NO_SIGACTION + +-MAILSPOOL_PATH = /usr/spool/mail/ ++MAILSPOOL_PATH = /var/mail/ + AUDIO_DEVICE = /dev/audio +-XHIMEDAT_PATH = $(LIBDIR)/xhime ++XHIMEDAT_PATH = ${PREFIX}/share/examples/xhime + + /*-------------*/ + /* SunOS 4.1.x */ +@@ -40,6 +40,7 @@ + DEFINES = $(DEF_SHAPE) $(DEF_NOSIG) -DAUDIO_DEVICE=\"$(AUDIO_DEVICE)\" -DMAILSPOOL_PATH=\"$(MAILSPOOL_PATH)\" -DXHIMEDAT_PATH=\"$(XHIMEDAT_PATH)\" Flags + + SimpleProgramTarget(xhime) ++MANSUFFIX=6 + + /*-------------*/ + XHIMEDATA = rh110.xhm diff --git a/games/xhime/files/patch-aa b/games/xhime/files/patch-aa deleted file mode 100644 index e7ccedd..0000000 --- a/games/xhime/files/patch-aa +++ /dev/null @@ -1,22 +0,0 @@ ---- Imakefile.orig Tue Sep 8 22:57:48 1998 -+++ Imakefile Mon Mar 8 01:48:11 1999 -@@ -5,9 +5,9 @@ - #define SHAPE - #undef NO_SIGACTION - --MAILSPOOL_PATH = /usr/spool/mail/ -+MAILSPOOL_PATH = /var/mail/ - AUDIO_DEVICE = /dev/audio --XHIMEDAT_PATH = $(LIBDIR)/xhime -+XHIMEDAT_PATH = ${PREFIX}/share/examples/xhime - - /*-------------*/ - /* SunOS 4.1.x */ -@@ -40,6 +40,7 @@ - DEFINES = $(DEF_SHAPE) $(DEF_NOSIG) -DAUDIO_DEVICE=\"$(AUDIO_DEVICE)\" -DMAILSPOOL_PATH=\"$(MAILSPOOL_PATH)\" -DXHIMEDAT_PATH=\"$(XHIMEDAT_PATH)\" Flags - - SimpleProgramTarget(xhime) -+MANSUFFIX=6 - - /*-------------*/ - XHIMEDATA = rh110.xhm diff --git a/games/xhime/files/patch-ab b/games/xhime/files/patch-ab deleted file mode 100644 index 19a66b3..0000000 --- a/games/xhime/files/patch-ab +++ /dev/null @@ -1,111 +0,0 @@ -*** xhime.c.orig Sun Nov 9 05:45:35 2003 ---- xhime.c Tue Feb 3 22:22:23 2004 -*************** -*** 24,32 **** - #include - #include /* defined in X11/Xos.h ? */ - #include /* defined in X11/Xos.h ? */ - #include -! #include - #include /* defined in X11/Xos.h */ - #include - #include - #ifndef O_RDONLY ---- 24,32 ---- - #include - #include /* defined in X11/Xos.h ? */ - #include /* defined in X11/Xos.h ? */ - #include -! #include - #include /* defined in X11/Xos.h */ - #include - #include - #ifndef O_RDONLY -*************** -*** 115,148 **** - int ActionFlag = ACT_NONE; - - /* -- */ - void -! Error(va_alist) -! va_dcl - { - va_list args; -- char *fmt; - - fprintf(stderr, "%s: ", ProgramName); - -! va_start(args); - fmt = (char *)va_arg(args, char *); - vfprintf(stderr, fmt, args); - va_end(args); - - fprintf(stderr, "\n"); - } - - void -! ErrorExit(va_alist) -! va_dcl - { - va_list args; -- char *fmt; - - fprintf(stderr, "%s: ", ProgramName); - -! va_start(args); - fmt = (char *)va_arg(args, char *); - vfprintf(stderr, fmt, args); - va_end(args); - ---- 115,144 ---- - int ActionFlag = ACT_NONE; - - /* -- */ - void -! Error(char *fmt, ...) - { - va_list args; - - fprintf(stderr, "%s: ", ProgramName); - -! va_start(args, fmt); - fmt = (char *)va_arg(args, char *); - vfprintf(stderr, fmt, args); - va_end(args); - - fprintf(stderr, "\n"); - } - - void -! ErrorExit(char *fmt, ...) - { - va_list args; - - fprintf(stderr, "%s: ", ProgramName); - -! va_start(args, fmt); - fmt = (char *)va_arg(args, char *); - vfprintf(stderr, fmt, args); - va_end(args); - -*************** -*** 1363,1371 **** - } - exit(0); - } - -! void - main(argc, argv) - int argc; - char *argv[]; - { ---- 1359,1367 ---- - } - exit(0); - } - -! int - main(argc, argv) - int argc; - char *argv[]; - { diff --git a/games/xhime/files/patch-xhime.c b/games/xhime/files/patch-xhime.c new file mode 100644 index 0000000..19a66b3 --- /dev/null +++ b/games/xhime/files/patch-xhime.c @@ -0,0 +1,111 @@ +*** xhime.c.orig Sun Nov 9 05:45:35 2003 +--- xhime.c Tue Feb 3 22:22:23 2004 +*************** +*** 24,32 **** + #include + #include /* defined in X11/Xos.h ? */ + #include /* defined in X11/Xos.h ? */ + #include +! #include + #include /* defined in X11/Xos.h */ + #include + #include + #ifndef O_RDONLY +--- 24,32 ---- + #include + #include /* defined in X11/Xos.h ? */ + #include /* defined in X11/Xos.h ? */ + #include +! #include + #include /* defined in X11/Xos.h */ + #include + #include + #ifndef O_RDONLY +*************** +*** 115,148 **** + int ActionFlag = ACT_NONE; + + /* -- */ + void +! Error(va_alist) +! va_dcl + { + va_list args; +- char *fmt; + + fprintf(stderr, "%s: ", ProgramName); + +! va_start(args); + fmt = (char *)va_arg(args, char *); + vfprintf(stderr, fmt, args); + va_end(args); + + fprintf(stderr, "\n"); + } + + void +! ErrorExit(va_alist) +! va_dcl + { + va_list args; +- char *fmt; + + fprintf(stderr, "%s: ", ProgramName); + +! va_start(args); + fmt = (char *)va_arg(args, char *); + vfprintf(stderr, fmt, args); + va_end(args); + +--- 115,144 ---- + int ActionFlag = ACT_NONE; + + /* -- */ + void +! Error(char *fmt, ...) + { + va_list args; + + fprintf(stderr, "%s: ", ProgramName); + +! va_start(args, fmt); + fmt = (char *)va_arg(args, char *); + vfprintf(stderr, fmt, args); + va_end(args); + + fprintf(stderr, "\n"); + } + + void +! ErrorExit(char *fmt, ...) + { + va_list args; + + fprintf(stderr, "%s: ", ProgramName); + +! va_start(args, fmt); + fmt = (char *)va_arg(args, char *); + vfprintf(stderr, fmt, args); + va_end(args); + +*************** +*** 1363,1371 **** + } + exit(0); + } + +! void + main(argc, argv) + int argc; + char *argv[]; + { +--- 1359,1367 ---- + } + exit(0); + } + +! int + main(argc, argv) + int argc; + char *argv[]; + { diff --git a/games/xinfocom/files/patch-Imakefile b/games/xinfocom/files/patch-Imakefile new file mode 100644 index 0000000..c97fc47 --- /dev/null +++ b/games/xinfocom/files/patch-Imakefile @@ -0,0 +1,8 @@ +--- Imakefile.orig Mon Sep 30 03:07:36 1996 ++++ Imakefile Wed Nov 1 10:13:13 2000 +@@ -13,4 +13,4 @@ + SRCS = addr.c alloc.c arith.c compare.c console.c dummy.c file.c globals.c head.c infocom.c init.c input.c interp.c jump.c mem.c message.c object.c pg_flat.c pc.c print.c prop.c random.c shared.c stack.c status.c stop.c support.c os_unix.c var.c window.c wio_unix.c + OBJS = addr.o alloc.o arith.o compare.o console.o dummy.o file.o globals.o head.o infocom.o init.o input.o interp.o jump.o mem.o message.o object.o pg_flat.o pc.o print.o prop.o random.o shared.o stack.o status.o stop.o support.o os_unix.o var.o window.o wio_unix.o + +-ComplexProgramTarget(xinfocom) ++ComplexProgramTargetNoMan(xinfocom) diff --git a/games/xinfocom/files/patch-aa b/games/xinfocom/files/patch-aa deleted file mode 100644 index c97fc47..0000000 --- a/games/xinfocom/files/patch-aa +++ /dev/null @@ -1,8 +0,0 @@ ---- Imakefile.orig Mon Sep 30 03:07:36 1996 -+++ Imakefile Wed Nov 1 10:13:13 2000 -@@ -13,4 +13,4 @@ - SRCS = addr.c alloc.c arith.c compare.c console.c dummy.c file.c globals.c head.c infocom.c init.c input.c interp.c jump.c mem.c message.c object.c pg_flat.c pc.c print.c prop.c random.c shared.c stack.c status.c stop.c support.c os_unix.c var.c window.c wio_unix.c - OBJS = addr.o alloc.o arith.o compare.o console.o dummy.o file.o globals.o head.o infocom.o init.o input.o interp.o jump.o mem.o message.o object.o pg_flat.o pc.o print.o prop.o random.o shared.o stack.o status.o stop.o support.o os_unix.o var.o window.o wio_unix.o - --ComplexProgramTarget(xinfocom) -+ComplexProgramTargetNoMan(xinfocom) diff --git a/games/xinvaders3d/files/patch-Makefile b/games/xinvaders3d/files/patch-Makefile new file mode 100644 index 0000000..a09d750 --- /dev/null +++ b/games/xinvaders3d/files/patch-Makefile @@ -0,0 +1,25 @@ +--- Makefile.orig Wed Oct 11 17:32:13 2000 ++++ Makefile Fri Nov 24 16:02:54 2006 +@@ -1,18 +1,18 @@ + all: game + +-CC = gcc +-XLIB = -L/usr/X11R6/lib -I/usr/X11R6/include ++CC?= gcc ++XLIB = -L$(LOCALBASE)/lib -I$(LOCALBASE)/include + LIBS = -lm -lX11 + OBJS = game.o aliens.o player.o effects.o \ + object.o camera.o main-x11.o vec4x1.o mat4x4.o + DEPENDS = + #CFLAGS = -g -Wall -pedantic -ansi +-CFLAGS = -ansi ++CFLAGS+= -ansi + #OPTIONS = -D_GNU_SOURCE -DGAME_LINUX_X11 -DGAME_DEBUG + OPTIONS= -DGAME_LINUX_X11 + + .c.o: $(DEPENDS) +- $(CC) -c $(CFLAGS) $(OPTIONS) $< -o $@ ++ $(CC) -c $(CFLAGS) $(OPTIONS) $(XLIB) $< -o $@ + + game: $(OBJS) $(DEPENDS) + $(CC) -o xinv3d $(OBJS) $(XLIB) $(LIBS) $(OPTIONS) diff --git a/games/xinvaders3d/files/patch-aa b/games/xinvaders3d/files/patch-aa deleted file mode 100644 index a09d750..0000000 --- a/games/xinvaders3d/files/patch-aa +++ /dev/null @@ -1,25 +0,0 @@ ---- Makefile.orig Wed Oct 11 17:32:13 2000 -+++ Makefile Fri Nov 24 16:02:54 2006 -@@ -1,18 +1,18 @@ - all: game - --CC = gcc --XLIB = -L/usr/X11R6/lib -I/usr/X11R6/include -+CC?= gcc -+XLIB = -L$(LOCALBASE)/lib -I$(LOCALBASE)/include - LIBS = -lm -lX11 - OBJS = game.o aliens.o player.o effects.o \ - object.o camera.o main-x11.o vec4x1.o mat4x4.o - DEPENDS = - #CFLAGS = -g -Wall -pedantic -ansi --CFLAGS = -ansi -+CFLAGS+= -ansi - #OPTIONS = -D_GNU_SOURCE -DGAME_LINUX_X11 -DGAME_DEBUG - OPTIONS= -DGAME_LINUX_X11 - - .c.o: $(DEPENDS) -- $(CC) -c $(CFLAGS) $(OPTIONS) $< -o $@ -+ $(CC) -c $(CFLAGS) $(OPTIONS) $(XLIB) $< -o $@ - - game: $(OBJS) $(DEPENDS) - $(CC) -o xinv3d $(OBJS) $(XLIB) $(LIBS) $(OPTIONS) diff --git a/games/xisola/files/patch-Imakefile b/games/xisola/files/patch-Imakefile new file mode 100644 index 0000000..0342c8b --- /dev/null +++ b/games/xisola/files/patch-Imakefile @@ -0,0 +1,15 @@ +--- Imakefile.orig Wed Mar 31 18:53:11 1993 ++++ Imakefile Fri Oct 13 22:04:24 2000 +@@ -6,10 +6,10 @@ + + EXTRA_INCLUDES = + +-CDEBUGFLAGS = -g ++XCOMM CDEBUGFLAGS = -g + + EXTRA_LOAD_FLAGS = + + EXTRA_LIBRARIES = + +-ComplexProgramTarget(xisola) ++ComplexProgramTargetNoMan(xisola) diff --git a/games/xisola/files/patch-aa b/games/xisola/files/patch-aa deleted file mode 100644 index 0342c8b..0000000 --- a/games/xisola/files/patch-aa +++ /dev/null @@ -1,15 +0,0 @@ ---- Imakefile.orig Wed Mar 31 18:53:11 1993 -+++ Imakefile Fri Oct 13 22:04:24 2000 -@@ -6,10 +6,10 @@ - - EXTRA_INCLUDES = - --CDEBUGFLAGS = -g -+XCOMM CDEBUGFLAGS = -g - - EXTRA_LOAD_FLAGS = - - EXTRA_LIBRARIES = - --ComplexProgramTarget(xisola) -+ComplexProgramTargetNoMan(xisola) diff --git a/games/xjig/files/patch-Makefile.Linux b/games/xjig/files/patch-Makefile.Linux new file mode 100644 index 0000000..8f8f62c --- /dev/null +++ b/games/xjig/files/patch-Makefile.Linux @@ -0,0 +1,33 @@ +--- Makefile.Linux.orig Wed Jul 17 22:10:55 1996 ++++ Makefile.Linux Fri Nov 24 16:10:03 2006 +@@ -1,7 +1,7 @@ + + ### compiler section +-CXX = gcc -Wall -fstrength-reduce -fpcc-struct-return +-CXXFLAGS = -g -DUSE_MIT_SHM ++CXX ?= c++ ++CXXFLAGS += -Wall -fstrength-reduce -fpcc-struct-return -DUSE_MIT_SHM -I${X_INCLUDE} + + ### default file to be used, when no options are set + +@@ -9,9 +9,9 @@ + + ### Directories for include files of X11 and libraries + +-X_INCLUDE = /usr/X11R6/include ++X_INCLUDE = $(LOCALBASE)/include + +-XLIB_DIR = /usr/X11R6/lib ++XLIB_DIR = $(LOCALBASE)/lib + + ################################################################### + +@@ -20,7 +20,7 @@ + .SUFFIXES: .C .o + + .C.o: +- $(CXX) -I$(X_INCLUDE) $(CXXFLAGS) -c $< ++ $(CXX) $(CXXFLAGS) -c $< + + LD = $(CXX) + diff --git a/games/xjig/files/patch-aa b/games/xjig/files/patch-aa deleted file mode 100644 index 8f8f62c..0000000 --- a/games/xjig/files/patch-aa +++ /dev/null @@ -1,33 +0,0 @@ ---- Makefile.Linux.orig Wed Jul 17 22:10:55 1996 -+++ Makefile.Linux Fri Nov 24 16:10:03 2006 -@@ -1,7 +1,7 @@ - - ### compiler section --CXX = gcc -Wall -fstrength-reduce -fpcc-struct-return --CXXFLAGS = -g -DUSE_MIT_SHM -+CXX ?= c++ -+CXXFLAGS += -Wall -fstrength-reduce -fpcc-struct-return -DUSE_MIT_SHM -I${X_INCLUDE} - - ### default file to be used, when no options are set - -@@ -9,9 +9,9 @@ - - ### Directories for include files of X11 and libraries - --X_INCLUDE = /usr/X11R6/include -+X_INCLUDE = $(LOCALBASE)/include - --XLIB_DIR = /usr/X11R6/lib -+XLIB_DIR = $(LOCALBASE)/lib - - ################################################################### - -@@ -20,7 +20,7 @@ - .SUFFIXES: .C .o - - .C.o: -- $(CXX) -I$(X_INCLUDE) $(CXXFLAGS) -c $< -+ $(CXX) $(CXXFLAGS) -c $< - - LD = $(CXX) - diff --git a/games/xjig/files/patch-ab b/games/xjig/files/patch-ab deleted file mode 100644 index 51a2ca4..0000000 --- a/games/xjig/files/patch-ab +++ /dev/null @@ -1,72 +0,0 @@ ---- gifx_image.C.orig Wed Jul 24 00:12:55 1996 -+++ gifx_image.C Tue Apr 7 15:34:33 1998 -@@ -62,12 +62,16 @@ - offset_rows=0; - #endif - DropData(); -- switch(texture_mode) { -- case 1: Reset8(); break; -- case 2: Reset16(); break; -- case 3: Reset32(); break; -- default: fprintf( stderr, "depth not supported\n" ); -- exit(0); -+ -+ extern int pixmap_depth; -+ -+ switch(pixmap_depth) { -+ case 8: Reset8(); break; -+ case 16: Reset16(); break; -+ case 24: Reset24(); break; -+ case 32: Reset32(); break; -+ default: fprintf( stderr, "depth not supported\n" ); -+ exit(0); - } - } - -@@ -90,29 +94,40 @@ - } - - /*----------------------------------------------------------------------------*/ -+ -+#define CARD24 long -+ -+#define DATA_TYPE CARD24 -+#define DATA_BYTES 3 -+void GifXImage::Reset24() { -+# include "reset_image.H" -+} -+#undef DATA_TYPE -+#undef DATA_BYTES -+/*----------------------------------------------------------------------------*/ - #define DATA_TYPE CARD32 --#define DATA_PAD 4 -+#define DATA_BYTES 4 - void GifXImage::Reset32() { - # include "reset_image.H" - } - #undef DATA_TYPE --#undef DATA_PAD -+#undef DATA_BYTES - /*----------------------------------------------------------------------------*/ - #define DATA_TYPE CARD16 --#define DATA_PAD 2 -+#define DATA_BYTES 2 - void GifXImage::Reset16() { - # include "reset_image.H" - } - #undef DATA_TYPE --#undef DATA_PAD -+#undef DATA_BYTES - /*----------------------------------------------------------------------------*/ - #define DATA_TYPE CARD8 --#define DATA_PAD 1 -+#define DATA_BYTES 1 - void GifXImage::Reset8() { - # include "reset_image.H" - } - #undef DATA_TYPE --#undef DATA_PAD -+#undef DATA_BYTES - - // ======================================================================== - diff --git a/games/xjig/files/patch-ac b/games/xjig/files/patch-ac deleted file mode 100644 index 20a647e..0000000 --- a/games/xjig/files/patch-ac +++ /dev/null @@ -1,10 +0,0 @@ ---- gifx_image.H.orig Mon Jul 15 12:59:11 1996 -+++ gifx_image.H Tue Apr 7 15:34:33 1998 -@@ -29,6 +29,7 @@ - void Reset8(); - void Reset16(); - void Reset32(); -+ void Reset24(); - - Display *dpy; - int scr; diff --git a/games/xjig/files/patch-ad b/games/xjig/files/patch-ad deleted file mode 100644 index 1d57e96..0000000 --- a/games/xjig/files/patch-ad +++ /dev/null @@ -1,10 +0,0 @@ ---- imgbuff.C.orig Wed Jul 17 00:23:26 1996 -+++ imgbuff.C Tue Apr 7 15:34:33 1998 -@@ -72,6 +72,7 @@ - - - XImage *ImageBuffer::Init(int w,int h,int bpp8) { -+ - // w+=10; h+=10; - if (w>width||h>height) { - FreeData(); diff --git a/games/xjig/files/patch-ae b/games/xjig/files/patch-ae deleted file mode 100644 index c05d5e3..0000000 --- a/games/xjig/files/patch-ae +++ /dev/null @@ -1,60 +0,0 @@ ---- objects.C.orig Wed Jul 24 15:06:28 1996 -+++ objects.C Tue Apr 7 15:34:33 1998 -@@ -533,28 +533,30 @@ - } - - #define DATA_TYPE CARD32 --#define DATA_PAD 4 - void PixmapPiece::CreateTilemap32() { - # include "rotate.H" - } - #undef DATA_TYPE --#undef DATA_PAD -+ -+#define CARD24 long -+ -+#define DATA_TYPE CARD24 -+void PixmapPiece::CreateTilemap24() { -+# include "rotate.H" -+} -+#undef DATA_TYPE - - #define DATA_TYPE CARD16 --#define DATA_PAD 2 - void PixmapPiece::CreateTilemap16() { - # include "rotate.H" - } - #undef DATA_TYPE --#undef DATA_PAD - - #define DATA_TYPE CARD8 --#define DATA_PAD 1 - void PixmapPiece::CreateTilemap8() { - # include "rotate.H" - } - #undef DATA_TYPE --#undef DATA_PAD - - - void PixmapPiece::DirectionChanged() { -@@ -573,10 +575,16 @@ - XPix(wcenter.X())-offx, YPix(wcenter.Y())-offy, width, height, 0, 0 ); - } - else { -- switch(texture_mode) { -- case 1: CreateTilemap8(); break; -- case 2: CreateTilemap16(); break; -- case 3: CreateTilemap32(); break; -+ extern int pixmap_depth; -+ -+ switch(pixmap_depth) { -+ case 8: CreateTilemap8(); break; -+ case 16: CreateTilemap16(); break; -+ case 32: CreateTilemap32(); break; -+ case 24: CreateTilemap24(); break; -+ default: -+ fprintf(stderr,"unhandled depth = %d\n",pixmap_depth); -+ exit(1); - } - } - } diff --git a/games/xjig/files/patch-af b/games/xjig/files/patch-af deleted file mode 100644 index 8be81a3..0000000 --- a/games/xjig/files/patch-af +++ /dev/null @@ -1,10 +0,0 @@ ---- objects.H.orig Wed Jul 24 15:08:44 1996 -+++ objects.H Tue Apr 7 15:34:33 1998 -@@ -241,6 +241,7 @@ - protected: - void CreateTilemap8(); - void CreateTilemap16(); -+ void CreateTilemap24(); - void CreateTilemap32(); - - Pixmap tilemap; diff --git a/games/xjig/files/patch-ag b/games/xjig/files/patch-ag deleted file mode 100644 index 1685207..0000000 --- a/games/xjig/files/patch-ag +++ /dev/null @@ -1,73 +0,0 @@ ---- reset_image.H.orig Wed Jul 17 02:59:50 1996 -+++ reset_image.H Fri Aug 6 03:12:24 2004 -@@ -16,15 +16,25 @@ - // to access data beyond the allocated image, that might lead to a segmentation - // violation. Therefore, it might be good to allocated some additional - // rows of data for the image. -- offset_bytes=xwidth*offset_rows*sizeof(DATA_TYPE); -- xdata=new DATA_TYPE[xwidth*(xheight+2*offset_rows)]; -+ -+ extern int scanline_pad; -+ -+ int byte_pad = scanline_pad / 8; -+ -+ offset_bytes=xwidth*offset_rows*DATA_BYTES; -+ // xdata=new DATA_TYPE[xwidth*(xheight+2*offset_rows)]; -+ -+ xdata=(DATA_TYPE*)new char[DATA_BYTES*xwidth*(xheight+2*offset_rows)]; - { DATA_TYPE *xdata_run=xdata; - unsigned long blk_pixel=BlackPixel(dpy,scr); - for (int i=xwidth*(xheight+2*offset_rows);i>0;i--) { -- *xdata_run++=(DATA_TYPE)blk_pixel; -+ // *xdata_run++=(DATA_TYPE)blk_pixel; -+ *xdata_run=(DATA_TYPE)blk_pixel; // align fault -+ char *my_xdata_run = (char *)xdata_run; -+ my_xdata_run += DATA_BYTES; - } - } -- xdata+=(offset_bytes/sizeof(DATA_TYPE)); -+ xdata+=(offset_bytes/DATA_BYTES); - - if (!xdata) { - fprintf(stderr,"not enough memory for XImage-data"); -@@ -32,9 +42,11 @@ - } - - // create the XImage -+ - ximage = XCreateImage(dpy, DefaultVisual(dpy,scr), -- DefaultDepth(dpy,scr), ZPixmap, 0, -- (char*)xdata, xwidth, xheight, 8*DATA_PAD, xwidth*sizeof(DATA_TYPE)); -+ DefaultDepth(dpy,scr), ZPixmap, 0, -+ (char*)xdata, xwidth, xheight, scanline_pad, -+ ((xwidth*DATA_BYTES + byte_pad - 1)/byte_pad) * byte_pad); - - if (!ximage) { - fprintf(stderr,"\n*** can't allocate ximage.\n" ); -@@ -47,9 +59,23 @@ - register const byte *org = Data(); - register int j,i; - -- for (i=0; iInit(width,height,DATA_PAD); -+ extern int scanline_pad; -+ -+ ximage = img_buf->Init(width,height,scanline_pad/8); - - if (!itm) { - if (page) { -@@ -40,7 +41,10 @@ - edge=wcenter+(*itm)*Vec2(-offx,-offy); - } - --#if (0) -+extern int pixmap_depth; -+ -+switch(pixmap_depth) { -+case 24: - - // - // the traditional routine to copy each pixel from one image to the other -@@ -52,6 +56,15 @@ - - for (int y=0;yGetPixel( XPix(pt.X()), YPix(pt.Y()) )); -+ pt+=dirx; -+ } -+ } -+ -+#if 0 -+ for (int y=0;ydata + y * ximage->bytes_per_line); - for (int x=0;xPutImage(dpy,tilemap,DefaultGC(dpy,scr),0,0,0,0,width,height); - diff --git a/games/xjig/files/patch-ai b/games/xjig/files/patch-ai deleted file mode 100644 index af0baff..0000000 --- a/games/xjig/files/patch-ai +++ /dev/null @@ -1,89 +0,0 @@ ---- xjig.C.orig Wed Jul 24 13:14:28 1996 -+++ xjig.C Tue Apr 7 15:34:34 1998 -@@ -61,7 +61,8 @@ - Window win; - GC gc; - --int texture_mode=0; // mode for texture mapping depending on depth -+int pixmap_depth = 0; -+int scanline_pad = 0; - - Cursor normal_cursor, move_cursor, pull_cursor, idle_cursor, no_cursor; - -@@ -324,7 +325,7 @@ - printf( " -sa : shuffle angles\n" ); - printf( " -sp : shuffle positions\n" ); - printf( " -r : rotation demo\n" ); -- printf( " -8 -16 -32 : manually select optimized texture mapping routine\n" ); -+ printf( " -8 -16 -24 -32 : manually select optimized texture mapping routine\n" ); - printf( " -dist : distortion percentage\n" ); - printf( " -maxang : maximum rotation angle at startup\n" ); - printf( " -rand : seed for random generator\n" ); -@@ -392,9 +393,10 @@ - #ifdef PINUP_DEFAULT - else if (!strcmp(argv[i],"-pinup")) filename=PINUP_DEFAULT; - #endif -- else if (!strcmp(argv[i],"-8")) texture_mode=1; -- else if (!strcmp(argv[i],"-16")) texture_mode=2; -- else if (!strcmp(argv[i],"-32")) texture_mode=3; -+ else if (!strcmp(argv[i],"-8")) pixmap_depth=8; -+ else if (!strcmp(argv[i],"-16")) pixmap_depth=16; -+ else if (!strcmp(argv[i],"-32")) pixmap_depth=32; -+ else if (!strcmp(argv[i],"-24")) pixmap_depth=24; - else if (!strcmp(argv[i],"-shm")) shared=1; - else if (!strcmp(argv[i],"-no_shm")) shared=0; - else if (!strcmp(argv[i],"-shapes")) shapes=1; -@@ -465,30 +467,34 @@ - printf( "xjig V2.4, by Helmut Hoenig, July-24-96\n" ); - printf( "\n" ); - -- if (!texture_mode) { -- // -- // check screen depth to select function for texture mappings -- // -- switch(DefaultDepth(dpy,scr)) { -- case 8: texture_mode=1; break; -- case 16: texture_mode=2; break; -- case 24: -- case 32: texture_mode=3; break; -+ XPixmapFormatValues *pmf; -+ -+ int n; -+ pmf = XListPixmapFormats (dpy, &n); -+ if (pmf) { -+ for (int i = 0; i < n; i++) { -+ if (pixmap_depth) { -+ if (pixmap_depth == pmf[i].depth) { -+ scanline_pad = pmf[i].scanline_pad; -+ break; -+ } -+ } else if (pmf[i].depth == DefaultDepth(dpy,scr)) { -+ pixmap_depth = pmf[i].depth; -+ scanline_pad = pmf[i].scanline_pad; -+ break; -+ } - } -+ XFree ((char *) pmf); - } -- if (!texture_mode) { -- fprintf( stderr, "*** Unable to select texture mode for Depth %d\n", DefaultDepth(dpy,scr) ); -- fprintf( stderr, " You can manually select one by trying either -8, -16 or -32\n" ); -- fprintf( stderr, " Good Luck.\n" ); -- exit(0); -+ -+ -+ if (!scanline_pad) { -+ fprintf(stderr,"No matching depth mode found\n"); -+ exit(1); - } - - if (verbose) { -- switch( texture_mode ) { -- case 1: printf( "texture mode 1: 1 byte\n" ); break; -- case 2: printf( "texture mode 2: 2 byte\n" ); break; -- case 3: printf( "texture mode 3: 4 byte\n" ); break; -- } -+ printf("depth: %d pad: %d\n",pixmap_depth,scanline_pad); - } - - old_handler=XSetErrorHandler( error_handler ); diff --git a/games/xjig/files/patch-gifx_image.C b/games/xjig/files/patch-gifx_image.C new file mode 100644 index 0000000..51a2ca4 --- /dev/null +++ b/games/xjig/files/patch-gifx_image.C @@ -0,0 +1,72 @@ +--- gifx_image.C.orig Wed Jul 24 00:12:55 1996 ++++ gifx_image.C Tue Apr 7 15:34:33 1998 +@@ -62,12 +62,16 @@ + offset_rows=0; + #endif + DropData(); +- switch(texture_mode) { +- case 1: Reset8(); break; +- case 2: Reset16(); break; +- case 3: Reset32(); break; +- default: fprintf( stderr, "depth not supported\n" ); +- exit(0); ++ ++ extern int pixmap_depth; ++ ++ switch(pixmap_depth) { ++ case 8: Reset8(); break; ++ case 16: Reset16(); break; ++ case 24: Reset24(); break; ++ case 32: Reset32(); break; ++ default: fprintf( stderr, "depth not supported\n" ); ++ exit(0); + } + } + +@@ -90,29 +94,40 @@ + } + + /*----------------------------------------------------------------------------*/ ++ ++#define CARD24 long ++ ++#define DATA_TYPE CARD24 ++#define DATA_BYTES 3 ++void GifXImage::Reset24() { ++# include "reset_image.H" ++} ++#undef DATA_TYPE ++#undef DATA_BYTES ++/*----------------------------------------------------------------------------*/ + #define DATA_TYPE CARD32 +-#define DATA_PAD 4 ++#define DATA_BYTES 4 + void GifXImage::Reset32() { + # include "reset_image.H" + } + #undef DATA_TYPE +-#undef DATA_PAD ++#undef DATA_BYTES + /*----------------------------------------------------------------------------*/ + #define DATA_TYPE CARD16 +-#define DATA_PAD 2 ++#define DATA_BYTES 2 + void GifXImage::Reset16() { + # include "reset_image.H" + } + #undef DATA_TYPE +-#undef DATA_PAD ++#undef DATA_BYTES + /*----------------------------------------------------------------------------*/ + #define DATA_TYPE CARD8 +-#define DATA_PAD 1 ++#define DATA_BYTES 1 + void GifXImage::Reset8() { + # include "reset_image.H" + } + #undef DATA_TYPE +-#undef DATA_PAD ++#undef DATA_BYTES + + // ======================================================================== + diff --git a/games/xjig/files/patch-gifx_image.H b/games/xjig/files/patch-gifx_image.H new file mode 100644 index 0000000..20a647e --- /dev/null +++ b/games/xjig/files/patch-gifx_image.H @@ -0,0 +1,10 @@ +--- gifx_image.H.orig Mon Jul 15 12:59:11 1996 ++++ gifx_image.H Tue Apr 7 15:34:33 1998 +@@ -29,6 +29,7 @@ + void Reset8(); + void Reset16(); + void Reset32(); ++ void Reset24(); + + Display *dpy; + int scr; diff --git a/games/xjig/files/patch-imgbuff.C b/games/xjig/files/patch-imgbuff.C new file mode 100644 index 0000000..1d57e96 --- /dev/null +++ b/games/xjig/files/patch-imgbuff.C @@ -0,0 +1,10 @@ +--- imgbuff.C.orig Wed Jul 17 00:23:26 1996 ++++ imgbuff.C Tue Apr 7 15:34:33 1998 +@@ -72,6 +72,7 @@ + + + XImage *ImageBuffer::Init(int w,int h,int bpp8) { ++ + // w+=10; h+=10; + if (w>width||h>height) { + FreeData(); diff --git a/games/xjig/files/patch-objects.C b/games/xjig/files/patch-objects.C new file mode 100644 index 0000000..c05d5e3 --- /dev/null +++ b/games/xjig/files/patch-objects.C @@ -0,0 +1,60 @@ +--- objects.C.orig Wed Jul 24 15:06:28 1996 ++++ objects.C Tue Apr 7 15:34:33 1998 +@@ -533,28 +533,30 @@ + } + + #define DATA_TYPE CARD32 +-#define DATA_PAD 4 + void PixmapPiece::CreateTilemap32() { + # include "rotate.H" + } + #undef DATA_TYPE +-#undef DATA_PAD ++ ++#define CARD24 long ++ ++#define DATA_TYPE CARD24 ++void PixmapPiece::CreateTilemap24() { ++# include "rotate.H" ++} ++#undef DATA_TYPE + + #define DATA_TYPE CARD16 +-#define DATA_PAD 2 + void PixmapPiece::CreateTilemap16() { + # include "rotate.H" + } + #undef DATA_TYPE +-#undef DATA_PAD + + #define DATA_TYPE CARD8 +-#define DATA_PAD 1 + void PixmapPiece::CreateTilemap8() { + # include "rotate.H" + } + #undef DATA_TYPE +-#undef DATA_PAD + + + void PixmapPiece::DirectionChanged() { +@@ -573,10 +575,16 @@ + XPix(wcenter.X())-offx, YPix(wcenter.Y())-offy, width, height, 0, 0 ); + } + else { +- switch(texture_mode) { +- case 1: CreateTilemap8(); break; +- case 2: CreateTilemap16(); break; +- case 3: CreateTilemap32(); break; ++ extern int pixmap_depth; ++ ++ switch(pixmap_depth) { ++ case 8: CreateTilemap8(); break; ++ case 16: CreateTilemap16(); break; ++ case 32: CreateTilemap32(); break; ++ case 24: CreateTilemap24(); break; ++ default: ++ fprintf(stderr,"unhandled depth = %d\n",pixmap_depth); ++ exit(1); + } + } + } diff --git a/games/xjig/files/patch-options.H b/games/xjig/files/patch-options.H new file mode 100644 index 0000000..8be81a3 --- /dev/null +++ b/games/xjig/files/patch-options.H @@ -0,0 +1,10 @@ +--- objects.H.orig Wed Jul 24 15:08:44 1996 ++++ objects.H Tue Apr 7 15:34:33 1998 +@@ -241,6 +241,7 @@ + protected: + void CreateTilemap8(); + void CreateTilemap16(); ++ void CreateTilemap24(); + void CreateTilemap32(); + + Pixmap tilemap; diff --git a/games/xjig/files/patch-reset_image.H b/games/xjig/files/patch-reset_image.H new file mode 100644 index 0000000..1685207 --- /dev/null +++ b/games/xjig/files/patch-reset_image.H @@ -0,0 +1,73 @@ +--- reset_image.H.orig Wed Jul 17 02:59:50 1996 ++++ reset_image.H Fri Aug 6 03:12:24 2004 +@@ -16,15 +16,25 @@ + // to access data beyond the allocated image, that might lead to a segmentation + // violation. Therefore, it might be good to allocated some additional + // rows of data for the image. +- offset_bytes=xwidth*offset_rows*sizeof(DATA_TYPE); +- xdata=new DATA_TYPE[xwidth*(xheight+2*offset_rows)]; ++ ++ extern int scanline_pad; ++ ++ int byte_pad = scanline_pad / 8; ++ ++ offset_bytes=xwidth*offset_rows*DATA_BYTES; ++ // xdata=new DATA_TYPE[xwidth*(xheight+2*offset_rows)]; ++ ++ xdata=(DATA_TYPE*)new char[DATA_BYTES*xwidth*(xheight+2*offset_rows)]; + { DATA_TYPE *xdata_run=xdata; + unsigned long blk_pixel=BlackPixel(dpy,scr); + for (int i=xwidth*(xheight+2*offset_rows);i>0;i--) { +- *xdata_run++=(DATA_TYPE)blk_pixel; ++ // *xdata_run++=(DATA_TYPE)blk_pixel; ++ *xdata_run=(DATA_TYPE)blk_pixel; // align fault ++ char *my_xdata_run = (char *)xdata_run; ++ my_xdata_run += DATA_BYTES; + } + } +- xdata+=(offset_bytes/sizeof(DATA_TYPE)); ++ xdata+=(offset_bytes/DATA_BYTES); + + if (!xdata) { + fprintf(stderr,"not enough memory for XImage-data"); +@@ -32,9 +42,11 @@ + } + + // create the XImage ++ + ximage = XCreateImage(dpy, DefaultVisual(dpy,scr), +- DefaultDepth(dpy,scr), ZPixmap, 0, +- (char*)xdata, xwidth, xheight, 8*DATA_PAD, xwidth*sizeof(DATA_TYPE)); ++ DefaultDepth(dpy,scr), ZPixmap, 0, ++ (char*)xdata, xwidth, xheight, scanline_pad, ++ ((xwidth*DATA_BYTES + byte_pad - 1)/byte_pad) * byte_pad); + + if (!ximage) { + fprintf(stderr,"\n*** can't allocate ximage.\n" ); +@@ -47,9 +59,23 @@ + register const byte *org = Data(); + register int j,i; + +- for (i=0; iInit(width,height,DATA_PAD); ++ extern int scanline_pad; ++ ++ ximage = img_buf->Init(width,height,scanline_pad/8); + + if (!itm) { + if (page) { +@@ -40,7 +41,10 @@ + edge=wcenter+(*itm)*Vec2(-offx,-offy); + } + +-#if (0) ++extern int pixmap_depth; ++ ++switch(pixmap_depth) { ++case 24: + + // + // the traditional routine to copy each pixel from one image to the other +@@ -52,6 +56,15 @@ + + for (int y=0;yGetPixel( XPix(pt.X()), YPix(pt.Y()) )); ++ pt+=dirx; ++ } ++ } ++ ++#if 0 ++ for (int y=0;ydata + y * ximage->bytes_per_line); + for (int x=0;xPutImage(dpy,tilemap,DefaultGC(dpy,scr),0,0,0,0,width,height); + diff --git a/games/xjig/files/patch-xjig.C b/games/xjig/files/patch-xjig.C new file mode 100644 index 0000000..af0baff --- /dev/null +++ b/games/xjig/files/patch-xjig.C @@ -0,0 +1,89 @@ +--- xjig.C.orig Wed Jul 24 13:14:28 1996 ++++ xjig.C Tue Apr 7 15:34:34 1998 +@@ -61,7 +61,8 @@ + Window win; + GC gc; + +-int texture_mode=0; // mode for texture mapping depending on depth ++int pixmap_depth = 0; ++int scanline_pad = 0; + + Cursor normal_cursor, move_cursor, pull_cursor, idle_cursor, no_cursor; + +@@ -324,7 +325,7 @@ + printf( " -sa : shuffle angles\n" ); + printf( " -sp : shuffle positions\n" ); + printf( " -r : rotation demo\n" ); +- printf( " -8 -16 -32 : manually select optimized texture mapping routine\n" ); ++ printf( " -8 -16 -24 -32 : manually select optimized texture mapping routine\n" ); + printf( " -dist : distortion percentage\n" ); + printf( " -maxang : maximum rotation angle at startup\n" ); + printf( " -rand : seed for random generator\n" ); +@@ -392,9 +393,10 @@ + #ifdef PINUP_DEFAULT + else if (!strcmp(argv[i],"-pinup")) filename=PINUP_DEFAULT; + #endif +- else if (!strcmp(argv[i],"-8")) texture_mode=1; +- else if (!strcmp(argv[i],"-16")) texture_mode=2; +- else if (!strcmp(argv[i],"-32")) texture_mode=3; ++ else if (!strcmp(argv[i],"-8")) pixmap_depth=8; ++ else if (!strcmp(argv[i],"-16")) pixmap_depth=16; ++ else if (!strcmp(argv[i],"-32")) pixmap_depth=32; ++ else if (!strcmp(argv[i],"-24")) pixmap_depth=24; + else if (!strcmp(argv[i],"-shm")) shared=1; + else if (!strcmp(argv[i],"-no_shm")) shared=0; + else if (!strcmp(argv[i],"-shapes")) shapes=1; +@@ -465,30 +467,34 @@ + printf( "xjig V2.4, by Helmut Hoenig, July-24-96\n" ); + printf( "\n" ); + +- if (!texture_mode) { +- // +- // check screen depth to select function for texture mappings +- // +- switch(DefaultDepth(dpy,scr)) { +- case 8: texture_mode=1; break; +- case 16: texture_mode=2; break; +- case 24: +- case 32: texture_mode=3; break; ++ XPixmapFormatValues *pmf; ++ ++ int n; ++ pmf = XListPixmapFormats (dpy, &n); ++ if (pmf) { ++ for (int i = 0; i < n; i++) { ++ if (pixmap_depth) { ++ if (pixmap_depth == pmf[i].depth) { ++ scanline_pad = pmf[i].scanline_pad; ++ break; ++ } ++ } else if (pmf[i].depth == DefaultDepth(dpy,scr)) { ++ pixmap_depth = pmf[i].depth; ++ scanline_pad = pmf[i].scanline_pad; ++ break; ++ } + } ++ XFree ((char *) pmf); + } +- if (!texture_mode) { +- fprintf( stderr, "*** Unable to select texture mode for Depth %d\n", DefaultDepth(dpy,scr) ); +- fprintf( stderr, " You can manually select one by trying either -8, -16 or -32\n" ); +- fprintf( stderr, " Good Luck.\n" ); +- exit(0); ++ ++ ++ if (!scanline_pad) { ++ fprintf(stderr,"No matching depth mode found\n"); ++ exit(1); + } + + if (verbose) { +- switch( texture_mode ) { +- case 1: printf( "texture mode 1: 1 byte\n" ); break; +- case 2: printf( "texture mode 2: 2 byte\n" ); break; +- case 3: printf( "texture mode 3: 4 byte\n" ); break; +- } ++ printf("depth: %d pad: %d\n",pixmap_depth,scanline_pad); + } + + old_handler=XSetErrorHandler( error_handler ); diff --git a/games/xlaby/files/patch-Imakefile b/games/xlaby/files/patch-Imakefile new file mode 100644 index 0000000..49a6fef --- /dev/null +++ b/games/xlaby/files/patch-Imakefile @@ -0,0 +1,24 @@ +--- ./Imakefile.orig 1997-12-01 15:59:02.000000000 -0200 ++++ ./Imakefile 2013-11-13 17:42:43.000000000 -0200 +@@ -11,19 +11,10 @@ + OWNER = games + GROUP = games + +-INSTALLFLAGS = -c -o $(OWNER) -g $(GROUP) ++INSTALLFLAGS = -c + +-# This will install xlaby in /usr/local/bin +-# and man page in /usr/local/man/man6 +-DESTDIR = /usr/local +-BINDIR = /bin +-MANPATH = /man +-MANSOURCEPATH = $(MANPATH)/man +-MANDIR = $(MANSOURCEPATH)6 +-MANSUFFIX = 6x ++MANSUFFIX = 6 + + LOCAL_LIBRARIES = $(XONLYLIB) + + SimpleProgramTarget(xlaby) +- +-install:: install.man diff --git a/games/xlaby/files/patch-aa b/games/xlaby/files/patch-aa deleted file mode 100644 index 49a6fef..0000000 --- a/games/xlaby/files/patch-aa +++ /dev/null @@ -1,24 +0,0 @@ ---- ./Imakefile.orig 1997-12-01 15:59:02.000000000 -0200 -+++ ./Imakefile 2013-11-13 17:42:43.000000000 -0200 -@@ -11,19 +11,10 @@ - OWNER = games - GROUP = games - --INSTALLFLAGS = -c -o $(OWNER) -g $(GROUP) -+INSTALLFLAGS = -c - --# This will install xlaby in /usr/local/bin --# and man page in /usr/local/man/man6 --DESTDIR = /usr/local --BINDIR = /bin --MANPATH = /man --MANSOURCEPATH = $(MANPATH)/man --MANDIR = $(MANSOURCEPATH)6 --MANSUFFIX = 6x -+MANSUFFIX = 6 - - LOCAL_LIBRARIES = $(XONLYLIB) - - SimpleProgramTarget(xlaby) -- --install:: install.man diff --git a/games/xmastermind/files/patch-ab b/games/xmastermind/files/patch-ab deleted file mode 100644 index 3cfc2ea..0000000 --- a/games/xmastermind/files/patch-ab +++ /dev/null @@ -1,13 +0,0 @@ ---- configure.h.orig Mon Jul 1 02:27:59 2002 -+++ configure.h Mon Jul 1 02:27:19 2002 -@@ -4,8 +4,10 @@ - #define VERSION 0.1 - - /* some stuff */ -+#ifndef TRUE - #define TRUE 1 - #define FALSE 0 -+#endif - #define BOOLEAN int - - /* Don't change this, because it will not work right with the GUI. Sorry! */ diff --git a/games/xmastermind/files/patch-configure.h b/games/xmastermind/files/patch-configure.h new file mode 100644 index 0000000..3cfc2ea --- /dev/null +++ b/games/xmastermind/files/patch-configure.h @@ -0,0 +1,13 @@ +--- configure.h.orig Mon Jul 1 02:27:59 2002 ++++ configure.h Mon Jul 1 02:27:19 2002 +@@ -4,8 +4,10 @@ + #define VERSION 0.1 + + /* some stuff */ ++#ifndef TRUE + #define TRUE 1 + #define FALSE 0 ++#endif + #define BOOLEAN int + + /* Don't change this, because it will not work right with the GUI. Sorry! */ diff --git a/games/xmemory/files/patch-Imakefile b/games/xmemory/files/patch-Imakefile new file mode 100644 index 0000000..0bcf8ed --- /dev/null +++ b/games/xmemory/files/patch-Imakefile @@ -0,0 +1,27 @@ +--- Imakefile.orig Thu Jul 18 08:02:56 1996 ++++ Imakefile Sun Sep 8 03:41:59 2002 +@@ -8,12 +8,12 @@ + + XCOMM where to search for data-files, when not found in current dir + +- XMEMORYDIR = \"/usr/games/lib/xmemory\" ++ XMEMORYDIR = \"${LIBDIR}/xmemory\" + + XCOMM set the compiler that you like, + XCOMM gcc should suit, since the libraries are not needed. + +- CXX = gcc ++ CXX ?= c++ + + XCOMM ####################################################################### + +@@ -29,8 +29,7 @@ + $(RM) $@ + $(CXX) -o $@ $(OBJS) $(LDOPTIONS) $(LOCAL_LIBRARIES) $(LDLIBS) $(EXTRA_LOAD_FLAGS) + +-InstallProgram(xmemory,$(BINDIR)) +-InstallManPage(xmemory,$(MANDIR)) ++ComplexCplusplusProgramTarget(xmemory) + DependTarget() + CleanTarget() + diff --git a/games/xmemory/files/patch-aa b/games/xmemory/files/patch-aa deleted file mode 100644 index 0bcf8ed..0000000 --- a/games/xmemory/files/patch-aa +++ /dev/null @@ -1,27 +0,0 @@ ---- Imakefile.orig Thu Jul 18 08:02:56 1996 -+++ Imakefile Sun Sep 8 03:41:59 2002 -@@ -8,12 +8,12 @@ - - XCOMM where to search for data-files, when not found in current dir - -- XMEMORYDIR = \"/usr/games/lib/xmemory\" -+ XMEMORYDIR = \"${LIBDIR}/xmemory\" - - XCOMM set the compiler that you like, - XCOMM gcc should suit, since the libraries are not needed. - -- CXX = gcc -+ CXX ?= c++ - - XCOMM ####################################################################### - -@@ -29,8 +29,7 @@ - $(RM) $@ - $(CXX) -o $@ $(OBJS) $(LDOPTIONS) $(LOCAL_LIBRARIES) $(LDLIBS) $(EXTRA_LOAD_FLAGS) - --InstallProgram(xmemory,$(BINDIR)) --InstallManPage(xmemory,$(MANDIR)) -+ComplexCplusplusProgramTarget(xmemory) - DependTarget() - CleanTarget() - diff --git a/games/xmemory/files/patch-ab b/games/xmemory/files/patch-ab deleted file mode 100644 index e7a190c..0000000 --- a/games/xmemory/files/patch-ab +++ /dev/null @@ -1,15 +0,0 @@ ---- xmemory.C.orig 1996-07-18 20:10:08.000000000 +0500 -+++ xmemory.C 2013-06-11 20:09:44.078362688 +0400 -@@ -196,10 +196,11 @@ char *def_disp[MAX_PLAYERS] = { - "", "", "", "", "", "", "", "", "", "" - }; - -+int - main( int argc, char **argv ) - { - int i; --long timefield; -+time_t timefield; - char main_display[30]; - char *main_p; - char *filename; diff --git a/games/xmemory/files/patch-xmemory.C b/games/xmemory/files/patch-xmemory.C new file mode 100644 index 0000000..e7a190c --- /dev/null +++ b/games/xmemory/files/patch-xmemory.C @@ -0,0 +1,15 @@ +--- xmemory.C.orig 1996-07-18 20:10:08.000000000 +0500 ++++ xmemory.C 2013-06-11 20:09:44.078362688 +0400 +@@ -196,10 +196,11 @@ char *def_disp[MAX_PLAYERS] = { + "", "", "", "", "", "", "", "", "", "" + }; + ++int + main( int argc, char **argv ) + { + int i; +-long timefield; ++time_t timefield; + char main_display[30]; + char *main_p; + char *filename; diff --git a/games/xmine/files/patch-Imakefile b/games/xmine/files/patch-Imakefile new file mode 100644 index 0000000..74bf3cb --- /dev/null +++ b/games/xmine/files/patch-Imakefile @@ -0,0 +1,11 @@ +--- Imakefile.orig Fri Jan 3 03:25:27 1997 ++++ Imakefile Fri Jan 3 03:29:04 1997 +@@ -1,5 +1,7 @@ ++MANSUFFIX=6 ++ + /* if you have Xaw3d installed, you might wish to use this: */ +-#define UseXaw3d 0 ++#define UseXaw3d YES + + /* for debugging: */ + /* CDEBUGFLAGS = -g -O2 */ diff --git a/games/xmine/files/patch-aa b/games/xmine/files/patch-aa deleted file mode 100644 index f159ea3..0000000 --- a/games/xmine/files/patch-aa +++ /dev/null @@ -1,57 +0,0 @@ -*** xmine.c~ Sat Apr 2 00:20:15 1994 ---- xmine.c Thu Jun 30 10:20:34 1994 -*************** -*** 78,83 **** ---- 78,90 ---- - #define GSPACEX 16 - #define GSPACEY 16 - -+ /* some systems might be better off with using "random()" instead of "rand()"*/ -+ #if defined __FreeBSD__ -+ # define USE_RANDOM 1 -+ #else -+ # define USE_RANDOM 0 -+ #endif -+ - #define SCORE_FILE "~/.xmine_scores" - #define TOPMARGIN 60 - #define BOTMARGIN 12 -*************** -*** 911,922 **** ---- 918,938 ---- - { - int i, x, y, xd, yd, tries; - -+ #if USE_RANDOM -+ srandom((unsigned) time(0)); -+ #else - srand((unsigned int) time(0)); -+ #endif - for (i = 0; i != mine_count; i++) { - tries = 1000; - do { -+ #if USE_RANDOM -+ x = (random()>>1) % gsizex; -+ y = (random()>>1) % gsizey; -+ #else - x = (rand()>>1) % gsizex; - y = (rand()>>1) % gsizey; -+ #endif - tries--; - } while (tries && (grid[x][y] || - !(x < fx-1 || x > fx+1 || y < fy-1 -*** Imakefile~ Mon Dec 26 12:42:58 1994 ---- Imakefile Mon Dec 26 12:49:44 1994 -*************** -*** 20,25 **** ---- 20,29 ---- - # define WarnLevel - #endif - -+ # for FreeBSD package: do not compress man page, otherwise gzip will -+ # complain when building the package target -+ COMPRESSMANCMD = echo -+ - DEPLIBS = XawClientDepLibs - LOCAL_LIBRARIES = XawClientLibs - EXTRA_DEFINES = WarnLevel Xaw3dDefs diff --git a/games/xmine/files/patch-ab b/games/xmine/files/patch-ab deleted file mode 100644 index 74bf3cb..0000000 --- a/games/xmine/files/patch-ab +++ /dev/null @@ -1,11 +0,0 @@ ---- Imakefile.orig Fri Jan 3 03:25:27 1997 -+++ Imakefile Fri Jan 3 03:29:04 1997 -@@ -1,5 +1,7 @@ -+MANSUFFIX=6 -+ - /* if you have Xaw3d installed, you might wish to use this: */ --#define UseXaw3d 0 -+#define UseXaw3d YES - - /* for debugging: */ - /* CDEBUGFLAGS = -g -O2 */ diff --git a/games/xmine/files/patch-ac b/games/xmine/files/patch-ac deleted file mode 100644 index 44f1f7a..0000000 --- a/games/xmine/files/patch-ac +++ /dev/null @@ -1,8 +0,0 @@ ---- xmine.man.orig Mon Mar 28 10:15:52 1994 -+++ xmine.man Fri Jan 3 03:27:40 1997 -@@ -1,4 +1,4 @@ --.TH XMINE 1 -+.TH XMINE 6 - .SH NAME - xmine \- identify mines in a mine field without getting blown up - .SH SYNOPSIS diff --git a/games/xmine/files/patch-ad b/games/xmine/files/patch-ad deleted file mode 100644 index 2a1b8dc..0000000 --- a/games/xmine/files/patch-ad +++ /dev/null @@ -1,18 +0,0 @@ ---- xmine.c.orig Sat Feb 19 20:50:19 2000 -+++ xmine.c Sat Feb 19 21:00:46 2000 -@@ -1407,7 +1407,6 @@ - str = XawDialogGetValueString(w); - if (!str) return; - if (atoi(str)) *val = atoi(str); -- XawAsciiSourceFreeString(w); - } - - /* ARGSUSED */ -@@ -1688,7 +1687,6 @@ - sc->times[level] = timer; - write_scores(sc); - } -- if (str) XawAsciiSourceFreeString(pane); - best_times(NULL, NULL, NULL); - } - diff --git a/games/xmine/files/patch-ae b/games/xmine/files/patch-ae deleted file mode 100644 index 58e2f69..0000000 --- a/games/xmine/files/patch-ae +++ /dev/null @@ -1,142 +0,0 @@ ---- xmine.c.orig Sat Feb 19 21:01:16 2000 -+++ xmine.c Sat Feb 19 21:43:15 2000 -@@ -126,6 +126,7 @@ - Display *disp; - Window win; - int colordisp; -+Atom delw; - - #define COL_BLUE 0 - #define COL_LIMEGREEN 1 -@@ -246,6 +247,7 @@ - int cant_write_score_file P ((void)); - void fix_size P ((void)); - void relax_size P ((void)); -+void GlobalProtoHandler P ((Widget w, XEvent *xev, String *params, Cardinal *n)); - - Pixmap fillface; - XtAppContext app; -@@ -278,7 +280,7 @@ - XColor unused; - int i; - -- XtActionsRec actions[3]; -+ XtActionsRec actions[4]; - String translations = - ": search(down)\n\ - : search(up)\n\ -@@ -291,6 +293,8 @@ - toplevel = XtVaAppInitialize(&app, "Xmine", NULL, 0, - &argc, argv, fallbacks, NULL); - -+ delw = XInternAtom(XtDisplay(toplevel), "WM_DELETE_WINDOW", False); -+ - main_w = XtVaCreateManagedWidget("main_w", boxWidgetClass, toplevel, - XtNorientation, XtorientVertical, - NULL); -@@ -390,7 +394,13 @@ - actions[1].proc = search_action; - actions[2].string = "mark"; - actions[2].proc = mark_action; -- XtAppAddActions(app, actions, 3); -+ actions[3].string = "GlobalProtoHandler"; -+ actions[3].proc = GlobalProtoHandler; -+ -+ XtAppAddActions(app, actions, 4); -+ XtOverrideTranslations(toplevel, XtParseTranslationTable( -+ "WM_PROTOCOLS : GlobalProtoHandler()") -+ ); - - drawing_a = XtVaCreateManagedWidget - ("drawing_a", -@@ -411,6 +421,7 @@ - XtAddEventHandler(toplevel, - StructureNotifyMask, False, resize_handler, 0); - XtRealizeWidget(toplevel); -+ XSetWMProtocols(XtDisplay(toplevel), XtWindow(toplevel), &delw, 1); - fillface = XCreateBitmapFromData(XtDisplay(main_w), - XtWindow(main_w), fillface_bits, - fillface_width, fillface_height); -@@ -635,11 +646,12 @@ - set_face(armit ? FACE_OHNO : FACE_HAPPY); - for (dx = -1; dx <= 1; dx++) - for (dy = -1; dy <= 1; dy++) -- if (is_state(x+dx, y+dy, COVERED)) -+ if (is_state(x+dx, y+dy, COVERED)) { - if (armit) - draw_blank_square(x+dx, y+dy, True); - else - draw_button(x+dx, y+dy); -+ } - } - - #if NeedFunctionPrototypes -@@ -1362,6 +1374,10 @@ - XtAddCallback(w, XtNcallback, dialog_ok, NULL); - XtManageChild(pane); - XtPopup(custom, XtGrabExclusive); -+ XtOverrideTranslations(custom, XtParseTranslationTable( -+ "WM_PROTOCOLS : GlobalProtoHandler()") -+ ); -+ XSetWMProtocols(XtDisplay(custom), XtWindow(custom), &delw, 1); - dialog_up = True; - while (dialog_up) { - XtAppProcessEvent(app, XtIMAll); -@@ -1525,6 +1541,10 @@ - if (cant_write_score_file()) XtSetSensitive(w, False); - XtManageChild(pane); - XtPopup(best, XtGrabExclusive); -+ XtOverrideTranslations(best, XtParseTranslationTable( -+ "WM_PROTOCOLS : GlobalProtoHandler()") -+ ); -+ XSetWMProtocols(XtDisplay(best), XtWindow(best), &delw, 1); - dialog_up = True; - while (dialog_up) { - XtAppProcessEvent(app, XtIMAll); -@@ -1569,6 +1589,10 @@ - XtAddCallback(w, XtNcallback, dialog_ok, NULL); - XtManageChild(pane); - XtPopup(about, XtGrabExclusive); -+ XtOverrideTranslations(about, XtParseTranslationTable( -+ "WM_PROTOCOLS : GlobalProtoHandler()") -+ ); -+ XSetWMProtocols(XtDisplay(about), XtWindow(about), &delw, 1); - dialog_up = True; - while (dialog_up) { - XtAppProcessEvent(app, XtIMAll); -@@ -1674,6 +1698,10 @@ - - XtManageChild(pane); - XtPopup(custom, XtGrabExclusive); -+ XtOverrideTranslations(custom, XtParseTranslationTable( -+ "WM_PROTOCOLS : GlobalProtoHandler()") -+ ); -+ XSetWMProtocols(XtDisplay(custom), XtWindow(custom), &delw, 1); - - dialog_up = True; - while (dialog_up) { -@@ -1828,3 +1856,24 @@ - { - exit(0); - } -+ -+#if NeedFunctionPrototypes -+void -+GlobalProtoHandler(Widget w, XEvent *xev, String *params, Cardinal *n) -+#else -+void -+GlobalProtoHandler(w, xev, params, n) -+ Widget w; -+ XEvent *xev; -+ String *params; -+ Cardinal *n; -+#endif -+{ -+ if(xev->xclient.data.l[0] == delw) { -+ if(w == toplevel) -+ exit(0); -+ else -+ XtPopdown(w); -+ } -+} -+ diff --git a/games/xmine/files/patch-xmine.c b/games/xmine/files/patch-xmine.c new file mode 100644 index 0000000..f159ea3 --- /dev/null +++ b/games/xmine/files/patch-xmine.c @@ -0,0 +1,57 @@ +*** xmine.c~ Sat Apr 2 00:20:15 1994 +--- xmine.c Thu Jun 30 10:20:34 1994 +*************** +*** 78,83 **** +--- 78,90 ---- + #define GSPACEX 16 + #define GSPACEY 16 + ++ /* some systems might be better off with using "random()" instead of "rand()"*/ ++ #if defined __FreeBSD__ ++ # define USE_RANDOM 1 ++ #else ++ # define USE_RANDOM 0 ++ #endif ++ + #define SCORE_FILE "~/.xmine_scores" + #define TOPMARGIN 60 + #define BOTMARGIN 12 +*************** +*** 911,922 **** +--- 918,938 ---- + { + int i, x, y, xd, yd, tries; + ++ #if USE_RANDOM ++ srandom((unsigned) time(0)); ++ #else + srand((unsigned int) time(0)); ++ #endif + for (i = 0; i != mine_count; i++) { + tries = 1000; + do { ++ #if USE_RANDOM ++ x = (random()>>1) % gsizex; ++ y = (random()>>1) % gsizey; ++ #else + x = (rand()>>1) % gsizex; + y = (rand()>>1) % gsizey; ++ #endif + tries--; + } while (tries && (grid[x][y] || + !(x < fx-1 || x > fx+1 || y < fy-1 +*** Imakefile~ Mon Dec 26 12:42:58 1994 +--- Imakefile Mon Dec 26 12:49:44 1994 +*************** +*** 20,25 **** +--- 20,29 ---- + # define WarnLevel + #endif + ++ # for FreeBSD package: do not compress man page, otherwise gzip will ++ # complain when building the package target ++ COMPRESSMANCMD = echo ++ + DEPLIBS = XawClientDepLibs + LOCAL_LIBRARIES = XawClientLibs + EXTRA_DEFINES = WarnLevel Xaw3dDefs diff --git a/games/xmine/files/patch-xmine.c_1 b/games/xmine/files/patch-xmine.c_1 new file mode 100644 index 0000000..2a1b8dc --- /dev/null +++ b/games/xmine/files/patch-xmine.c_1 @@ -0,0 +1,18 @@ +--- xmine.c.orig Sat Feb 19 20:50:19 2000 ++++ xmine.c Sat Feb 19 21:00:46 2000 +@@ -1407,7 +1407,6 @@ + str = XawDialogGetValueString(w); + if (!str) return; + if (atoi(str)) *val = atoi(str); +- XawAsciiSourceFreeString(w); + } + + /* ARGSUSED */ +@@ -1688,7 +1687,6 @@ + sc->times[level] = timer; + write_scores(sc); + } +- if (str) XawAsciiSourceFreeString(pane); + best_times(NULL, NULL, NULL); + } + diff --git a/games/xmine/files/patch-xmine.c_2 b/games/xmine/files/patch-xmine.c_2 new file mode 100644 index 0000000..58e2f69 --- /dev/null +++ b/games/xmine/files/patch-xmine.c_2 @@ -0,0 +1,142 @@ +--- xmine.c.orig Sat Feb 19 21:01:16 2000 ++++ xmine.c Sat Feb 19 21:43:15 2000 +@@ -126,6 +126,7 @@ + Display *disp; + Window win; + int colordisp; ++Atom delw; + + #define COL_BLUE 0 + #define COL_LIMEGREEN 1 +@@ -246,6 +247,7 @@ + int cant_write_score_file P ((void)); + void fix_size P ((void)); + void relax_size P ((void)); ++void GlobalProtoHandler P ((Widget w, XEvent *xev, String *params, Cardinal *n)); + + Pixmap fillface; + XtAppContext app; +@@ -278,7 +280,7 @@ + XColor unused; + int i; + +- XtActionsRec actions[3]; ++ XtActionsRec actions[4]; + String translations = + ": search(down)\n\ + : search(up)\n\ +@@ -291,6 +293,8 @@ + toplevel = XtVaAppInitialize(&app, "Xmine", NULL, 0, + &argc, argv, fallbacks, NULL); + ++ delw = XInternAtom(XtDisplay(toplevel), "WM_DELETE_WINDOW", False); ++ + main_w = XtVaCreateManagedWidget("main_w", boxWidgetClass, toplevel, + XtNorientation, XtorientVertical, + NULL); +@@ -390,7 +394,13 @@ + actions[1].proc = search_action; + actions[2].string = "mark"; + actions[2].proc = mark_action; +- XtAppAddActions(app, actions, 3); ++ actions[3].string = "GlobalProtoHandler"; ++ actions[3].proc = GlobalProtoHandler; ++ ++ XtAppAddActions(app, actions, 4); ++ XtOverrideTranslations(toplevel, XtParseTranslationTable( ++ "WM_PROTOCOLS : GlobalProtoHandler()") ++ ); + + drawing_a = XtVaCreateManagedWidget + ("drawing_a", +@@ -411,6 +421,7 @@ + XtAddEventHandler(toplevel, + StructureNotifyMask, False, resize_handler, 0); + XtRealizeWidget(toplevel); ++ XSetWMProtocols(XtDisplay(toplevel), XtWindow(toplevel), &delw, 1); + fillface = XCreateBitmapFromData(XtDisplay(main_w), + XtWindow(main_w), fillface_bits, + fillface_width, fillface_height); +@@ -635,11 +646,12 @@ + set_face(armit ? FACE_OHNO : FACE_HAPPY); + for (dx = -1; dx <= 1; dx++) + for (dy = -1; dy <= 1; dy++) +- if (is_state(x+dx, y+dy, COVERED)) ++ if (is_state(x+dx, y+dy, COVERED)) { + if (armit) + draw_blank_square(x+dx, y+dy, True); + else + draw_button(x+dx, y+dy); ++ } + } + + #if NeedFunctionPrototypes +@@ -1362,6 +1374,10 @@ + XtAddCallback(w, XtNcallback, dialog_ok, NULL); + XtManageChild(pane); + XtPopup(custom, XtGrabExclusive); ++ XtOverrideTranslations(custom, XtParseTranslationTable( ++ "WM_PROTOCOLS : GlobalProtoHandler()") ++ ); ++ XSetWMProtocols(XtDisplay(custom), XtWindow(custom), &delw, 1); + dialog_up = True; + while (dialog_up) { + XtAppProcessEvent(app, XtIMAll); +@@ -1525,6 +1541,10 @@ + if (cant_write_score_file()) XtSetSensitive(w, False); + XtManageChild(pane); + XtPopup(best, XtGrabExclusive); ++ XtOverrideTranslations(best, XtParseTranslationTable( ++ "WM_PROTOCOLS : GlobalProtoHandler()") ++ ); ++ XSetWMProtocols(XtDisplay(best), XtWindow(best), &delw, 1); + dialog_up = True; + while (dialog_up) { + XtAppProcessEvent(app, XtIMAll); +@@ -1569,6 +1589,10 @@ + XtAddCallback(w, XtNcallback, dialog_ok, NULL); + XtManageChild(pane); + XtPopup(about, XtGrabExclusive); ++ XtOverrideTranslations(about, XtParseTranslationTable( ++ "WM_PROTOCOLS : GlobalProtoHandler()") ++ ); ++ XSetWMProtocols(XtDisplay(about), XtWindow(about), &delw, 1); + dialog_up = True; + while (dialog_up) { + XtAppProcessEvent(app, XtIMAll); +@@ -1674,6 +1698,10 @@ + + XtManageChild(pane); + XtPopup(custom, XtGrabExclusive); ++ XtOverrideTranslations(custom, XtParseTranslationTable( ++ "WM_PROTOCOLS : GlobalProtoHandler()") ++ ); ++ XSetWMProtocols(XtDisplay(custom), XtWindow(custom), &delw, 1); + + dialog_up = True; + while (dialog_up) { +@@ -1828,3 +1856,24 @@ + { + exit(0); + } ++ ++#if NeedFunctionPrototypes ++void ++GlobalProtoHandler(Widget w, XEvent *xev, String *params, Cardinal *n) ++#else ++void ++GlobalProtoHandler(w, xev, params, n) ++ Widget w; ++ XEvent *xev; ++ String *params; ++ Cardinal *n; ++#endif ++{ ++ if(xev->xclient.data.l[0] == delw) { ++ if(w == toplevel) ++ exit(0); ++ else ++ XtPopdown(w); ++ } ++} ++ diff --git a/games/xmine/files/patch-xmine.man b/games/xmine/files/patch-xmine.man new file mode 100644 index 0000000..44f1f7a --- /dev/null +++ b/games/xmine/files/patch-xmine.man @@ -0,0 +1,8 @@ +--- xmine.man.orig Mon Mar 28 10:15:52 1994 ++++ xmine.man Fri Jan 3 03:27:40 1997 +@@ -1,4 +1,4 @@ +-.TH XMINE 1 ++.TH XMINE 6 + .SH NAME + xmine \- identify mines in a mine field without getting blown up + .SH SYNOPSIS diff --git a/games/xmines/files/patch-Makefile b/games/xmines/files/patch-Makefile new file mode 100644 index 0000000..2c8070b --- /dev/null +++ b/games/xmines/files/patch-Makefile @@ -0,0 +1,41 @@ +--- Makefile.orig Fri Dec 3 23:22:38 1993 ++++ Makefile Sat Aug 5 07:47:54 2000 +@@ -3,20 +3,20 @@ + # + # make clean removes all temporary files. + +-CFLAGS = -O +-CC = gcc +-INCLUDE = /usr/X386/include +-LIBRARY = /usr/X386/lib +-BIN = /usr/X386/bin +-SCOREFILES = /usr/X386/lib/X11/games ++CFLAGS += -DSCOREfILE=\"$(SCOREFILES)/scores\" ++CC ?= gcc ++INCLUDE = ${LOCALBASE}/include ++LIBRARY = ${LOCALBASE}/lib ++BIN = ${PREFIX}/bin ++SCOREFILES = ${PREFIX}/share/xmines + + .c.o: + $(CC) $(CFLAGS) -I $(INCLUDE) -c $< + +-all: xbombs ++all: xmines + +-xbombs: xmines.o X11.o score.o +- $(CC) -L $(LIBRARY) -o xbombs xmines.o score.o X11.o -lX11 ++xmines: xmines.o X11.o score.o ++ $(CC) -L $(LIBRARY) -o xmines xmines.o score.o X11.o -lX11 + + X11.o: covered.pat flag.pat gray.pat highlight.pat marked.pat mine.pat ohno.pat shades.pat smiley.pat uncovered.pat uncoveredcolor.pat + +@@ -24,5 +24,6 @@ + rm -f *.o + + install: +- install -g games -o games -m 0664 scores/scores $(SCOREFILES)/xbomb-scores +- install -g games -o games -m 2755 xbombs $(BIN) ++ mkdir -p ${DESTDIR}$(SCOREFILES) ++ ${INSTALL} -m 0666 scores/scores ${DESTDIR}$(SCOREFILES)/scores ++ ${INSTALL} -s -m 0755 xmines ${DESTDIR}$(BIN) diff --git a/games/xmines/files/patch-aa b/games/xmines/files/patch-aa deleted file mode 100644 index 2c8070b..0000000 --- a/games/xmines/files/patch-aa +++ /dev/null @@ -1,41 +0,0 @@ ---- Makefile.orig Fri Dec 3 23:22:38 1993 -+++ Makefile Sat Aug 5 07:47:54 2000 -@@ -3,20 +3,20 @@ - # - # make clean removes all temporary files. - --CFLAGS = -O --CC = gcc --INCLUDE = /usr/X386/include --LIBRARY = /usr/X386/lib --BIN = /usr/X386/bin --SCOREFILES = /usr/X386/lib/X11/games -+CFLAGS += -DSCOREfILE=\"$(SCOREFILES)/scores\" -+CC ?= gcc -+INCLUDE = ${LOCALBASE}/include -+LIBRARY = ${LOCALBASE}/lib -+BIN = ${PREFIX}/bin -+SCOREFILES = ${PREFIX}/share/xmines - - .c.o: - $(CC) $(CFLAGS) -I $(INCLUDE) -c $< - --all: xbombs -+all: xmines - --xbombs: xmines.o X11.o score.o -- $(CC) -L $(LIBRARY) -o xbombs xmines.o score.o X11.o -lX11 -+xmines: xmines.o X11.o score.o -+ $(CC) -L $(LIBRARY) -o xmines xmines.o score.o X11.o -lX11 - - X11.o: covered.pat flag.pat gray.pat highlight.pat marked.pat mine.pat ohno.pat shades.pat smiley.pat uncovered.pat uncoveredcolor.pat - -@@ -24,5 +24,6 @@ - rm -f *.o - - install: -- install -g games -o games -m 0664 scores/scores $(SCOREFILES)/xbomb-scores -- install -g games -o games -m 2755 xbombs $(BIN) -+ mkdir -p ${DESTDIR}$(SCOREFILES) -+ ${INSTALL} -m 0666 scores/scores ${DESTDIR}$(SCOREFILES)/scores -+ ${INSTALL} -s -m 0755 xmines ${DESTDIR}$(BIN) diff --git a/games/xmines/files/patch-ab b/games/xmines/files/patch-ab deleted file mode 100644 index ac01cec..0000000 --- a/games/xmines/files/patch-ab +++ /dev/null @@ -1,12 +0,0 @@ ---- score.c.orig Fri Dec 3 23:18:35 1993 -+++ score.c Sat Aug 5 07:48:43 2000 -@@ -6,7 +6,9 @@ - - - FILE *scoreFile; -+#ifndef SCOREfILE - #define SCOREfILE "/usr/X386/lib/X11/games/xbomb-scores" -+#endif - #define NUMsCORES 10 - #define NAMEsIZE 50 - #define SCOREfORMAT "%5d %s\n" diff --git a/games/xmines/files/patch-score.c b/games/xmines/files/patch-score.c new file mode 100644 index 0000000..ac01cec --- /dev/null +++ b/games/xmines/files/patch-score.c @@ -0,0 +1,12 @@ +--- score.c.orig Fri Dec 3 23:18:35 1993 ++++ score.c Sat Aug 5 07:48:43 2000 +@@ -6,7 +6,9 @@ + + + FILE *scoreFile; ++#ifndef SCOREfILE + #define SCOREfILE "/usr/X386/lib/X11/games/xbomb-scores" ++#endif + #define NUMsCORES 10 + #define NAMEsIZE 50 + #define SCOREfORMAT "%5d %s\n" diff --git a/games/xmulti/Makefile b/games/xmulti/Makefile index 41b3284..8104ee7 100644 --- a/games/xmulti/Makefile +++ b/games/xmulti/Makefile @@ -20,14 +20,10 @@ DOCSDIR= ${PREFIX}/share/doc/ja/{PORTNAME} OPTIONS_DEFINE= DOCS -.include - post-install: -.if ${PORT_OPTIONS:MDOCS} ${MKDIR} ${STAGEDIR}${DOCSDIR} .for i in MODULE.jp README.jp STYLESHEET.jp XMULTI.jp ${INSTALL_MAN} ${WRKSRC}/$i ${STAGEDIR}${DOCSDIR} .endfor -.endif .include diff --git a/games/xmulti/files/patch-aa b/games/xmulti/files/patch-aa deleted file mode 100644 index ad88b15..0000000 --- a/games/xmulti/files/patch-aa +++ /dev/null @@ -1,29 +0,0 @@ ---- config.tmpl.orig Thu Jun 4 18:59:37 1998 -+++ config.tmpl Thu Jun 4 18:59:55 1998 -@@ -16,7 +16,7 @@ - XCOMM CDEBUGFLAGS = -g -Wall - XCOMM CCOPTIONS = - INLINE = --YACC = bison -y -+YACC = byacc - LEX = flex - - XCOMM ----------- Making shared object options -@@ -25,7 +25,7 @@ - XCOMM PICFLAG = -fpic -DPIC - - XCOMM for BSD --XCOMM SHAREFLAGS = -x -Bshareable -+SHAREFLAGS = -x -Bshareable - - XCOMM for Linux - XCOMM SYS_LIBRARIES += -rdynamic -ldl -@@ -35,7 +35,7 @@ - XCOMM SHAREFLAGS = - - XCOMM for Other OSs (don't make modules) Ex. SunOS 5.0 --SHAREFLAGS = -+XCOMM SHAREFLAGS = - #define NOMODULE - - XCOMM --------------------------------------- diff --git a/games/xmulti/files/patch-config.tmpl b/games/xmulti/files/patch-config.tmpl new file mode 100644 index 0000000..ad88b15 --- /dev/null +++ b/games/xmulti/files/patch-config.tmpl @@ -0,0 +1,29 @@ +--- config.tmpl.orig Thu Jun 4 18:59:37 1998 ++++ config.tmpl Thu Jun 4 18:59:55 1998 +@@ -16,7 +16,7 @@ + XCOMM CDEBUGFLAGS = -g -Wall + XCOMM CCOPTIONS = + INLINE = +-YACC = bison -y ++YACC = byacc + LEX = flex + + XCOMM ----------- Making shared object options +@@ -25,7 +25,7 @@ + XCOMM PICFLAG = -fpic -DPIC + + XCOMM for BSD +-XCOMM SHAREFLAGS = -x -Bshareable ++SHAREFLAGS = -x -Bshareable + + XCOMM for Linux + XCOMM SYS_LIBRARIES += -rdynamic -ldl +@@ -35,7 +35,7 @@ + XCOMM SHAREFLAGS = + + XCOMM for Other OSs (don't make modules) Ex. SunOS 5.0 +-SHAREFLAGS = ++XCOMM SHAREFLAGS = + #define NOMODULE + + XCOMM --------------------------------------- diff --git a/games/xoids/files/patch-Imakefile b/games/xoids/files/patch-Imakefile new file mode 100644 index 0000000..a8aeac5 --- /dev/null +++ b/games/xoids/files/patch-Imakefile @@ -0,0 +1,46 @@ +--- Imakefile.orig Tue Jun 25 15:42:14 1996 ++++ Imakefile Sat Oct 14 00:59:00 2000 +@@ -6,11 +6,12 @@ + XPM_INC_FLAGS = -I/usr/local/xpm/include + XPM_LIB_FLAGS = -L/usr/local/xpm/lib -lXpm + ++MANSUFFIX = 6 ++ + XCOMM You shouldn't have to change anything below unless you need to + XCOMM add a new architecture. + #define MyNull + +-CDEBUGFLAGS = -O + OS_C_FLAGS = + OS_LIB_FLAGS = + OS_DEFINES = +@@ -19,25 +20,23 @@ + #if defined(SunArchitecture) + #endif + +-#if defined(AlphaArchitecture) ++#if defined(AlphaArchitecture) && !defined(FreeBSDArchitecture) + OS_LIB_FLAGS = -lbsd + #endif + + #if defined(FreeBSDArchitecture) ++XPM_INC_FLAGS = -I$(INCROOT)/X11 ++XPM_LIB_FLAGS = -lXpm + #endif + + SRCS = init.c oids.c oids_x.c + OBJS = init.o oids.o oids_x.o + + INCLUDES = $(XPM_INC_FLAGS) +-CCOPTIONS = $(OS_C_FLAGS) + DEFINES = $(OS_DEFINES) + EXTRA_LIBRARIES = $(XPM_LIB_FLAGS) -lX11 -lm $(OS_LIB_FLAGS) + +-AllTarget(xoids) +-NormalProgramTarget(xoids, $(OBJS), MyNull, MyNull, MyNull) +-InstallProgram(xoids,$(BINDIR)) +-DependTarget() ++ComplexProgramTarget(xoids) + + XCOMM End of Imakefile + diff --git a/games/xoids/files/patch-aa b/games/xoids/files/patch-aa deleted file mode 100644 index a8aeac5..0000000 --- a/games/xoids/files/patch-aa +++ /dev/null @@ -1,46 +0,0 @@ ---- Imakefile.orig Tue Jun 25 15:42:14 1996 -+++ Imakefile Sat Oct 14 00:59:00 2000 -@@ -6,11 +6,12 @@ - XPM_INC_FLAGS = -I/usr/local/xpm/include - XPM_LIB_FLAGS = -L/usr/local/xpm/lib -lXpm - -+MANSUFFIX = 6 -+ - XCOMM You shouldn't have to change anything below unless you need to - XCOMM add a new architecture. - #define MyNull - --CDEBUGFLAGS = -O - OS_C_FLAGS = - OS_LIB_FLAGS = - OS_DEFINES = -@@ -19,25 +20,23 @@ - #if defined(SunArchitecture) - #endif - --#if defined(AlphaArchitecture) -+#if defined(AlphaArchitecture) && !defined(FreeBSDArchitecture) - OS_LIB_FLAGS = -lbsd - #endif - - #if defined(FreeBSDArchitecture) -+XPM_INC_FLAGS = -I$(INCROOT)/X11 -+XPM_LIB_FLAGS = -lXpm - #endif - - SRCS = init.c oids.c oids_x.c - OBJS = init.o oids.o oids_x.o - - INCLUDES = $(XPM_INC_FLAGS) --CCOPTIONS = $(OS_C_FLAGS) - DEFINES = $(OS_DEFINES) - EXTRA_LIBRARIES = $(XPM_LIB_FLAGS) -lX11 -lm $(OS_LIB_FLAGS) - --AllTarget(xoids) --NormalProgramTarget(xoids, $(OBJS), MyNull, MyNull, MyNull) --InstallProgram(xoids,$(BINDIR)) --DependTarget() -+ComplexProgramTarget(xoids) - - XCOMM End of Imakefile - diff --git a/games/xoj/Makefile b/games/xoj/Makefile index 6a06373..ed91726 100644 --- a/games/xoj/Makefile +++ b/games/xoj/Makefile @@ -7,12 +7,11 @@ PORTREVISION= 2 CATEGORIES= games MASTER_SITES= ${MASTER_SITE_SUNSITE} MASTER_SITE_SUBDIR= X11/demos -EXTRACT_SUFX= .tgz MAINTAINER= ports@FreeBSD.org COMMENT= O. J. Simpson Simulator root window demo -USES= imake +USES= imake tar:tgz USE_XORG= xaw NO_INSTALL_MANPAGES= yes PLIST_FILES= bin/xoj diff --git a/games/xoj/files/patch-Imakefile b/games/xoj/files/patch-Imakefile new file mode 100644 index 0000000..d8fab9c --- /dev/null +++ b/games/xoj/files/patch-Imakefile @@ -0,0 +1,12 @@ +--- Imakefile.orig Tue Jul 26 23:10:17 1994 ++++ Imakefile Fri Oct 13 22:40:03 2000 +@@ -1,5 +1,8 @@ + LOCAL_LIBRARIES = XawClientLibs -lm + DEPLIBS = XawClientDepLibs + +-SimpleProgramTarget(xoj) ++SRCS = xoj.c ++OBJS = xoj.o ++ ++ComplexProgramTargetNoMan(xoj) + diff --git a/games/xoj/files/patch-aa b/games/xoj/files/patch-aa deleted file mode 100644 index af856b9..0000000 --- a/games/xoj/files/patch-aa +++ /dev/null @@ -1,38 +0,0 @@ ---- xoj.c.orig Tue Jul 26 23:10:19 1994 -+++ xoj.c Fri Oct 13 22:37:45 2000 -@@ -33,7 +33,9 @@ - - #include - #include -+#ifndef __STDC__ - #include -+#endif - #include - #include - -@@ -106,7 +108,9 @@ - void UpdateCop(); - void DrawCop(); - void EraseCop(); -+#ifndef __FreeBSD__ - void usleep(); -+#endif - Pixel AllocNamedColor(); - - void -@@ -584,6 +588,7 @@ - /* - * sleep for a number of micro-seconds - */ -+#ifndef __FreeBSD__ - void usleep(usec) - unsigned long usec; - { -@@ -596,6 +601,7 @@ - select(0, (void *)0, (void *)0, (void *)0, &t); - #endif - } -+#endif - - - diff --git a/games/xoj/files/patch-ab b/games/xoj/files/patch-ab deleted file mode 100644 index d8fab9c..0000000 --- a/games/xoj/files/patch-ab +++ /dev/null @@ -1,12 +0,0 @@ ---- Imakefile.orig Tue Jul 26 23:10:17 1994 -+++ Imakefile Fri Oct 13 22:40:03 2000 -@@ -1,5 +1,8 @@ - LOCAL_LIBRARIES = XawClientLibs -lm - DEPLIBS = XawClientDepLibs - --SimpleProgramTarget(xoj) -+SRCS = xoj.c -+OBJS = xoj.o -+ -+ComplexProgramTargetNoMan(xoj) - diff --git a/games/xoj/files/patch-xoj.c b/games/xoj/files/patch-xoj.c new file mode 100644 index 0000000..af856b9 --- /dev/null +++ b/games/xoj/files/patch-xoj.c @@ -0,0 +1,38 @@ +--- xoj.c.orig Tue Jul 26 23:10:19 1994 ++++ xoj.c Fri Oct 13 22:37:45 2000 +@@ -33,7 +33,9 @@ + + #include + #include ++#ifndef __STDC__ + #include ++#endif + #include + #include + +@@ -106,7 +108,9 @@ + void UpdateCop(); + void DrawCop(); + void EraseCop(); ++#ifndef __FreeBSD__ + void usleep(); ++#endif + Pixel AllocNamedColor(); + + void +@@ -584,6 +588,7 @@ + /* + * sleep for a number of micro-seconds + */ ++#ifndef __FreeBSD__ + void usleep(usec) + unsigned long usec; + { +@@ -596,6 +601,7 @@ + select(0, (void *)0, (void *)0, (void *)0, &t); + #endif + } ++#endif + + + diff --git a/games/xosmulti/files/patch-Makefile b/games/xosmulti/files/patch-Makefile new file mode 100644 index 0000000..e7190fb --- /dev/null +++ b/games/xosmulti/files/patch-Makefile @@ -0,0 +1,35 @@ +--- Makefile.orig Sat Nov 28 17:59:36 1998 ++++ Makefile Fri Feb 19 00:24:44 1999 +@@ -4,17 +4,17 @@ + + TARGET = xosmulti + +-CC = cc +-LINKER = cc ++CC ?= cc ++LINKER = $(CC) + + # + # Set MAIL_SPOOL to moderate value for your environment. + # +-MAIL_SPOOL = '"/usr/spool/mail"' ++# MAIL_SPOOL = '"/usr/spool/mail"' + # MAIL_SPOOL = '"/usr/mail"' +-# MAIL_SPOOL = '"/var/mail"' ++MAIL_SPOOL = '"/var/mail"' + +-CFLAGS = -O -DMAILBOX_DIRECTORY=$(MAIL_SPOOL) ++CFLAGS += -DMAILBOX_DIRECTORY=$(MAIL_SPOOL) + + SRCS = $(TARGET).c image.c biff.c message.c + OBJS = $(SRCS:.c=.o) +@@ -22,8 +22,8 @@ + LIBS = -lX11 -lXext + # LIBS = -lX11 -lXext -lsocket -lnsl # for Sun-OS + +-# INC_DIR = -I/usr/X11R6/include +-# LIB_DIR = -L/usr/X11R6/lib ++INC_DIR = -I${LOCALBASE}/include ++LIB_DIR = -L${LOCALBASE}/lib + + all: $(TARGET) diff --git a/games/xosmulti/files/patch-aa b/games/xosmulti/files/patch-aa deleted file mode 100644 index e7190fb..0000000 --- a/games/xosmulti/files/patch-aa +++ /dev/null @@ -1,35 +0,0 @@ ---- Makefile.orig Sat Nov 28 17:59:36 1998 -+++ Makefile Fri Feb 19 00:24:44 1999 -@@ -4,17 +4,17 @@ - - TARGET = xosmulti - --CC = cc --LINKER = cc -+CC ?= cc -+LINKER = $(CC) - - # - # Set MAIL_SPOOL to moderate value for your environment. - # --MAIL_SPOOL = '"/usr/spool/mail"' -+# MAIL_SPOOL = '"/usr/spool/mail"' - # MAIL_SPOOL = '"/usr/mail"' --# MAIL_SPOOL = '"/var/mail"' -+MAIL_SPOOL = '"/var/mail"' - --CFLAGS = -O -DMAILBOX_DIRECTORY=$(MAIL_SPOOL) -+CFLAGS += -DMAILBOX_DIRECTORY=$(MAIL_SPOOL) - - SRCS = $(TARGET).c image.c biff.c message.c - OBJS = $(SRCS:.c=.o) -@@ -22,8 +22,8 @@ - LIBS = -lX11 -lXext - # LIBS = -lX11 -lXext -lsocket -lnsl # for Sun-OS - --# INC_DIR = -I/usr/X11R6/include --# LIB_DIR = -L/usr/X11R6/lib -+INC_DIR = -I${LOCALBASE}/include -+LIB_DIR = -L${LOCALBASE}/lib - - all: $(TARGET) diff --git a/games/xpipeman/Makefile b/games/xpipeman/Makefile index 2857ffd..a1062c9 100644 --- a/games/xpipeman/Makefile +++ b/games/xpipeman/Makefile @@ -8,7 +8,6 @@ CATEGORIES= games MASTER_SITES= SUNSITE MASTER_SITE_SUBDIR= games/strategy DISTNAME= ${PORTNAME} -EXTRACT_SUFX= .tar.Z MAINTAINER= ports@FreeBSD.org COMMENT= Connect the pipes to stop the leaks @@ -16,7 +15,7 @@ COMMENT= Connect the pipes to stop the leaks # LP64 issues ONLY_FOR_ARCHS= i386 amd64 -USES= imake +USES= imake tar:Z USE_XORG= x11 xaw xext xmu xt sm ice CFLAGS+= -Wno-error=return-type diff --git a/games/xpipeman/files/patch-Imakefile b/games/xpipeman/files/patch-Imakefile new file mode 100644 index 0000000..f5f57b0 --- /dev/null +++ b/games/xpipeman/files/patch-Imakefile @@ -0,0 +1,27 @@ +--- ./Imakefile.orig 1992-07-28 23:56:27.000000000 +0000 ++++ ./Imakefile 2013-05-31 12:26:22.000000000 +0000 +@@ -1,7 +1,7 @@ + +- SCORE_FILE = -DSCORE_FILE=\"/usr/games/lib/xpipescores\" ++ SCORE_FILE = -DSCORE_FILE=\"$(PREFIX)/lib/X11/xpipescores\" + MAXSCORES = -DMAXSCORES=20 +- DEFINES = $(SCORE_FILE) $(MAXSCORES) -DSYSV ++ DEFINES = $(SCORE_FILE) $(MAXSCORES) + + SRCS = actions.c game.c graphics.c main.c score.c popup.c info.c + OBJS = actions.o game.o graphics.o main.o score.o popup.o info.o +@@ -10,6 +10,9 @@ + LOCAL_LIBRARIES = $(XAWLIB) $(XMULIB) $(XTOOLLIB) $(XLIB) + SYS_LIBRARIES = -lm + ++ MANSUFFIX = 6 ++ INSTPGMFLAGS = -g games -m 2755 ++ + all:: xpipeman + + ComplexProgramTarget(xpipeman) +@@ -19,4 +22,3 @@ + * InstallManPage(xpipeman,$(MANDIR)) + * InstallProgram(xpipeman,$(BINDIR)) + */ +- diff --git a/games/xpipeman/files/patch-aa b/games/xpipeman/files/patch-aa deleted file mode 100644 index ddeaebe..0000000 --- a/games/xpipeman/files/patch-aa +++ /dev/null @@ -1,31 +0,0 @@ ---- score.c.orig 1991-09-13 22:32:12.000000000 +0200 -+++ score.c 2011-02-02 19:34:46.908945354 +0100 -@@ -50,8 +50,9 @@ - #include - #endif - --#include /* brings in */ -+#include - #include -+#include - #include "xpipeman.h" - - /*----------------------------------------------------------------------*/ -@@ -64,7 +65,7 @@ - - static SCORE scores[MAXSCORES]; - --void show_scores(), -+static void show_scores(), - new_high_score(), - load_scores(), - write_out_scores(); -@@ -198,7 +199,7 @@ - - - /*ARGSUSED*/ --static XtCallbackProc -+static void - popdown_callback(w, closure, call_data) - Widget w; - caddr_t closure; diff --git a/games/xpipeman/files/patch-ab b/games/xpipeman/files/patch-ab deleted file mode 100644 index f5f57b0..0000000 --- a/games/xpipeman/files/patch-ab +++ /dev/null @@ -1,27 +0,0 @@ ---- ./Imakefile.orig 1992-07-28 23:56:27.000000000 +0000 -+++ ./Imakefile 2013-05-31 12:26:22.000000000 +0000 -@@ -1,7 +1,7 @@ - -- SCORE_FILE = -DSCORE_FILE=\"/usr/games/lib/xpipescores\" -+ SCORE_FILE = -DSCORE_FILE=\"$(PREFIX)/lib/X11/xpipescores\" - MAXSCORES = -DMAXSCORES=20 -- DEFINES = $(SCORE_FILE) $(MAXSCORES) -DSYSV -+ DEFINES = $(SCORE_FILE) $(MAXSCORES) - - SRCS = actions.c game.c graphics.c main.c score.c popup.c info.c - OBJS = actions.o game.o graphics.o main.o score.o popup.o info.o -@@ -10,6 +10,9 @@ - LOCAL_LIBRARIES = $(XAWLIB) $(XMULIB) $(XTOOLLIB) $(XLIB) - SYS_LIBRARIES = -lm - -+ MANSUFFIX = 6 -+ INSTPGMFLAGS = -g games -m 2755 -+ - all:: xpipeman - - ComplexProgramTarget(xpipeman) -@@ -19,4 +22,3 @@ - * InstallManPage(xpipeman,$(MANDIR)) - * InstallProgram(xpipeman,$(BINDIR)) - */ -- diff --git a/games/xpipeman/files/patch-ac b/games/xpipeman/files/patch-ac deleted file mode 100644 index df7d9d2..0000000 --- a/games/xpipeman/files/patch-ac +++ /dev/null @@ -1,43 +0,0 @@ ---- ./main.c.orig 1991-09-13 20:32:10.000000000 +0000 -+++ ./main.c 2013-05-31 10:39:59.000000000 +0000 -@@ -146,21 +146,11 @@ - {"-scorefile","scorefile",XrmoptionSepArg, NULL }, - }; - --static XtResource application_resources[] = { -- {"foreground", "Foreground", XtRPixel, sizeof(Pixel), -- (Cardinal)&fg, XtRString, (caddr_t) "Black"}, -- {"background", "Background", XtRPixel, sizeof(Pixel), -- (Cardinal)&bg, XtRString, (caddr_t) "White"}, -- {"translations","Translations", XtRTranslationTable, sizeof(XtTranslations), -- (Cardinal)&translations, XtRString, (caddr_t)translations_str}, -- {"scorefile","Scorefile", XtRString, sizeof(String), -- (Cardinal)&score_filename, XtRString, (caddr_t)SCORE_FILE}, --}; - - /*----------------------------------------------------------------------*/ - - main(argc, argv) -- unsigned int argc; -+ int argc; - char **argv; - { - Arg args[1]; -@@ -168,6 +158,17 @@ - Widget quit_command, - new_game_command; - -+XtResource application_resources[] = { -+ {"foreground", "Foreground", XtRPixel, sizeof(Pixel), -+ (Cardinal)&fg, XtRString, (caddr_t) "Black"}, -+ {"background", "Background", XtRPixel, sizeof(Pixel), -+ (Cardinal)&bg, XtRString, (caddr_t) "White"}, -+ {"translations","Translations", XtRTranslationTable, sizeof(XtTranslations), -+ (Cardinal)&translations, XtRString, (caddr_t)translations_str}, -+ {"scorefile","Scorefile", XtRString, sizeof(String), -+ (Cardinal)&score_filename, XtRString, (caddr_t)SCORE_FILE}, -+}; -+ - srandom(getpid()); - current_block = 0; - current_callback = NULL; diff --git a/games/xpipeman/files/patch-main.c b/games/xpipeman/files/patch-main.c new file mode 100644 index 0000000..df7d9d2 --- /dev/null +++ b/games/xpipeman/files/patch-main.c @@ -0,0 +1,43 @@ +--- ./main.c.orig 1991-09-13 20:32:10.000000000 +0000 ++++ ./main.c 2013-05-31 10:39:59.000000000 +0000 +@@ -146,21 +146,11 @@ + {"-scorefile","scorefile",XrmoptionSepArg, NULL }, + }; + +-static XtResource application_resources[] = { +- {"foreground", "Foreground", XtRPixel, sizeof(Pixel), +- (Cardinal)&fg, XtRString, (caddr_t) "Black"}, +- {"background", "Background", XtRPixel, sizeof(Pixel), +- (Cardinal)&bg, XtRString, (caddr_t) "White"}, +- {"translations","Translations", XtRTranslationTable, sizeof(XtTranslations), +- (Cardinal)&translations, XtRString, (caddr_t)translations_str}, +- {"scorefile","Scorefile", XtRString, sizeof(String), +- (Cardinal)&score_filename, XtRString, (caddr_t)SCORE_FILE}, +-}; + + /*----------------------------------------------------------------------*/ + + main(argc, argv) +- unsigned int argc; ++ int argc; + char **argv; + { + Arg args[1]; +@@ -168,6 +158,17 @@ + Widget quit_command, + new_game_command; + ++XtResource application_resources[] = { ++ {"foreground", "Foreground", XtRPixel, sizeof(Pixel), ++ (Cardinal)&fg, XtRString, (caddr_t) "Black"}, ++ {"background", "Background", XtRPixel, sizeof(Pixel), ++ (Cardinal)&bg, XtRString, (caddr_t) "White"}, ++ {"translations","Translations", XtRTranslationTable, sizeof(XtTranslations), ++ (Cardinal)&translations, XtRString, (caddr_t)translations_str}, ++ {"scorefile","Scorefile", XtRString, sizeof(String), ++ (Cardinal)&score_filename, XtRString, (caddr_t)SCORE_FILE}, ++}; ++ + srandom(getpid()); + current_block = 0; + current_callback = NULL; diff --git a/games/xpipeman/files/patch-score.c b/games/xpipeman/files/patch-score.c new file mode 100644 index 0000000..ddeaebe --- /dev/null +++ b/games/xpipeman/files/patch-score.c @@ -0,0 +1,31 @@ +--- score.c.orig 1991-09-13 22:32:12.000000000 +0200 ++++ score.c 2011-02-02 19:34:46.908945354 +0100 +@@ -50,8 +50,9 @@ + #include + #endif + +-#include /* brings in */ ++#include + #include ++#include + #include "xpipeman.h" + + /*----------------------------------------------------------------------*/ +@@ -64,7 +65,7 @@ + + static SCORE scores[MAXSCORES]; + +-void show_scores(), ++static void show_scores(), + new_high_score(), + load_scores(), + write_out_scores(); +@@ -198,7 +199,7 @@ + + + /*ARGSUSED*/ +-static XtCallbackProc ++static void + popdown_callback(w, closure, call_data) + Widget w; + caddr_t closure; diff --git a/games/xpuyopuyo/files/patch-Makefile.in b/games/xpuyopuyo/files/patch-Makefile.in new file mode 100644 index 0000000..e16f892 --- /dev/null +++ b/games/xpuyopuyo/files/patch-Makefile.in @@ -0,0 +1,11 @@ +--- Makefile.in.orig Sat Sep 25 18:11:27 1999 ++++ Makefile.in Fri Oct 8 10:34:51 1999 +@@ -135,7 +135,7 @@ + @GTK_FALSE@xpuyopuyo_DEPENDENCIES = libxpuyopuyo.a + @GTK_TRUE@xpuyopuyo_DEPENDENCIES = libxpuyopuyo.a + xpuyopuyo_LDFLAGS = +-CFLAGS = @CFLAGS@ ++CFLAGS += @CFLAGS@ + COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) + LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) + CCLD = $(CC) diff --git a/games/xpuyopuyo/files/patch-aa b/games/xpuyopuyo/files/patch-aa deleted file mode 100644 index e16f892..0000000 --- a/games/xpuyopuyo/files/patch-aa +++ /dev/null @@ -1,11 +0,0 @@ ---- Makefile.in.orig Sat Sep 25 18:11:27 1999 -+++ Makefile.in Fri Oct 8 10:34:51 1999 -@@ -135,7 +135,7 @@ - @GTK_FALSE@xpuyopuyo_DEPENDENCIES = libxpuyopuyo.a - @GTK_TRUE@xpuyopuyo_DEPENDENCIES = libxpuyopuyo.a - xpuyopuyo_LDFLAGS = --CFLAGS = @CFLAGS@ -+CFLAGS += @CFLAGS@ - COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) - LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) - CCLD = $(CC) diff --git a/games/xpuyopuyo/files/patch-ab b/games/xpuyopuyo/files/patch-ab deleted file mode 100644 index 87a41ba..0000000 --- a/games/xpuyopuyo/files/patch-ab +++ /dev/null @@ -1,11 +0,0 @@ ---- pgame/Makefile.in.orig Tue Jul 18 10:31:49 2000 -+++ pgame/Makefile.in Tue Jul 18 10:32:05 2000 -@@ -117,7 +117,7 @@ - libxpp_game_a_SOURCES = pconfig.c pfield.c pgame.c phighscore.c pinfo.c pmanip.c ppiece.c pplayer.c ptournament.c pconfig.h pconfigm.h pfield.h pgame.h phighscore.h pinfo.h pmanip.h ppiece.h pplayer.h ptime.h ptournament.h pwindow.h - - --INCLUDES = -I../putil -I../pai -I../pnet -I../psound -+INCLUDES = $(LIBMIKMOD_CFLAGS) -I../putil -I../pai -I../pnet -I../psound - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs - CONFIG_HEADER = ../config.h - CONFIG_CLEAN_FILES = diff --git a/games/xpuyopuyo/files/patch-pgame_Makefile.in b/games/xpuyopuyo/files/patch-pgame_Makefile.in new file mode 100644 index 0000000..87a41ba --- /dev/null +++ b/games/xpuyopuyo/files/patch-pgame_Makefile.in @@ -0,0 +1,11 @@ +--- pgame/Makefile.in.orig Tue Jul 18 10:31:49 2000 ++++ pgame/Makefile.in Tue Jul 18 10:32:05 2000 +@@ -117,7 +117,7 @@ + libxpp_game_a_SOURCES = pconfig.c pfield.c pgame.c phighscore.c pinfo.c pmanip.c ppiece.c pplayer.c ptournament.c pconfig.h pconfigm.h pfield.h pgame.h phighscore.h pinfo.h pmanip.h ppiece.h pplayer.h ptime.h ptournament.h pwindow.h + + +-INCLUDES = -I../putil -I../pai -I../pnet -I../psound ++INCLUDES = $(LIBMIKMOD_CFLAGS) -I../putil -I../pai -I../pnet -I../psound + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs + CONFIG_HEADER = ../config.h + CONFIG_CLEAN_FILES = diff --git a/games/xpuzzletama/files/patch-Imakefile b/games/xpuzzletama/files/patch-Imakefile new file mode 100644 index 0000000..3167672 --- /dev/null +++ b/games/xpuzzletama/files/patch-Imakefile @@ -0,0 +1,17 @@ +--- ./Imakefile.org Thu Oct 15 03:24:34 1998 ++++ ./Imakefile Wed Sep 6 19:13:20 2000 +@@ -7,7 +7,7 @@ + OBJS = $(SRCS:.c=.o) + + #SCOREFILE = /opt/X11R6/lib/X11/tama_score +-SCOREFILE = ./.tama_score ++SCOREFILE = $(LIBDIR)/xpuzzletama/tama_score + + # もしネットワーク対戦をサポートしないなら下の -DNET を削ってください。 + # スコアファイルにロック機構が必要ないなら -DFILELOCK を付けてください。 +@@ -15,4 +15,4 @@ + #DEFINES = -DSFILE=\"${SCOREFILE}\" -DNET -DFILELOCK -I/opt/X11R6/include + DEFINES = -DSFILE=\"${SCOREFILE}\" -DNET + +-ComplexProgramTarget(xpuzzletama) ++ComplexProgramTargetNoMan(xpuzzletama) diff --git a/games/xpuzzletama/files/patch-aa b/games/xpuzzletama/files/patch-aa deleted file mode 100644 index 3167672..0000000 --- a/games/xpuzzletama/files/patch-aa +++ /dev/null @@ -1,17 +0,0 @@ ---- ./Imakefile.org Thu Oct 15 03:24:34 1998 -+++ ./Imakefile Wed Sep 6 19:13:20 2000 -@@ -7,7 +7,7 @@ - OBJS = $(SRCS:.c=.o) - - #SCOREFILE = /opt/X11R6/lib/X11/tama_score --SCOREFILE = ./.tama_score -+SCOREFILE = $(LIBDIR)/xpuzzletama/tama_score - - # もしネットワーク対戦をサポートしないなら下の -DNET を削ってください。 - # スコアファイルにロック機構が必要ないなら -DFILELOCK を付けてください。 -@@ -15,4 +15,4 @@ - #DEFINES = -DSFILE=\"${SCOREFILE}\" -DNET -DFILELOCK -I/opt/X11R6/include - DEFINES = -DSFILE=\"${SCOREFILE}\" -DNET - --ComplexProgramTarget(xpuzzletama) -+ComplexProgramTargetNoMan(xpuzzletama) diff --git a/games/xrisk/files/patch-aa b/games/xrisk/files/patch-aa deleted file mode 100644 index c64fdf7..0000000 --- a/games/xrisk/files/patch-aa +++ /dev/null @@ -1,11 +0,0 @@ ---- xrisk.def.orig Wed Oct 27 19:14:11 1993 -+++ xrisk.def Fri Feb 11 15:46:40 2000 -@@ -3,6 +3,8 @@ - /* EXTRA_DEFINES = -D_NO_PROTO */ - RISKBINDIR = $(BINDIR) - RISKLIBDIR = $(LIBDIR)/xrisk -+MANDIR = $(MANPATH)/man6 -+MANSUFFIX = 6 - - /* - If you prefere mappings other than english check out if it exists (or write diff --git a/games/xrisk/files/patch-ab b/games/xrisk/files/patch-ab deleted file mode 100644 index 90039a8..0000000 --- a/games/xrisk/files/patch-ab +++ /dev/null @@ -1,8 +0,0 @@ ---- doc/Imakefile.orig Sun Jul 18 00:18:14 1993 -+++ doc/Imakefile Tue Feb 1 22:39:11 2000 -@@ -1,5 +1,3 @@ - #include "../xrisk.def" - --all: -- - InstallManPage(xrisk,$(MANDIR)) diff --git a/games/xrisk/files/patch-ac b/games/xrisk/files/patch-ac deleted file mode 100644 index 1547b5c..0000000 --- a/games/xrisk/files/patch-ac +++ /dev/null @@ -1,11 +0,0 @@ ---- lib/Imakefile.orig Sun Jul 18 00:26:04 1993 -+++ lib/Imakefile Tue Feb 1 22:42:35 2000 -@@ -3,8 +3,6 @@ - MAPFILES = english.mapping french.mapping german.mapping norwegian.mapping - XRASFILES = *.xras - --all: -- - InstallMultiple($(DATAFILE),$(DATADIR)) - InstallMultiple($(MAPFILES),$(MAPDIR)) - InstallMultiple($(XRASFILES),$(XRASDIR)) diff --git a/games/xrisk/files/patch-doc_Imakefile b/games/xrisk/files/patch-doc_Imakefile new file mode 100644 index 0000000..90039a8 --- /dev/null +++ b/games/xrisk/files/patch-doc_Imakefile @@ -0,0 +1,8 @@ +--- doc/Imakefile.orig Sun Jul 18 00:18:14 1993 ++++ doc/Imakefile Tue Feb 1 22:39:11 2000 +@@ -1,5 +1,3 @@ + #include "../xrisk.def" + +-all: +- + InstallManPage(xrisk,$(MANDIR)) diff --git a/games/xrisk/files/patch-lib_Imakefile b/games/xrisk/files/patch-lib_Imakefile new file mode 100644 index 0000000..1547b5c --- /dev/null +++ b/games/xrisk/files/patch-lib_Imakefile @@ -0,0 +1,11 @@ +--- lib/Imakefile.orig Sun Jul 18 00:26:04 1993 ++++ lib/Imakefile Tue Feb 1 22:42:35 2000 +@@ -3,8 +3,6 @@ + MAPFILES = english.mapping french.mapping german.mapping norwegian.mapping + XRASFILES = *.xras + +-all: +- + InstallMultiple($(DATAFILE),$(DATADIR)) + InstallMultiple($(MAPFILES),$(MAPDIR)) + InstallMultiple($(XRASFILES),$(XRASDIR)) diff --git a/games/xrisk/files/patch-xrisk.def b/games/xrisk/files/patch-xrisk.def new file mode 100644 index 0000000..c64fdf7 --- /dev/null +++ b/games/xrisk/files/patch-xrisk.def @@ -0,0 +1,11 @@ +--- xrisk.def.orig Wed Oct 27 19:14:11 1993 ++++ xrisk.def Fri Feb 11 15:46:40 2000 +@@ -3,6 +3,8 @@ + /* EXTRA_DEFINES = -D_NO_PROTO */ + RISKBINDIR = $(BINDIR) + RISKLIBDIR = $(LIBDIR)/xrisk ++MANDIR = $(MANPATH)/man6 ++MANSUFFIX = 6 + + /* + If you prefere mappings other than english check out if it exists (or write diff --git a/games/xroach/files/patch-Makefile b/games/xroach/files/patch-Makefile new file mode 100644 index 0000000..a5c1aea --- /dev/null +++ b/games/xroach/files/patch-Makefile @@ -0,0 +1,24 @@ +--- Makefile.orig Tue Jun 8 19:12:04 1993 ++++ Makefile Sun Sep 8 03:45:39 2002 +@@ -1,9 +1,16 @@ +-# @(#)Makefile 8.1 (Berkeley) 6/8/93 ++# @(#)Makefile 8.1 (Berkeley) 5/31/93 + + PROG= xroach +-MAN6= xroach.0 +-CFLAGS+= -I${.CURDIR}/bitmaps +-DPADD= ${LIBX} ${LIBM} +-LDADD= -lX11/X11 -lm ++MAN6= xroach.6 ++ ++DPADD+= ${LOCALBASE}/lib/libX11.a ${LIBM} ++CFLAGS+= -I${LOCALBASE}/include -I${.CURDIR}/bitmaps ++LDADD+= -L${LOCALBASE}/lib -lX11 -lm ++ ++MANDIR= ${LOCALBASE}/man/man ++ ++BINOWN= bin ++BINDIR= ${LOCALBASE}/bin ++BINMODE= 755 + + .include diff --git a/games/xroach/files/patch-aa b/games/xroach/files/patch-aa deleted file mode 100644 index a5c1aea..0000000 --- a/games/xroach/files/patch-aa +++ /dev/null @@ -1,24 +0,0 @@ ---- Makefile.orig Tue Jun 8 19:12:04 1993 -+++ Makefile Sun Sep 8 03:45:39 2002 -@@ -1,9 +1,16 @@ --# @(#)Makefile 8.1 (Berkeley) 6/8/93 -+# @(#)Makefile 8.1 (Berkeley) 5/31/93 - - PROG= xroach --MAN6= xroach.0 --CFLAGS+= -I${.CURDIR}/bitmaps --DPADD= ${LIBX} ${LIBM} --LDADD= -lX11/X11 -lm -+MAN6= xroach.6 -+ -+DPADD+= ${LOCALBASE}/lib/libX11.a ${LIBM} -+CFLAGS+= -I${LOCALBASE}/include -I${.CURDIR}/bitmaps -+LDADD+= -L${LOCALBASE}/lib -lX11 -lm -+ -+MANDIR= ${LOCALBASE}/man/man -+ -+BINOWN= bin -+BINDIR= ${LOCALBASE}/bin -+BINMODE= 755 - - .include diff --git a/games/xroach/files/patch-ab b/games/xroach/files/patch-ab deleted file mode 100644 index ea392fd2..0000000 --- a/games/xroach/files/patch-ab +++ /dev/null @@ -1,58 +0,0 @@ ---- xroach.c.orig 1993-06-04 21:47:09.000000000 +0200 -+++ xroach.c 2011-12-20 19:03:53.816175581 +0100 -@@ -77,7 +77,7 @@ - int MarkHiddenRoaches(); - Pixel AllocNamedColor(); - --void -+int - main(ac, av) - int ac; - char *av[]; -@@ -96,19 +96,23 @@ - /* - Process command line options. - */ -- for (ax=1; ax= ac) -+ Usage(); -+ - if (strcmp(arg, "-display") == 0) { -- display_name = av[++ax]; -+ display_name = av[ax++]; - } - else if (strcmp(arg, "-rc") == 0) { -- roachColor = av[++ax]; -+ roachColor = av[ax++]; - } - else if (strcmp(arg, "-speed") == 0) { -- roachSpeed = atof(av[++ax]); -+ roachSpeed = atof(av[ax++]); - } - else if (strcmp(arg, "-roaches") == 0) { -- maxRoaches = strtol(av[++ax], (char **)NULL, 0); -+ maxRoaches = strtol(av[ax++], (char **)NULL, 0); - } - else { - Usage(); -@@ -212,6 +216,7 @@ - CoverRoot(); - - XCloseDisplay(display); -+ return(0); - } - - #define USEPRT(msg) fprintf(stderr, msg) -@@ -465,7 +470,7 @@ - Region covered; - Region visible; - Window *children; -- int nChildren; -+ unsigned int nChildren; - Window dummy; - XWindowAttributes wa; - int wx; diff --git a/games/xroach/files/patch-xroach.c b/games/xroach/files/patch-xroach.c new file mode 100644 index 0000000..ea392fd2 --- /dev/null +++ b/games/xroach/files/patch-xroach.c @@ -0,0 +1,58 @@ +--- xroach.c.orig 1993-06-04 21:47:09.000000000 +0200 ++++ xroach.c 2011-12-20 19:03:53.816175581 +0100 +@@ -77,7 +77,7 @@ + int MarkHiddenRoaches(); + Pixel AllocNamedColor(); + +-void ++int + main(ac, av) + int ac; + char *av[]; +@@ -96,19 +96,23 @@ + /* + Process command line options. + */ +- for (ax=1; ax= ac) ++ Usage(); ++ + if (strcmp(arg, "-display") == 0) { +- display_name = av[++ax]; ++ display_name = av[ax++]; + } + else if (strcmp(arg, "-rc") == 0) { +- roachColor = av[++ax]; ++ roachColor = av[ax++]; + } + else if (strcmp(arg, "-speed") == 0) { +- roachSpeed = atof(av[++ax]); ++ roachSpeed = atof(av[ax++]); + } + else if (strcmp(arg, "-roaches") == 0) { +- maxRoaches = strtol(av[++ax], (char **)NULL, 0); ++ maxRoaches = strtol(av[ax++], (char **)NULL, 0); + } + else { + Usage(); +@@ -212,6 +216,7 @@ + CoverRoot(); + + XCloseDisplay(display); ++ return(0); + } + + #define USEPRT(msg) fprintf(stderr, msg) +@@ -465,7 +470,7 @@ + Region covered; + Region visible; + Window *children; +- int nChildren; ++ unsigned int nChildren; + Window dummy; + XWindowAttributes wa; + int wx; diff --git a/games/xroads/files/patch-Makefile b/games/xroads/files/patch-Makefile new file mode 100644 index 0000000..0d0c353 --- /dev/null +++ b/games/xroads/files/patch-Makefile @@ -0,0 +1,52 @@ +--- Makefile.orig Sat Jul 17 10:37:03 1999 ++++ Makefile Fri Mar 30 21:19:14 2001 +@@ -5,8 +5,10 @@ + # the executable + ########################################################################### + +-DATAPATH = /usr/games/xroads/ +-BINPATH = /usr/X11R6/bin/ ++PREFIX ?= /usr/X11R6 ++LOCALBASE ?= /usr/X11R6 ++DATAPATH = ${PREFIX}/share/xroads ++BINPATH = ${PREFIX}/bin + # I imagine you would use this BINPATH for Solaris: + #BINPATH = /usr/openwin/bin/ + +@@ -16,7 +18,7 @@ + ########################################################################### + + #CFLAGS = -fomit-frame-pointer -O2 -Wall -DXRMPATH=\"$(DATAPATH)\" +-CFLAGS = -O6 -mpentium -g -Wall -DXRMPATH=\"$(DATAPATH)\" ++CFLAGS += -DXRMPATH=\"$(DATAPATH)\" -I${LOCALBASE}/include + + ########################################################################### + # Links necessary for X11 +@@ -33,7 +35,7 @@ + ########################################################################### + + ### Linux machines use this line: +-LINK = -L/usr/X11R6/lib -I/usr/X11R6/include -lX11 -lm ++LINK = -L${LOCALBASE}/lib -lX11 -lm + + ### This line should work on Sun machines: + #LINK = -L/usr/openwin/lib -I/usr/openwin/include -lX11 -lm +@@ -43,8 +45,7 @@ + ########################################################################### + + # Your C compiler +-CC = egcs +-#CC = gcc ++CC ?= gcc + + # Your tar + TAR = tar +@@ -71,7 +72,7 @@ + + ## "all" of course builds XRoads. + all: $(OBJECTS) +- $(CC) $(FLAGS) -o xroads $(OBJECTS) $(LINK) ++ $(CC) $(CFLAGS) -o xroads $(OBJECTS) $(LINK) + + install: all + rm -fr $(DATAPATH) diff --git a/games/xroads/files/patch-aa b/games/xroads/files/patch-aa deleted file mode 100644 index 0d0c353..0000000 --- a/games/xroads/files/patch-aa +++ /dev/null @@ -1,52 +0,0 @@ ---- Makefile.orig Sat Jul 17 10:37:03 1999 -+++ Makefile Fri Mar 30 21:19:14 2001 -@@ -5,8 +5,10 @@ - # the executable - ########################################################################### - --DATAPATH = /usr/games/xroads/ --BINPATH = /usr/X11R6/bin/ -+PREFIX ?= /usr/X11R6 -+LOCALBASE ?= /usr/X11R6 -+DATAPATH = ${PREFIX}/share/xroads -+BINPATH = ${PREFIX}/bin - # I imagine you would use this BINPATH for Solaris: - #BINPATH = /usr/openwin/bin/ - -@@ -16,7 +18,7 @@ - ########################################################################### - - #CFLAGS = -fomit-frame-pointer -O2 -Wall -DXRMPATH=\"$(DATAPATH)\" --CFLAGS = -O6 -mpentium -g -Wall -DXRMPATH=\"$(DATAPATH)\" -+CFLAGS += -DXRMPATH=\"$(DATAPATH)\" -I${LOCALBASE}/include - - ########################################################################### - # Links necessary for X11 -@@ -33,7 +35,7 @@ - ########################################################################### - - ### Linux machines use this line: --LINK = -L/usr/X11R6/lib -I/usr/X11R6/include -lX11 -lm -+LINK = -L${LOCALBASE}/lib -lX11 -lm - - ### This line should work on Sun machines: - #LINK = -L/usr/openwin/lib -I/usr/openwin/include -lX11 -lm -@@ -43,8 +45,7 @@ - ########################################################################### - - # Your C compiler --CC = egcs --#CC = gcc -+CC ?= gcc - - # Your tar - TAR = tar -@@ -71,7 +72,7 @@ - - ## "all" of course builds XRoads. - all: $(OBJECTS) -- $(CC) $(FLAGS) -o xroads $(OBJECTS) $(LINK) -+ $(CC) $(CFLAGS) -o xroads $(OBJECTS) $(LINK) - - install: all - rm -fr $(DATAPATH) diff --git a/games/xroads/files/patch-ab b/games/xroads/files/patch-ab deleted file mode 100644 index e1d3efc..0000000 --- a/games/xroads/files/patch-ab +++ /dev/null @@ -1,11 +0,0 @@ ---- config.h.orig Sat Jul 17 10:37:03 1999 -+++ config.h Fri Mar 30 21:11:09 2001 -@@ -30,7 +30,7 @@ - /* Comment this out to disable the joystick code. This code currently only - works on Linux, and only uses one joystick */ - --#define USEJOYSTICK -+#undef USEJOYSTICK - - /* Don't enable the joystick by default. Otherwise, it defaults to - controlling player 1. Uncomment this if your joystick doesn't work diff --git a/games/xroads/files/patch-config.h b/games/xroads/files/patch-config.h new file mode 100644 index 0000000..e1d3efc --- /dev/null +++ b/games/xroads/files/patch-config.h @@ -0,0 +1,11 @@ +--- config.h.orig Sat Jul 17 10:37:03 1999 ++++ config.h Fri Mar 30 21:11:09 2001 +@@ -30,7 +30,7 @@ + /* Comment this out to disable the joystick code. This code currently only + works on Linux, and only uses one joystick */ + +-#define USEJOYSTICK ++#undef USEJOYSTICK + + /* Don't enable the joystick by default. Otherwise, it defaults to + controlling player 1. Uncomment this if your joystick doesn't work diff --git a/games/xsokoban/files/patch-Imakefile b/games/xsokoban/files/patch-Imakefile new file mode 100644 index 0000000..355fb6b --- /dev/null +++ b/games/xsokoban/files/patch-Imakefile @@ -0,0 +1,19 @@ +*** Imakefile.orig Wed Aug 28 02:34:41 1996 +--- Imakefile Sat Jan 15 00:00:00 2000 +*************** +*** 1,7 **** + DEFINES= -DNDEBUG +! EXTRA_INCLUDES= -I/usr/local/include + +! SYS_LIBRARIES= -L/usr/local/lib -lXpm $(XLIB) + # -lXpm is only needed if you are using Xpm. + + SRCS= display.c main.c resources.c play.c score.c screen.c \ +--- 1,7 ---- + DEFINES= -DNDEBUG +! EXTRA_INCLUDES= -I$(INCDIR)/X11 + +! SYS_LIBRARIES= -lXpm $(XLIB) + # -lXpm is only needed if you are using Xpm. + + SRCS= display.c main.c resources.c play.c score.c screen.c \ diff --git a/games/xsokoban/files/patch-aa b/games/xsokoban/files/patch-aa deleted file mode 100644 index 355fb6b..0000000 --- a/games/xsokoban/files/patch-aa +++ /dev/null @@ -1,19 +0,0 @@ -*** Imakefile.orig Wed Aug 28 02:34:41 1996 ---- Imakefile Sat Jan 15 00:00:00 2000 -*************** -*** 1,7 **** - DEFINES= -DNDEBUG -! EXTRA_INCLUDES= -I/usr/local/include - -! SYS_LIBRARIES= -L/usr/local/lib -lXpm $(XLIB) - # -lXpm is only needed if you are using Xpm. - - SRCS= display.c main.c resources.c play.c score.c screen.c \ ---- 1,7 ---- - DEFINES= -DNDEBUG -! EXTRA_INCLUDES= -I$(INCDIR)/X11 - -! SYS_LIBRARIES= -lXpm $(XLIB) - # -lXpm is only needed if you are using Xpm. - - SRCS= display.c main.c resources.c play.c score.c screen.c \ diff --git a/games/xsokoban/files/patch-ab b/games/xsokoban/files/patch-ab deleted file mode 100644 index 32d94eb..0000000 --- a/games/xsokoban/files/patch-ab +++ /dev/null @@ -1,53 +0,0 @@ -*** config.h.orig Tue Aug 27 21:41:47 1996 ---- config.h Mon Nov 18 18:25:14 1996 -*************** -*** 30,36 **** - variable in the installed version, but you know best... - */ - #ifndef ROOTDIR -! #define ROOTDIR "." - #endif - - /* ---- 30,36 ---- - variable in the installed version, but you know best... - */ - #ifndef ROOTDIR -! #define ROOTDIR "%%PREFIX%%/lib/X11/xsokoban" - #endif - - /* -*************** -*** 95,101 **** - OWNER: defines the name of the local game owner. - */ - #ifndef OWNER -! #define OWNER "andru" - #endif - - /* ---- 95,101 ---- - OWNER: defines the name of the local game owner. - */ - #ifndef OWNER -! #define OWNER "root" - #endif - - /* -*************** -*** 147,153 **** - */ - - #ifndef WWW -! #define WWW 1 - #endif - - #define DEBUG_SERVER(x) ---- 147,153 ---- - */ - - #ifndef WWW -! #define WWW 0 - #endif - - #define DEBUG_SERVER(x) diff --git a/games/xsokoban/files/patch-ac b/games/xsokoban/files/patch-ac deleted file mode 100644 index 9478799..0000000 --- a/games/xsokoban/files/patch-ac +++ /dev/null @@ -1,19 +0,0 @@ -*** config_local.h.orig Sun Apr 16 00:50:16 1995 ---- config_local.h Mon Nov 18 18:33:14 1996 -*************** -*** 61,67 **** - #define LOCALTIME_PROTO 1 - - /* Is there a nl_langinfo() call? */ -! #define HAVE_NL_LANGINFO 1 - - /* Is there a working */ - #define HAVE_SYS_PARAM_H 1 ---- 61,67 ---- - #define LOCALTIME_PROTO 1 - - /* Is there a nl_langinfo() call? */ -! #undef HAVE_NL_LANGINFO - - /* Is there a working */ - #define HAVE_SYS_PARAM_H 1 diff --git a/games/xsokoban/files/patch-ad b/games/xsokoban/files/patch-ad deleted file mode 100644 index b8f1195..0000000 --- a/games/xsokoban/files/patch-ad +++ /dev/null @@ -1,14 +0,0 @@ -*** externs.h.orig Sun Apr 16 07:46:14 1995 ---- externs.h Sat Jan 15 00:00:00 2000 -*************** -*** 5,11 **** ---- 5,13 ---- - #include - #include - #include -+ #ifndef __STDC__ - #include -+ #endif - - #ifdef NEED_NETINET_IN - #include diff --git a/games/xsokoban/files/patch-config.h b/games/xsokoban/files/patch-config.h new file mode 100644 index 0000000..32d94eb --- /dev/null +++ b/games/xsokoban/files/patch-config.h @@ -0,0 +1,53 @@ +*** config.h.orig Tue Aug 27 21:41:47 1996 +--- config.h Mon Nov 18 18:25:14 1996 +*************** +*** 30,36 **** + variable in the installed version, but you know best... + */ + #ifndef ROOTDIR +! #define ROOTDIR "." + #endif + + /* +--- 30,36 ---- + variable in the installed version, but you know best... + */ + #ifndef ROOTDIR +! #define ROOTDIR "%%PREFIX%%/lib/X11/xsokoban" + #endif + + /* +*************** +*** 95,101 **** + OWNER: defines the name of the local game owner. + */ + #ifndef OWNER +! #define OWNER "andru" + #endif + + /* +--- 95,101 ---- + OWNER: defines the name of the local game owner. + */ + #ifndef OWNER +! #define OWNER "root" + #endif + + /* +*************** +*** 147,153 **** + */ + + #ifndef WWW +! #define WWW 1 + #endif + + #define DEBUG_SERVER(x) +--- 147,153 ---- + */ + + #ifndef WWW +! #define WWW 0 + #endif + + #define DEBUG_SERVER(x) diff --git a/games/xsokoban/files/patch-config_local.h b/games/xsokoban/files/patch-config_local.h new file mode 100644 index 0000000..9478799 --- /dev/null +++ b/games/xsokoban/files/patch-config_local.h @@ -0,0 +1,19 @@ +*** config_local.h.orig Sun Apr 16 00:50:16 1995 +--- config_local.h Mon Nov 18 18:33:14 1996 +*************** +*** 61,67 **** + #define LOCALTIME_PROTO 1 + + /* Is there a nl_langinfo() call? */ +! #define HAVE_NL_LANGINFO 1 + + /* Is there a working */ + #define HAVE_SYS_PARAM_H 1 +--- 61,67 ---- + #define LOCALTIME_PROTO 1 + + /* Is there a nl_langinfo() call? */ +! #undef HAVE_NL_LANGINFO + + /* Is there a working */ + #define HAVE_SYS_PARAM_H 1 diff --git a/games/xsokoban/files/patch-externs.h b/games/xsokoban/files/patch-externs.h new file mode 100644 index 0000000..b8f1195 --- /dev/null +++ b/games/xsokoban/files/patch-externs.h @@ -0,0 +1,14 @@ +*** externs.h.orig Sun Apr 16 07:46:14 1995 +--- externs.h Sat Jan 15 00:00:00 2000 +*************** +*** 5,11 **** +--- 5,13 ---- + #include + #include + #include ++ #ifndef __STDC__ + #include ++ #endif + + #ifdef NEED_NETINET_IN + #include diff --git a/games/xsoldier/files/patch-ab b/games/xsoldier/files/patch-ab deleted file mode 100644 index 05ec1ea..0000000 --- a/games/xsoldier/files/patch-ab +++ /dev/null @@ -1,22 +0,0 @@ - -$FreeBSD$ - ---- manage.c.orig -+++ manage.c -@@ -17,7 +17,6 @@ - - #include - #include --#include - /* - #include - #include -@@ -393,7 +392,7 @@ - - New = (PlayerData *)malloc(sizeof(PlayerData)); - -- sprintf(New->Rec[0].name,name); -+ snprintf(New->Rec[0].name, sizeof(New->Rec[0].name), name); - New->Rec[0].score = 0; - New->Rec[0].stage = 0; - New->Rec[0].loop = 0; diff --git a/games/xsoldier/files/patch-ac b/games/xsoldier/files/patch-ac deleted file mode 100644 index 23c46a3..0000000 --- a/games/xsoldier/files/patch-ac +++ /dev/null @@ -1,22 +0,0 @@ - -$FreeBSD$ - ---- main.c.orig -+++ main.c -@@ -33,7 +33,6 @@ - /* DeleteAllStar */ - #include "star.h" - #include "score.h" --#include "wait.h" - #include "graphic.h" - #include "input.h" - -@@ -175,7 +174,7 @@ - i + 1); - display[sizeof(display) - 1] = '\0'; - fprintf(stderr, "truncated to %d chars\n", -- sizeof(display) - 1); -+ (int)sizeof(display) - 1); - } - i++; - } diff --git a/games/xsoldier/files/patch-main.c b/games/xsoldier/files/patch-main.c new file mode 100644 index 0000000..23c46a3 --- /dev/null +++ b/games/xsoldier/files/patch-main.c @@ -0,0 +1,22 @@ + +$FreeBSD$ + +--- main.c.orig ++++ main.c +@@ -33,7 +33,6 @@ + /* DeleteAllStar */ + #include "star.h" + #include "score.h" +-#include "wait.h" + #include "graphic.h" + #include "input.h" + +@@ -175,7 +174,7 @@ + i + 1); + display[sizeof(display) - 1] = '\0'; + fprintf(stderr, "truncated to %d chars\n", +- sizeof(display) - 1); ++ (int)sizeof(display) - 1); + } + i++; + } diff --git a/games/xsoldier/files/patch-manage.c b/games/xsoldier/files/patch-manage.c new file mode 100644 index 0000000..05ec1ea --- /dev/null +++ b/games/xsoldier/files/patch-manage.c @@ -0,0 +1,22 @@ + +$FreeBSD$ + +--- manage.c.orig ++++ manage.c +@@ -17,7 +17,6 @@ + + #include + #include +-#include + /* + #include + #include +@@ -393,7 +392,7 @@ + + New = (PlayerData *)malloc(sizeof(PlayerData)); + +- sprintf(New->Rec[0].name,name); ++ snprintf(New->Rec[0].name, sizeof(New->Rec[0].name), name); + New->Rec[0].score = 0; + New->Rec[0].stage = 0; + New->Rec[0].loop = 0; diff --git a/games/xspacewarp/files/patch-Imakefile b/games/xspacewarp/files/patch-Imakefile new file mode 100644 index 0000000..7f1f28d --- /dev/null +++ b/games/xspacewarp/files/patch-Imakefile @@ -0,0 +1,23 @@ +--- Imakefile.orig Fri Dec 29 16:39:19 1995 ++++ Imakefile Sat Oct 14 06:14:22 2000 +@@ -2,12 +2,7 @@ + + XCOMM Use the C++ compiler of your choice. + +-CC = g++ +- +-XCOMM Suffix rule for ".cc" files +- +-.cc.o: +- $(CC) $(CFLAGS) -c $< ++CCLINK = $(CXXLINK) + + LOCAL_LIBRARIES = XawClientLibs + SYS_LIBRARIES = -lm +@@ -26,4 +21,5 @@ + draw_summary.o draw_intro.o draw_mission.o draw_orientation.o \ + draw_winlose.o + +-ComplexProgramTarget(xspacewarp) ++ComplexProgramTargetNoMan(xspacewarp) ++InstallAppDefaults(XSpacewarp) diff --git a/games/xspacewarp/files/patch-aa b/games/xspacewarp/files/patch-aa deleted file mode 100644 index ed3b8c1..0000000 --- a/games/xspacewarp/files/patch-aa +++ /dev/null @@ -1,11 +0,0 @@ ---- c_endever.hh.orig Sun Feb 27 12:21:09 2000 -+++ c_endever.hh Sun Feb 27 12:21:27 2000 -@@ -35,7 +35,7 @@ - bool nomove() const {return (nomoveflag);} - void setnomove(bool nm) {nomoveflag = nm;} - static void seticon(const char *str); -- static geticon_len(); -+ static int geticon_len(); - private: - int torpedoes; - bool docked; // whether docked to a base diff --git a/games/xspacewarp/files/patch-ab b/games/xspacewarp/files/patch-ab deleted file mode 100644 index 95f91e2..0000000 --- a/games/xspacewarp/files/patch-ab +++ /dev/null @@ -1,101 +0,0 @@ ---- xprep.hh.orig Sun Feb 27 12:22:21 2000 -+++ xprep.hh Sun Feb 27 12:27:25 2000 -@@ -194,7 +194,7 @@ - sizeof(Boolean), - XtOffsetOf(AppData, nomouse), - XtRString, -- "False" -+ (XtPointer) "False" - }, - { - XtNrows, -@@ -365,7 +365,7 @@ - sizeof(Pixel), - XtOffsetOf(AppData, foreground), - XtRString, -- XtDefaultForeground -+ (XtPointer) XtDefaultForeground - }, - { - XtNbackground, -@@ -374,7 +374,7 @@ - sizeof(Pixel), - XtOffsetOf(AppData, background), - XtRString, -- XtDefaultBackground -+ (XtPointer) XtDefaultBackground - }, - { - XtNendeverColor, -@@ -383,7 +383,7 @@ - sizeof(Pixel), - XtOffsetOf(AppData, endever_color), - XtRString, -- XtDefaultForeground -+ (XtPointer) XtDefaultForeground - }, - { - XtNendeverIcon, -@@ -401,7 +401,7 @@ - sizeof(Pixel), - XtOffsetOf(AppData, jovian_color), - XtRString, -- XtDefaultForeground -+ (XtPointer) XtDefaultForeground - }, - { - XtNjovianIcon, -@@ -419,7 +419,7 @@ - sizeof(Pixel), - XtOffsetOf(AppData, base_color), - XtRString, -- XtDefaultForeground -+ (XtPointer) XtDefaultForeground - }, - { - XtNbaseIcon, -@@ -437,7 +437,7 @@ - sizeof(Pixel), - XtOffsetOf(AppData, star_color), - XtRString, -- XtDefaultForeground -+ (XtPointer) XtDefaultForeground - }, - { - XtNstarIcon, -@@ -455,7 +455,7 @@ - sizeof(Pixel), - XtOffsetOf(AppData, blackhole_color), - XtRString, -- XtDefaultForeground -+ (XtPointer) XtDefaultForeground - }, - { - XtNblackholeIcon, -@@ -473,7 +473,7 @@ - sizeof(Pixel), - XtOffsetOf(AppData, faser_color), - XtRString, -- XtDefaultForeground -+ (XtPointer) XtDefaultForeground - }, - { - XtNfaserWidth, -@@ -518,7 +518,7 @@ - sizeof(Pixel), - XtOffsetOf(AppData, torpedo_color), - XtRString, -- XtDefaultForeground -+ (XtPointer) XtDefaultForeground - }, - { - XtNtorpedoWidth, -@@ -554,7 +554,7 @@ - sizeof(Pixel), - XtOffsetOf(AppData, explosion_color), - XtRString, -- XtDefaultForeground -+ (XtPointer) XtDefaultForeground - }, - { - XtNexplosionSpeed, diff --git a/games/xspacewarp/files/patch-ac b/games/xspacewarp/files/patch-ac deleted file mode 100644 index 27a9c80..0000000 --- a/games/xspacewarp/files/patch-ac +++ /dev/null @@ -1,15 +0,0 @@ ---- c_jovian.cc.orig Fri Dec 29 01:41:56 1995 -+++ c_jovian.cc Sun Feb 27 12:30:41 2000 -@@ -22,10 +22,12 @@ - - // these AI functions are kept in separate file c_jovian_ai.cc - -+#if 0 - extern Action Jovian::pick_action(); - extern Direction Jovian::pick_direction(); - extern Ucoors Jovian::pick_sector(); - extern Point Jovian::pick_target(); -+#endif - - - Jovian::Jovian(): Combatant() diff --git a/games/xspacewarp/files/patch-ad b/games/xspacewarp/files/patch-ad deleted file mode 100644 index 7f1f28d..0000000 --- a/games/xspacewarp/files/patch-ad +++ /dev/null @@ -1,23 +0,0 @@ ---- Imakefile.orig Fri Dec 29 16:39:19 1995 -+++ Imakefile Sat Oct 14 06:14:22 2000 -@@ -2,12 +2,7 @@ - - XCOMM Use the C++ compiler of your choice. - --CC = g++ -- --XCOMM Suffix rule for ".cc" files -- --.cc.o: -- $(CC) $(CFLAGS) -c $< -+CCLINK = $(CXXLINK) - - LOCAL_LIBRARIES = XawClientLibs - SYS_LIBRARIES = -lm -@@ -26,4 +21,5 @@ - draw_summary.o draw_intro.o draw_mission.o draw_orientation.o \ - draw_winlose.o - --ComplexProgramTarget(xspacewarp) -+ComplexProgramTargetNoMan(xspacewarp) -+InstallAppDefaults(XSpacewarp) diff --git a/games/xspacewarp/files/patch-c_endever.hh b/games/xspacewarp/files/patch-c_endever.hh new file mode 100644 index 0000000..ed3b8c1 --- /dev/null +++ b/games/xspacewarp/files/patch-c_endever.hh @@ -0,0 +1,11 @@ +--- c_endever.hh.orig Sun Feb 27 12:21:09 2000 ++++ c_endever.hh Sun Feb 27 12:21:27 2000 +@@ -35,7 +35,7 @@ + bool nomove() const {return (nomoveflag);} + void setnomove(bool nm) {nomoveflag = nm;} + static void seticon(const char *str); +- static geticon_len(); ++ static int geticon_len(); + private: + int torpedoes; + bool docked; // whether docked to a base diff --git a/games/xspacewarp/files/patch-c_jovian.cc b/games/xspacewarp/files/patch-c_jovian.cc new file mode 100644 index 0000000..27a9c80 --- /dev/null +++ b/games/xspacewarp/files/patch-c_jovian.cc @@ -0,0 +1,15 @@ +--- c_jovian.cc.orig Fri Dec 29 01:41:56 1995 ++++ c_jovian.cc Sun Feb 27 12:30:41 2000 +@@ -22,10 +22,12 @@ + + // these AI functions are kept in separate file c_jovian_ai.cc + ++#if 0 + extern Action Jovian::pick_action(); + extern Direction Jovian::pick_direction(); + extern Ucoors Jovian::pick_sector(); + extern Point Jovian::pick_target(); ++#endif + + + Jovian::Jovian(): Combatant() diff --git a/games/xspacewarp/files/patch-xprep.hh b/games/xspacewarp/files/patch-xprep.hh new file mode 100644 index 0000000..95f91e2 --- /dev/null +++ b/games/xspacewarp/files/patch-xprep.hh @@ -0,0 +1,101 @@ +--- xprep.hh.orig Sun Feb 27 12:22:21 2000 ++++ xprep.hh Sun Feb 27 12:27:25 2000 +@@ -194,7 +194,7 @@ + sizeof(Boolean), + XtOffsetOf(AppData, nomouse), + XtRString, +- "False" ++ (XtPointer) "False" + }, + { + XtNrows, +@@ -365,7 +365,7 @@ + sizeof(Pixel), + XtOffsetOf(AppData, foreground), + XtRString, +- XtDefaultForeground ++ (XtPointer) XtDefaultForeground + }, + { + XtNbackground, +@@ -374,7 +374,7 @@ + sizeof(Pixel), + XtOffsetOf(AppData, background), + XtRString, +- XtDefaultBackground ++ (XtPointer) XtDefaultBackground + }, + { + XtNendeverColor, +@@ -383,7 +383,7 @@ + sizeof(Pixel), + XtOffsetOf(AppData, endever_color), + XtRString, +- XtDefaultForeground ++ (XtPointer) XtDefaultForeground + }, + { + XtNendeverIcon, +@@ -401,7 +401,7 @@ + sizeof(Pixel), + XtOffsetOf(AppData, jovian_color), + XtRString, +- XtDefaultForeground ++ (XtPointer) XtDefaultForeground + }, + { + XtNjovianIcon, +@@ -419,7 +419,7 @@ + sizeof(Pixel), + XtOffsetOf(AppData, base_color), + XtRString, +- XtDefaultForeground ++ (XtPointer) XtDefaultForeground + }, + { + XtNbaseIcon, +@@ -437,7 +437,7 @@ + sizeof(Pixel), + XtOffsetOf(AppData, star_color), + XtRString, +- XtDefaultForeground ++ (XtPointer) XtDefaultForeground + }, + { + XtNstarIcon, +@@ -455,7 +455,7 @@ + sizeof(Pixel), + XtOffsetOf(AppData, blackhole_color), + XtRString, +- XtDefaultForeground ++ (XtPointer) XtDefaultForeground + }, + { + XtNblackholeIcon, +@@ -473,7 +473,7 @@ + sizeof(Pixel), + XtOffsetOf(AppData, faser_color), + XtRString, +- XtDefaultForeground ++ (XtPointer) XtDefaultForeground + }, + { + XtNfaserWidth, +@@ -518,7 +518,7 @@ + sizeof(Pixel), + XtOffsetOf(AppData, torpedo_color), + XtRString, +- XtDefaultForeground ++ (XtPointer) XtDefaultForeground + }, + { + XtNtorpedoWidth, +@@ -554,7 +554,7 @@ + sizeof(Pixel), + XtOffsetOf(AppData, explosion_color), + XtRString, +- XtDefaultForeground ++ (XtPointer) XtDefaultForeground + }, + { + XtNexplosionSpeed, diff --git a/games/xspringies/files/patch-01 b/games/xspringies/files/patch-01 deleted file mode 100644 index 2b7a99a..0000000 --- a/games/xspringies/files/patch-01 +++ /dev/null @@ -1,23 +0,0 @@ ---- phys.c.orig Mon Mar 29 06:26:52 1993 -+++ phys.c Sat Feb 15 16:54:26 1997 -@@ -212,11 +212,15 @@ - - mass1 = m1->mass; - mass2 = m2->mass; -- -- m1->ax += forcex / mass1; -- m1->ay += forcey / mass1; -- m2->ax -= forcex / mass2; -- m2->ay -= forcey / mass2; -+ -+ if (mass1 != 0) { -+ m1->ax += forcex / mass1; -+ m1->ay += forcey / mass1; -+ } -+ if (mass2 != 0) { -+ m2->ax -= forcex / mass2; -+ m2->ay -= forcey / mass2; -+ } - } - } - } diff --git a/games/xspringies/files/patch-phys.c b/games/xspringies/files/patch-phys.c new file mode 100644 index 0000000..2b7a99a --- /dev/null +++ b/games/xspringies/files/patch-phys.c @@ -0,0 +1,23 @@ +--- phys.c.orig Mon Mar 29 06:26:52 1993 ++++ phys.c Sat Feb 15 16:54:26 1997 +@@ -212,11 +212,15 @@ + + mass1 = m1->mass; + mass2 = m2->mass; +- +- m1->ax += forcex / mass1; +- m1->ay += forcey / mass1; +- m2->ax -= forcex / mass2; +- m2->ay -= forcey / mass2; ++ ++ if (mass1 != 0) { ++ m1->ax += forcex / mass1; ++ m1->ay += forcey / mass1; ++ } ++ if (mass2 != 0) { ++ m2->ax -= forcex / mass2; ++ m2->ay -= forcey / mass2; ++ } + } + } + } diff --git a/games/xtet42/files/patch-Makefile.in b/games/xtet42/files/patch-Makefile.in new file mode 100644 index 0000000..a085b28 --- /dev/null +++ b/games/xtet42/files/patch-Makefile.in @@ -0,0 +1,20 @@ +--- Makefile.in.orig Mon Feb 15 00:36:53 1999 ++++ Makefile.in Mon Feb 15 00:41:28 1999 +@@ -24,7 +24,7 @@ + libdir = @libdir@ + localstatedir = @localstatedir@ + mandir = @mandir@ +-hiscoredir = $(localstatedir)/$(PACKAGE) ++hiscoredir = $(PREFIX)/lib/X11/$(PACKAGE) + + _Ver = $(VERSION) + _Lock = $(hiscoredir)/.xtet42.lock +@@ -37,6 +37,8 @@ + -D_Hiscore=\"$(_Hiscore)\" -D_Hione=\"$(_Hione)\" \ + -D_Log=\"$(_Log)\" -D_Ver=\"$(_Ver)\" + ++ ++all: xtet42 + + xtet42: $(OBJS) + $(CC) $(LDFLAGS) -o xtet42 $(OBJS) diff --git a/games/xtet42/files/patch-aa b/games/xtet42/files/patch-aa deleted file mode 100644 index a085b28..0000000 --- a/games/xtet42/files/patch-aa +++ /dev/null @@ -1,20 +0,0 @@ ---- Makefile.in.orig Mon Feb 15 00:36:53 1999 -+++ Makefile.in Mon Feb 15 00:41:28 1999 -@@ -24,7 +24,7 @@ - libdir = @libdir@ - localstatedir = @localstatedir@ - mandir = @mandir@ --hiscoredir = $(localstatedir)/$(PACKAGE) -+hiscoredir = $(PREFIX)/lib/X11/$(PACKAGE) - - _Ver = $(VERSION) - _Lock = $(hiscoredir)/.xtet42.lock -@@ -37,6 +37,8 @@ - -D_Hiscore=\"$(_Hiscore)\" -D_Hione=\"$(_Hione)\" \ - -D_Log=\"$(_Log)\" -D_Ver=\"$(_Ver)\" - -+ -+all: xtet42 - - xtet42: $(OBJS) - $(CC) $(LDFLAGS) -o xtet42 $(OBJS) diff --git a/games/xtet42/files/patch-ab b/games/xtet42/files/patch-ab deleted file mode 100644 index 34d979a..0000000 --- a/games/xtet42/files/patch-ab +++ /dev/null @@ -1,31 +0,0 @@ ---- xtet42.c.orig Mon Feb 15 00:37:09 1999 -+++ xtet42.c Mon Feb 15 00:39:51 1999 -@@ -67,23 +67,23 @@ - #endif - - #ifndef _Lock --#define _Lock "/local/games/lib/xtet42/.xtet42.lock" -+#define _Lock "/usr/X11R6/lib/X11/xtet42/.xtet42.lock" - #endif - - #ifndef _Unlock --#define _Unlock "/local/games/lib/xtet42/.xtet42.unlock" -+#define _Unlock "/usr/X11R6/lib/X11/xtet42/.xtet42.unlock" - #endif - - #ifndef _Log --#define _Log "/local/games/lib/xtet42/.xtet42.log" -+#define _Log "/usr/X11R6/lib/X11/xtet42/.xtet42.log" - #endif - - #ifndef _Hiscore --#define _Hiscore "/local/games/lib/xtet42/.xtet42.hiscore" -+#define _Hiscore "/usr/X11R6/lib/X11/xtet42/.xtet42.hiscore" - #endif - - #ifndef _Hione --#define _Hione "/local/games/lib/xtet42/.xtet42.hiscore.single" -+#define _Hione "/usr/X11R6/lib/X11/xtet42/.xtet42.hiscore.single" - #endif - - static int bricks[7][4][4][4]= diff --git a/games/xtet42/files/patch-xtete42.c b/games/xtet42/files/patch-xtete42.c new file mode 100644 index 0000000..34d979a --- /dev/null +++ b/games/xtet42/files/patch-xtete42.c @@ -0,0 +1,31 @@ +--- xtet42.c.orig Mon Feb 15 00:37:09 1999 ++++ xtet42.c Mon Feb 15 00:39:51 1999 +@@ -67,23 +67,23 @@ + #endif + + #ifndef _Lock +-#define _Lock "/local/games/lib/xtet42/.xtet42.lock" ++#define _Lock "/usr/X11R6/lib/X11/xtet42/.xtet42.lock" + #endif + + #ifndef _Unlock +-#define _Unlock "/local/games/lib/xtet42/.xtet42.unlock" ++#define _Unlock "/usr/X11R6/lib/X11/xtet42/.xtet42.unlock" + #endif + + #ifndef _Log +-#define _Log "/local/games/lib/xtet42/.xtet42.log" ++#define _Log "/usr/X11R6/lib/X11/xtet42/.xtet42.log" + #endif + + #ifndef _Hiscore +-#define _Hiscore "/local/games/lib/xtet42/.xtet42.hiscore" ++#define _Hiscore "/usr/X11R6/lib/X11/xtet42/.xtet42.hiscore" + #endif + + #ifndef _Hione +-#define _Hione "/local/games/lib/xtet42/.xtet42.hiscore.single" ++#define _Hione "/usr/X11R6/lib/X11/xtet42/.xtet42.hiscore.single" + #endif + + static int bricks[7][4][4][4]= diff --git a/games/xtic/files/patch-aa b/games/xtic/files/patch-aa deleted file mode 100644 index 386c6c7..0000000 --- a/games/xtic/files/patch-aa +++ /dev/null @@ -1,8 +0,0 @@ ---- ./configure.h.org Sun Jun 18 13:31:44 1995 -+++ ./configure.h Thu Jun 22 21:17:57 1995 -@@ -20,4 +20,4 @@ - /* Linker flags needed to locate and link in the Xpm library - * Change this to the correct place, if needed */ - --#define XPMLIBRARY -L/usr/local/lib -lXpm -+#define XPMLIBRARY -L%%LOCALBASE%%/lib -lXpm diff --git a/games/xtic/files/patch-ab b/games/xtic/files/patch-ab deleted file mode 100644 index 1fa68ac..0000000 --- a/games/xtic/files/patch-ab +++ /dev/null @@ -1,11 +0,0 @@ ---- src/Imakefile.orig Sun Jun 20 19:27:24 1999 -+++ src/Imakefile Sun Jun 20 19:27:46 1999 -@@ -8,7 +8,7 @@ - - XPMLIB = XPMLIBRARY - --#ifdef AlphaArchitecture -+#if defined(AlphaArchitecture) && !defined(FreeBSDArchitecture) - LOCAL_LIBRARIES = $(XPMLIB) $(XLIB) $(XTOOLLIB) $(XAWLIB) $(XMULIB) -ldnet_stub - #else - #ifdef HPArchitecture diff --git a/games/xtic/files/patch-configure.h b/games/xtic/files/patch-configure.h new file mode 100644 index 0000000..386c6c7 --- /dev/null +++ b/games/xtic/files/patch-configure.h @@ -0,0 +1,8 @@ +--- ./configure.h.org Sun Jun 18 13:31:44 1995 ++++ ./configure.h Thu Jun 22 21:17:57 1995 +@@ -20,4 +20,4 @@ + /* Linker flags needed to locate and link in the Xpm library + * Change this to the correct place, if needed */ + +-#define XPMLIBRARY -L/usr/local/lib -lXpm ++#define XPMLIBRARY -L%%LOCALBASE%%/lib -lXpm diff --git a/games/xtic/files/patch-src_Imakefile b/games/xtic/files/patch-src_Imakefile new file mode 100644 index 0000000..1fa68ac --- /dev/null +++ b/games/xtic/files/patch-src_Imakefile @@ -0,0 +1,11 @@ +--- src/Imakefile.orig Sun Jun 20 19:27:24 1999 ++++ src/Imakefile Sun Jun 20 19:27:46 1999 +@@ -8,7 +8,7 @@ + + XPMLIB = XPMLIBRARY + +-#ifdef AlphaArchitecture ++#if defined(AlphaArchitecture) && !defined(FreeBSDArchitecture) + LOCAL_LIBRARIES = $(XPMLIB) $(XLIB) $(XTOOLLIB) $(XAWLIB) $(XMULIB) -ldnet_stub + #else + #ifdef HPArchitecture diff --git a/games/xtron/files/patch-Makefile b/games/xtron/files/patch-Makefile new file mode 100644 index 0000000..4324ff0 --- /dev/null +++ b/games/xtron/files/patch-Makefile @@ -0,0 +1,18 @@ +--- Makefile.orig Sun Apr 16 22:26:00 1995 ++++ Makefile Fri Mar 31 22:59:19 2000 +@@ -18,10 +18,11 @@ + # + # Last Modified: 16/4/95 + # +-CC= gcc +-CFLAGS= -O4 -Wall +-INCLUDES= -I/usr/X386/include/X11 -I/usr/include +-LIBS= -L/usr/X386/lib ++CC?= gcc ++CFLAGS?= -O4 -Wall ++DEFINES= -DPREFIX=\"${PREFIX}\" ++INCLUDES= -I${LOCALBASE}/include -I${LOCALBASE}/include/X11 ++LIBS= -L${LOCALBASE}/lib + LDLIBS= -lXpm -lX11 + DEPEND= makedepend + OBJS= wintype.o xtron.o main.o xpm2pixmap.o resource.o diff --git a/games/xtron/files/patch-aa b/games/xtron/files/patch-aa deleted file mode 100644 index 4324ff0..0000000 --- a/games/xtron/files/patch-aa +++ /dev/null @@ -1,18 +0,0 @@ ---- Makefile.orig Sun Apr 16 22:26:00 1995 -+++ Makefile Fri Mar 31 22:59:19 2000 -@@ -18,10 +18,11 @@ - # - # Last Modified: 16/4/95 - # --CC= gcc --CFLAGS= -O4 -Wall --INCLUDES= -I/usr/X386/include/X11 -I/usr/include --LIBS= -L/usr/X386/lib -+CC?= gcc -+CFLAGS?= -O4 -Wall -+DEFINES= -DPREFIX=\"${PREFIX}\" -+INCLUDES= -I${LOCALBASE}/include -I${LOCALBASE}/include/X11 -+LIBS= -L${LOCALBASE}/lib - LDLIBS= -lXpm -lX11 - DEPEND= makedepend - OBJS= wintype.o xtron.o main.o xpm2pixmap.o resource.o diff --git a/games/xtron/files/patch-ab b/games/xtron/files/patch-ab deleted file mode 100644 index ce4873e..0000000 --- a/games/xtron/files/patch-ab +++ /dev/null @@ -1,13 +0,0 @@ ---- resource.c.orig Mon Apr 24 07:39:03 1995 -+++ resource.c Fri Mar 31 23:09:37 2000 -@@ -101,8 +101,8 @@ - if ((XTRONresources = XrmGetFileDatabase("./.xtronrc")) == NULL) { - if ((XTRONresources = XrmGetFileDatabase("$HOME/xtronrc")) == NULL) { - if ((XTRONresources = XrmGetFileDatabase("$HOME/.xtronrc")) == NULL) { -- if ((XTRONresources = XrmGetFileDatabase("/usr/X11/lib/X11/app-defaults/xtronrc")) == NULL) { -- if ((XTRONresources = XrmGetFileDatabase("/usr/X11/lib/X11/app-defaults/.xtronrc")) == NULL) { -+ if ((XTRONresources = XrmGetFileDatabase(PREFIX "/lib/X11/app-defaults/Tron")) == NULL) { -+ if ((XTRONresources = XrmGetFileDatabase(PREFIX "/share/xtron/xtronrc")) == NULL) { - fprintf(stderr,"error: unable to open/read resource file xtronrc\n"); - return(0); - } diff --git a/games/xtron/files/patch-ac b/games/xtron/files/patch-ac deleted file mode 100644 index d188ebe..0000000 --- a/games/xtron/files/patch-ac +++ /dev/null @@ -1,11 +0,0 @@ ---- xtronrc.orig Mon Apr 24 07:53:22 1995 -+++ xtronrc Fri Mar 31 05:16:36 2000 -@@ -3,7 +3,7 @@ - # in the user's home directory or in /usr/X11/lib/X11/app-defaults. - # you can also rename it .xtronrc if you prefer it to be hidden - # make sure that the pixmaps directory has a trailing / at the end --xtron.PixmapsDIR: ./pixmaps/ -+xtron.PixmapsDIR: %%PREFIX%%/share/xtron/ - - # change these key settings for player 1 [RED] - xtron.player1UP: w diff --git a/games/xtron/files/patch-resource.c b/games/xtron/files/patch-resource.c new file mode 100644 index 0000000..ce4873e --- /dev/null +++ b/games/xtron/files/patch-resource.c @@ -0,0 +1,13 @@ +--- resource.c.orig Mon Apr 24 07:39:03 1995 ++++ resource.c Fri Mar 31 23:09:37 2000 +@@ -101,8 +101,8 @@ + if ((XTRONresources = XrmGetFileDatabase("./.xtronrc")) == NULL) { + if ((XTRONresources = XrmGetFileDatabase("$HOME/xtronrc")) == NULL) { + if ((XTRONresources = XrmGetFileDatabase("$HOME/.xtronrc")) == NULL) { +- if ((XTRONresources = XrmGetFileDatabase("/usr/X11/lib/X11/app-defaults/xtronrc")) == NULL) { +- if ((XTRONresources = XrmGetFileDatabase("/usr/X11/lib/X11/app-defaults/.xtronrc")) == NULL) { ++ if ((XTRONresources = XrmGetFileDatabase(PREFIX "/lib/X11/app-defaults/Tron")) == NULL) { ++ if ((XTRONresources = XrmGetFileDatabase(PREFIX "/share/xtron/xtronrc")) == NULL) { + fprintf(stderr,"error: unable to open/read resource file xtronrc\n"); + return(0); + } diff --git a/games/xtron/files/patch-xtronrc b/games/xtron/files/patch-xtronrc new file mode 100644 index 0000000..d188ebe --- /dev/null +++ b/games/xtron/files/patch-xtronrc @@ -0,0 +1,11 @@ +--- xtronrc.orig Mon Apr 24 07:53:22 1995 ++++ xtronrc Fri Mar 31 05:16:36 2000 +@@ -3,7 +3,7 @@ + # in the user's home directory or in /usr/X11/lib/X11/app-defaults. + # you can also rename it .xtronrc if you prefer it to be hidden + # make sure that the pixmaps directory has a trailing / at the end +-xtron.PixmapsDIR: ./pixmaps/ ++xtron.PixmapsDIR: %%PREFIX%%/share/xtron/ + + # change these key settings for player 1 [RED] + xtron.player1UP: w diff --git a/games/xtruco/files/patch-Makefile b/games/xtruco/files/patch-Makefile new file mode 100644 index 0000000..dc7a6b4 --- /dev/null +++ b/games/xtruco/files/patch-Makefile @@ -0,0 +1,33 @@ +--- Makefile.orig Tue Oct 22 04:18:27 1996 ++++ Makefile Fri Mar 31 05:23:20 2000 +@@ -6,17 +6,18 @@ + # # + ################################ + +-INCLUDES = -I/usr/X11/include ++INCLUDES = -I${LOCALBASE}/include + + # Remove '-DIPC_OK' if you have problems with 'shared-memory' (IPC routines) + OPC = -DIPC_OK + +-LIBRARIES = -lX11 -L/usr/X11/lib ++LIBRARIES = -lX11 -L${LOCALBASE}/lib + + CFILES = xtruco.c bitmap.c cursor.c display.c event.c gc.c pixmap.c\ + topwind.c window.c color.c button.c font.c read.c + +-CC = gcc -O2 -g -Dlinux -DX11R6 $(INCLUDES) $(OPC) ++CC ?= gcc ++CFLAGS += -DX11R6 $(INCLUDES) $(OPC) + + PROG=xtruco + +@@ -25,7 +26,7 @@ + OBJS=$(CFILES:.c=.o) + + all: $(OBJS) +- $(CC) -o $(PROG) $(LIBRARIES) $(OBJS) ++ $(CC) $(CFLAGS) -o $(PROG) $(LIBRARIES) $(OBJS) + # strip ${PROG} + + clean: diff --git a/games/xtruco/files/patch-aa b/games/xtruco/files/patch-aa deleted file mode 100644 index dc7a6b4..0000000 --- a/games/xtruco/files/patch-aa +++ /dev/null @@ -1,33 +0,0 @@ ---- Makefile.orig Tue Oct 22 04:18:27 1996 -+++ Makefile Fri Mar 31 05:23:20 2000 -@@ -6,17 +6,18 @@ - # # - ################################ - --INCLUDES = -I/usr/X11/include -+INCLUDES = -I${LOCALBASE}/include - - # Remove '-DIPC_OK' if you have problems with 'shared-memory' (IPC routines) - OPC = -DIPC_OK - --LIBRARIES = -lX11 -L/usr/X11/lib -+LIBRARIES = -lX11 -L${LOCALBASE}/lib - - CFILES = xtruco.c bitmap.c cursor.c display.c event.c gc.c pixmap.c\ - topwind.c window.c color.c button.c font.c read.c - --CC = gcc -O2 -g -Dlinux -DX11R6 $(INCLUDES) $(OPC) -+CC ?= gcc -+CFLAGS += -DX11R6 $(INCLUDES) $(OPC) - - PROG=xtruco - -@@ -25,7 +26,7 @@ - OBJS=$(CFILES:.c=.o) - - all: $(OBJS) -- $(CC) -o $(PROG) $(LIBRARIES) $(OBJS) -+ $(CC) $(CFLAGS) -o $(PROG) $(LIBRARIES) $(OBJS) - # strip ${PROG} - - clean: diff --git a/games/xtux/files/patch-Makefile b/games/xtux/files/patch-Makefile new file mode 100644 index 0000000..ccf272f --- /dev/null +++ b/games/xtux/files/patch-Makefile @@ -0,0 +1,57 @@ +--- Makefile.orig Wed Feb 5 00:59:01 2003 ++++ Makefile Thu May 15 19:59:20 2003 +@@ -5,7 +5,7 @@ + #============================================================# + + #Change this to where you want to put the data directory. +-DATADIR = `pwd`/data ++#DATADIR = `pwd`/data + #Eg you might want to put the data files here...... + #DATADIR = /usr/share/games/xtux + +@@ -15,36 +15,36 @@ + CL_SRC_DIR = src/client + GZ_SRC_DIR = src/ggz + +-MAKE = @make -C ++#MAKE = @make -C + + all: common ggz client server + + clean: +- $(MAKE) $(CM_SRC_DIR) clean +- $(MAKE) $(SV_SRC_DIR) clean +- $(MAKE) $(CL_SRC_DIR) clean +- $(MAKE) $(GZ_SRC_DIR) clean ++ $(MAKE) -C $(CM_SRC_DIR) clean ++ $(MAKE) -C $(SV_SRC_DIR) clean ++ $(MAKE) -C $(CL_SRC_DIR) clean ++ $(MAKE) -C $(GZ_SRC_DIR) clean + + common: + @echo + @echo " ************* Building COMMON lib *************" + @echo +- $(MAKE) $(CM_SRC_DIR) $(MFLAGS) ++ $(MAKE) -C $(CM_SRC_DIR) $(MFLAGS) + server: + @echo + @echo " ************* Building SERVER *************" + @echo +- $(MAKE) $(SV_SRC_DIR) $(MFLAGS) ++ $(MAKE) -C $(SV_SRC_DIR) $(MFLAGS) + + client: + @echo + @echo " ************* Building CLIENT *************" + @echo +- $(MAKE) $(CL_SRC_DIR) $(MFLAGS) ++ $(MAKE) -C $(CL_SRC_DIR) $(MFLAGS) + + ggz: + @echo + @echo " ************* Building GGZ *************" + @echo +- $(MAKE) $(GZ_SRC_DIR) $(MFLAGS) ++ $(MAKE) -C $(GZ_SRC_DIR) $(MFLAGS) + diff --git a/games/xtux/files/patch-aa b/games/xtux/files/patch-aa deleted file mode 100644 index ccf272f..0000000 --- a/games/xtux/files/patch-aa +++ /dev/null @@ -1,57 +0,0 @@ ---- Makefile.orig Wed Feb 5 00:59:01 2003 -+++ Makefile Thu May 15 19:59:20 2003 -@@ -5,7 +5,7 @@ - #============================================================# - - #Change this to where you want to put the data directory. --DATADIR = `pwd`/data -+#DATADIR = `pwd`/data - #Eg you might want to put the data files here...... - #DATADIR = /usr/share/games/xtux - -@@ -15,36 +15,36 @@ - CL_SRC_DIR = src/client - GZ_SRC_DIR = src/ggz - --MAKE = @make -C -+#MAKE = @make -C - - all: common ggz client server - - clean: -- $(MAKE) $(CM_SRC_DIR) clean -- $(MAKE) $(SV_SRC_DIR) clean -- $(MAKE) $(CL_SRC_DIR) clean -- $(MAKE) $(GZ_SRC_DIR) clean -+ $(MAKE) -C $(CM_SRC_DIR) clean -+ $(MAKE) -C $(SV_SRC_DIR) clean -+ $(MAKE) -C $(CL_SRC_DIR) clean -+ $(MAKE) -C $(GZ_SRC_DIR) clean - - common: - @echo - @echo " ************* Building COMMON lib *************" - @echo -- $(MAKE) $(CM_SRC_DIR) $(MFLAGS) -+ $(MAKE) -C $(CM_SRC_DIR) $(MFLAGS) - server: - @echo - @echo " ************* Building SERVER *************" - @echo -- $(MAKE) $(SV_SRC_DIR) $(MFLAGS) -+ $(MAKE) -C $(SV_SRC_DIR) $(MFLAGS) - - client: - @echo - @echo " ************* Building CLIENT *************" - @echo -- $(MAKE) $(CL_SRC_DIR) $(MFLAGS) -+ $(MAKE) -C $(CL_SRC_DIR) $(MFLAGS) - - ggz: - @echo - @echo " ************* Building GGZ *************" - @echo -- $(MAKE) $(GZ_SRC_DIR) $(MFLAGS) -+ $(MAKE) -C $(GZ_SRC_DIR) $(MFLAGS) - diff --git a/games/xtux/files/patch-ab b/games/xtux/files/patch-ab deleted file mode 100644 index 4870a11..0000000 --- a/games/xtux/files/patch-ab +++ /dev/null @@ -1,10 +0,0 @@ ---- src/client/misc.c.orig Tue Nov 14 07:18:38 2000 -+++ src/client/misc.c Sat Dec 23 06:47:57 2000 -@@ -4,6 +4,7 @@ - #include - #include - #include -+#include - - #include "xtux.h" - #include "client.h" diff --git a/games/xtux/files/patch-af b/games/xtux/files/patch-af deleted file mode 100644 index 4317790..0000000 --- a/games/xtux/files/patch-af +++ /dev/null @@ -1,15 +0,0 @@ ---- src/common/timing.c.orig Mon Feb 17 12:10:07 2003 -+++ src/common/timing.c Thu May 15 20:03:11 2003 -@@ -1,6 +1,12 @@ - #include - #include -+#include -+#if __FreeBSD_version >= 500000 - #include -+#else -+#include -+#define INT32_MAX INT_MAX -+#endif - #include "timing.h" - - static msec_t tvtol(struct timeval t); diff --git a/games/xtux/files/patch-src_client_misc.c b/games/xtux/files/patch-src_client_misc.c new file mode 100644 index 0000000..4870a11 --- /dev/null +++ b/games/xtux/files/patch-src_client_misc.c @@ -0,0 +1,10 @@ +--- src/client/misc.c.orig Tue Nov 14 07:18:38 2000 ++++ src/client/misc.c Sat Dec 23 06:47:57 2000 +@@ -4,6 +4,7 @@ + #include + #include + #include ++#include + + #include "xtux.h" + #include "client.h" diff --git a/games/xtux/files/patch-src_common_timing.c b/games/xtux/files/patch-src_common_timing.c new file mode 100644 index 0000000..4317790 --- /dev/null +++ b/games/xtux/files/patch-src_common_timing.c @@ -0,0 +1,15 @@ +--- src/common/timing.c.orig Mon Feb 17 12:10:07 2003 ++++ src/common/timing.c Thu May 15 20:03:11 2003 +@@ -1,6 +1,12 @@ + #include + #include ++#include ++#if __FreeBSD_version >= 500000 + #include ++#else ++#include ++#define INT32_MAX INT_MAX ++#endif + #include "timing.h" + + static msec_t tvtol(struct timeval t); diff --git a/games/xvmines/files/patch-Imakefile b/games/xvmines/files/patch-Imakefile new file mode 100644 index 0000000..f2e3dcb --- /dev/null +++ b/games/xvmines/files/patch-Imakefile @@ -0,0 +1,22 @@ +--- Imakefile.orig Sun Jun 27 19:05:51 1993 ++++ Imakefile Fri Mar 3 08:07:52 2000 +@@ -1,7 +1,8 @@ +-WHERE :sh = (tmp=`echo /usr/openwin`;echo ${OPENWINHOME:=$tmp}) ++#WHERE :sh = (tmp=`echo /usr/openwin`;echo ${OPENWINHOME:=$tmp}) ++WHERE=${LOCALBASE} + + #CC = gcc +-CC = cc ++XCOMM CC = cc + INCLUDES = -I${WHERE}/include + LOCAL_LIBRARIES = -L${WHERE}/lib + +@@ -14,7 +15,7 @@ + OBJS = xvmines.o play.o + + #CDEBUGFLAGS = -g +-CDEBUGFLAGS = -O4 ++XCOMM CDEBUGFLAGS = -O4 + + ComplexProgramTarget(xvmines) + diff --git a/games/xvmines/files/patch-aa b/games/xvmines/files/patch-aa deleted file mode 100644 index f2e3dcb..0000000 --- a/games/xvmines/files/patch-aa +++ /dev/null @@ -1,22 +0,0 @@ ---- Imakefile.orig Sun Jun 27 19:05:51 1993 -+++ Imakefile Fri Mar 3 08:07:52 2000 -@@ -1,7 +1,8 @@ --WHERE :sh = (tmp=`echo /usr/openwin`;echo ${OPENWINHOME:=$tmp}) -+#WHERE :sh = (tmp=`echo /usr/openwin`;echo ${OPENWINHOME:=$tmp}) -+WHERE=${LOCALBASE} - - #CC = gcc --CC = cc -+XCOMM CC = cc - INCLUDES = -I${WHERE}/include - LOCAL_LIBRARIES = -L${WHERE}/lib - -@@ -14,7 +15,7 @@ - OBJS = xvmines.o play.o - - #CDEBUGFLAGS = -g --CDEBUGFLAGS = -O4 -+XCOMM CDEBUGFLAGS = -O4 - - ComplexProgramTarget(xvmines) - diff --git a/games/xworm/files/patch-ab b/games/xworm/files/patch-ab deleted file mode 100644 index 12bfff8..0000000 --- a/games/xworm/files/patch-ab +++ /dev/null @@ -1,35 +0,0 @@ ---- xworm.c.orig 1997-05-07 18:25:57.000000000 +0200 -+++ xworm.c 2011-12-20 20:08:25.012174397 +0100 -@@ -3,13 +3,20 @@ - - #include - #include -+#ifdef __FreeBSD__ -+#include -+#endif - #include - #include - #include - --#define gridfile "xworm.grid" --#define fontfile "xworm.font" --#define logofile "xworm.raw" -+#ifndef PREFIX -+#define PREFIX "." -+#endif -+ -+#define gridfile XWORMDIR "/xworm.grid" -+#define fontfile XWORMDIR "/xworm.font" -+#define logofile XWORMDIR "/xworm.raw" - - #define maxQ 5000 /* max queue */ - #define NCOLORS 15 /* number of colours */ -@@ -137,7 +144,7 @@ - int vec_wrline(char *,int,int,int); - int vec_wrlineX(char *,int,int,int,float); - --void main(int argc, char **argv) { -+int main(int argc, char **argv) { - - memset(&timeout, 0, sizeof(struct timeval)); - diff --git a/games/xworm/files/patch-xworm.c b/games/xworm/files/patch-xworm.c new file mode 100644 index 0000000..12bfff8 --- /dev/null +++ b/games/xworm/files/patch-xworm.c @@ -0,0 +1,35 @@ +--- xworm.c.orig 1997-05-07 18:25:57.000000000 +0200 ++++ xworm.c 2011-12-20 20:08:25.012174397 +0100 +@@ -3,13 +3,20 @@ + + #include + #include ++#ifdef __FreeBSD__ ++#include ++#endif + #include + #include + #include + +-#define gridfile "xworm.grid" +-#define fontfile "xworm.font" +-#define logofile "xworm.raw" ++#ifndef PREFIX ++#define PREFIX "." ++#endif ++ ++#define gridfile XWORMDIR "/xworm.grid" ++#define fontfile XWORMDIR "/xworm.font" ++#define logofile XWORMDIR "/xworm.raw" + + #define maxQ 5000 /* max queue */ + #define NCOLORS 15 /* number of colours */ +@@ -137,7 +144,7 @@ + int vec_wrline(char *,int,int,int); + int vec_wrlineX(char *,int,int,int,float); + +-void main(int argc, char **argv) { ++int main(int argc, char **argv) { + + memset(&timeout, 0, sizeof(struct timeval)); + diff --git a/games/yahtzee/Makefile b/games/yahtzee/Makefile index e24ad46..eb8be9d 100644 --- a/games/yahtzee/Makefile +++ b/games/yahtzee/Makefile @@ -8,16 +8,16 @@ CATEGORIES= games MASTER_SITES= ${MASTER_SITE_SUNSITE} MASTER_SITE_SUBDIR= games/strategy DISTNAME= ${PORTNAME}-src -EXTRACT_SUFX= .tar.Z MAINTAINER= ports@FreeBSD.org COMMENT= Curses version of the dice game for one or more players +USES= tar:Z WRKSRC= ${WRKDIR}/${PORTNAME} do-install: ${INSTALL_PROGRAM} ${WRKSRC}/yahtzee ${STAGEDIR}${PREFIX}/bin @${MKDIR} -m 0755 ${STAGEDIR}${DATADIR} - ${INSTALL_DATA} -m 0664 /dev/null ${STAGEDIR}${DATADIR}/yahtzee.sco + ${TOUCH} ${STAGEDIR}${DATADIR}/yahtzee.sco .include diff --git a/games/yahtzee/files/patch-Makefile b/games/yahtzee/files/patch-Makefile new file mode 100644 index 0000000..c2eb526 --- /dev/null +++ b/games/yahtzee/files/patch-Makefile @@ -0,0 +1,21 @@ +--- Makefile.orig Sat Jan 25 17:45:26 1992 ++++ Makefile Wed Nov 8 04:48:42 2000 +@@ -1,4 +1,4 @@ +-CFLAGS = ++CFLAGS += -DHAS_RENAME -DSCOREDIR=\"$(PREFIX)/share/yahtzee\" + + OBJ = computer.o main.o + +@@ -7,9 +7,11 @@ + BIN = yahtzee + + $(BIN): $(OBJ) +- cc -o $@ $(OBJ) -lcurses ++ $(CC) -o $@ $(OBJ) -lcurses + + clean: + rm -f $(OBJ) $(BIN) + + $(OBJ): yahtzee.h config.h ++ ++all: $(BIN) $(OBJ) diff --git a/games/yahtzee/files/patch-aa b/games/yahtzee/files/patch-aa deleted file mode 100644 index c2eb526..0000000 --- a/games/yahtzee/files/patch-aa +++ /dev/null @@ -1,21 +0,0 @@ ---- Makefile.orig Sat Jan 25 17:45:26 1992 -+++ Makefile Wed Nov 8 04:48:42 2000 -@@ -1,4 +1,4 @@ --CFLAGS = -+CFLAGS += -DHAS_RENAME -DSCOREDIR=\"$(PREFIX)/share/yahtzee\" - - OBJ = computer.o main.o - -@@ -7,9 +7,11 @@ - BIN = yahtzee - - $(BIN): $(OBJ) -- cc -o $@ $(OBJ) -lcurses -+ $(CC) -o $@ $(OBJ) -lcurses - - clean: - rm -f $(OBJ) $(BIN) - - $(OBJ): yahtzee.h config.h -+ -+all: $(BIN) $(OBJ) diff --git a/games/yahtzee/files/patch-ab b/games/yahtzee/files/patch-ab deleted file mode 100644 index 5f2e454..0000000 --- a/games/yahtzee/files/patch-ab +++ /dev/null @@ -1,12 +0,0 @@ ---- config.h.orig Sat Jan 25 17:41:05 1992 -+++ config.h Wed Nov 8 04:47:56 2000 -@@ -1,7 +1,9 @@ - #ifndef _config_H_ - #define _config_H_ - -+#ifndef SCOREDIR - #define SCOREDIR "/usr/local/lib" -+#endif - #define SCOREFNAME "yahtzee.sco" /* must allow .L extension */ - - #define NUM_TOP_PLAYERS 10 diff --git a/games/yahtzee/files/patch-ac b/games/yahtzee/files/patch-ac deleted file mode 100644 index c5c96b2..0000000 --- a/games/yahtzee/files/patch-ac +++ /dev/null @@ -1,75 +0,0 @@ ---- main.c.orig Sat Jan 25 17:41:13 1992 -+++ main.c Thu Nov 6 18:12:58 2003 -@@ -12,7 +12,7 @@ - * (c)1992 by orest zborowski - */ - --static char *header = "Yahtzee Version 1.00 (c)1992 by zorst"; -+static char *header = "Yahtzee Version 1.00p1 (c)1992 by zorst, FreeBSD port by Joel Sutton"; - - extern errno; - -@@ -138,7 +138,7 @@ - - initscr(); - if (LINES < 23) -- abort("Not enough lines on the terminal"); -+ _abort("Not enough lines on the terminal"); - numlines = LINES; - clear(); - mvaddstr(0, 9, header); -@@ -156,7 +156,7 @@ - endwin(); - } - --abort(char *msg) -+_abort(char *msg) - { - yend(); - putchar('\n'); -@@ -278,7 +278,7 @@ - int j; - - if (num < 1 || num > 5) -- abort("Bad dice loc passed"); -+ _abort("Bad dice loc passed"); - - for (j = 0; j < 1; ++j) - { -@@ -820,6 +820,7 @@ - int i; - int topscore; - int winner; -+ char dummy[5]; - - for (;;) - { -@@ -844,7 +845,9 @@ - winner = i; - } - -- say("The winner is %s", players[winner].name); -+ say("The winner is %s. Press to continue...", players[winner].name); -+ fgets(dummy,5,stdin); -+ fflush(stdin); - } - - #define L_LOCK 0 -@@ -1117,7 +1120,8 @@ - - printf ("How many times to you wish to roll? "); - -- gets(nrollstr); -+ fflush(stdin); -+ fgets(nrollstr, 10, stdin); - nroll = atoi(nrollstr); - - printf("Generating...\n"); -@@ -1270,6 +1274,7 @@ - printf("How many computers to play (max of %d) ? ", - MAX_NUMBER_OF_PLAYERS - num_players); - fflush(stdout); -+ fpurge(stdin); - - fgets(num, sizeof(num), stdin); - diff --git a/games/yahtzee/files/patch-config.h b/games/yahtzee/files/patch-config.h new file mode 100644 index 0000000..5f2e454 --- /dev/null +++ b/games/yahtzee/files/patch-config.h @@ -0,0 +1,12 @@ +--- config.h.orig Sat Jan 25 17:41:05 1992 ++++ config.h Wed Nov 8 04:47:56 2000 +@@ -1,7 +1,9 @@ + #ifndef _config_H_ + #define _config_H_ + ++#ifndef SCOREDIR + #define SCOREDIR "/usr/local/lib" ++#endif + #define SCOREFNAME "yahtzee.sco" /* must allow .L extension */ + + #define NUM_TOP_PLAYERS 10 diff --git a/games/yahtzee/files/patch-main.c b/games/yahtzee/files/patch-main.c new file mode 100644 index 0000000..c5c96b2 --- /dev/null +++ b/games/yahtzee/files/patch-main.c @@ -0,0 +1,75 @@ +--- main.c.orig Sat Jan 25 17:41:13 1992 ++++ main.c Thu Nov 6 18:12:58 2003 +@@ -12,7 +12,7 @@ + * (c)1992 by orest zborowski + */ + +-static char *header = "Yahtzee Version 1.00 (c)1992 by zorst"; ++static char *header = "Yahtzee Version 1.00p1 (c)1992 by zorst, FreeBSD port by Joel Sutton"; + + extern errno; + +@@ -138,7 +138,7 @@ + + initscr(); + if (LINES < 23) +- abort("Not enough lines on the terminal"); ++ _abort("Not enough lines on the terminal"); + numlines = LINES; + clear(); + mvaddstr(0, 9, header); +@@ -156,7 +156,7 @@ + endwin(); + } + +-abort(char *msg) ++_abort(char *msg) + { + yend(); + putchar('\n'); +@@ -278,7 +278,7 @@ + int j; + + if (num < 1 || num > 5) +- abort("Bad dice loc passed"); ++ _abort("Bad dice loc passed"); + + for (j = 0; j < 1; ++j) + { +@@ -820,6 +820,7 @@ + int i; + int topscore; + int winner; ++ char dummy[5]; + + for (;;) + { +@@ -844,7 +845,9 @@ + winner = i; + } + +- say("The winner is %s", players[winner].name); ++ say("The winner is %s. Press to continue...", players[winner].name); ++ fgets(dummy,5,stdin); ++ fflush(stdin); + } + + #define L_LOCK 0 +@@ -1117,7 +1120,8 @@ + + printf ("How many times to you wish to roll? "); + +- gets(nrollstr); ++ fflush(stdin); ++ fgets(nrollstr, 10, stdin); + nroll = atoi(nrollstr); + + printf("Generating...\n"); +@@ -1270,6 +1274,7 @@ + printf("How many computers to play (max of %d) ? ", + MAX_NUMBER_OF_PLAYERS - num_players); + fflush(stdout); ++ fpurge(stdin); + + fgets(num, sizeof(num), stdin); + diff --git a/games/yahtzee/pkg-plist b/games/yahtzee/pkg-plist index 831fc5a..76c519f 100644 --- a/games/yahtzee/pkg-plist +++ b/games/yahtzee/pkg-plist @@ -1,7 +1,8 @@ @group games @mode 2755 bin/yahtzee -@mode +@mode 664 %%DATADIR%%/yahtzee.sco @group +@mode @dirrm %%DATADIR%% -- cgit v1.1