diff options
| author | jlam <jlam@pkgsrc.org> | 2002-08-28 08:45:41 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2002-08-28 08:45:41 +0000 |
| commit | bad74d9f3879186f86cba4e56d83f9e12ece1b9a (patch) | |
| tree | 1331a50f748a68496d21f5230d15563b428e5928 | |
| parent | b6e9a5338ad8bec404989dde620191a3e81163fc (diff) | |
| download | pkgsrc-bad74d9f3879186f86cba4e56d83f9e12ece1b9a.tar.gz | |
buildlink1 -> buildlink2
| -rw-r--r-- | devel/automake-devel/Makefile | 8 | ||||
| -rw-r--r-- | mail/imap-uw/Makefile | 17 |
2 files changed, 13 insertions, 12 deletions
diff --git a/devel/automake-devel/Makefile b/devel/automake-devel/Makefile index ca49ce17ee4..751a36d238c 100644 --- a/devel/automake-devel/Makefile +++ b/devel/automake-devel/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2002/08/12 17:32:12 wiz Exp $ +# $NetBSD: Makefile,v 1.3 2002/08/28 08:49:44 jlam Exp $ # FreeBSD Id: Makefile,v 1.5 1997/09/19 09:29:04 max Exp # @@ -14,7 +14,7 @@ COMMENT= GNU Standards-compliant Makefile generator DEPENDS= autoconf>=2.53:../../devel/autoconf-devel PLIST_SUBST+= PKG_DIR_VERSION=1.6 -USE_BUILDLINK_ONLY= YES +USE_BUILDLINK2= YES GNU_CONFIGURE= YES CONFIGURE_ENV= PERL=${PERL5} _STRIPFLAG_INSTALL= # none @@ -25,10 +25,10 @@ MAKE_ENV+= MAKEINFOFLAGS="${MAKEINFOFLAGS}" INFO_FILES= automake.info -PERL_REQD= 5.5 +PERL5_REQD= 5.5 TEXINFO_REQD= 4.0 TEXINFO_OVERRIDE= YES -.include "../../lang/perl5/buildlink.mk" +.include "../../lang/perl5/buildlink2.mk" .include "../../mk/texinfo.mk" .include "../../mk/bsd.pkg.mk" diff --git a/mail/imap-uw/Makefile b/mail/imap-uw/Makefile index b7e57af9d60..8ce5a13877d 100644 --- a/mail/imap-uw/Makefile +++ b/mail/imap-uw/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.44 2002/08/25 19:23:06 jlam Exp $ +# $NetBSD: Makefile,v 1.45 2002/08/28 08:45:41 jlam Exp $ DISTNAME= imap-2001a PKGNAME= imap-uw-2001.1 @@ -10,11 +10,11 @@ MAINTAINER= hubertf@netbsd.org HOMEPAGE= http://www.washington.edu/imap/ COMMENT= University of Washington's IMAP, POP2, and POP3 servers -USE_BUILDLINK_ONLY= # defined -USE_LIBTOOL= # defined +USE_BUILDLINK2= # defined +USE_LIBTOOL= # defined -INST_PROG= ${LIBTOOL} ${INSTALL_PROGRAM} -INST_LIB= ${LIBTOOL} ${INSTALL_DATA} +INST_PROG= ${PKGLIBTOOL} ${INSTALL_PROGRAM} +INST_LIB= ${PKGLIBTOOL} ${INSTALL_DATA} INC_DIR= ${PREFIX}/include/c-client LIB_DIR= ${PREFIX}/lib DOC_DIR= ${PREFIX}/share/doc/imap-uw @@ -56,7 +56,7 @@ MAKE_ENV+= CCLIENT_MAJOR="${CCLIENT_MAJOR}" MAKE_ENV+= CCLIENT_MINOR="${CCLIENT_MINOR}" MAKE_ENV+= CREATEPROTO=${IMAP_UW_CCLIENT_MBOX_FMT}proto -ALL_TARGET+= CC="${LIBTOOL} ${CC}" +ALL_TARGET+= CC="${PKGLIBTOOL} ${CC}" ALL_TARGET+= EXTRACFLAGS="${CFLAGS}" ALL_TARGET+= EXTRALDFLAGS="${LDFLAGS}" .if defined(IMAP_UW_NO_CLEARTEXT) && ${IMAP_UW_NO_CLEARTEXT} == "YES" @@ -91,7 +91,8 @@ post-extract: # Generate _pic.a library from shared objects. # post-build: - cd ${WRKSRC}/c-client; ${LIBTOOL} ${CC} -o ${CCLIENT_PICLIB:.a=.la} *.lo + cd ${WRKSRC}/c-client; \ + ${PKGLIBTOOL} ${CC} -o ${CCLIENT_PICLIB:.a=.la} *.lo do-install: ${INSTALL_DATA_DIR} ${INC_DIR} @@ -117,6 +118,6 @@ do-install: ${CHMOD} -R a=rX ${DOC_DIR} .if !defined(IMAP_UW_NO_SSL) || ${IMAP_UW_NO_SSL} != "YES" -.include "../../security/openssl/buildlink.mk" +.include "../../security/openssl/buildlink2.mk" .endif .include "../../mk/bsd.pkg.mk" |