dwarf_fortress: Update to 44.02

This commit is contained in:
i3enedek 2017-12-15 10:24:13 +00:00
parent 066ab7c6d6
commit 7e1412d087
5 changed files with 366 additions and 51 deletions

View File

@ -1,64 +1,67 @@
# $NetBSD: Makefile,v 1.2 2015/05/08 22:58:43 i3enedek Exp $
# $NetBSD$
DISTNAME= df_43_05_linux
PKGNAME= dwarf_fortress-43.05
DISTNAME= df_44_02_linux
PKGNAME= dwarf_fortress-44.02
CATEGORIES= games
MASTER_SITES= http://www.bay12games.com/dwarves/
EXTRACT_SUFX= .tar.bz2
LICENSE= unlicense
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://www.bay12games.com/dwarves/
COMMENT= Single-player fantasy game in a randomly generated, persistent world
LICENSE= unlicense
#UNPRIVILEGED= yes
EMUL_PLATFORMS= linux-i386 linux-x86_64
EMUL_MODULES.linux= base compat expat gtk2 libSDL glx x11
EMUL_PLATFORMS= linux-i386 linux-x86_64
EMUL_MODULES.linux= base compat expat gtk2 png libSDL glx x11 locale
NO_BUILD= yes
BUILD_TOOLS= pax
BUILD_DIRS= # empty
USE_TOOLS+= pax
BUILD_DIRS= # empty
WRKSRC= ${WRKDIR}/df_linux
.include "../../mk/bsd.prefs.mk"
.if ${EMUL_PLATFORM} == "linux-i386"
DISTFILES= ${DISTNAME}32${EXTRACT_SUFX}
DISTFILES= ${DISTNAME}32${EXTRACT_SUFX}
.elif ${EMUL_PLATFORM} == "linux-x86_64"
DISTFILES= ${DISTNAME}${EXTRACT_SUFX}
DISTFILES= ${DISTNAME}${EXTRACT_SUFX}
.endif
INSTALLATION_DIRS= bin df_linux
INSTALLATION_DIRS=bin df_linux
#INSTALLATION_DIRS=bin df_linux/data df_linux/data/movies df_linux/data/art df_linux/data/init df_linux/data/init/macros df_linux/data/announcement df_linux/data/dipscript df_linux/data/dipscript/text df_linux/data/help df_linux/data/speech df_linux/data/initial_movies df_linux/data/sound df_linux/raw df_linux/raw/graphics df_linux/raw/graphics/example df_linux/raw/interaction\ examples df_linux/raw/objects df_linux/raw/objects/notes df_linux/raw/objects/text df_linux/sdl df_linux/libs
DFDIR= df_linux
PREFIX= #empty
do-install:
AUTO_MKDIRS= yes
DFDIR= df_linux
post-extract:
${RM} -r ${WRKDIR}/${DFDIR}/g_src
#cd ${DESTDIR} && ${MKDIR} bin df_linux/data df_linux/data/movies df_linux/data/art df_linux/data/init df_linux/data/init/macros df_linux/data/announcement df_linux/data/dipscript df_linux/data/dipscript/text df_linux/data/help df_linux/data/speech df_linux/data/initial_movies df_linux/data/sound df_linux/raw df_linux/raw/graphics df_linux/raw/graphics/example df_linux/raw/interaction\ examples df_linux/raw/objects df_linux/raw/objects/notes df_linux/raw/objects/text df_linux/sdl df_linux/libs
#cd ${WRKSRC} && find ./data -exec chmod 666 {} \;
#cd ${WRKSRC} && find ./raw -exec chmod 666 {} \;
#cd ${WRKSRC} && find . -type d -exec chmod 755 {} \;
#cd ${WRKSRC} && find . -maxdepth 1 -type f -exec chmod 666 {} \;
${CP} ${WRKDIR}/df_linux/df ${DESTDIR}${PREFIX}/bin/df_linux
cd ${WRKSRC} && pax -rw ./ ${DESTDIR}${PREFIX}/df_linux
SUBST_CLASSES+= fix-paths
SUBST_MESSAGE.fix-paths= Fixing pngs to bmps.
SUBST_STAGE.fix-paths= post-configure
SUBST_FILES.fix-paths= libs/Dwarf_Fortress
SUBST_FILES.fix-paths+= data/init/init.txt
SUBST_SED.fix-paths= -e 's,\.png,.bmp,g'
SUBST_CLASSES+= fix-paths-1
SUBST_MESSAGE.fix-paths= Disabling sound.
SUBST_STAGE.fix-paths-1= post-configure
SUBST_FILES.fix-paths-1= data/init/init.txt
SUBST_SED.fix-paths-1= -e 's,SOUND:YES,SOUND:NO,g'
#post-install:
# ${CP} ${WRKSRC}/df ${DESTDIR}${PREFIX}/bin/df_linux
pre-install:
${RM} ${WRKDIR}/${DFDIR}/df.orig
${INSTALL_SCRIPT} ${WRKDIR}/df_linux/df ${DESTDIR}${PREFIX}/bin/df_linux
cd ${WRKSRC} && pax -rw ./ ${DESTDIR}${PREFIX}/df_linux
# png no longer seems to be broken.
#
#SUBST_CLASSES+= fix-paths
#SUBST_MESSAGE.fix-paths= Fixing pngs to bmps.
#SUBST_STAGE.fix-paths= post-configure
#SUBST_FILES.fix-paths= libs/Dwarf_Fortress
#SUBST_FILES.fix-paths+= data/init/init.txt
#SUBST_SED.fix-paths= -e 's,\.png,.bmp,g'
# Need import SUSE OpenAL
#
SUBST_CLASSES+= fix-paths-1
SUBST_MESSAGE.fix-paths-1= Disabling sound.
SUBST_STAGE.fix-paths-1= post-configure
SUBST_FILES.fix-paths-1= data/init/init.txt
SUBST_SED.fix-paths-1= -e 's,SOUND:YES,SOUND:NO,g'
.include "../../mk/bsd.prefs.mk"
.include "../../mk/bsd.pkg.mk"

View File

@ -1 +1,306 @@
@comment $NetBSD: PLIST,v 1.1 2014/04/17 00:33:17 thomasklausner Exp $
@comment $NetBSD$
bin/df_linux
df_linux/README.linux
df_linux/command line.txt
df_linux/data/announcement/diplomatrebuffed
df_linux/data/announcement/end2
df_linux/data/announcement/end3
df_linux/data/announcement/end4
df_linux/data/announcement/end5
df_linux/data/announcement/fortressintro
df_linux/data/announcement/hastyking
df_linux/data/announcement/kingarrival
df_linux/data/announcement/merchantexit
df_linux/data/announcement/merchantintro
df_linux/data/announcement/semiend
df_linux/data/announcement/unretire
df_linux/data/art/curses_640x300.bmp
df_linux/data/art/curses_640x300.png
df_linux/data/art/curses_800x600.bmp
df_linux/data/art/curses_800x600.png
df_linux/data/art/curses_square_16x16.bmp
df_linux/data/art/curses_square_16x16.png
df_linux/data/art/font license.txt
df_linux/data/art/font.ttf
df_linux/data/art/mouse.bmp
df_linux/data/art/mouse.png
df_linux/data/dipscript/dwarf_liaison
df_linux/data/dipscript/elves_firstcontact
df_linux/data/dipscript/elves_standard
df_linux/data/dipscript/human_standard
df_linux/data/dipscript/human_trade
df_linux/data/dipscript/text/dwarf_liaison1
df_linux/data/dipscript/text/dwarf_liaison_bye
df_linux/data/dipscript/text/elves_firstcontact1
df_linux/data/dipscript/text/elves_firstcontact2
df_linux/data/dipscript/text/elves_standard1
df_linux/data/dipscript/text/elves_standard_bye
df_linux/data/dipscript/text/human_standard1
df_linux/data/dipscript/text/human_standard_bye
df_linux/data/dipscript/text/human_trade1
df_linux/data/dipscript/text/human_trade_bye
df_linux/data/help/a_first
df_linux/data/help/a_icons
df_linux/data/help/a_intro
df_linux/data/help/a_keys
df_linux/data/help/a_main
df_linux/data/help/accounts
df_linux/data/help/building_clutter
df_linux/data/help/crafts
df_linux/data/help/defense
df_linux/data/help/food
df_linux/data/help/icons
df_linux/data/help/icons_creature
df_linux/data/help/icons_dwarf
df_linux/data/help/icons_items
df_linux/data/help/icons_terrain
df_linux/data/help/intro
df_linux/data/help/living_quarters
df_linux/data/help/machines
df_linux/data/help/main
df_linux/data/help/menu_activity_zones
df_linux/data/help/menu_builditem
df_linux/data/help/menu_buildjob
df_linux/data/help/menu_buildjob_animaltrap
df_linux/data/help/menu_buildjob_depot
df_linux/data/help/menu_buildjob_door
df_linux/data/help/menu_buildjob_farmplot
df_linux/data/help/menu_buildjob_lever
df_linux/data/help/menu_buildjob_shop
df_linux/data/help/menu_buildjob_siege
df_linux/data/help/menu_buildjob_stockpile
df_linux/data/help/menu_civlist
df_linux/data/help/menu_designations
df_linux/data/help/menu_jobunitlist
df_linux/data/help/menu_look
df_linux/data/help/menu_make_buildings
df_linux/data/help/menu_manager
df_linux/data/help/menu_military
df_linux/data/help/menu_nobles
df_linux/data/help/menu_orders
df_linux/data/help/menu_professions
df_linux/data/help/menu_roomlist
df_linux/data/help/menu_rooms
df_linux/data/help/menu_squads
df_linux/data/help/menu_status
df_linux/data/help/menu_status_animals
df_linux/data/help/menu_status_currency
df_linux/data/help/menu_status_justice
df_linux/data/help/menu_status_kitchen
df_linux/data/help/menu_status_prices
df_linux/data/help/menu_status_stocks
df_linux/data/help/menu_status_stone
df_linux/data/help/menu_stockpiles
df_linux/data/help/menu_viewunit
df_linux/data/help/menu_wages
df_linux/data/help/menus
df_linux/data/help/mining
df_linux/data/help/new_region
df_linux/data/help/outpost
df_linux/data/help/practice
df_linux/data/help/r_intro
df_linux/data/help/r_main
df_linux/data/help/setup_game
df_linux/data/help/storage
df_linux/data/help/table_item_designations
df_linux/data/help/tables
df_linux/data/help/technical
df_linux/data/help/text_viewer
df_linux/data/help/text_viewer2
df_linux/data/help/text_viewer3
df_linux/data/help/trading
df_linux/data/help/unit_profile
df_linux/data/help/water
df_linux/data/help/wood
df_linux/data/index
df_linux/data/init/announcements.txt
df_linux/data/init/arena.txt
df_linux/data/init/colors.txt
df_linux/data/init/d_init.txt
df_linux/data/init/init.txt
df_linux/data/init/interface.txt
df_linux/data/init/world_gen.txt
df_linux/data/initial_movies/bay12games.cmv
df_linux/data/initial_movies/dwarf_fortress.cmv
df_linux/data/initial_movies/toadyone.cmv
df_linux/data/readme.txt
df_linux/data/shader.fs
df_linux/data/shader.vs
df_linux/data/sound/DFINTRO.ogg
df_linux/data/sound/DFINTROEND.ogg
df_linux/data/sound/DFPICK.ogg
df_linux/data/sound/DFRUBBLE.ogg
df_linux/data/sound/baybeyond.ogg
df_linux/data/sound/bayend.ogg
df_linux/data/sound/bayquality.ogg
df_linux/data/sound/baystart.ogg
df_linux/data/sound/song_game.ogg
df_linux/data/sound/song_title.ogg
df_linux/data/speech/ab_specific_hf_seeker.txt
df_linux/data/speech/animal_slayer.txt
df_linux/data/speech/arch_info_justification.txt
df_linux/data/speech/child_age_proclamation.txt
df_linux/data/speech/current_profession_no_year.txt
df_linux/data/speech/current_profession_year.txt
df_linux/data/speech/curse.txt
df_linux/data/speech/dwarf.txt
df_linux/data/speech/elf.txt
df_linux/data/speech/family_relationship_additional.txt
df_linux/data/speech/family_relationship_additional_dead.txt
df_linux/data/speech/family_relationship_no_spec.txt
df_linux/data/speech/family_relationship_no_spec_dead.txt
df_linux/data/speech/family_relationship_spec.txt
df_linux/data/speech/family_relationship_spec_dead.txt
df_linux/data/speech/general.txt
df_linux/data/speech/goodbye_worship_1.txt
df_linux/data/speech/goodbye_worship_2.txt
df_linux/data/speech/goodbye_worship_3.txt
df_linux/data/speech/greet.txt
df_linux/data/speech/greet_baby.txt
df_linux/data/speech/greet_reply.txt
df_linux/data/speech/greet_reply_after_hero.txt
df_linux/data/speech/greet_reply_diff_language.txt
df_linux/data/speech/greet_reply_unusual_first.txt
df_linux/data/speech/greet_worship.txt
df_linux/data/speech/guard_profession.txt
df_linux/data/speech/guard_warning.txt
df_linux/data/speech/hist_fig_slayer.txt
df_linux/data/speech/hunting_profession.txt
df_linux/data/speech/hunting_profession_year.txt
df_linux/data/speech/justification_antithetical.txt
df_linux/data/speech/justification_experience.txt
df_linux/data/speech/justification_proximity.txt
df_linux/data/speech/justification_reminder.txt
df_linux/data/speech/justification_representation.txt
df_linux/data/speech/lair_hunter_minotaur.txt
df_linux/data/speech/mercenary_profession.txt
df_linux/data/speech/mercenary_profession_year.txt
df_linux/data/speech/no_family.txt
df_linux/data/speech/past_hunting_profession.txt
df_linux/data/speech/past_mercenary_profession.txt
df_linux/data/speech/past_profession_no_year.txt
df_linux/data/speech/past_profession_year.txt
df_linux/data/speech/past_snatcher_profession.txt
df_linux/data/speech/past_thief_profession.txt
df_linux/data/speech/past_wandering_profession.txt
df_linux/data/speech/positive.txt
df_linux/data/speech/same_site_ab_specific_hf_seeker.txt
df_linux/data/speech/same_site_specific_hf_seeker.txt
df_linux/data/speech/site_specific_hf_seeker.txt
df_linux/data/speech/slayer.txt
df_linux/data/speech/snatcher_profession.txt
df_linux/data/speech/snatcher_profession_year.txt
df_linux/data/speech/soldier_profession.txt
df_linux/data/speech/task_recommendation.txt
df_linux/data/speech/temple_already_member.txt
df_linux/data/speech/temple_become_member.txt
df_linux/data/speech/thief_profession.txt
df_linux/data/speech/thief_profession_year.txt
df_linux/data/speech/threat.txt
df_linux/data/speech/unknown_hf_seeker.txt
df_linux/data/speech/wandering_profession.txt
df_linux/data/speech/wandering_profession_year.txt
df_linux/df
df_linux/file changes.txt
df_linux/libs/Dwarf_Fortress
df_linux/libs/libgcc_s.so.1
df_linux/libs/libgraphics.so
df_linux/libs/libstdc++.so.6
df_linux/raw/graphics/example/dwarves.bmp
df_linux/raw/graphics/graphics_example.txt
df_linux/raw/interaction examples/interaction_disturbance.txt
df_linux/raw/interaction examples/interaction_region.txt
df_linux/raw/interaction examples/interaction_secret.txt
df_linux/raw/interaction examples/interaction_underground_special.txt
df_linux/raw/interaction examples/interaction_vampire.txt
df_linux/raw/interaction examples/interaction_werebeast.txt
df_linux/raw/objects/b_detail_plan_default.txt
df_linux/raw/objects/body_default.txt
df_linux/raw/objects/body_rcp.txt
df_linux/raw/objects/building_custom.txt
df_linux/raw/objects/c_variation_default.txt
df_linux/raw/objects/creature_amphibians.txt
df_linux/raw/objects/creature_annelids.txt
df_linux/raw/objects/creature_birds.txt
df_linux/raw/objects/creature_birds_new.txt
df_linux/raw/objects/creature_bug_slug_new.txt
df_linux/raw/objects/creature_desert_new.txt
df_linux/raw/objects/creature_domestic.txt
df_linux/raw/objects/creature_equipment.txt
df_linux/raw/objects/creature_fanciful.txt
df_linux/raw/objects/creature_insects.txt
df_linux/raw/objects/creature_large_mountain.txt
df_linux/raw/objects/creature_large_ocean.txt
df_linux/raw/objects/creature_large_riverlake.txt
df_linux/raw/objects/creature_large_temperate.txt
df_linux/raw/objects/creature_large_tropical.txt
df_linux/raw/objects/creature_large_tundra.txt
df_linux/raw/objects/creature_mountain_new.txt
df_linux/raw/objects/creature_next_underground.txt
df_linux/raw/objects/creature_ocean_new.txt
df_linux/raw/objects/creature_other.txt
df_linux/raw/objects/creature_reptiles.txt
df_linux/raw/objects/creature_riverlakepool_new.txt
df_linux/raw/objects/creature_small_mammal_new.txt
df_linux/raw/objects/creature_small_mammals.txt
df_linux/raw/objects/creature_small_ocean.txt
df_linux/raw/objects/creature_small_riverlake.txt
df_linux/raw/objects/creature_standard.txt
df_linux/raw/objects/creature_subterranean.txt
df_linux/raw/objects/creature_temperate_new.txt
df_linux/raw/objects/creature_tropical_new.txt
df_linux/raw/objects/creature_tundra_taiga_new.txt
df_linux/raw/objects/descriptor_color_standard.txt
df_linux/raw/objects/descriptor_pattern_iris_eye.txt
df_linux/raw/objects/descriptor_pattern_pupil_eye.txt
df_linux/raw/objects/descriptor_pattern_special.txt
df_linux/raw/objects/descriptor_shape_standard.txt
df_linux/raw/objects/entity_default.txt
df_linux/raw/objects/examples and notes/gaits.txt
df_linux/raw/objects/examples and notes/item_instrument_example.txt
df_linux/raw/objects/examples and notes/reaction_instrument_example.txt
df_linux/raw/objects/inorganic_metal.txt
df_linux/raw/objects/inorganic_other.txt
df_linux/raw/objects/inorganic_stone_gem.txt
df_linux/raw/objects/inorganic_stone_layer.txt
df_linux/raw/objects/inorganic_stone_mineral.txt
df_linux/raw/objects/inorganic_stone_soil.txt
df_linux/raw/objects/interaction_standard.txt
df_linux/raw/objects/item_ammo.txt
df_linux/raw/objects/item_armor.txt
df_linux/raw/objects/item_food.txt
df_linux/raw/objects/item_gloves.txt
df_linux/raw/objects/item_helm.txt
df_linux/raw/objects/item_pants.txt
df_linux/raw/objects/item_shield.txt
df_linux/raw/objects/item_shoes.txt
df_linux/raw/objects/item_siegeammo.txt
df_linux/raw/objects/item_tool.txt
df_linux/raw/objects/item_toy.txt
df_linux/raw/objects/item_trapcomp.txt
df_linux/raw/objects/item_weapon.txt
df_linux/raw/objects/language_DWARF.txt
df_linux/raw/objects/language_ELF.txt
df_linux/raw/objects/language_GOBLIN.txt
df_linux/raw/objects/language_HUMAN.txt
df_linux/raw/objects/language_SYM.txt
df_linux/raw/objects/language_words.txt
df_linux/raw/objects/material_template_default.txt
df_linux/raw/objects/plant_crops.txt
df_linux/raw/objects/plant_garden.txt
df_linux/raw/objects/plant_grasses.txt
df_linux/raw/objects/plant_new_trees.txt
df_linux/raw/objects/plant_standard.txt
df_linux/raw/objects/reaction_adv_carpenter.txt
df_linux/raw/objects/reaction_other.txt
df_linux/raw/objects/reaction_smelter.txt
df_linux/raw/objects/text/book_art.txt
df_linux/raw/objects/text/book_instruction.txt
df_linux/raw/objects/text/secret_death.txt
df_linux/raw/objects/tissue_template_default.txt
df_linux/raw/readme.txt
df_linux/readme.txt
df_linux/release notes.txt
df_linux/sdl/sdl license.txt
@pkgdir df_linux/data/movies
@pkgdir df_linux/data/init/macros

View File

@ -1,7 +1,3 @@
Fix sound.
Workaround for png issues; use bitmaps instead.
Package it up; am keeping an eye on wip/lugaru
to see how it deals with the game expecting
the data to be relative to it's location.

View File

@ -1,7 +1,7 @@
$NetBSD: distinfo,v 1.2 2015/05/08 22:58:43 i3enedek Exp $
SHA1 (df_43_05_linux.tar.bz2) = 1f0bfdb6a14a801b8f2cdc6fb6880b967e6a24bf
RMD160 (df_43_05_linux.tar.bz2) = d2e99c1991f48c63096dfb301faf25d89b4f6ba7
SHA512 (df_43_05_linux.tar.bz2) = 502e6bac0bdd5586fb6b4e1117caf144a0336a7eed3ed9350ec316e4a286e309a15e0738517c0dd7d32f182984c501c7a8756e942d3dde9fb87f72b153f38e7a
Size (df_43_05_linux.tar.bz2) = 11580594 bytes
SHA1 (patch-df) = fc5414f27e63eb280bb61914c4603715f7ff4734
SHA1 (df_44_02_linux.tar.bz2) = b5ec54841a4adf19b5b7e668a05d64f8fea7cde2
RMD160 (df_44_02_linux.tar.bz2) = 9c5454d040eadc14471cd74659ccbda4e9280a07
SHA512 (df_44_02_linux.tar.bz2) = 793bf3f0726cb3fca35771781144e1f2cc8ae496222d24d1c8d6add83f5e78a2c11e458ab05a87f14141513e98807e5d0d99d384f719b02301140ff0dc915875
Size (df_44_02_linux.tar.bz2) = 11940967 bytes
SHA1 (patch-df) = 079651012bccfd59411faa1f390961e252c74dff

View File

@ -1,11 +1,22 @@
$NetBSD$
libGL fix
--- df.orig 2016-01-17 21:44:56.000000000 +0000
#Move df to homedir and where it looks for x11
--- df.orig 2017-11-28 17:40:52.000000000 +0000
+++ df
@@ -1,6 +1,7 @@
@@ -1,6 +1,14 @@
#!/bin/sh
DF_DIR=$(dirname "$0")
cd "${DF_DIR}"
-DF_DIR=$(dirname "$0")
-cd "${DF_DIR}"
+
+if [ ! -f ~/df_linux ]
+then
+ echo "Copying..."
+ cp -r /usr/pkg/df_linux ~/
+fi
+
+DF_DIR="~/df_linux"
+cd ~/df_linux
+export LIBGL_DRIVERS_PATH=${X11BASE}
export SDL_DISABLE_LOCK_KEYS=1 # Work around for bug in Debian/Ubuntu SDL patch.
#export SDL_VIDEO_CENTERED=1 # Centre the screen. Messes up resizing.