summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--audio/id3ed/Makefile10
-rw-r--r--cad/felt/Makefile10
-rw-r--r--comms/plptools/Makefile8
-rw-r--r--databases/postgresql-client/Makefile8
-rw-r--r--databases/postgresql-server/Makefile6
-rw-r--r--databases/postgresql/Makefile.common21
-rw-r--r--databases/sqsh/Makefile12
-rw-r--r--devel/cdecl/Makefile10
-rw-r--r--devel/cmdline/Makefile10
-rw-r--r--devel/libgetopt/Makefile.getopt34
-rw-r--r--devel/libgetopt/buildlink.mk36
-rw-r--r--devel/readline/buildlink.mk (renamed from devel/readline/Makefile.readline)51
-rw-r--r--games/freeciv-server/Makefile10
-rw-r--r--lang/hugs/Makefile8
-rw-r--r--math/capc-calc/Makefile10
-rw-r--r--misc/chipmunk/Makefile10
-rw-r--r--net/ncftp2/Makefile10
-rw-r--r--net/samba/Makefile10
-rw-r--r--www/cadaver/Makefile12
-rw-r--r--www/sitecopy/Makefile8
20 files changed, 150 insertions, 144 deletions
diff --git a/audio/id3ed/Makefile b/audio/id3ed/Makefile
index fe2bcddc7c4..6fa47b775af 100644
--- a/audio/id3ed/Makefile
+++ b/audio/id3ed/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2001/05/22 15:44:32 jlam Exp $
+# $NetBSD: Makefile,v 1.9 2001/05/24 08:53:54 jlam Exp $
#
DISTNAME= id3ed-1.10.2
@@ -14,13 +14,13 @@ USE_GMAKE= YES
USE_GNU_READLINE= # uses rl_startup_hook
-.include "../../devel/readline/Makefile.readline"
+.include "../../devel/readline/buildlink.mk"
CONFIGURE_ENV+= LIBS="${LIBS}"
-CFLAGS+= -I${WRKINCDIR}
-LIBS+= -L${WRKLIBDIR} ${LDFLAGS}
+CFLAGS+= -I${BUILDLINK_INCDIR}
+LIBS+= -L${BUILDLINK_LIBDIR} ${LDFLAGS}
-pre-configure: link-readline-headers link-readline-libs
+pre-configure: ${BUILDLINK_TARGETS}
post-extract:
${TOUCH} ${WRKSRC}/install.sh
diff --git a/cad/felt/Makefile b/cad/felt/Makefile
index daf9651aa4d..be8e0fd9715 100644
--- a/cad/felt/Makefile
+++ b/cad/felt/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2001/05/22 16:48:59 jlam Exp $
+# $NetBSD: Makefile,v 1.10 2001/05/24 08:53:54 jlam Exp $
DISTNAME= felt-3.05.src
PKGNAME= felt-3.05
@@ -24,15 +24,15 @@ MAKE_ENV+= SH="${SH}"
USE_GNU_READLINE= # uses remove_history() and history_list()
-.include "../../devel/readline/Makefile.readline"
+.include "../../devel/readline/buildlink.mk"
-CFLAGS+= -I${WRKINCDIR}
-LDFLAGS+= -L${WRKLIBDIR}
+CFLAGS+= -I${BUILDLINK_INCDIR}
+LDFLAGS+= -L${BUILDLINK_LIBDIR}
post-extract:
@${GZCAT} ${DISTDIR}/felt-3.05.ps.gz > ${WRKSRC}/felt.ps
-pre-build: link-readline-headers link-readline-libs
+pre-build: ${BUILDLINK_TARGETS}
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/felt
diff --git a/comms/plptools/Makefile b/comms/plptools/Makefile
index 0c9f0725d15..b2ef1c055a3 100644
--- a/comms/plptools/Makefile
+++ b/comms/plptools/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2001/05/22 17:04:45 jlam Exp $
+# $NetBSD: Makefile,v 1.13 2001/05/24 08:53:54 jlam Exp $
#
DISTNAME= plptools-0.6
@@ -16,15 +16,15 @@ LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig
USE_GNU_READLINE= # uses rl_filename_quoting_desired flag
.include "../../mk/bsd.prefs.mk"
-.include "../../devel/readline/Makefile.readline"
+.include "../../devel/readline/buildlink.mk"
CONFIGURE_ARGS+= --with-serial=${DEFAULT_SERIAL_DEVICE}
CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}"
CONFIGURE_ENV+= LIBS="${LIBS}"
-CPPFLAGS+= -I${WRKINCDIR}
+CPPFLAGS+= -I${BUILDLINK_INCDIR}
LIBS+= -ltermcap
-pre-configure: link-readline-headers link-readline-libs
+pre-configure: ${BUILDLINK_TARGETS}
.include "../../mk/bsd.pkg.mk"
diff --git a/databases/postgresql-client/Makefile b/databases/postgresql-client/Makefile
index 37ec2d68cca..3fe2de67216 100644
--- a/databases/postgresql-client/Makefile
+++ b/databases/postgresql-client/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2001/05/16 05:30:33 jlam Exp $
+# $NetBSD: Makefile,v 1.4 2001/05/24 08:53:55 jlam Exp $
.include "../../databases/postgresql/Makefile.common"
.include "../../databases/postgresql/Makefile.ssl"
-.include "../../devel/libgetopt/Makefile.getopt"
-.include "../../devel/readline/Makefile.readline"
+.include "../../devel/libgetopt/buildlink.mk"
+.include "../../devel/readline/buildlink.mk"
PKGNAME= postgresql-client-${PG_VERS}
PG_PKG_VERS= # empty
@@ -16,7 +16,7 @@ CONFIGURE_ARGS+= --enable-readline
DIRS_TO_BUILD= src/bin
-pre-configure: link-getopt-headers link-readline-headers link-readline-libs
+pre-configure: ${BUILDLINK_TARGETS}
pre-build:
cd ${WRKSRC}/src/bin/psql && \
diff --git a/databases/postgresql-server/Makefile b/databases/postgresql-server/Makefile
index 2340c60e0b9..919fc33779c 100644
--- a/databases/postgresql-server/Makefile
+++ b/databases/postgresql-server/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2001/05/21 16:02:50 abs Exp $
+# $NetBSD: Makefile,v 1.6 2001/05/24 08:53:55 jlam Exp $
.include "../../databases/postgresql/Makefile.common"
.include "../../databases/postgresql/Makefile.ssl"
-.include "../../devel/libgetopt/Makefile.getopt"
+.include "../../devel/libgetopt/buildlink.mk"
PKGNAME= postgresql-server-${PG_VERS}
PG_PKG_VERS= # empty
@@ -42,7 +42,7 @@ ADDGROUP= groupadd
DEINSTALL_FILE= ${WRKDIR}/DEINSTALL
INSTALL_FILE= ${WRKDIR}/INSTALL
-pre-configure: link-getopt-headers
+pre-configure: ${BUILDLINK_TARGETS}
do-build:
.for DIR in ${DIRS_TO_BUILD}
diff --git a/databases/postgresql/Makefile.common b/databases/postgresql/Makefile.common
index 009668fc21e..4d1c6504566 100644
--- a/databases/postgresql/Makefile.common
+++ b/databases/postgresql/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.15 2001/05/16 05:28:55 jlam Exp $
+# $NetBSD: Makefile.common,v 1.16 2001/05/24 08:54:27 jlam Exp $
#
# This Makefile fragment is included by all PostgreSQL packages built from
# the main sources of the PostgreSQL distribution.
@@ -79,20 +79,19 @@ CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}"
CONFIGURE_ENV+= LIBS="${LIBS}"
MAKE_ENV+= CUSTOM_COPT="${CFLAGS}"
-WRKINCDIR= ${WRKDIR}/include
-WRKLIBDIR= ${WRKDIR}/lib
-CPPFLAGS+= -I${WRKINCDIR}
-CFLAGS+= -I${WRKINCDIR}
-LDFLAGS+= -L${WRKLIBDIR}
+CPPFLAGS+= -I${BUILDLINK_INCDIR}
+CFLAGS+= -I${BUILDLINK_INCDIR}
+LDFLAGS+= -L${BUILDLINK_LIBDIR}
-# The following is a hack to force ${WRKLIBDIR} 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.
+# 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${WRKLIBDIR}
+CFLAGS+= -L${BUILDLINK_LIBDIR}
post-extract:
- ${MKDIR} -p ${WRKINCDIR} ${WRKLIBDIR}
+ ${MKDIR} ${BUILDLINK_INCDIR} ${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 e01fa196feb..8276baf09a8 100644
--- a/databases/sqsh/Makefile
+++ b/databases/sqsh/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2001/05/22 05:28:23 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2001/05/24 08:53:55 jlam Exp $
DISTNAME= sqsh-1.7-src
PKGNAME= sqsh-1.7
@@ -22,12 +22,12 @@ CONFIGURE_ENV+= SYBASE="${SYBASE}"
SYBASE= ${PREFIX}/freetds
LDFLAGS+= -Wl,-R${SYBASE}/lib
-.include "../../devel/readline/Makefile.readline"
+.include "../../devel/readline/buildlink.mk"
-LDFLAGS+= -L${WRKLIBDIR}
-CONFIGURE_ENV+= INCDIRS="${WRKINCDIR}"
-CONFIGURE_ENV+= LIBDIRS="${WRKLIBDIR}"
+LDFLAGS+= -L${BUILDLINK_LIBDIR}
+CONFIGURE_ENV+= INCDIRS="${BUILDLINK_INCDIR}"
+CONFIGURE_ENV+= LIBDIRS="${BUILDLINK_LIBDIR}"
-pre-configure: link-readline-headers link-readline-libs
+pre-configure: ${BUILDLINK_TARGETS}
.include "../../mk/bsd.pkg.mk"
diff --git a/devel/cdecl/Makefile b/devel/cdecl/Makefile
index 173649ccd8f..4af91257d34 100644
--- a/devel/cdecl/Makefile
+++ b/devel/cdecl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2001/05/22 05:50:51 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2001/05/24 08:53:55 jlam Exp $
#
DISTNAME= cdecl-2.5
@@ -14,14 +14,14 @@ COMMENT= utility to explain and compose C and C++ declarations
ALL_TARGET= cdecl
-.include "../../devel/readline/Makefile.readline"
+.include "../../devel/readline/buildlink.mk"
-CFLAGS+= -I${WRKINCDIR}
-LDFLAGS+= -L${WRKLIBDIR}
+CFLAGS+= -I${BUILDLINK_INCDIR}
+LDFLAGS+= -L${BUILDLINK_LIBDIR}
EGDIR= ${PREFIX}/share/examples/cdecl
-pre-configure: link-readline-headers link-readline-libs
+pre-configure: ${BUILDLINK_TARGETS}
post-install:
${INSTALL_DATA_DIR} ${EGDIR}
diff --git a/devel/cmdline/Makefile b/devel/cmdline/Makefile
index 9387411973a..80d1bc511e8 100644
--- a/devel/cmdline/Makefile
+++ b/devel/cmdline/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2001/05/17 20:28:18 jlam Exp $
+# $NetBSD: Makefile,v 1.5 2001/05/24 08:53:55 jlam Exp $
DISTNAME= CmdLine
PKGNAME= cmdline-${PKG_VERS}
@@ -16,15 +16,15 @@ DIST_SUBDIR= cmdline-${DIST_VERS}
USE_LIBTOOL= # defined
NO_CONFIGURE= # defined
-.include "../../devel/readline/Makefile.readline"
+.include "../../devel/readline/buildlink.mk"
-MOREUSRDEFS= -I${WRKINCDIR}/readline
-MOREUSRLIBS= -L${WRKLIBDIR} -lreadline -ltermcap
+MOREUSRDEFS= -I${BUILDLINK_INCDIR}/readline
+MOREUSRLIBS= -L${BUILDLINK_LIBDIR} -lreadline -ltermcap
MAKE_ENV+= OPT="${CXXFLAGS}"
MAKE_ENV+= MOREUSRDEFS="${MOREUSRDEFS}"
MAKE_ENV+= MOREUSRLIBS="${MOREUSRLIBS}"
-pre-build: link-readline-headers link-readline-libs
+pre-build: ${BUILDLINK_TARGETS}
.include "../../mk/bsd.pkg.mk"
diff --git a/devel/libgetopt/Makefile.getopt b/devel/libgetopt/Makefile.getopt
deleted file mode 100644
index 928f131037f..00000000000
--- a/devel/libgetopt/Makefile.getopt
+++ /dev/null
@@ -1,34 +0,0 @@
-# $NetBSD: Makefile.getopt,v 1.3 2001/05/22 16:45:38 jlam Exp $
-#
-# This Makefile fragment is included by packages that use getopt_long().
-#
-# If getopt_long() is not present in the base system, then a dependency
-# on devel/libgetopt is added, and the appropriate headers are linked
-# into ${WRKINCDIR} (${WRKSRC}/include).
-#
-# To use this Makefile, simply include this Makefile fragment in the
-# package Makefile, optionally define WRKINCDIR, add
-# link-getopt-headers to the prerequisite targets for pre-configure,
-# and add ${WRKINCDIR} to the compiler's header search path.
-
-.if exists(/usr/include/getopt.h)
-GETOPT_H= /usr/include/getopt.h
-.else
-GETOPT_H= ${LOCALBASE}/include/getopt.h
-DEPENDS+= libgetopt>=1.3:../../devel/libgetopt
-.if defined(GNU_CONFIGURE)
-CONFIGURE_ENV+= LIBS="${LIBS}"
-LIBS+= -lgetopt
-.endif
-.endif
-
-WRKINCDIR?= ${WRKDIR}/include
-
-# This target links the getopt header into ${WRKINCDIR}, which should be
-# searched first by the C preprocessor.
-#
-link-getopt-headers:
- @${ECHO} "Linking getopt headers into ${WRKINCDIR}."
- @${MKDIR} -p ${WRKINCDIR}
- @${RM} -f ${WRKINCDIR}/getopt.h
- @${LN} -sf ${GETOPT_H} ${WRKINCDIR}
diff --git a/devel/libgetopt/buildlink.mk b/devel/libgetopt/buildlink.mk
new file mode 100644
index 00000000000..eaef5fb7424
--- /dev/null
+++ b/devel/libgetopt/buildlink.mk
@@ -0,0 +1,36 @@
+# $NetBSD: buildlink.mk,v 1.1 2001/05/24 08:53:56 jlam Exp $
+#
+# This Makefile fragment is included by packages that use getopt_long().
+#
+# If getopt_long() is not present in the base system, then a dependency
+# on devel/libgetopt is added, and the appropriate headers are linked
+# into ${BUILDLINK_INCDIR} (${WRKSRC}/include).
+#
+# To use this Makefile, simply include this Makefile fragment in the
+# package Makefile, optionally define BUILDLINK_INCDIR, add
+# ${BUILDLINK_TARGETS} to the prerequisite targets for pre-configure,
+# and add ${BUILDLINK_INCDIR} to the compiler's header search path.
+
+.if exists(/usr/include/getopt.h)
+GETOPT_H= /usr/include/getopt.h
+.else
+GETOPT_H= ${LOCALBASE}/include/getopt.h
+DEPENDS+= libgetopt>=1.3:../../devel/libgetopt
+.if defined(GNU_CONFIGURE)
+CONFIGURE_ENV+= LIBS="${LIBS}"
+LIBS+= -lgetopt
+.endif
+.endif
+
+BUILDLINK_INCDIR?= ${WRKDIR}/include
+
+BUILDLINK_TARGETS+= link-getopt-headers
+
+# This target links the getopt header into ${BUILDLINK_INCDIR}, which should
+# be searched first by the C preprocessor.
+#
+link-getopt-headers:
+ @${ECHO} "Linking getopt headers into ${BUILDLINK_INCDIR}."
+ @${MKDIR} ${BUILDLINK_INCDIR}
+ @${RM} -f ${BUILDLINK_INCDIR}/getopt.h
+ @${LN} -sf ${GETOPT_H} ${BUILDLINK_INCDIR}
diff --git a/devel/readline/Makefile.readline b/devel/readline/buildlink.mk
index fd0a9952187..f15d8e31f20 100644
--- a/devel/readline/Makefile.readline
+++ b/devel/readline/buildlink.mk
@@ -1,23 +1,23 @@
-# $NetBSD: Makefile.readline,v 1.4 2001/05/22 16:46:37 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.1 2001/05/24 08:53:56 jlam Exp $
#
# This Makefile fragment is included by packages that use readline().
#
# If readline() is not present in the base system through libedit, then a
# dependency on devel/readline is added, the appropriate headers are linked
-# into ${WRKINCDIR} (${WRKSRC}/include), and the appropriate libraries are
-# linked into ${WRKLIBDIR} (${WRKSRC}/lib).
+# into ${BUILDLINK_INCDIR} (${WRKSRC}/include), and the appropriate libraries
+# are linked into ${BUILDLINK_LIBDIR} (${WRKSRC}/lib).
#
# To use this Makefile fragment, simply:
#
# (1) Optionally define USE_GNU_READLINE to force use of GNU readline.
# (2) Optionally define READLINE_REQD to the version of GNU readline desired.
# (3) Include this Makefile fragment in the package Makefile,
-# (4) Optionally define WRKINCDIR and WRKLIBDIR,
-# (5) Add link-readline-headers and link-readline-libs to the prerequisite
-# targets for pre-configure,
-# (6) Add ${WRKINCDIR} to the front of the C preprocessor's header search
-# path, and
-# (7) Add ${WRKLIBDIR} to the front of the linker's library search path.
+# (4) Optionally define BUILDLINK_INCDIR and BUILDLINK_LIBDIR,
+# (5) Add ${BUILDLINK_TARGETS} to the prerequisite targets for pre-configure,
+# (6) Add ${BUILDLINK_INCDIR} to the front of the C preprocessor's header
+# search path, and
+# (7) Add ${BUILDLINK_LIBDIR} to the front of the linker's library search
+# path.
#
# NOTE: You may need to do some more work to get libedit recognized over
# libreadline, especially by GNU configure scripts.
@@ -57,36 +57,39 @@ DEPENDS+= readline>=${READLINE_REQD}:../../devel/readline
.endif
.endif
-WRKINCDIR?= ${WRKDIR}/include
-WRKLIBDIR?= ${WRKDIR}/lib
+BUILDLINK_INCDIR?= ${WRKDIR}/include
+BUILDLINK_LIBDIR?= ${WRKDIR}/lib
-# This target links the readline and history headers into ${WRKINCDIR},
+BUILDLINK_TARGETS+= link-readline-headers
+BUILDLINK_TARGETS+= link-readline-libs
+
+# This target links the readline and history headers into ${BUILDLINK_INCDIR},
# which should be searched first by the C preprocessor.
#
link-readline-headers:
- @${ECHO} "Linking readline headers into ${WRKINCDIR}."
- @${MKDIR} -p ${WRKINCDIR}/readline
- @${RM} -f ${WRKINCDIR}/readline/*
+ @${ECHO} "Linking readline headers into ${BUILDLINK_INCDIR}."
+ @${MKDIR} -p ${BUILDLINK_INCDIR}/readline
+ @${RM} -f ${BUILDLINK_INCDIR}/readline/*
.if defined(READLINE_INCDIR)
@for inc in ${READLINE_INCDIR}/*; do \
- ${LN} -sf $${inc} ${WRKINCDIR}/readline; \
+ ${LN} -sf $${inc} ${BUILDLINK_INCDIR}/readline; \
done
.else
- @${LN} -sf ${READLINE_H} ${WRKINCDIR}/readline
- @${LN} -sf ${HISTORY_H} ${WRKINCDIR}/readline
+ @${LN} -sf ${READLINE_H} ${BUILDLINK_INCDIR}/readline
+ @${LN} -sf ${HISTORY_H} ${BUILDLINK_INCDIR}/readline
.endif
-# This target links the readline and history libraries into ${WRKLIBDIR},
-# which should be searched first by the linker.
+# This target links the readline and history libraries into
+# ${BUILDLINK_LIBDIR}, which should be searched first by the linker.
#
link-readline-libs:
- @${ECHO} "Linking readline libraries into ${WRKLIBDIR}."
- @${MKDIR} -p ${WRKLIBDIR}
+ @${ECHO} "Linking readline libraries into ${BUILDLINK_LIBDIR}."
+ @${MKDIR} -p ${BUILDLINK_LIBDIR}
@for lib in ${LIBREADLINE}; do \
dest=`${BASENAME} $${lib} | ${SED} "s|libedit|libreadline|"`; \
- ${LN} -sf $${lib} ${WRKLIBDIR}/$${dest}; \
+ ${LN} -sf $${lib} ${BUILDLINK_LIBDIR}/$${dest}; \
done
@for lib in ${LIBHISTORY}; do \
dest=`${BASENAME} $${lib} | ${SED} "s|libedit|libhistory|"`; \
- ${LN} -sf $${lib} ${WRKLIBDIR}/$${dest}; \
+ ${LN} -sf $${lib} ${BUILDLINK_LIBDIR}/$${dest}; \
done
diff --git a/games/freeciv-server/Makefile b/games/freeciv-server/Makefile
index 792d90224e9..6a47cb8350b 100644
--- a/games/freeciv-server/Makefile
+++ b/games/freeciv-server/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2001/05/22 06:05:25 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2001/05/24 08:53:56 jlam Exp $
PKGNAME= ${DISTNAME:S/-/-server-/}
@@ -12,13 +12,13 @@ CONFIGURE_ARGS+= --with-readline
USE_GNU_READLINE= # uses callback interface of GNU readline
-.include "../../devel/readline/Makefile.readline"
+.include "../../devel/readline/buildlink.mk"
-CPPFLAGS+= -I${WRKINCDIR}
-LDFLAGS+= -L${WRKLIBDIR}
+CPPFLAGS+= -I${BUILDLINK_INCDIR}
+LDFLAGS+= -L${BUILDLINK_LIBDIR}
LIBS+= -ltermcap
-pre-configure: link-readline-headers link-readline-libs
+pre-configure: ${BUILDLINK_TARGETS}
do-install:
cd ${WRKSRC}/server; ${SETENV} ${MAKE_ENV} \
diff --git a/lang/hugs/Makefile b/lang/hugs/Makefile
index da3293ff113..529bf6f2c10 100644
--- a/lang/hugs/Makefile
+++ b/lang/hugs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2001/05/22 06:54:05 jlam Exp $
+# $NetBSD: Makefile,v 1.16 2001/05/24 08:53:57 jlam Exp $
DISTNAME= hugs98-Feb2000
PKGNAME= hugs98-200002
@@ -20,11 +20,11 @@ CONFIGURE_ENV+= ac_cv_lib_ncurses_main=no
# Hugs' build doesn't require the readline headers, only the readline library.
# The only function it uses is readline().
#
-.include "../../devel/readline/Makefile.readline"
+.include "../../devel/readline/buildlink.mk"
-LDFLAGS+= -L${WRKLIBDIR}
+LDFLAGS+= -L${BUILDLINK_LIBDIR}
-pre-configure: link-readline-libs
+pre-configure: ${BUILDLINK_TARGETS}
do-build:
@cd ${WRKSRC}/.. && ${SETENV} ${MAKE_ENV} \
diff --git a/math/capc-calc/Makefile b/math/capc-calc/Makefile
index 900b04ed903..c4f65623afe 100644
--- a/math/capc-calc/Makefile
+++ b/math/capc-calc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2001/05/16 20:28:40 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2001/05/24 08:53:57 jlam Exp $
#
DISTNAME= calc-2.11.4t2
@@ -13,12 +13,12 @@ COMMENT= C arbitrary precision calculator
NO_CONFIGURE= # defined
-.include "../../devel/readline/Makefile.readline"
+.include "../../devel/readline/buildlink.mk"
MAKE_ENV+= CPPFLAGS="${CPPFLAGS}"
-CPPFLAGS+= -I${WRKINCDIR}
-LDFLAGS+= -L${WRKLIBDIR}
+CPPFLAGS+= -I${BUILDLINK_INCDIR}
+LDFLAGS+= -L${BUILDLINK_LIBDIR}
-pre-build: link-readline-headers link-readline-libs
+pre-build: ${BUILDLINK_TARGETS}
.include "../../mk/bsd.pkg.mk"
diff --git a/misc/chipmunk/Makefile b/misc/chipmunk/Makefile
index 44648fe35c3..953b8053d03 100644
--- a/misc/chipmunk/Makefile
+++ b/misc/chipmunk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2001/05/17 20:17:27 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2001/05/24 08:53:57 jlam Exp $
#
DISTNAME= chipmunk-1.4
@@ -11,16 +11,16 @@ COMMENT= shell-like tool for hardware debugging
ONLY_FOR_PLATFORM= NetBSD-*-i386
-.include "../../devel/readline/Makefile.readline"
+.include "../../devel/readline/buildlink.mk"
ALL_TARGET= chipmunk
MAKE_ENV+= CONFIG_OPTIONS="${CPPFLAGS}"
MAKE_ENV+= EXTRA_LIBS=-li386
-CPPFLAGS+= -I${WRKINCDIR}
-LDFLAGS+= -L${WRKLIBDIR}
+CPPFLAGS+= -I${BUILDLINK_INCDIR}
+LDFLAGS+= -L${BUILDLINK_LIBDIR}
-pre-configure: link-readline-headers link-readline-libs
+pre-configure: ${BUILDLINK_TARGETS}
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/chipmunk ${PREFIX}/sbin/chipmunk
diff --git a/net/ncftp2/Makefile b/net/ncftp2/Makefile
index 65326c7dd86..16195ba7267 100644
--- a/net/ncftp2/Makefile
+++ b/net/ncftp2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2001/05/16 20:27:23 jlam Exp $
+# $NetBSD: Makefile,v 1.25 2001/05/24 08:53:57 jlam Exp $
# FreeBSD Id: Makefile,v 1.39 1998/01/31 17:49:48 jseger Exp
#
@@ -30,12 +30,12 @@ DEPENDS+= socks5-1.0.2:../../net/socks5
.endif
.endif
-.include "../../devel/readline/Makefile.readline"
+.include "../../devel/readline/buildlink.mk"
-CPPFLAGS+= -I${WRKINCDIR}
-LDFLAGS+= -L${WRKLIBDIR}
+CPPFLAGS+= -I${BUILDLINK_INCDIR}
+LDFLAGS+= -L${BUILDLINK_LIBDIR}
-pre-configure: link-readline-headers link-readline-libs
+pre-configure: ${BUILDLINK_TARGETS}
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/ncftp ${PREFIX}/bin/ncftp2
diff --git a/net/samba/Makefile b/net/samba/Makefile
index 3f21cbc52b3..879484119dd 100644
--- a/net/samba/Makefile
+++ b/net/samba/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.50 2001/05/22 21:49:28 jlam Exp $
+# $NetBSD: Makefile,v 1.51 2001/05/24 08:53:57 jlam Exp $
DISTNAME= samba-2.2.0
WRKSRC= ${WRKDIR}/${DISTNAME}/source
@@ -24,10 +24,10 @@ LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig
USE_GNU_READLINE= # uses rl_event_hook interface to GNU readline
.include "../../mk/bsd.prefs.mk"
-.include "../../devel/readline/Makefile.readline"
+.include "../../devel/readline/buildlink.mk"
-CFLAGS+= -I${WRKINCDIR}
-LDFLAGS+= -L${WRKLIBDIR}
+CFLAGS+= -I${BUILDLINK_INCDIR}
+LDFLAGS+= -L${BUILDLINK_LIBDIR}
SAMBA_LOGDIR= /var/log
SAMBA_LOCKDIR= /var/run/samba
@@ -79,6 +79,8 @@ HTMLDIR= ${PREFIX}/share/doc/html/samba
post-extract:
${FIND} ${WRKDIR}/${DISTNAME} -name ".cvsignore" -exec ${RM} -f {} \;
+pre-configure: ${BUILDLINK_TARGETS}
+
pre-install:
for file in nmbd.sh smbd.sh; do \
${SED} -e "s,@PREFIX@,${PREFIX},g" \
diff --git a/www/cadaver/Makefile b/www/cadaver/Makefile
index 0d0822e3bec..4e2ec537a92 100644
--- a/www/cadaver/Makefile
+++ b/www/cadaver/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2001/05/22 16:09:14 jlam Exp $
+# $NetBSD: Makefile,v 1.5 2001/05/24 08:53:58 jlam Exp $
DISTNAME= cadaver-0.17.0
CATEGORIES= www
@@ -21,18 +21,18 @@ CONFIGURA_ARGS+= --with-include-neon
CONFIGURE_ARGS+= --enable-libxml
CONFIGURE_ARGS+= --enable-netrc
-.include "../../devel/libgetopt/Makefile.getopt"
-.include "../../devel/readline/Makefile.readline"
+.include "../../devel/libgetopt/buildlink.mk"
+.include "../../devel/readline/buildlink.mk"
CONFIGURE_ENV+= LIBS="${LIBS}"
CONFIGURE_ENV+= ac_cv_lib_curses_tputs=no
CONFIGURE_ENV+= ac_cv_lib_ncurses_tputs=no
-CFLAGS+= -I${WRKINCDIR} ${CPPFLAGS}
-LDFLAGS+= -L${WRKLIBDIR}
+CFLAGS+= -I${BUILDLINK_INCDIR} ${CPPFLAGS}
+LDFLAGS+= -L${BUILDLINK_LIBDIR}
LIBS+= -ltermcap
-pre-configure: link-getopt-headers link-readline-headers link-readline-libs
+pre-configure: ${BUILDLINK_TARGETS}
# The build process doesn't correctly find some headers for utility functions
# which are provided in ${WRKSRC}/lib. Help the compiler by linking the
diff --git a/www/sitecopy/Makefile b/www/sitecopy/Makefile
index 6954f145a44..deee6bc4c9d 100644
--- a/www/sitecopy/Makefile
+++ b/www/sitecopy/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2001/05/22 16:09:14 jlam Exp $
+# $NetBSD: Makefile,v 1.4 2001/05/24 08:53:58 jlam Exp $
DISTNAME= sitecopy-0.10.15
CATEGORIES= www
@@ -19,11 +19,11 @@ CONFIGURE_ARGS+= --with-ssl=${SSLBASE}
CONFIGURE_ARGS+= --with-included-neon
CONFIGURE_ARGS+= --enable-libxml
-.include "../../devel/libgetopt/Makefile.getopt"
+.include "../../devel/libgetopt/buildlink.mk"
-CFLAGS+= -I${WRKINCDIR} ${CPPFLAGS}
+CFLAGS+= -I${BUILDLINK_INCDIR} ${CPPFLAGS}
-pre-configure: link-getopt-headers
+pre-configure: ${BUILDLINK_TARGETS}
# 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
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-13 07:49:06 +0000