Update to 5.9.0

7 files changed, 8 insertions, 434 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ee908c479907..e1a9c44e0775 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = crispy-doom
 	pkgdesc = Vanilla-compatible enhanced Doom engine
-	pkgver = 5.8.0
-	pkgrel = 3
+	pkgver = 5.9.0
+	pkgrel = 1
 	url = http://fabiangreffrath.github.io/crispy-doom
 	install = crispy-doom.install
 	arch = i686
@@ -16,18 +16,8 @@ pkgbase = crispy-doom
 	optdepends = freedm: Free deathmatch game
 	optdepends = freedoom1: Free Ultimate Doom-compatible game
 	optdepends = freedoom2: Free Doom II-compatible game
-	source = https://github.com/fabiangreffrath/crispy-doom/archive/crispy-doom-5.8.0.tar.gz
-	source = 0001-fix-sky-in-NRFTL-MAP04-08-if-loaded-from-command-lin.patch
-	source = 0002-allow-HUD-texts-being-printed-up-to-the-right-screen.patch
-	source = 0003-NERVE.wad-Support-for-Vanilla-DOOM-2-586.patch
-	source = 0004-un-name-the-color-translation-enum.patch
-	source = 0005-restrict-game-choice-to-Doom-and-Heretic.patch
-	b2sums = f4495363216fe251566ffda6ff4dff0952661050ebb1221e536ab5a13f792b69ae4eb159f2a89b32843cc796cead43455216ddec8cc2047d44e565f0aaab302b
-	b2sums = b78423efa9402936adf40ac276e86f86742d29b5cafddbbe88937da65fdea9ff1412033a54e367c30886cbc4a433f194309bcabe9028ca9c5afc4573ecd70435
-	b2sums = b3c572f5b433e14e2316e5dd3f2be01fc14974c0ef7b81915664f3a99f8a14af5c14363b9a91820ff08f75466e55ebd82ccd37be2c38f89a0e101acd2cff0ca8
-	b2sums = 0d4c1c39992b3a672830c63a80243e6344fe9c6159c97ae76e647ce563ba2a3ee6e8755f3f54e736693877e2e7ca53fe8bcde5bc09c637fb63a7d6b16020fc6b
-	b2sums = ddc440848fb6e09d6abe54d4025ec5a1c0f8f81f3d7d00d042c900fbc0d452fbec9fa472c66078679cfb2212623a7faf4ce26a7c8fc51ed293e8f84e6a02010e
-	b2sums = cd8d58c38bc2f720b29f54fb61f6222a88f8f15e5b38e887bcdda6303a6b16337468302f32f1e9c1f6248eb09d2f3b5261a10e69000b905fb1d7eef1a6589762
+	source = https://github.com/fabiangreffrath/crispy-doom/archive/crispy-doom-5.9.0.tar.gz
+	b2sums = a97bb7d9bda0c4e984054a0051cadfcaba7c758829bec9e615801bbf91dc1c8063decfedf5b76056cd2fb05e8fcf4113f19c10d72604399b715011d994af3e8b
 
 pkgname = crispy-doom
 
diff --git a/0001-fix-sky-in-NRFTL-MAP04-08-if-loaded-from-command-lin.patch b/0001-fix-sky-in-NRFTL-MAP04-08-if-loaded-from-command-lin.patch
deleted file mode 100644
index ac1eb8ef4d74..000000000000
--- a/0001-fix-sky-in-NRFTL-MAP04-08-if-loaded-from-command-lin.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 9421f1bd61aff3d8254b9eb4bf23f0ad336d5c56 Mon Sep 17 00:00:00 2001
-From: Fabian Greffrath <fabian@greffrath.com>
-Date: Fri, 17 Apr 2020 11:44:39 +0200
-Subject: [PATCH 1/5] fix sky in NRFTL MAP04-08 if loaded from command line
-
-Fixes #585, thanks @Zodomaniac
----
- src/doom/g_game.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/doom/g_game.c b/src/doom/g_game.c
-index df31011e4..2db8f3c82 100644
---- a/src/doom/g_game.c
-+++ b/src/doom/g_game.c
-@@ -819,7 +819,7 @@ void G_DoLoadLevel (void)
- 
-         if (gamemap < 12)
-         {
--            if (gamemission == pack_nerve && gamemap >= 4 && gamemap <= 8)
-+            if ((gameepisode == 2 || gamemission == pack_nerve) && gamemap >= 4 && gamemap <= 8)
-                 skytexturename = "SKY3";
-             else
-             skytexturename = "SKY1";
--- 
-2.26.2
-
diff --git a/0002-allow-HUD-texts-being-printed-up-to-the-right-screen.patch b/0002-allow-HUD-texts-being-printed-up-to-the-right-screen.patch
deleted file mode 100644
index ba8ab5f5bdd2..000000000000
--- a/0002-allow-HUD-texts-being-printed-up-to-the-right-screen.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 3f533a543ed1dc9450ac598b0add11aa0e261d84 Mon Sep 17 00:00:00 2001
-From: Fabian Greffrath <fabian@greffrath.com>
-Date: Fri, 17 Apr 2020 11:48:53 +0200
-Subject: [PATCH 2/5] allow HUD texts being printed up to the right screen edge
- (again)
-
-Thanks Grizzly
----
- src/doom/hu_lib.c | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/src/doom/hu_lib.c b/src/doom/hu_lib.c
-index 1bc557c33..abff9edc1 100644
---- a/src/doom/hu_lib.c
-+++ b/src/doom/hu_lib.c
-@@ -131,7 +131,7 @@ HUlib_drawTextLine
- 	    && c <= '_')
- 	{
- 	    w = SHORT(l->f[c - l->sc]->width);
--	    if (x+w > ORIGWIDTH)
-+	    if (x+w > ORIGWIDTH + WIDESCREENDELTA)
- 		break;
- 	    V_DrawPatchDirect(x, y, l->f[c - l->sc]);
- 	    x += w;
-@@ -139,14 +139,14 @@ HUlib_drawTextLine
- 	else
- 	{
- 	    x += 4;
--	    if (x >= ORIGWIDTH)
-+	    if (x >= ORIGWIDTH + WIDESCREENDELTA)
- 		break;
- 	}
-     }
- 
-     // draw the cursor if requested
-     if (drawcursor
--	&& x + SHORT(l->f['_' - l->sc]->width) <= ORIGWIDTH)
-+	&& x + SHORT(l->f['_' - l->sc]->width) <= ORIGWIDTH + WIDESCREENDELTA)
-     {
- 	V_DrawPatchDirect(x, y, l->f['_' - l->sc]);
-     }
--- 
-2.26.2
-
diff --git a/0003-NERVE.wad-Support-for-Vanilla-DOOM-2-586.patch b/0003-NERVE.wad-Support-for-Vanilla-DOOM-2-586.patch
deleted file mode 100644
index a814360f10c1..000000000000
--- a/0003-NERVE.wad-Support-for-Vanilla-DOOM-2-586.patch
+++ /dev/null
@@ -1,285 +0,0 @@
-From fc08e1089a5d04c21266a67fc46e4e30d3333685 Mon Sep 17 00:00:00 2001
-From: Fabian Greffrath <fabian@greffrath.com>
-Date: Fri, 17 Apr 2020 13:12:33 +0200
-Subject: [PATCH 3/5] NERVE.wad Support for Vanilla DOOM 2 (#586)
-
-Fixes #582, thanks @hkight
----
- src/doom/d_main.c |  23 +++++-----
- src/doom/m_menu.c | 111 ++++++++++++++++++++++------------------------
- 2 files changed, 65 insertions(+), 69 deletions(-)
-
-diff --git a/src/doom/d_main.c b/src/doom/d_main.c
-index f3cbd9610..681d52311 100644
---- a/src/doom/d_main.c
-+++ b/src/doom/d_main.c
-@@ -1486,7 +1486,7 @@ static void LoadSigilWad(void)
- // [crispy] support loading NERVE.WAD alongside DOOM2.WAD
- static void LoadNerveWad(void)
- {
--    int i, j, k;
-+    int i, j;
- 
-     if (gamemission != doom2)
-         return;
-@@ -1500,16 +1500,6 @@ static void LoadNerveWad(void)
- 	DEH_AddStringReplacement ("TITLEPIC", "INTERPIC");
-     }
-     else
--    // [crispy] The "New Game -> Which Expansion" menu is only shown if the
--    // menu graphics lumps are available and (a) if they are from the IWAD
--    // and that is the BFG Edition DOOM2.WAD or (b) if they are from a PWAD.
--    if ((i = W_CheckNumForName("M_EPI1")) != -1 &&
--        (j = W_CheckNumForName("M_EPI2")) != -1 &&
--        (k = W_CheckNumForName("M_EPISOD")) != -1 &&
--        (gamevariant == bfgedition ||
--        (!W_IsIWADLump(lumpinfo[i]) &&
--         !W_IsIWADLump(lumpinfo[j]) &&
--         !W_IsIWADLump(lumpinfo[k]))))
-     {
-         if (strrchr(iwadfile, DIR_SEPARATOR) != NULL)
-         {
-@@ -1546,6 +1536,17 @@ static void LoadNerveWad(void)
-             lumpinfo[W_GetNumForName(lumpname)]->name[0] = 'N';
-         }
- 
-+        // [crispy] The "New Game -> Which Expansion" menu is only shown if the
-+        // menu graphics lumps are available and (a) if they are from the IWAD
-+        // and that is the BFG Edition DOOM2.WAD or (b) if they are from a PWAD.
-+        if (gamevariant != bfgedition)
-+        {
-+            if ((i = W_CheckNumForName("M_EPI1")) != -1 && W_IsIWADLump(lumpinfo[i]))
-+                lumpinfo[i]->name[0] = 'X';
-+            if ((i = W_CheckNumForName("M_EPI2")) != -1 && W_IsIWADLump(lumpinfo[i]))
-+                lumpinfo[i]->name[0] = 'X';
-+        }
-+
-         // [crispy] regenerate the hashtable
-         W_GenerateHashTable();
-     }
-diff --git a/src/doom/m_menu.c b/src/doom/m_menu.c
-index 281536e8a..9847a1553 100644
---- a/src/doom/m_menu.c
-+++ b/src/doom/m_menu.c
-@@ -160,7 +160,7 @@ typedef struct
-     
-     // hotkey in menu
-     char	alphaKey;			
--    char	*alttext; // [crispy] alternative text for the Options menu
-+    char	*alttext; // [crispy] alternative text for menu items
- } menuitem_t;
- 
- 
-@@ -174,6 +174,7 @@ typedef struct menu_s
-     short		x;
-     short		y;		// x,y of menu
-     short		lastOn;		// last item user was on in menu
-+    short		lumps_missing;	// [crispy] indicate missing menu graphics lumps
- } menu_t;
- 
- short		itemOn;			// menu item skull is on
-@@ -192,7 +193,6 @@ menu_t*	currentMenu;
- //
- static void M_NewGame(int choice);
- static void M_Episode(int choice);
--static void M_Expansion(int choice); // [crispy] NRFTL
- static void M_ChooseSkill(int choice);
- static void M_LoadGame(int choice);
- static void M_SaveGame(int choice);
-@@ -320,32 +320,6 @@ menu_t  EpiDef =
-     ep1			// lastOn
- };
- 
--//
--// EXPANSION SELECT
--//
--enum
--{
--    ex1,
--    ex2,
--    ex_end
--} expansions_e;
--
--static menuitem_t ExpansionMenu[]=
--{
--    {1,"M_EPI1", M_Expansion,'h'},
--    {1,"M_EPI2", M_Expansion,'n'},
--};
--
--static menu_t  ExpDef =
--{
--    ex_end,		// # of menu items
--    &MainDef,		// previous menu
--    ExpansionMenu,	// menuitem_t ->
--    M_DrawEpisode,	// drawing routine ->
--    48,63,              // x,y
--    ex1			// lastOn
--};
--
- //
- // NEW GAME
- //
-@@ -1290,10 +1264,7 @@ void M_NewGame(int choice)
- 	
-     // Chex Quest disabled the episode select screen, as did Doom II.
- 
--    if (nervewadfile)
--	M_SetupNextMenu(&ExpDef);
--    else
--    if (gamemode == commercial || gameversion == exe_chex)
-+    if ((gamemode == commercial && !nervewadfile) || gameversion == exe_chex) // [crispy] NRFTL
- 	M_SetupNextMenu(&NewDef);
-     else
- 	M_SetupNextMenu(&EpiDef);
-@@ -1345,47 +1316,52 @@ void M_Episode(int choice)
-     M_SetupNextMenu(&NewDef);
- }
- 
--static void M_Expansion(int choice)
--{
--    epi = choice;
--    M_SetupNextMenu(&NewDef);
--}
- 
- 
- //
- // M_Options
- //
--// [crispy] no patches are drawn in the Options menu anymore
--/*
- static const char *detailNames[2] = {"M_GDHIGH","M_GDLOW"};
- static const char *msgNames[2] = {"M_MSGOFF","M_MSGON"};
--*/
- 
- void M_DrawOptions(void)
- {
-     V_DrawPatchDirect(108, 15, W_CacheLumpName(DEH_String("M_OPTTTL"),
-                                                PU_CACHE));
- 	
--// [crispy] no patches are drawn in the Options menu anymore
--/*
-+    if (OptionsDef.lumps_missing == -1)
-+    {
-     V_DrawPatchDirect(OptionsDef.x + 175, OptionsDef.y + LINEHEIGHT * detail,
- 		      W_CacheLumpName(DEH_String(detailNames[detailLevel]),
- 			              PU_CACHE));
--*/
--
-+    }
-+    else
-+    if (OptionsDef.lumps_missing > 0)
-+    {
-     M_WriteText(OptionsDef.x + M_StringWidth("Graphic Detail: "),
-                 OptionsDef.y + LINEHEIGHT * detail + 8 - (M_StringHeight("HighLow")/2),
-                 detailLevel ? "Low" : "High");
-+    }
- 
--// [crispy] no patches are drawn in the Options menu anymore
--/*
-+    if (OptionsDef.lumps_missing == -1)
-+    {
-     V_DrawPatchDirect(OptionsDef.x + 120, OptionsDef.y + LINEHEIGHT * messages,
-                       W_CacheLumpName(DEH_String(msgNames[showMessages]),
-                                       PU_CACHE));
--*/
-+    }
-+    else
-+    if (OptionsDef.lumps_missing > 0)
-+    {
-     M_WriteText(OptionsDef.x + M_StringWidth("Messages: "),
-                 OptionsDef.y + LINEHEIGHT * messages + 8 - (M_StringHeight("OnOff")/2),
-                 showMessages ? "On" : "Off");
-+    }
-+
-+// [crispy] mouse sensitivity menu
-+/*
-+    M_DrawThermo(OptionsDef.x, OptionsDef.y + LINEHEIGHT * (mousesens + 1),
-+		 10, mouseSensitivity);
-+*/
- 
-     M_DrawThermo(OptionsDef.x,OptionsDef.y+LINEHEIGHT*(scrnsize+1),
- 		 9 + (crispy->widescreen ? 6 : 3),screenSize); // [crispy] Crispy HUD
-@@ -1765,7 +1741,6 @@ void M_QuitResponse(int key)
- 
-     if (key != key_menu_confirm)
- 	return;
--
-     // [crispy] play quit sound only if the ENDOOM screen is also shown
-     if (!netgame && show_endoom)
-     {
-@@ -2980,11 +2955,25 @@ void M_Drawer (void)
-     y = currentMenu->y;
-     max = currentMenu->numitems;
- 
-+    // [crispy] check current menu for missing menu graphics lumps - only once
-+    if (currentMenu->lumps_missing == 0)
-+    {
-+        for (i = 0; i < max; i++)
-+            if (currentMenu->menuitems[i].name[0])
-+                if (W_CheckNumForName(currentMenu->menuitems[i].name) < 0)
-+                    currentMenu->lumps_missing++;
-+
-+        // [crispy] no lump missing, no need to check again
-+        if (currentMenu->lumps_missing == 0)
-+            currentMenu->lumps_missing = -1;
-+    }
-+
-     for (i=0;i<max;i++)
-     {
-+        char *alttext = currentMenu->menuitems[i].alttext;
-         name = DEH_String(currentMenu->menuitems[i].name);
- 
--	if (name[0]) // && W_CheckNumForName(name) > 0) // [crispy] moved...
-+	if (name[0] && (W_CheckNumForName(name) > 0 || alttext))
- 	{
- 	    // [crispy] shade unavailable menu items
- 	    if ((currentMenu == &MainDef && i == savegame && (!usergame || gamestate != GS_LEVEL)) ||
-@@ -2993,15 +2982,10 @@ void M_Drawer (void)
- 	        (currentMenu == &MainDef && i == newgame && (demorecording || (netgame && !demoplayback))))
- 	        dp_translation = cr[CR_DARK];
- 
--	    if (currentMenu == &OptionsDef)
--	    {
--		char *alttext = currentMenu->menuitems[i].alttext;
--
--		if (alttext)
--		    M_WriteText(x, y+8-(M_StringHeight(alttext)/2), alttext);
--	    }
--	    else if (W_CheckNumForName(name) > 0) // [crispy] ...here
-+	    if (W_CheckNumForName(name) > 0 && currentMenu->lumps_missing == -1)
- 	    V_DrawPatchDirect (x, y, W_CacheLumpName(name, PU_CACHE));
-+	    else if (alttext)
-+		M_WriteText(x, y+8-(M_StringHeight(alttext)/2), alttext);
- 
- 	    dp_translation = NULL;
- 	}
-@@ -3104,7 +3088,7 @@ void M_Init (void)
-         MainMenu[readthis] = MainMenu[quitdoom];
-         MainDef.numitems--;
-         MainDef.y += 8;
--        NewDef.prevMenu = nervewadfile ? &ExpDef : &MainDef;
-+        NewDef.prevMenu = &MainDef;
-         ReadDef1.routine = M_DrawReadThisCommercial;
-         ReadDef1.x = 330;
-         ReadDef1.y = 165;
-@@ -3133,6 +3117,17 @@ void M_Init (void)
-         NewDef.prevMenu = &MainDef;
-     }
- 
-+    // [crispy] NRFTL
-+    if (nervewadfile)
-+    {
-+        NewDef.prevMenu = &EpiDef;
-+        EpiDef.numitems = 2;
-+        EpisodeMenu[0].alphaKey = 'h';
-+        EpisodeMenu[0].alttext = "Hell on Earth";
-+        EpisodeMenu[1].alphaKey = 'n';
-+        EpisodeMenu[1].alttext = "No Rest for the Living";
-+    }
-+
-     // [crispy] rearrange Load Game and Save Game menus
-     {
- 	const patch_t *patchl, *patchs, *patchm;
--- 
-2.26.2
-
diff --git a/0004-un-name-the-color-translation-enum.patch b/0004-un-name-the-color-translation-enum.patch
deleted file mode 100644
index 611ad18e4802..000000000000
--- a/0004-un-name-the-color-translation-enum.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From c6c5b7aceb19af4686d3394b59ca2c8f89ee2d96 Mon Sep 17 00:00:00 2001
-From: Fabian Greffrath <fabian@greffrath.com>
-Date: Fri, 17 Apr 2020 14:03:06 +0200
-Subject: [PATCH 4/5] un-name the color translation enum{}
-
----
- src/v_trans.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/v_trans.h b/src/v_trans.h
-index 7810a53a7..95138a05e 100644
---- a/src/v_trans.h
-+++ b/src/v_trans.h
-@@ -47,7 +47,7 @@ enum
-     CR_RED2BLUE,
-     CR_RED2GREEN,
-     CRMAX
--} cr_t;
-+};
- 
- #define CR_GREY CR_GRAY
- 
--- 
-2.26.2
-
diff --git a/0005-restrict-game-choice-to-Doom-and-Heretic.patch b/0005-restrict-game-choice-to-Doom-and-Heretic.patch
deleted file mode 100644
index fdc9142ed03c..000000000000
--- a/0005-restrict-game-choice-to-Doom-and-Heretic.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 774ea8cf96834188dc2d86433514fd12a14f11d9 Mon Sep 17 00:00:00 2001
-From: Fabian Greffrath <fabian@greffrath.com>
-Date: Mon, 20 Apr 2020 09:19:54 +0200
-Subject: [PATCH 5/5] restrict game choice to Doom and Heretic
-
-in the setup menu, at least for now.
----
- src/setup/mode.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/setup/mode.c b/src/setup/mode.c
-index c663e85e6..c30b2b0e1 100644
---- a/src/setup/mode.c
-+++ b/src/setup/mode.c
-@@ -293,7 +293,7 @@ static void OpenGameSelectDialog(GameSelectCallback callback)
-         // Do we have any IWADs for this game installed?
-         // If so, add a button.
- 
--        iwads = D_FindAllIWADs(mission_configs[i].mask);
-+        iwads = D_FindAllIWADs(mission_configs[i].mask & (IWAD_MASK_DOOM|IWAD_MASK_HERETIC)); // [crispy] restrict game choice to Doom and Heretic
- 
-         if (iwads[0] != NULL)
-         {
--- 
-2.26.2
-
diff --git a/PKGBUILD b/PKGBUILD
index 5e3630455e1f..a65ce617f256 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,8 +2,8 @@
 
 pkgname=crispy-doom
 pkgdesc="Vanilla-compatible enhanced Doom engine"
-pkgver=5.8.0
-pkgrel=3
+pkgver=5.9.0
+pkgrel=1
 arch=('i686' 'x86_64')
 url="http://fabiangreffrath.github.io/crispy-doom"
 license=('GPL2')
@@ -13,18 +13,8 @@ optdepends=('freedm: Free deathmatch game'
             'freedoom1: Free Ultimate Doom-compatible game'
             'freedoom2: Free Doom II-compatible game')
 install=crispy-doom.install
-source=(https://github.com/fabiangreffrath/$pkgname/archive/$pkgname-$pkgver.tar.gz
-        0001-fix-sky-in-NRFTL-MAP04-08-if-loaded-from-command-lin.patch
-        0002-allow-HUD-texts-being-printed-up-to-the-right-screen.patch
-        0003-NERVE.wad-Support-for-Vanilla-DOOM-2-586.patch
-        0004-un-name-the-color-translation-enum.patch
-        0005-restrict-game-choice-to-Doom-and-Heretic.patch)
-b2sums=('f4495363216fe251566ffda6ff4dff0952661050ebb1221e536ab5a13f792b69ae4eb159f2a89b32843cc796cead43455216ddec8cc2047d44e565f0aaab302b'
-        'b78423efa9402936adf40ac276e86f86742d29b5cafddbbe88937da65fdea9ff1412033a54e367c30886cbc4a433f194309bcabe9028ca9c5afc4573ecd70435'
-        'b3c572f5b433e14e2316e5dd3f2be01fc14974c0ef7b81915664f3a99f8a14af5c14363b9a91820ff08f75466e55ebd82ccd37be2c38f89a0e101acd2cff0ca8'
-        '0d4c1c39992b3a672830c63a80243e6344fe9c6159c97ae76e647ce563ba2a3ee6e8755f3f54e736693877e2e7ca53fe8bcde5bc09c637fb63a7d6b16020fc6b'
-        'ddc440848fb6e09d6abe54d4025ec5a1c0f8f81f3d7d00d042c900fbc0d452fbec9fa472c66078679cfb2212623a7faf4ce26a7c8fc51ed293e8f84e6a02010e'
-        'cd8d58c38bc2f720b29f54fb61f6222a88f8f15e5b38e887bcdda6303a6b16337468302f32f1e9c1f6248eb09d2f3b5261a10e69000b905fb1d7eef1a6589762')
+source=(https://github.com/fabiangreffrath/$pkgname/archive/$pkgname-$pkgver.tar.gz)
+b2sums=('a97bb7d9bda0c4e984054a0051cadfcaba7c758829bec9e615801bbf91dc1c8063decfedf5b76056cd2fb05e8fcf4113f19c10d72604399b715011d994af3e8b')
 
 prepare() {
   cd "$pkgname-$pkgname-$pkgver"