diff options
| author | jlam <jlam@pkgsrc.org> | 2001-06-11 02:05:07 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2001-06-11 02:05:07 +0000 |
| commit | dbfde59b14f3df33f921b522c83796d99919502c (patch) | |
| tree | 8a4903fb4961ac3e5118ca00c446b0bcfea9697d | |
| parent | 072be2ad69b44757c1fda013ef9c97ac9969c501 (diff) | |
| download | pkgsrc-dbfde59b14f3df33f921b522c83796d99919502c.tar.gz | |
The buildlink include and lib directories are added to CFLAGS, CPPFLAGS,
CXXFLAGS, and LDFLAGS by the buildlink.mk files so remove the extra
definitions to add them from the package Makefiles. As advised by the
bsd.buildlink.mk file, also ensure that the buildlink.mk files are
included prior to defining any package-specific CFLAGS/LDFLAGS to ensure
that the buildlink directories are at the head of the compiler search
paths.
39 files changed, 89 insertions, 171 deletions
diff --git a/audio/id3ed/Makefile b/audio/id3ed/Makefile index 4124ba15676..da9a5e684bb 100644 --- a/audio/id3ed/Makefile +++ b/audio/id3ed/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2001/06/10 00:08:41 jlam Exp $ +# $NetBSD: Makefile,v 1.11 2001/06/11 02:05:07 jlam Exp $ # DISTNAME= id3ed-1.10.2 @@ -17,8 +17,7 @@ USE_GNU_READLINE= # uses rl_startup_hook .include "../../devel/readline/buildlink.mk" CONFIGURE_ENV+= LIBS="${LIBS}" -CFLAGS+= -I${BUILDLINK_INCDIR} -LIBS+= -L${BUILDLINK_LIBDIR} ${LDFLAGS} +LIBS+= ${LDFLAGS} post-extract: ${TOUCH} ${WRKSRC}/install.sh diff --git a/cad/felt/Makefile b/cad/felt/Makefile index 0298140a240..3666b8a0eba 100644 --- a/cad/felt/Makefile +++ b/cad/felt/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2001/06/10 00:08:42 jlam Exp $ +# $NetBSD: Makefile,v 1.12 2001/06/11 02:05:08 jlam Exp $ DISTNAME= felt-3.05.src PKGNAME= felt-3.05 @@ -25,9 +25,6 @@ USE_GNU_READLINE= # uses remove_history() and history_list() .include "../../devel/readline/buildlink.mk" -CFLAGS+= -I${BUILDLINK_INCDIR} -LDFLAGS+= -L${BUILDLINK_LIBDIR} - post-extract: @${GZCAT} ${DISTDIR}/felt-3.05.ps.gz > ${WRKSRC}/felt.ps diff --git a/comms/plptools/Makefile b/comms/plptools/Makefile index 23e0a0a1198..b7e14df7c98 100644 --- a/comms/plptools/Makefile +++ b/comms/plptools/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2001/06/10 00:08:42 jlam Exp $ +# $NetBSD: Makefile,v 1.15 2001/06/11 02:05:08 jlam Exp $ # DISTNAME= plptools-0.6 @@ -22,7 +22,6 @@ CONFIGURE_ARGS+= --with-serial=${DEFAULT_SERIAL_DEVICE} CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}" CONFIGURE_ENV+= LIBS="${LIBS}" -CPPFLAGS+= -I${BUILDLINK_INCDIR} LIBS+= -ltermcap .include "../../mk/bsd.pkg.mk" diff --git a/databases/postgresql-client/Makefile b/databases/postgresql-client/Makefile index 2889e342105..47526ce239d 100644 --- a/databases/postgresql-client/Makefile +++ b/databases/postgresql-client/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2001/06/10 00:08:42 jlam Exp $ +# $NetBSD: Makefile,v 1.6 2001/06/11 02:05:08 jlam Exp $ .include "../../databases/postgresql/Makefile.common" .include "../../databases/postgresql/Makefile.ssl" @@ -16,6 +16,13 @@ CONFIGURE_ARGS+= --enable-readline DIRS_TO_BUILD= src/bin +# The following is a hack to force ${BUILDLINK_DIR}/lib to the front of the +# linker's library search path without having to patch a lot of Makefile. +# It works because the PostgreSQL Makefiles invoke the linker with $(CFLAGS) +# as well. +# +CFLAGS+= -L${BUILDLINK_DIR}/lib + pre-build: cd ${WRKSRC}/src/bin/psql && \ ${RM} -f pqsignal.h && \ diff --git a/databases/postgresql-server/Makefile b/databases/postgresql-server/Makefile index 37d140edb74..c267ca1753e 100644 --- a/databases/postgresql-server/Makefile +++ b/databases/postgresql-server/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2001/06/10 00:08:42 jlam Exp $ +# $NetBSD: Makefile,v 1.8 2001/06/11 02:05:09 jlam Exp $ .include "../../databases/postgresql/Makefile.common" .include "../../databases/postgresql/Makefile.ssl" @@ -15,6 +15,13 @@ NOT_FOR_PLATFORM= *-*-mips DIRS_TO_BUILD= src/backend +# The following is a hack to force ${BUILDLINK_DIR}/lib to the front of the +# linker's library search path without having to patch a lot of Makefile. +# It works because the PostgreSQL Makefiles invoke the linker with $(CFLAGS) +# as well. +# +CFLAGS+= -L${BUILDLINK_DIR}/lib + # PGUSER username of the database administrator # PGGROUP group of the database administrator # PGHOME home directory of the database administrator and location of diff --git a/databases/postgresql/Makefile.common b/databases/postgresql/Makefile.common index f5bfd9d30c2..feb35a49a81 100644 --- a/databases/postgresql/Makefile.common +++ b/databases/postgresql/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.18 2001/05/29 23:28:05 jlam Exp $ +# $NetBSD: Makefile.common,v 1.19 2001/06/11 02:05:08 jlam Exp $ # # This Makefile fragment is included by all PostgreSQL packages built from # the main sources of the PostgreSQL distribution. @@ -79,23 +79,7 @@ CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}" CONFIGURE_ENV+= LIBS="${LIBS}" MAKE_ENV+= CUSTOM_COPT="${CFLAGS}" -BUILDLINK_INCDIR= ${WRKDIR}/include -BUILDLINK_LIBDIR= ${WRKDIR}/lib - -CPPFLAGS+= -I${BUILDLINK_INCDIR} -CFLAGS+= -I${BUILDLINK_INCDIR} -LDFLAGS+= -L${BUILDLINK_LIBDIR} - -# The following is a hack to force ${BUILDLINK_LIBDIR} to the front of the -# linker's library search path without having to patch a lot of Makefile. -# It works because the PostgreSQL Makefiles invoke the linker with $(CFLAGS) -# as well. -# -CFLAGS+= -L${BUILDLINK_LIBDIR} - post-extract: - ${MKDIR} ${BUILDLINK_INCDIR} - ${MKDIR} ${BUILDLINK_LIBDIR} if [ -d ${WRKSRC}/src ]; then \ ${RM} -f ${WRKSRC}/src/Makefile.custom; \ ${CP} -f ${COMMON_FILESDIR}/Makefile.custom \ diff --git a/databases/sqsh/Makefile b/databases/sqsh/Makefile index 882b4ab7572..469b1c268ec 100644 --- a/databases/sqsh/Makefile +++ b/databases/sqsh/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2001/06/10 00:08:43 jlam Exp $ +# $NetBSD: Makefile,v 1.8 2001/06/11 02:05:09 jlam Exp $ DISTNAME= sqsh-1.7-src PKGNAME= sqsh-1.7 @@ -24,8 +24,7 @@ LDFLAGS+= -Wl,-R${SYBASE}/lib .include "../../devel/readline/buildlink.mk" -LDFLAGS+= -L${BUILDLINK_LIBDIR} -CONFIGURE_ENV+= INCDIRS="${BUILDLINK_INCDIR}" -CONFIGURE_ENV+= LIBDIRS="${BUILDLINK_LIBDIR}" +CONFIGURE_ENV+= INCDIRS="${BUILDLINK_DIR}/include" +CONFIGURE_ENV+= LIBDIRS="${BUILDLINK_DIR}/lib" .include "../../mk/bsd.pkg.mk" diff --git a/devel/cdecl/Makefile b/devel/cdecl/Makefile index 88e52a1ea6b..d1c501f381a 100644 --- a/devel/cdecl/Makefile +++ b/devel/cdecl/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2001/06/10 00:08:43 jlam Exp $ +# $NetBSD: Makefile,v 1.9 2001/06/11 02:05:09 jlam Exp $ # DISTNAME= cdecl-2.5 @@ -16,9 +16,6 @@ ALL_TARGET= cdecl .include "../../devel/readline/buildlink.mk" -CFLAGS+= -I${BUILDLINK_INCDIR} -LDFLAGS+= -L${BUILDLINK_LIBDIR} - EGDIR= ${PREFIX}/share/examples/cdecl post-install: diff --git a/devel/cmdline/Makefile b/devel/cmdline/Makefile index f417e4a8261..cd4eb26f0f7 100644 --- a/devel/cmdline/Makefile +++ b/devel/cmdline/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2001/06/10 00:08:43 jlam Exp $ +# $NetBSD: Makefile,v 1.7 2001/06/11 02:05:09 jlam Exp $ DISTNAME= CmdLine PKGNAME= cmdline-${PKG_VERS} @@ -17,8 +17,8 @@ USE_LIBTOOL= # defined .include "../../devel/readline/buildlink.mk" -MOREUSRDEFS= -I${BUILDLINK_INCDIR}/readline -MOREUSRLIBS= -L${BUILDLINK_LIBDIR} -lreadline -ltermcap +MOREUSRDEFS= -I${BUILDLINK_DIR}/include/readline +MOREUSRLIBS= -L${BUILDLINK_DIR}/lib -lreadline -ltermcap MAKE_ENV+= OPT="${CXXFLAGS}" MAKE_ENV+= MOREUSRDEFS="${MOREUSRDEFS}" diff --git a/devel/rpc2/Makefile b/devel/rpc2/Makefile index 11725e6bb7e..abdd8c72f93 100644 --- a/devel/rpc2/Makefile +++ b/devel/rpc2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2001/06/10 00:08:43 jlam Exp $ +# $NetBSD: Makefile,v 1.8 2001/06/11 02:05:09 jlam Exp $ # DISTNAME= rpc2-1.10 @@ -24,7 +24,5 @@ LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig CONFIGURE_ENV+= ac_cv_search_tgetent="-ltermcap" CONFIGURE_ENV+= PERL=${PERL5} CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}" -CPPFLAGS+= -I${BUILDLINK_INCDIR} -LDFLAGS+= -L${BUILDLINK_LIBDIR} .include "../../mk/bsd.pkg.mk" diff --git a/devel/rvm/Makefile b/devel/rvm/Makefile index 2064856ef38..3c0166670f8 100644 --- a/devel/rvm/Makefile +++ b/devel/rvm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2001/06/10 00:08:43 jlam Exp $ +# $NetBSD: Makefile,v 1.6 2001/06/11 02:05:10 jlam Exp $ # DISTNAME= rvm-1.3 @@ -20,7 +20,6 @@ LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig .include "../../devel/lwp/buildlink.mk" -CONFIGURE_ARGS+= --with-lwp-includes=${BUILDLINK_INCDIR} -LDFLAGS+= -L${BUILDLINK_LIBDIR} +CONFIGURE_ARGS+= --with-lwp-includes=${BUILDLINK_DIR}/include .include "../../mk/bsd.pkg.mk" diff --git a/editors/abiword/Makefile b/editors/abiword/Makefile index 124d358e2cf..c2f817dd866 100644 --- a/editors/abiword/Makefile +++ b/editors/abiword/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.28 2001/06/10 00:08:44 jlam Exp $ +# $NetBSD: Makefile,v 1.29 2001/06/11 02:05:10 jlam Exp $ # # According to AbiSource's explanation of their trademark rights, # compilations/distributions of AbiWord not provided by AbiSource must @@ -35,7 +35,7 @@ ALL_TARGET= compile canonical .include "../../graphics/png/buildlink.mk" OS_CFLAGS= ${CFLAGS} -OS_CFLAGS+= -I${BUILDLINK_INCDIR} +OS_CFLAGS+= ${BUILDLINK_CPPFLAGS} .if exists(/usr/include/inttypes.h) OS_CFLAGS+= -DHAVE_INTTYPE_H=1 @@ -44,8 +44,7 @@ OS_CFLAGS+= -DHAVE_INTTYPE_H=1 # AbiWord expects the iconv functions to be in the system libraries, so # unconditionally link against the pkgsrc libiconv.so. # -XLDFLAGS= -L${BUILDLINK_LIBDIR} -XLDFLAGS+= ${LDFLAGS} -liconv +XLDFLAGS= ${LDFLAGS} -liconv MAKE_ENV+= OS_CFLAGS="${OS_CFLAGS}" MAKE_ENV+= XLDFLAGS="${XLDFLAGS}" diff --git a/games/freeciv-server/Makefile b/games/freeciv-server/Makefile index 643d8feadae..906f828424c 100644 --- a/games/freeciv-server/Makefile +++ b/games/freeciv-server/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2001/06/10 00:08:44 jlam Exp $ +# $NetBSD: Makefile,v 1.9 2001/06/11 02:05:10 jlam Exp $ PKGNAME= ${DISTNAME:S/-/-server-/} @@ -14,8 +14,7 @@ USE_GNU_READLINE= # uses callback interface of GNU readline .include "../../devel/readline/buildlink.mk" -CPPFLAGS+= -I${BUILDLINK_INCDIR} -LDFLAGS+= -L${BUILDLINK_LIBDIR} +CONFIGURE_ENV+= LIBS="${LIBS}" LIBS+= -ltermcap do-install: diff --git a/graphics/freetype-lib/Makefile.common b/graphics/freetype-lib/Makefile.common index 994478924a3..8b24db11ae1 100644 --- a/graphics/freetype-lib/Makefile.common +++ b/graphics/freetype-lib/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.13 2001/06/10 00:08:44 jlam Exp $ +# $NetBSD: Makefile.common,v 1.14 2001/06/11 02:05:10 jlam Exp $ DISTNAME= freetype-${FT_VERS} FT_VERS= 1.3.1 @@ -28,8 +28,4 @@ PATCHDIR= ${.CURDIR}/../../graphics/freetype-lib/patches CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}" CONFIGURE_ENV+= LIBS="${LIBS}" -CPPFLAGS+= -I${BUILDLINK_INCDIR} -CFLAGS+= -I${BUILDLINK_INCDIR} -LDFLAGS+= -L${BUILDLINK_LIBDIR} - .include "../../mk/bsd.pkg.mk" diff --git a/graphics/png/Makefile b/graphics/png/Makefile index 695575cd545..35e556ce833 100644 --- a/graphics/png/Makefile +++ b/graphics/png/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.34 2001/06/10 00:08:44 jlam Exp $ +# $NetBSD: Makefile,v 1.35 2001/06/11 02:05:11 jlam Exp $ # On update, don't forget to increase shared library major/minor's in # accordance with changes (patch-aa). @@ -21,9 +21,6 @@ MAKE_ENV+= REALCC="${CC}" .include "../../devel/zlib/buildlink.mk" -CFLAGS+= -I${BUILDLINK_INCDIR} -LDFLAGS+= -L${BUILDLINK_LIBDIR} - post-install: ${INSTALL_MAN} ${WRKSRC}/libpng.3 ${PREFIX}/man/man3 ${INSTALL_MAN} ${WRKSRC}/libpngpf.3 ${PREFIX}/man/man3 diff --git a/graphics/tiff/Makefile b/graphics/tiff/Makefile index 6ebb97fde3c..85e33fc02cc 100644 --- a/graphics/tiff/Makefile +++ b/graphics/tiff/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.32 2001/06/10 00:08:45 jlam Exp $ +# $NetBSD: Makefile,v 1.33 2001/06/11 02:05:11 jlam Exp $ DISTNAME= tiff-v3.5.5 PKGNAME= tiff-3.5.5 @@ -41,8 +41,7 @@ CONFIGURE_ENV+= PREFIX="${PREFIX}" CONFIGURE_ENV+= LOCALBASE="${LOCALBASE}" CONFIGURE_ENV+= ENVOPTS="${CFLAGS} ${CPPFLAGS}" CONFIGURE_ENV+= ZLIBDIR="${ZLIBDIR}" -CONFIGURE_ENV+= BUILDLINK_INCDIR=${BUILDLINK_INCDIR} -CONFIGURE_ENV+= BUILDLINK_LIBDIR=${BUILDLINK_LIBDIR} +CONFIGURE_ENV+= BUILDLINK_DIR="${BUILDLINK_DIR}" pre-patch: # reference correct relative man page when using .so diff --git a/graphics/tiff/files/config.site b/graphics/tiff/files/config.site index b28b4f59d4d..655f521a935 100644 --- a/graphics/tiff/files/config.site +++ b/graphics/tiff/files/config.site @@ -1,23 +1,23 @@ -# $NetBSD: config.site,v 1.6 2001/05/28 02:50:25 jlam Exp $ +# $NetBSD: config.site,v 1.7 2001/06/11 02:05:11 jlam Exp $ DIR_BIN=${PREFIX}/bin # destination for applications DIR_LIB=${PREFIX}/lib # destination for library DIR_INC=${PREFIX}/include # destination for include files DIR_MAN=${PREFIX}/man # destination for man pages DIR_HTML=${PREFIX}/share/doc/html/tiff # destination for html documentation -DIRS_LIBINC=${BUILDLINK_INCDIR} # dirs to search for ancillary includes +DIRS_LIBINC=${BUILDLINK_DIR}/include # dirs to search for ancillary includes # JPEG support # JPEG=yes DIR_JPEGLIB=${LOCALBASE}/lib -LIBJPEG="-Wl,-R${DIR_JPEGLIB} -L${BUILDLINK_LIBDIR} -ljpeg" +LIBJPEG="-Wl,-R${DIR_JPEGLIB} -L${BUILDLINK_DIR}/lib -ljpeg" # ZLIB compression support # ZIP=yes DIR_GZLIB=${ZLIBDIR} -LIBGZ="-Wl,-R${DIR_GZLIB} -L${BUILDLINK_LIBDIR} -lz" +LIBGZ="-Wl,-R${DIR_GZLIB} -L${BUILDLINK_DIR}/lib -lz" DSO=no # don't use libtiff's shared lib mechanism diff --git a/japanese/vflib-lib/Makefile.common b/japanese/vflib-lib/Makefile.common index 3dbab4af40a..226f3007c04 100644 --- a/japanese/vflib-lib/Makefile.common +++ b/japanese/vflib-lib/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.10 2001/06/10 00:08:45 jlam Exp $ +# $NetBSD: Makefile.common,v 1.11 2001/06/11 02:05:11 jlam Exp $ # FreeBSD Id: Makefile,v 1.20 1999/05/03 01:58:33 steve Exp $ DISTNAME= VFlib2-${VFLIB_VERSION} @@ -21,8 +21,8 @@ LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig .include "../../graphics/freetype-lib/buildlink.mk" FT_LIB= ttf -lintl -FT_INCLUDEDIR= ${BUILDLINK_INCDIR}/freetype -FT_LIBDIR= ${BUILDLINK_LIBDIR} +FT_INCLUDEDIR= ${BUILDLINK_DIR}/include/freetype +FT_LIBDIR= ${BUILDLINK_DIR}/lib GNU_CONFIGURE= # defined CONFIGURE_ARGS+= --with-freetype="${FT_LIB}" @@ -30,9 +30,6 @@ CONFIGURE_ARGS+= --with-freetype-includedir=${FT_INCLUDEDIR} CONFIGURE_ARGS+= --with-freetype-libdir=${FT_LIBDIR} MAKE_ENV+= LOCAL_LDFLAGS="${LDFLAGS}" -CFLAGS+= -I${BUILDLINK_INCDIR} -LDFLAGS+= -L${BUILDLINK_LIBDIR} - DISTINFO_FILE= ${.CURDIR}/../../japanese/vflib-lib/distinfo PATCHDIR= ${.CURDIR}/../../japanese/vflib-lib/patches diff --git a/lang/guile/Makefile b/lang/guile/Makefile index 1134ebf92b3..d644d166723 100644 --- a/lang/guile/Makefile +++ b/lang/guile/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.22 2001/06/10 00:08:45 jlam Exp $ +# $NetBSD: Makefile,v 1.23 2001/06/11 02:05:11 jlam Exp $ # FreeBSD Id: Makefile,v 1.12 1997/11/22 16:01:32 jseger Exp # @@ -21,8 +21,4 @@ USE_GNU_READLINE= # defined INFO_FILES= data-rep.info .include "../../devel/readline/buildlink.mk" - -CFLAGS+= -I${BUILDLINK_INCDIR} -LDFLAGS+= -L${BUILDLINK_LIBDIR} - .include "../../mk/bsd.pkg.mk" diff --git a/lang/hugs/Makefile b/lang/hugs/Makefile index 1ab1b2ec74d..00a1018486a 100644 --- a/lang/hugs/Makefile +++ b/lang/hugs/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2001/06/10 00:08:45 jlam Exp $ +# $NetBSD: Makefile,v 1.18 2001/06/11 02:05:12 jlam Exp $ DISTNAME= hugs98-Feb2000 PKGNAME= hugs98-200002 @@ -22,8 +22,6 @@ CONFIGURE_ENV+= ac_cv_lib_ncurses_main=no # .include "../../devel/readline/buildlink.mk" -LDFLAGS+= -L${BUILDLINK_LIBDIR} - do-build: @cd ${WRKSRC}/.. && ${SETENV} ${MAKE_ENV} \ ${MAKE_PROGRAM} ${MAKE_FLAGS} -f ${MAKEFILE} ${ALL_TARGET} diff --git a/lang/librep/Makefile b/lang/librep/Makefile index dc697da3379..e17829fc2ca 100644 --- a/lang/librep/Makefile +++ b/lang/librep/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2001/06/10 00:08:45 jlam Exp $ +# $NetBSD: Makefile,v 1.12 2001/06/11 02:05:12 jlam Exp $ # DISTNAME= librep-${REP_VERS} @@ -22,14 +22,11 @@ CONFIGURE_ARGS+= --with-readline CONFIGURE_ARGS+= --with-gmp CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}" +PLIST_SUBST+= REP_VERS=${REP_VERS} + .include "../../databases/gdbm/buildlink.mk" .include "../../devel/gettext-lib/buildlink.mk" .include "../../devel/gmp/buildlink.mk" .include "../../devel/readline/buildlink.mk" -CPPFLAGS+= -I${BUILDLINK_INCDIR} -LDFLAGS+= -L${BUILDLINK_LIBDIR} - -PLIST_SUBST+= REP_VERS=${REP_VERS} - .include "../../mk/bsd.pkg.mk" diff --git a/math/capc-calc/Makefile b/math/capc-calc/Makefile index 8f58e8be6da..630925b3fab 100644 --- a/math/capc-calc/Makefile +++ b/math/capc-calc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2001/06/10 00:08:46 jlam Exp $ +# $NetBSD: Makefile,v 1.8 2001/06/11 02:05:12 jlam Exp $ # DISTNAME= calc-2.11.4t2 @@ -14,7 +14,5 @@ COMMENT= C arbitrary precision calculator .include "../../devel/readline/buildlink.mk" MAKE_ENV+= CPPFLAGS="${CPPFLAGS}" -CPPFLAGS+= -I${BUILDLINK_INCDIR} -LDFLAGS+= -L${BUILDLINK_LIBDIR} .include "../../mk/bsd.pkg.mk" diff --git a/misc/chipmunk/Makefile b/misc/chipmunk/Makefile index fcc3cecaf52..abd6f22fc92 100644 --- a/misc/chipmunk/Makefile +++ b/misc/chipmunk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2001/06/10 00:08:46 jlam Exp $ +# $NetBSD: Makefile,v 1.8 2001/06/11 02:05:12 jlam Exp $ # DISTNAME= chipmunk-1.4 @@ -17,9 +17,6 @@ ALL_TARGET= chipmunk MAKE_ENV+= CONFIG_OPTIONS="${CPPFLAGS}" MAKE_ENV+= EXTRA_LIBS=-li386 -CPPFLAGS+= -I${BUILDLINK_INCDIR} -LDFLAGS+= -L${BUILDLINK_LIBDIR} - do-install: ${INSTALL_PROGRAM} ${WRKSRC}/chipmunk ${PREFIX}/sbin/chipmunk diff --git a/misc/py-readline/Makefile b/misc/py-readline/Makefile index 0fcb2d3511f..d8465216641 100644 --- a/misc/py-readline/Makefile +++ b/misc/py-readline/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2001/06/10 00:08:46 jlam Exp $ +# $NetBSD: Makefile,v 1.17 2001/06/11 02:05:12 jlam Exp $ # DISTNAME= ${PY_DISTNAME} @@ -17,8 +17,8 @@ USE_GNU_READLINE= # defined .include "../../devel/readline/buildlink.mk" -PY_SETUP_SUBST+= BUILDLINK_INCDIR=${BUILDLINK_INCDIR} -PY_SETUP_SUBST+= BUILDLINK_LIBDIR=${BUILDLINK_LIBDIR} +PY_SETUP_SUBST+= BUILDLINK_CPPFLAGS=${BUILDLINK_CPPFLAGS} +PY_SETUP_SUBST+= BUILDLINK_LDFLAGS=${BUILDLINK_LDFLAGS} do-configure: python-std-do-configure diff --git a/misc/py-readline/files/Setup.in b/misc/py-readline/files/Setup.in index 15ec3f86459..45c63d96042 100644 --- a/misc/py-readline/files/Setup.in +++ b/misc/py-readline/files/Setup.in @@ -1,5 +1,5 @@ -# $NetBSD: Setup.in,v 1.4 2001/05/30 05:02:52 jlam Exp $ +# $NetBSD: Setup.in,v 1.5 2001/06/11 02:05:13 jlam Exp $ # *shared* -readline readline.c -L@BUILDLINK_LIBDIR@ -R@LOCALBASE@/lib \ - -I@BUILDLINK_INCDIR@ -lreadline -ltermcap +readline readline.c @BUILDLINK_LDFLAGS@ -R@LOCALBASE@/lib \ + @BUILDLINK_CPPFLAGS@ -lreadline -ltermcap diff --git a/net/coda5_client/Makefile b/net/coda5_client/Makefile index 406533f0177..8292d90f7f7 100644 --- a/net/coda5_client/Makefile +++ b/net/coda5_client/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.30 2001/06/10 00:08:46 jlam Exp $ +# $NetBSD: Makefile,v 1.31 2001/06/11 02:05:13 jlam Exp $ # DISTNAME= coda-5.3.13 @@ -26,18 +26,14 @@ USE_GMAKE= yes .include "../../devel/rpc2/buildlink.mk" .include "../../devel/rvm/buildlink.mk" -CFLAGS+= -I${BUILDLINK_INCDIR} -CXXFLAGS+= -I${BUILDLINK_INCDIR} -LDFLAGS+= -L${BUILDLINK_LIBDIR} - DEINSTALL_FILE= ${WRKDIR}/DEINSTALL INSTALL_FILE= ${WRKDIR}/INSTALL -INSTALL_SUBST= CAT=${CAT} -INSTALL_SUBST+= LN=${LN} -INSTALL_SUBST+= RM=${RM} -INSTALL_SUBST+= RMDIR=${RMDIR} -INSTALL_SUBST+= TRUE=${TRUE} +INSTALL_SUBST= CAT=${CAT:Q} +INSTALL_SUBST+= LN=${LN:Q} +INSTALL_SUBST+= RM=${RM:Q} +INSTALL_SUBST+= RMDIR=${RMDIR:Q} +INSTALL_SUBST+= TRUE=${TRUE:Q} pre-install: ${SED} ${INSTALL_SUBST:S/=/@!/:S/$/!g/:S/^/ -e s!@/} \ diff --git a/net/coda5_server/Makefile b/net/coda5_server/Makefile index 36e4202a394..a4ed9eb2314 100644 --- a/net/coda5_server/Makefile +++ b/net/coda5_server/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.29 2001/06/10 00:08:46 jlam Exp $ +# $NetBSD: Makefile,v 1.30 2001/06/11 02:05:13 jlam Exp $ # DISTNAME= coda-5.3.13 @@ -25,18 +25,14 @@ USE_GMAKE= yes .include "../../devel/rpc2/buildlink.mk" .include "../../devel/rvm/buildlink.mk" -CFLAGS+= -I${BUILDLINK_INCDIR} -CXXFLAGS+= -I${BUILDLINK_INCDIR} -LDFLAGS+= -L${BUILDLINK_LIBDIR} - DEINSTALL_FILE= ${WRKDIR}/DEINSTALL INSTALL_FILE= ${WRKDIR}/INSTALL -INSTALL_SUBST= CAT=${CAT} -INSTALL_SUBST+= LN=${LN} -INSTALL_SUBST+= RM=${RM} -INSTALL_SUBST+= RMDIR=${RMDIR} -INSTALL_SUBST+= TRUE=${TRUE} +INSTALL_SUBST= CAT=${CAT:Q} +INSTALL_SUBST+= LN=${LN:Q} +INSTALL_SUBST+= RM=${RM:Q} +INSTALL_SUBST+= RMDIR=${RMDIR:Q} +INSTALL_SUBST+= TRUE=${TRUE:Q} pre-install: ${SED} ${INSTALL_SUBST:S/=/@!/:S/$/!g/:S/^/ -e s!@/} \ diff --git a/net/ncftp2/Makefile b/net/ncftp2/Makefile index 6c701888cda..326d78dccdf 100644 --- a/net/ncftp2/Makefile +++ b/net/ncftp2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.26 2001/06/10 00:08:47 jlam Exp $ +# $NetBSD: Makefile,v 1.27 2001/06/11 02:05:13 jlam Exp $ # FreeBSD Id: Makefile,v 1.39 1998/01/31 17:49:48 jseger Exp # @@ -32,9 +32,6 @@ DEPENDS+= socks5-1.0.2:../../net/socks5 .include "../../devel/readline/buildlink.mk" -CPPFLAGS+= -I${BUILDLINK_INCDIR} -LDFLAGS+= -L${BUILDLINK_LIBDIR} - do-install: ${INSTALL_PROGRAM} ${WRKSRC}/ncftp ${PREFIX}/bin/ncftp2 ${INSTALL_MAN} ${WRKSRC}/ncftp.1 ${PREFIX}/man/man1/ncftp2.1 diff --git a/net/samba/Makefile b/net/samba/Makefile index 9d697b2d464..f7c0eb85227 100644 --- a/net/samba/Makefile +++ b/net/samba/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.55 2001/06/10 00:08:47 jlam Exp $ +# $NetBSD: Makefile,v 1.56 2001/06/11 02:05:13 jlam Exp $ DISTNAME= samba-2.2.0 PKGNAME= ${DISTNAME}nb1 @@ -23,14 +23,11 @@ LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig USE_GNU_READLINE= # uses rl_event_hook interface to GNU readline +CFLAGS+= -I${SSLBASE}/include/openssl # ssl.h, err.h + .include "../../mk/bsd.prefs.mk" .include "../../devel/readline/buildlink.mk" -CFLAGS+= -I${SSLBASE}/include/openssl # ssl.h, err.h -CFLAGS+= -I${BUILDLINK_INCDIR} -CPPFLAGS+= -I${BUILDLINK_INCDIR} -LDFLAGS+= -L${BUILDLINK_LIBDIR} - SAMBA_LOGDIR= /var/log SAMBA_LOCKDIR= /var/run/samba SAMBA_ETCDIR?= /etc/samba diff --git a/net/zebra/Makefile b/net/zebra/Makefile index b895d4c7ebc..e09de14a3cd 100644 --- a/net/zebra/Makefile +++ b/net/zebra/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.38 2001/06/10 00:08:47 jlam Exp $ +# $NetBSD: Makefile,v 1.39 2001/06/11 02:05:14 jlam Exp $ # Based on KAME Id: Makefile,v 1.1.2.1.2.1.10.2 1999/01/05 11:03:50 itojun Exp # @@ -23,8 +23,6 @@ PLIST_SRC= # empty USE_GNU_READLINE= uses rl_pending_input .include "../../devel/readline/buildlink.mk" CONFIGURE_ARGS+= --enable-vtysh -CPPFLAGS+= -I${BUILDLINK_INCDIR} -LDFLAGS+= -L${BUILDLINK_LIBDIR} PLIST_SRC+= ${PKGDIR}/PLIST.vtysh .else CONFIGURE_ARGS+= --disable-vtysh diff --git a/print/cups/Makefile b/print/cups/Makefile index ee67691a969..67c656cafaf 100644 --- a/print/cups/Makefile +++ b/print/cups/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.31 2001/06/10 00:08:47 jlam Exp $ +# $NetBSD: Makefile,v 1.32 2001/06/11 02:05:14 jlam Exp $ DISTNAME= cups-${VERS}-source PKGNAME= cups-${VERS} @@ -46,10 +46,6 @@ CONFIGURE_ARGS+= --disable-pam PLIST_SRC= ${PKGDIR}/PLIST .endif -CFLAGS+= -I${BUILDLINK_INCDIR} -CXXFLAGS+= -I${BUILDLINK_INCDIR} -LDFLAGS+= -L${BUILDLINK_LIBDIR} - # CUPS_USER username of the CUPS administrator # CUPS_GROUP group of the CUPS administrator # diff --git a/print/ghostscript-nox11/Makefile.common b/print/ghostscript-nox11/Makefile.common index cfc3cbde538..e220d146fe8 100644 --- a/print/ghostscript-nox11/Makefile.common +++ b/print/ghostscript-nox11/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.15 2001/06/10 00:08:48 jlam Exp $ +# $NetBSD: Makefile.common,v 1.16 2001/06/11 02:05:14 jlam Exp $ DISTNAME= ghostscript-${GS_VERS} GS_VERS= 6.01 @@ -109,11 +109,8 @@ CFLAGS= CFLAGS+= -DA4 .endif -CFLAGS+= -I${BUILDLINK_INCDIR} CFLAGS+= -DHAVE_MKSTEMP=1 -LDFLAGS+= -L${BUILDLINK_LIBDIR} - .if ${OPSYS} == "SunOS" LDFLAGS+= -L${LOCALBASE}/bsd/lib -Wl,-R${LOCALBASE}/bsd/lib .endif diff --git a/print/xpp/Makefile b/print/xpp/Makefile index dfa0952e38c..00b76b90f92 100644 --- a/print/xpp/Makefile +++ b/print/xpp/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2001/06/10 00:08:48 jlam Exp $ +# $NetBSD: Makefile,v 1.10 2001/06/11 02:05:14 jlam Exp $ DISTNAME= xpp-1.0 CATEGORIES= print x11 @@ -17,9 +17,6 @@ CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}" .include "../../print/cups/buildlink.mk" .include "../../x11/fltk/buildlink.mk" -CPPFLAGS+= -I${BUILDLINK_INCDIR} -LDFLAGS+= -L${BUILDLINK_LIBDIR} - DOCDIR= ${PREFIX}/share/doc/xpp pre-configure: diff --git a/sysutils/amanda-client/Makefile b/sysutils/amanda-client/Makefile index 5bbb2571401..9d5cb8875a8 100644 --- a/sysutils/amanda-client/Makefile +++ b/sysutils/amanda-client/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2001/06/10 00:08:48 jlam Exp $ +# $NetBSD: Makefile,v 1.21 2001/06/11 02:05:15 jlam Exp $ # FreeBSD Id: Makefile,v 1.9 1997/03/08 05:00:11 gpalmer Exp # @@ -20,9 +20,6 @@ GNU_CONFIGURE= yes .include "../../sysutils/amanda-common/Makefile.common" .include "../../devel/readline/buildlink.mk" -CPPFLAGS+= -I${BUILDLINK_INCDIR} -LDFLAGS+= -L${BUILDLINK_LIBDIR} - CONFIGURE_ARGS+= --without-server --without-restore CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}" diff --git a/textproc/libxml/Makefile b/textproc/libxml/Makefile index 1ccf4f9e606..da85dc4c7d6 100644 --- a/textproc/libxml/Makefile +++ b/textproc/libxml/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2001/05/26 21:51:51 jlam Exp $ +# $NetBSD: Makefile,v 1.17 2001/06/11 02:05:15 jlam Exp $ # DISTNAME= libxml-1.8.13 @@ -10,15 +10,11 @@ MAINTAINER= rh@netbsd.org HOMEPAGE= http://xmlsoft.org/ COMMENT= XML parser, mainly used by the GNOME project -.include "../../devel/zlib/buildlink.mk" - GNU_CONFIGURE= YES CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}" USE_LIBTOOL= YES LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig -CPPFLAGS+= -I${BUILDLINK_INCDIR} -LDFLAGS+= -L${BUILDLINK_LIBDIR} - +.include "../../devel/zlib/buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/time/devtodo/Makefile b/time/devtodo/Makefile index 1d401d10062..b3727686ea0 100644 --- a/time/devtodo/Makefile +++ b/time/devtodo/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2001/06/10 00:08:48 jlam Exp $ +# $NetBSD: Makefile,v 1.8 2001/06/11 02:05:15 jlam Exp $ # DISTNAME= devtodo-0.1.6-1 @@ -21,8 +21,4 @@ CONFIGURE_ENV+= ac_cv_lib_curses_tputs=no USE_GNU_READLINE= # uses rl_startup_hook() .include "../../devel/readline/buildlink.mk" - -CXXFLAGS+= -I${BUILDLINK_INCDIR} -LDFLAGS+= -L${BUILDLINK_LIBDIR} - .include "../../mk/bsd.pkg.mk" diff --git a/www/cadaver/Makefile b/www/cadaver/Makefile index 7e1d80c605f..8df5808d85e 100644 --- a/www/cadaver/Makefile +++ b/www/cadaver/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2001/06/10 00:08:48 jlam Exp $ +# $NetBSD: Makefile,v 1.7 2001/06/11 02:05:15 jlam Exp $ DISTNAME= cadaver-0.17.0 CATEGORIES= www @@ -28,8 +28,7 @@ CONFIGURE_ENV+= LIBS="${LIBS}" CONFIGURE_ENV+= ac_cv_lib_curses_tputs=no CONFIGURE_ENV+= ac_cv_lib_ncurses_tputs=no -CFLAGS+= -I${BUILDLINK_INCDIR} ${CPPFLAGS} -LDFLAGS+= -L${BUILDLINK_LIBDIR} +CFLAGS+= ${CPPFLAGS} LIBS+= -ltermcap # The build process doesn't correctly find some headers for utility functions diff --git a/www/sitecopy/Makefile b/www/sitecopy/Makefile index f8557cf870f..74abb54ccee 100644 --- a/www/sitecopy/Makefile +++ b/www/sitecopy/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2001/06/10 00:08:49 jlam Exp $ +# $NetBSD: Makefile,v 1.6 2001/06/11 02:05:15 jlam Exp $ DISTNAME= sitecopy-0.10.15 CATEGORIES= www @@ -21,7 +21,7 @@ CONFIGURE_ARGS+= --enable-libxml .include "../../devel/libgetopt/buildlink.mk" -CFLAGS+= -I${BUILDLINK_INCDIR} ${CPPFLAGS} +CFLAGS+= ${CPPFLAGS} # The build process doesn't correctly find the header for GNU fnmatch, which # is provided in ${WRKSRC}/lib. Help the compiler by linking the header diff --git a/x11/fltk/Makefile b/x11/fltk/Makefile index 81132fe4f6d..804ac1f5bff 100644 --- a/x11/fltk/Makefile +++ b/x11/fltk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2001/06/10 00:08:49 jlam Exp $ +# $NetBSD: Makefile,v 1.17 2001/06/11 02:05:16 jlam Exp $ # DISTNAME= ${PKGNAME}-source @@ -29,9 +29,6 @@ CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}" .include "../../graphics/Mesa/buildlink.mk" -CPPFLAGS+= -I${BUILDLINK_INCDIR} -LDFLAGS+= -L${BUILDLINK_LIBDIR} - test: @cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \ ${MAKE_PROGRAM} ${MAKE_FLAGS} -f ${MAKEFILE} test |