diff options
-rw-r--r-- | chat/jabberd2/Makefile | 4 | ||||
-rw-r--r-- | devel/gnustep-objc-lf2/buildlink3.mk | 4 | ||||
-rw-r--r-- | devel/ncurses/builtin.mk | 4 | ||||
-rw-r--r-- | devel/readline/buildlink3.mk | 4 | ||||
-rw-r--r-- | doc/guide/files/buildlink.xml | 4 | ||||
-rw-r--r-- | games/neverball/Makefile | 6 | ||||
-rw-r--r-- | lang/classpath-gui/Makefile | 4 | ||||
-rw-r--r-- | lang/gcc3-ada/buildlink3.mk | 4 | ||||
-rw-r--r-- | lang/gcc34-ada/buildlink3.mk | 4 | ||||
-rw-r--r-- | lang/gcc34/buildlink3.mk | 4 | ||||
-rw-r--r-- | lang/guile14/buildlink3.mk | 4 | ||||
-rw-r--r-- | mk/buildlink3/bsd.buildlink3.mk | 14 | ||||
-rw-r--r-- | multimedia/kaffeine/Makefile | 4 | ||||
-rw-r--r-- | multimedia/vlc/Makefile | 4 | ||||
-rw-r--r-- | multimedia/vlc07/Makefile | 4 | ||||
-rw-r--r-- | pkgtools/pkglint/files/deprecated.map | 5 | ||||
-rw-r--r-- | pkgtools/pkglint/files/makevars.map | 4 | ||||
-rw-r--r-- | pkgtools/x11-links/buildlink3.mk | 4 | ||||
-rw-r--r-- | security/gpgme03/buildlink3.mk | 6 | ||||
-rw-r--r-- | x11/qt1/buildlink3.mk | 4 | ||||
-rw-r--r-- | x11/xorg-libs/buildlink3.mk | 4 |
21 files changed, 53 insertions, 46 deletions
diff --git a/chat/jabberd2/Makefile b/chat/jabberd2/Makefile index a268ca19617..1136e98b506 100644 --- a/chat/jabberd2/Makefile +++ b/chat/jabberd2/Makefile @@ -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 @@ USE_LIBTOOL= yes 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 --git a/devel/gnustep-objc-lf2/buildlink3.mk b/devel/gnustep-objc-lf2/buildlink3.mk index 2e79c31565a..de278980b07 100644 --- a/devel/gnustep-objc-lf2/buildlink3.mk +++ b/devel/gnustep-objc-lf2/buildlink3.mk @@ -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_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gnustep-objc-lf2 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 --git a/devel/ncurses/builtin.mk b/devel/ncurses/builtin.mk index 3297d8aa5a2..a3b9b68672f 100644 --- a/devel/ncurses/builtin.mk +++ b/devel/ncurses/builtin.mk @@ -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 @@ BUILDLINK_LDADD.ncurses= -lncurses . 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 --git a/devel/readline/buildlink3.mk b/devel/readline/buildlink3.mk index 3d6126d14f1..67c925f7d84 100644 --- a/devel/readline/buildlink3.mk +++ b/devel/readline/buildlink3.mk @@ -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_PKGSRCDIR.readline?= ../../devel/readline 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 --git a/doc/guide/files/buildlink.xml b/doc/guide/files/buildlink.xml index f1bffbfdce3..a82ab55f488 100644 --- a/doc/guide/files/buildlink.xml +++ b/doc/guide/files/buildlink.xml @@ -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 --git a/games/neverball/Makefile b/games/neverball/Makefile index c4c023e3096..047d1eb2ab7 100644 --- a/games/neverball/Makefile +++ b/games/neverball/Makefile @@ -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 @@ COMMENT= Part puzzle game, part action game and with SDL graphics 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 --git a/lang/classpath-gui/Makefile b/lang/classpath-gui/Makefile index 006a4bdacca..0da5a304ae6 100644 --- a/lang/classpath-gui/Makefile +++ b/lang/classpath-gui/Makefile @@ -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 @@ BUILD_DIRS+= native/jni/gtk-peer 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 --git a/lang/gcc3-ada/buildlink3.mk b/lang/gcc3-ada/buildlink3.mk index d733024b36d..fe4e38f188c 100644 --- a/lang/gcc3-ada/buildlink3.mk +++ b/lang/gcc3-ada/buildlink3.mk @@ -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_INCDIRS.gcc3-ada+= include ${_GCC_ARCHDIR:S/^${BUILDLINK_PREFIX. 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 --git a/lang/gcc34-ada/buildlink3.mk b/lang/gcc34-ada/buildlink3.mk index 7d8d03a6ab4..4e7668799c6 100644 --- a/lang/gcc34-ada/buildlink3.mk +++ b/lang/gcc34-ada/buildlink3.mk @@ -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_INCDIRS.gcc34-ada+= include ${_GCC_ARCHDIR:S/^${BUILDLINK_PREFIX.gcc34 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 --git a/lang/gcc34/buildlink3.mk b/lang/gcc34/buildlink3.mk index d955254f31e..28a3816baa7 100644 --- a/lang/gcc34/buildlink3.mk +++ b/lang/gcc34/buildlink3.mk @@ -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_INCDIRS.gcc34+= include ${_GCC_ARCHDIR:S/^${BUILDLINK_PREFIX.gcc34}\// 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 --git a/lang/guile14/buildlink3.mk b/lang/guile14/buildlink3.mk index 6e9dd591532..457fd0e9b3a 100644 --- a/lang/guile14/buildlink3.mk +++ b/lang/guile14/buildlink3.mk @@ -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_PKGSRCDIR.guile14?= ../../lang/guile14 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 --git a/mk/buildlink3/bsd.buildlink3.mk b/mk/buildlink3/bsd.buildlink3.mk index 9caa72e2dbf..6bda459761b 100644 --- a/mk/buildlink3/bsd.buildlink3.mk +++ b/mk/buildlink3/bsd.buildlink3.mk @@ -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 @@ buildlink-directories: # +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 @@ ${_BLNK_COOKIE.${_pkg_}}: ${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 @@ ${_BLNK_COOKIE.${_pkg_}}: 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 --git a/multimedia/kaffeine/Makefile b/multimedia/kaffeine/Makefile index 3d5ab80c4ad..7684c3eb2ff 100644 --- a/multimedia/kaffeine/Makefile +++ b/multimedia/kaffeine/Makefile @@ -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-dpms 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 --git a/multimedia/vlc/Makefile b/multimedia/vlc/Makefile index 36d75d19e3a..1ec927433e8 100644 --- a/multimedia/vlc/Makefile +++ b/multimedia/vlc/Makefile @@ -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_SED.fnt= -e "s,${ORIGFNT},${DEFAULT_FONT}," 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 --git a/multimedia/vlc07/Makefile b/multimedia/vlc07/Makefile index 62900e35318..5c4f0d131a1 100644 --- a/multimedia/vlc07/Makefile +++ b/multimedia/vlc07/Makefile @@ -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_STAGE.libav= post-patch 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" diff --git a/pkgtools/pkglint/files/deprecated.map b/pkgtools/pkglint/files/deprecated.map index 94a786c0363..0b7d7b1a487 100644 --- a/pkgtools/pkglint/files/deprecated.map +++ b/pkgtools/pkglint/files/deprecated.map @@ -1,4 +1,4 @@ -# $NetBSD: deprecated.map,v 1.50 2006/11/18 08:20:44 rillig Exp $ +# $NetBSD: deprecated.map,v 1.51 2007/01/17 03:11:19 rillig Exp $ # # This file contains names of Makefile variables and a short explanation @@ -126,3 +126,6 @@ MAKEFILE Use MAKE_FILE instead. # November 2006 SKIP_PORTABILITY_CHECK Use CHECK_PORTABILITY_SKIP (a list of patterns) instead. PKG_SKIP_REASON Use PKG_FAIL_REASON instead. + +# January 2007 +BUILDLINK_TRANSFORM.* Use BUILDLINK_FNAME_TRANSFORM.* instead. diff --git a/pkgtools/pkglint/files/makevars.map b/pkgtools/pkglint/files/makevars.map index 7b9e85d4ea8..e33eaac5805 100644 --- a/pkgtools/pkglint/files/makevars.map +++ b/pkgtools/pkglint/files/makevars.map @@ -1,4 +1,4 @@ -# $NetBSD: makevars.map,v 1.153 2007/01/15 08:44:39 rillig Exp $ +# $NetBSD: makevars.map,v 1.154 2007/01/17 03:11:19 rillig Exp $ # # This file contains the guessed type of some variables, according to @@ -177,7 +177,7 @@ BUILDLINK_PKGSRCDIR.* RelativePkgDir [b:dp] BUILDLINK_PREFIX.* Pathname [builtin.mk:su, b:, m:u, c:u, *.mk:u] BUILDLINK_RPATHDIRS.* List of Pathname [b:a] BUILDLINK_TARGETS List of Identifier [] -BUILDLINK_TRANSFORM.* SedCommands [m:a,builtin.mk:a,h:a,b:a] +BUILDLINK_FNAME_TRANSFORM.* SedCommands [m:a,builtin.mk:a,h:a,b:a] BUILDLINK_TRANSFORM List of WrapperTransform [*:a] BUILD_DEFS List of Varname [m:a,c:a,o:a] BUILD_DEPENDS InternalList of DependencyWithPath [c:a,m:a,o:a,*.mk:a] diff --git a/pkgtools/x11-links/buildlink3.mk b/pkgtools/x11-links/buildlink3.mk index a7d010fbb14..0131bfaa361 100644 --- a/pkgtools/x11-links/buildlink3.mk +++ b/pkgtools/x11-links/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.7 2006/07/10 21:50:34 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.8 2007/01/17 03:11:19 rillig Exp $ # # Don't include this file manually! It will be included as necessary # by bsd.buildlink3.mk. @@ -31,7 +31,7 @@ BUILDLINK_CONTENTS_FILTER.x11-links= \ # Rename the symlinks so that they appear in ${BUILDLINK_X11_DIR}/include # and ${BUILDLINK_X11_DIR}/lib. # -BUILDLINK_TRANSFORM.x11-links+= -e "s|/share/x11-links/|/|" +BUILDLINK_FNAME_TRANSFORM.x11-links+= -e "s|/share/x11-links/|/|" .endif # X11_LINKS_BUILDLINK3_MK diff --git a/security/gpgme03/buildlink3.mk b/security/gpgme03/buildlink3.mk index 66d0259054d..230e1e4ba42 100644 --- a/security/gpgme03/buildlink3.mk +++ b/security/gpgme03/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.9 2006/07/08 23:11:06 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.10 2007/01/17 03:11:19 rillig Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ GPGME03_BUILDLINK3_MK:= ${GPGME03_BUILDLINK3_MK}+ @@ -17,8 +17,8 @@ BUILDLINK_ABI_DEPENDS.gpgme03+= gpgme03>=0.3.16nb2 BUILDLINK_PKGSRCDIR.gpgme03?= ../../security/gpgme03 BUILDLINK_FILES.gpgme03+= bin/gpgme03-config -BUILDLINK_TRANSFORM.gpgme03+= -e 's|/gpgme03-config|/gpgme-config|g' -BUILDLINK_TRANSFORM.gpgme03+= -e 's|/gpgme03.h|/gpgme.h|g' +BUILDLINK_FNAME_TRANSFORM.gpgme03+= -e 's|/gpgme03-config|/gpgme-config|g' +BUILDLINK_FNAME_TRANSFORM.gpgme03+= -e 's|/gpgme03.h|/gpgme.h|g' BUILDLINK_TRANSFORM+= l:gpgme:gpgme03 .endif # GPGME03_BUILDLINK3_MK diff --git a/x11/qt1/buildlink3.mk b/x11/qt1/buildlink3.mk index 3e0f67722e9..5bc9947bc36 100644 --- a/x11/qt1/buildlink3.mk +++ b/x11/qt1/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.9 2007/01/13 18:42:35 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.10 2007/01/17 03:11:19 rillig Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ QT1_BUILDLINK3_MK:= ${QT1_BUILDLINK3_MK}+ @@ -18,7 +18,7 @@ BUILDLINK_PKGSRCDIR.qt1?= ../../x11/qt1 BUILDLINK_PASSTHRU_DIRS= ${LOCALBASE}/qt1 BUILDLINK_FILES.qt1+= qt1/bin/* -BUILDLINK_TRANSFORM.qt1+= -e s,/qt1/bin/,/bin/, +BUILDLINK_FNAME_TRANSFORM.qt1+= -e s,/qt1/bin/,/bin/, QT1DIR= ${LOCALBASE}/qt1 .endif # QT1_BUILDLINK3_MK diff --git a/x11/xorg-libs/buildlink3.mk b/x11/xorg-libs/buildlink3.mk index 7c4dd56bc90..0e46d2499ea 100644 --- a/x11/xorg-libs/buildlink3.mk +++ b/x11/xorg-libs/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.18 2006/12/12 21:52:38 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.19 2007/01/17 03:11:19 rillig Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ XORG_LIBS_BUILDLINK3_MK:= ${XORG_LIBS_BUILDLINK3_MK}+ @@ -23,7 +23,7 @@ BUILDLINK_API_DEPENDS.xorg-libs+= xorg-libs>=6.9.0 BUILDLINK_ABI_DEPENDS.xorg-libs?= xorg-libs>=6.9.0nb2 BUILDLINK_PKGSRCDIR.xorg-libs?= ../../x11/xorg-libs BUILDLINK_LIBDIRS.xorg-libs?= ${X11ROOT_PREFIX}/lib -BUILDLINK_TRANSFORM.xorg-libs+= -e "s|/${X11ROOT_PREFIX}/|/|" +BUILDLINK_FNAME_TRANSFORM.xorg-libs+= -e "s|/${X11ROOT_PREFIX}/|/|" .endif # XORG_LIBS_BUILDLINK3_MK |