| 1 |
commit: 6c3a76a2952c7aa6bdb0dccf7dcd13e3a4faf1b7 |
| 2 |
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Apr 28 22:48:40 2020 +0000 |
| 4 |
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Apr 28 22:55:06 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6c3a76a2 |
| 7 |
|
| 8 |
games-emulation/advancemame: Fix autover.sh error, improve src_install |
| 9 |
|
| 10 |
The nasty src_install hasn't changed much since 2004 so I've sent some |
| 11 |
long overdue patches upstream to make things better going forwards. |
| 12 |
|
| 13 |
Package-Manager: Portage-2.3.99, Repoman-2.3.22 |
| 14 |
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org> |
| 15 |
|
| 16 |
games-emulation/advancemame/advancemame-3.9.ebuild | 36 +--- |
| 17 |
.../files/advancemame-3.9-DESTDIR.patch | 196 +++++++++++++++++++ |
| 18 |
.../advancemame/files/advancemame-3.9-FHS.patch | 212 +++++++++++++++++++++ |
| 19 |
.../files/advancemame-3.9-blank-flags.patch | 32 ++++ |
| 20 |
4 files changed, 450 insertions(+), 26 deletions(-) |
| 21 |
|
| 22 |
diff --git a/games-emulation/advancemame/advancemame-3.9.ebuild b/games-emulation/advancemame/advancemame-3.9.ebuild |
| 23 |
index 0c69669f9ac..a0c04dabff6 100644 |
| 24 |
--- a/games-emulation/advancemame/advancemame-3.9.ebuild |
| 25 |
+++ b/games-emulation/advancemame/advancemame-3.9.ebuild |
| 26 |
@@ -2,6 +2,7 @@ |
| 27 |
# Distributed under the terms of the GNU General Public License v2 |
| 28 |
|
| 29 |
EAPI=7 |
| 30 |
+ |
| 31 |
inherit autotools flag-o-matic |
| 32 |
|
| 33 |
DESCRIPTION="GNU/Linux port of the MAME emulator with GUI menu" |
| 34 |
@@ -13,7 +14,6 @@ SLOT="0" |
| 35 |
KEYWORDS="~amd64 ~x86" |
| 36 |
IUSE="alsa fbcon ncurses oss slang truetype" |
| 37 |
|
| 38 |
-# sdl is required (bug #158417) |
| 39 |
DEPEND=" |
| 40 |
dev-libs/expat |
| 41 |
media-libs/libsdl2[video] |
| 42 |
@@ -39,6 +39,9 @@ PATCHES=( |
| 43 |
|
| 44 |
# Patches from upstream |
| 45 |
"${FILESDIR}"/${P}-pkgconfig_for_ncurses_and_slang.patch |
| 46 |
+ "${FILESDIR}"/${P}-blank-flags.patch |
| 47 |
+ "${FILESDIR}"/${P}-DESTDIR.patch |
| 48 |
+ "${FILESDIR}"/${P}-FHS.patch |
| 49 |
) |
| 50 |
|
| 51 |
src_prepare() { |
| 52 |
@@ -48,14 +51,11 @@ src_prepare() { |
| 53 |
sed -i -e 's/AC_CHECK_CC_OPT/AX_CHECK_COMPILE_FLAG/' configure.ac || die |
| 54 |
|
| 55 |
eautoreconf |
| 56 |
- sed -i -e 's/"-s"//' configure || die |
| 57 |
} |
| 58 |
|
| 59 |
src_configure() { |
| 60 |
# Fix for bug #78030 |
| 61 |
- if use ppc; then |
| 62 |
- append-ldflags "-Wl,--relax" |
| 63 |
- fi |
| 64 |
+ use ppc && append-ldflags "-Wl,--relax" |
| 65 |
|
| 66 |
ac_cv_prog_ASM=nasm \ |
| 67 |
econf \ |
| 68 |
@@ -75,28 +75,12 @@ src_configure() { |
| 69 |
} |
| 70 |
|
| 71 |
src_compile() { |
| 72 |
- STRIPPROG=true emake |
| 73 |
+ emake \ |
| 74 |
+ VERSION="${PV}" |
| 75 |
} |
| 76 |
|
| 77 |
src_install() { |
| 78 |
- local f |
| 79 |
- |
| 80 |
- for f in adv* ; do |
| 81 |
- if [[ -L "${f}" ]] ; then |
| 82 |
- dobin "${f}" |
| 83 |
- fi |
| 84 |
- done |
| 85 |
- |
| 86 |
- insinto "/usr/share/advance" |
| 87 |
- doins support/event.dat |
| 88 |
- keepdir "/usr/share/advance/"{artwork,diff,image,rom,sample,snap} |
| 89 |
- |
| 90 |
- dodoc HISTORY README RELEASE |
| 91 |
- cd doc |
| 92 |
- dodoc *.txt |
| 93 |
- HTMLDOCS="*.html" einstalldocs |
| 94 |
- |
| 95 |
- for f in *.1 ; do |
| 96 |
- newman ${f} ${f/1/6} |
| 97 |
- done |
| 98 |
+ emake install \ |
| 99 |
+ VERSION="${PV}" \ |
| 100 |
+ DESTDIR="${D}" |
| 101 |
} |
| 102 |
|
| 103 |
diff --git a/games-emulation/advancemame/files/advancemame-3.9-DESTDIR.patch b/games-emulation/advancemame/files/advancemame-3.9-DESTDIR.patch |
| 104 |
new file mode 100644 |
| 105 |
index 00000000000..755f8b45188 |
| 106 |
--- /dev/null |
| 107 |
+++ b/games-emulation/advancemame/files/advancemame-3.9-DESTDIR.patch |
| 108 |
@@ -0,0 +1,196 @@ |
| 109 |
+From fca370c9f7a6dcb0a3625cc15f6d0a80182dd4b3 Mon Sep 17 00:00:00 2001 |
| 110 |
+From: James Le Cuirot <chewi@g.o> |
| 111 |
+Date: Sat, 25 Apr 2020 10:56:27 +0100 |
| 112 |
+Subject: [PATCH] Support make install DESTDIR=/foo just like Automake does |
| 113 |
+ |
| 114 |
+Distributions really need this. |
| 115 |
+--- |
| 116 |
+ advance/advance.mak | 94 ++++++++++++++++++++++----------------------- |
| 117 |
+ 1 file changed, 47 insertions(+), 47 deletions(-) |
| 118 |
+ |
| 119 |
+diff --git a/advance/advance.mak b/advance/advance.mak |
| 120 |
+index 6c4d89c..100dd23 100644 |
| 121 |
+--- a/advance/advance.mak |
| 122 |
++++ b/advance/advance.mak |
| 123 |
+@@ -376,131 +376,131 @@ pkgdir = $(datadir)/advance |
| 124 |
+ pkgdocdir = $(docdir)/advance |
| 125 |
+ |
| 126 |
+ install-dirs: |
| 127 |
+- -$(INSTALL_PROGRAM_DIR) $(bindir) |
| 128 |
+- -$(INSTALL_DATA_DIR) $(pkgdir) |
| 129 |
+- -$(INSTALL_DATA_DIR) $(pkgdocdir) |
| 130 |
+- -$(INSTALL_MAN_DIR) $(mandir)/man1 |
| 131 |
+- -$(INSTALL_DATA_DIR) $(pkgdir)/rom |
| 132 |
+- -$(INSTALL_DATA_DIR) $(pkgdir)/sample |
| 133 |
+- -$(INSTALL_DATA_DIR) $(pkgdir)/artwork |
| 134 |
+- -$(INSTALL_DATA_DIR) $(pkgdir)/image |
| 135 |
+- -$(INSTALL_DATA_DIR) $(pkgdir)/image/ti99_4a |
| 136 |
+- -$(INSTALL_DATA_DIR) $(pkgdir)/crc |
| 137 |
+- -$(INSTALL_DATA_DIR) $(pkgdir)/snap |
| 138 |
+- -$(INSTALL_DATA_DIR) $(pkgdir)/snap/ti99_4a |
| 139 |
++ -$(INSTALL_PROGRAM_DIR) $(DESTDIR)$(bindir) |
| 140 |
++ -$(INSTALL_DATA_DIR) $(DESTDIR)$(pkgdir) |
| 141 |
++ -$(INSTALL_DATA_DIR) $(DESTDIR)$(pkgdocdir) |
| 142 |
++ -$(INSTALL_MAN_DIR) $(DESTDIR)$(mandir)/man1 |
| 143 |
++ -$(INSTALL_DATA_DIR) $(DESTDIR)$(pkgdir)/rom |
| 144 |
++ -$(INSTALL_DATA_DIR) $(DESTDIR)$(pkgdir)/sample |
| 145 |
++ -$(INSTALL_DATA_DIR) $(DESTDIR)$(pkgdir)/artwork |
| 146 |
++ -$(INSTALL_DATA_DIR) $(DESTDIR)$(pkgdir)/image |
| 147 |
++ -$(INSTALL_DATA_DIR) $(DESTDIR)$(pkgdir)/image/ti99_4a |
| 148 |
++ -$(INSTALL_DATA_DIR) $(DESTDIR)$(pkgdir)/crc |
| 149 |
++ -$(INSTALL_DATA_DIR) $(DESTDIR)$(pkgdir)/snap |
| 150 |
++ -$(INSTALL_DATA_DIR) $(DESTDIR)$(pkgdir)/snap/ti99_4a |
| 151 |
+ |
| 152 |
+ install-data: $(INSTALL_DATAFILES) $(INSTALL_ROMFILES) $(INSTALL_IMAGEFILES_TI99_4A) $(INSTALL_SAMPLEFILES) $(INSTALL_SNAPFILES) $(INSTALL_SNAPFILES_TI99_4A) |
| 153 |
+ ifdef INSTALL_DATAFILES |
| 154 |
+ @for i in $(INSTALL_DATAFILES); do \ |
| 155 |
+- echo "$(INSTALL_DATA) $$i $(pkgdir)"; \ |
| 156 |
+- $(INSTALL_DATA) $$i $(pkgdir); \ |
| 157 |
++ echo "$(INSTALL_DATA) $$i $(DESTDIR)$(pkgdir)"; \ |
| 158 |
++ $(INSTALL_DATA) $$i $(DESTDIR)$(pkgdir); \ |
| 159 |
+ done |
| 160 |
+ endif |
| 161 |
+ ifdef INSTALL_ROMFILES |
| 162 |
+ @for i in $(INSTALL_ROMFILES); do \ |
| 163 |
+- echo "$(INSTALL_DATA) $$i $(pkgdir)/rom"; \ |
| 164 |
+- $(INSTALL_DATA) $$i $(pkgdir)/rom; \ |
| 165 |
++ echo "$(INSTALL_DATA) $$i $(DESTDIR)$(pkgdir)/rom"; \ |
| 166 |
++ $(INSTALL_DATA) $$i $(DESTDIR)$(pkgdir)/rom; \ |
| 167 |
+ done |
| 168 |
+ endif |
| 169 |
+ ifdef INSTALL_IMAGEFILES_TI99_4A |
| 170 |
+ @for i in $(INSTALL_IMAGEFILES_TI99_4A); do \ |
| 171 |
+- echo "$(INSTALL_DATA) $$i $(pkgdir)/image/ti99_4a"; \ |
| 172 |
+- $(INSTALL_DATA) $$i $(pkgdir)/image/ti99_4a; \ |
| 173 |
++ echo "$(INSTALL_DATA) $$i $(DESTDIR)$(pkgdir)/image/ti99_4a"; \ |
| 174 |
++ $(INSTALL_DATA) $$i $(DESTDIR)$(pkgdir)/image/ti99_4a; \ |
| 175 |
+ done |
| 176 |
+ endif |
| 177 |
+ ifdef INSTALL_SAMPLEFILES |
| 178 |
+ @for i in $(INSTALL_SAMPLEFILES); do \ |
| 179 |
+- echo "$(INSTALL_DATA) $$i $(pkgdir)/sample"; \ |
| 180 |
+- $(INSTALL_DATA) $$i $(pkgdir)/sample; \ |
| 181 |
++ echo "$(INSTALL_DATA) $$i $(DESTDIR)$(pkgdir)/sample"; \ |
| 182 |
++ $(INSTALL_DATA) $$i $(DESTDIR)$(pkgdir)/sample; \ |
| 183 |
+ done |
| 184 |
+ endif |
| 185 |
+ ifdef INSTALL_SNAPFILES |
| 186 |
+ @for i in $(INSTALL_SNAPFILES); do \ |
| 187 |
+- echo "$(INSTALL_DATA) $$i $(pkgdir)/snap"; \ |
| 188 |
+- $(INSTALL_DATA) $$i $(pkgdir)/snap; \ |
| 189 |
++ echo "$(INSTALL_DATA) $$i $(DESTDIR)$(pkgdir)/snap"; \ |
| 190 |
++ $(INSTALL_DATA) $$i $(DESTDIR)$(pkgdir)/snap; \ |
| 191 |
+ done |
| 192 |
+ endif |
| 193 |
+ ifdef INSTALL_SNAPFILES_TI99_4A |
| 194 |
+ @for i in $(INSTALL_SNAPFILES_TI99_4A); do \ |
| 195 |
+- echo "$(INSTALL_DATA) $$i $(pkgdir)/snap/ti99_4a"; \ |
| 196 |
+- $(INSTALL_DATA) $$i $(pkgdir)/snap/ti99_4a; \ |
| 197 |
++ echo "$(INSTALL_DATA) $$i $(DESTDIR)$(pkgdir)/snap/ti99_4a"; \ |
| 198 |
++ $(INSTALL_DATA) $$i $(DESTDIR)$(pkgdir)/snap/ti99_4a; \ |
| 199 |
+ done |
| 200 |
+ endif |
| 201 |
+ |
| 202 |
+ uninstall-data: |
| 203 |
+ ifdef INSTALL_DATAFILES |
| 204 |
+ @for i in $(notdir $(INSTALL_DATAFILES)); do \ |
| 205 |
+- rm -f $(pkgdir)/$$i; \ |
| 206 |
++ rm -f $(DESTDIR)$(pkgdir)/$$i; \ |
| 207 |
+ done |
| 208 |
+ endif |
| 209 |
+ ifdef INSTALL_ROMFILES |
| 210 |
+ @for i in $(notdir $(INSTALL_ROMFILES)); do \ |
| 211 |
+- rm -f $(pkgdir)/rom/$$i; \ |
| 212 |
++ rm -f $(DESTDIR)$(pkgdir)/rom/$$i; \ |
| 213 |
+ done |
| 214 |
+ endif |
| 215 |
+ ifdef INSTALL_SAMPLEFILES |
| 216 |
+ @for i in $(notdir $(INSTALL_SAMPLEFILES)); do \ |
| 217 |
+- rm -f $(pkgdir)/sample/$$i; \ |
| 218 |
++ rm -f $(DESTDIR)$(pkgdir)/sample/$$i; \ |
| 219 |
+ done |
| 220 |
+ endif |
| 221 |
+ ifdef INSTALL_SNAPFILES |
| 222 |
+ @for i in $(notdir $(INSTALL_SNAPFILES)); do \ |
| 223 |
+- rm -f $(pkgdir)/snap/$$i; \ |
| 224 |
++ rm -f $(DESTDIR)$(pkgdir)/snap/$$i; \ |
| 225 |
+ done |
| 226 |
+ endif |
| 227 |
+ |
| 228 |
+ install-bin: $(INSTALL_BINFILES) |
| 229 |
+ @for i in $(INSTALL_BINFILES); do \ |
| 230 |
+- echo "$(INSTALL_PROGRAM) $$i $(bindir)"; \ |
| 231 |
+- $(INSTALL_PROGRAM) $$i $(bindir); \ |
| 232 |
++ echo "$(INSTALL_PROGRAM) $$i $(DESTDIR)$(bindir)"; \ |
| 233 |
++ $(INSTALL_PROGRAM) $$i $(DESTDIR)$(bindir); \ |
| 234 |
+ done |
| 235 |
+ |
| 236 |
+ uninstall-bin: |
| 237 |
+ @for i in $(notdir $(INSTALL_BINFILES)); do \ |
| 238 |
+- rm -f $(bindir)/$$i; \ |
| 239 |
++ rm -f $(DESTDIR)$(bindir)/$$i; \ |
| 240 |
+ done |
| 241 |
+ |
| 242 |
+ install-doc: $(INSTALL_DOCFILES) |
| 243 |
+ ifdef INSTALL_DOCFILES |
| 244 |
+ @for i in $(INSTALL_DOCFILES); do \ |
| 245 |
+- echo "$(INSTALL_DATA) $$i $(pkgdocdir)"; \ |
| 246 |
+- $(INSTALL_DATA) $$i $(pkgdocdir); \ |
| 247 |
++ echo "$(INSTALL_DATA) $$i $(DESTDIR)$(pkgdocdir)"; \ |
| 248 |
++ $(INSTALL_DATA) $$i $(DESTDIR)$(pkgdocdir); \ |
| 249 |
+ done |
| 250 |
+ endif |
| 251 |
+ |
| 252 |
+ uninstall-doc: |
| 253 |
+ ifdef INSTALL_DOCFILES |
| 254 |
+ @for i in $(notdir $(INSTALL_DOCFILES)); do \ |
| 255 |
+- rm -f $(pkgdocdir)/$$i; \ |
| 256 |
++ rm -f $(DESTDIR)$(pkgdocdir)/$$i; \ |
| 257 |
+ done |
| 258 |
+ endif |
| 259 |
+ |
| 260 |
+ install-man: $(INSTALL_MANFILES) |
| 261 |
+ ifdef INSTALL_MANFILES |
| 262 |
+ @for i in $(INSTALL_MANFILES); do \ |
| 263 |
+- echo "$(INSTALL_DATA) $$i $(mandir)/man1"; \ |
| 264 |
+- $(INSTALL_DATA) $$i $(mandir)/man1; \ |
| 265 |
++ echo "$(INSTALL_DATA) $$i $(DESTDIR)$(mandir)/man1"; \ |
| 266 |
++ $(INSTALL_DATA) $$i $(DESTDIR)$(mandir)/man1; \ |
| 267 |
+ done |
| 268 |
+ endif |
| 269 |
+ |
| 270 |
+ uninstall-man: |
| 271 |
+ ifdef INSTALL_MANFILES |
| 272 |
+ @for i in $(notdir $(INSTALL_MANFILES)); do \ |
| 273 |
+- rm -f $(mandir)/man1/$$i; \ |
| 274 |
++ rm -f $(DESTDIR)$(mandir)/man1/$$i; \ |
| 275 |
+ done |
| 276 |
+ endif |
| 277 |
+ |
| 278 |
+ uninstall-dirs: |
| 279 |
+- -rmdir $(pkgdir)/rom |
| 280 |
+- -rmdir $(pkgdir)/sample |
| 281 |
+- -rmdir $(pkgdir)/artwork |
| 282 |
+- -rmdir $(pkgdir)/image/ti99_4a |
| 283 |
+- -rmdir $(pkgdir)/image |
| 284 |
+- -rmdir $(pkgdir)/crc |
| 285 |
+- -rmdir $(pkgdir)/snap/ti99_4a |
| 286 |
+- -rmdir $(pkgdir)/snap |
| 287 |
+- -rmdir $(pkgdir) |
| 288 |
+- -rmdir $(pkgdocdir) |
| 289 |
++ -rmdir $(DESTDIR)$(pkgdir)/rom |
| 290 |
++ -rmdir $(DESTDIR)$(pkgdir)/sample |
| 291 |
++ -rmdir $(DESTDIR)$(pkgdir)/artwork |
| 292 |
++ -rmdir $(DESTDIR)$(pkgdir)/image/ti99_4a |
| 293 |
++ -rmdir $(DESTDIR)$(pkgdir)/image |
| 294 |
++ -rmdir $(DESTDIR)$(pkgdir)/crc |
| 295 |
++ -rmdir $(DESTDIR)$(pkgdir)/snap/ti99_4a |
| 296 |
++ -rmdir $(DESTDIR)$(pkgdir)/snap |
| 297 |
++ -rmdir $(DESTDIR)$(pkgdir) |
| 298 |
++ -rmdir $(DESTDIR)$(pkgdocdir) |
| 299 |
+ |
| 300 |
+ install: install-dirs install-bin install-data install-doc install-man |
| 301 |
+ |
| 302 |
+-- |
| 303 |
+2.26.0 |
| 304 |
+ |
| 305 |
|
| 306 |
diff --git a/games-emulation/advancemame/files/advancemame-3.9-FHS.patch b/games-emulation/advancemame/files/advancemame-3.9-FHS.patch |
| 307 |
new file mode 100644 |
| 308 |
index 00000000000..312e895b8fd |
| 309 |
--- /dev/null |
| 310 |
+++ b/games-emulation/advancemame/files/advancemame-3.9-FHS.patch |
| 311 |
@@ -0,0 +1,212 @@ |
| 312 |
+From 6d8c1dc720b09fb9c6ff6edb273ad2a2ea31d768 Mon Sep 17 00:00:00 2001 |
| 313 |
+From: James Le Cuirot <chewi@g.o> |
| 314 |
+Date: Sat, 25 Apr 2020 11:16:01 +0100 |
| 315 |
+Subject: [PATCH 1/2] Use /usr/share/man and /usr/share/doc and not /usr/man |
| 316 |
+ and /usr/doc |
| 317 |
+ |
| 318 |
+This has been mandated by the Filesystem Hierarchy Standard since 2.0 |
| 319 |
+in 1997. Autoconf actually does the right thing by default. |
| 320 |
+--- |
| 321 |
+ Makefile.usr | 4 ++-- |
| 322 |
+ advance/advance.mak | 11 +++++------ |
| 323 |
+ configure.ac | 2 -- |
| 324 |
+ 3 files changed, 7 insertions(+), 10 deletions(-) |
| 325 |
+ |
| 326 |
+diff --git a/Makefile.usr b/Makefile.usr |
| 327 |
+index 4519857..74a4d53 100644 |
| 328 |
+--- a/Makefile.usr |
| 329 |
++++ b/Makefile.usr |
| 330 |
+@@ -238,8 +238,8 @@ srcdir=. |
| 331 |
+ datadir=${prefix}/share |
| 332 |
+ sysconfdir=${prefix}/etc |
| 333 |
+ bindir=${prefix}/bin |
| 334 |
+-mandir=${prefix}/man |
| 335 |
+-docdir=${prefix}/share/doc |
| 336 |
++mandir=${datadir}/man |
| 337 |
++docdir=${datadir}/doc/advancemame |
| 338 |
+ |
| 339 |
+ ############################################################################# |
| 340 |
+ # Extra configuration common for ./configure and manual |
| 341 |
+diff --git a/advance/advance.mak b/advance/advance.mak |
| 342 |
+index 100dd23..8cd0444 100644 |
| 343 |
+--- a/advance/advance.mak |
| 344 |
++++ b/advance/advance.mak |
| 345 |
+@@ -373,12 +373,11 @@ CONF_SRC = \ |
| 346 |
+ # Install |
| 347 |
+ |
| 348 |
+ pkgdir = $(datadir)/advance |
| 349 |
+-pkgdocdir = $(docdir)/advance |
| 350 |
+ |
| 351 |
+ install-dirs: |
| 352 |
+ -$(INSTALL_PROGRAM_DIR) $(DESTDIR)$(bindir) |
| 353 |
+ -$(INSTALL_DATA_DIR) $(DESTDIR)$(pkgdir) |
| 354 |
+- -$(INSTALL_DATA_DIR) $(DESTDIR)$(pkgdocdir) |
| 355 |
++ -$(INSTALL_DATA_DIR) $(DESTDIR)$(docdir) |
| 356 |
+ -$(INSTALL_MAN_DIR) $(DESTDIR)$(mandir)/man1 |
| 357 |
+ -$(INSTALL_DATA_DIR) $(DESTDIR)$(pkgdir)/rom |
| 358 |
+ -$(INSTALL_DATA_DIR) $(DESTDIR)$(pkgdir)/sample |
| 359 |
+@@ -463,15 +462,15 @@ uninstall-bin: |
| 360 |
+ install-doc: $(INSTALL_DOCFILES) |
| 361 |
+ ifdef INSTALL_DOCFILES |
| 362 |
+ @for i in $(INSTALL_DOCFILES); do \ |
| 363 |
+- echo "$(INSTALL_DATA) $$i $(DESTDIR)$(pkgdocdir)"; \ |
| 364 |
+- $(INSTALL_DATA) $$i $(DESTDIR)$(pkgdocdir); \ |
| 365 |
++ echo "$(INSTALL_DATA) $$i $(DESTDIR)$(docdir)"; \ |
| 366 |
++ $(INSTALL_DATA) $$i $(DESTDIR)$(docdir); \ |
| 367 |
+ done |
| 368 |
+ endif |
| 369 |
+ |
| 370 |
+ uninstall-doc: |
| 371 |
+ ifdef INSTALL_DOCFILES |
| 372 |
+ @for i in $(notdir $(INSTALL_DOCFILES)); do \ |
| 373 |
+- rm -f $(DESTDIR)$(pkgdocdir)/$$i; \ |
| 374 |
++ rm -f $(DESTDIR)$(docdir)/$$i; \ |
| 375 |
+ done |
| 376 |
+ endif |
| 377 |
+ |
| 378 |
+@@ -500,7 +499,7 @@ uninstall-dirs: |
| 379 |
+ -rmdir $(DESTDIR)$(pkgdir)/snap/ti99_4a |
| 380 |
+ -rmdir $(DESTDIR)$(pkgdir)/snap |
| 381 |
+ -rmdir $(DESTDIR)$(pkgdir) |
| 382 |
+- -rmdir $(DESTDIR)$(pkgdocdir) |
| 383 |
++ -rmdir $(DESTDIR)$(docdir) |
| 384 |
+ |
| 385 |
+ install: install-dirs install-bin install-data install-doc install-man |
| 386 |
+ |
| 387 |
+diff --git a/configure.ac b/configure.ac |
| 388 |
+index f8ba989..e54c038 100644 |
| 389 |
+--- a/configure.ac |
| 390 |
++++ b/configure.ac |
| 391 |
+@@ -1220,8 +1220,6 @@ AC_SUBST([CONF_LIB_JEVENT],[$ac_lib_jevent]) |
| 392 |
+ |
| 393 |
+ dnl Final |
| 394 |
+ AC_SUBST([CONF_LIB_DIRECT],[$ac_lib_direct_flag]) |
| 395 |
+-AC_SUBST([mandir],['${prefix}/man']) |
| 396 |
+-AC_SUBST([docdir],['${prefix}/doc']) |
| 397 |
+ AC_CONFIG_FILES([Makefile]) |
| 398 |
+ AC_OUTPUT |
| 399 |
+ |
| 400 |
+-- |
| 401 |
+2.26.0 |
| 402 |
+ |
| 403 |
+From e35a602a73880bf529083bee5de911e1490a27b5 Mon Sep 17 00:00:00 2001 |
| 404 |
+From: James Le Cuirot <chewi@g.o> |
| 405 |
+Date: Sat, 25 Apr 2020 11:52:13 +0100 |
| 406 |
+Subject: [PATCH 2/2] Install *.html files to a separately htmldir rather than |
| 407 |
+ docdir |
| 408 |
+ |
| 409 |
+Autoconf already sets up htmldir for you. It defaults to the same as |
| 410 |
+docdir but some distributions set it differently. |
| 411 |
+--- |
| 412 |
+ Makefile.in | 1 + |
| 413 |
+ Makefile.usr | 1 + |
| 414 |
+ advance/advance.mak | 21 +++++++++++++++++---- |
| 415 |
+ 3 files changed, 19 insertions(+), 4 deletions(-) |
| 416 |
+ |
| 417 |
+diff --git a/Makefile.in b/Makefile.in |
| 418 |
+index e92a107..86905d7 100644 |
| 419 |
+--- a/Makefile.in |
| 420 |
++++ b/Makefile.in |
| 421 |
+@@ -14,6 +14,7 @@ exec_prefix=@exec_prefix@ |
| 422 |
+ bindir=@bindir@ |
| 423 |
+ mandir=@mandir@ |
| 424 |
+ docdir=@docdir@ |
| 425 |
++htmldir=@htmldir@ |
| 426 |
+ CONF_SYSTEM=@CONF_SYSTEM@ |
| 427 |
+ CONF_HOST=@CONF_HOST@ |
| 428 |
+ CONF_BUILD=@CONF_BUILD@ |
| 429 |
+diff --git a/Makefile.usr b/Makefile.usr |
| 430 |
+index 74a4d53..c8e7430 100644 |
| 431 |
+--- a/Makefile.usr |
| 432 |
++++ b/Makefile.usr |
| 433 |
+@@ -240,6 +240,7 @@ sysconfdir=${prefix}/etc |
| 434 |
+ bindir=${prefix}/bin |
| 435 |
+ mandir=${datadir}/man |
| 436 |
+ docdir=${datadir}/doc/advancemame |
| 437 |
++htmldir=${docdir} |
| 438 |
+ |
| 439 |
+ ############################################################################# |
| 440 |
+ # Extra configuration common for ./configure and manual |
| 441 |
+diff --git a/advance/advance.mak b/advance/advance.mak |
| 442 |
+index 8cd0444..009ccd6 100644 |
| 443 |
+--- a/advance/advance.mak |
| 444 |
++++ b/advance/advance.mak |
| 445 |
+@@ -152,7 +152,7 @@ endif |
| 446 |
+ endif |
| 447 |
+ |
| 448 |
+ INSTALL_DOCFILES += $(subst $(srcdir)/doc/,$(DOCOBJ)/,$(subst .d,.txt,$(wildcard $(srcdir)/doc/*.d))) |
| 449 |
+-INSTALL_DOCFILES += $(subst $(srcdir)/doc/,$(DOCOBJ)/,$(subst .d,.html,$(wildcard $(srcdir)/doc/*.d))) |
| 450 |
++INSTALL_HTMLFILES += $(subst $(srcdir)/doc/,$(DOCOBJ)/,$(subst .d,.html,$(wildcard $(srcdir)/doc/*.d))) |
| 451 |
+ WEB_DOCFILES += $(subst $(srcdir)/doc/,$(DOCOBJ)/,$(subst .d,.hh,$(wildcard $(srcdir)/doc/*.d))) |
| 452 |
+ |
| 453 |
+ ############################################################################ |
| 454 |
+@@ -162,7 +162,7 @@ ifdef ADV_ALL |
| 455 |
+ all_override: $(ADV_ALL) |
| 456 |
+ endif |
| 457 |
+ |
| 458 |
+-all: $(OBJ_DIRS) $(INSTALL_BINFILES) $(INSTALL_DOCFILES) $(INSTALL_MANFILES) |
| 459 |
++all: $(OBJ_DIRS) $(INSTALL_BINFILES) $(INSTALL_DOCFILES) $(INSTALL_HTMLFILES) $(INSTALL_MANFILES) |
| 460 |
+ mame: $(OBJ) $(OBJ)/advmame$(EXE) |
| 461 |
+ mess: $(MESSOBJ) $(MESSOBJ)/advmess$(EXE) |
| 462 |
+ emu: mame mess |
| 463 |
+@@ -182,7 +182,7 @@ web: $(WEB_DOCFILES) |
| 464 |
+ # Ensure that the doc target is always created also if a doc directory exists |
| 465 |
+ .PHONY: doc |
| 466 |
+ |
| 467 |
+-doc: $(INSTALL_DOCFILES) |
| 468 |
++doc: $(INSTALL_DOCFILES) $(INSTALL_HTMLFILES) |
| 469 |
+ |
| 470 |
+ ############################################################################ |
| 471 |
+ # Source |
| 472 |
+@@ -378,6 +378,7 @@ install-dirs: |
| 473 |
+ -$(INSTALL_PROGRAM_DIR) $(DESTDIR)$(bindir) |
| 474 |
+ -$(INSTALL_DATA_DIR) $(DESTDIR)$(pkgdir) |
| 475 |
+ -$(INSTALL_DATA_DIR) $(DESTDIR)$(docdir) |
| 476 |
++ -$(INSTALL_DATA_DIR) $(DESTDIR)$(htmldir) |
| 477 |
+ -$(INSTALL_MAN_DIR) $(DESTDIR)$(mandir)/man1 |
| 478 |
+ -$(INSTALL_DATA_DIR) $(DESTDIR)$(pkgdir)/rom |
| 479 |
+ -$(INSTALL_DATA_DIR) $(DESTDIR)$(pkgdir)/sample |
| 480 |
+@@ -459,13 +460,19 @@ uninstall-bin: |
| 481 |
+ rm -f $(DESTDIR)$(bindir)/$$i; \ |
| 482 |
+ done |
| 483 |
+ |
| 484 |
+-install-doc: $(INSTALL_DOCFILES) |
| 485 |
++install-doc: $(INSTALL_DOCFILES) $(INSTALL_HTMLFILES) |
| 486 |
+ ifdef INSTALL_DOCFILES |
| 487 |
+ @for i in $(INSTALL_DOCFILES); do \ |
| 488 |
+ echo "$(INSTALL_DATA) $$i $(DESTDIR)$(docdir)"; \ |
| 489 |
+ $(INSTALL_DATA) $$i $(DESTDIR)$(docdir); \ |
| 490 |
+ done |
| 491 |
+ endif |
| 492 |
++ifdef INSTALL_HTMLFILES |
| 493 |
++ @for i in $(INSTALL_HTMLFILES); do \ |
| 494 |
++ echo "$(INSTALL_DATA) $$i $(DESTDIR)$(htmldir)"; \ |
| 495 |
++ $(INSTALL_DATA) $$i $(DESTDIR)$(htmldir); \ |
| 496 |
++ done |
| 497 |
++endif |
| 498 |
+ |
| 499 |
+ uninstall-doc: |
| 500 |
+ ifdef INSTALL_DOCFILES |
| 501 |
+@@ -473,6 +480,11 @@ ifdef INSTALL_DOCFILES |
| 502 |
+ rm -f $(DESTDIR)$(docdir)/$$i; \ |
| 503 |
+ done |
| 504 |
+ endif |
| 505 |
++ifdef INSTALL_HTMLFILES |
| 506 |
++ @for i in $(notdir $(INSTALL_HTMLFILES)); do \ |
| 507 |
++ rm -f $(DESTDIR)$(htmldir)/$$i; \ |
| 508 |
++ done |
| 509 |
++endif |
| 510 |
+ |
| 511 |
+ install-man: $(INSTALL_MANFILES) |
| 512 |
+ ifdef INSTALL_MANFILES |
| 513 |
+@@ -500,6 +512,7 @@ uninstall-dirs: |
| 514 |
+ -rmdir $(DESTDIR)$(pkgdir)/snap |
| 515 |
+ -rmdir $(DESTDIR)$(pkgdir) |
| 516 |
+ -rmdir $(DESTDIR)$(docdir) |
| 517 |
++ -rmdir $(DESTDIR)$(htmldir) |
| 518 |
+ |
| 519 |
+ install: install-dirs install-bin install-data install-doc install-man |
| 520 |
+ |
| 521 |
+-- |
| 522 |
+2.26.0 |
| 523 |
+ |
| 524 |
|
| 525 |
diff --git a/games-emulation/advancemame/files/advancemame-3.9-blank-flags.patch b/games-emulation/advancemame/files/advancemame-3.9-blank-flags.patch |
| 526 |
new file mode 100644 |
| 527 |
index 00000000000..68cfa62f1ca |
| 528 |
--- /dev/null |
| 529 |
+++ b/games-emulation/advancemame/files/advancemame-3.9-blank-flags.patch |
| 530 |
@@ -0,0 +1,32 @@ |
| 531 |
+From f306234fbaa6bd3fbcb75ebe5e3b318a9fc1c5f0 Mon Sep 17 00:00:00 2001 |
| 532 |
+From: James Le Cuirot <chewi@g.o> |
| 533 |
+Date: Sat, 25 Apr 2020 11:40:18 +0100 |
| 534 |
+Subject: [PATCH] Don't use auto CFLAGS/LDFLAGS if they are set but blank |
| 535 |
+ |
| 536 |
+Explicitly blank flags are valid. |
| 537 |
+--- |
| 538 |
+ configure.ac | 4 ++-- |
| 539 |
+ 1 file changed, 2 insertions(+), 2 deletions(-) |
| 540 |
+ |
| 541 |
+diff --git a/configure.ac b/configure.ac |
| 542 |
+index f8ba989..330959c 100644 |
| 543 |
+--- a/configure.ac |
| 544 |
++++ b/configure.ac |
| 545 |
+@@ -82,12 +82,12 @@ case "$build" in |
| 546 |
+ esac |
| 547 |
+ AC_SUBST([CONF_BUILD],[$ac_build]) |
| 548 |
+ |
| 549 |
+-if test -z "$CFLAGS" ; then |
| 550 |
++if test -z "${CFLAGS+set}" ; then |
| 551 |
+ ac_auto_cflags=yes |
| 552 |
+ else |
| 553 |
+ ac_auto_cflags=no |
| 554 |
+ fi |
| 555 |
+-if test -z "$LDFLAGS" ; then |
| 556 |
++if test -z "${LDFLAGS+set}" ; then |
| 557 |
+ ac_auto_ldflags=yes |
| 558 |
+ else |
| 559 |
+ ac_auto_ldflags=no |
| 560 |
+-- |
| 561 |
+2.26.0 |
| 562 |
+ |
Archives