Hi, First time here, hoping I didn't mess up too much. The patch below updates games/taisei from 1.0 to the latest 1.3.1 with the followings changes:
- use https for HOMEPAGE - upstream repo changed - dropped all the patches, they're not needed anymore - dependecies updated Built and played on amd64, everything seems to work fine (audio too.) portcheck does not complain, but is the DISTFILE bit correct? I needed to add PKGNAME because of "bad package name" during make package. -- /Omar Polo Index: Makefile =================================================================== RCS file: /cvs/ports/games/taisei/Makefile,v retrieving revision 1.6 diff -u -p -r1.6 Makefile --- Makefile 12 Jul 2019 20:46:25 -0000 1.6 +++ Makefile 15 Jan 2020 12:54:27 -0000 @@ -2,32 +2,40 @@ COMMENT = clone of the touhou games -V = 1.0a -DISTNAME = taisei-$V -REVISION = 3 +V = 1.3.1 +DISTNAME = taisei-v$V +PKGNAME = taisei-$V +REVISION = 0 CATEGORIES = games -HOMEPAGE = http://taisei-project.org/ +HOMEPAGE = https://taisei-project.org/ # MIT PERMIT_PACKAGE = Yes -WANTLIB += GL GLU SDL SDL_ttf alut c freetype m openal png pthread -WANTLIB += z +WANTLIB += GL GLU SDL2 SDL2_ttf SDL2_mixer c freetype m openal png pthread +WANTLIB += z zip -GH_ACCOUNT = laochailan -GH_PROJECT = taisei -GH_TAGNAME = v$V +MASTER_SITES = https://github.com/taisei-project/ + +EXTRACT_SUFX = .tar.xz + +DISTFILES = {taisei/releases/download/v${V}/}${DISTNAME}${EXTRACT_SUFX} CFLAGS += -fgnu89-inline -MODULES = devel/cmake -RUN_DEPENDS = devel/desktop-file-utils \ - x11/gtk+3,-guic -LIB_DEPENDS = audio/freealut \ +MODULES = devel/meson + +RUN_DEPENDS = x11/gtk+3,-guic \ + devel/desktop-file-utils \ + misc/shared-mime-info + +LIB_DEPENDS = devel/sdl2 \ + devel/sdl2-mixer \ + devel/sdl2-ttf \ audio/openal \ - devel/sdl-ttf \ - graphics/png + graphics/png \ + archivers/libzip NO_TEST = Yes Index: distinfo =================================================================== RCS file: /cvs/ports/games/taisei/distinfo,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 distinfo --- distinfo 22 Aug 2015 09:38:07 -0000 1.1.1.1 +++ distinfo 15 Jan 2020 12:54:27 -0000 @@ -1,2 +1,2 @@ -SHA256 (taisei-1.0a.tar.gz) = FWHITJ/YucepG4ZL38B/uBG7baXFTPMqK2vWPeX48/8= -SIZE (taisei-1.0a.tar.gz) = 91854864 +SHA256 (taisei-v1.3.1.tar.xz) = hlg6OnEAk+YwFKWua2glGgacslraBsb41zT4XzGtyYU= +SIZE (taisei-v1.3.1.tar.xz) = 70763196 Index: patches/patch-meson_options_txt =================================================================== RCS file: patches/patch-meson_options_txt diff -N patches/patch-meson_options_txt --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-meson_options_txt 15 Jan 2020 12:54:27 -0000 @@ -0,0 +1,14 @@ +$OpenBSD$ + +Index: meson_options.txt +--- meson_options.txt.orig ++++ meson_options.txt +@@ -96,7 +96,7 @@ option( + option( + 'docs', + type : 'boolean', +- value : true, ++ value : false, + description : 'Build and install documentation' + ) + Index: patches/patch-src_boss_h =================================================================== RCS file: patches/patch-src_boss_h diff -N patches/patch-src_boss_h --- patches/patch-src_boss_h 17 May 2017 22:54:28 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,14 +0,0 @@ -$OpenBSD: patch-src_boss_h,v 1.1 2017/05/17 22:54:28 espie Exp $ - -Index: src/boss.h ---- src/boss.h.orig -+++ src/boss.h -@@ -9,6 +9,8 @@ - #define BOSS_H - - #include <complex.h> -+#undef complex -+#define complex double _Complex - - #include <resource/animation.h> - struct Boss; Index: patches/patch-src_enemy_h =================================================================== RCS file: patches/patch-src_enemy_h diff -N patches/patch-src_enemy_h --- patches/patch-src_enemy_h 17 May 2017 22:54:28 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,14 +0,0 @@ -$OpenBSD: patch-src_enemy_h,v 1.1 2017/05/17 22:54:28 espie Exp $ - -Index: src/enemy.h ---- src/enemy.h.orig -+++ src/enemy.h -@@ -8,6 +8,8 @@ - #ifndef ENEMY_H - #define ENEMY_H - #include <complex.h> -+#undef complex -+#define complex double _Complex - #include "projectile.h" - - #undef complex Index: patches/patch-src_item_c =================================================================== RCS file: patches/patch-src_item_c diff -N patches/patch-src_item_c --- patches/patch-src_item_c 17 May 2017 22:54:28 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,14 +0,0 @@ -$OpenBSD: patch-src_item_c,v 1.1 2017/05/17 22:54:28 espie Exp $ - -Index: src/item.c ---- src/item.c.orig -+++ src/item.c -@@ -76,7 +76,7 @@ void process_items() { - int v; - - float r = 30; -- if(global.plr.focus > 0); -+ if(global.plr.focus > 0) - r *= 2; - - while(item != NULL) { Index: patches/patch-src_item_h =================================================================== RCS file: patches/patch-src_item_h diff -N patches/patch-src_item_h --- patches/patch-src_item_h 17 May 2017 22:54:28 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,14 +0,0 @@ -$OpenBSD: patch-src_item_h,v 1.1 2017/05/17 22:54:28 espie Exp $ - -Index: src/item.h ---- src/item.h.orig -+++ src/item.h -@@ -10,6 +10,8 @@ - #define ITEM_H - - #include <complex.h> -+#undef complex -+#define complex double _Complex - - typedef struct Item Item; - Index: patches/patch-src_laser_h =================================================================== RCS file: patches/patch-src_laser_h diff -N patches/patch-src_laser_h --- patches/patch-src_laser_h 17 May 2017 22:54:28 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,14 +0,0 @@ -$OpenBSD: patch-src_laser_h,v 1.1 2017/05/17 22:54:28 espie Exp $ - -Index: src/laser.h ---- src/laser.h.orig -+++ src/laser.h -@@ -9,6 +9,8 @@ - #define LASER_H - - #include <complex.h> -+#undef complex -+#define complex double _Complex - #include "projectile.h" - #include "resource/shader.h" - Index: patches/patch-src_menu_replayview_c =================================================================== RCS file: patches/patch-src_menu_replayview_c diff -N patches/patch-src_menu_replayview_c --- patches/patch-src_menu_replayview_c 17 May 2017 22:54:28 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,14 +0,0 @@ -$OpenBSD: patch-src_menu_replayview_c,v 1.1 2017/05/17 22:54:28 espie Exp $ - -Index: src/menu/replayview.c ---- src/menu/replayview.c.orig -+++ src/menu/replayview.c -@@ -193,7 +193,7 @@ static void replayview_drawitem(void *n, int item, int - break; - - case 3: -- snprintf(tmp, 128, difficulty_name(rpy->stages[0].diff)); -+ snprintf(tmp, 128, "%s", difficulty_name(rpy->stages[0].diff)); - break; - - case 4: Index: patches/patch-src_player_h =================================================================== RCS file: patches/patch-src_player_h diff -N patches/patch-src_player_h --- patches/patch-src_player_h 17 May 2017 22:54:28 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,14 +0,0 @@ -$OpenBSD: patch-src_player_h,v 1.1 2017/05/17 22:54:28 espie Exp $ - -Index: src/player.h ---- src/player.h.orig -+++ src/player.h -@@ -9,6 +9,8 @@ - #define PLAYER_H - - #include <complex.h> -+#undef complex -+#define complex double _Complex - #include "enemy.h" - - #include "resource/animation.h" Index: patches/patch-src_projectile_h =================================================================== RCS file: patches/patch-src_projectile_h diff -N patches/patch-src_projectile_h --- patches/patch-src_projectile_h 17 May 2017 22:54:28 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,14 +0,0 @@ -$OpenBSD: patch-src_projectile_h,v 1.1 2017/05/17 22:54:28 espie Exp $ - -Index: src/projectile.h ---- src/projectile.h.orig -+++ src/projectile.h -@@ -9,6 +9,8 @@ - #define PROJECTILE - - #include <complex.h> -+#undef complex -+#define complex double _Complex - #include "resource/texture.h" - - enum { Index: patches/patch-src_stages_stage1_c =================================================================== RCS file: patches/patch-src_stages_stage1_c diff -N patches/patch-src_stages_stage1_c --- patches/patch-src_stages_stage1_c 17 May 2017 22:54:28 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,14 +0,0 @@ -$OpenBSD: patch-src_stages_stage1_c,v 1.1 2017/05/17 22:54:28 espie Exp $ - -Index: src/stages/stage1.c ---- src/stages/stage1.c.orig -+++ src/stages/stage1.c -@@ -60,7 +60,7 @@ Vector **stage1_bg_pos(Vector p, float maxrange) { - } - - void stage1_smoke_draw(Vector pos) { -- float d = abs(pos[1]-bgcontext.cx[1]); -+ float d = fabsf(pos[1]-bgcontext.cx[1]); - - glDisable(GL_DEPTH_TEST); - glPushMatrix(); Index: patches/patch-src_stageutils_h =================================================================== RCS file: patches/patch-src_stageutils_h diff -N patches/patch-src_stageutils_h --- patches/patch-src_stageutils_h 17 May 2017 22:54:28 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,14 +0,0 @@ -$OpenBSD: patch-src_stageutils_h,v 1.1 2017/05/17 22:54:28 espie Exp $ - -Index: src/stageutils.h ---- src/stageutils.h.orig -+++ src/stageutils.h -@@ -5,7 +5,7 @@ - * Copyright (C) 2011, Lukas Weber <laochai...@web.de> - */ - --#ifndef STAGEUITLS_H -+#ifndef STAGEUTILS_H - #define STAGEUTILS_H - - #include "matrix.h" Index: pkg/PLIST =================================================================== RCS file: /cvs/ports/games/taisei/pkg/PLIST,v retrieving revision 1.3 diff -u -p -r1.3 PLIST --- pkg/PLIST 29 Jun 2018 22:16:15 -0000 1.3 +++ pkg/PLIST 15 Jan 2020 12:54:28 -0000 @@ -1,148 +1,22 @@ @comment $OpenBSD: PLIST,v 1.3 2018/06/29 22:16:15 espie Exp $ @bin bin/taisei +share/applications/ +share/applications/taisei-replay-viewer.desktop share/applications/taisei.desktop +share/icons/ +share/icons/hicolor/ +share/icons/hicolor/128x128/ +share/icons/hicolor/128x128/apps/ share/icons/hicolor/128x128/apps/taisei.png +share/icons/hicolor/256x256/ +share/icons/hicolor/256x256/mimetypes/ +share/icons/hicolor/256x256/mimetypes/taisei-replay.png +share/mime/ +share/mime/packages/ +share/mime/packages/taisei.xml share/taisei/ -share/taisei/gfx/ -share/taisei/gfx/LinBiolinum.ttf -share/taisei/gfx/ani_1_1_10_cirno.png -share/taisei/gfx/ani_1_1_10_elly.png -share/taisei/gfx/ani_1_1_10_hina.png -share/taisei/gfx/ani_1_1_10_kurumi.png -share/taisei/gfx/ani_1_1_10_scuttle.png -share/taisei/gfx/ani_1_1_10_wriggle.png -share/taisei/gfx/ani_1_1_25_iku.png -share/taisei/gfx/ani_1_25_1_fire.png -share/taisei/gfx/ani_1_25_1_hinabg.png -share/taisei/gfx/ani_2_2_15_bigfairy.png -share/taisei/gfx/ani_2_2_15_fairy.png -share/taisei/gfx/ani_2_4_10_marisa.png -share/taisei/gfx/ani_2_4_10_youmu.png -share/taisei/gfx/boss_circle.png -share/taisei/gfx/boss_indicator.png -share/taisei/gfx/boss_spellcircle0.png -share/taisei/gfx/charselect_arrow.png -share/taisei/gfx/dialog/ -share/taisei/gfx/dialog/hina.png -share/taisei/gfx/dialog/marisa.png -share/taisei/gfx/dialog/youmu.png -share/taisei/gfx/fairy_circle.png -share/taisei/gfx/flare.png -share/taisei/gfx/focus.png -share/taisei/gfx/hud.png -share/taisei/gfx/immortal.ttf -share/taisei/gfx/items/ -share/taisei/gfx/items/bomb.png -share/taisei/gfx/items/bullet_point.png -share/taisei/gfx/items/life.png -share/taisei/gfx/items/point.png -share/taisei/gfx/items/power.png -share/taisei/gfx/mainmenu/ -share/taisei/gfx/mainmenu/logo.png -share/taisei/gfx/mainmenu/mainmenubg.png -share/taisei/gfx/mainmenu/mainmenubgbg.png -share/taisei/gfx/masterspark.png -share/taisei/gfx/masterspark_ring.png -share/taisei/gfx/part/ -share/taisei/gfx/part/blast.png -share/taisei/gfx/part/boss_shadow.png -share/taisei/gfx/part/flare.png -share/taisei/gfx/part/lasercurve.png -share/taisei/gfx/part/marilaser_part0.png -share/taisei/gfx/part/maristar_orbit.png -share/taisei/gfx/part/petal.png -share/taisei/gfx/part/smoke.png -share/taisei/gfx/part/stain.png -share/taisei/gfx/part/youmu_slice.png -share/taisei/gfx/proj/ -share/taisei/gfx/proj/ball.png -share/taisei/gfx/proj/bigball.png -share/taisei/gfx/proj/bullet.png -share/taisei/gfx/proj/card.png -share/taisei/gfx/proj/crystal.png -share/taisei/gfx/proj/flea.png -share/taisei/gfx/proj/hghost.png -share/taisei/gfx/proj/marilaser.png -share/taisei/gfx/proj/marisa.png -share/taisei/gfx/proj/maristar.png -share/taisei/gfx/proj/plainball.png -share/taisei/gfx/proj/rice.png -share/taisei/gfx/proj/soul.png -share/taisei/gfx/proj/thickrice.png -share/taisei/gfx/proj/wave.png -share/taisei/gfx/proj/youhoming.png -share/taisei/gfx/proj/youmu.png -share/taisei/gfx/stage1/ -share/taisei/gfx/stage1/cirnobg.png -share/taisei/gfx/stage1/fog.png -share/taisei/gfx/stage1/snowlayer.png -share/taisei/gfx/stage1/water.png -share/taisei/gfx/stage2/ -share/taisei/gfx/stage2/border.png -share/taisei/gfx/stage2/leaves.png -share/taisei/gfx/stage2/road.png -share/taisei/gfx/stage2/spellbg1.png -share/taisei/gfx/stage2/spellbg2.png -share/taisei/gfx/stage3/ -share/taisei/gfx/stage3/border.png -share/taisei/gfx/stage3/spellbg1.png -share/taisei/gfx/stage3/wspellbg.png -share/taisei/gfx/stage3/wspellclouds.png -share/taisei/gfx/stage3/wspellswarm.png -share/taisei/gfx/stage4/ -share/taisei/gfx/stage4/kurumibg1.png -share/taisei/gfx/stage4/kurumibg2.png -share/taisei/gfx/stage4/lake.png -share/taisei/gfx/stage4/mansion.png -share/taisei/gfx/stage4/planks.png -share/taisei/gfx/stage4/wall.png -share/taisei/gfx/stage5/ -share/taisei/gfx/stage5/noise.png -share/taisei/gfx/stage5/spell_bg.png -share/taisei/gfx/stage5/spell_clouds.png -share/taisei/gfx/stage5/spell_lightning.png -share/taisei/gfx/stage5/tower.png -share/taisei/gfx/stage6/ -share/taisei/gfx/stage6/baryon.png -share/taisei/gfx/stage6/baryon_connector.png -share/taisei/gfx/stage6/scythe.png -share/taisei/gfx/stage6/scythecircle.png -share/taisei/gfx/stage6/sky.png -share/taisei/gfx/stage6/spellbg_chalk.png -share/taisei/gfx/stage6/spellbg_classic.png -share/taisei/gfx/stage6/spellbg_modern.png -share/taisei/gfx/stage6/towertop.png -share/taisei/gfx/stage6/towerwall.png -share/taisei/gfx/star.png -share/taisei/gfx/swirl.png -share/taisei/gfx/titletransition.png -share/taisei/gfx/yukkureimu.png -share/taisei/models/ -share/taisei/models/lake.obj -share/taisei/models/mansion.obj -share/taisei/models/skysphere.obj -share/taisei/models/tower.obj -share/taisei/models/towertop.obj -share/taisei/models/towerwall.obj -share/taisei/sfx/ -share/taisei/sfx/charge_generic.wav -share/taisei/sfx/hit.wav -share/taisei/sfx/item_generic.wav -share/taisei/sfx/laser1.wav -share/taisei/sfx/masterspark.wav -share/taisei/sfx/shot_special1.wav -share/taisei/shader/ -share/taisei/shader/alpha_depth.sha -share/taisei/shader/bloom.sha -share/taisei/shader/boss_zoom.sha -share/taisei/shader/bullet_color.sha -share/taisei/shader/ingame_menu.sha -share/taisei/shader/laser_snippets -share/taisei/shader/stagetitle.sha -share/taisei/shader/tower_light.sha -share/taisei/shader/tower_wall.sha -share/taisei/shader/tunnel.sha -share/taisei/shader/zbuf_fog.sha -share/taisei/story.txt @tag update-desktop-database @tag gtk-update-icon-cache %D/share/icons/hicolor +share/taisei/00-taisei.zip +share/taisei/gamecontrollerdb.txt +@tag update-mime-database
