diff options
Diffstat (limited to 'net')
-rw-r--r-- | net/coda5_client/Makefile | 16 | ||||
-rw-r--r-- | net/coda5_server/Makefile | 16 | ||||
-rw-r--r-- | net/ncftp2/Makefile | 5 | ||||
-rw-r--r-- | net/samba/Makefile | 9 | ||||
-rw-r--r-- | net/zebra/Makefile | 4 |
5 files changed, 17 insertions, 33 deletions
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 |