From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 891BB138351 for ; Tue, 28 Apr 2020 22:55:32 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 97053E094F; Tue, 28 Apr 2020 22:55:31 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 731BDE094F for ; Tue, 28 Apr 2020 22:55:31 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E4B2534EFA4 for ; Tue, 28 Apr 2020 22:55:29 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 77C971FB for ; Tue, 28 Apr 2020 22:55:28 +0000 (UTC) From: "James Le Cuirot" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "James Le Cuirot" Message-ID: <1588114506.6c3a76a2952c7aa6bdb0dccf7dcd13e3a4faf1b7.chewi@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: games-emulation/advancemame/files/, games-emulation/advancemame/ X-VCS-Repository: repo/gentoo X-VCS-Files: games-emulation/advancemame/advancemame-3.9.ebuild games-emulation/advancemame/files/advancemame-3.9-DESTDIR.patch games-emulation/advancemame/files/advancemame-3.9-FHS.patch games-emulation/advancemame/files/advancemame-3.9-blank-flags.patch X-VCS-Directories: games-emulation/advancemame/ games-emulation/advancemame/files/ X-VCS-Committer: chewi X-VCS-Committer-Name: James Le Cuirot X-VCS-Revision: 6c3a76a2952c7aa6bdb0dccf7dcd13e3a4faf1b7 X-VCS-Branch: master Date: Tue, 28 Apr 2020 22:55:28 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 32ecc9dc-f9e1-4158-8f08-e5812cc5d2f6 X-Archives-Hash: 0362f68d651c38e0dd2ea9db30b8879d commit: 6c3a76a2952c7aa6bdb0dccf7dcd13e3a4faf1b7 Author: James Le Cuirot gentoo org> AuthorDate: Tue Apr 28 22:48:40 2020 +0000 Commit: James Le Cuirot gentoo org> CommitDate: Tue Apr 28 22:55:06 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6c3a76a2 games-emulation/advancemame: Fix autover.sh error, improve src_install The nasty src_install hasn't changed much since 2004 so I've sent some long overdue patches upstream to make things better going forwards. Package-Manager: Portage-2.3.99, Repoman-2.3.22 Signed-off-by: James Le Cuirot gentoo.org> games-emulation/advancemame/advancemame-3.9.ebuild | 36 +--- .../files/advancemame-3.9-DESTDIR.patch | 196 +++++++++++++++++++ .../advancemame/files/advancemame-3.9-FHS.patch | 212 +++++++++++++++++++++ .../files/advancemame-3.9-blank-flags.patch | 32 ++++ 4 files changed, 450 insertions(+), 26 deletions(-) diff --git a/games-emulation/advancemame/advancemame-3.9.ebuild b/games-emulation/advancemame/advancemame-3.9.ebuild index 0c69669f9ac..a0c04dabff6 100644 --- a/games-emulation/advancemame/advancemame-3.9.ebuild +++ b/games-emulation/advancemame/advancemame-3.9.ebuild @@ -2,6 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=7 + inherit autotools flag-o-matic DESCRIPTION="GNU/Linux port of the MAME emulator with GUI menu" @@ -13,7 +14,6 @@ SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="alsa fbcon ncurses oss slang truetype" -# sdl is required (bug #158417) DEPEND=" dev-libs/expat media-libs/libsdl2[video] @@ -39,6 +39,9 @@ PATCHES=( # Patches from upstream "${FILESDIR}"/${P}-pkgconfig_for_ncurses_and_slang.patch + "${FILESDIR}"/${P}-blank-flags.patch + "${FILESDIR}"/${P}-DESTDIR.patch + "${FILESDIR}"/${P}-FHS.patch ) src_prepare() { @@ -48,14 +51,11 @@ src_prepare() { sed -i -e 's/AC_CHECK_CC_OPT/AX_CHECK_COMPILE_FLAG/' configure.ac || die eautoreconf - sed -i -e 's/"-s"//' configure || die } src_configure() { # Fix for bug #78030 - if use ppc; then - append-ldflags "-Wl,--relax" - fi + use ppc && append-ldflags "-Wl,--relax" ac_cv_prog_ASM=nasm \ econf \ @@ -75,28 +75,12 @@ src_configure() { } src_compile() { - STRIPPROG=true emake + emake \ + VERSION="${PV}" } src_install() { - local f - - for f in adv* ; do - if [[ -L "${f}" ]] ; then - dobin "${f}" - fi - done - - insinto "/usr/share/advance" - doins support/event.dat - keepdir "/usr/share/advance/"{artwork,diff,image,rom,sample,snap} - - dodoc HISTORY README RELEASE - cd doc - dodoc *.txt - HTMLDOCS="*.html" einstalldocs - - for f in *.1 ; do - newman ${f} ${f/1/6} - done + emake install \ + VERSION="${PV}" \ + DESTDIR="${D}" } diff --git a/games-emulation/advancemame/files/advancemame-3.9-DESTDIR.patch b/games-emulation/advancemame/files/advancemame-3.9-DESTDIR.patch new file mode 100644 index 00000000000..755f8b45188 --- /dev/null +++ b/games-emulation/advancemame/files/advancemame-3.9-DESTDIR.patch @@ -0,0 +1,196 @@ +From fca370c9f7a6dcb0a3625cc15f6d0a80182dd4b3 Mon Sep 17 00:00:00 2001 +From: James Le Cuirot +Date: Sat, 25 Apr 2020 10:56:27 +0100 +Subject: [PATCH] Support make install DESTDIR=/foo just like Automake does + +Distributions really need this. +--- + advance/advance.mak | 94 ++++++++++++++++++++++----------------------- + 1 file changed, 47 insertions(+), 47 deletions(-) + +diff --git a/advance/advance.mak b/advance/advance.mak +index 6c4d89c..100dd23 100644 +--- a/advance/advance.mak ++++ b/advance/advance.mak +@@ -376,131 +376,131 @@ pkgdir = $(datadir)/advance + pkgdocdir = $(docdir)/advance + + install-dirs: +- -$(INSTALL_PROGRAM_DIR) $(bindir) +- -$(INSTALL_DATA_DIR) $(pkgdir) +- -$(INSTALL_DATA_DIR) $(pkgdocdir) +- -$(INSTALL_MAN_DIR) $(mandir)/man1 +- -$(INSTALL_DATA_DIR) $(pkgdir)/rom +- -$(INSTALL_DATA_DIR) $(pkgdir)/sample +- -$(INSTALL_DATA_DIR) $(pkgdir)/artwork +- -$(INSTALL_DATA_DIR) $(pkgdir)/image +- -$(INSTALL_DATA_DIR) $(pkgdir)/image/ti99_4a +- -$(INSTALL_DATA_DIR) $(pkgdir)/crc +- -$(INSTALL_DATA_DIR) $(pkgdir)/snap +- -$(INSTALL_DATA_DIR) $(pkgdir)/snap/ti99_4a ++ -$(INSTALL_PROGRAM_DIR) $(DESTDIR)$(bindir) ++ -$(INSTALL_DATA_DIR) $(DESTDIR)$(pkgdir) ++ -$(INSTALL_DATA_DIR) $(DESTDIR)$(pkgdocdir) ++ -$(INSTALL_MAN_DIR) $(DESTDIR)$(mandir)/man1 ++ -$(INSTALL_DATA_DIR) $(DESTDIR)$(pkgdir)/rom ++ -$(INSTALL_DATA_DIR) $(DESTDIR)$(pkgdir)/sample ++ -$(INSTALL_DATA_DIR) $(DESTDIR)$(pkgdir)/artwork ++ -$(INSTALL_DATA_DIR) $(DESTDIR)$(pkgdir)/image ++ -$(INSTALL_DATA_DIR) $(DESTDIR)$(pkgdir)/image/ti99_4a ++ -$(INSTALL_DATA_DIR) $(DESTDIR)$(pkgdir)/crc ++ -$(INSTALL_DATA_DIR) $(DESTDIR)$(pkgdir)/snap ++ -$(INSTALL_DATA_DIR) $(DESTDIR)$(pkgdir)/snap/ti99_4a + + install-data: $(INSTALL_DATAFILES) $(INSTALL_ROMFILES) $(INSTALL_IMAGEFILES_TI99_4A) $(INSTALL_SAMPLEFILES) $(INSTALL_SNAPFILES) $(INSTALL_SNAPFILES_TI99_4A) + ifdef INSTALL_DATAFILES + @for i in $(INSTALL_DATAFILES); do \ +- echo "$(INSTALL_DATA) $$i $(pkgdir)"; \ +- $(INSTALL_DATA) $$i $(pkgdir); \ ++ echo "$(INSTALL_DATA) $$i $(DESTDIR)$(pkgdir)"; \ ++ $(INSTALL_DATA) $$i $(DESTDIR)$(pkgdir); \ + done + endif + ifdef INSTALL_ROMFILES + @for i in $(INSTALL_ROMFILES); do \ +- echo "$(INSTALL_DATA) $$i $(pkgdir)/rom"; \ +- $(INSTALL_DATA) $$i $(pkgdir)/rom; \ ++ echo "$(INSTALL_DATA) $$i $(DESTDIR)$(pkgdir)/rom"; \ ++ $(INSTALL_DATA) $$i $(DESTDIR)$(pkgdir)/rom; \ + done + endif + ifdef INSTALL_IMAGEFILES_TI99_4A + @for i in $(INSTALL_IMAGEFILES_TI99_4A); do \ +- echo "$(INSTALL_DATA) $$i $(pkgdir)/image/ti99_4a"; \ +- $(INSTALL_DATA) $$i $(pkgdir)/image/ti99_4a; \ ++ echo "$(INSTALL_DATA) $$i $(DESTDIR)$(pkgdir)/image/ti99_4a"; \ ++ $(INSTALL_DATA) $$i $(DESTDIR)$(pkgdir)/image/ti99_4a; \ + done + endif + ifdef INSTALL_SAMPLEFILES + @for i in $(INSTALL_SAMPLEFILES); do \ +- echo "$(INSTALL_DATA) $$i $(pkgdir)/sample"; \ +- $(INSTALL_DATA) $$i $(pkgdir)/sample; \ ++ echo "$(INSTALL_DATA) $$i $(DESTDIR)$(pkgdir)/sample"; \ ++ $(INSTALL_DATA) $$i $(DESTDIR)$(pkgdir)/sample; \ + done + endif + ifdef INSTALL_SNAPFILES + @for i in $(INSTALL_SNAPFILES); do \ +- echo "$(INSTALL_DATA) $$i $(pkgdir)/snap"; \ +- $(INSTALL_DATA) $$i $(pkgdir)/snap; \ ++ echo "$(INSTALL_DATA) $$i $(DESTDIR)$(pkgdir)/snap"; \ ++ $(INSTALL_DATA) $$i $(DESTDIR)$(pkgdir)/snap; \ + done + endif + ifdef INSTALL_SNAPFILES_TI99_4A + @for i in $(INSTALL_SNAPFILES_TI99_4A); do \ +- echo "$(INSTALL_DATA) $$i $(pkgdir)/snap/ti99_4a"; \ +- $(INSTALL_DATA) $$i $(pkgdir)/snap/ti99_4a; \ ++ echo "$(INSTALL_DATA) $$i $(DESTDIR)$(pkgdir)/snap/ti99_4a"; \ ++ $(INSTALL_DATA) $$i $(DESTDIR)$(pkgdir)/snap/ti99_4a; \ + done + endif + + uninstall-data: + ifdef INSTALL_DATAFILES + @for i in $(notdir $(INSTALL_DATAFILES)); do \ +- rm -f $(pkgdir)/$$i; \ ++ rm -f $(DESTDIR)$(pkgdir)/$$i; \ + done + endif + ifdef INSTALL_ROMFILES + @for i in $(notdir $(INSTALL_ROMFILES)); do \ +- rm -f $(pkgdir)/rom/$$i; \ ++ rm -f $(DESTDIR)$(pkgdir)/rom/$$i; \ + done + endif + ifdef INSTALL_SAMPLEFILES + @for i in $(notdir $(INSTALL_SAMPLEFILES)); do \ +- rm -f $(pkgdir)/sample/$$i; \ ++ rm -f $(DESTDIR)$(pkgdir)/sample/$$i; \ + done + endif + ifdef INSTALL_SNAPFILES + @for i in $(notdir $(INSTALL_SNAPFILES)); do \ +- rm -f $(pkgdir)/snap/$$i; \ ++ rm -f $(DESTDIR)$(pkgdir)/snap/$$i; \ + done + endif + + install-bin: $(INSTALL_BINFILES) + @for i in $(INSTALL_BINFILES); do \ +- echo "$(INSTALL_PROGRAM) $$i $(bindir)"; \ +- $(INSTALL_PROGRAM) $$i $(bindir); \ ++ echo "$(INSTALL_PROGRAM) $$i $(DESTDIR)$(bindir)"; \ ++ $(INSTALL_PROGRAM) $$i $(DESTDIR)$(bindir); \ + done + + uninstall-bin: + @for i in $(notdir $(INSTALL_BINFILES)); do \ +- rm -f $(bindir)/$$i; \ ++ rm -f $(DESTDIR)$(bindir)/$$i; \ + done + + install-doc: $(INSTALL_DOCFILES) + ifdef INSTALL_DOCFILES + @for i in $(INSTALL_DOCFILES); do \ +- echo "$(INSTALL_DATA) $$i $(pkgdocdir)"; \ +- $(INSTALL_DATA) $$i $(pkgdocdir); \ ++ echo "$(INSTALL_DATA) $$i $(DESTDIR)$(pkgdocdir)"; \ ++ $(INSTALL_DATA) $$i $(DESTDIR)$(pkgdocdir); \ + done + endif + + uninstall-doc: + ifdef INSTALL_DOCFILES + @for i in $(notdir $(INSTALL_DOCFILES)); do \ +- rm -f $(pkgdocdir)/$$i; \ ++ rm -f $(DESTDIR)$(pkgdocdir)/$$i; \ + done + endif + + install-man: $(INSTALL_MANFILES) + ifdef INSTALL_MANFILES + @for i in $(INSTALL_MANFILES); do \ +- echo "$(INSTALL_DATA) $$i $(mandir)/man1"; \ +- $(INSTALL_DATA) $$i $(mandir)/man1; \ ++ echo "$(INSTALL_DATA) $$i $(DESTDIR)$(mandir)/man1"; \ ++ $(INSTALL_DATA) $$i $(DESTDIR)$(mandir)/man1; \ + done + endif + + uninstall-man: + ifdef INSTALL_MANFILES + @for i in $(notdir $(INSTALL_MANFILES)); do \ +- rm -f $(mandir)/man1/$$i; \ ++ rm -f $(DESTDIR)$(mandir)/man1/$$i; \ + done + endif + + uninstall-dirs: +- -rmdir $(pkgdir)/rom +- -rmdir $(pkgdir)/sample +- -rmdir $(pkgdir)/artwork +- -rmdir $(pkgdir)/image/ti99_4a +- -rmdir $(pkgdir)/image +- -rmdir $(pkgdir)/crc +- -rmdir $(pkgdir)/snap/ti99_4a +- -rmdir $(pkgdir)/snap +- -rmdir $(pkgdir) +- -rmdir $(pkgdocdir) ++ -rmdir $(DESTDIR)$(pkgdir)/rom ++ -rmdir $(DESTDIR)$(pkgdir)/sample ++ -rmdir $(DESTDIR)$(pkgdir)/artwork ++ -rmdir $(DESTDIR)$(pkgdir)/image/ti99_4a ++ -rmdir $(DESTDIR)$(pkgdir)/image ++ -rmdir $(DESTDIR)$(pkgdir)/crc ++ -rmdir $(DESTDIR)$(pkgdir)/snap/ti99_4a ++ -rmdir $(DESTDIR)$(pkgdir)/snap ++ -rmdir $(DESTDIR)$(pkgdir) ++ -rmdir $(DESTDIR)$(pkgdocdir) + + install: install-dirs install-bin install-data install-doc install-man + +-- +2.26.0 + diff --git a/games-emulation/advancemame/files/advancemame-3.9-FHS.patch b/games-emulation/advancemame/files/advancemame-3.9-FHS.patch new file mode 100644 index 00000000000..312e895b8fd --- /dev/null +++ b/games-emulation/advancemame/files/advancemame-3.9-FHS.patch @@ -0,0 +1,212 @@ +From 6d8c1dc720b09fb9c6ff6edb273ad2a2ea31d768 Mon Sep 17 00:00:00 2001 +From: James Le Cuirot +Date: Sat, 25 Apr 2020 11:16:01 +0100 +Subject: [PATCH 1/2] Use /usr/share/man and /usr/share/doc and not /usr/man + and /usr/doc + +This has been mandated by the Filesystem Hierarchy Standard since 2.0 +in 1997. Autoconf actually does the right thing by default. +--- + Makefile.usr | 4 ++-- + advance/advance.mak | 11 +++++------ + configure.ac | 2 -- + 3 files changed, 7 insertions(+), 10 deletions(-) + +diff --git a/Makefile.usr b/Makefile.usr +index 4519857..74a4d53 100644 +--- a/Makefile.usr ++++ b/Makefile.usr +@@ -238,8 +238,8 @@ srcdir=. + datadir=${prefix}/share + sysconfdir=${prefix}/etc + bindir=${prefix}/bin +-mandir=${prefix}/man +-docdir=${prefix}/share/doc ++mandir=${datadir}/man ++docdir=${datadir}/doc/advancemame + + ############################################################################# + # Extra configuration common for ./configure and manual +diff --git a/advance/advance.mak b/advance/advance.mak +index 100dd23..8cd0444 100644 +--- a/advance/advance.mak ++++ b/advance/advance.mak +@@ -373,12 +373,11 @@ CONF_SRC = \ + # Install + + pkgdir = $(datadir)/advance +-pkgdocdir = $(docdir)/advance + + install-dirs: + -$(INSTALL_PROGRAM_DIR) $(DESTDIR)$(bindir) + -$(INSTALL_DATA_DIR) $(DESTDIR)$(pkgdir) +- -$(INSTALL_DATA_DIR) $(DESTDIR)$(pkgdocdir) ++ -$(INSTALL_DATA_DIR) $(DESTDIR)$(docdir) + -$(INSTALL_MAN_DIR) $(DESTDIR)$(mandir)/man1 + -$(INSTALL_DATA_DIR) $(DESTDIR)$(pkgdir)/rom + -$(INSTALL_DATA_DIR) $(DESTDIR)$(pkgdir)/sample +@@ -463,15 +462,15 @@ uninstall-bin: + install-doc: $(INSTALL_DOCFILES) + ifdef INSTALL_DOCFILES + @for i in $(INSTALL_DOCFILES); do \ +- echo "$(INSTALL_DATA) $$i $(DESTDIR)$(pkgdocdir)"; \ +- $(INSTALL_DATA) $$i $(DESTDIR)$(pkgdocdir); \ ++ echo "$(INSTALL_DATA) $$i $(DESTDIR)$(docdir)"; \ ++ $(INSTALL_DATA) $$i $(DESTDIR)$(docdir); \ + done + endif + + uninstall-doc: + ifdef INSTALL_DOCFILES + @for i in $(notdir $(INSTALL_DOCFILES)); do \ +- rm -f $(DESTDIR)$(pkgdocdir)/$$i; \ ++ rm -f $(DESTDIR)$(docdir)/$$i; \ + done + endif + +@@ -500,7 +499,7 @@ uninstall-dirs: + -rmdir $(DESTDIR)$(pkgdir)/snap/ti99_4a + -rmdir $(DESTDIR)$(pkgdir)/snap + -rmdir $(DESTDIR)$(pkgdir) +- -rmdir $(DESTDIR)$(pkgdocdir) ++ -rmdir $(DESTDIR)$(docdir) + + install: install-dirs install-bin install-data install-doc install-man + +diff --git a/configure.ac b/configure.ac +index f8ba989..e54c038 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -1220,8 +1220,6 @@ AC_SUBST([CONF_LIB_JEVENT],[$ac_lib_jevent]) + + dnl Final + AC_SUBST([CONF_LIB_DIRECT],[$ac_lib_direct_flag]) +-AC_SUBST([mandir],['${prefix}/man']) +-AC_SUBST([docdir],['${prefix}/doc']) + AC_CONFIG_FILES([Makefile]) + AC_OUTPUT + +-- +2.26.0 + +From e35a602a73880bf529083bee5de911e1490a27b5 Mon Sep 17 00:00:00 2001 +From: James Le Cuirot +Date: Sat, 25 Apr 2020 11:52:13 +0100 +Subject: [PATCH 2/2] Install *.html files to a separately htmldir rather than + docdir + +Autoconf already sets up htmldir for you. It defaults to the same as +docdir but some distributions set it differently. +--- + Makefile.in | 1 + + Makefile.usr | 1 + + advance/advance.mak | 21 +++++++++++++++++---- + 3 files changed, 19 insertions(+), 4 deletions(-) + +diff --git a/Makefile.in b/Makefile.in +index e92a107..86905d7 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -14,6 +14,7 @@ exec_prefix=@exec_prefix@ + bindir=@bindir@ + mandir=@mandir@ + docdir=@docdir@ ++htmldir=@htmldir@ + CONF_SYSTEM=@CONF_SYSTEM@ + CONF_HOST=@CONF_HOST@ + CONF_BUILD=@CONF_BUILD@ +diff --git a/Makefile.usr b/Makefile.usr +index 74a4d53..c8e7430 100644 +--- a/Makefile.usr ++++ b/Makefile.usr +@@ -240,6 +240,7 @@ sysconfdir=${prefix}/etc + bindir=${prefix}/bin + mandir=${datadir}/man + docdir=${datadir}/doc/advancemame ++htmldir=${docdir} + + ############################################################################# + # Extra configuration common for ./configure and manual +diff --git a/advance/advance.mak b/advance/advance.mak +index 8cd0444..009ccd6 100644 +--- a/advance/advance.mak ++++ b/advance/advance.mak +@@ -152,7 +152,7 @@ endif + endif + + INSTALL_DOCFILES += $(subst $(srcdir)/doc/,$(DOCOBJ)/,$(subst .d,.txt,$(wildcard $(srcdir)/doc/*.d))) +-INSTALL_DOCFILES += $(subst $(srcdir)/doc/,$(DOCOBJ)/,$(subst .d,.html,$(wildcard $(srcdir)/doc/*.d))) ++INSTALL_HTMLFILES += $(subst $(srcdir)/doc/,$(DOCOBJ)/,$(subst .d,.html,$(wildcard $(srcdir)/doc/*.d))) + WEB_DOCFILES += $(subst $(srcdir)/doc/,$(DOCOBJ)/,$(subst .d,.hh,$(wildcard $(srcdir)/doc/*.d))) + + ############################################################################ +@@ -162,7 +162,7 @@ ifdef ADV_ALL + all_override: $(ADV_ALL) + endif + +-all: $(OBJ_DIRS) $(INSTALL_BINFILES) $(INSTALL_DOCFILES) $(INSTALL_MANFILES) ++all: $(OBJ_DIRS) $(INSTALL_BINFILES) $(INSTALL_DOCFILES) $(INSTALL_HTMLFILES) $(INSTALL_MANFILES) + mame: $(OBJ) $(OBJ)/advmame$(EXE) + mess: $(MESSOBJ) $(MESSOBJ)/advmess$(EXE) + emu: mame mess +@@ -182,7 +182,7 @@ web: $(WEB_DOCFILES) + # Ensure that the doc target is always created also if a doc directory exists + .PHONY: doc + +-doc: $(INSTALL_DOCFILES) ++doc: $(INSTALL_DOCFILES) $(INSTALL_HTMLFILES) + + ############################################################################ + # Source +@@ -378,6 +378,7 @@ install-dirs: + -$(INSTALL_PROGRAM_DIR) $(DESTDIR)$(bindir) + -$(INSTALL_DATA_DIR) $(DESTDIR)$(pkgdir) + -$(INSTALL_DATA_DIR) $(DESTDIR)$(docdir) ++ -$(INSTALL_DATA_DIR) $(DESTDIR)$(htmldir) + -$(INSTALL_MAN_DIR) $(DESTDIR)$(mandir)/man1 + -$(INSTALL_DATA_DIR) $(DESTDIR)$(pkgdir)/rom + -$(INSTALL_DATA_DIR) $(DESTDIR)$(pkgdir)/sample +@@ -459,13 +460,19 @@ uninstall-bin: + rm -f $(DESTDIR)$(bindir)/$$i; \ + done + +-install-doc: $(INSTALL_DOCFILES) ++install-doc: $(INSTALL_DOCFILES) $(INSTALL_HTMLFILES) + ifdef INSTALL_DOCFILES + @for i in $(INSTALL_DOCFILES); do \ + echo "$(INSTALL_DATA) $$i $(DESTDIR)$(docdir)"; \ + $(INSTALL_DATA) $$i $(DESTDIR)$(docdir); \ + done + endif ++ifdef INSTALL_HTMLFILES ++ @for i in $(INSTALL_HTMLFILES); do \ ++ echo "$(INSTALL_DATA) $$i $(DESTDIR)$(htmldir)"; \ ++ $(INSTALL_DATA) $$i $(DESTDIR)$(htmldir); \ ++ done ++endif + + uninstall-doc: + ifdef INSTALL_DOCFILES +@@ -473,6 +480,11 @@ ifdef INSTALL_DOCFILES + rm -f $(DESTDIR)$(docdir)/$$i; \ + done + endif ++ifdef INSTALL_HTMLFILES ++ @for i in $(notdir $(INSTALL_HTMLFILES)); do \ ++ rm -f $(DESTDIR)$(htmldir)/$$i; \ ++ done ++endif + + install-man: $(INSTALL_MANFILES) + ifdef INSTALL_MANFILES +@@ -500,6 +512,7 @@ uninstall-dirs: + -rmdir $(DESTDIR)$(pkgdir)/snap + -rmdir $(DESTDIR)$(pkgdir) + -rmdir $(DESTDIR)$(docdir) ++ -rmdir $(DESTDIR)$(htmldir) + + install: install-dirs install-bin install-data install-doc install-man + +-- +2.26.0 + diff --git a/games-emulation/advancemame/files/advancemame-3.9-blank-flags.patch b/games-emulation/advancemame/files/advancemame-3.9-blank-flags.patch new file mode 100644 index 00000000000..68cfa62f1ca --- /dev/null +++ b/games-emulation/advancemame/files/advancemame-3.9-blank-flags.patch @@ -0,0 +1,32 @@ +From f306234fbaa6bd3fbcb75ebe5e3b318a9fc1c5f0 Mon Sep 17 00:00:00 2001 +From: James Le Cuirot +Date: Sat, 25 Apr 2020 11:40:18 +0100 +Subject: [PATCH] Don't use auto CFLAGS/LDFLAGS if they are set but blank + +Explicitly blank flags are valid. +--- + configure.ac | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/configure.ac b/configure.ac +index f8ba989..330959c 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -82,12 +82,12 @@ case "$build" in + esac + AC_SUBST([CONF_BUILD],[$ac_build]) + +-if test -z "$CFLAGS" ; then ++if test -z "${CFLAGS+set}" ; then + ac_auto_cflags=yes + else + ac_auto_cflags=no + fi +-if test -z "$LDFLAGS" ; then ++if test -z "${LDFLAGS+set}" ; then + ac_auto_ldflags=yes + else + ac_auto_ldflags=no +-- +2.26.0 +