diff options
author | hans <hans@pkgsrc.org> | 2012-01-14 02:09:35 +0000 |
---|---|---|
committer | hans <hans@pkgsrc.org> | 2012-01-14 02:09:35 +0000 |
commit | bbd52967db3e763461156db6ce03938e11717a34 (patch) | |
tree | 4e45393f80bc13327eb3d2467873328c365ce2fa /lang | |
parent | 61a093ec38c3d2105a3f40a7fc8d986f2e9fd920 (diff) | |
download | pkgsrc-bbd52967db3e763461156db6ce03938e11717a34.tar.gz |
Convert to USE_TOOLS=zip.
Diffstat (limited to 'lang')
-rw-r--r-- | lang/classpath/Makefile | 6 | ||||
-rw-r--r-- | lang/gcc44/options.mk | 5 | ||||
-rw-r--r-- | lang/gcc45/Makefile | 6 | ||||
-rw-r--r-- | lang/gcc46/options.mk | 5 | ||||
-rw-r--r-- | lang/openjdk7/Makefile | 7 | ||||
-rw-r--r-- | lang/sablevm-classpath/Makefile | 4 | ||||
-rw-r--r-- | lang/smalltalk/Makefile | 6 |
7 files changed, 15 insertions, 24 deletions
diff --git a/lang/classpath/Makefile b/lang/classpath/Makefile index 727081744e9..bc1e8acf2de 100644 --- a/lang/classpath/Makefile +++ b/lang/classpath/Makefile @@ -1,12 +1,10 @@ -# $NetBSD: Makefile,v 1.15 2011/04/22 13:43:58 obache Exp $ +# $NetBSD: Makefile,v 1.16 2012/01/14 02:09:36 hans Exp $ .include "Makefile.common" PKGREVISION= 2 -BUILD_DEPENDS+= zip>=2.3:../../archivers/zip - -USE_TOOLS+= makeinfo +USE_TOOLS+= makeinfo zip INFO_FILES= # PLIST CONFIGURE_ARGS+= --disable-gtk-peer diff --git a/lang/gcc44/options.mk b/lang/gcc44/options.mk index d12994d4a0a..f3a47195b66 100644 --- a/lang/gcc44/options.mk +++ b/lang/gcc44/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.6 2011/07/13 13:25:17 hans Exp $ +# $NetBSD: options.mk,v 1.7 2012/01/14 02:09:36 hans Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.gcc44 PKG_SUPPORTED_OPTIONS= nls gcc-c++ gcc-fortran gcc-java gcc-objc #gcc-ada @@ -42,8 +42,7 @@ PKG_OPTIONS+= gcc-c++ LANGS+= java REPLACE_PYTHON= libjava/contrib/aot-compile.in -USE_TOOLS+= unzip -DEPENDS+= zip-[0-9]*:../../archivers/zip +USE_TOOLS+= unzip zip:run CONFIGURE_ARGS+= --with-system-zlib # ${WRKSRC}/gcc-4.4.1/libjava/contrib/aotcompile.py.in stores the path to diff --git a/lang/gcc45/Makefile b/lang/gcc45/Makefile index 15aa04a3de6..2cdb1829ab0 100644 --- a/lang/gcc45/Makefile +++ b/lang/gcc45/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2011/10/18 17:55:27 hans Exp $ +# $NetBSD: Makefile,v 1.4 2012/01/14 02:09:36 hans Exp $ DISTNAME= gcc-${GCC_VERSION} PKGNAME= gcc45-${GCC_VERSION} @@ -16,9 +16,7 @@ PKG_DESTDIR_SUPPORT= user-destdir USE_TOOLS+= awk:run bash:run perl chmod \ gmake:run makeinfo msgfmt bison flex gm4 \ - sed:run unzip - -DEPENDS+= zip-[0-9]*:../../archivers/zip + sed:run unzip zip:run GCC_VERSION= 4.5.3 diff --git a/lang/gcc46/options.mk b/lang/gcc46/options.mk index a54243b8f29..bae3433ec17 100644 --- a/lang/gcc46/options.mk +++ b/lang/gcc46/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.3 2011/10/13 10:54:24 hans Exp $ +# $NetBSD: options.mk,v 1.4 2012/01/14 02:09:36 hans Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.gcc46 PKG_SUPPORTED_OPTIONS= nls gcc-c++ gcc-fortran gcc-java gcc-objc #gcc-ada @@ -43,8 +43,7 @@ PKG_OPTIONS+= gcc-c++ LANGS+= java REPLACE_PYTHON= libjava/contrib/aot-compile.in -USE_TOOLS+= unzip -DEPENDS+= zip-[0-9]*:../../archivers/zip +USE_TOOLS+= unzip zip:run CONFIGURE_ARGS+= --with-system-zlib # ${WRKSRC}/gcc-4.6.1/libjava/contrib/aotcompile.py.in stores the path to diff --git a/lang/openjdk7/Makefile b/lang/openjdk7/Makefile index b0894673f26..6dac46970d5 100644 --- a/lang/openjdk7/Makefile +++ b/lang/openjdk7/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.26 2011/11/01 06:01:56 sbd Exp $ +# $NetBSD: Makefile,v 1.27 2012/01/14 02:09:36 hans Exp $ DISTNAME= openjdk-7-fcs-src-b147-27_jun_2011 PKGNAME= openjdk7-1.7.0.147.20110811 @@ -30,9 +30,8 @@ JAVA_HOME= ${PREFIX}/java/${JAVA_NAME} JAVA_WRAPPERS= jar java javac javadoc javah javap keytool orbd \ policytool rmid rmiregistry servertool tnameserv -BUILD_DEPENDS+= zip-[0-9]*:../../archivers/zip BUILD_DEPENDS+= unzip-[0-9]*:../../archivers/unzip -MAKE_ENV+= PKGSRC_ZIPEXE=${PREFIX}/bin/zip +MAKE_ENV+= PKGSRC_ZIPEXE=${TOOLS_PATH.zip} MAKE_ENV+= PKGSRC_UNZIP=${PREFIX}/bin/unzip MAKE_ENV+= PKGSRC_UNZIPSFX=${PREFIX}/bin/unzipsfv @@ -42,7 +41,7 @@ DEPENDS+= dejavu-ttf-[0-9]*:../../fonts/dejavu-ttf NO_CONFIGURE= yes USE_LANGUAGES= c c++ -USE_TOOLS+= gmake pax +USE_TOOLS+= gmake pax zip:run UNLIMIT_RESOURCES= datasize stacksize WRKSRC= ${WRKDIR}/openjdk diff --git a/lang/sablevm-classpath/Makefile b/lang/sablevm-classpath/Makefile index 894476c92a5..14b4ea9777a 100644 --- a/lang/sablevm-classpath/Makefile +++ b/lang/sablevm-classpath/Makefile @@ -1,10 +1,10 @@ -# $NetBSD: Makefile,v 1.12 2008/06/20 01:09:23 joerg Exp $ +# $NetBSD: Makefile,v 1.13 2012/01/14 02:09:37 hans Exp $ # PKG_DESTDIR_SUPPORT= user-destdir .include "Makefile.common" PKGREVISION= 1 -BUILD_DEPENDS+= zip>=2.3:../../archivers/zip +USE_TOOLS+= zip:run INFO_FILES= # PLIST diff --git a/lang/smalltalk/Makefile b/lang/smalltalk/Makefile index 4126387a2a9..957d134ae90 100644 --- a/lang/smalltalk/Makefile +++ b/lang/smalltalk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.61 2011/12/23 19:01:40 asau Exp $ +# $NetBSD: Makefile,v 1.62 2012/01/14 02:09:37 hans Exp $ DISTNAME= smalltalk-3.2.4 PKGREVISION= 2 @@ -15,9 +15,7 @@ PKG_DESTDIR_SUPPORT= user-destdir MAKE_JOBS_SAFE= no -BUILD_DEPENDS+= zip-[0-9]*:../../archivers/zip - -USE_TOOLS+= gawk gmake makeinfo pkg-config +USE_TOOLS+= gawk gmake makeinfo pkg-config zip USE_GNU_READLINE= YES USE_LIBTOOL= YES GNU_CONFIGURE= YES |