[pkgsrc/trunk]: pkgsrc/lang Rename the internal package variable referred to ...

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc/lang Rename the internal package variable referred to ...
From: jlam <jlam%pkgsrc.org@localhost>
Date: Wed, 13 Oct 2021 23:45:00 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/607fdff8b6b4
branches:  trunk
changeset: 471105:607fdff8b6b4
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Thu Mar 18 04:19:39 2004 +0000

description:
Rename the internal package variable referred to by buildlink[23].  No
functional change.

diffstat:

 lang/gcc3-c++/buildlink2.mk  |  34 +++++++++++++++++-----------------
 lang/gcc3-c++/buildlink3.mk  |  30 +++++++++++++++---------------
 lang/gcc3-c/buildlink2.mk    |  38 +++++++++++++++++++-------------------
 lang/gcc3-c/buildlink3.mk    |  28 ++++++++++++++--------------
 lang/gcc3-f77/buildlink2.mk  |  30 +++++++++++++++---------------
 lang/gcc3-f77/buildlink3.mk  |  30 +++++++++++++++---------------
 lang/gcc3-java/buildlink2.mk |  28 ++++++++++++++--------------
 lang/gcc3-java/buildlink3.mk |  28 ++++++++++++++--------------
 lang/gcc3-objc/buildlink2.mk |  28 ++++++++++++++--------------
 lang/gcc3-objc/buildlink3.mk |  28 ++++++++++++++--------------
 10 files changed, 151 insertions(+), 151 deletions(-)

diffs (truncated from 564 to 300 lines):

diff -r c559db53a9f4 -r 607fdff8b6b4 lang/gcc3-c++/buildlink2.mk
--- a/lang/gcc3-c++/buildlink2.mk       Thu Mar 18 03:42:13 2004 +0000
+++ b/lang/gcc3-c++/buildlink2.mk       Thu Mar 18 04:19:39 2004 +0000
@@ -1,40 +1,40 @@
-# $NetBSD: buildlink2.mk,v 1.1 2004/02/01 14:05:47 jlam Exp $
+# $NetBSD: buildlink2.mk,v 1.2 2004/03/18 04:19:39 jlam Exp $
 
-.if !defined(GCC3CXX_BUILDLINK2_MK)
-GCC3CXX_BUILDLINK2_MK= # defined
+.if !defined(GCC3_CXX_BUILDLINK2_MK)
+GCC3_CXX_BUILDLINK2_MK=        # defined
 
 .include "../../mk/bsd.prefs.mk"
 
 .if defined(GCC3_INSTALLTO_SUBPREFIX)
 GCC3_PKGMODIF=                 _${GCC3_INSTALLTO_SUBPREFIX}
 .endif
-BUILDLINK_PACKAGES+=           gcc3cxx
-BUILDLINK_DEPENDS.gcc3cxx?=    gcc3${GCC3_PKGMODIF}-c++>=${_GCC_REQD}
-BUILDLINK_PKGSRCDIR.gcc3cxx?=  ../../lang/gcc3-c++
+BUILDLINK_PACKAGES+=           gcc3-cxx
+BUILDLINK_DEPENDS.gcc3-cxx?=   gcc3${GCC3_PKGMODIF}-c++>=${_GCC_REQD}
+BUILDLINK_PKGSRCDIR.gcc3-cxx?= ../../lang/gcc3-c++
 
 # Packages that link against gcc shared libraries need a full
 # dependency.
 #
 .if defined(USE_GCC_SHLIB)
-BUILDLINK_DEPMETHOD.gcc3cxx+=  full
+BUILDLINK_DEPMETHOD.gcc3-cxx+= full
 .else
-BUILDLINK_DEPMETHOD.gcc3cxx?=  build
+BUILDLINK_DEPMETHOD.gcc3-cxx?= build
 .endif
 
-BUILDLINK_PREFIX.gcc3cxx=      ${LOCALBASE}
+BUILDLINK_PREFIX.gcc3-cxx=     ${LOCALBASE}
 BUILDLINK_WRAPPER_ENV+=        \
        COMPILER_PATH="${BUILDLINK_DIR}/bin"; export COMPILER_PATH
 
-BUILDLINK_FILES.gcc3cxx=       ${_GCC_SUBPREFIX}include/c++/*/*
-BUILDLINK_FILES.gcc3cxx+=      ${_GCC_SUBPREFIX}include/c++/*/*/*
-BUILDLINK_FILES.gcc3cxx+=      ${_GCC_SUBPREFIX}include/c++/*/*/*/*
-BUILDLINK_FILES.gcc3cxx+=      ${_GCC_SUBPREFIX}lib/libstdc++.*
-BUILDLINK_FILES.gcc3cxx+=      ${_GCC_SUBPREFIX}lib/libsupc++.*
+BUILDLINK_FILES.gcc3-cxx=      ${_GCC_SUBPREFIX}include/c++/*/*
+BUILDLINK_FILES.gcc3-cxx+=     ${_GCC_SUBPREFIX}include/c++/*/*/*
+BUILDLINK_FILES.gcc3-cxx+=     ${_GCC_SUBPREFIX}include/c++/*/*/*/*
+BUILDLINK_FILES.gcc3-cxx+=     ${_GCC_SUBPREFIX}lib/libstdc++.*
+BUILDLINK_FILES.gcc3-cxx+=     ${_GCC_SUBPREFIX}lib/libsupc++.*
 
-BUILDLINK_TARGETS+=    gcc3cxx-buildlink
+BUILDLINK_TARGETS+=    gcc3-cxx-buildlink
 BUILDLINK_TARGETS+=     libstdc++-buildlink-la
 
-gcc3cxx-buildlink: _BUILDLINK_USE
+gcc3-cxx-buildlink: _BUILDLINK_USE
 
 libstdc++-buildlink-la:               
        ${_PKG_SILENT}${_PKG_DEBUG}                                     \
@@ -42,4 +42,4 @@
        libpattern="/usr/lib/libstdc++.*";                              \
        ${BUILDLINK_FAKE_LA}
 
-.endif # GCC3CXX_BUILDLINK2_MK
+.endif # GCC3_CXX_BUILDLINK2_MK
diff -r c559db53a9f4 -r 607fdff8b6b4 lang/gcc3-c++/buildlink3.mk
--- a/lang/gcc3-c++/buildlink3.mk       Thu Mar 18 03:42:13 2004 +0000
+++ b/lang/gcc3-c++/buildlink3.mk       Thu Mar 18 04:19:39 2004 +0000
@@ -1,36 +1,36 @@
-# $NetBSD: buildlink3.mk,v 1.7 2004/03/16 18:23:27 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2004/03/18 04:19:39 jlam Exp $
 
-BUILDLINK_DEPTH:=      ${BUILDLINK_DEPTH}+
-GCC3CXX_BUILDLINK3_MK:=        ${GCC3CXX_BUILDLINK3_MK}+
+BUILDLINK_DEPTH:=              ${BUILDLINK_DEPTH}+
+GCC3_CXX_BUILDLINK3_MK:=       ${GCC3_CXX_BUILDLINK3_MK}+
 
 .include "../../mk/bsd.prefs.mk"
 
 .if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=    gcc3cxx
+BUILDLINK_DEPENDS+=    gcc3-cxx
 .endif
 
-BUILDLINK_PACKAGES:=   ${BUILDLINK_PACKAGES:Ngcc3cxx}
-BUILDLINK_PACKAGES+=   gcc3cxx
+BUILDLINK_PACKAGES:=   ${BUILDLINK_PACKAGES:Ngcc3-cxx}
+BUILDLINK_PACKAGES+=   gcc3-cxx
 
-.if !empty(GCC3CXX_BUILDLINK3_MK:M+)
+.if !empty(GCC3_CXX_BUILDLINK3_MK:M+)
 .  if defined(GCC3_INSTALLTO_SUBPREFIX)
 .    if ${GCC3_INSTALLTO_SUBPREFIX} != "gcc3"
 GCC3_PKGMODIF= _${GCC3_INSTALLTO_SUBPREFIX}
 .    endif
 .  endif
-BUILDLINK_PKGBASE.gcc3cxx?=    gcc3${GCC3_PKGMODIF}-c++
-BUILDLINK_DEPENDS.gcc3cxx+=    gcc3${GCC3_PKGMODIF}-c++>=${_GCC_REQD}
-BUILDLINK_PKGSRCDIR.gcc3cxx?=  ../../lang/gcc3-c++
-BUILDLINK_LIBDIRS.gcc3cxx?=    \
-       lib ${_GCC_ARCHDIR:S/^${BUILDLINK_PREFIX.gcc3cxx}\///}
+BUILDLINK_PKGBASE.gcc3-cxx?=   gcc3${GCC3_PKGMODIF}-c++
+BUILDLINK_DEPENDS.gcc3-cxx+=   gcc3${GCC3_PKGMODIF}-c++>=${_GCC_REQD}
+BUILDLINK_PKGSRCDIR.gcc3-cxx?= ../../lang/gcc3-c++
+BUILDLINK_LIBDIRS.gcc3-cxx?=   \
+       lib ${_GCC_ARCHDIR:S/^${BUILDLINK_PREFIX.gcc3-cxx}\///}
 
 # Packages that link against shared libraries need a full dependency.
 .if defined(USE_GCC_SHLIB)
-BUILDLINK_DEPMETHOD.gcc3cxx+=  full
+BUILDLINK_DEPMETHOD.gcc3-cxx+= full
 .else
-BUILDLINK_DEPMETHOD.gcc3cxx?=  build
+BUILDLINK_DEPMETHOD.gcc3-cxx?= build
 .endif
 
-.endif # GCC3CXX_BUILDLINK3_MK
+.endif # GCC3_CXX_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=      ${BUILDLINK_DEPTH:S/+$//}
diff -r c559db53a9f4 -r 607fdff8b6b4 lang/gcc3-c/buildlink2.mk
--- a/lang/gcc3-c/buildlink2.mk Thu Mar 18 03:42:13 2004 +0000
+++ b/lang/gcc3-c/buildlink2.mk Thu Mar 18 04:19:39 2004 +0000
@@ -1,40 +1,40 @@
-# $NetBSD: buildlink2.mk,v 1.5 2004/02/21 10:37:27 jlam Exp $
+# $NetBSD: buildlink2.mk,v 1.6 2004/03/18 04:19:39 jlam Exp $
 
-.if !defined(GCC3C_BUILDLINK2_MK)
-GCC3C_BUILDLINK2_MK=   # defined
+.if !defined(GCC3_C_BUILDLINK2_MK)
+GCC3_C_BUILDLINK2_MK=  # defined
 
 .include "../../mk/bsd.prefs.mk"
 
 .if defined(GCC3_INSTALLTO_SUBPREFIX)
 GCC3_PKGMODIF=                 _${GCC3_INSTALLTO_SUBPREFIX}
 .endif
-BUILDLINK_PACKAGES+=           gcc3c
-BUILDLINK_DEPENDS.gcc3c?=      gcc3${GCC3_PKGMODIF}-c>=${_GCC_REQD}
-BUILDLINK_PKGSRCDIR.gcc3c?=    ../../lang/gcc3-c
+BUILDLINK_PACKAGES+=           gcc3-c
+BUILDLINK_DEPENDS.gcc3-c?=     gcc3${GCC3_PKGMODIF}-c>=${_GCC_REQD}
+BUILDLINK_PKGSRCDIR.gcc3-c?=   ../../lang/gcc3-c
 
 # Packages that link against gcc shared libraries need a full
 # dependency.
 #
 .if defined(USE_GCC_SHLIB)
-BUILDLINK_DEPMETHOD.gcc3c+=    full
+BUILDLINK_DEPMETHOD.gcc3-c+=   full
 .else
-BUILDLINK_DEPMETHOD.gcc3c?=    build
+BUILDLINK_DEPMETHOD.gcc3-c?=   build
 .endif
 
-BUILDLINK_PREFIX.gcc3c=        ${LOCALBASE}
+BUILDLINK_PREFIX.gcc3-c=       ${LOCALBASE}
 BUILDLINK_WRAPPER_ENV+=        \
        COMPILER_PATH="${BUILDLINK_DIR}/bin"; export COMPILER_PATH
 
-BUILDLINK_FILES.gcc3c= ${_GCC_SUBPREFIX}lib/gcc-lib/*/*/include/*/*/*/*
-BUILDLINK_FILES.gcc3c+=        ${_GCC_SUBPREFIX}lib/gcc-lib/*/*/include/*/*/*
-BUILDLINK_FILES.gcc3c+=        ${_GCC_SUBPREFIX}lib/gcc-lib/*/*/include/*/*
-BUILDLINK_FILES.gcc3c+=        ${_GCC_SUBPREFIX}lib/gcc-lib/*/*/include/*
-BUILDLINK_FILES.gcc3c+=        ${_GCC_SUBPREFIX}lib/gcc-lib/*/*/lib*.*
-BUILDLINK_FILES.gcc3c+=        ${_GCC_SUBPREFIX}lib/gcc-lib/*/*/specs
-BUILDLINK_FILES.gcc3c+=        ${_GCC_SUBPREFIX}lib/libgcc_s.*
+BUILDLINK_FILES.gcc3-c=        ${_GCC_SUBPREFIX}lib/gcc-lib/*/*/include/*/*/*/*
+BUILDLINK_FILES.gcc3-c+=${_GCC_SUBPREFIX}lib/gcc-lib/*/*/include/*/*/*
+BUILDLINK_FILES.gcc3-c+=${_GCC_SUBPREFIX}lib/gcc-lib/*/*/include/*/*
+BUILDLINK_FILES.gcc3-c+=${_GCC_SUBPREFIX}lib/gcc-lib/*/*/include/*
+BUILDLINK_FILES.gcc3-c+=${_GCC_SUBPREFIX}lib/gcc-lib/*/*/lib*.*
+BUILDLINK_FILES.gcc3-c+=${_GCC_SUBPREFIX}lib/gcc-lib/*/*/specs
+BUILDLINK_FILES.gcc3-c+=${_GCC_SUBPREFIX}lib/libgcc_s.*
 
-BUILDLINK_PRE_TARGETS+=        gcc3c-buildlink
+BUILDLINK_PRE_TARGETS+=        gcc3-c-buildlink
 
-gcc3c-buildlink: _BUILDLINK_USE
+gcc3-c-buildlink: _BUILDLINK_USE
 
-.endif # GCC3C_BUILDLINK2_MK
+.endif # GCC3_C_BUILDLINK2_MK
diff -r c559db53a9f4 -r 607fdff8b6b4 lang/gcc3-c/buildlink3.mk
--- a/lang/gcc3-c/buildlink3.mk Thu Mar 18 03:42:13 2004 +0000
+++ b/lang/gcc3-c/buildlink3.mk Thu Mar 18 04:19:39 2004 +0000
@@ -1,18 +1,18 @@
-# $NetBSD: buildlink3.mk,v 1.6 2004/03/16 18:23:27 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2004/03/18 04:19:39 jlam Exp $
 
 BUILDLINK_DEPTH:=      ${BUILDLINK_DEPTH}+
-GCC3C_BUILDLINK3_MK:=  ${GCC3C_BUILDLINK3_MK}+
+GCC3_C_BUILDLINK3_MK:= ${GCC3_C_BUILDLINK3_MK}+
 
 .include "../../mk/bsd.prefs.mk"
 
 .if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=    gcc3c
+BUILDLINK_DEPENDS+=    gcc3-c
 .endif
 
-BUILDLINK_PACKAGES:=   ${BUILDLINK_PACKAGES:Ngcc3c}
-BUILDLINK_PACKAGES+=   gcc3c
+BUILDLINK_PACKAGES:=   ${BUILDLINK_PACKAGES:Ngcc3-c}
+BUILDLINK_PACKAGES+=   gcc3-c
 
-.if !empty(GCC3C_BUILDLINK3_MK:M+)
+.if !empty(GCC3_C_BUILDLINK3_MK:M+)
 .  if defined(GCC3_INSTALLTO_SUBPREFIX)
 #
 # "gcc3" is the directory named in pkgsrc/lang/gcc3-c/Makefile.common"
@@ -22,19 +22,19 @@
 GCC3_PKGMODIF= _${GCC3_INSTALLTO_SUBPREFIX}
 .    endif
 .  endif
-BUILDLINK_PKGBASE.gcc3c?=      gcc3${GCC3_PKGMODIF}-c
-BUILDLINK_DEPENDS.gcc3c+=      gcc3${GCC3_PKGMODIF}-c>=${_GCC_REQD}
-BUILDLINK_PKGSRCDIR.gcc3c?=    ../../lang/gcc3-c
-BUILDLINK_LIBDIRS.gcc3c?=      \
-       lib ${_GCC_ARCHDIR:S/^${BUILDLINK_PREFIX.gcc3c}\///}
+BUILDLINK_PKGBASE.gcc3-c?=     gcc3${GCC3_PKGMODIF}-c
+BUILDLINK_DEPENDS.gcc3-c+=     gcc3${GCC3_PKGMODIF}-c>=${_GCC_REQD}
+BUILDLINK_PKGSRCDIR.gcc3-c?=   ../../lang/gcc3-c
+BUILDLINK_LIBDIRS.gcc3-c?=     \
+       lib ${_GCC_ARCHDIR:S/^${BUILDLINK_PREFIX.gcc3-c}\///}
 
 # Packages that link against shared libraries need a full dependency.
 .if defined(USE_GCC_SHLIB)
-BUILDLINK_DEPMETHOD.gcc3c+=    full
+BUILDLINK_DEPMETHOD.gcc3-c+=   full
 .else
-BUILDLINK_DEPMETHOD.gcc3c?=    build
+BUILDLINK_DEPMETHOD.gcc3-c?=   build
 .endif
 
-.endif # GCC3C_BUILDLINK3_MK
+.endif # GCC3_C_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=      ${BUILDLINK_DEPTH:S/+$//}
diff -r c559db53a9f4 -r 607fdff8b6b4 lang/gcc3-f77/buildlink2.mk
--- a/lang/gcc3-f77/buildlink2.mk       Thu Mar 18 03:42:13 2004 +0000
+++ b/lang/gcc3-f77/buildlink2.mk       Thu Mar 18 04:19:39 2004 +0000
@@ -1,36 +1,36 @@
-# $NetBSD: buildlink2.mk,v 1.2 2004/03/01 11:39:58 markd Exp $
+# $NetBSD: buildlink2.mk,v 1.3 2004/03/18 04:19:39 jlam Exp $
 
-.if !defined(GCC3F77_BUILDLINK2_MK)
-GCC3F77_BUILDLINK2_MK= # defined
+.if !defined(GCC3_F77_BUILDLINK2_MK)
+GCC3_F77_BUILDLINK2_MK=        # defined
 
 .include "../../mk/bsd.prefs.mk"
 
 .if defined(GCC3_INSTALLTO_SUBPREFIX)
 GCC3_PKGMODIF=                 _${GCC3_INSTALLTO_SUBPREFIX}
 .endif
-BUILDLINK_PACKAGES+=           gcc3f77
-BUILDLINK_DEPENDS.gcc3f77?=    gcc3${GCC3_PKGMODIF}-f77>=${_GCC_REQD}
-BUILDLINK_PKGSRCDIR.gcc3f77?=  ../../lang/gcc3-f77
+BUILDLINK_PACKAGES+=           gcc3-f77
+BUILDLINK_DEPENDS.gcc3-f77?=   gcc3${GCC3_PKGMODIF}-f77>=${_GCC_REQD}
+BUILDLINK_PKGSRCDIR.gcc3-f77?= ../../lang/gcc3-f77
 
 # Packages that link against gcc shared libraries need a full
 # dependency.
 #
 .if defined(USE_GCC_SHLIB)
-BUILDLINK_DEPMETHOD.gcc3f77+=  full
+BUILDLINK_DEPMETHOD.gcc3-f77+= full
 .else
-BUILDLINK_DEPMETHOD.gcc3f77?=  build
+BUILDLINK_DEPMETHOD.gcc3-f77?= build
 .endif
 
-BUILDLINK_PREFIX.gcc3f77=      ${LOCALBASE}
+BUILDLINK_PREFIX.gcc3-f77=     ${LOCALBASE}
 BUILDLINK_WRAPPER_ENV+=        \
        COMPILER_PATH="${BUILDLINK_DIR}/bin"; export COMPILER_PATH
 
-BUILDLINK_FILES.gcc3f77=       ${_GCC_SUBPREFIX}lib/gcc-lib/*/*/include/g2c.h
-BUILDLINK_FILES.gcc3f77+=      ${_GCC_SUBPREFIX}lib/libfrtbegin.*
-BUILDLINK_FILES.gcc3f77+=      ${_GCC_SUBPREFIX}lib/libg2c.*
+BUILDLINK_FILES.gcc3-f77=      ${_GCC_SUBPREFIX}lib/gcc-lib/*/*/include/g2c.h
+BUILDLINK_FILES.gcc3-f77+=     ${_GCC_SUBPREFIX}lib/libfrtbegin.*
+BUILDLINK_FILES.gcc3-f77+=     ${_GCC_SUBPREFIX}lib/libg2c.*
 
-BUILDLINK_TARGETS+=    gcc3f77-buildlink
+BUILDLINK_TARGETS+=    gcc3-f77-buildlink
 
-gcc3f77-buildlink: _BUILDLINK_USE
+gcc3-f77-buildlink: _BUILDLINK_USE
 
-.endif # GCC3F77_BUILDLINK2_MK
+.endif # GCC3_F77_BUILDLINK2_MK
diff -r c559db53a9f4 -r 607fdff8b6b4 lang/gcc3-f77/buildlink3.mk
--- a/lang/gcc3-f77/buildlink3.mk       Thu Mar 18 03:42:13 2004 +0000
+++ b/lang/gcc3-f77/buildlink3.mk       Thu Mar 18 04:19:39 2004 +0000
@@ -1,36 +1,36 @@
-# $NetBSD: buildlink3.mk,v 1.7 2004/03/16 18:23:27 jlam Exp $
Prev by Date: [pkgsrc/trunk]: pkgsrc/mail/drac This uses rpcgen, so set NO_EXPORT_CPP.
Next by Date: [pkgsrc/trunk]: pkgsrc/mk/buildlink3 Back out part of previous that was an un...
Previous by Thread: [pkgsrc/trunk]: pkgsrc/mail/drac This uses rpcgen, so set NO_EXPORT_CPP.
Next by Thread: [pkgsrc/trunk]: pkgsrc/mk/buildlink3 Back out part of previous that was an un...
Indexes:
Home | Main Index | Thread Index | Old Index