diff -urN /usr/ports/games/crossfire-server/Makefile games/crossfire-server/Makefile --- /usr/ports/games/crossfire-server/Makefile 2007-05-20 13:50:01.000000000 +0900 +++ games/crossfire-server/Makefile 2008-02-25 04:03:56.000000000 +0900 @@ -6,8 +6,7 @@ # PORTNAME= crossfire -PORTVERSION= 1.10.0 -PORTREVISION= 1 +PORTVERSION= 1.11.0 CATEGORIES= games MASTER_SITES= SF \ ftp://ftp.real-time.com/pub/games/crossfire/ @@ -21,34 +20,35 @@ BUILD_DEPENDS= bash:${PORTSDIR}/shells/bash LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png -USE_XPM= yes +USE_XORG= ice sm x11 xaw xext xmu xpm xt +USE_GNOME= gnometarget USE_PERL5= yes USE_PYTHON= yes USE_GMAKE= yes USE_AUTOTOOLS= libtool:15 -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" -CONFIGURE_ARGS= --disable-check +CONFIGURE_ARGS= --with-check=no MAN6= crossedit.6 crossfire.6 crossfire-config.6 crossloop.6 \ crossloop.web.6 -CPPFLAGS= -I${LOCALBASE}/include -I${X11BASE}/include \ - -I${PYTHON_INCLUDEDIR} ${PTHREAD_CFLAGS} -LDFLAGS= -L${LOCALBASE}/lib -L${X11BASE}/lib \ - -L${PYTHON_LIBDIR} ${PTHREAD_LIBS} +CPPFLAGS= -I${LOCALBASE}/include ${PTHREAD_CFLAGS} +LDFLAGS= -L${LOCALBASE}/lib ${PTHREAD_LIBS} + +post-extract: + @${CHMOD} a+x ${WRKSRC}/utils/install-sh post-patch: @${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \ 's|-ldl||g' @${REINPLACE_CMD} -e 's|^#.*/bin/sh|#! ${LOCALBASE}/bin/bash|g ; \ + s|-ldl||g ; \ s|python[{].*[}]|${PYTHON_VERSION}|g ; \ - s|-ldl||g' ${WRKSRC}/configure + s|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/configure post-install: @${MKDIR} ${DATADIR}/maps - cd ${WRKDIR}/maps && ${FIND} . ! -name ".#*" | \ - ${CPIO} -pdm -L -R ${SHAREOWN}:${SHAREGRP} ${DATADIR}/maps + cd ${WRKDIR}/maps && ${COPYTREE_SHARE} . ${DATADIR}/maps @${CHOWN} ${BINOWN}:games ${PREFIX}/bin/crossfire @${CHMOD} 2755 ${PREFIX}/bin/crossfire @${CHGRP} -R games ${PREFIX}/var/crossfire diff -urN /usr/ports/games/crossfire-server/distinfo games/crossfire-server/distinfo --- /usr/ports/games/crossfire-server/distinfo 2007-04-27 17:18:54.000000000 +0900 +++ games/crossfire-server/distinfo 2008-02-24 15:00:15.000000000 +0900 @@ -1,6 +1,6 @@ -MD5 (crossfire-1.10.0.tar.gz) = d56ad6cac04ea49f8b6b326b441553a3 -SHA256 (crossfire-1.10.0.tar.gz) = feeaadcd016b6c760adf2a91adbb76d4c605bed93af8db05f416afdf53a8ba3e -SIZE (crossfire-1.10.0.tar.gz) = 6061251 -MD5 (crossfire-1.10.0.maps.tar.gz) = 0c410171602268b0499f3b62091fafa4 -SHA256 (crossfire-1.10.0.maps.tar.gz) = 4c7813e50588e65015dc5a0b6e9f915cfb89f86ad6bbf7c80fcf12831e4e8a23 -SIZE (crossfire-1.10.0.maps.tar.gz) = 24070723 +MD5 (crossfire-1.11.0.tar.gz) = 4c2e8f60ca57fb140808d07e62b072a9 +SHA256 (crossfire-1.11.0.tar.gz) = ad259903d37ddecbfc69507f01e5bfcf5c3f847fd22e711b1cc7df2d47ad222c +SIZE (crossfire-1.11.0.tar.gz) = 6302656 +MD5 (crossfire-1.11.0.maps.tar.gz) = f0c3f1459e42163a500ce9be3cad39d2 +SHA256 (crossfire-1.11.0.maps.tar.gz) = 848dc10e292f0e4812f9ec4cd802375da8e18df7648d090942e484bbde94b08b +SIZE (crossfire-1.11.0.maps.tar.gz) = 24675542 diff -urN /usr/ports/games/crossfire-server/pkg-plist games/crossfire-server/pkg-plist --- /usr/ports/games/crossfire-server/pkg-plist 2007-04-27 17:18:55.000000000 +0900 +++ games/crossfire-server/pkg-plist 2008-02-24 16:31:47.000000000 +0900 @@ -9,6 +9,7 @@ etc/crossfire/dm_file etc/crossfire/exp_table etc/crossfire/forbid +etc/crossfire/metaserver2 etc/crossfire/motd etc/crossfire/news etc/crossfire/rules @@ -47,11 +48,16 @@ %%DATADIR%%/help/cast %%DATADIR%%/help/drop %%DATADIR%%/help/dropall +%%DATADIR%%/help/empty +%%DATADIR%%/help/explore +%%DATADIR%%/help/fire +%%DATADIR%%/help/fire_stop %%DATADIR%%/help/golem %%DATADIR%%/help/invoke %%DATADIR%%/help/keys %%DATADIR%%/help/killpets %%DATADIR%%/help/listen +%%DATADIR%%/help/maps %%DATADIR%%/help/mark %%DATADIR%%/help/melee %%DATADIR%%/help/mode @@ -63,6 +69,7 @@ %%DATADIR%%/help/output-count %%DATADIR%%/help/output-sync %%DATADIR%%/help/party +%%DATADIR%%/help/party_rejoin %%DATADIR%%/help/peaceful %%DATADIR%%/help/petmode %%DATADIR%%/help/pickup @@ -74,6 +81,7 @@ %%DATADIR%%/help/save %%DATADIR%%/help/shout %%DATADIR%%/help/showpets +%%DATADIR%%/help/skills %%DATADIR%%/help/sort_inventory %%DATADIR%%/help/spells %%DATADIR%%/help/statistics @@ -85,6 +93,7 @@ %%DATADIR%%/image_info %%DATADIR%%/maps/.emergency %%DATADIR%%/maps/COPYING +%%DATADIR%%/maps/ChangeLog %%DATADIR%%/maps/HallOfDMs %%DATADIR%%/maps/HallOfSelection %%DATADIR%%/maps/Info/README @@ -359,6 +368,7 @@ %%DATADIR%%/maps/brest/pshops/pshopsinc %%DATADIR%%/maps/brest/pshops/pshopsinc2 %%DATADIR%%/maps/brest/pshops/ugriver1 +%%DATADIR%%/maps/brest/shops/a_small_shop %%DATADIR%%/maps/brest/shops/buildshop %%DATADIR%%/maps/brest/shops/buildshop2 %%DATADIR%%/maps/brest/sow/sow @@ -369,7 +379,9 @@ %%DATADIR%%/maps/brest/underground2 %%DATADIR%%/maps/brest/zorn/castle.basement0 %%DATADIR%%/maps/brest/zorn/castle.mainfloor +%%DATADIR%%/maps/brest/zorn/castle.upper.floor.four %%DATADIR%%/maps/brest/zorn/castle.upper.floor.one +%%DATADIR%%/maps/brest/zorn/castle.upper.floor.three %%DATADIR%%/maps/brest/zorn/castle.upper.floor.two %%DATADIR%%/maps/darcap/README %%DATADIR%%/maps/darcap/castle/castle2.0 @@ -530,6 +542,22 @@ %%DATADIR%%/maps/dungeons/valriel/valriel_final %%DATADIR%%/maps/dungeons/valriel/valriel_treasure %%DATADIR%%/maps/dungeons/xyzzy-mines +%%DATADIR%%/maps/editor/pickmaps/NPC +%%DATADIR%%/maps/editor/pickmaps/armour +%%DATADIR%%/maps/editor/pickmaps/background +%%DATADIR%%/maps/editor/pickmaps/castles +%%DATADIR%%/maps/editor/pickmaps/connected +%%DATADIR%%/maps/editor/pickmaps/exit +%%DATADIR%%/maps/editor/pickmaps/food +%%DATADIR%%/maps/editor/pickmaps/indoor +%%DATADIR%%/maps/editor/pickmaps/monster +%%DATADIR%%/maps/editor/pickmaps/river +%%DATADIR%%/maps/editor/pickmaps/runes +%%DATADIR%%/maps/editor/pickmaps/supernatural +%%DATADIR%%/maps/editor/pickmaps/town +%%DATADIR%%/maps/editor/pickmaps/treasure +%%DATADIR%%/maps/editor/pickmaps/wall special +%%DATADIR%%/maps/editor/pickmaps/weapon %%DATADIR%%/maps/editor/picks/TownStaff %%DATADIR%%/maps/editor/picks/alchemy %%DATADIR%%/maps/editor/picks/alltown @@ -553,6 +581,10 @@ %%DATADIR%%/maps/editor/picks/shops %%DATADIR%%/maps/editor/picks/special %%DATADIR%%/maps/editor/picks/town +%%DATADIR%%/maps/editor/scripts/LegacySpellConverter +%%DATADIR%%/maps/editor/scripts/MapNormalizer +%%DATADIR%%/maps/editor/scripts/MapValidator +%%DATADIR%%/maps/editor/scripts/WorldMaker %%DATADIR%%/maps/editor/walls/caves %%DATADIR%%/maps/editor/walls/caves2 %%DATADIR%%/maps/editor/walls/misc @@ -789,6 +821,7 @@ %%DATADIR%%/maps/navar_city/misc/library %%DATADIR%%/maps/navar_city/misc/market1 %%DATADIR%%/maps/navar_city/misc/market2 +%%DATADIR%%/maps/navar_city/misc/midane %%DATADIR%%/maps/navar_city/misc/navarwiz %%DATADIR%%/maps/navar_city/misc/tannery %%DATADIR%%/maps/navar_city/misc/thamshop @@ -852,6 +885,7 @@ %%DATADIR%%/maps/navar_city/mlab/ttower8 %%DATADIR%%/maps/navar_city/mlab/ttower9 %%DATADIR%%/maps/navar_city/mlab/ttowerchoswld1 +%%DATADIR%%/maps/navar_city/mouse_house %%DATADIR%%/maps/navar_city/slums/Iggys_house %%DATADIR%%/maps/navar_city/slums/Iggys_house_lower %%DATADIR%%/maps/navar_city/slums/Iggys_house_upper @@ -1110,6 +1144,7 @@ %%DATADIR%%/maps/pup_land/lone_town/nf_bar %%DATADIR%%/maps/pup_land/lone_town/pupuly %%DATADIR%%/maps/pup_land/lone_town/shops/buildshop +%%DATADIR%%/maps/pup_land/lone_town/shops/transport.shoppe %%DATADIR%%/maps/pup_land/lone_town/tavern %%DATADIR%%/maps/pup_land/lone_town/tavern_ud %%DATADIR%%/maps/pup_land/lone_town/thief_market @@ -1343,6 +1378,7 @@ %%DATADIR%%/maps/python/CFBoard.py %%DATADIR%%/maps/python/CFCampfire.py %%DATADIR%%/maps/python/CFDataFile.py +%%DATADIR%%/maps/python/CFDialog.py %%DATADIR%%/maps/python/CFGamble.py %%DATADIR%%/maps/python/CFGuilds.py %%DATADIR%%/maps/python/CFItemBroker.py @@ -1385,12 +1421,21 @@ %%DATADIR%%/maps/python/guilds/guildoracle.py %%DATADIR%%/maps/python/items/campfire_say.py %%DATADIR%%/maps/python/items/campfire_timer.py +%%DATADIR%%/maps/python/items/experience_rewarder.py %%DATADIR%%/maps/python/items/positioning_system.py %%DATADIR%%/maps/python/items/rhyzian_amulet.py %%DATADIR%%/maps/python/items/ring_occidental_mages.py +%%DATADIR%%/maps/python/items/roll-o-matic.py +%%DATADIR%%/maps/python/items/smoking_pipe.py %%DATADIR%%/maps/python/items/weapon_occidental_mages.py +%%DATADIR%%/maps/python/maps/navar-midane_apply.py +%%DATADIR%%/maps/python/maps/navar-midane_attack.py +%%DATADIR%%/maps/python/maps/navar-midane_pickup.py +%%DATADIR%%/maps/python/maps/navar-midane_time.py %%DATADIR%%/maps/python/misc/CFInsulter.py %%DATADIR%%/maps/python/misc/CFweardisguise.py +%%DATADIR%%/maps/python/misc/death_message.py +%%DATADIR%%/maps/python/misc/greet_message.py %%DATADIR%%/maps/quests/cd/cd.castle.750 %%DATADIR%%/maps/quests/cd/cd.cellar1.757 %%DATADIR%%/maps/quests/cd/cd.inn.752 @@ -1398,6 +1443,22 @@ %%DATADIR%%/maps/quests/cd/cd.tower1.754 %%DATADIR%%/maps/quests/cd/cd.tower2.755 %%DATADIR%%/maps/quests/cd/cd.tunnel.751 +%%DATADIR%%/maps/quests/greyshield/Archery +%%DATADIR%%/maps/quests/greyshield/Arena +%%DATADIR%%/maps/quests/greyshield/Castle +%%DATADIR%%/maps/quests/greyshield/Cave +%%DATADIR%%/maps/quests/greyshield/Cavern +%%DATADIR%%/maps/quests/greyshield/Cavern2 +%%DATADIR%%/maps/quests/greyshield/Chamber +%%DATADIR%%/maps/quests/greyshield/Doors +%%DATADIR%%/maps/quests/greyshield/Dungeon +%%DATADIR%%/maps/quests/greyshield/Elements +%%DATADIR%%/maps/quests/greyshield/Factory +%%DATADIR%%/maps/quests/greyshield/Finish +%%DATADIR%%/maps/quests/greyshield/Fortress +%%DATADIR%%/maps/quests/greyshield/GreyMaster +%%DATADIR%%/maps/quests/greyshield/Greysword +%%DATADIR%%/maps/quests/greyshield/Sphinx %%DATADIR%%/maps/quests/hendel/acid_room %%DATADIR%%/maps/quests/hendel/mountain_pass %%DATADIR%%/maps/quests/hendel/pre_acid @@ -1972,6 +2033,31 @@ %%DATADIR%%/maps/styles/monsterstyles/dragon/dragon_7 %%DATADIR%%/maps/styles/monsterstyles/dragon/dragon_8 %%DATADIR%%/maps/styles/monsterstyles/dragon/dragon_9 +%%DATADIR%%/maps/styles/monsterstyles/dwarf/dwarf01 +%%DATADIR%%/maps/styles/monsterstyles/dwarf/dwarf02 +%%DATADIR%%/maps/styles/monsterstyles/dwarf/dwarf03 +%%DATADIR%%/maps/styles/monsterstyles/dwarf/dwarf04 +%%DATADIR%%/maps/styles/monsterstyles/dwarf/dwarf05 +%%DATADIR%%/maps/styles/monsterstyles/dwarf/dwarf06 +%%DATADIR%%/maps/styles/monsterstyles/dwarf/dwarf07 +%%DATADIR%%/maps/styles/monsterstyles/dwarf/dwarf08 +%%DATADIR%%/maps/styles/monsterstyles/dwarf/dwarf09 +%%DATADIR%%/maps/styles/monsterstyles/dwarf/dwarf10 +%%DATADIR%%/maps/styles/monsterstyles/dwarf/dwarf11 +%%DATADIR%%/maps/styles/monsterstyles/dwarf/dwarf12 +%%DATADIR%%/maps/styles/monsterstyles/dwarf/dwarf13 +%%DATADIR%%/maps/styles/monsterstyles/dwarf/dwarf14 +%%DATADIR%%/maps/styles/monsterstyles/dwarf/dwarf15 +%%DATADIR%%/maps/styles/monsterstyles/dwarf/dwarf16 +%%DATADIR%%/maps/styles/monsterstyles/dwarf/dwarf17 +%%DATADIR%%/maps/styles/monsterstyles/dwarf/dwarf18 +%%DATADIR%%/maps/styles/monsterstyles/dwarf/dwarf19 +%%DATADIR%%/maps/styles/monsterstyles/dwarf/dwarf20 +%%DATADIR%%/maps/styles/monsterstyles/dwarf/dwarf21 +%%DATADIR%%/maps/styles/monsterstyles/dwarf/dwarf22 +%%DATADIR%%/maps/styles/monsterstyles/dwarf/dwarf23 +%%DATADIR%%/maps/styles/monsterstyles/dwarf/dwarf24 +%%DATADIR%%/maps/styles/monsterstyles/dwarf/dwarf25 %%DATADIR%%/maps/styles/monsterstyles/humanoid/humanoid_1 %%DATADIR%%/maps/styles/monsterstyles/humanoid/humanoid_10 %%DATADIR%%/maps/styles/monsterstyles/humanoid/humanoid_11 @@ -2160,7 +2246,12 @@ %%DATADIR%%/maps/templates/guild/README.txt %%DATADIR%%/maps/templates/guild/basement %%DATADIR%%/maps/templates/guild/bigchest -%%DATADIR%%/maps/templates/guild/guild_HQ +%%DATADIR%%/maps/templates/guild/guild_alchemy +%%DATADIR%%/maps/templates/guild/guild_bbq +%%DATADIR%%/maps/templates/guild/guild_hq +%%DATADIR%%/maps/templates/guild/guild_jeweler +%%DATADIR%%/maps/templates/guild/guild_thaum +%%DATADIR%%/maps/templates/guild/guild_toolshed %%DATADIR%%/maps/templates/guild/guildman_lounge %%DATADIR%%/maps/templates/guild/guildmaster_lounge %%DATADIR%%/maps/templates/guild/hallofjoining @@ -2198,6 +2289,8 @@ %%DATADIR%%/maps/test/playermover %%DATADIR%%/maps/test/python %%DATADIR%%/maps/test/python.py +%%DATADIR%%/maps/test/python_exit.py +%%DATADIR%%/maps/test/python_pickup.py %%DATADIR%%/maps/test/python_timer.py %%DATADIR%%/maps/test/quest %%DATADIR%%/maps/test/randomtreasure @@ -2232,6 +2325,7 @@ %%DATADIR%%/maps/unlinked/Greyshield/Greysword %%DATADIR%%/maps/unlinked/Greyshield/Island %%DATADIR%%/maps/unlinked/Greyshield/Island1 +%%DATADIR%%/maps/unlinked/Greyshield/README %%DATADIR%%/maps/unlinked/Greyshield/Ruins %%DATADIR%%/maps/unlinked/Greyshield/Sphinx %%DATADIR%%/maps/unlinked/academy.crap/Entrance @@ -2307,6 +2401,7 @@ %%DATADIR%%/maps/unlinked/kandora/signal2 %%DATADIR%%/maps/unlinked/kandora/signal3 %%DATADIR%%/maps/unlinked/lefttower2 +%%DATADIR%%/maps/unlinked/tutorial1 %%DATADIR%%/maps/unlinked/vol_vill_shops %%DATADIR%%/maps/unlinked/zornstuff/zornstuff.NOT.a.map %%DATADIR%%/maps/whalingoutpost/houses/fishershouse1 @@ -2344,6 +2439,7 @@ %%DATADIR%%/maps/whalingoutpost/underwaterdungeon/level1 %%DATADIR%%/maps/whalingoutpost/underwaterdungeon/level2 %%DATADIR%%/maps/whalingoutpost/underwaterdungeon/level3 +%%DATADIR%%/maps/wolfsburg/apartments/wolfsburg.apartment %%DATADIR%%/maps/wolfsburg/dept_store_armour %%DATADIR%%/maps/wolfsburg/dept_store_magic %%DATADIR%%/maps/wolfsburg/dept_store_misc @@ -2387,6 +2483,8 @@ %%DATADIR%%/maps/wolfsburg/magara/tower2/floor_2 %%DATADIR%%/maps/wolfsburg/piratechurch %%DATADIR%%/maps/wolfsburg/prison +%%DATADIR%%/maps/wolfsburg/shops/buildshop +%%DATADIR%%/maps/wolfsburg/shops/transport.shoppe %%DATADIR%%/maps/wolfsburg/slave_pit1 %%DATADIR%%/maps/wolfsburg/slave_pit2 %%DATADIR%%/maps/wolfsburg/slave_pit3 @@ -2403,7 +2501,6 @@ %%DATADIR%%/maps/wolfsburg/volcano/vvhuts %%DATADIR%%/maps/wolfsburg/volcano/vvmansion %%DATADIR%%/maps/wolfsburg/ware1 -%%DATADIR%%/maps/wolfsburg/whorehouse %%DATADIR%%/maps/world/world_100_100 %%DATADIR%%/maps/world/world_100_101 %%DATADIR%%/maps/world/world_100_102 @@ -3366,6 +3463,7 @@ @dirrm %%DATADIR%%/maps/wolfsburg/volcano @dirrm %%DATADIR%%/maps/wolfsburg/tt @dirrm %%DATADIR%%/maps/wolfsburg/temple +@dirrm %%DATADIR%%/maps/wolfsburg/shops @dirrm %%DATADIR%%/maps/wolfsburg/magara/tower2 @dirrm %%DATADIR%%/maps/wolfsburg/magara/tower1 @dirrm %%DATADIR%%/maps/wolfsburg/magara/cellar1 @@ -3375,6 +3473,7 @@ @dirrm %%DATADIR%%/maps/wolfsburg/guilds @dirrm %%DATADIR%%/maps/wolfsburg/eeur @dirrm %%DATADIR%%/maps/wolfsburg/dungeons +@dirrm %%DATADIR%%/maps/wolfsburg/apartments @dirrm %%DATADIR%%/maps/wolfsburg @dirrm %%DATADIR%%/maps/whalingoutpost/underwaterdungeon @dirrm %%DATADIR%%/maps/whalingoutpost/taverns @@ -3413,6 +3512,7 @@ @dirrm %%DATADIR%%/maps/styles/monsterstyles/insect @dirrm %%DATADIR%%/maps/styles/monsterstyles/imp @dirrm %%DATADIR%%/maps/styles/monsterstyles/humanoid +@dirrm %%DATADIR%%/maps/styles/monsterstyles/dwarf @dirrm %%DATADIR%%/maps/styles/monsterstyles/dragon @dirrm %%DATADIR%%/maps/styles/monsterstyles/demon @dirrm %%DATADIR%%/maps/styles/monsterstyles/city @@ -3494,9 +3594,11 @@ @dirrm %%DATADIR%%/maps/quests/mak/chaos @dirrm %%DATADIR%%/maps/quests/mak @dirrm %%DATADIR%%/maps/quests/hendel +@dirrm %%DATADIR%%/maps/quests/greyshield @dirrm %%DATADIR%%/maps/quests/cd @dirrm %%DATADIR%%/maps/quests @dirrm %%DATADIR%%/maps/python/misc +@dirrm %%DATADIR%%/maps/python/maps @dirrm %%DATADIR%%/maps/python/items @dirrm %%DATADIR%%/maps/python/guilds @dirrm %%DATADIR%%/maps/python/gods @@ -3598,7 +3700,9 @@ @dirrm %%DATADIR%%/maps/inn_and_outpost @dirrm %%DATADIR%%/maps/euthville @dirrm %%DATADIR%%/maps/editor/walls +@dirrm %%DATADIR%%/maps/editor/scripts @dirrm %%DATADIR%%/maps/editor/picks +@dirrm %%DATADIR%%/maps/editor/pickmaps @dirrm %%DATADIR%%/maps/editor @dirrm %%DATADIR%%/maps/dungeons/valriel @dirrm %%DATADIR%%/maps/dungeons/train @@ -3697,8 +3801,10 @@ @exec mkdir -p %D/var/crossfire/datafiles @exec mkdir -p %D/var/crossfire/maps @exec mkdir -p %D/var/crossfire/players +@exec mkdir -p %D/var/crossfire/template-maps @exec mkdir -p %D/var/crossfire/unique-items @dirrmtry var/crossfire/unique-items +@dirrmtry var/crossfire/template-maps @dirrmtry var/crossfire/players @dirrmtry var/crossfire/maps @dirrmtry var/crossfire/datafiles