diff options
author | jlam <jlam@pkgsrc.org> | 2004-02-08 03:00:29 +0000 |
---|---|---|
committer | jlam <jlam@pkgsrc.org> | 2004-02-08 03:00:29 +0000 |
commit | 75f431d969f29ed2e62ab970d189c492a40ef738 (patch) | |
tree | d67c38589f0a70653612f61a7f96e8c870fc484e | |
parent | 3f0c4ee09a7f8e9149550c82e83b658ffc55645f (diff) | |
download | pkgsrc-75f431d969f29ed2e62ab970d189c492a40ef738.tar.gz |
PKGLIBTOOL and PKGSHLIBTOOL are no more.
-rw-r--r-- | archivers/bzip2/Makefile | 8 | ||||
-rw-r--r-- | audio/SDL_mixer/Makefile | 6 | ||||
-rw-r--r-- | editors/pico/Makefile | 8 | ||||
-rw-r--r-- | finance/gnucash/Makefile | 4 | ||||
-rw-r--r-- | mail/imap-uw/Makefile | 10 | ||||
-rw-r--r-- | print/cups/Makefile | 4 | ||||
-rw-r--r-- | security/cy-login/Makefile | 4 | ||||
-rw-r--r-- | security/tcp_wrappers/Makefile | 8 | ||||
-rw-r--r-- | x11/fltk/Makefile | 4 | ||||
-rw-r--r-- | x11/qt2-designer-kde/Makefile | 8 | ||||
-rw-r--r-- | x11/qt2-designer/Makefile | 8 | ||||
-rw-r--r-- | x11/qt2-libs/Makefile | 4 |
12 files changed, 38 insertions, 38 deletions
diff --git a/archivers/bzip2/Makefile b/archivers/bzip2/Makefile index fd32125dc43..0329b2bb3f9 100644 --- a/archivers/bzip2/Makefile +++ b/archivers/bzip2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.30 2004/01/07 01:14:03 jlam Exp $ +# $NetBSD: Makefile,v 1.31 2004/02/08 03:00:29 jlam Exp $ # DISTNAME= bzip2-1.0.2 @@ -25,11 +25,11 @@ MAKE_ENV+= BZIP_CFLAGS="${BZIP_CFLAGS}" INSTALLATION_DIRS= bin include lib man/man1 do-install: - ${PKGLIBTOOL} --mode=install ${INSTALL_DATA} ${WRKSRC}/libbz2.la ${PREFIX}/lib - ${PKGLIBTOOL} --mode=install ${INSTALL_PROGRAM} ${WRKSRC}/bzip2 ${PREFIX}/bin + ${LIBTOOL} --mode=install ${INSTALL_DATA} ${WRKSRC}/libbz2.la ${PREFIX}/lib + ${LIBTOOL} --mode=install ${INSTALL_PROGRAM} ${WRKSRC}/bzip2 ${PREFIX}/bin ${LN} -f ${PREFIX}/bin/bzip2 ${PREFIX}/bin/bunzip2 ${LN} -f ${PREFIX}/bin/bzip2 ${PREFIX}/bin/bzcat - ${PKGLIBTOOL} --mode=install ${INSTALL_PROGRAM} ${WRKSRC}/bzip2recover ${PREFIX}/bin + ${LIBTOOL} --mode=install ${INSTALL_PROGRAM} ${WRKSRC}/bzip2recover ${PREFIX}/bin ${INSTALL_MAN} ${WRKSRC}/bzip2.1 ${PREFIX}/man/man1 ${RM} -f ${PREFIX}/man/man1/bunzip2.1 ${PREFIX}/man/man1/bzcat.1 ${PREFIX}/man/man1/bzip2recover.1 ${LN} -s ${PREFIX}/man/man1/bzip2.1 ${PREFIX}/man/man1/bunzip2.1 diff --git a/audio/SDL_mixer/Makefile b/audio/SDL_mixer/Makefile index 42fde400c67..21f23bdcf80 100644 --- a/audio/SDL_mixer/Makefile +++ b/audio/SDL_mixer/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2004/01/05 22:44:04 jlam Exp $ +# $NetBSD: Makefile,v 1.11 2004/02/08 03:00:29 jlam Exp $ # DISTNAME= SDL_mixer-1.2.5 @@ -27,8 +27,8 @@ CFLAGS= -DPREFIX=\"\\\"${PREFIX}\\\"\" INSTALLATION_DIRS= bin post-install: - ${PKGLIBTOOL} ${INSTALL_PROGRAM} ${WRKSRC}/playmus ${PREFIX}/bin - ${PKGLIBTOOL} ${INSTALL_PROGRAM} ${WRKSRC}/playwave ${PREFIX}/bin + ${LIBTOOL} ${INSTALL_PROGRAM} ${WRKSRC}/playmus ${PREFIX}/bin + ${LIBTOOL} ${INSTALL_PROGRAM} ${WRKSRC}/playwave ${PREFIX}/bin .include "../../audio/libogg/buildlink3.mk" .include "../../devel/gettext-lib/buildlink3.mk" diff --git a/editors/pico/Makefile b/editors/pico/Makefile index 07617522b61..bb52b11228f 100644 --- a/editors/pico/Makefile +++ b/editors/pico/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.47 2003/09/28 09:13:56 jlam Exp $ +# $NetBSD: Makefile,v 1.48 2004/02/08 03:00:29 jlam Exp $ DISTNAME= pine4.58 PKGNAME= pico-4.6 @@ -33,13 +33,13 @@ MAKE_ENV+= _STRIPFLAG_INSTALL= # debug... do-build: cd ${WRKSRC} && \ ${SETENV} ${MAKE_ENV} ./build ${BUILDNAME} \ - CC="${PKGLIBTOOL} ${BUILDLINK_CC}" \ + CC="${LIBTOOL} ${BUILDLINK_CC}" \ PREFIX=${PREFIX} OPTIMIZE="${CFLAGS}" do-install: - ${PKGLIBTOOL} --mode=install ${INSTALL_DATA} \ + ${LIBTOOL} --mode=install ${INSTALL_DATA} \ ${WRKSRC}/pico/libpico.la ${PREFIX}/lib - ${PKGLIBTOOL} --mode=install ${INSTALL_PROGRAM} \ + ${LIBTOOL} --mode=install ${INSTALL_PROGRAM} \ ${WRKSRC}/pico/pico ${WRKSRC}/pico/pilot ${PREFIX}/bin ${INSTALL_MAN} ${WRKSRC}/doc/pico.1 ${PREFIX}/man/man1 ${INSTALL_MAN} ${WRKSRC}/doc/pilot.1 ${PREFIX}/man/man1 diff --git a/finance/gnucash/Makefile b/finance/gnucash/Makefile index 1886c85857d..5aac12e99f3 100644 --- a/finance/gnucash/Makefile +++ b/finance/gnucash/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.56 2004/01/22 08:37:19 grant Exp $ +# $NetBSD: Makefile,v 1.57 2004/02/08 03:00:29 jlam Exp $ DISTNAME= gnucash-1.8.8 PKGREVISION= 2 @@ -33,7 +33,7 @@ CONFIGURE_ARGS+= --with-libiconv-prefix=${BUILDLINK_PREFIX.iconv} CONFIGURE_ENV+= GUILE="${GUILE14}" CONFIGURE_ENV+= PKG_CONFIG_PATH="${PREFIX}/lib/pkgconfig:${X11BASE}/lib/pkgconfig" -AM_MAKEFLAGS= LIBTOOL='${PKGLIBTOOL} ${LIBTOOL_FLAGS}' +AM_MAKEFLAGS= LIBTOOL='${LIBTOOL} ${LIBTOOL_FLAGS}' MAKE_ENV+= AM_MAKEFLAGS="${AM_MAKEFLAGS}" INFO_FILES= gnucash-design.info diff --git a/mail/imap-uw/Makefile b/mail/imap-uw/Makefile index d085e7e880b..808befc83eb 100644 --- a/mail/imap-uw/Makefile +++ b/mail/imap-uw/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.72 2003/11/12 03:39:40 jschauma Exp $ +# $NetBSD: Makefile,v 1.73 2004/02/08 03:00:29 jlam Exp $ # ATTENTION: # The Kerberos support in this software is known to be problematic. If you # upgrade this package you *must* test it on a system *without* Kerberos @@ -18,8 +18,8 @@ COMMENT= University of Washington's IMAP, POP2, and POP3 servers USE_BUILDLINK2= # defined USE_LIBTOOL= # defined -INST_PROG= ${PKGLIBTOOL} ${INSTALL_PROGRAM} -INST_LIB= ${PKGLIBTOOL} ${INSTALL_DATA} +INST_PROG= ${LIBTOOL} ${INSTALL_PROGRAM} +INST_LIB= ${LIBTOOL} ${INSTALL_DATA} INC_DIR= ${PREFIX}/include/c-client LIB_DIR= ${PREFIX}/lib DOC_DIR= ${PREFIX}/share/doc/imap-uw @@ -70,7 +70,7 @@ MAKE_ENV+= CCLIENT_MAJOR=${CCLIENT_MAJOR:Q} MAKE_ENV+= CCLIENT_MINOR=${CCLIENT_MINOR:Q} MAKE_ENV+= CREATEPROTO=${IMAP_UW_CCLIENT_MBOX_FMT:Q}proto -ALL_TARGET+= CC="${PKGLIBTOOL} ${CC}" +ALL_TARGET+= CC="${LIBTOOL} ${CC}" ALL_TARGET+= EXTRACFLAGS="${CFLAGS}" ALL_TARGET+= EXTRALDFLAGS="${LDFLAGS}" .if defined(IMAP_UW_NO_CLEARTEXT) && ${IMAP_UW_NO_CLEARTEXT} == "YES" @@ -133,7 +133,7 @@ post-patch: # post-build: cd ${WRKSRC}/c-client; \ - ${PKGLIBTOOL} ${CC} -o ${CCLIENT_PICLIB:.a=.la} *.lo + ${LIBTOOL} ${CC} -o ${CCLIENT_PICLIB:.a=.la} *.lo do-install: ${INSTALL_DATA_DIR} ${INC_DIR} diff --git a/print/cups/Makefile b/print/cups/Makefile index 4b7927bff2f..a5005a17892 100644 --- a/print/cups/Makefile +++ b/print/cups/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.72 2004/01/24 14:58:00 grant Exp $ +# $NetBSD: Makefile,v 1.73 2004/02/08 03:00:29 jlam Exp $ # # The CUPS author is very good about taking back changes into the main # CUPS distribution. The correct place to send patches or bug-fixes is: @@ -47,7 +47,7 @@ CONFIGURE_ARGS+= --with-rcdir=${RCD_SCRIPTS_DIR} CONFIGURE_ARGS+= --with-cups-user=${CUPS_USER} CONFIGURE_ARGS+= --with-cups-group=${CUPS_GROUP} CONFIGURE_ARGS+= --with-manext=bsd -CONFIGURE_ARGS+= --enable-libtool-unsupported="${PKGLIBTOOL} ${LIBTOOL_FLAGS}" +CONFIGURE_ARGS+= --enable-libtool-unsupported="${LIBTOOL} ${LIBTOOL_FLAGS}" CONFIGURE_ARGS+= --enable-slp CONFIGURE_ARGS+= --enable-ssl CONFIGURE_ENV+= DSOFLAGS="${LDFLAGS}" diff --git a/security/cy-login/Makefile b/security/cy-login/Makefile index 617d22a378e..c966d4c4c94 100644 --- a/security/cy-login/Makefile +++ b/security/cy-login/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2003/03/19 21:09:46 jlam Exp $ +# $NetBSD: Makefile,v 1.2 2004/02/08 03:00:29 jlam Exp $ PKGNAME= ${DISTNAME:S/cyrus-sasl/cy-login/} COMMENT= Cyrus SASL LOGIN authentication plugin @@ -22,6 +22,6 @@ ALL_TARGET= liblogin.la do-install: cd ${WRKSRC}/plugins && \ - ${PKGLIBTOOL} --mode=install ${INSTALL_PROGRAM} liblogin.la ${PLUGINDIR} + ${LIBTOOL} --mode=install ${INSTALL_PROGRAM} liblogin.la ${PLUGINDIR} .include "../../mk/bsd.pkg.mk" diff --git a/security/tcp_wrappers/Makefile b/security/tcp_wrappers/Makefile index e7fccd73428..1c96293f1b3 100644 --- a/security/tcp_wrappers/Makefile +++ b/security/tcp_wrappers/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2004/01/05 12:04:20 jlam Exp $ +# $NetBSD: Makefile,v 1.14 2004/02/08 03:00:29 jlam Exp $ DISTNAME= tcp_wrappers_7.6-ipv6.1 PKGNAME= tcp_wrappers-7.6.1 @@ -34,11 +34,11 @@ MAKE_ENV+= IPV6=-DHAVE_IPV6 .endif do-install: - cd ${WRKSRC}; ${PKGLIBTOOL} ${INSTALL_DATA} libwrap.la ${PREFIX}/lib - cd ${WRKSRC}; ${PKGLIBTOOL} ${INSTALL_PROGRAM} \ + cd ${WRKSRC}; ${LIBTOOL} ${INSTALL_DATA} libwrap.la ${PREFIX}/lib + cd ${WRKSRC}; ${LIBTOOL} ${INSTALL_PROGRAM} \ tcpdmatch try-from safe_finger tcpdchk ${PREFIX}/bin cd ${WRKSRC}; ${INSTALL_DATA} tcpd.h ${PREFIX}/include - cd ${WRKSRC}; ${PKGLIBTOOL} ${INSTALL_PROGRAM} tcpd ${PREFIX}/libexec + cd ${WRKSRC}; ${LIBTOOL} ${INSTALL_PROGRAM} tcpd ${PREFIX}/libexec cd ${WRKSRC}; ${INSTALL_DATA} *.3 ${PREFIX}/man/man3 cd ${WRKSRC}; ${INSTALL_DATA} *.5 ${PREFIX}/man/man5 cd ${WRKSRC}; ${INSTALL_DATA} *.8 ${PREFIX}/man/man8 diff --git a/x11/fltk/Makefile b/x11/fltk/Makefile index 1a8b23110f1..f8a1c440af3 100644 --- a/x11/fltk/Makefile +++ b/x11/fltk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.34 2004/02/02 13:02:49 jlam Exp $ +# $NetBSD: Makefile,v 1.35 2004/02/08 03:00:29 jlam Exp $ # DISTNAME= fltk-1.0.11-source @@ -27,7 +27,7 @@ USE_X11BASE= # defined TEST_TARGET= test GNU_CONFIGURE= # defined -CONFIGURE_ARGS+= --enable-libtool=${PKGLIBTOOL} +CONFIGURE_ARGS+= --enable-libtool=${LIBTOOL} .include "../../graphics/MesaLib/buildlink2.mk" .include "../../graphics/glu/buildlink2.mk" diff --git a/x11/qt2-designer-kde/Makefile b/x11/qt2-designer-kde/Makefile index 85862f819fe..ec5ff867544 100644 --- a/x11/qt2-designer-kde/Makefile +++ b/x11/qt2-designer-kde/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2004/01/23 21:50:52 jmmv Exp $ +# $NetBSD: Makefile,v 1.17 2004/02/08 03:00:29 jlam Exp $ # PKGNAME= qt2-designer-kde-${QTVERSION} @@ -20,11 +20,11 @@ ALL_TARGET= sub-tools UNLIMIT_RESOURCES= datasize do-install: - ${PKGLIBTOOL} ${INSTALL_DATA} \ + ${LIBTOOL} ${INSTALL_DATA} \ ${WRKSRC}/tools/designer/util/libqutil.la ${QTPREFIX}/lib - ${PKGLIBTOOL} ${INSTALL_PROGRAM} \ + ${LIBTOOL} ${INSTALL_PROGRAM} \ ${WRKSRC}/tools/designer/uic/uic ${QTPREFIX}/bin - ${PKGLIBTOOL} ${INSTALL_PROGRAM} \ + ${LIBTOOL} ${INSTALL_PROGRAM} \ ${WRKSRC}/tools/designer/designer/designer ${QTPREFIX}/bin .include "../../x11/kdelibs2/buildlink2.mk" diff --git a/x11/qt2-designer/Makefile b/x11/qt2-designer/Makefile index 87acb551935..604802f52c7 100644 --- a/x11/qt2-designer/Makefile +++ b/x11/qt2-designer/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2003/05/02 12:34:24 wiz Exp $ +# $NetBSD: Makefile,v 1.19 2004/02/08 03:00:29 jlam Exp $ PKGNAME= qt2-designer-${QTVERSION} PKGREVISION= 2 @@ -13,11 +13,11 @@ USE_BUILDLINK2= yes ALL_TARGET= sub-tools do-install: - ${PKGLIBTOOL} ${INSTALL_DATA} \ + ${LIBTOOL} ${INSTALL_DATA} \ ${WRKSRC}/tools/designer/util/libqutil.la ${QTPREFIX}/lib - ${PKGLIBTOOL} ${INSTALL_PROGRAM} \ + ${LIBTOOL} ${INSTALL_PROGRAM} \ ${WRKSRC}/tools/designer/uic/uic ${QTPREFIX}/bin - ${PKGLIBTOOL} ${INSTALL_PROGRAM} \ + ${LIBTOOL} ${INSTALL_PROGRAM} \ ${WRKSRC}/tools/designer/designer/designer ${QTPREFIX}/bin .include "../../x11/qt2-libs/buildlink2.mk" diff --git a/x11/qt2-libs/Makefile b/x11/qt2-libs/Makefile index 002017719f8..2e4f896c7ee 100644 --- a/x11/qt2-libs/Makefile +++ b/x11/qt2-libs/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.22 2003/11/30 22:58:40 jschauma Exp $ +# $NetBSD: Makefile,v 1.23 2004/02/08 03:00:29 jlam Exp $ PKGNAME= qt2-libs-${QTVERSION} PKGREVISION= 5 @@ -24,7 +24,7 @@ do-install: ${INSTALL_PROGRAM_DIR} ${QTPREFIX}/bin ${INSTALL_PROGRAM} ${WRKSRC}/bin/moc ${QTPREFIX}/bin ${INSTALL_DATA_DIR} ${QTPREFIX}/lib - ${PKGLIBTOOL} ${INSTALL_DATA} ${WRKSRC}/src/libqt.la ${QTPREFIX}/lib + ${LIBTOOL} ${INSTALL_DATA} ${WRKSRC}/src/libqt.la ${QTPREFIX}/lib ${INSTALL_DATA_DIR} ${QTPREFIX}/include ${INSTALL_DATA} ${WRKSRC}/include/* ${QTPREFIX}/include |