[pkgsrc/trunk]: pkgsrc Use the new BUILDLINK_TRANSFORM commands to more preci...

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc Use the new BUILDLINK_TRANSFORM commands to more preci...
From: jlam <jlam%pkgsrc.org@localhost>
Date: Thu, 14 Oct 2021 00:30:55 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/0c02408cb0db
branches:  trunk
changeset: 480020:0c02408cb0db
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Sat Aug 28 06:05:31 2004 +0000

description:
Use the new BUILDLINK_TRANSFORM commands to more precisely state the
intended transformation: use "rm" to remove an option, "rmdir" to remove
all options containing a path starting with a given directory name, and
"rename" to rename options to something else.

diffstat:

 audio/flac/Makefile                 |   4 ++--
 audio/oss/buildlink3.mk             |   4 ++--
 chat/icb/Makefile                   |   4 ++--
 converters/libiconv/builtin.mk      |   4 ++--
 databases/db4/Makefile              |   6 +++---
 devel/devhelp/Makefile              |   6 +++---
 devel/gettext-lib/builtin.mk        |   4 ++--
 devel/libslang/Makefile             |   6 +++---
 games/quake2forge/Makefile          |   4 ++--
 graphics/MesaLib/Makefile           |   4 ++--
 graphics/giram/Makefile             |   4 ++--
 ham/xdx/Makefile                    |   4 ++--
 lang/gauche/Makefile                |   4 ++--
 lang/sablevm/Makefile               |   4 ++--
 mail/evolution/Makefile             |   6 +++---
 misc/gperiodic/Makefile             |  10 +++++-----
 multimedia/avidemux/Makefile        |   4 ++--
 net/ed2k-gtk-gui/Makefile           |   4 ++--
 security/openssl/buildlink3.mk      |   6 +++---
 sysutils/cdrecord-xcdroast/Makefile |   5 ++---
 sysutils/cdrtools-ossdvd/Makefile   |   5 ++---
 sysutils/grub/Makefile              |   4 ++--
 sysutils/gtk-send-pr/Makefile       |   4 ++--
 textproc/p5-XML-Xerces/Makefile     |   4 ++--
 x11/gnome-themes-extras/Makefile    |   6 +++---
 x11/gtk2-theme-switch/Makefile      |   4 ++--
 x11/xpad/Makefile                   |   4 ++--
 27 files changed, 63 insertions(+), 65 deletions(-)

diffs (truncated from 510 to 300 lines):

diff -r 57b7b0e909cc -r 0c02408cb0db audio/flac/Makefile
--- a/audio/flac/Makefile       Sat Aug 28 06:02:21 2004 +0000
+++ b/audio/flac/Makefile       Sat Aug 28 06:05:31 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2004/05/15 14:39:54 grant Exp $
+# $NetBSD: Makefile,v 1.24 2004/08/28 06:05:31 jlam Exp $
 #
 
 DISTNAME=              flac-1.1.0
@@ -32,7 +32,7 @@
 #
 .include "../../mk/compiler.mk"
 .if !empty(PKGSRC_COMPILER:Mmipspro)
-BUILDLINK_TRANSFORM+=  S:-O3:
+BUILDLINK_TRANSFORM+=  rm:-O3
 .endif
 
 .include "../../multimedia/libogg/buildlink3.mk"
diff -r 57b7b0e909cc -r 0c02408cb0db audio/oss/buildlink3.mk
--- a/audio/oss/buildlink3.mk   Sat Aug 28 06:02:21 2004 +0000
+++ b/audio/oss/buildlink3.mk   Sat Aug 28 06:05:31 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2004/03/05 19:25:08 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2004/08/28 06:05:31 jlam Exp $
 
 BUILDLINK_DEPTH:=      ${BUILDLINK_DEPTH}+
 OSS_BUILDLINK3_MK:=    ${OSS_BUILDLINK3_MK}+
@@ -18,7 +18,7 @@
 # If we are using audio/oss, then we don't need the NetBSD OSS
 # compatibility library.
 #
-BUILDLINK_TRANSFORM+=  l:ossaudio:
+BUILDLINK_TRANSFORM+=  rm:-lossaudio
 
 BUILDLINK_TARGETS+=    buildlink-oss-soundcard-h
 
diff -r 57b7b0e909cc -r 0c02408cb0db chat/icb/Makefile
--- a/chat/icb/Makefile Sat Aug 28 06:02:21 2004 +0000
+++ b/chat/icb/Makefile Sat Aug 28 06:05:31 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2004/03/29 03:30:57 schmonz Exp $
+# $NetBSD: Makefile,v 1.10 2004/08/28 06:05:31 jlam Exp $
 #
 
 # Note: The file ftp://ftp.icb.net/pub/icb/icb-0.9grok2.tar.gz is way
@@ -20,7 +20,7 @@
 .include "../../mk/bsd.prefs.mk"
 
 .if ${OPSYS} == "Darwin"
-BUILDLINK_TRANSFORM+=  s:-ltermcap:
+BUILDLINK_TRANSFORM+=  rm:-ltermcap
 .endif
 
 INSTALLATION_DIRS=     bin libdata libdata/icb
diff -r 57b7b0e909cc -r 0c02408cb0db converters/libiconv/builtin.mk
--- a/converters/libiconv/builtin.mk    Sat Aug 28 06:02:21 2004 +0000
+++ b/converters/libiconv/builtin.mk    Sat Aug 28 06:05:31 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.5 2004/06/04 05:21:14 reed Exp $
+# $NetBSD: builtin.mk,v 1.6 2004/08/28 06:05:31 jlam Exp $
 
 .if !defined(_LIBICONV_FOUND)
 _LIBICONV_FOUND!=                                                      \
@@ -130,7 +130,7 @@
 _LIBICONV=             -liconv
 .  else
 _LIBICONV=             # empty
-BUILDLINK_TRANSFORM+=  l:iconv:
+BUILDLINK_TRANSFORM+=  rm:-liconv
 .  endif
 .endif
 
diff -r 57b7b0e909cc -r 0c02408cb0db databases/db4/Makefile
--- a/databases/db4/Makefile    Sat Aug 28 06:02:21 2004 +0000
+++ b/databases/db4/Makefile    Sat Aug 28 06:05:31 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2004/07/01 15:17:21 recht Exp $
+# $NetBSD: Makefile,v 1.22 2004/08/28 06:05:31 jlam Exp $
 
 DISTNAME=              db-4.2.52
 PKGNAME=               ${DISTNAME:S/db/db4/}
@@ -45,9 +45,9 @@
 .    if !empty(_GCC_IS_TOO_OLD:M[yY][eE][sS])
 #
 # Pre-3.3 GCC has an optimization bug tickled by the db4 code, so remove
-# optimization when 
+# optimization.
 #
-BUILDLINK_TRANSFORM+=  S:-O[0-9]*:
+BUILDLINK_TRANSFORM+=  rm:-O[0-9]*
 .    endif
 .  endif
 .endif
diff -r 57b7b0e909cc -r 0c02408cb0db devel/devhelp/Makefile
--- a/devel/devhelp/Makefile    Sat Aug 28 06:02:21 2004 +0000
+++ b/devel/devhelp/Makefile    Sat Aug 28 06:05:31 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2004/04/19 13:41:28 recht Exp $
+# $NetBSD: Makefile,v 1.15 2004/08/28 06:05:31 jlam Exp $
 
 DISTNAME=              devhelp-0.7
 PKGREVISION=           9
@@ -21,8 +21,8 @@
 GNU_CONFIGURE=         yes
 CONFIGURE_ARGS+=       --with-html-widget=gtkhtml2
 
-BUILDLINK_TRANSFORM+=  S:-DG_DISABLE_DEPRECATED:
-BUILDLINK_TRANSFORM+=  S:-DGTK_DISABLE_DEPRECATED:
+BUILDLINK_TRANSFORM+=  rm:-DG_DISABLE_DEPRECATED
+BUILDLINK_TRANSFORM+=  rm:-DGTK_DISABLE_DEPRECATED
 
 post-install:
        ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/devhelp
diff -r 57b7b0e909cc -r 0c02408cb0db devel/gettext-lib/builtin.mk
--- a/devel/gettext-lib/builtin.mk      Sat Aug 28 06:02:21 2004 +0000
+++ b/devel/gettext-lib/builtin.mk      Sat Aug 28 06:05:31 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.7 2004/05/09 20:31:07 danw Exp $
+# $NetBSD: builtin.mk,v 1.8 2004/08/28 06:05:31 jlam Exp $
 
 .if !defined(_BLNK_LIBINTL_FOUND)
 _BLNK_LIBINTL_FOUND!=  \
@@ -135,7 +135,7 @@
 _BLNK_LIBINTL=         -lintl
 .  else
 _BLNK_LIBINTL=         # empty
-BUILDLINK_TRANSFORM+=  l:intl:
+BUILDLINK_TRANSFORM+=  rm:-lintl
 .  endif
 .endif
 
diff -r 57b7b0e909cc -r 0c02408cb0db devel/libslang/Makefile
--- a/devel/libslang/Makefile   Sat Aug 28 06:02:21 2004 +0000
+++ b/devel/libslang/Makefile   Sat Aug 28 06:05:31 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.49 2004/02/14 15:29:15 jlam Exp $
+# $NetBSD: Makefile,v 1.50 2004/08/28 06:05:32 jlam Exp $
 #
 
 DISTNAME=      slang-1.4.9
@@ -32,8 +32,8 @@
 .include "../../mk/bsd.prefs.mk"
 
 # Debian doesn't have -ltermcap, use -lncurses instead
-.if ${OPSYS} == "Linux" && ${LOWER_VENDOR} == "debian"
-BUILDLINK_TRANSFORM+=  l:termcap:
+.if (${OPSYS} == "Linux") && (${LOWER_VENDOR} == "debian")
+BUILDLINK_TRANSFORM+=  rm:-ltermcap
 .  include "../../devel/ncurses/buildlink3.mk"
 .endif
 
diff -r 57b7b0e909cc -r 0c02408cb0db games/quake2forge/Makefile
--- a/games/quake2forge/Makefile        Sat Aug 28 06:02:21 2004 +0000
+++ b/games/quake2forge/Makefile        Sat Aug 28 06:05:31 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2004/08/24 23:11:17 snj Exp $
+# $NetBSD: Makefile,v 1.9 2004/08/28 06:05:32 jlam Exp $
 #
 
 DISTNAME=      quake2-0.2.1
@@ -20,7 +20,7 @@
 USE_BUILTIN.glu=       yes
 USE_BUILTIN.MesaLib=   yes
 
-BUILDLINK_TRANSFORM+=  S:-Werror:
+BUILDLINK_TRANSFORM+=  rm:-Werror
 CONFIGURE_ARGS+=       --program-transform-name='s/^quake2$$/quake2forge/'
 
 post-install:
diff -r 57b7b0e909cc -r 0c02408cb0db graphics/MesaLib/Makefile
--- a/graphics/MesaLib/Makefile Sat Aug 28 06:02:21 2004 +0000
+++ b/graphics/MesaLib/Makefile Sat Aug 28 06:05:31 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2004/03/03 00:20:19 snj Exp $
+# $NetBSD: Makefile,v 1.32 2004/08/28 06:05:32 jlam Exp $
 #
 
 PKGNAME=       MesaLib-${MESA_VERSION}
@@ -24,7 +24,7 @@
 .endif
 
 .if !empty(CC_VERSION:Mgcc-3*)
-BUILDLINK_TRANSFORM+=   S:-O[23]:
+BUILDLINK_TRANSFORM+=   rm:-O[23]
 .endif
 
 pre-build:
diff -r 57b7b0e909cc -r 0c02408cb0db graphics/giram/Makefile
--- a/graphics/giram/Makefile   Sat Aug 28 06:02:21 2004 +0000
+++ b/graphics/giram/Makefile   Sat Aug 28 06:05:31 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.37 2004/05/16 00:57:24 kristerw Exp $
+# $NetBSD: Makefile,v 1.38 2004/08/28 06:05:32 jlam Exp $
 #
 
 DISTNAME=      giram-0.3.5
@@ -27,7 +27,7 @@
 
 SHLIBTOOL_OVERRIDE=    libtool
 
-BUILDLINK_TRANSFORM+=  S:-DGTK_DISABLE_DEPRECATED:
+BUILDLINK_TRANSFORM+=  rm:-DGTK_DISABLE_DEPRECATED
 
 OWN_DIRS+=     ${PKG_SYSCONFDIR}/0.3
 CONF_FILES+=   ${PREFIX}/share/examples/giram/giramrc          \
diff -r 57b7b0e909cc -r 0c02408cb0db ham/xdx/Makefile
--- a/ham/xdx/Makefile  Sat Aug 28 06:02:21 2004 +0000
+++ b/ham/xdx/Makefile  Sat Aug 28 06:05:31 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2004/05/03 22:37:30 kristerw Exp $
+# $NetBSD: Makefile,v 1.3 2004/08/28 06:05:32 jlam Exp $
 #
 
 DISTNAME=      xdx-1.1
@@ -14,7 +14,7 @@
 GNU_CONFIGURE= yes
 USE_PKGLOCALEDIR=yes
 
-BUILDLINK_TRANSFORM+=  S:-DGTK_DISABLE_DEPRECATED:
+BUILDLINK_TRANSFORM+=  rm:-DGTK_DISABLE_DEPRECATED
 
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 57b7b0e909cc -r 0c02408cb0db lang/gauche/Makefile
--- a/lang/gauche/Makefile      Sat Aug 28 06:02:21 2004 +0000
+++ b/lang/gauche/Makefile      Sat Aug 28 06:05:31 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2004/08/18 13:51:50 minoura Exp $
+# $NetBSD: Makefile,v 1.25 2004/08/28 06:05:32 jlam Exp $
 #
 
 DISTNAME=      Gauche-0.8.1
@@ -38,5 +38,5 @@
 .if !empty(_WITH_ICONV_LIB)
 CONFIGURE_ARGS+=       --with-iconv-lib=${_WITH_ICONV_LIB}
 .else
-BUILDLINK_TRANSFORM+=  S:-liconv:
+BUILDLINK_TRANSFORM+=  rm:-liconv
 .endif
diff -r 57b7b0e909cc -r 0c02408cb0db lang/sablevm/Makefile
--- a/lang/sablevm/Makefile     Sat Aug 28 06:02:21 2004 +0000
+++ b/lang/sablevm/Makefile     Sat Aug 28 06:05:31 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2004/05/23 10:25:30 jmmv Exp $
+# $NetBSD: Makefile,v 1.4 2004/08/28 06:05:32 jlam Exp $
 #
 
 DISTNAME=      sablevm-1.1.3
@@ -34,7 +34,7 @@
 
 .if !exists(/usr/include/semaphore.h)
 LDFLAGS+=      -lsemaphore
-BUILDLINK_TRANSFORM+=  l:rt:semaphore:
+BUILDLINK_TRANSFORM+=  l:rt:semaphore
 .include "../../devel/pthread-sem/buildlink3.mk"
 .endif
 .include "../../devel/libffi/buildlink3.mk"
diff -r 57b7b0e909cc -r 0c02408cb0db mail/evolution/Makefile
--- a/mail/evolution/Makefile   Sat Aug 28 06:02:21 2004 +0000
+++ b/mail/evolution/Makefile   Sat Aug 28 06:05:31 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.62 2004/05/06 10:03:54 recht Exp $
+# $NetBSD: Makefile,v 1.63 2004/08/28 06:05:32 jlam Exp $
 
 DISTNAME=              evolution-1.4.6
 CATEGORIES=            mail time gnome
@@ -69,8 +69,8 @@
 GCONF2_SCHEMAS+=       apps_evolution_summary.schemas
 GCONF2_SCHEMAS+=       evolution-mail.schemas
 
-BUILDLINK_TRANSFORM+=  S:-DG_DISABLE_DEPRECATED:
-BUILDLINK_TRANSFORM+=  S:-DGTK_DISABLE_DEPRECATED:
+BUILDLINK_TRANSFORM+=  rm:-DG_DISABLE_DEPRECATED
+BUILDLINK_TRANSFORM+=  rm:-DGTK_DISABLE_DEPRECATED
 
 .if !exists(/usr/include/semaphore.h)
 LDFLAGS+=      -lsemaphore
diff -r 57b7b0e909cc -r 0c02408cb0db misc/gperiodic/Makefile
--- a/misc/gperiodic/Makefile   Sat Aug 28 06:02:21 2004 +0000
+++ b/misc/gperiodic/Makefile   Sat Aug 28 06:05:31 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2004/04/28 05:33:58 snj Exp $
+# $NetBSD: Makefile,v 1.25 2004/08/28 06:05:32 jlam Exp $
 
 DISTNAME=              gperiodic-2.0.7
 PKGREVISION=           2
@@ -17,10 +17,10 @@
 USE_X11=               # defined
 USE_GNU_TOOLS+=                make
 
-BUILDLINK_TRANSFORM+=  S:-DG_DISABLE_DEPRECATED:
-BUILDLINK_TRANSFORM+=  S:-DGDK_DISABLE_DEPRECATED:
-BUILDLINK_TRANSFORM+=  S:-DGDK_PIXBUF_DISABLE_DEPRECATED:
-BUILDLINK_TRANSFORM+=  S:-DGTK_DISABLE_DEPRECATED:
+BUILDLINK_TRANSFORM+=  rm:-DG_DISABLE_DEPRECATED
+BUILDLINK_TRANSFORM+=  rm:-DGDK_DISABLE_DEPRECATED
+BUILDLINK_TRANSFORM+=  rm:-DGDK_PIXBUF_DISABLE_DEPRECATED
+BUILDLINK_TRANSFORM+=  rm:-DGTK_DISABLE_DEPRECATED
 
 MAKE_ENV+=             PKGLOCALEDIR=${PKGLOCALEDIR}
Prev by Date: [pkgsrc/trunk]: pkgsrc/regress/buildlink-unwrap Regression test for whether *...
Next by Date: [pkgsrc/trunk]: pkgsrc/regress/buildlink-transform Add some more tests for "l...
Previous by Thread: [pkgsrc/trunk]: pkgsrc/regress/buildlink-unwrap Regression test for whether *...
Next by Thread: [pkgsrc/trunk]: pkgsrc/regress/buildlink-transform Add some more tests for "l...
Indexes:
Home | Main Index | Thread Index | Old Index