Sun Nov 14 08:50:03 2021 UTC ()
hercules4sdl: Fix syntax error.

OPSYS can't be tested against until after bsd.prefs.mk has been
included, but using OPSYSVARS is better anyway.


(jperkin)
diff -r1.2 -r1.3 pkgsrc/emulators/hercules4sdl/Makefile
cvs diff -r1.2 -r1.3 pkgsrc/emulators/hercules4sdl/Makefile (expand / switch to unified diff)

--- pkgsrc/emulators/hercules4sdl/Makefile 2021/11/13 12:44:39 1.2
+++ pkgsrc/emulators/hercules4sdl/Makefile 2021/11/14 08:50:03 1.3
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.2 2021/11/13 12:44:39 rhialto Exp $ 1# $NetBSD: Makefile,v 1.3 2021/11/14 08:50:03 jperkin Exp $
2 2
3PKGNAME= hercules4sdl-4.3 3PKGNAME= hercules4sdl-4.3
4DISTNAME= Release_${PKGVERSION_NOREV} 4DISTNAME= Release_${PKGVERSION_NOREV}
5CATEGORIES= emulators 5CATEGORIES= emulators
6MASTER_SITES= ${MASTER_SITE_GITHUB:=SDL-Hercules-390/} 6MASTER_SITES= ${MASTER_SITE_GITHUB:=SDL-Hercules-390/}
7EXTRACT_USING= bsdtar 7EXTRACT_USING= bsdtar
8DIST_SUBDIR= hercules4sdl 8DIST_SUBDIR= hercules4sdl
9 9
10MAINTAINER= rhialto@NetBSD.org 10MAINTAINER= rhialto@NetBSD.org
11HOMEPAGE= https://github.com/SDL-Hercules-390/hyperion 11HOMEPAGE= https://github.com/SDL-Hercules-390/hyperion
12COMMENT= The SoftDevLabs version of Hercules 4.x (Hyperion) 12COMMENT= The SoftDevLabs version of Hercules 4.x (Hyperion)
13LICENSE= qpl-v1.0 13LICENSE= qpl-v1.0
14 14
@@ -23,32 +23,30 @@ USE_LANGUAGES+= c @@ -23,32 +23,30 @@ USE_LANGUAGES+= c
23PTHREAD_OPTS+= require 23PTHREAD_OPTS+= require
24REPLACE_BASH= _dynamic_version 24REPLACE_BASH= _dynamic_version
25.if ${MACHINE_ARCH} == i386 25.if ${MACHINE_ARCH} == i386
26CFLAGS+= -march=i586 26CFLAGS+= -march=i586
27.endif 27.endif
28 28
29SUBST_CLASSES+= prefix 29SUBST_CLASSES+= prefix
30SUBST_STAGE.prefix= pre-configure 30SUBST_STAGE.prefix= pre-configure
31SUBST_MESSAGE.prefix= Correcting configuration path 31SUBST_MESSAGE.prefix= Correcting configuration path
32SUBST_FILES.prefix= hercules.cnf 32SUBST_FILES.prefix= hercules.cnf
33SUBST_SED.prefix= -e 's,/usr/local,${PREFIX},g' 33SUBST_SED.prefix= -e 's,/usr/local,${PREFIX},g'
34 34
35CONFIGURE_ARGS+= --enable-extpkgs=${PREFIX}/lib/hercules4sdl 35CONFIGURE_ARGS+= --enable-extpkgs=${PREFIX}/lib/hercules4sdl
36.if ${OPSYS} == "Darwin" 
37# There is a configure check that uses C++ to check if the compiler is 36# There is a configure check that uses C++ to check if the compiler is
38# GNU, and on Darwin it thinks GNU C++ is needed to create shared 37# GNU, and on Darwin it thinks GNU C++ is needed to create shared
39# libraries, even though no actual C++ is used. Or something. 38# libraries, even though no actual C++ is used. Or something.
40CONFIGURE_ENV+= ac_cv_cxx_compiler_gnu=yes 39CONFIGURE_ENV.Darwin+= ac_cv_cxx_compiler_gnu=yes
41.endif 
42 40
43INSTALLATION_DIRS+= share/examples/hercules 41INSTALLATION_DIRS+= share/examples/hercules
44 42
45pre-configure: 43pre-configure:
46 ${RM} -f ${WRKSRC}/ltdl.h ${WRKSRC}/ltdl.c 44 ${RM} -f ${WRKSRC}/ltdl.h ${WRKSRC}/ltdl.c
47 cd ${WRKSRC} && ./autogen.sh 45 cd ${WRKSRC} && ./autogen.sh
48 46
49post-install: 47post-install:
50 ${INSTALL_DATA} ${WRKSRC}/hercules.cnf ${DESTDIR}${PREFIX}/share/examples/hercules/ 48 ${INSTALL_DATA} ${WRKSRC}/hercules.cnf ${DESTDIR}${PREFIX}/share/examples/hercules/
51 49
52.include "../../archivers/bzip2/buildlink3.mk" 50.include "../../archivers/bzip2/buildlink3.mk"
53.include "../../converters/libiconv/buildlink3.mk" 51.include "../../converters/libiconv/buildlink3.mk"
54.include "../../devel/libltdl/buildlink3.mk" 52.include "../../devel/libltdl/buildlink3.mk"