[pkgsrc/trunk]: pkgsrc Renamed BUILDLINK_TRANSFORM.* to BUILDLINK_FNAME_TRANS...

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc Renamed BUILDLINK_TRANSFORM.* to BUILDLINK_FNAME_TRANS...
From: rillig <rillig%pkgsrc.org@localhost>
Date: Thu, 14 Oct 2021 04:27:29 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/ee4aa28d1804
branches:  trunk
changeset: 524026:ee4aa28d1804
user:      rillig <rillig%pkgsrc.org@localhost>
date:      Wed Jan 17 03:11:18 2007 +0000

description:
Renamed BUILDLINK_TRANSFORM.* to BUILDLINK_FNAME_TRANSFORM.*, to make
clear that these variables are completely unrelated to
BUILDLINK_TRANSFORM.

Added a legacy check that catches appearances of BUILDLINK_TRANSFORM.*.

XXX: Where should incompatible changes in pkgsrc be documented?

diffstat:

 chat/jabberd2/Makefile                |   4 ++--
 devel/gnustep-objc-lf2/buildlink3.mk  |   4 ++--
 devel/ncurses/builtin.mk              |   4 ++--
 devel/readline/buildlink3.mk          |   4 ++--
 doc/guide/files/buildlink.xml         |   4 ++--
 games/neverball/Makefile              |   6 +++---
 lang/classpath-gui/Makefile           |   4 ++--
 lang/gcc3-ada/buildlink3.mk           |   4 ++--
 lang/gcc34-ada/buildlink3.mk          |   4 ++--
 lang/gcc34/buildlink3.mk              |   4 ++--
 lang/guile14/buildlink3.mk            |   4 ++--
 mk/buildlink3/bsd.buildlink3.mk       |  14 +++++++++-----
 multimedia/kaffeine/Makefile          |   4 ++--
 multimedia/vlc/Makefile               |   4 ++--
 multimedia/vlc07/Makefile             |   4 ++--
 pkgtools/pkglint/files/deprecated.map |   5 ++++-
 pkgtools/pkglint/files/makevars.map   |   4 ++--
 pkgtools/x11-links/buildlink3.mk      |   4 ++--
 security/gpgme03/buildlink3.mk        |   6 +++---
 x11/qt1/buildlink3.mk                 |   4 ++--
 x11/xorg-libs/buildlink3.mk           |   4 ++--
 21 files changed, 53 insertions(+), 46 deletions(-)

diffs (truncated from 408 to 300 lines):

diff -r cb12838050f5 -r ee4aa28d1804 chat/jabberd2/Makefile
--- a/chat/jabberd2/Makefile    Wed Jan 17 02:54:21 2007 +0000
+++ b/chat/jabberd2/Makefile    Wed Jan 17 03:11:18 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2006/06/11 01:57:27 xtraeme Exp $
+# $NetBSD: Makefile,v 1.33 2007/01/17 03:11:18 rillig Exp $
 #
 
 DISTNAME=              jabberd-2.0s11
@@ -15,7 +15,7 @@
 GNU_CONFIGURE=         yes
 
 BUILDLINK_API_DEPENDS.openssl+=        openssl>=0.9.6b
-BUILDLINK_TRANSFORM.db4+=      -e "s,/db4/,/,g"
+BUILDLINK_FNAME_TRANSFORM.db4+=        -e "s,/db4/,/,g"
 
 SUBST_CLASSES+=                path
 SUBST_STAGE.path=      post-patch
diff -r cb12838050f5 -r ee4aa28d1804 devel/gnustep-objc-lf2/buildlink3.mk
--- a/devel/gnustep-objc-lf2/buildlink3.mk      Wed Jan 17 02:54:21 2007 +0000
+++ b/devel/gnustep-objc-lf2/buildlink3.mk      Wed Jan 17 03:11:18 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 23:10:43 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2007/01/17 03:11:18 rillig Exp $
 
 BUILDLINK_DEPTH:=                      ${BUILDLINK_DEPTH}+
 GNUSTEP_OBJC_LF2_BUILDLINK3_MK:=       ${GNUSTEP_OBJC_LF2_BUILDLINK3_MK}+
@@ -15,7 +15,7 @@
 BUILDLINK_API_DEPENDS.gnustep-objc-lf2+=       gnustep-objc-lf2>=2.95.3.88
 BUILDLINK_ABI_DEPENDS.gnustep-objc-lf2?=       gnustep-objc-lf2>=2.95.3.88nb1
 BUILDLINK_PKGSRCDIR.gnustep-objc-lf2?= ../../devel/gnustep-objc-lf2
-BUILDLINK_TRANSFORM.gnustep-objc-lf2?= -e "s|Headers/objc_lf2/|Headers/objc/|g"
+BUILDLINK_FNAME_TRANSFORM.gnustep-objc-lf2?=   -e "s|Headers/objc_lf2/|Headers/objc/|g"
 BUILDLINK_TRANSFORM+=  l:objc:objc_lf2
 .endif # GNUSTEP_OBJC_LF2_BUILDLINK3_MK
 
diff -r cb12838050f5 -r ee4aa28d1804 devel/ncurses/builtin.mk
--- a/devel/ncurses/builtin.mk  Wed Jan 17 02:54:21 2007 +0000
+++ b/devel/ncurses/builtin.mk  Wed Jan 17 03:11:18 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.11 2006/04/06 06:21:54 reed Exp $
+# $NetBSD: builtin.mk,v 1.12 2007/01/17 03:11:18 rillig Exp $
 
 BUILTIN_PKG:=  ncurses
 
@@ -109,7 +109,7 @@
 .  if !empty(USE_BUILTIN.ncurses:M[yY][eE][sS])
 .    if !empty(BUILTIN_LIB_FOUND.ncurses:M[nN][oO]) || (${OPSYS} == "Interix")
 BUILDLINK_LDADD.ncurses=       -lcurses
-BUILDLINK_TRANSFORM.ncurses+=  -e "s|/curses\.h|/ncurses.h|g"
+BUILDLINK_FNAME_TRANSFORM.ncurses+=    -e "s|/curses\.h|/ncurses.h|g"
 BUILDLINK_TRANSFORM+=          l:ncurses:curses
 .    endif
 BUILDLINK_FILES.ncurses+=      include/curses.h
diff -r cb12838050f5 -r ee4aa28d1804 devel/readline/buildlink3.mk
--- a/devel/readline/buildlink3.mk      Wed Jan 17 02:54:21 2007 +0000
+++ b/devel/readline/buildlink3.mk      Wed Jan 17 03:11:18 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.27 2006/12/12 21:52:35 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.28 2007/01/17 03:11:18 rillig Exp $
 
 BUILDLINK_DEPTH:=              ${BUILDLINK_DEPTH}+
 READLINE_BUILDLINK3_MK:=       ${READLINE_BUILDLINK3_MK}+
@@ -19,7 +19,7 @@
 BUILDLINK_FILES.readline+=     include/history.h
 BUILDLINK_FILES.readline+=     include/readline.h
 
-BUILDLINK_TRANSFORM.readline+= \
+BUILDLINK_FNAME_TRANSFORM.readline+= \
        -e "s|include/history\.h|include/readline/history.h|g"          \
        -e "s|include/readline\.h|include/readline/readline.h|g"
 
diff -r cb12838050f5 -r ee4aa28d1804 doc/guide/files/buildlink.xml
--- a/doc/guide/files/buildlink.xml     Wed Jan 17 02:54:21 2007 +0000
+++ b/doc/guide/files/buildlink.xml     Wed Jan 17 03:11:18 2007 +0000
@@ -1,4 +1,4 @@
-<!-- $NetBSD: buildlink.xml,v 1.22 2007/01/03 00:58:24 kano Exp $ -->
+<!-- $NetBSD: buildlink.xml,v 1.23 2007/01/17 03:11:18 rillig Exp $ -->
 
 <chapter id="buildlink">
   <title>Buildlink methodology</title>
@@ -331,7 +331,7 @@
        </listitem>
 
        <listitem>
-         <para><varname>BUILDLINK_TRANSFORM.<replaceable>pkg</replaceable></varname>
+         <para><varname>BUILDLINK_FNAME_TRANSFORM.<replaceable>pkg</replaceable></varname>
            (not shown above) is a list of sed arguments used to
            transform the name of the source filename into a
            destination filename, e.g. <command>-e
diff -r cb12838050f5 -r ee4aa28d1804 games/neverball/Makefile
--- a/games/neverball/Makefile  Wed Jan 17 02:54:21 2007 +0000
+++ b/games/neverball/Makefile  Wed Jan 17 03:11:18 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2006/06/12 16:28:10 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2007/01/17 03:11:19 rillig Exp $
 #
 
 DISTNAME=      neverball-1.4.0
@@ -13,8 +13,8 @@
 USE_TOOLS+=    gmake
 
 # Avoiding multiples patches...
-BUILDLINK_TRANSFORM.SDL+=      -e "s|/SDL/|/|g"
-BUILDLINK_TRANSFORM.SDL_ttf+=  -e "s|/SDL/|/|g"
+BUILDLINK_FNAME_TRANSFORM.SDL+=        -e "s|/SDL/|/|g"
+BUILDLINK_FNAME_TRANSFORM.SDL_ttf+=    -e "s|/SDL/|/|g"
 
 SHAREDIR=      ${PREFIX}/share/${PKGBASE}
 
diff -r cb12838050f5 -r ee4aa28d1804 lang/classpath-gui/Makefile
--- a/lang/classpath-gui/Makefile       Wed Jan 17 02:54:21 2007 +0000
+++ b/lang/classpath-gui/Makefile       Wed Jan 17 03:11:18 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2007/01/14 09:22:02 joerg Exp $
+# $NetBSD: Makefile,v 1.15 2007/01/17 03:11:19 rillig Exp $
 
 .include "../../lang/classpath/Makefile.common"
 
@@ -14,7 +14,7 @@
 INSTALL_DIRS=  native/jni/gtk-peer
 
 BUILDLINK_FILES.libart2+=      bin/libart2-config
-BUILDLINK_TRANSFORM.libart2+=  -e 's|/libart2-config|/libart-config|g'
+BUILDLINK_FNAME_TRANSFORM.libart2+=    -e 's|/libart2-config|/libart-config|g'
 
 BUILDLINK_DEPMETHOD.libXt?=    build
 
diff -r cb12838050f5 -r ee4aa28d1804 lang/gcc3-ada/buildlink3.mk
--- a/lang/gcc3-ada/buildlink3.mk       Wed Jan 17 02:54:21 2007 +0000
+++ b/lang/gcc3-ada/buildlink3.mk       Wed Jan 17 03:11:18 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 23:10:54 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2007/01/17 03:11:19 rillig Exp $
 
 BUILDLINK_DEPTH:=       ${BUILDLINK_DEPTH}+
 GCC3_ADA_BUILDLINK3_MK:=  ${GCC3_ADA_BUILDLINK3_MK}+
@@ -28,7 +28,7 @@
 BUILDLINK_PKGSRCDIR.gcc3-ada?=     ../../lang/gcc3-ada
 BUILDLINK_FILES_CMD.gcc3-ada=  (cd  ${BUILDLINK_PREFIX.gcc3-ada} && \
        ${FIND} bin libexec lib \( -type file -o -type link \) -print)
-BUILDLINK_TRANSFORM.gcc3-ada=  -e s:\buildlink:buildlink/gcc3:
+BUILDLINK_FNAME_TRANSFORM.gcc3-ada=    -e s:\buildlink:buildlink/gcc3:
 
 BUILDLINK_DEPMETHOD.gcc3-ada?= build
 
diff -r cb12838050f5 -r ee4aa28d1804 lang/gcc34-ada/buildlink3.mk
--- a/lang/gcc34-ada/buildlink3.mk      Wed Jan 17 02:54:21 2007 +0000
+++ b/lang/gcc34-ada/buildlink3.mk      Wed Jan 17 03:11:18 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.10 2006/07/08 23:10:54 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2007/01/17 03:11:19 rillig Exp $
 
 BUILDLINK_DEPTH:=      ${BUILDLINK_DEPTH}+
 GCCADA_BUILDLINK3_MK:= ${GCCADA_BUILDLINK3_MK}+
@@ -29,7 +29,7 @@
 
 BUILDLINK_FILES_CMD.gcc34-ada= (cd  ${BUILDLINK_PREFIX.gcc34-ada} && \
        ${FIND} bin libexec lib \( -type file -o -type link \) -print)
-BUILDLINK_TRANSFORM.gcc34-ada= -e s:\buildlink:buildlink/gcc34-ada:
+BUILDLINK_FNAME_TRANSFORM.gcc34-ada=   -e s:\buildlink:buildlink/gcc34-ada:
 
 # Packages that link against shared libraries need a full dependency.
 .  if defined(_USE_GCC_SHLIB)
diff -r cb12838050f5 -r ee4aa28d1804 lang/gcc34/buildlink3.mk
--- a/lang/gcc34/buildlink3.mk  Wed Jan 17 02:54:21 2007 +0000
+++ b/lang/gcc34/buildlink3.mk  Wed Jan 17 03:11:18 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.14 2006/07/08 23:10:54 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.15 2007/01/17 03:11:19 rillig Exp $
 
 BUILDLINK_DEPTH:=       ${BUILDLINK_DEPTH}+
 GCC34_BUILDLINK3_MK:=  ${GCC34_BUILDLINK3_MK}+
@@ -36,7 +36,7 @@
 BUILDLINK_FILES_CMD.gcc34=     \
        (cd  ${BUILDLINK_PREFIX.gcc34} &&       \
        ${FIND} bin libexec lib \( -type f -o -type l \) -print)
-BUILDLINK_TRANSFORM.gcc34=     -e s:\buildlink:buildlink/gcc34:
+BUILDLINK_FNAME_TRANSFORM.gcc34=       -e s:\buildlink:buildlink/gcc34:
 
 # Packages that link against shared libraries need a full dependency.
 .  if defined(_USE_GCC_SHLIB)
diff -r cb12838050f5 -r ee4aa28d1804 lang/guile14/buildlink3.mk
--- a/lang/guile14/buildlink3.mk        Wed Jan 17 02:54:21 2007 +0000
+++ b/lang/guile14/buildlink3.mk        Wed Jan 17 03:11:18 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.9 2006/07/08 23:10:55 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2007/01/17 03:11:19 rillig Exp $
 
 BUILDLINK_DEPTH:=      ${BUILDLINK_DEPTH}+
 GUILE14_BUILDLINK3_MK:=        ${GUILE14_BUILDLINK3_MK}+
@@ -18,7 +18,7 @@
 
 BUILDLINK_PASSTHRU_DIRS=       ${LOCALBASE}/guile/1.4
 BUILDLINK_FILES.guile14+=      guile/1.4/bin/*
-BUILDLINK_TRANSFORM.guile14+=  -e s,/guile/1.4/bin/,/bin/,
+BUILDLINK_FNAME_TRANSFORM.guile14+=    -e s,/guile/1.4/bin/,/bin/,
 
 GUILE14_SUBDIR=                        guile/1.4
 .endif # GUILE14_BUILDLINK3_MK
diff -r cb12838050f5 -r ee4aa28d1804 mk/buildlink3/bsd.buildlink3.mk
--- a/mk/buildlink3/bsd.buildlink3.mk   Wed Jan 17 02:54:21 2007 +0000
+++ b/mk/buildlink3/bsd.buildlink3.mk   Wed Jan 17 03:11:18 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.buildlink3.mk,v 1.190 2006/12/20 01:04:47 joerg Exp $
+# $NetBSD: bsd.buildlink3.mk,v 1.191 2007/01/17 03:11:19 rillig Exp $
 #
 # Copyright (c) 2004 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -512,7 +512,7 @@
 #      +CONTENTS, and for pkgviews packages, it outputs any libtool
 #      archives in lib directories.
 #
-# BUILDLINK_TRANSFORM.<pkg>
+# BUILDLINK_FNAME_TRANSFORM.<pkg>
 #      sed arguments used to transform the name of the source filename
 #      into a destination filename, e.g. -e "s|/curses.h|/ncurses.h|g"
 #
@@ -574,7 +574,7 @@
                ${ERROR_MSG} "[bsd.buildlink3.mk] X11BASE is not set correctly."; \
                exit 1;                                                 \
        }
-       ${_PKG_SILENT}${_PKG_DEBUG}                                     \
+       ${RUN}                                                          \
        case ${BUILDLINK_PREFIX.${_pkg_}} in                            \
        ${LOCALBASE})   buildlink_dir="${BUILDLINK_DIR}" ;;             \
        ${X11BASE})     buildlink_dir="${BUILDLINK_X11_DIR}" ;;         \
@@ -587,12 +587,16 @@
                if [ ! -f "$$src" ]; then                                       \
                        msg="$$src: not found";                         \
                else                                                    \
-                       if [ -z "${BUILDLINK_TRANSFORM.${_pkg_}:Q}" ]; then \
+                       : "Legacy: Can be removed after 2007Q2.";       \
+                       if [ ${BUILDLINK_TRANSFORM.${_pkg_}:Q}"" ]; then \
+                               ${FAIL_MSG} "[bsd.buildlink3.mk] BUILDLINK_TRANSFORM.${_pkg_} is obsolete. Use BUILDLINK_FNAME_TRANSFORM.${_pkg_} instead."; \
+                       fi;                                             \
+                       if [ -z "${BUILDLINK_FNAME_TRANSFORM.${_pkg_}:Q}" ]; then \
                                dest="$$buildlink_dir/$$file";          \
                                msg="$$src";                            \
                        else                                            \
                                dest="$$buildlink_dir/$$file";          \
-                               dest=`${ECHO} $$dest | ${SED} ${BUILDLINK_TRANSFORM.${_pkg_}}`; \
+                               dest=`${ECHO} $$dest | ${SED} ${BUILDLINK_FNAME_TRANSFORM.${_pkg_}}`; \
                                msg="$$src -> $$dest";                  \
                        fi;                                             \
                        dir=`${DIRNAME} "$$dest"`;                      \
diff -r cb12838050f5 -r ee4aa28d1804 multimedia/kaffeine/Makefile
--- a/multimedia/kaffeine/Makefile      Wed Jan 17 02:54:21 2007 +0000
+++ b/multimedia/kaffeine/Makefile      Wed Jan 17 03:11:18 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2007/01/07 12:25:55 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2007/01/17 03:11:19 rillig Exp $
 #
 
 DISTNAME=      kaffeine-0.8.3
@@ -21,7 +21,7 @@
 CONFIGURE_ARGS+=       --without-xinerama
 CONFIGURE_ARGS+=       --without-dvb
 
-BUILDLINK_TRANSFORM.cdparanoia+=       -e "s|/cdparanoia/|/|g"
+BUILDLINK_FNAME_TRANSFORM.cdparanoia+= -e "s|/cdparanoia/|/|g"
 
 # Hardcoded paths for libdvdcss and win32-codecs
 SUBST_CLASSES+=                path
diff -r cb12838050f5 -r ee4aa28d1804 multimedia/vlc/Makefile
--- a/multimedia/vlc/Makefile   Wed Jan 17 02:54:21 2007 +0000
+++ b/multimedia/vlc/Makefile   Wed Jan 17 03:11:18 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.42 2007/01/13 10:46:34 joerg Exp $
+# $NetBSD: Makefile,v 1.43 2007/01/17 03:11:19 rillig Exp $
 #
 
 DISTNAME=              vlc-${VLC_VER}
@@ -85,7 +85,7 @@
 SUBST_FILES.fnt=       modules/misc/freetype.c
 SUBST_MESSAGE.fnt=     Fixing hardcoded paths.
 
-BUILDLINK_TRANSFORM.ffmpeg+=   -e "s,include/ffmpeg,include/,g"
+BUILDLINK_FNAME_TRANSFORM.ffmpeg+=     -e "s,include/ffmpeg,include/,g"
 
 .if ${OPSYS} == "NetBSD"
 PLIST_SUBST+=          COND_CDDA="@comment "
diff -r cb12838050f5 -r ee4aa28d1804 multimedia/vlc07/Makefile
--- a/multimedia/vlc07/Makefile Wed Jan 17 02:54:21 2007 +0000
+++ b/multimedia/vlc07/Makefile Wed Jan 17 03:11:18 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2007/01/14 09:58:24 joerg Exp $
+# $NetBSD: Makefile,v 1.6 2007/01/17 03:11:19 rillig Exp $
 #
 
 DISTNAME=              vlc-${VLC_VER}
@@ -71,7 +71,7 @@
 SUBST_FILES.libav=     configure
 SUBST_SED.libav=       -e "s,libavcodec/libavcodec.a,libavcodec.a,g"
 
-BUILDLINK_TRANSFORM.ffmpeg+=   -e "s,include/ffmpeg,include/,g"
+BUILDLINK_FNAME_TRANSFORM.ffmpeg+=     -e "s,include/ffmpeg,include/,g"
 
 .include "../../audio/flac/buildlink3.mk"
 .include "../../audio/lame/buildlink3.mk"
Prev by Date: [pkgsrc/trunk]: pkgsrc/x11/iceauth Import iceauth-1.0.1, the program to displ...
Next by Date: [pkgsrc/trunk]: pkgsrc/chat/loudmouth Whitespace, found by pkglint.
Previous by Thread: [pkgsrc/trunk]: pkgsrc/x11/iceauth Import iceauth-1.0.1, the program to displ...
Next by Thread: [pkgsrc/trunk]: pkgsrc/chat/loudmouth Whitespace, found by pkglint.
Indexes:
Home | Main Index | Thread Index | Old Index