summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--audio/amarok-kde3/Makefile6
-rw-r--r--audio/bmp/Makefile4
-rw-r--r--cross/i386-msdosdjgpp/Makefile4
-rw-r--r--devel/opengrok/Makefile6
-rw-r--r--emulators/uae/Makefile6
-rw-r--r--fonts/cyberbit-ttf/Makefile.common4
-rw-r--r--lang/sablevm/Makefile5
-rw-r--r--mail/amavis-perl/Makefile5
8 files changed, 15 insertions, 25 deletions
diff --git a/audio/amarok-kde3/Makefile b/audio/amarok-kde3/Makefile
index 735ce06fc25..f4ad14fabae 100644
--- a/audio/amarok-kde3/Makefile
+++ b/audio/amarok-kde3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2012/01/13 10:54:44 obache Exp $
+# $NetBSD: Makefile,v 1.15 2012/01/14 03:13:04 hans Exp $
DISTNAME= amarok-${VERSION}
VERSION= 1.4.10
@@ -13,9 +13,7 @@ COMMENT= KDE3 audio player
PKG_DESTDIR_SUPPORT= user-destdir
-DEPENDS+= unzip-[0-9]*:../../archivers/unzip
-
-USE_TOOLS+= gmake pkg-config msgfmt
+USE_TOOLS+= gmake pkg-config msgfmt unzip:run
USE_LANGUAGES= c c++
GNU_CONFIGURE= yes
USE_LIBTOOL= yes
diff --git a/audio/bmp/Makefile b/audio/bmp/Makefile
index 7aa34bd01a5..ba36a13e90e 100644
--- a/audio/bmp/Makefile
+++ b/audio/bmp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.38 2012/01/13 10:54:44 obache Exp $
+# $NetBSD: Makefile,v 1.39 2012/01/14 03:13:03 hans Exp $
#
BMP_ENABLE_ENCODERS= yes
@@ -7,7 +7,7 @@ PKG_DESTDIR_SUPPORT= user-destdir
.include "Makefile.common"
PKGREVISION= 14
-DEPENDS+= unzip-[0-9]*:../../archivers/unzip
+USE_TOOLS+= unzip:run
PLIST_VARS+= cdaudio
.if ${OPSYS} != "Darwin"
diff --git a/cross/i386-msdosdjgpp/Makefile b/cross/i386-msdosdjgpp/Makefile
index 3bcb30f3ef3..ae36c8999d3 100644
--- a/cross/i386-msdosdjgpp/Makefile
+++ b/cross/i386-msdosdjgpp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2011/11/15 20:26:04 shattered Exp $
+# $NetBSD: Makefile,v 1.30 2012/01/14 03:13:04 hans Exp $
#
DISTVERSION= 2.02.0
@@ -17,8 +17,6 @@ COMMENT= Cross-compile environment for MS-DOS on 386 and higher
NOT_FOR_PLATFORM= *-*-x86_64
-BUILD_DEPENDS+= unzip-[0-9]*:../../archivers/unzip
-
SITES.wmemu2b.zip= http://ftp.delorie.com/pub/djgpp/beta/ \
ftp://ftp.delorie.com/pub/djgpp/beta/ \
ftp://ftp.iij.ad.jp/pub/djgpp/beta/ \
diff --git a/devel/opengrok/Makefile b/devel/opengrok/Makefile
index 716344b9960..d482ac2a98f 100644
--- a/devel/opengrok/Makefile
+++ b/devel/opengrok/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2012/01/14 02:09:35 hans Exp $
+# $NetBSD: Makefile,v 1.18 2012/01/14 03:13:04 hans Exp $
#
DISTNAME= opengrok-0.8.1
@@ -11,8 +11,6 @@ HOMEPAGE= http://hub.opensolaris.org/bin/view/Project+opengrok/
COMMENT= Fast and usable source code search and cross reference engine
DEPENDS+= exctags-[0-9]*:../../devel/exctags
-DEPENDS+= unzip-[0-9]*:../../archivers/unzip
-DEPENDS+= zip-[0-9]*:../../archivers/zip
PKG_DESTDIR_SUPPORT= user-destdir
@@ -24,7 +22,7 @@ NO_BUILD= YES
USE_JAVA= run
USE_JAVA2= yes
-USE_TOOLS+= zip:run
+USE_TOOLS+= unzip:run zip:run
CONF_FILES= ${PREFIX}/share/examples/opengrok/paths.tsv \
${PREFIX}/share/opengrok/paths.tsv
diff --git a/emulators/uae/Makefile b/emulators/uae/Makefile
index 7dd671937c6..96e3e7fd54d 100644
--- a/emulators/uae/Makefile
+++ b/emulators/uae/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.57 2011/11/01 06:01:10 sbd Exp $
+# $NetBSD: Makefile,v 1.58 2012/01/14 03:13:04 hans Exp $
DISTNAME= uae-0.8.25
PKGREVISION= 10
@@ -9,12 +9,10 @@ MAINTAINER= kristerw@NetBSD.org
HOMEPAGE= http://uae.coresystems.de/
COMMENT= The UAE Amiga Emulator
-DEPENDS+= unzip>=5.40:../../archivers/unzip
-
PKG_DESTDIR_SUPPORT= user-destdir
MAKE_JOBS_SAFE= no
-USE_TOOLS+= gmake pkg-config
+USE_TOOLS+= gmake pkg-config unzip:run
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --enable-dga --enable-vidmode
diff --git a/fonts/cyberbit-ttf/Makefile.common b/fonts/cyberbit-ttf/Makefile.common
index 4557beaea1e..0b7f221fb26 100644
--- a/fonts/cyberbit-ttf/Makefile.common
+++ b/fonts/cyberbit-ttf/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.22 2009/08/25 11:56:36 wiz Exp $
+# $NetBSD: Makefile.common,v 1.23 2012/01/14 03:13:04 hans Exp $
#
DISTNAME= # empty
@@ -16,7 +16,7 @@ NO_SRC_ON_FTP= ${RESTRICTED}
NO_BIN_ON_CDROM=${RESTRICTED}
NO_BIN_ON_FTP= ${RESTRICTED}
-BUILD_DEPENDS+= unzip-[0-9]*:../../archivers/unzip
+USE_TOOLS+= unzip
PKG_DESTDIR_SUPPORT= user-destdir
diff --git a/lang/sablevm/Makefile b/lang/sablevm/Makefile
index 8934b3c81a5..82c2bafc516 100644
--- a/lang/sablevm/Makefile
+++ b/lang/sablevm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2011/04/22 13:43:59 obache Exp $
+# $NetBSD: Makefile,v 1.28 2012/01/14 03:13:04 hans Exp $
#
DISTNAME= sablevm-1.13
@@ -12,13 +12,12 @@ COMMENT= SableVM free Java virtual machine
PKG_DESTDIR_SUPPORT= user-destdir
-DEPENDS+= unzip>=5.50:../../archivers/unzip
DEPENDS+= sablevm-classpath-1.13nb1:../../lang/sablevm-classpath
GNU_CONFIGURE= yes
GNU_CONFIGURE_PREFIX= ${JAVA_HOME}
GNU_CONFIGURE_MANDIR= ${PREFIX}/${PKGMANDIR}
-USE_TOOLS+= gmake gm4
+USE_TOOLS+= gmake gm4 unzip:run
USE_LIBTOOL= yes
JAVA_NAME= sablevm
diff --git a/mail/amavis-perl/Makefile b/mail/amavis-perl/Makefile
index 3206efc4360..df3bbbd22d1 100644
--- a/mail/amavis-perl/Makefile
+++ b/mail/amavis-perl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2010/12/24 07:21:09 kefren Exp $
+# $NetBSD: Makefile,v 1.2 2012/01/14 03:13:04 hans Exp $
DISTNAME= amavisd-${VERSION}
PKGNAME= amavis-perl-${VERSION}
@@ -19,7 +19,6 @@ CONFLICTS+= amavis-perl-[0-9]*
DEPENDS+= uvscan-[0-9]*:../../security/uvscan
DEPENDS+= maildrop-[0-9]*:../../mail/maildrop
DEPENDS+= tnef-[0-9]*:../../mail/tnef
-DEPENDS+= unzip-[0-9]*:../../archivers/unzip
DEPENDS+= unarj-[0-9]*:../../archivers/unarj
DEPENDS+= unrar-[0-9]*:../../archivers/unrar
DEPENDS+= xbin-[0-9]*:../../archivers/xbin
@@ -49,7 +48,7 @@ VIRUSMAILTO?= security # whom to notify about viruses
GNU_CONFIGURE= YES
PLIST_SRC= ${PKGDIR}/PLIST
-USE_TOOLS+= file perl:run
+USE_TOOLS+= file perl:run unzip:run
CONFIGURE_ENV+= file=${TOOLS_FILE_CMD:Q}
CONFIGURE_ENV+= procmail="/usr/libexec/mail.local"