diff options
74 files changed, 181 insertions, 174 deletions
diff --git a/archivers/bzip2/buildlink.mk b/archivers/bzip2/buildlink.mk index 718560d9e01..c49a2116037 100644 --- a/archivers/bzip2/buildlink.mk +++ b/archivers/bzip2/buildlink.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink.mk,v 1.3 2001/07/01 22:59:08 jlam Exp $ +# $NetBSD: buildlink.mk,v 1.4 2001/07/20 01:54:31 jlam Exp $ # # This Makefile fragment is included by packages that use bzip2. # @@ -38,7 +38,7 @@ _NEED_BZIP2= NO .if ${_NEED_BZIP2} == "YES" DEPENDS+= ${BUILDLINK_DEPENDS.bzip2}:../../archivers/bzip2 -BUILDLINK_PREFIX.bzip2= ${LOCALBASE} +EVAL_PREFIX+= BUILDLINK_PREFIX.bzip2=bzip2 .else BUILDLINK_PREFIX.bzip2= /usr .endif diff --git a/archivers/liblzo/buildlink.mk b/archivers/liblzo/buildlink.mk index 9c7a16f766c..b44074b720c 100644 --- a/archivers/liblzo/buildlink.mk +++ b/archivers/liblzo/buildlink.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink.mk,v 1.3 2001/07/16 09:56:04 jlam Exp $ +# $NetBSD: buildlink.mk,v 1.4 2001/07/20 01:54:32 jlam Exp $ # # This Makefile fragment is included by packages that use liblzo. # @@ -20,7 +20,7 @@ LIBLZO_BUILDLINK_MK= # defined BUILDLINK_DEPENDS.liblzo?= liblzo>=1.06 DEPENDS+= ${BUILDLINK_DEPENDS.liblzo}:../../archivers/liblzo -BUILDLINK_PREFIX.liblzo= ${LOCALBASE} +EVAL_PREFIX+= BUILDLINK_PREFIX.liblzo=liblzo BUILDLINK_FILES.liblzo= include/lzo1.h BUILDLINK_FILES.liblzo+= include/lzo16bit.h BUILDLINK_FILES.liblzo+= include/lzo1a.h diff --git a/audio/esound/buildlink.mk b/audio/esound/buildlink.mk index 263a6994d69..fbfac66848e 100644 --- a/audio/esound/buildlink.mk +++ b/audio/esound/buildlink.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink.mk,v 1.4 2001/07/02 05:33:56 jlam Exp $ +# $NetBSD: buildlink.mk,v 1.5 2001/07/20 01:54:32 jlam Exp $ # # This Makefile fragment is included by packages that use esound. # @@ -20,7 +20,7 @@ ESOUND_BUILDLINK_MK= # defined BUILDLINK_DEPENDS.esound?= esound>=0.2.18 DEPENDS+= ${BUILDLINK_DEPENDS.esound}:../../audio/esound -BUILDLINK_PREFIX.esound= ${LOCALBASE} +EVAL_PREFIX+= BUILDLINK_PREFIX.esound=esound BUILDLINK_FILES.esound= include/esd.h BUILDLINK_FILES.esound+= lib/libesd.* @@ -30,7 +30,7 @@ BUILDLINK_TARGETS.esound= esound-buildlink BUILDLINK_TARGETS.esound+= esound-buildlink-config-wrapper BUILDLINK_TARGETS+= ${BUILDLINK_TARGETS.esound} -BUILDLINK_CONFIG.esound= ${LOCALBASE}/bin/esd-config +BUILDLINK_CONFIG.esound= ${BUILDLINK_PREFIX.esound}/bin/esd-config BUILDLINK_CONFIG_WRAPPER.esound= ${BUILDLINK_DIR}/bin/esd-config .if defined(USE_CONFIG_WRAPPER) && defined(GNU_CONFIGURE) diff --git a/audio/gsm/buildlink.mk b/audio/gsm/buildlink.mk index 58d211dc7f7..c6eb5e218c9 100644 --- a/audio/gsm/buildlink.mk +++ b/audio/gsm/buildlink.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink.mk,v 1.2 2001/07/01 22:59:09 jlam Exp $ +# $NetBSD: buildlink.mk,v 1.3 2001/07/20 01:54:32 jlam Exp $ # # This Makefile fragment is included by packages that use gsm. # @@ -20,7 +20,7 @@ GSM_BUILDLINK_MK= # defined BUILDLINK_DEPENDS.gsm?= gsm>=1.0.10 DEPENDS+= ${BUILDLINK_DEPENDS.gsm}:../../audio/gsm -BUILDLINK_PREFIX.gsm= ${LOCALBASE} +EVAL_PREFIX+= BUILDLINK_PREFIX.gsm=gsm BUILDLINK_FILES.gsm= include/gsm.h BUILDLINK_FILES.gsm+= include/gsm/* BUILDLINK_FILES.gsm+= lib/libgsm.* diff --git a/audio/libaudiofile/buildlink.mk b/audio/libaudiofile/buildlink.mk index 771cdf90692..69e48f64fb4 100644 --- a/audio/libaudiofile/buildlink.mk +++ b/audio/libaudiofile/buildlink.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink.mk,v 1.5 2001/07/02 05:33:57 jlam Exp $ +# $NetBSD: buildlink.mk,v 1.6 2001/07/20 01:54:33 jlam Exp $ # # This Makefile fragment is included by packages that use libaudiofile. # @@ -20,7 +20,7 @@ AUDIOFILE_BUILDLINK_MK= # defined BUILDLINK_DEPENDS.audiofile?= libaudiofile>=0.2.1 DEPENDS+= ${BUILDLINK_DEPENDS.audiofile}:../../audio/libaudiofile -BUILDLINK_PREFIX.audiofile= ${LOCALBASE} +EVAL_PREFIX+= BUILDLINK_PREFIX.audiofile=libaudiofile BUILDLINK_FILES.audiofile= include/af_vfs.h BUILDLINK_FILES.audiofile+= include/audiofile.h BUILDLINK_FILES.audiofile+= include/aupvlist.h @@ -30,9 +30,10 @@ BUILDLINK_TARGETS.audiofile= audiofile-buildlink BUILDLINK_TARGETS.audiofile+= audiofile-buildlink-config-wrapper BUILDLINK_TARGETS+= ${BUILDLINK_TARGETS.audiofile} -BUILDLINK_CONFIG.audiofile= ${LOCALBASE}/bin/audiofile-config +BUILDLINK_CONFIG.audiofile= \ + ${BUILDLINK_PREFIX.audiofile}/bin/audiofile-config BUILDLINK_CONFIG_WRAPPER.audiofile= \ - ${BUILDLINK_DIR}/bin/audiofile-config + ${BUILDLINK_DIR}/bin/audiofile-config .if defined(USE_CONFIG_WRAPPER) && defined(GNU_CONFIGURE) AUDIOFILE_CONFIG?= ${BUILDLINK_CONFIG_WRAPPER.audiofile} diff --git a/audio/libmikmod/buildlink.mk b/audio/libmikmod/buildlink.mk index 3ffa6933417..c56bbfa774f 100644 --- a/audio/libmikmod/buildlink.mk +++ b/audio/libmikmod/buildlink.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink.mk,v 1.4 2001/07/02 05:33:57 jlam Exp $ +# $NetBSD: buildlink.mk,v 1.5 2001/07/20 01:54:33 jlam Exp $ # # This Makefile fragment is included by packages that use libmikmod. # @@ -20,7 +20,7 @@ LIBMIKMOD_BUILDLINK_MK= # defined BUILDLINK_DEPENDS.libmikmod?= libmikmod>=3.1.9 DEPENDS+= ${BUILDLINK_DEPENDS.libmikmod}:../../audio/libmikmod -BUILDLINK_PREFIX.libmikmod= ${LOCALBASE} +EVAL_PREFIX+= BUILDLINK_PREFIX.libmikmod=libmikmod BUILDLINK_FILES.libmikmod= include/mikmod.h BUILDLINK_FILES.libmikmod+= lib/libmikmod.* @@ -28,8 +28,10 @@ BUILDLINK_TARGETS.libmikmod= libmikmod-buildlink BUILDLINK_TARGETS.libmikmod+= libmikmod-buildlink-config-wrapper BUILDLINK_TARGETS+= ${BUILDLINK_TARGETS.libmikmod} -BUILDLINK_CONFIG.libmikmod= ${LOCALBASE}/bin/libmikmod-config -BUILDLINK_CONFIG_WRAPPER.libmikmod= ${BUILDLINK_DIR}/bin/libmikmod-config +BUILDLINK_CONFIG.libmikmod= \ + ${BUILDLINK_PREFIX.libmikmod}/bin/libmikmod-config +BUILDLINK_CONFIG_WRAPPER.libmikmod= \ + ${BUILDLINK_DIR}/bin/libmikmod-config .if defined(USE_CONFIG_WRAPPER) && defined(GNU_CONFIGURE) LIBMIKMOD_CONFIG?= ${BUILDLINK_CONFIG_WRAPPER.libmikmod} diff --git a/audio/libogg/buildlink.mk b/audio/libogg/buildlink.mk index fdd9fad92f4..fccd94b8d98 100644 --- a/audio/libogg/buildlink.mk +++ b/audio/libogg/buildlink.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink.mk,v 1.2 2001/07/01 22:59:10 jlam Exp $ +# $NetBSD: buildlink.mk,v 1.3 2001/07/20 01:54:33 jlam Exp $ # # This Makefile fragment is included by packages that use libogg. # @@ -20,7 +20,7 @@ LIGOGG_BUILDLINK_MK= # defined BUILDLINK_DEPENDS.libogg?= libogg>=1.0.0.4 DEPENDS+= ${BUILDLINK_DEPENDS.libogg}:../../audio/libogg -BUILDLINK_PREFIX.libogg= ${LOCALBASE} +EVAL_PREFIX+= BUILDLINK_PREFIX.libogg=libogg BUILDLINK_FILES.libogg= include/ogg/config_types.h BUILDLINK_FILES.libogg+= include/ogg/ogg.h BUILDLINK_FILES.libogg+= include/ogg/os_types.h diff --git a/audio/libsidplay/buildlink.mk b/audio/libsidplay/buildlink.mk index e2aaf9f67ec..70eb5599a60 100644 --- a/audio/libsidplay/buildlink.mk +++ b/audio/libsidplay/buildlink.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink.mk,v 1.2 2001/07/01 22:59:10 jlam Exp $ +# $NetBSD: buildlink.mk,v 1.3 2001/07/20 01:54:33 jlam Exp $ # # This Makefile fragment is included by packages that use libsidplay. # @@ -20,7 +20,7 @@ LIBSIDPLAY_BUILDLINK_MK= # defined BUILDLINK_DEPENDS.libsidplay?= libsidplay>=1.36.38 DEPENDS+= ${BUILDLINK_DEPENDS.libsidplay}:../../audio/libsidplay -BUILDLINK_PREFIX.libsidplay= ${LOCALBASE} +EVAL_PREFIX+= BUILDLINK_PREFIX.libsidplay=libsidplay BUILDLINK_FILES.libsidplay= include/sidplay/* BUILDLINK_FILES.libsidplay+= lib/libsidplay.* diff --git a/audio/libvorbis/buildlink.mk b/audio/libvorbis/buildlink.mk index 48a403a1932..6526dfc9df1 100644 --- a/audio/libvorbis/buildlink.mk +++ b/audio/libvorbis/buildlink.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink.mk,v 1.3 2001/07/01 23:00:48 jlam Exp $ +# $NetBSD: buildlink.mk,v 1.4 2001/07/20 01:54:34 jlam Exp $ # # This Makefile fragment is included by packages that use libvorbis. # @@ -20,7 +20,7 @@ LIBVORBIS_BUILDLINK_MK= # defined BUILDLINK_DEPENDS.libvorbis?= libvorbis>=1.0.0.4 DEPENDS+= ${BUILDLINK_DEPENDS.libvorbis}:../../audio/libvorbis -BUILDLINK_PREFIX.libvorbis= ${LOCALBASE} +EVAL_PREFIX+= BUILDLINK_PREFIX.libvorbis=libvorbis BUILDLINK_FILES.libvorbis= include/vorbis/* BUILDLINK_FILES.libvorbis+= lib/libvorbis.* BUILDLINK_FILES.libvorbis+= lib/libvorbisenc.* diff --git a/audio/nas/buildlink.mk b/audio/nas/buildlink.mk index d28388aaf93..ea376db76f9 100644 --- a/audio/nas/buildlink.mk +++ b/audio/nas/buildlink.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink.mk,v 1.3 2001/07/14 13:40:41 jlam Exp $ +# $NetBSD: buildlink.mk,v 1.4 2001/07/20 01:54:34 jlam Exp $ # # This Makefile fragment is included by packages that use nas. # @@ -20,7 +20,7 @@ NAS_BUILDLINK_MK= # defined BUILDLINK_DEPENDS.nas?= nas>=1.4.2 DEPENDS+= ${BUILDLINK_DEPENDS.nas}:../../audio/nas -BUILDLINK_PREFIX.nas= ${X11PREFIX} +EVAL_PREFIX+= BUILDLINK_PREFIX.nas=nas BUILDLINK_FILES.nas= include/audio/* BUILDLINK_FILES.nas+= lib/libaudio.* diff --git a/audio/rplay/buildlink.mk b/audio/rplay/buildlink.mk index 93f9349da23..66aba1f36d2 100644 --- a/audio/rplay/buildlink.mk +++ b/audio/rplay/buildlink.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink.mk,v 1.2 2001/07/01 22:59:11 jlam Exp $ +# $NetBSD: buildlink.mk,v 1.3 2001/07/20 01:54:34 jlam Exp $ # # This Makefile fragment is included by packages that use rplay. # @@ -20,7 +20,7 @@ RPLAY_BUILDLINK_MK= # defined BUILDLINK_DEPENDS.rplay?= rplay>=3.3.2 DEPENDS+= ${BUILDLINK_DEPENDS.rplay}:../../audio/rplay -BUILDLINK_PREFIX.rplay= ${LOCALBASE} +EVAL_PREFIX+= BUILDLINK_PREFIX.rplay=rplay BUILDLINK_FILES.rplay= include/rplay.h BUILDLINK_FILES.rplay+= lib/librplay.* diff --git a/comms/jpilot/buildlink.mk b/comms/jpilot/buildlink.mk index 8fe19747426..7daba0fedbe 100644 --- a/comms/jpilot/buildlink.mk +++ b/comms/jpilot/buildlink.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink.mk,v 1.4 2001/07/01 22:59:12 jlam Exp $ +# $NetBSD: buildlink.mk,v 1.5 2001/07/20 01:54:34 jlam Exp $ # # This Makefile fragment is included by packages that use jpilot. # @@ -20,7 +20,7 @@ JPILOT_BUILDLINK_MK= # defined BUILDLINK_DEPENDS.jpilot?= jpilot>=0.99 BUILD_DEPENDS+= ${BUILDLINK_DEPENDS.jpilot}:../../comms/jpilot -BUILDLINK_PREFIX.jpilot= ${LOCALBASE} +EVAL_PREFIX+= BUILDLINK_PREFIX.jpilot=jpilot BUILDLINK_FILES.jpilot= include/jpilot/* .include "../../x11/gtk/buildlink.mk" diff --git a/comms/pilot-link-libs/buildlink.mk b/comms/pilot-link-libs/buildlink.mk index 85305e7da9d..5fbca472344 100644 --- a/comms/pilot-link-libs/buildlink.mk +++ b/comms/pilot-link-libs/buildlink.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink.mk,v 1.3 2001/07/01 22:59:12 jlam Exp $ +# $NetBSD: buildlink.mk,v 1.4 2001/07/20 01:54:34 jlam Exp $ # # This Makefile fragment is included by packages that use pilot-link-libs. # @@ -20,7 +20,7 @@ PILOT_LINK_LIBS_BUILDLINK_MK= # defined BUILDLINK_DEPENDS.pilot-link-libs?= pilot-link-libs>=0.9.5 DEPENDS+= ${BUILDLINK_DEPENDS.pilot-link-libs}:../../comms/pilot-link-libs -BUILDLINK_PREFIX.pilot-link-libs= ${LOCALBASE} +EVAL_PREFIX+= BUILDLINK_PREFIX.pilot-link-libs=pilot-link-libs BUILDLINK_FILES.pilot-link-libs= include/pi-*.* BUILDLINK_FILES.pilot-link-libs+= lib/libpicc.* BUILDLINK_FILES.pilot-link-libs+= lib/libpisock.* diff --git a/converters/libiconv/buildlink.mk b/converters/libiconv/buildlink.mk index 678e8369bb6..818719bb766 100644 --- a/converters/libiconv/buildlink.mk +++ b/converters/libiconv/buildlink.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink.mk,v 1.5 2001/07/01 22:59:12 jlam Exp $ +# $NetBSD: buildlink.mk,v 1.6 2001/07/20 01:54:35 jlam Exp $ # # This Makefile fragment is included by packages that use libiconv. # @@ -20,7 +20,7 @@ ICONV_BUILDLINK_MK= # defined BUILDLINK_DEPENDS.iconv?= libiconv>=1.5 DEPENDS+= ${BUILDLINK_DEPENDS.iconv}:../../converters/libiconv -BUILDLINK_PREFIX.iconv= ${LOCALBASE} +EVAL_PREFIX+= BUILDLINK_PREFIX.iconv=iconv BUILDLINK_FILES.iconv= include/iconv.h BUILDLINK_FILES.iconv+= include/libcharset.h BUILDLINK_FILES.iconv+= lib/libcharset.* diff --git a/databases/db/buildlink.mk b/databases/db/buildlink.mk index 6e68788ce0e..f41a8c1a4bb 100644 --- a/databases/db/buildlink.mk +++ b/databases/db/buildlink.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink.mk,v 1.3 2001/07/01 22:59:13 jlam Exp $ +# $NetBSD: buildlink.mk,v 1.4 2001/07/20 01:54:35 jlam Exp $ # # This Makefile fragment is included by packages that use db. # @@ -20,7 +20,7 @@ DB_BUILDLINK_MK= # defined BUILDLINK_DEPENDS.db?= db>=2.7.3 DEPENDS+= ${BUILDLINK_DEPENDS.db}:../../databases/db -BUILDLINK_PREFIX.db= ${LOCALBASE} +EVAL_PREFIX+= BUILDLINK_PREFIX.db=db BUILDLINK_FILES.db= include/db2/* BUILDLINK_FILES.db+= lib/libdb2.* diff --git a/databases/db3/buildlink.mk b/databases/db3/buildlink.mk index 67e82db1b42..d6aad8f941b 100644 --- a/databases/db3/buildlink.mk +++ b/databases/db3/buildlink.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink.mk,v 1.1 2001/07/19 19:16:43 jlam Exp $ +# $NetBSD: buildlink.mk,v 1.2 2001/07/20 01:54:35 jlam Exp $ # # This Makefile fragment is included by packages that use db3. # @@ -20,7 +20,7 @@ DB3_BUILDLINK_MK= # defined BUILDLINK_DEPENDS.db3?= db3>=2.9 DEPENDS+= ${BUILDLINK_DEPENDS.db3}:../../databases/db3 -BUILDLINK_PREFIX.db3= ${LOCALBASE} +EVAL_PREFIX+= BUILDLINK_PREFIX.db3=db3 BUILDLINK_FILES.db3= include/db3/db3_cxx.h BUILDLINK_FILES.db3+= include/db3/db3.h BUILDLINK_FILES.db3+= lib/libdb3.* diff --git a/databases/freetds/buildlink.mk b/databases/freetds/buildlink.mk index 3a953b4e771..235de09a8ed 100644 --- a/databases/freetds/buildlink.mk +++ b/databases/freetds/buildlink.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink.mk,v 1.7 2001/07/02 05:35:20 jlam Exp $ +# $NetBSD: buildlink.mk,v 1.8 2001/07/20 01:54:36 jlam Exp $ # # This Makefile fragment is included by packages that use freetds. # @@ -20,7 +20,7 @@ FREETDS_BUILDLINK_MK= # defined BUILDLINK_DEPENDS.freetds?= freetds>=0.50 DEPENDS+= ${BUILDLINK_DEPENDS.freetds}:../../databases/freetds -BUILDLINK_PREFIX.freetds= ${LOCALBASE} +EVAL_PREFIX+= BUILDLINK_PREFIX.freetds=freetds BUILDLINK_FILES.freetds= freetds/include/* BUILDLINK_FILES.freetds+= freetds/lib/* BUILDLINK_FILES.freetds+= freetds/interfaces diff --git a/databases/gdbm/buildlink.mk b/databases/gdbm/buildlink.mk index ed769852d28..8102f225ef6 100644 --- a/databases/gdbm/buildlink.mk +++ b/databases/gdbm/buildlink.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink.mk,v 1.6 2001/07/01 22:59:13 jlam Exp $ +# $NetBSD: buildlink.mk,v 1.7 2001/07/20 01:54:36 jlam Exp $ # # This Makefile fragment is included by packages that use gdbm. # @@ -20,7 +20,7 @@ GDBM_BUILDLINK_MK= # defined BUILDLINK_DEPENDS.gdbm?= gdbm>=1.7.3 DEPENDS+= ${BUILDLINK_DEPENDS.gdbm}:../../databases/gdbm -BUILDLINK_PREFIX.gdbm= ${LOCALBASE} +EVAL_PREFIX+= BUILDLINK_PREFIX.gdbm=gdbm BUILDLINK_FILES.gdbm= include/gdbm.h BUILDLINK_FILES.gdbm+= lib/libgdbm.* diff --git a/databases/postgresql-lib/buildlink.mk b/databases/postgresql-lib/buildlink.mk index aee1f548bb8..3bad4749295 100644 --- a/databases/postgresql-lib/buildlink.mk +++ b/databases/postgresql-lib/buildlink.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink.mk,v 1.3 2001/07/01 22:59:13 jlam Exp $ +# $NetBSD: buildlink.mk,v 1.4 2001/07/20 01:54:36 jlam Exp $ # # This Makefile fragment is included by packages that use postgresql-lib. # @@ -20,7 +20,7 @@ POSTGRESQL_LIB_BUILDLINK_MK= # defined BUILDLINK_DEPENDS.postgresql-lib?= postgresql-{6.5.3*,7.0*,lib-*} DEPENDS+= ${BUILDLINK_DEPENDS.postgresql-lib}:../../databases/postgresql-lib -BUILDLINK_PREFIX.postgresql-lib= ${LOCALBASE} +EVAL_PREFIX+= BUILDLINK_PREFIX.postgresql-lib=postgresql-lib BUILDLINK_FILES.postgresql-lib= include/pgsql/*/*.h BUILDLINK_FILES.postgresql-lib+= include/pgsql/*.h BUILDLINK_FILES.postgresql-lib+= lib/libecpg.* diff --git a/databases/tcl-postgresql/buildlink.mk b/databases/tcl-postgresql/buildlink.mk index 271c906d590..59a9060574d 100644 --- a/databases/tcl-postgresql/buildlink.mk +++ b/databases/tcl-postgresql/buildlink.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink.mk,v 1.3 2001/07/01 22:59:14 jlam Exp $ +# $NetBSD: buildlink.mk,v 1.4 2001/07/20 01:54:36 jlam Exp $ # # This Makefile fragment is included by packages that use tcl-postgresql. # @@ -20,7 +20,7 @@ TCL_POSTGRESQL_BUILDLINK_MK= # defined BUILDLINK_DEPENDS.tcl-postgresql?= tcl-postgresql>=7.0 DEPENDS+= ${BUILDLINK_DEPENDS.tcl-postgresql}:../../databases/tcl-postgresql -BUILDLINK_PREFIX.tcl-postgresql= ${LOCALBASE} +EVAL_PREFIX+= BUILDLINK_PREFIX.tcl-postgresql=tcl-postgresql BUILDLINK_FILES.tcl-postgresql= include/pgsql/libpgtcl.h BUILDLINK_FILES.tcl-postgresql+= lib/libpgtcl.* diff --git a/devel/SDL/buildlink.mk b/devel/SDL/buildlink.mk index 18eecc06d6d..f6d0c665de1 100644 --- a/devel/SDL/buildlink.mk +++ b/devel/SDL/buildlink.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink.mk,v 1.7 2001/07/14 15:51:47 jlam Exp $ +# $NetBSD: buildlink.mk,v 1.8 2001/07/20 01:54:36 jlam Exp $ # # This Makefile fragment is included by packages that use SDL. # @@ -20,7 +20,7 @@ SDL_BUILDLINK_MK= # defined BUILDLINK_DEPENDS.SDL?= SDL>=1.2.0 DEPENDS+= ${BUILDLINK_DEPENDS.SDL}:../../devel/SDL -BUILDLINK_PREFIX.SDL= ${LOCALBASE} +EVAL_PREFIX+= BUILDLINK_PREFIX.SDL=SDL BUILDLINK_FILES.SDL= include/SDL/* BUILDLINK_FILES.SDL+= lib/libSDL.* BUILDLINK_FILES.SDL+= lib/libSDLmain.* @@ -41,7 +41,7 @@ BUILDLINK_TARGETS.SDL= SDL-buildlink BUILDLINK_TARGETS.SDL+= SDL-buildlink-config-wrapper BUILDLINK_TARGETS+= ${BUILDLINK_TARGETS.SDL} -BUILDLINK_CONFIG.SDL= ${LOCALBASE}/bin/sdl-config +BUILDLINK_CONFIG.SDL= ${BUILDLINK_PREFIX.SDL}/bin/sdl-config BUILDLINK_CONFIG_WRAPPER.SDL= ${BUILDLINK_DIR}/bin/sdl-config .if defined(USE_CONFIG_WRAPPER) && defined(GNU_CONFIGURE) diff --git a/devel/SDL_ttf/buildlink.mk b/devel/SDL_ttf/buildlink.mk index 9d022b515e1..4692321a5be 100644 --- a/devel/SDL_ttf/buildlink.mk +++ b/devel/SDL_ttf/buildlink.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink.mk,v 1.5 2001/07/14 15:59:17 jlam Exp $ +# $NetBSD: buildlink.mk,v 1.6 2001/07/20 01:54:37 jlam Exp $ # # This Makefile fragment is included by packages that use SDL_ttf. # @@ -20,7 +20,7 @@ SDL_ttf_BUILDLINK_MK= # defined BUILDLINK_DEPENDS.SDL_ttf?= SDL_ttf>=2.0.3 DEPENDS+= ${BUILDLINK_DEPENDS.SDL_ttf}:../../devel/SDL_ttf -BUILDLINK_PREFIX.SDL_ttf= ${LOCALBASE} +EVAL_PREFIX+= BUILDLINK_PREFIX.SDL_ttf=SDL_ttf BUILDLINK_FILES.SDL_ttf= include/SDL/SDL_ttf.h BUILDLINK_FILES.SDL_ttf+= lib/libSDL_ttf-* BUILDLINK_FILES.SDL_ttf+= lib/libSDL_ttf.* diff --git a/devel/gettext-lib/buildlink.mk b/devel/gettext-lib/buildlink.mk index 9762ba6988e..a2c55a77743 100644 --- a/devel/gettext-lib/buildlink.mk +++ b/devel/gettext-lib/buildlink.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink.mk,v 1.8 2001/07/01 22:59:15 jlam Exp $ +# $NetBSD: buildlink.mk,v 1.9 2001/07/20 01:54:37 jlam Exp $ # # This Makefile fragment is included by packages that use gettext. # @@ -29,7 +29,7 @@ _NEED_GNU_GETTEXT= YES .if ${_NEED_GNU_GETTEXT} == "YES" DEPENDS+= ${BUILDLINK_DEPENDS.gettext}:../../devel/gettext-lib -BUILDLINK_PREFIX.gettext= ${LOCALBASE} +EVAL_PREFIX+= BUILDLINK_PREFIX.gettext=gettext-lib .else BUILDLINK_PREFIX.gettext= /usr .endif diff --git a/devel/glib/buildlink.mk b/devel/glib/buildlink.mk index add516da6e9..138eacac089 100644 --- a/devel/glib/buildlink.mk +++ b/devel/glib/buildlink.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink.mk,v 1.8 2001/07/13 23:23:39 dogcow Exp $ +# $NetBSD: buildlink.mk,v 1.9 2001/07/20 01:54:37 jlam Exp $ # # This Makefile fragment is included by packages that use glib. # @@ -20,7 +20,7 @@ GLIB_BUILDLINK_MK= # defined BUILDLINK_DEPENDS.glib?= glib>=1.2.8 DEPENDS+= ${BUILDLINK_DEPENDS.glib}:../../devel/glib -BUILDLINK_PREFIX.glib= ${LOCALBASE} +EVAL_PREFIX+= BUILDLINK_PREFIX.glib=glib BUILDLINK_FILES.glib= include/glib/*/* BUILDLINK_FILES.glib+= include/glib/* BUILDLINK_FILES.glib+= lib/glib/*/* @@ -37,7 +37,7 @@ BUILDLINK_TARGETS.glib= glib-buildlink BUILDLINK_TARGETS.glib+= glib-buildlink-config-wrapper BUILDLINK_TARGETS+= ${BUILDLINK_TARGETS.glib} -BUILDLINK_CONFIG.glib= ${LOCALBASE}/bin/glib-config +BUILDLINK_CONFIG.glib= ${BUILDLINK_PREFIX.glib}/bin/glib-config BUILDLINK_CONFIG_WRAPPER.glib= ${BUILDLINK_DIR}/bin/glib-config .if defined(USE_CONFIG_WRAPPER) && defined(GNU_CONFIGURE) diff --git a/devel/gmp/buildlink.mk b/devel/gmp/buildlink.mk index c71fd421bfe..1f9c600df45 100644 --- a/devel/gmp/buildlink.mk +++ b/devel/gmp/buildlink.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink.mk,v 1.5 2001/07/01 22:59:15 jlam Exp $ +# $NetBSD: buildlink.mk,v 1.6 2001/07/20 01:54:37 jlam Exp $ # # This Makefile fragment is included by packages that use gmp. # @@ -20,7 +20,7 @@ GMP_BUILDLINK_MK= # defined BUILDLINK_DEPENDS.gmp?= gmp>=3.0 DEPENDS+= ${BUILDLINK_DEPENDS.gmp}:../../devel/gmp -BUILDLINK_PREFIX.gmp= ${LOCALBASE} +EVAL_PREFIX+= BUILDLINK_PREFIX.gmp=gmp BUILDLINK_FILES.gmp= include/gmp.h BUILDLINK_FILES.gmp+= lib/libgmp.* diff --git a/devel/libdockapp/buildlink.mk b/devel/libdockapp/buildlink.mk index a273b80e2f1..a1667f0301f 100644 --- a/devel/libdockapp/buildlink.mk +++ b/devel/libdockapp/buildlink.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink.mk,v 1.2 2001/07/01 22:59:16 jlam Exp $ +# $NetBSD: buildlink.mk,v 1.3 2001/07/20 01:54:38 jlam Exp $ # # This Makefile fragment is included by packages that use libdockapp. # @@ -20,7 +20,7 @@ LIBDOCKAPP_BUILDLINK_MK= # defined BUILDLINK_DEPENDS.libdockapp?= libdockapp>=0.4.0 DEPENDS+= ${BUILDLINK_DEPENDS.libdockapp}:../../devel/libdockapp -BUILDLINK_PREFIX.libdockapp= ${LOCALBASE} +EVAL_PREFIX+= BUILDLINK_PREFIX.libdockapp=libdockapp BUILDLINK_FILES.libdockapp= include/dockapp.h BUILDLINK_FILES.libdockapp+= lib/libdockapp.* diff --git a/devel/libgetopt/buildlink.mk b/devel/libgetopt/buildlink.mk index 130b94c320a..7a57326214b 100644 --- a/devel/libgetopt/buildlink.mk +++ b/devel/libgetopt/buildlink.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink.mk,v 1.10 2001/07/01 22:59:16 jlam Exp $ +# $NetBSD: buildlink.mk,v 1.11 2001/07/20 01:54:38 jlam Exp $ # # This Makefile fragment is included by packages that use getopt_long(). # @@ -23,7 +23,7 @@ BUILDLINK_PREFIX.getopt= /usr BUILDLINK_FILES.getopt= include/getopt.h .else DEPENDS+= ${BUILDLINK_DEPENDS.getopt}:../../devel/libgetopt -BUILDLINK_PREFIX.getopt= ${LOCALBASE} +EVAL_PREFIX+= BUILDLINK_PREFIX.getopt=libgetopt BUILDLINK_FILES.getopt= include/getopt.h BUILDLINK_FILES.getopt+= lib/libgetopt.* BUILDLINK_FILES.getopt+= lib/libgetopt_pic.a diff --git a/devel/libnet/buildlink.mk b/devel/libnet/buildlink.mk index 0401337bbab..5ef7e8b6d38 100644 --- a/devel/libnet/buildlink.mk +++ b/devel/libnet/buildlink.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink.mk,v 1.1 2001/07/14 16:41:38 sakamoto Exp $ +# $NetBSD: buildlink.mk,v 1.2 2001/07/20 01:54:38 jlam Exp $ # # This Makefile fragment is included by packages that use libnet. # @@ -20,7 +20,7 @@ LIBNET_BUILDLINK_MK= # defined BUILDLINK_DEPENDS.libnet?= libnet-* DEPENDS+= ${BUILDLINK_DEPENDS.libnet}:../../devel/libnet -BUILDLINK_PREFIX.libnet= ${LOCALBASE} +EVAL_PREFIX+= BUILDLINK_PREFIX.libnet=libnet BUILDLINK_FILES.libnet= include/libnet.h BUILDLINK_FILES.libnet+= include/libnet/* BUILDLINK_FILES.libnet+= lib/libnet.* diff --git a/devel/libproplist/buildlink.mk b/devel/libproplist/buildlink.mk index 593f2db59db..3547cdbe348 100644 --- a/devel/libproplist/buildlink.mk +++ b/devel/libproplist/buildlink.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink.mk,v 1.3 2001/07/01 22:59:16 jlam Exp $ +# $NetBSD: buildlink.mk,v 1.4 2001/07/20 01:54:38 jlam Exp $ # # This Makefile fragment is included by packages that use libproplist. # @@ -20,7 +20,7 @@ LIBPROPLIST_BUILDLINK_MK= # defined BUILDLINK_DEPENDS.libproplist?= libproplist>=0.10.1 DEPENDS+= ${BUILDLINK_DEPENDS.libproplist}:../../devel/libproplist -BUILDLINK_PREFIX.libproplist= ${LOCALBASE} +EVAL_PREFIX+= BUILDLINK_PREFIX.libproplist=libproplist BUILDLINK_FILES.libproplist= include/proplist.h BUILDLINK_FILES.libproplist+= lib/libPropList.* diff --git a/devel/libslang/buildlink.mk b/devel/libslang/buildlink.mk index 0f4cb1f61d0..b3cf48475b0 100644 --- a/devel/libslang/buildlink.mk +++ b/devel/libslang/buildlink.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink.mk,v 1.2 2001/07/01 22:59:17 jlam Exp $ +# $NetBSD: buildlink.mk,v 1.3 2001/07/20 01:54:39 jlam Exp $ # # This Makefile fragment is included by packages that use libslang. # @@ -20,7 +20,7 @@ LIBSLANG_BUILDLINK_MK= # defined BUILDLINK_DEPENDS.libslang?= libslang>=1.4.4 DEPENDS+= ${BUILDLINK_DEPENDS.libslang}:../../devel/libslang -BUILDLINK_PREFIX.libslang= ${LOCALBASE} +EVAL_PREFIX+= BUILDLINK_PREFIX.libslang=libslang BUILDLINK_FILES.libslang= include/slcurses.h BUILDLINK_FILES.libslang+= include/slang.h BUILDLINK_FILES.libslang+= lib/libslang.* diff --git a/devel/libtool/buildlink.mk b/devel/libtool/buildlink.mk index 18abf44a730..aeda690ce9b 100644 --- a/devel/libtool/buildlink.mk +++ b/devel/libtool/buildlink.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink.mk,v 1.3 2001/07/01 22:59:17 jlam Exp $ +# $NetBSD: buildlink.mk,v 1.4 2001/07/20 01:54:39 jlam Exp $ # # This Makefile fragment is included by packages that use ltdl. # @@ -18,7 +18,7 @@ LTDL_BUILDLINK_MK= # defined BUILDLINK_DEPENDS.ltdl?= libtool>=${LIBTOOL_REQD} DEPENDS+= ${BUILDLINK_DEPENDS.ltdl}:../../devel/libtool -BUILDLINK_PREFIX.ltdl= ${LOCALBASE} +EVAL_PREFIX+= BUILDLINK_PREFIX.ltdl=libtool BUILDLINK_FILES.ltdl= include/ltdl.h BUILDLINK_FILES.ltdl+= lib/libltdl.* diff --git a/devel/lwp/buildlink.mk b/devel/lwp/buildlink.mk index 93ba7f49fc5..1dbe7c80877 100644 --- a/devel/lwp/buildlink.mk +++ b/devel/lwp/buildlink.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink.mk,v 1.6 2001/07/01 22:59:17 jlam Exp $ +# $NetBSD: buildlink.mk,v 1.7 2001/07/20 01:54:39 jlam Exp $ # # This Makefile fragment is included by packages that use lwp. # @@ -20,7 +20,7 @@ LWP_BUILDLINK_MK= # defined BUILDLINK_DEPENDS.lwp?= lwp>=1.6 DEPENDS+= ${BUILDLINK_DEPENDS.lwp}:../../devel/lwp -BUILDLINK_PREFIX.lwp= ${LOCALBASE} +EVAL_PREFIX+= BUILDLINK_PREFIX.lwp=lwp BUILDLINK_FILES.lwp= include/lwp/* BUILDLINK_FILES.lwp+= lib/liblwp.* diff --git a/devel/ncurses/buildlink.mk b/devel/ncurses/buildlink.mk index 9f0c00b02b2..72459960195 100644 --- a/devel/ncurses/buildlink.mk +++ b/devel/ncurses/buildlink.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink.mk,v 1.6 2001/07/10 15:27:25 tron Exp $ +# $NetBSD: buildlink.mk,v 1.7 2001/07/20 01:54:39 jlam Exp $ # # This Makefile fragment is included by packages that use ncurses. # @@ -39,7 +39,7 @@ _NEED_NCURSES= YES .endif .if ${_NEED_NCURSES} == "YES" -BUILDLINK_PREFIX.ncurses= ${LOCALBASE} +EVAL_PREFIX+= BUILDLINK_PREFIX.ncurses=ncurses BUILDLINK_FILES.ncurses= include/cursesapp.h BUILDLINK_FILES.ncurses+= include/cursesf.h BUILDLINK_FILES.ncurses+= include/cursesm.h diff --git a/devel/pcre/buildlink.mk b/devel/pcre/buildlink.mk index 37f50253564..3d805d30ce0 100644 --- a/devel/pcre/buildlink.mk +++ b/devel/pcre/buildlink.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink.mk,v 1.3 2001/07/02 05:33:58 jlam Exp $ +# $NetBSD: buildlink.mk,v 1.4 2001/07/20 01:54:40 jlam Exp $ # # This Makefile fragment is included by packages that use pcre. # @@ -20,7 +20,7 @@ PCRE_BUILDLINK_MK= # defined BUILDLINK_DEPENDS.pcre?= pcre>=3.4 DEPENDS+= ${BUILDLINK_DEPENDS.pcre}:../../devel/pcre -BUILDLINK_PREFIX.pcre= ${LOCALBASE} +EVAL_PREFIX+= BUILDLINK_PREFIX.pcre=pcre BUILDLINK_FILES.pcre= include/pcre.h BUILDLINK_FILES.pcre+= include/pcreposix.h BUILDLINK_FILES.pcre+= lib/libpcre.* @@ -30,7 +30,7 @@ BUILDLINK_TARGETS.pcre= pcre-buildlink BUILDLINK_TARGETS.pcre+= pcre-buildlink-config-wrapper BUILDLINK_TARGETS+= ${BUILDLINK_TARGETS.pcre} -BUILDLINK_CONFIG.pcre= ${LOCALBASE}/bin/pcre-config +BUILDLINK_CONFIG.pcre= ${BUILDLINK_PREFIX.pcre}/bin/pcre-config BUILDLINK_CONFIG_WRAPPER.pcre= ${BUILDLINK_DIR}/bin/pcre-config .if defined(USE_CONFIG_WRAPPER) && defined(GNU_CONFIGURE) diff --git a/devel/pth/buildlink.mk b/devel/pth/buildlink.mk index 3ec7164d41c..5b63289701e 100644 --- a/devel/pth/buildlink.mk +++ b/devel/pth/buildlink.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink.mk,v 1.5 2001/07/02 05:32:41 jlam Exp $ +# $NetBSD: buildlink.mk,v 1.6 2001/07/20 01:54:40 jlam Exp $ # # This Makefile fragment is included by packages that use pth. # @@ -20,7 +20,7 @@ PTH_BUILDLINK_MK= # defined BUILDLINK_DEPENDS.pth?= pth>=1.3.2 DEPENDS+= ${BUILDLINK_DEPENDS.pth}:../../devel/pth -BUILDLINK_PREFIX.pth= ${LOCALBASE} +EVAL_PREFIX+= BUILDLINK_PREFIX.pth=pth BUILDLINK_FILES.pth= include/pth.h BUILDLINK_FILES.pth+= include/pthread.h BUILDLINK_FILES.pth+= lib/libpth.* @@ -31,10 +31,10 @@ BUILDLINK_TARGETS.pth+= pth-buildlink-config-wrapper BUILDLINK_TARGETS.pth+= pth-pthread-buildlink-config-wrapper BUILDLINK_TARGETS+= ${BUILDLINK_TARGETS.pth} -BUILDLINK_CONFIG.pth= ${LOCALBASE}/bin/pth-config +BUILDLINK_CONFIG.pth= ${BUILDLINK_PREFIX.pth}/bin/pth-config BUILDLINK_CONFIG_WRAPPER.pth= ${BUILDLINK_DIR}/bin/pth-config -BUILDLINK_CONFIG.pth-pthread= ${LOCALBASE}/bin/pthread-config +BUILDLINK_CONFIG.pth-pthread= ${BUILDLINK_PREFIX.pth}/bin/pthread-config BUILDLINK_CONFIG_WRAPPER.pth-pthread= ${BUILDLINK_DIR}/bin/pthread-config .if defined(USE_CONFIG_WRAPPER) && defined(GNU_CONFIGURE) diff --git a/devel/readline/buildlink.mk b/devel/readline/buildlink.mk index 3617897ca7d..15ace60b5a0 100644 --- a/devel/readline/buildlink.mk +++ b/devel/readline/buildlink.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink.mk,v 1.13 2001/07/01 22:59:18 jlam Exp $ +# $NetBSD: buildlink.mk,v 1.14 2001/07/20 01:54:40 jlam Exp $ # # This Makefile fragment is included by packages that use readline(). # @@ -33,11 +33,11 @@ _NEED_GNU_READLINE= YES .if ${_NEED_GNU_READLINE} == "YES" DEPENDS+= ${BUILDLINK_DEPENDS.readline}:../../devel/readline -BUILDLINK_PREFIX.readline= ${LOCALBASE} +EVAL_PREFIX+= BUILDLINK_PREFIX.readline=readline BUILDLINK_FILES.readline= include/readline/* BUILDLINK_FILES.readline+= lib/libreadline.* -BUILDLINK_PREFIX.history= ${LOCALBASE} +BUILDLINK_PREFIX.history= ${BUILDLINK_PREFIX.readline} BUILDLINK_FILES.history+= lib/libhistory.* .else .if exists(/usr/include/readline.h) diff --git a/devel/rpc2/buildlink.mk b/devel/rpc2/buildlink.mk index 4293e6d719e..6f00a916016 100644 --- a/devel/rpc2/buildlink.mk +++ b/devel/rpc2/buildlink.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink.mk,v 1.6 2001/07/01 22:59:19 jlam Exp $ +# $NetBSD: buildlink.mk,v 1.7 2001/07/20 01:54:40 jlam Exp $ # # This Makefile fragment is included by packages that use rpc2. # @@ -20,7 +20,7 @@ RPC2_BUILDLINK_MK= # defined BUILDLINK_DEPENDS.rpc2?= rpc2>=1.10 DEPENDS+= ${BUILDLINK_DEPENDS.rpc2}:../../devel/rpc2 -BUILDLINK_PREFIX.rpc2= ${LOCALBASE} +EVAL_PREFIX+= BUILDLINK_PREFIX.rpc2=rpc2 BUILDLINK_FILES.rpc2= include/rpc2/* BUILDLINK_FILES.rpc2+= lib/libfail.* BUILDLINK_FILES.rpc2+= lib/librpc2.* diff --git a/devel/rvm/buildlink.mk b/devel/rvm/buildlink.mk index 91a73d6535d..e463a514b5e 100644 --- a/devel/rvm/buildlink.mk +++ b/devel/rvm/buildlink.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink.mk,v 1.6 2001/07/01 22:59:19 jlam Exp $ +# $NetBSD: buildlink.mk,v 1.7 2001/07/20 01:54:41 jlam Exp $ # # This Makefile fragment is included by packages that use rvm. # @@ -20,7 +20,7 @@ RVM_BUILDLINK_MK= # defined BUILDLINK_DEPENDS.rvm?= rvm>=1.3 DEPENDS+= ${BUILDLINK_DEPENDS.rvm}:../../devel/rvm -BUILDLINK_PREFIX.rvm= ${LOCALBASE} +EVAL_PREFIX+= BUILDLINK_PREFIX.rvm=rvm BUILDLINK_FILES.rvm= include/rvm/* BUILDLINK_FILES.rvm+= lib/librds.* BUILDLINK_FILES.rvm+= lib/librdslwp.* diff --git a/devel/rx/buildlink.mk b/devel/rx/buildlink.mk index dc36d506c15..b9b6f2531ce 100644 --- a/devel/rx/buildlink.mk +++ b/devel/rx/buildlink.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink.mk,v 1.2 2001/07/01 22:59:19 jlam Exp $ +# $NetBSD: buildlink.mk,v 1.3 2001/07/20 01:54:41 jlam Exp $ # # This Makefile fragment is included by packages that use rx. # @@ -20,7 +20,7 @@ RX_BUILDLINK_MK= # defined BUILDLINK_DEPENDS.rx?= rx>=1.5 DEPENDS+= ${BUILDLINK_DEPENDS.rx}:../../devel/rx -BUILDLINK_PREFIX.rx= ${LOCALBASE} +EVAL_PREFIX+= BUILDLINK_PREFIX.rx=rx BUILDLINK_FILES.rx= include/rxposix.h BUILDLINK_FILES.rx+= lib/librx.* diff --git a/devel/smpeg/buildlink.mk b/devel/smpeg/buildlink.mk index b15db7b05eb..6706b605516 100644 --- a/devel/smpeg/buildlink.mk +++ b/devel/smpeg/buildlink.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink.mk,v 1.5 2001/07/02 05:33:58 jlam Exp $ +# $NetBSD: buildlink.mk,v 1.6 2001/07/20 01:54:41 jlam Exp $ # # This Makefile fragment is included by packages that use smpeg. # @@ -20,7 +20,7 @@ SMPEG_BUILDLINK_MK= # defined BUILDLINK_DEPENDS.smpeg?= smpeg>=0.4.3 DEPENDS+= ${BUILDLINK_DEPENDS.smpeg}:../../devel/smpeg -BUILDLINK_PREFIX.smpeg= ${LOCALBASE} +EVAL_PREFIX+= BUILDLINK_PREFIX.smpeg=smpeg BUILDLINK_FILES.smpeg= include/smpeg/* BUILDLINK_FILES.smpeg+= lib/libsmpeg-* BUILDLINK_FILES.smpeg+= lib/libsmpeg.* @@ -31,7 +31,7 @@ BUILDLINK_TARGETS.smpeg= smpeg-buildlink BUILDLINK_TARGETS.smpeg+= smpeg-buildlink-config-wrapper BUILDLINK_TARGETS+= ${BUILDLINK_TARGETS.smpeg} -BUILDLINK_CONFIG.smpeg= ${LOCALBASE}/bin/smpeg-config +BUILDLINK_CONFIG.smpeg= ${BUILDLINK_PREFIX.smpeg}/bin/smpeg-config BUILDLINK_CONFIG_WRAPPER.smpeg= ${BUILDLINK_DIR}/bin/smpeg-config .if defined(USE_CONFIG_WRAPPER) && defined(GNU_CONFIGURE) diff --git a/devel/zlib/buildlink.mk b/devel/zlib/buildlink.mk index 61786b89818..e9974eef992 100644 --- a/devel/zlib/buildlink.mk +++ b/devel/zlib/buildlink.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink.mk,v 1.5 2001/07/01 22:59:20 jlam Exp $ +# $NetBSD: buildlink.mk,v 1.6 2001/07/20 01:54:41 jlam Exp $ # # This Makefile fragment is included by packages that use zlib. # @@ -27,7 +27,7 @@ _NEED_ZLIB= YES .if ${_NEED_ZLIB} == "YES" DEPENDS+= ${BUILDLINK_DEPENDS.zlib}:../../devel/zlib -BUILDLINK_PREFIX.zlib= ${LOCALBASE} +EVAL_PREFIX+= BUILDLINK_PREFIX.zlib=zlib .else BUILDLINK_PREFIX.zlib= /usr .endif diff --git a/graphics/ImageMagick/buildlink.mk b/graphics/ImageMagick/buildlink.mk index b4e39cfabdf..a6c75f2e1b4 100644 --- a/graphics/ImageMagick/buildlink.mk +++ b/graphics/ImageMagick/buildlink.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink.mk,v 1.3 2001/07/09 18:24:09 zuntum Exp $ +# $NetBSD: buildlink.mk,v 1.4 2001/07/20 01:54:42 jlam Exp $ # # This Makefile fragment is included by packages that use ImageMagick. # @@ -20,7 +20,7 @@ IMAGEMAGICK_BUILDLINK_MK= # defined BUILDLINK_DEPENDS.ImageMagick?= ImageMagick>=5.2.8 DEPENDS+= ${BUILDLINK_DEPENDS.ImageMagick}:../../graphics/ImageMagick -BUILDLINK_PREFIX.ImageMagick= ${LOCALBASE} +EVAL_PREFIX+= BUILDLINK_PREFIX.ImageMagick=ImageMagick BUILDLINK_FILES.ImageMagick= include/Magick++.h BUILDLINK_FILES.ImageMagick+= include/Magick++/* BUILDLINK_FILES.ImageMagick+= include/magick/* diff --git a/graphics/avifile/buildlink.mk b/graphics/avifile/buildlink.mk index 4f350ef4e12..dfa4f0edcf8 100644 --- a/graphics/avifile/buildlink.mk +++ b/graphics/avifile/buildlink.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink.mk,v 1.3 2001/07/02 05:33:58 jlam Exp $ +# $NetBSD: buildlink.mk,v 1.4 2001/07/20 01:54:42 jlam Exp $ # # This Makefile fragment is included by packages that use avifile. # @@ -20,7 +20,7 @@ AVIFILE_BUILDLINK_MK= # defined BUILDLINK_DEPENDS.avifile?= avifile>=0.53.5 DEPENDS+= ${BUILDLINK_DEPENDS.avifile}:../../graphics/avifile -BUILDLINK_PREFIX.avifile= ${LOCALBASE} +EVAL_PREFIX+= BUILDLINK_PREFIX.avifile=avifile BUILDLINK_FILES.avifile= lib/libaviplay.* BUILDLINK_FILES.avifile+= include/avifile/* BUILDLINK_FILES.avifile+= include/avifile/wine/* @@ -29,7 +29,7 @@ BUILDLINK_TARGETS.avifile= avifile-buildlink BUILDLINK_TARGETS.avifile+= avifile-buildlink-config-wrapper BUILDLINK_TARGETS+= ${BUILDLINK_TARGETS.avifile} -BUILDLINK_CONFIG.avifile= ${LOCALBASE}/bin/avifile-config +BUILDLINK_CONFIG.avifile= ${BUILDLINK_PREFIX.avifile}/bin/avifile-config BUILDLINK_CONFIG_WRAPPER.avifile=${BUILDLINK_DIR}/bin/avifile-config .if defined(USE_CONFIG_WRAPPER) && defined(GNU_CONFIGURE) diff --git a/graphics/clanlib/buildlink.mk b/graphics/clanlib/buildlink.mk index c853667a9d4..0ae1e9caeec 100644 --- a/graphics/clanlib/buildlink.mk +++ b/graphics/clanlib/buildlink.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink.mk,v 1.3 2001/07/02 05:33:59 jlam Exp $ +# $NetBSD: buildlink.mk,v 1.4 2001/07/20 01:54:42 jlam Exp $ # # This Makefile fragment is included by packages that use ClanLib. # @@ -20,7 +20,7 @@ CLANLIB_BUILDLINK_MK= # defined BUILDLINK_DEPENDS.ClanLib?= ClanLib>=0.4.4 DEPENDS+= ${BUILDLINK_DEPENDS.ClanLib}:../../graphics/clanlib -BUILDLINK_PREFIX.ClanLib= ${X11BASE} +EVAL_PREFIX+= BUILDLINK_PREFIX.ClanLib=ClanLib BUILDLINK_FILES.ClanLib= lib/libclancore.* BUILDLINK_FILES.ClanLib+= lib/ClanLib/* BUILDLINK_FILES.ClanLib+= include/ClanLib/*.h @@ -43,7 +43,7 @@ BUILDLINK_TARGETS.ClanLib= ClanLib-buildlink BUILDLINK_TARGETS.ClanLib+= ClanLib-buildlink-config-wrapper BUILDLINK_TARGETS+= ${BUILDLINK_TARGETS.ClanLib} -BUILDLINK_CONFIG.ClanLib= ${LOCALBASE}/bin/clanlib-config +BUILDLINK_CONFIG.ClanLib= ${BUILDLINK_PREFIX.ClanLib}/bin/clanlib-config BUILDLINK_CONFIG_WRAPPER.ClanLib=${BUILDLINK_DIR}/bin/clanlib-config .if defined(USE_CONFIG_WRAPPER) && defined(GNU_CONFIGURE) diff --git a/graphics/fnlib/buildlink.mk b/graphics/fnlib/buildlink.mk index ff98d845834..51e5ad6e042 100644 --- a/graphics/fnlib/buildlink.mk +++ b/graphics/fnlib/buildlink.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink.mk,v 1.1 2001/07/03 16:30:19 zuntum Exp $ +# $NetBSD: buildlink.mk,v 1.2 2001/07/20 01:54:43 jlam Exp $ # # This Makefile fragment is included by packages that use fnlib. # @@ -18,7 +18,7 @@ FNLIB_BUILDLINK_MK= # defined BUILDLINK_DEPENDS.fnlib?= fnlib>=0.5 DEPENDS+= ${BUILDLINK_DEPENDS.fnlib}:../../graphics/fnlib -BUILDLINK_PREFIX.fnlib= ${LOCALBASE} +EVAL_PREFIX+= BUILDLINK_PREFIX.fnlib=fnlib BUILDLINK_FILES.fnlib= include/Fnlib* BUILDLINK_FILES.fnlib+= lib/libFnlib.* diff --git a/graphics/freetype-lib/buildlink.mk b/graphics/freetype-lib/buildlink.mk index 05673b386bb..fa598f8c95b 100644 --- a/graphics/freetype-lib/buildlink.mk +++ b/graphics/freetype-lib/buildlink.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink.mk,v 1.6 2001/07/01 22:59:22 jlam Exp $ +# $NetBSD: buildlink.mk,v 1.7 2001/07/20 01:54:43 jlam Exp $ # # This Makefile fragment is included by packages that use freetype. # @@ -20,7 +20,7 @@ FREETYPE_BUILDLINK_MK= # defined BUILDLINK_DEPENDS.freetype?= freetype-lib>=1.3.1 DEPENDS+= ${BUILDLINK_DEPENDS.freetype}:../../graphics/freetype-lib -BUILDLINK_PREFIX.freetype= ${LOCALBASE} +EVAL_PREFIX+= BUILDLINK_PREFIX.freetype=freetype-lib BUILDLINK_FILES.freetype= include/freetype/* BUILDLINK_FILES.freetype+= lib/libttf.* diff --git a/graphics/freetype2/buildlink.mk b/graphics/freetype2/buildlink.mk index d82712df2a9..1868b174c8e 100644 --- a/graphics/freetype2/buildlink.mk +++ b/graphics/freetype2/buildlink.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink.mk,v 1.8 2001/07/14 15:56:28 jlam Exp $ +# $NetBSD: buildlink.mk,v 1.9 2001/07/20 01:54:43 jlam Exp $ # # This Makefile fragment is included by packages that use freetype2. # @@ -36,7 +36,7 @@ _NEED_FREETYPE2= NO .if ${_NEED_FREETYPE2} == "YES" DEPENDS+= ${BUILDLINK_DEPENDS.freetype2}:../../graphics/freetype2 -BUILDLINK_PREFIX.freetype2= ${LOCALBASE} +EVAL_PREFIX+= BUILDLINK_PREFIX.freetype2=freetype2 .else BUILDLINK_PREFIX.freetype2= ${X11BASE} .endif @@ -54,8 +54,10 @@ BUILDLINK_TARGETS.freetype2= freetype2-buildlink .if ${_NEED_FREETYPE2} == "YES" BUILDLINK_TARGETS.freetype2+= freetype2-buildlink-config-wrapper -BUILDLINK_CONFIG.freetype2= ${LOCALBASE}/bin/freetype-config -BUILDLINK_CONFIG_WRAPPER.freetype2= ${BUILDLINK_DIR}/bin/freetype-config +BUILDLINK_CONFIG.freetype2= \ + ${BUILDLINK_PREFIX.freetype2}/bin/freetype-config +BUILDLINK_CONFIG_WRAPPER.freetype2= \ + ${BUILDLINK_DIR}/bin/freetype-config freetype2-buildlink-config-wrapper: _BUILDLINK_CONFIG_WRAPPER_USE diff --git a/graphics/gd/buildlink.mk b/graphics/gd/buildlink.mk index 463d2ef1610..f43864d66a0 100644 --- a/graphics/gd/buildlink.mk +++ b/graphics/gd/buildlink.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink.mk,v 1.2 2001/07/01 22:59:22 jlam Exp $ +# $NetBSD: buildlink.mk,v 1.3 2001/07/20 01:54:44 jlam Exp $ # # This Makefile fragment is included by packages that use gd. # @@ -20,7 +20,7 @@ GD_BUILDLINK_MK= # defined BUILDLINK_DEPENDS.gd?= gd>=1.8.3 DEPENDS+= ${BUILDLINK_DEPENDS.gd}:../../graphics/gd -BUILDLINK_PREFIX.gd= ${LOCALBASE} +EVAL_PREFIX+= BUILDLINK_PREFIX.gd=gd BUILDLINK_FILES.gd= include/gd*.h BUILDLINK_FILES.gd+= lib/libgd.* diff --git a/graphics/gdk-pixbuf/buildlink.mk b/graphics/gdk-pixbuf/buildlink.mk index 6997520a173..dc5d59ebb6b 100644 --- a/graphics/gdk-pixbuf/buildlink.mk +++ b/graphics/gdk-pixbuf/buildlink.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink.mk,v 1.5 2001/07/02 05:33:59 jlam Exp $ +# $NetBSD: buildlink.mk,v 1.6 2001/07/20 01:54:44 jlam Exp $ # # This Makefile fragment is included by packages that use gdk-pixbuf. # @@ -20,7 +20,7 @@ GDK_PIXBUF_BUILDLINK_MK= # defined BUILDLINK_DEPENDS.gkd-pixbuf?= gdk-pixbuf>=0.8.0nb1 DEPENDS+= ${BUILDLINK_DEPENDS.gkd-pixbuf}:../../graphics/gdk-pixbuf -BUILDLINK_PREFIX.gdk-pixbuf= ${X11PREFIX} +EVAL_PREFIX+= BUILDLINK_PREFIX.gdk-pixbuf=gdk-pixbuf BUILDLINK_FILES.gdk-pixbuf= include/gdk-pixbuf/* BUILDLINK_FILES.gdk-pixbuf+= lib/libgdk_pixbuf.* BUILDLINK_FILES.gdk-pixbuf+= lib/libgdk_pixbuf_xlib.* @@ -33,8 +33,10 @@ BUILDLINK_TARGETS.gdk-pixbuf= gdk-pixbuf-buildlink BUILDLINK_TARGETS.gdk-pixbuf+= gdk-pixbuf-buildlink-config-wrapper BUILDLINK_TARGETS+= ${BUILDLINK_TARGETS.gdk-pixbuf} -BUILDLINK_CONFIG.gdk-pixbuf= ${X11PREFIX}/bin/gdk-pixbuf-config -BUILDLINK_CONFIG_WRAPPER.gdk-pixbuf= ${BUILDLINK_DIR}/bin/gdk-pixbuf-config +BUILDLINK_CONFIG.gdk-pixbuf= \ + ${BUILDLINK_PREFIX.gdk-pixbuf}/bin/gdk-pixbuf-config +BUILDLINK_CONFIG_WRAPPER.gdk-pixbuf= \ + ${BUILDLINK_DIR}/bin/gdk-pixbuf-config .if defined(USE_CONFIG_WRAPPER) && defined(GNU_CONFIGURE) GDK_PIXBUF_CONFIG?= ${BUILDLINK_CONFIG_WRAPPER.gdk-pixbuf} diff --git a/graphics/hermes/buildlink.mk b/graphics/hermes/buildlink.mk index 810f7a759d9..bc46654570c 100644 --- a/graphics/hermes/buildlink.mk +++ b/graphics/hermes/buildlink.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink.mk,v 1.2 2001/07/01 22:59:23 jlam Exp $ +# $NetBSD: buildlink.mk,v 1.3 2001/07/20 01:54:44 jlam Exp $ # # This Makefile fragment is included by packages that use Hermes. # @@ -20,7 +20,7 @@ HERMES_BUILDLINK_MK= # defined BUILDLINK_DEPENDS.Hermes?= Hermes>=1.3.2 DEPENDS+= ${BUILDLINK_DEPENDS.Hermes}:../../graphics/hermes -BUILDLINK_PREFIX.Hermes= ${LOCALBASE} +EVAL_PREFIX+= BUILDLINK_PREFIX.Hermes=Hermes BUILDLINK_FILES.Hermes= include/Hermes/* BUILDLINK_FILES.Hermes+= lib/libHermes.* diff --git a/graphics/imlib/buildlink.mk b/graphics/imlib/buildlink.mk index 57c23a53049..f6e301d0172 100644 --- a/graphics/imlib/buildlink.mk +++ b/graphics/imlib/buildlink.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink.mk,v 1.4 2001/07/02 05:33:59 jlam Exp $ +# $NetBSD: buildlink.mk,v 1.5 2001/07/20 01:54:44 jlam Exp $ # # This Makefile fragment is included by packages that use imlib. # @@ -20,7 +20,7 @@ IMLIB_BUILDLINK_MK= # defined BUILDLINK_DEPENDS.imlib?= imlib>=1.9.8 DEPENDS+= ${BUILDLINK_DEPENDS.imlib}:../../graphics/imlib -BUILDLINK_PREFIX.imlib= ${X11PREFIX} +EVAL_PREFIX+= BUILDLINK_PREFIX.imlib=imlib BUILDLINK_FILES.imlib= include/gdk_imlib.h BUILDLINK_FILES.imlib+= include/gdk_imlib_private.h BUILDLINK_FILES.imlib+= include/gdk_imlib_types.h @@ -41,7 +41,7 @@ BUILDLINK_TARGETS.imlib= imlib-buildlink BUILDLINK_TARGETS.imlib+= imlib-buildlink-config-wrapper BUILDLINK_TARGETS+= ${BUILDLINK_TARGETS.imlib} -BUILDLINK_CONFIG.imlib= ${X11PREFIX}/bin/imlib-config +BUILDLINK_CONFIG.imlib= ${BUILDLINK_PREFIX.imlib}/bin/imlib-config BUILDLINK_CONFIG_WRAPPER.imlib= ${BUILDLINK_DIR}/bin/imlib-config .if defined(USE_CONFIG_WRAPPER) && defined(GNU_CONFIGURE) diff --git a/graphics/jpeg/buildlink.mk b/graphics/jpeg/buildlink.mk index af77b33aff6..99e17592052 100644 --- a/graphics/jpeg/buildlink.mk +++ b/graphics/jpeg/buildlink.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink.mk,v 1.6 2001/07/01 22:59:24 jlam Exp $ +# $NetBSD: buildlink.mk,v 1.7 2001/07/20 01:54:45 jlam Exp $ # # This Makefile fragment is included by packages that use libjpeg. # @@ -20,7 +20,7 @@ JPEG_BUILDLINK_MK= # defined BUILDLINK_DEPENDS.jpeg?= jpeg-6b DEPENDS+= ${BUILDLINK_DEPENDS.jpeg}:../../graphics/jpeg -BUILDLINK_PREFIX.jpeg= ${LOCALBASE} +EVAL_PREFIX+= BUILDLINK_PREFIX.jpeg=jpeg BUILDLINK_FILES.jpeg= include/jconfig.h BUILDLINK_FILES.jpeg+= include/jpeglib.h BUILDLINK_FILES.jpeg+= include/jmorecfg.h diff --git a/graphics/lcms/buildlink.mk b/graphics/lcms/buildlink.mk index 36e41d8f710..43b68bd3d0a 100644 --- a/graphics/lcms/buildlink.mk +++ b/graphics/lcms/buildlink.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink.mk,v 1.3 2001/07/01 22:59:24 jlam Exp $ +# $NetBSD: buildlink.mk,v 1.4 2001/07/20 01:54:45 jlam Exp $ # # This Makefile fragment is included by packages that use lcms. # @@ -20,7 +20,7 @@ LCMS_BUILDLINK_MK= # defined BUILDLINK_DEPENDS.lcms?= lcms>=1.06 DEPENDS+= ${BUILDLINK_DEPENDS.lcms}:../../graphics/lcms -BUILDLINK_PREFIX.lcms= ${LOCALBASE} +EVAL_PREFIX+= BUILDLINK_PREFIX.lcms=lcms BUILDLINK_FILES.lcms= include/lcms/* BUILDLINK_FILES.lcms+= lib/liblcms.* diff --git a/graphics/libungif/buildlink.mk b/graphics/libungif/buildlink.mk index ef6ac61d77e..0f521c77781 100644 --- a/graphics/libungif/buildlink.mk +++ b/graphics/libungif/buildlink.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink.mk,v 1.3 2001/07/01 22:59:24 jlam Exp $ +# $NetBSD: buildlink.mk,v 1.4 2001/07/20 01:54:45 jlam Exp $ # # This Makefile fragment is included by packages that use libungif. # @@ -20,7 +20,7 @@ LIBUNGIF_BUILDLINK_MK= # defined BUILDLINK_DEPENDS.libungif?= libungif>=4.1.0 DEPENDS+= ${BUILDLINK_DEPENDS.libungif}:../../graphics/libungif -BUILDLINK_PREFIX.libungif= ${LOCALBASE} +EVAL_PREFIX+= BUILDLINK_PREFIX.libungif=libungif BUILDLINK_FILES.libungif= include/gif_lib.h BUILDLINK_FILES.libungif+= lib/libgif.* BUILDLINK_FILES.libungif+= lib/libungif.* diff --git a/graphics/libwmf/buildlink.mk b/graphics/libwmf/buildlink.mk index c7f6293733f..63cd414c908 100644 --- a/graphics/libwmf/buildlink.mk +++ b/graphics/libwmf/buildlink.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink.mk,v 1.1 2001/07/09 18:59:48 zuntum Exp $ +# $NetBSD: buildlink.mk,v 1.2 2001/07/20 01:54:45 jlam Exp $ # # This Makefile fragment is included by packages that use libwmf. # @@ -20,7 +20,7 @@ LIBWMF_BUILDLINK_MK= # defined BUILDLINK_DEPENDS.libwmf?= libwmf>=0.1.21 DEPENDS+= ${BUILDLINK_DEPENDS.libwmf}:../../graphics/libwmf -BUILDLINK_PREFIX.libwmf= ${LOCALBASE} +EVAL_PREFIX+= BUILDLINK_PREFIX.libwmf=libwmf BUILDLINK_FILES.libwmf= include/libwmf/*.h BUILDLINK_FILES.libwmf+= lib/libXwmf.a BUILDLINK_FILES.libwmf+= lib/libdib.a diff --git a/graphics/mng/buildlink.mk b/graphics/mng/buildlink.mk index 402aa494259..b0cf8b4d788 100644 --- a/graphics/mng/buildlink.mk +++ b/graphics/mng/buildlink.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink.mk,v 1.4 2001/07/01 22:59:24 jlam Exp $ +# $NetBSD: buildlink.mk,v 1.5 2001/07/20 01:54:46 jlam Exp $ # # This Makefile fragment is included by packages that use mng. # @@ -20,7 +20,7 @@ MNG_BUILDLINK_MK= # defined BUILDLINK_DEPENDS.mng?= mng>=1.0.0 DEPENDS+= ${BUILDLINK_DEPENDS.mng}:../../graphics/mng -BUILDLINK_PREFIX.mng= ${LOCALBASE} +EVAL_PREFIX+= BUILDLINK_PREFIX.mng=mng BUILDLINK_FILES.mng= include/libmng.h BUILDLINK_FILES.mng+= include/libmng_conf.h BUILDLINK_FILES.mng+= include/libmng_types.h diff --git a/graphics/mpeg-lib/buildlink.mk b/graphics/mpeg-lib/buildlink.mk index fca2829635f..c2dfbdc29c1 100644 --- a/graphics/mpeg-lib/buildlink.mk +++ b/graphics/mpeg-lib/buildlink.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink.mk,v 1.2 2001/07/01 22:59:25 jlam Exp $ +# $NetBSD: buildlink.mk,v 1.3 2001/07/20 01:54:46 jlam Exp $ # # This Makefile fragment is included by packages that use mpeg. # @@ -20,7 +20,7 @@ MPEG_BUILDLINK_MK= # defined BUILDLINK_DEPENDS.mpeg?= mpeg>=1.2.1 DEPENDS+= ${BUILDLINK_DEPENDS.mpeg}:../../graphics/mpeg-lib -BUILDLINK_PREFIX.mpeg= ${LOCALBASE} +EVAL_PREFIX+= BUILDLINK_PREFIX.mpeg=mpeg BUILDLINK_FILES.mpeg= include/mpeg.h BUILDLINK_FILES.mpeg+= lib/libmpeg.* diff --git a/graphics/netpbm/buildlink.mk b/graphics/netpbm/buildlink.mk index 07c0ffcfc1b..65b6905405f 100644 --- a/graphics/netpbm/buildlink.mk +++ b/graphics/netpbm/buildlink.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink.mk,v 1.3 2001/07/01 22:59:25 jlam Exp $ +# $NetBSD: buildlink.mk,v 1.4 2001/07/20 01:54:46 jlam Exp $ # # This Makefile fragment is included by packages that use netpbm. # @@ -20,7 +20,7 @@ NETPBM_BUILDLINK_MK= # defined BUILDLINK_DEPENDS.netpbm?= netpbm>=9.7 DEPENDS+= ${BUILDLINK_DEPENDS.netpbm}:../../graphics/netpbm -BUILDLINK_PREFIX.netpbm= ${LOCALBASE} +EVAL_PREFIX+= BUILDLINK_PREFIX.netpbm=netpbm BUILDLINK_FILES.netpbm= include/pbm.h BUILDLINK_FILES.netpbm+= include/pbmplus.h BUILDLINK_FILES.netpbm+= include/pgm.h diff --git a/graphics/png/buildlink.mk b/graphics/png/buildlink.mk index 2e41ea229f0..255ea3a2e9c 100644 --- a/graphics/png/buildlink.mk +++ b/graphics/png/buildlink.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink.mk,v 1.7 2001/07/01 22:59:25 jlam Exp $ +# $NetBSD: buildlink.mk,v 1.8 2001/07/20 01:54:46 jlam Exp $ # # This Makefile fragment is included by packages that use libpng. # @@ -20,7 +20,7 @@ PNG_BUILDLINK_MK= # defined BUILDLINK_DEPENDS.png?= png>=1.0.11 DEPENDS+= ${BUILDLINK_DEPENDS.png}:../../graphics/png -BUILDLINK_PREFIX.png= ${LOCALBASE} +EVAL_PREFIX+= BUILDLINK_PREFIX.png=png BUILDLINK_FILES.png= include/png.h BUILDLINK_FILES.png+= include/pngconf.h BUILDLINK_FILES.png+= lib/libpng.* diff --git a/graphics/tiff/buildlink.mk b/graphics/tiff/buildlink.mk index 99040097329..5280d3c84c0 100644 --- a/graphics/tiff/buildlink.mk +++ b/graphics/tiff/buildlink.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink.mk,v 1.7 2001/07/01 22:59:26 jlam Exp $ +# $NetBSD: buildlink.mk,v 1.8 2001/07/20 01:54:46 jlam Exp $ # # This Makefile fragment is included by packages that use libtiff. # @@ -20,7 +20,7 @@ TIFF_BUILDLINK_MK= # defined BUILDLINK_DEPENDS.tiff?= tiff>=3.5.4 DEPENDS+= ${BUILDLINK_DEPENDS.tiff}:../../graphics/tiff -BUILDLINK_PREFIX.tiff= ${LOCALBASE} +EVAL_PREFIX+= BUILDLINK_PREFIX.tiff=tiff BUILDLINK_FILES.tiff= include/tiff.h BUILDLINK_FILES.tiff+= include/tiffconf.h BUILDLINK_FILES.tiff+= include/tiffio.h diff --git a/graphics/xpm/buildlink.mk b/graphics/xpm/buildlink.mk index 5a0f2aafde5..044435fb78b 100644 --- a/graphics/xpm/buildlink.mk +++ b/graphics/xpm/buildlink.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink.mk,v 1.8 2001/07/07 06:24:12 tron Exp $ +# $NetBSD: buildlink.mk,v 1.9 2001/07/20 01:54:47 jlam Exp $ # # This Makefile fragment is included by packages that use xpm. # @@ -35,7 +35,7 @@ _NEED_XPM= NO .if ${_NEED_XPM} == "YES" DEPENDS+= ${BUILDLINK_DEPENDS.xpm}:../../graphics/xpm -BUILDLINK_PREFIX.xpm= ${X11PREFIX} +EVAL_PREFIX+= BUILDLINK_PREFIX.xpm=xpm .else BUILDLINK_PREFIX.xpm= ${X11BASE} .endif diff --git a/japanese/vflib-lib/buildlink.mk b/japanese/vflib-lib/buildlink.mk index 9a800052e5b..6a591d0b58e 100644 --- a/japanese/vflib-lib/buildlink.mk +++ b/japanese/vflib-lib/buildlink.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink.mk,v 1.6 2001/07/01 22:59:26 jlam Exp $ +# $NetBSD: buildlink.mk,v 1.7 2001/07/20 01:54:47 jlam Exp $ # # This Makefile fragment is included by packages that use VFlib. # @@ -20,7 +20,7 @@ VFLIB_BUILDLINK_MK= # defined BUILDLINK_DEPENDS.vflib?= ja-vflib-lib>=2.24.2 DEPENDS+= ${BUILDLINK_DEPENDS.vflib}:../../japanese/vflib-lib -BUILDLINK_PREFIX.vflib= ${LOCALBASE} +EVAL_PREFIX+= BUILDLINK_PREFIX.vflib=vflib-lib BUILDLINK_FILES.vflib= include/VF.h BUILDLINK_FILES.vflib+= lib/libVFlib2.* diff --git a/lang/f2c/buildlink.mk b/lang/f2c/buildlink.mk index a89e9c8f5fd..488efb70774 100644 --- a/lang/f2c/buildlink.mk +++ b/lang/f2c/buildlink.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink.mk,v 1.1 2001/07/18 22:11:33 jlam Exp $ +# $NetBSD: buildlink.mk,v 1.2 2001/07/20 01:54:47 jlam Exp $ # # This Makefile fragment is included by packages that use f2c. # @@ -20,7 +20,7 @@ F2C_BUILDLINK_MK= # defined BUILDLINK_DEPENDS.f2c?= f2c>=20001205nb3 DEPENDS+= ${BUILDLINK_DEPENDS.f2c}:../../lang/f2c -BUILDLINK_PREFIX.f2c= ${LOCALBASE} +EVAL_PREFIX+= BUILDLINK_PREFIX.f2c=f2c BUILDLINK_FILES.f2c= include/f2c.h BUILDLINK_FILES.f2c+= lib/libf2c.* BUILDLINK_FILES.f2c+= lib/libf2c_p.a diff --git a/lang/tcl/buildlink.mk b/lang/tcl/buildlink.mk index 60b8cefd528..efeac03a8d4 100644 --- a/lang/tcl/buildlink.mk +++ b/lang/tcl/buildlink.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink.mk,v 1.3 2001/07/01 22:59:26 jlam Exp $ +# $NetBSD: buildlink.mk,v 1.4 2001/07/20 01:54:48 jlam Exp $ # # This Makefile fragment is included by packages that use tcl. # @@ -20,7 +20,7 @@ TCL_BUILDLINK_MK= # defined BUILDLINK_DEPENDS.tcl?= tcl>=8.3.2 DEPENDS+= ${BUILDLINK_DEPENDS.tcl}:../../lang/tcl -BUILDLINK_PREFIX.tcl= ${LOCALBASE} +EVAL_PREFIX+= BUILDLINK_PREFIX.tcl=tcl BUILDLINK_FILES.tcl= include/tcl.h BUILDLINK_FILES.tcl+= include/tclDecls.h BUILDLINK_FILES.tcl+= include/tcl/*/*.h @@ -40,9 +40,9 @@ tclConfig-buildlink: if [ ! -f $${cookie} ]; then \ file=lib/tclConfig.sh; \ ${ECHO_MSG} "Creating script ${BUILDLINK_DIR}/$${file}."; \ - ${SED} -e "s|-L${LOCALBASE}/lib|-L${BUILDLINK_DIR}/lib|g" \ - -e "s|${LOCALBASE}/lib/libtclstub|${BUILDLINK_DIR}/lib/libtclstub|g" \ - ${LOCALBASE}/$${file} > ${BUILDLINK_DIR}/$${file}; \ + ${SED} -e "s|-L${BUILDLINK_PREFIX.tcl}/lib|-L${BUILDLINK_DIR}/lib|g" \ + -e "s|${BUILDLINK_PREFIX.tcl}/lib/libtclstub|${BUILDLINK_DIR}/lib/libtclstub|g" \ + ${BUILDLINK_PREFIX.tcl}/$${file} > ${BUILDLINK_DIR}/$${file}; \ ${CHMOD} +x ${BUILDLINK_DIR}/$${file}; \ ${TOUCH} ${TOUCH_FLAGS} $${cookie}; \ fi diff --git a/mail/imap-uw/buildlink.mk b/mail/imap-uw/buildlink.mk index bee689e4f09..3c8bb5ba432 100644 --- a/mail/imap-uw/buildlink.mk +++ b/mail/imap-uw/buildlink.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink.mk,v 1.3 2001/07/01 22:59:27 jlam Exp $ +# $NetBSD: buildlink.mk,v 1.4 2001/07/20 01:54:48 jlam Exp $ # # This Makefile fragment is included by packages that use imap-uw. # @@ -20,7 +20,7 @@ IMAP_UW_BUILDLINK_MK= # defined BUILDLINK_DEPENDS.imap-uw?= imap-uw>=2000.0.3nb1 DEPENDS+= ${BUILDLINK_DEPENDS.imap-uw}:../../mail/imap-uw -BUILDLINK_PREFIX.imap-uw= ${LOCALBASE} +EVAL_PREFIX+= BUILDLINK_PREFIX.imap-uw=imap-uw BUILDLINK_FILES.imap-uw= include/c-client/* BUILDLINK_FILES.imap-uw+= lib/libc-client.* BUILDLINK_FILES.imap-uw+= lib/libc-client_pic.* diff --git a/math/blas/buildlink.mk b/math/blas/buildlink.mk index e27e03fe96a..a8191dbcbdb 100644 --- a/math/blas/buildlink.mk +++ b/math/blas/buildlink.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink.mk,v 1.1 2001/07/18 22:16:09 jlam Exp $ +# $NetBSD: buildlink.mk,v 1.2 2001/07/20 01:54:48 jlam Exp $ # # This Makefile fragment is included by packages that use blas. # @@ -20,7 +20,7 @@ BLAS_BUILDLINK_MK= # defined BUILDLINK_DEPENDS.blas?= blas>=1.0 BUILD_DEPENDS+= ${BUILDLINK_DEPENDS.blas}:../../math/blas -BUILDLINK_PREFIX.blas= ${LOCALBASE} +EVAL_PREFIX+= BUILDLINK_PREFIX.blas=blas BUILDLINK_FILES.blas= lib/libblas.* BUILDLINK_TARGETS.blas= blas-buildlink diff --git a/misc/rpm/buildlink.mk b/misc/rpm/buildlink.mk index 95b229ca9a4..822bb4fba87 100644 --- a/misc/rpm/buildlink.mk +++ b/misc/rpm/buildlink.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink.mk,v 1.4 2001/07/14 07:34:44 jlam Exp $ +# $NetBSD: buildlink.mk,v 1.5 2001/07/20 01:54:48 jlam Exp $ # # This Makefile fragment is included by packages that use rpm. # @@ -21,7 +21,7 @@ RPM_BUILDLINK_MK= # defined BUILDLINK_DEPENDS.rpm?= rpm>=2.4.3 BUILD_DEPENDS+= ${BUILDLINK_DEPENDS.rpm}:../../misc/rpm -BUILDLINK_PREFIX.rpm= ${LOCALBASE} +EVAL_PREFIX+= BUILDLINK_PREFIX.rpm=rpm BUILDLINK_FILES.rpm= include/rpm/* BUILDLINK_FILES.rpm+= lib/librpm.a diff --git a/net/ORBit/buildlink.mk b/net/ORBit/buildlink.mk index 563b03a767a..47780da5b1b 100644 --- a/net/ORBit/buildlink.mk +++ b/net/ORBit/buildlink.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink.mk,v 1.4 2001/07/02 05:34:00 jlam Exp $ +# $NetBSD: buildlink.mk,v 1.5 2001/07/20 01:54:49 jlam Exp $ # # This Makefile fragment is included by packages that use ORBit. # @@ -20,7 +20,7 @@ ORBIT_BUILDLINK_MK= # defined BUILDLINK_DEPENDS.ORBit?= ORBit>=0.5.1 DEPENDS+= ${BUILDLINK_DEPENDS.ORBit}:../../net/ORBit -BUILDLINK_PREFIX.ORBit= ${LOCALBASE} +EVAL_PREFIX+= BUILDLINK_PREFIX.ORBit=ORBit BUILDLINK_FILES.ORBit= include/IIOP/* BUILDLINK_FILES.ORBit+= include/ORBitservices/* BUILDLINK_FILES.ORBit+= include/ORBitutil/* @@ -45,11 +45,11 @@ BUILDLINK_TARGETS.ORBit+= libIDL-buildlink-config-wrapper BUILDLINK_TARGETS.ORBit+= orbit-buildlink-config-wrapper BUILDLINK_TARGETS+= ${BUILDLINK_TARGETS.ORBit} -BUILDLINK_CONFIG.libIDL= ${LOCALBASE}/bin/libIDL-config -BUILDLINK_CONFIG_WRAPPER.libIDL= ${BUILDLINK_DIR}/bin/libIDL-config +BUILDLINK_CONFIG.libIDL= ${BUILDLINK_PREFIX.ORBit}/bin/libIDL-config +BUILDLINK_CONFIG_WRAPPER.libIDL=${BUILDLINK_DIR}/bin/libIDL-config -BUILDLINK_CONFIG.orbit= ${LOCALBASE}/bin/orbit-config -BUILDLINK_CONFIG_WRAPPER.orbit= ${BUILDLINK_DIR}/bin/orbit-config +BUILDLINK_CONFIG.orbit= ${BUILDLINK_PREFIX.ORBit}/bin/orbit-config +BUILDLINK_CONFIG_WRAPPER.orbit= ${BUILDLINK_DIR}/bin/orbit-config .if defined(USE_CONFIG_WRAPPER) && defined(GNU_CONFIGURE) LIBIDL_CONFIG?= ${BUILDLINK_CONFIG_WRAPPER.libIDL} diff --git a/net/SDL_net/buildlink.mk b/net/SDL_net/buildlink.mk index c87bd28a753..7c1eaa9cff7 100644 --- a/net/SDL_net/buildlink.mk +++ b/net/SDL_net/buildlink.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink.mk,v 1.1.1.1 2001/07/10 09:05:28 zuntum Exp $ +# $NetBSD: buildlink.mk,v 1.2 2001/07/20 01:54:49 jlam Exp $ # # This Makefile fragment is included by packages that use SDL_net. # @@ -20,7 +20,7 @@ SDL_NET_BUILDLINK_MK= # defined BUILDLINK_DEPENDS.SDL_net?= SDL_net>=1.2.0 DEPENDS+= ${BUILDLINK_DEPENDS.SDL_net}:../../net/SDL_net -BUILDLINK_PREFIX.SDL_net= ${LOCALBASE} +EVAL_PREFIX+= BUILDLINK_PREFIX.SDL_net=SDL_net BUILDLINK_FILES.SDL_net= include/SDL/SDL_net.h BUILDLINK_FILES.SDL_net+= lib/libSDL_net-* BUILDLINK_FILES.SDL_net+= lib/libSDL_net.* diff --git a/net/socks4/buildlink.mk b/net/socks4/buildlink.mk index cd79be98be0..1c1eca27099 100644 --- a/net/socks4/buildlink.mk +++ b/net/socks4/buildlink.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink.mk,v 1.5 2001/07/15 12:18:04 jlam Exp $ +# $NetBSD: buildlink.mk,v 1.6 2001/07/20 01:54:49 jlam Exp $ # # This Makefile fragment is included by packages that use socks4. # @@ -20,7 +20,7 @@ SOCKS4_BUILDLINK_MK= # defined BUILDLINK_DEPENDS.socks4?= socks4>=2.2 DEPENDS+= ${BUILDLINK_DEPENDS.socks4}:../../net/socks4 -BUILDLINK_PREFIX.socks4= ${LOCALBASE} +EVAL_PREFIX+= BUILDLINK_PREFIX.socks4=socks4 BUILDLINK_FILES.socks4= lib/libsocks4.* BUILDLINK_TARGETS.socks4= socks4-buildlink diff --git a/net/socks5/buildlink.mk b/net/socks5/buildlink.mk index 147571f1da4..16c50948193 100644 --- a/net/socks5/buildlink.mk +++ b/net/socks5/buildlink.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink.mk,v 1.2 2001/07/01 22:59:28 jlam Exp $ +# $NetBSD: buildlink.mk,v 1.3 2001/07/20 01:54:50 jlam Exp $ # # This Makefile fragment is included by packages that use socks5. # @@ -20,7 +20,7 @@ SOCKS5_BUILDLINK_MK= # defined BUILDLINK_DEPENDS.socks5?= socks5>=1.0.2 DEPENDS+= ${BUILDLINK_DEPENDS.socks5}:../../net/socks5 -BUILDLINK_PREFIX.socks5= ${LOCALBASE} +EVAL_PREFIX+= BUILDLINK_PREFIX.socks5=socks5 BUILDLINK_FILES.socks5= include/socks.h BUILDLINK_FILES.socks5+= lib/libsocks5.a BUILDLINK_FILES.socks5+= lib/libsocks5_sh.* diff --git a/print/cups/buildlink.mk b/print/cups/buildlink.mk index c32c86f1365..4ac7247b2db 100644 --- a/print/cups/buildlink.mk +++ b/print/cups/buildlink.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink.mk,v 1.8 2001/07/01 22:59:28 jlam Exp $ +# $NetBSD: buildlink.mk,v 1.9 2001/07/20 01:54:50 jlam Exp $ # # This Makefile fragment is included by packages that use libcups. # @@ -20,7 +20,7 @@ CUPS_BUILDLINK_MK= # defined BUILDLINK_DEPENDS.cups?= cups>=1.1.1 DEPENDS+= ${BUILDLINK_DEPENDS.cups}:../../print/cups -BUILDLINK_PREFIX.cups= ${LOCALBASE} +EVAL_PREFIX+= BUILDLINK_PREFIX.cups=cups BUILDLINK_FILES.cups= include/cups/* BUILDLINK_FILES.cups+= lib/libcups.* BUILDLINK_FILES.cups+= lib/libcupsimage.* diff --git a/security/PAM/buildlink.mk b/security/PAM/buildlink.mk index e0690111562..64ef22eab4e 100644 --- a/security/PAM/buildlink.mk +++ b/security/PAM/buildlink.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink.mk,v 1.8 2001/07/01 22:59:28 jlam Exp $ +# $NetBSD: buildlink.mk,v 1.9 2001/07/20 01:54:50 jlam Exp $ # # This Makefile fragment is included by packages that use libpam. # @@ -20,7 +20,7 @@ PAM_BUILDLINK_MK= # defined BUILDLINK_DEPENDS.pam?= PAM>=0.72 DEPENDS+= ${BUILDLINK_DEPENDS.pam}:../../security/PAM -BUILDLINK_PREFIX.pam= ${LOCALBASE} +EVAL_PREFIX+= BUILDLINK_PREFIX.pam=PAM BUILDLINK_FILES.pam= include/security/* BUILDLINK_FILES.pam+= lib/libpam.* BUILDLINK_FILES.pam+= lib/libpamc.* diff --git a/security/libcrack/buildlink.mk b/security/libcrack/buildlink.mk index a557bddd1b9..aade14f3e13 100644 --- a/security/libcrack/buildlink.mk +++ b/security/libcrack/buildlink.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink.mk,v 1.3 2001/07/01 22:59:28 jlam Exp $ +# $NetBSD: buildlink.mk,v 1.4 2001/07/20 01:54:50 jlam Exp $ # # This Makefile fragment is included by packages that use libcrack. # @@ -20,7 +20,7 @@ LIBCRACK_BUILDLINK_MK= # defined BUILDLINK_DEPENDS.libcrack?= libcrack>=2.7 DEPENDS+= ${BUILDLINK_DEPENDS.libcrack}:../../security/libcrack -BUILDLINK_PREFIX.libcrack= ${LOCALBASE} +EVAL_PREFIX+= BUILDLINK_PREFIX.libcrack=libcrack BUILDLINK_FILES.libcrack= include/cracklib/* BUILDLINK_FILES.libcrack+= lib/libcrack.* |