CVS commit: pkgsrc/lang/clisp

["Roland Illig" <rillig%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   rillig
Date:           Sat Nov  2 10:20:42 UTC 2019

Modified Files:
        pkgsrc/lang/clisp: Makefile module.mk

Log Message:
lang/clisp: fix pkglint warnings and notes


To generate a diff of this commit:
cvs rdiff -u -r1.114 -r1.115 pkgsrc/lang/clisp/Makefile
cvs rdiff -u -r1.11 -r1.12 pkgsrc/lang/clisp/module.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/lang/clisp/Makefile
diff -u pkgsrc/lang/clisp/Makefile:1.114 pkgsrc/lang/clisp/Makefile:1.115
--- pkgsrc/lang/clisp/Makefile:1.114    Tue Aug 13 14:24:31 2019
+++ pkgsrc/lang/clisp/Makefile  Sat Nov  2 10:20:42 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.114 2019/08/13 14:24:31 rjs Exp $
+# $NetBSD: Makefile,v 1.115 2019/11/02 10:20:42 rillig Exp $
 
 DISTNAME=              clisp-2.49
 PKGREVISION=           26
@@ -13,9 +13,7 @@ LICENSE=              gnu-gpl-v2
 
 # XXX: is this still current?
 BROKEN_ON_PLATFORM+=   *-*-arm
-
 BROKEN_ON_PLATFORM+=   *-*-aarch64
-
 # makes the bulk build hang under MirBSD
 BROKEN_ON_PLATFORM+=   MirBSD-*-*
 
@@ -47,7 +45,7 @@ TEST_TARGET=          check mod-check
 
 .include "../../mk/bsd.prefs.mk"
 
-.if ${MACHINE_ARCH:Malpha} || ${MACHINE_ARCH:Mamd64} || ${MACHINE_ARCH:Mx86_64} || ${OPSYS} == "DragonFly"
+.if ${MACHINE_ARCH} == alpha || ${MACHINE_ARCH} == amd64 || ${MACHINE_ARCH} == x86_64 || ${OPSYS} == DragonFly
 CONFIGURE_ARGS+=       --disable-mmap
 .endif
 
@@ -61,7 +59,7 @@ CFLAGS+=      -fno-builtin-valloc
 CFLAGS+=       -fno-builtin-free
 .endif
 
-.if $(MACHINE_ARCH:Mi386)
+.if ${MACHINE_ARCH} == i386
 CFLAGS+=               -falign-functions=4     # force the assumption
 .endif
 

Index: pkgsrc/lang/clisp/module.mk
diff -u pkgsrc/lang/clisp/module.mk:1.11 pkgsrc/lang/clisp/module.mk:1.12
--- pkgsrc/lang/clisp/module.mk:1.11    Mon Jan  1 01:10:13 2018
+++ pkgsrc/lang/clisp/module.mk Sat Nov  2 10:20:42 2019
@@ -1,7 +1,9 @@
-# $NetBSD: module.mk,v 1.11 2018/01/01 01:10:13 rillig Exp $
-
-# Used variables:
-# CLISP_MODULE - name of module and subdirectory in "modules"
+# $NetBSD: module.mk,v 1.12 2019/11/02 10:20:42 rillig Exp $
+#
+# Package-settable variables:
+#
+# CLISP_MODULE
+#      name of module and subdirectory in "modules"
 
 CLISP_VERSION=         2.49
 DISTNAME=              clisp-${CLISP_VERSION}
@@ -20,7 +22,7 @@ INSTALLATION_DIRS=    lib/clisp
 do-install:
        ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/lib/clisp/dynmod
        cd ${WRKSRC}/modules;   \
-       ${SETENV} ${MAKE_ENV} ${INSTALL_ENV} sh ${LOCALBASE}/bin/clisp-link install ${CLISP_MODULE}
+       ${SETENV} ${MAKE_ENV} ${INSTALL_ENV} sh ${PREFIX}/bin/clisp-link install ${CLISP_MODULE}
 .endif
 
 .include "../../lang/clisp/buildlink3.mk"