dosbox-staging: install the binary as "dosbox-staging"

[Yorick Hardy <yorickhardy%gmail.com@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Yorick Hardy <yorickhardy%gmail.com@localhost>
Pushed By:	yhardy
Date:		Thu Dec 31 18:42:49 2020 +0200
Changeset:	006a842fbeacb89477651a97e846f599e81dc0ba

Modified Files:
	dosbox-staging/Makefile
	dosbox-staging/PLIST
	dosbox-staging/distinfo
	dosbox-staging/patches/patch-docs_Makefile.am
	dosbox-staging/patches/patch-src_Makefile.am

Log Message:
dosbox-staging: install the binary as "dosbox-staging"

Installing the binary as "dosbox-staging" is consistent with the
package name, and also with dosbox-x. The underscore in "dosbox_staging"
was mainly introduced due to a misunderstanding of how automake
variables work.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=006a842fbeacb89477651a97e846f599e81dc0ba

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 dosbox-staging/Makefile                       | 4 ++--
 dosbox-staging/PLIST                          | 4 ++--
 dosbox-staging/distinfo                       | 4 ++--
 dosbox-staging/patches/patch-docs_Makefile.am | 4 ++--
 dosbox-staging/patches/patch-src_Makefile.am  | 4 ++--
 5 files changed, 10 insertions(+), 10 deletions(-)

diffs:
diff --git a/dosbox-staging/Makefile b/dosbox-staging/Makefile
index 5c1530551e..cfb18905bc 100644
--- a/dosbox-staging/Makefile
+++ b/dosbox-staging/Makefile
@@ -18,10 +18,10 @@ GNU_CONFIGURE=	yes
 USE_LANGUAGES=	c c++
 USE_TOOLS=	aclocal automake autoconf gmake pkg-config
 
-NOT_PAX_MPROTECT_SAFE=	bin/dosbox_staging
+NOT_PAX_MPROTECT_SAFE=	bin/dosbox-staging
 
 pre-configure:
-	${MV} ${WRKSRC}/docs/dosbox.1 ${WRKSRC}/docs/dosbox_staging.1
+	${MV} ${WRKSRC}/docs/dosbox.1 ${WRKSRC}/docs/dosbox-staging.1
 	set -e; cd ${WRKSRC}; \
 	aclocal; autoheader; automake -a --foreign -i; autoconf
 
diff --git a/dosbox-staging/PLIST b/dosbox-staging/PLIST
index 4b2695cf7d..c3fbb8e60c 100644
--- a/dosbox-staging/PLIST
+++ b/dosbox-staging/PLIST
@@ -1,3 +1,3 @@
 @comment $NetBSD$
-bin/dosbox_staging
-man/man1/dosbox_staging.1
+bin/dosbox-staging
+man/man1/dosbox-staging.1
diff --git a/dosbox-staging/distinfo b/dosbox-staging/distinfo
index efa303e43e..fe63d40f4c 100644
--- a/dosbox-staging/distinfo
+++ b/dosbox-staging/distinfo
@@ -4,5 +4,5 @@ SHA1 (dosbox-staging/v0.76.0.tar.gz) = ca64bc6285a7f5d7c88fb23671e3639c23f3ed30
 RMD160 (dosbox-staging/v0.76.0.tar.gz) = 3cc9aa389bc8a906cbf5a899992e9b9364884775
 SHA512 (dosbox-staging/v0.76.0.tar.gz) = 8c0357bcec08cac2cd2b306edd8b51ad05e16a3c3efb1f4c77e1d942f285493cae8aab45f1633e9c168c0b4b45aa289cf3ffc72685dc004d83127cdb6c76ae9d
 Size (dosbox-staging/v0.76.0.tar.gz) = 1908605 bytes
-SHA1 (patch-docs_Makefile.am) = 1a10779a5abf2329359683b5d1bf3da9ac888747
-SHA1 (patch-src_Makefile.am) = ead30d4bcebcafae531d2c3e0bdededa59ae32f2
+SHA1 (patch-docs_Makefile.am) = 89ea60bae98438fb6d86d28ff0ce02949588bae4
+SHA1 (patch-src_Makefile.am) = 369abff7137bb602478c62babca980dac54af876
diff --git a/dosbox-staging/patches/patch-docs_Makefile.am b/dosbox-staging/patches/patch-docs_Makefile.am
index 2e712d0b53..aa3db6d85a 100644
--- a/dosbox-staging/patches/patch-docs_Makefile.am
+++ b/dosbox-staging/patches/patch-docs_Makefile.am
@@ -1,6 +1,6 @@
 $NetBSD$
 
-Install as "dosbox_staging" to avoid a conflict with emulators dosbox.
+Install as "dosbox-staging" to avoid a conflict with emulators/dosbox.
 
 --- docs/Makefile.am.orig	2020-12-03 18:36:19.000000000 +0000
 +++ docs/Makefile.am
@@ -8,7 +8,7 @@ Install as "dosbox_staging" to avoid a conflict with emulators dosbox.
  # Main Makefile for DOSBox
  
 -man_MANS = dosbox.1 
-+man_MANS = dosbox_staging.1 
++man_MANS = dosbox-staging.1 
  EXTRA_DIST = $(man_MANS) README.video PORTING
  
  
diff --git a/dosbox-staging/patches/patch-src_Makefile.am b/dosbox-staging/patches/patch-src_Makefile.am
index 90bec16f86..60318cda54 100644
--- a/dosbox-staging/patches/patch-src_Makefile.am
+++ b/dosbox-staging/patches/patch-src_Makefile.am
@@ -1,6 +1,6 @@
 $NetBSD$
 
-Install as "dosbox_staging" to avoid a conflict with emulators dosbox.
+Install as "dosbox-staging" to avoid a conflict with emulators/dosbox.
 
 --- src/Makefile.am.orig	2020-12-03 18:36:19.000000000 +0000
 +++ src/Makefile.am
@@ -9,7 +9,7 @@ Install as "dosbox_staging" to avoid a conflict with emulators dosbox.
  SUBDIRS = cpu debug dos fpu gui hardware libs ints midi misc shell platform
  
 -bin_PROGRAMS = dosbox
-+bin_PROGRAMS = dosbox_staging
++bin_PROGRAMS = dosbox-staging
  
  if HAVE_WINDRES
  ico_stuff = winres.rc