CVS commit: pkgsrc/lang

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/lang
From: "Roland Illig" <rillig%netbsd.org@localhost>
Date: Sun, 14 Jul 2019 21:46:22 +0000

Module Name:    pkgsrc
Committed By:   rillig
Date:           Sun Jul 14 21:46:22 UTC 2019

Modified Files:
        pkgsrc/lang/guile: Makefile buildlink3.mk
        pkgsrc/lang/guile20: Makefile buildlink3.mk
        pkgsrc/lang/guile22: Makefile buildlink3.mk

Log Message:
lang/guile: fix alignment of variables


To generate a diff of this commit:
cvs rdiff -u -r1.110 -r1.111 pkgsrc/lang/guile/Makefile
cvs rdiff -u -r1.18 -r1.19 pkgsrc/lang/guile/buildlink3.mk
cvs rdiff -u -r1.14 -r1.15 pkgsrc/lang/guile20/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/lang/guile20/buildlink3.mk
cvs rdiff -u -r1.9 -r1.10 pkgsrc/lang/guile22/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/lang/guile22/buildlink3.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/guile/Makefile
diff -u pkgsrc/lang/guile/Makefile:1.110 pkgsrc/lang/guile/Makefile:1.111
--- pkgsrc/lang/guile/Makefile:1.110    Tue Jun 19 11:07:25 2018
+++ pkgsrc/lang/guile/Makefile  Sun Jul 14 21:46:22 2019
@@ -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 @@ PTHREAD_AUTO_VARS=    YES
 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

Index: pkgsrc/lang/guile/buildlink3.mk
diff -u pkgsrc/lang/guile/buildlink3.mk:1.18 pkgsrc/lang/guile/buildlink3.mk:1.19
--- pkgsrc/lang/guile/buildlink3.mk:1.18        Thu Sep 15 14:32:40 2016
+++ pkgsrc/lang/guile/buildlink3.mk     Sun Jul 14 21:46:22 2019
@@ -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_API_DEPENDS.guile+=   guile>=1.8
 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,

Index: pkgsrc/lang/guile20/Makefile
diff -u pkgsrc/lang/guile20/Makefile:1.14 pkgsrc/lang/guile20/Makefile:1.15
--- pkgsrc/lang/guile20/Makefile:1.14   Sat Aug 19 00:28:10 2017
+++ pkgsrc/lang/guile20/Makefile        Sun Jul 14 21:46:22 2019
@@ -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 @@ LICENSE=      gnu-lgpl-v3
 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 @@ CONFIGURE_ARGS+=    SHELL=${CONFIG_SHELL}
 
 .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

Index: pkgsrc/lang/guile20/buildlink3.mk
diff -u pkgsrc/lang/guile20/buildlink3.mk:1.3 pkgsrc/lang/guile20/buildlink3.mk:1.4
--- pkgsrc/lang/guile20/buildlink3.mk:1.3       Thu Sep 15 14:32:40 2016
+++ pkgsrc/lang/guile20/buildlink3.mk   Sun Jul 14 21:46:22 2019
@@ -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_PKGSRCDIR.guile20?= ../../lang
 #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"

Index: pkgsrc/lang/guile22/Makefile
diff -u pkgsrc/lang/guile22/Makefile:1.9 pkgsrc/lang/guile22/Makefile:1.10
--- pkgsrc/lang/guile22/Makefile:1.9    Sun Jun 23 09:14:58 2019
+++ pkgsrc/lang/guile22/Makefile        Sun Jul 14 21:46:22 2019
@@ -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= guile/2.2
 #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 @@ CONFIGURE_ARGS+=    SHELL=${CONFIG_SHELL}
 
 .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

Index: pkgsrc/lang/guile22/buildlink3.mk
diff -u pkgsrc/lang/guile22/buildlink3.mk:1.1 pkgsrc/lang/guile22/buildlink3.mk:1.2
--- pkgsrc/lang/guile22/buildlink3.mk:1.1       Thu Mar 16 10:02:57 2017
+++ pkgsrc/lang/guile22/buildlink3.mk   Sun Jul 14 21:46:22 2019
@@ -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 @@ GUILE22_BUILDLINK3_MK:=
 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,

Prev by Date: CVS commit: pkgsrc/pkgtools/pkglint
Next by Date: Re: CVS commit: pkgsrc/audio/libsndfile
Previous by Thread: CVS commit: pkgsrc/pkgtools/pkglint
Next by Thread: CVS commit: pkgsrc/doc
Indexes:

Home | Main Index | Thread Index | Old Index