head 1.2; access; symbols pkgsrc-2026Q1:1.2.0.48 pkgsrc-2026Q1-base:1.2 pkgsrc-2025Q4:1.2.0.46 pkgsrc-2025Q4-base:1.2 pkgsrc-2025Q3:1.2.0.44 pkgsrc-2025Q3-base:1.2 pkgsrc-2025Q2:1.2.0.42 pkgsrc-2025Q2-base:1.2 pkgsrc-2025Q1:1.2.0.40 pkgsrc-2025Q1-base:1.2 pkgsrc-2024Q4:1.2.0.38 pkgsrc-2024Q4-base:1.2 pkgsrc-2024Q3:1.2.0.36 pkgsrc-2024Q3-base:1.2 pkgsrc-2024Q2:1.2.0.34 pkgsrc-2024Q2-base:1.2 pkgsrc-2024Q1:1.2.0.32 pkgsrc-2024Q1-base:1.2 pkgsrc-2023Q4:1.2.0.30 pkgsrc-2023Q4-base:1.2 pkgsrc-2023Q3:1.2.0.28 pkgsrc-2023Q3-base:1.2 pkgsrc-2023Q2:1.2.0.26 pkgsrc-2023Q2-base:1.2 pkgsrc-2023Q1:1.2.0.24 pkgsrc-2023Q1-base:1.2 pkgsrc-2022Q4:1.2.0.22 pkgsrc-2022Q4-base:1.2 pkgsrc-2022Q3:1.2.0.20 pkgsrc-2022Q3-base:1.2 pkgsrc-2022Q2:1.2.0.18 pkgsrc-2022Q2-base:1.2 pkgsrc-2022Q1:1.2.0.16 pkgsrc-2022Q1-base:1.2 pkgsrc-2021Q4:1.2.0.14 pkgsrc-2021Q4-base:1.2 pkgsrc-2021Q3:1.2.0.12 pkgsrc-2021Q3-base:1.2 pkgsrc-2021Q2:1.2.0.10 pkgsrc-2021Q2-base:1.2 pkgsrc-2021Q1:1.2.0.8 pkgsrc-2021Q1-base:1.2 pkgsrc-2020Q4:1.2.0.6 pkgsrc-2020Q4-base:1.2 pkgsrc-2020Q3:1.2.0.4 pkgsrc-2020Q3-base:1.2 pkgsrc-2020Q2:1.2.0.2 pkgsrc-2020Q2-base:1.2 pkgsrc-2020Q1:1.1.0.2 pkgsrc-2020Q1-base:1.1; locks; strict; comment @# @; 1.2 date 2020.04.22.08.13.40; author nia; state Exp; branches; next 1.1; commitid hQxBntNIXqMn7m5C; 1.1 date 2020.03.06.12.23.01; author nia; state Exp; branches; next ; commitid 0CcTnqrZb9fW0lZB; desc @@ 1.2 log @caprice32: Update to 4.6.0 Changes: * Support CAP32_DELAY in autorun commands * Support German keyboard (physical layout only) * Better freedesktop integration * Better logic for finding configuration file * Dynamic loading of CAPS (IPF) library * Nix packaging support @ text @$NetBSD: patch-makefile,v 1.1 2020/03/06 12:23:01 nia Exp $ - Don't force -O2 - Use the executable for the "all" target - Use BSD_INSTALL_*. --- makefile.orig 2020-03-14 14:36:08.000000000 +0000 +++ makefile @@@@ -104,7 +104,7 @@@@ TEST_OBJECTS:=$(TEST_DEPENDS:.d=.o) WARNINGS = -Wall -Wextra -Wzero-as-null-pointer-constant -Wformat=2 -Wold-style-cast -Wmissing-include-dirs -Wlogical-op -Woverloaded-virtual -Wpointer-arith -Wredundant-decls COMMON_CFLAGS += $(CFLAGS) -std=c++11 $(IPATHS) DEBUG_FLAGS = -Werror -g -O0 -DDEBUG -RELEASE_FLAGS = -O2 -funroll-loops -ffast-math -fomit-frame-pointer -fno-strength-reduce -finline-functions -s +RELEASE_FLAGS = -ffast-math -fno-strength-reduce -finline-functions BUILD_FLAGS = $(RELEASE_FLAGS) debug: BUILD_FLAGS:=$(DEBUG_FLAGS) @@@@ -124,7 +124,7 @@@@ ifdef DEBUG BUILD_FLAGS = $(DEBUG_FLAGS) all: check_deps debug else -all: check_deps distrib +all: check_deps $(TARGET) endif # gtest doesn't build with warnings flags, hence the COMMON_CFLAGS @@@@ -211,11 +211,19 @@@@ distrib: $(TARGET) ln -s caprice32-$(VERSION).tar.bz2 $(ARCHIVE)/caprice32_$(VERSION).orig.tar.bz2 || true install: $(TARGET) - install -D $(TARGET) $(DESTDIR)$(prefix)/bin/$(TARGET) - install -D $(GROFF_DOC) $(DESTDIR)$(prefix)/share/man/man6/cap32.6 - install -D -m664 cap32.cfg $(DESTDIR)/etc/cap32.cfg - mkdir -p $(DESTDIR)$(prefix)/share/caprice32 - cp -r resources rom $(DESTDIR)$(prefix)/share/caprice32 + $(BSD_INSTALL_PROGRAM_DIR) $(DESTDIR)$(prefix)/bin + $(BSD_INSTALL_PROGRAM) $(TARGET) $(DESTDIR)$(prefix)/bin/$(TARGET) + $(BSD_INSTALL_MAN_DIR) $(DESTDIR)$(prefix)/$(PKGMANDIR)/man6 + $(BSD_INSTALL_MAN) $(GROFF_DOC) $(DESTDIR)$(prefix)/$(PKGMANDIR)/man6/cap32.6 + $(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(prefix)/share/examples/caprice32 + $(BSD_INSTALL_DATA) cap32.cfg $(DESTDIR)$(prefix)/share/examples/caprice32/cap32.cfg + $(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(prefix)/share/caprice32/resources + $(BSD_INSTALL_DATA) resources/*.* $(DESTDIR)$(prefix)/share/caprice32/resources + $(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(prefix)/share/pixmaps + $(BSD_INSTALL_DATA) resources/freedesktop/caprice32.png $(DESTDIR)$(prefix)/share/pixmaps + $(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(prefix)/share/applications + $(BSD_INSTALL_DATA) resources/freedesktop/caprice32.desktop $(DESTDIR)$(prefix)/share/applications + $(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(prefix)/share/caprice32/rom endif #################################### @ 1.1 log @emulators: Add caprice32. Caprice32 is a software emulator of the Amstrad CPC 8bit home computer series. The emulator faithfully imitates the CPC464, CPC664, and CPC6128 models. By recreating the operations of all hardware components at a low level, the emulator achieves a high degree of compatibility with original CPC software. These programs or games can be run unmodified at real-time or higher speeds, depending on the emulator host environment. @ text @d1 1 a1 1 $NetBSD$ d3 3 a5 1 We pass our own flags. d7 1 a7 1 --- makefile.orig 2019-01-04 19:01:29.000000000 +0000 d9 1 a9 9 @@@@ -50,7 +50,6 @@@@ COMMON_CFLAGS += -DWITH_IPF LIBS += $(MINGW_PATH)/bin/$(CAPSIPFDLL) endif else -prefix = /usr/local TARGET = cap32 TEST_TARGET = test_runner IPATHS = -Isrc/ -Isrc/gui/includes `pkg-config --cflags freetype2` `sdl-config --cflags` `pkg-config --cflags libpng` @@@@ -97,7 +96,7 @@@@ TEST_OBJECTS:=$(TEST_DEPENDS:.d=.o) d18 1 a18 1 @@@@ -117,7 +116,7 @@@@ ifdef DEBUG d27 1 a27 1 @@@@ -204,11 +203,15 @@@@ distrib: $(TARGET) d43 5 a47 1 + $(BSD_INSTALL_DATA) resources/* $(DESTDIR)$(prefix)/share/caprice32/resources @