From 65a89c9bd7e9e93929c8641afa945971e9ba78ba Mon Sep 17 00:00:00 2001 From: Olaf Seibert Date: Sun, 6 Dec 2020 15:17:07 +0100 Subject: [PATCH] sdl-hercules-hyperion: replace a patch by a SUBST. --- sdl-hercules-hyperion/Makefile | 9 +++++++++ sdl-hercules-hyperion/distinfo | 1 - sdl-hercules-hyperion/patches/patch-hercules.cnf | 14 -------------- 3 files changed, 9 insertions(+), 15 deletions(-) delete mode 100644 sdl-hercules-hyperion/patches/patch-hercules.cnf diff --git a/sdl-hercules-hyperion/Makefile b/sdl-hercules-hyperion/Makefile index f453a704e6..7750981669 100644 --- a/sdl-hercules-hyperion/Makefile +++ b/sdl-hercules-hyperion/Makefile @@ -21,6 +21,15 @@ USE_LIBTOOL= YES USE_LANGUAGES+= c PTHREAD_OPTS+= require REPLACE_BASH= _dynamic_version +.if ${MACHINE_ARCH} == i386 +CFLAGS+= -march=i586 +.endif + +SUBST_CLASSES+= prefix +SUBST_STAGE.prefix= pre-configure +SUBST_MESSAGE.prefix= Correcting configuration path +SUBST_FILES.prefix= hercules.cnf +SUBST_SED.prefix= -e 's,/usr/local,${PREFIX},g' CONFIGURE_ARGS+= --enable-extpkgs=${PREFIX}/lib/sdlhercules diff --git a/sdl-hercules-hyperion/distinfo b/sdl-hercules-hyperion/distinfo index 452cf2c4c3..db7d3ef124 100644 --- a/sdl-hercules-hyperion/distinfo +++ b/sdl-hercules-hyperion/distinfo @@ -6,7 +6,6 @@ SHA512 (Release_4.3.tar.gz) = e2591b16ecc08f952f16c013764a1d6bfd88aafe9620130dca Size (Release_4.3.tar.gz) = 11609664 bytes SHA1 (patch-Makefile.am) = 85b65386cfde0d7c180abaeaab67e05ad7d07385 SHA1 (patch-configure.ac) = b7f79b0a12cfe20eab389b59ace08bea427d2b63 -SHA1 (patch-hercules.cnf) = cd0a09d39175e9673dab785703d2f8c1b92c8dc6 SHA1 (patch-hifr.h) = 6b878b957d1847296882316067281b05872a760c SHA1 (patch-msgenu.h) = 947d7ddf4395c6c91d2f6640c9d06e8880c8fdf9 SHA1 (patch-tuntap.c) = 6067b1be32d2cd3aa4ad57e63a7483aa823fbcf1 diff --git a/sdl-hercules-hyperion/patches/patch-hercules.cnf b/sdl-hercules-hyperion/patches/patch-hercules.cnf deleted file mode 100644 index 497d063fbd..0000000000 --- a/sdl-hercules-hyperion/patches/patch-hercules.cnf +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD$ - -Put a more likely to be correct path in the example config. - ---- hercules.cnf.orig 2020-02-09 16:27:07.621576951 +0000 -+++ hercules.cnf -@@ -4,6 +4,7 @@ - - MSGLEVEL VERBOSE # normal/verbose/debug - # MODPATH /usr/local/lib/hercules # Where to search for modules -+ MODPATH /usr/pkg/lib/hercules # Where to search for modules - - - #-------------------------------------------------------------------------------