[pkgsrc/trunk]: pkgsrc/lang lang/guile: fix alignment of variables

[rillig <rillig%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/86f042b278c9
branches:  trunk
changeset: 336434:86f042b278c9
user:      rillig <rillig%pkgsrc.org@localhost>
date:      Sun Jul 14 21:46:22 2019 +0000

description:
lang/guile: fix alignment of variables

diffstat:

 lang/guile/Makefile        |   4 ++--
 lang/guile/buildlink3.mk   |   4 ++--
 lang/guile20/Makefile      |  18 +++++++++---------
 lang/guile20/buildlink3.mk |   4 ++--
 lang/guile22/Makefile      |  18 +++++++++---------
 lang/guile22/buildlink3.mk |   4 ++--
 6 files changed, 26 insertions(+), 26 deletions(-)

diffs (156 lines):

diff -r f33162f8bf3e -r 86f042b278c9 lang/guile/Makefile
--- a/lang/guile/Makefile       Sun Jul 14 21:25:57 2019 +0000
+++ b/lang/guile/Makefile       Sun Jul 14 21:46:22 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.110 2018/06/19 11:07:25 fhajny Exp $
+# $NetBSD: Makefile,v 1.111 2019/07/14 21:46:22 rillig Exp $
 
 DISTNAME=              guile-1.8.8
 PKGREVISION=           9
@@ -19,7 +19,7 @@
 INFO_FILES=            YES
 PKGCONFIG_OVERRIDE=    guile-1.8.pc.in
 
-GUILE_PREFIX=                  ${PREFIX}/guile/1.8
+GUILE_PREFIX=                  ${PREFIX}/guile/1.8
 GNU_CONFIGURE_PREFIX=          ${GUILE_PREFIX}
 BUILDLINK_PASSTHRU_DIRS+=      ${GUILE_PREFIX}
 LDFLAGS+=                      ${COMPILER_RPATH_FLAG}${GUILE_PREFIX}/lib
diff -r f33162f8bf3e -r 86f042b278c9 lang/guile/buildlink3.mk
--- a/lang/guile/buildlink3.mk  Sun Jul 14 21:25:57 2019 +0000
+++ b/lang/guile/buildlink3.mk  Sun Jul 14 21:46:22 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.18 2016/09/15 14:32:40 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.19 2019/07/14 21:46:22 rillig Exp $
 
 BUILDLINK_TREE+=       guile
 
@@ -9,7 +9,7 @@
 BUILDLINK_ABI_DEPENDS.guile+=  guile>=1.8.8nb8
 BUILDLINK_PKGSRCDIR.guile?=    ../../lang/guile
 
-BUILDLINK_PASSTHRU_DIRS=               ${LOCALBASE}/guile/1.8
+BUILDLINK_PASSTHRU_DIRS=               ${PREFIX}/guile/1.8
 BUILDLINK_FILES.guile+=                        guile/1.8/bin/*
 BUILDLINK_FNAME_TRANSFORM.guile+=      -e s,guile/1.8/bin,bin,
 BUILDLINK_FNAME_TRANSFORM.guile+=      -e s,guile/1.8/lib/pkgconfig,lib/pkgconfig,
diff -r f33162f8bf3e -r 86f042b278c9 lang/guile20/Makefile
--- a/lang/guile20/Makefile     Sun Jul 14 21:25:57 2019 +0000
+++ b/lang/guile20/Makefile     Sun Jul 14 21:46:22 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2017/08/19 00:28:10 jlam Exp $
+# $NetBSD: Makefile,v 1.15 2019/07/14 21:46:22 rillig Exp $
 
 DISTNAME=      guile-2.0.14
 PKGNAME=       ${DISTNAME:S/guile/guile20/}
@@ -16,7 +16,7 @@
 GUILE_SUBDIR=  # empty
 
 # guile does not like the --build and --host triplets on NetBSD
-HAS_CONFIGURE= yes
+HAS_CONFIGURE=         yes
 CONFIGURE_ARGS+=       --disable-shared
 # not until boehm-gc is threaded
 CONFIGURE_ARGS+=       --without-threads
@@ -24,16 +24,16 @@
 
 .if !empty(GUILE_SUBDIR)
 # Installation prefix is non-default.
-GUILE_PREFIX=          ${PREFIX}/${GUILE_SUBDIR}
-CONFIGURE_ARGS+=       --prefix=${GUILE_PREFIX:Q}
-CONFIGURE_ARGS+=       --infodir=${GUILE_PREFIX:Q}/info
-CONFIGURE_ARGS+=       --mandir=${GUILE_PREFIX:Q}/man
+GUILE_PREFIX=                  ${PREFIX}/${GUILE_SUBDIR}
+CONFIGURE_ARGS+=               --prefix=${GUILE_PREFIX:Q}
+CONFIGURE_ARGS+=               --infodir=${GUILE_PREFIX:Q}/info
+CONFIGURE_ARGS+=               --mandir=${GUILE_PREFIX:Q}/man
 BUILDLINK_PASSTHRU_DIRS+=      ${GUILE_PREFIX}
 LDFLAGS+=                      ${COMPILER_RPATH_FLAG}${GUILE_PREFIX}/lib
 .else
-CONFIGURE_ARGS+=       --prefix=${PREFIX:Q}
-CONFIGURE_ARGS+=       --infodir=${PREFIX:Q}/${PKGINFODIR:Q}
-CONFIGURE_ARGS+=       --mandir=${PREFIX:Q}/${PKGMANDIR:Q}
+CONFIGURE_ARGS+=               --prefix=${PREFIX}
+CONFIGURE_ARGS+=               --infodir=${PREFIX}/${PKGINFODIR}
+CONFIGURE_ARGS+=               --mandir=${PREFIX}/${PKGMANDIR}
 .endif
 
 INFO_FILES=    yes
diff -r f33162f8bf3e -r 86f042b278c9 lang/guile20/buildlink3.mk
--- a/lang/guile20/buildlink3.mk        Sun Jul 14 21:25:57 2019 +0000
+++ b/lang/guile20/buildlink3.mk        Sun Jul 14 21:46:22 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2016/09/15 14:32:40 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2019/07/14 21:46:22 rillig Exp $
 
 BUILDLINK_TREE+=       guile20
 
@@ -14,7 +14,7 @@
 #BUILDLINK_FNAME_TRANSFORM.guile20+=   -e s,guile/2.0/bin,bin,
 #BUILDLINK_FNAME_TRANSFORM.guile20+=   -e s,guile/2.0/lib/pkgconfig,lib/pkgconfig,
 #
-#GUILE20_SUBDIR=                               guile/2.0
+#GUILE20_SUBDIR=                       guile/2.0
 
 .include "../../devel/gmp/buildlink3.mk"
 .include "../../devel/libffi/buildlink3.mk"
diff -r f33162f8bf3e -r 86f042b278c9 lang/guile22/Makefile
--- a/lang/guile22/Makefile     Sun Jul 14 21:25:57 2019 +0000
+++ b/lang/guile22/Makefile     Sun Jul 14 21:46:22 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2019/06/23 09:14:58 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2019/07/14 21:46:22 rillig Exp $
 
 DISTNAME=      guile-2.2.5
 PKGNAME=       ${DISTNAME:S/guile/guile22/}
@@ -15,7 +15,7 @@
 #GUILE_SUBDIR= # empty
 
 # guile does not like the --build and --host triplets on NetBSD
-HAS_CONFIGURE= yes
+HAS_CONFIGURE=         yes
 CONFIGURE_ARGS+=       --disable-shared
 # not until boehm-gc is threaded
 CONFIGURE_ARGS+=       --without-threads
@@ -23,16 +23,16 @@
 
 .if !empty(GUILE_SUBDIR)
 # Installation prefix is non-default.
-GUILE_PREFIX=          ${PREFIX}/${GUILE_SUBDIR}
-CONFIGURE_ARGS+=       --prefix=${GUILE_PREFIX:Q}
-CONFIGURE_ARGS+=       --infodir=${GUILE_PREFIX:Q}/info
-CONFIGURE_ARGS+=       --mandir=${GUILE_PREFIX:Q}/man
+GUILE_PREFIX=                  ${PREFIX}/${GUILE_SUBDIR}
+CONFIGURE_ARGS+=               --prefix=${GUILE_PREFIX:Q}
+CONFIGURE_ARGS+=               --infodir=${GUILE_PREFIX:Q}/info
+CONFIGURE_ARGS+=               --mandir=${GUILE_PREFIX:Q}/man
 BUILDLINK_PASSTHRU_DIRS+=      ${GUILE_PREFIX}
 LDFLAGS+=                      ${COMPILER_RPATH_FLAG}${GUILE_PREFIX}/lib
 .else
-CONFIGURE_ARGS+=       --prefix=${PREFIX:Q}
-CONFIGURE_ARGS+=       --infodir=${PREFIX:Q}/${PKGINFODIR:Q}
-CONFIGURE_ARGS+=       --mandir=${PREFIX:Q}/${PKGMANDIR:Q}
+CONFIGURE_ARGS+=               --prefix=${PREFIX}
+CONFIGURE_ARGS+=               --infodir=${PREFIX}/${PKGINFODIR}
+CONFIGURE_ARGS+=               --mandir=${PREFIX}/${PKGMANDIR}
 .endif
 
 INFO_FILES=    yes
diff -r f33162f8bf3e -r 86f042b278c9 lang/guile22/buildlink3.mk
--- a/lang/guile22/buildlink3.mk        Sun Jul 14 21:25:57 2019 +0000
+++ b/lang/guile22/buildlink3.mk        Sun Jul 14 21:46:22 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2017/03/16 10:02:57 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2019/07/14 21:46:22 rillig Exp $
 
 BUILDLINK_TREE+=       guile22
 
@@ -8,7 +8,7 @@
 BUILDLINK_API_DEPENDS.guile22+=        guile22>=2.2
 BUILDLINK_PKGSRCDIR.guile22?=  ../../lang/guile22
 
-BUILDLINK_PASSTHRU_DIRS=               ${LOCALBASE}/guile/2.2
+BUILDLINK_PASSTHRU_DIRS=               ${PREFIX}/guile/2.2
 BUILDLINK_FILES.guile22+=              guile/2.2/bin/*
 BUILDLINK_FNAME_TRANSFORM.guile22+=    -e s,guile/2.2/bin,bin,
 BUILDLINK_FNAME_TRANSFORM.guile22+=    -e s,guile/2.2/lib/pkgconfig,lib/pkgconfig,