summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--archivers/file-roller/Makefile5
-rw-r--r--audio/audacity/Makefile6
-rw-r--r--audio/bmpx/Makefile6
-rw-r--r--devel/eclipse/Makefile6
-rw-r--r--devel/opengrok/Makefile3
-rw-r--r--devel/xulrunner/mozilla-common.mk6
-rw-r--r--editors/poedit/Makefile6
-rw-r--r--emulators/Cygne-SDL/Makefile4
-rw-r--r--games/warzone2100/Makefile5
-rw-r--r--graphics/zphoto/options.mk4
-rw-r--r--lang/classpath/Makefile6
-rw-r--r--lang/gcc44/options.mk5
-rw-r--r--lang/gcc45/Makefile6
-rw-r--r--lang/gcc46/options.mk5
-rw-r--r--lang/openjdk7/Makefile7
-rw-r--r--lang/sablevm-classpath/Makefile4
-rw-r--r--lang/smalltalk/Makefile6
-rw-r--r--misc/openoffice3/Makefile5
-rw-r--r--multimedia/dvdstyler/Makefile5
-rw-r--r--net/rabbitmq/Makefile5
-rw-r--r--textproc/jdom/Makefile11
-rw-r--r--textproc/lit2epub/Makefile5
-rw-r--r--www/SOGo/Makefile5
-rw-r--r--www/icedtea-web/Makefile6
-rw-r--r--www/nvu/Makefile6
25 files changed, 52 insertions, 86 deletions
diff --git a/archivers/file-roller/Makefile b/archivers/file-roller/Makefile
index 56bb2b48bc6..29c9b97f63f 100644
--- a/archivers/file-roller/Makefile
+++ b/archivers/file-roller/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.110 2011/11/01 06:00:33 sbd Exp $
+# $NetBSD: Makefile,v 1.111 2012/01/14 02:09:35 hans Exp $
#
DISTNAME= file-roller-2.32.2
@@ -14,13 +14,12 @@ LICENSE= gnu-gpl-v2
DEPENDS+= gtar-base>=1.13.25:../../archivers/gtar-base
DEPENDS+= unzip>=5.50nb2:../../archivers/unzip
-DEPENDS+= zip>=2.3nb2:../../archivers/zip
PKG_DESTDIR_SUPPORT= user-destdir
GNU_CONFIGURE= yes
USE_LIBTOOL= yes
-USE_TOOLS+= gmake intltool msgfmt perl pkg-config
+USE_TOOLS+= gmake intltool msgfmt perl pkg-config zip:run
USE_PKGLOCALEDIR= yes
GCONF_SCHEMAS= file-roller.schemas
diff --git a/audio/audacity/Makefile b/audio/audacity/Makefile
index c56d50900c7..69393df0781 100644
--- a/audio/audacity/Makefile
+++ b/audio/audacity/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.69 2011/11/01 06:00:34 sbd Exp $
+# $NetBSD: Makefile,v 1.70 2012/01/14 02:09:35 hans Exp $
DISTNAME= audacity-src-1.2.6
PKGREVISION= 11
@@ -10,14 +10,12 @@ MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://audacity.sourceforge.net/
COMMENT= Audio editor
-DEPENDS+= zip>=0.0:../../archivers/zip
-
PKG_DESTDIR_SUPPORT= user-destdir
MAKE_JOBS_SAFE= no
USE_LIBTOOL= yes
USE_PKGLOCALEDIR= yes
-USE_TOOLS+= autoconf gmake msgfmt pkg-config
+USE_TOOLS+= autoconf gmake msgfmt pkg-config zip:run
USE_LANGUAGES= c c++
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --without-xaudio
diff --git a/audio/bmpx/Makefile b/audio/bmpx/Makefile
index 2dd011aaedb..ad45b58d84e 100644
--- a/audio/bmpx/Makefile
+++ b/audio/bmpx/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2012/01/09 02:54:25 obache Exp $
+# $NetBSD: Makefile,v 1.34 2012/01/14 02:09:35 hans Exp $
DISTNAME= bmpx-0.40.14
PKGREVISION= 12
@@ -10,13 +10,11 @@ MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://bmpx.backtrace.info/site/BMPx_Homepage
COMMENT= Audio player to be used with a frontend or as a daemon
-DEPENDS+= zip-[0-9]*:../../archivers/zip
-
PKG_DESTDIR_SUPPORT= user-destdir
GNU_CONFIGURE= yes
USE_LANGUAGES= c c++
-USE_TOOLS+= gmake intltool msgfmt pkg-config
+USE_TOOLS+= gmake intltool msgfmt pkg-config zip
USE_LIBTOOL= yes
USE_PKGLOCALEDIR= yes
# the following is a fix for nonsense in the configure script
diff --git a/devel/eclipse/Makefile b/devel/eclipse/Makefile
index ea446d97f8a..a525d38e77e 100644
--- a/devel/eclipse/Makefile
+++ b/devel/eclipse/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2011/10/02 22:42:39 dholland Exp $
+# $NetBSD: Makefile,v 1.29 2012/01/14 02:09:35 hans Exp $
#
DISTNAME= ${PKGNAME_NOREV}
@@ -14,7 +14,7 @@ COMMENT= Java IDE
LICENSE= eclipse-license
DEPENDS+= apache-ant>=1.4.1:../../devel/apache-ant
-USE_TOOLS+= unzip
+USE_TOOLS+= unzip zip
PKG_DESTDIR_SUPPORT= user-destdir
@@ -34,8 +34,6 @@ ONLY_FOR_PLATFORM= NetBSD-*-i386 NetBSD-*-x86_64 Linux-*-*
DISTNAME= eclipse-sourceBuild-srcIncluded-${VERSION}
MASTER_SITES= ftp://download.eclipse.org/R-3.0.1-200409161125/
-BUILD_DEPENDS+= zip>=2.3:../../archivers/zip
-
INSTALLATION_DIRS= bin
do-build:
diff --git a/devel/opengrok/Makefile b/devel/opengrok/Makefile
index 289125eabb7..716344b9960 100644
--- a/devel/opengrok/Makefile
+++ b/devel/opengrok/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2011/12/02 07:13:50 sbd Exp $
+# $NetBSD: Makefile,v 1.17 2012/01/14 02:09:35 hans Exp $
#
DISTNAME= opengrok-0.8.1
@@ -24,6 +24,7 @@ NO_BUILD= YES
USE_JAVA= run
USE_JAVA2= yes
+USE_TOOLS+= zip:run
CONF_FILES= ${PREFIX}/share/examples/opengrok/paths.tsv \
${PREFIX}/share/opengrok/paths.tsv
diff --git a/devel/xulrunner/mozilla-common.mk b/devel/xulrunner/mozilla-common.mk
index 719e822afc4..47238aa9391 100644
--- a/devel/xulrunner/mozilla-common.mk
+++ b/devel/xulrunner/mozilla-common.mk
@@ -1,4 +1,4 @@
-# $NetBSD: mozilla-common.mk,v 1.28 2011/11/27 10:01:05 tnn Exp $
+# $NetBSD: mozilla-common.mk,v 1.29 2012/01/14 02:09:35 hans Exp $
#
# common Makefile fragment for mozilla packages based on gecko 2.0.
#
@@ -8,12 +8,10 @@
# used by www/seamonkey/Makefile
GNU_CONFIGURE= yes
-USE_TOOLS+= pkg-config perl gmake autoconf213 unzip
+USE_TOOLS+= pkg-config perl gmake autoconf213 unzip zip
USE_LANGUAGES+= c99 c++
UNLIMIT_RESOURCES+= datasize
-BUILD_DEPENDS+= zip>=2.3:../../archivers/zip
-
PKG_DESTDIR_SUPPORT= user-destdir
CHECK_PORTABILITY_SKIP+=${MOZILLA_DIR}security/nss/tests/libpkix/libpkix.sh
CHECK_PORTABILITY_SKIP+=${MOZILLA_DIR}security/nss/tests/multinit/multinit.sh
diff --git a/editors/poedit/Makefile b/editors/poedit/Makefile
index af83846e8a2..8c4d26669f0 100644
--- a/editors/poedit/Makefile
+++ b/editors/poedit/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.36 2011/11/01 06:01:07 sbd Exp $
+# $NetBSD: Makefile,v 1.37 2012/01/14 02:09:36 hans Exp $
DISTNAME= poedit-1.4.6.1
PKGREVISION= 7
@@ -12,12 +12,10 @@ LICENSE= mit
PKG_DESTDIR_SUPPORT= user-destdir
-DEPENDS+= zip-[0-9]*:../../archivers/zip
-
BDB_ACCEPTED= db4 db5
USE_LANGUAGES= c c++
USE_PKGLOCALEDIR= yes
-USE_TOOLS+= gmake pkg-config
+USE_TOOLS+= gmake pkg-config zip:run
GNU_CONFIGURE= yes
CONFIGURE_ENV+= BDB_TYPE="${BDB_TYPE}"
CONFIGURE_ENV+= WX_CONFIG_NAME=${BUILDLINK_PREFIX.wxGTK28}/bin/wx-config
diff --git a/emulators/Cygne-SDL/Makefile b/emulators/Cygne-SDL/Makefile
index a281dd49616..afba5fec2f3 100644
--- a/emulators/Cygne-SDL/Makefile
+++ b/emulators/Cygne-SDL/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2008/03/03 19:21:37 jlam Exp $
+# $NetBSD: Makefile,v 1.15 2012/01/14 02:09:36 hans Exp $
#
DISTNAME= Cygne-SDL-0.1-src
@@ -12,7 +12,6 @@ HOMEPAGE= http://icculus.org/Cygne-SDL/
COMMENT= Bandai Wonderswan Color handheld emulator
BUILD_DEPENDS+= nasm>=0.98:../../devel/nasm
-BUILD_DEPENDS+= zip>=2.0:../../archivers/zip
PKG_DESTDIR_SUPPORT= user-destdir
@@ -21,6 +20,7 @@ MAKE_FILE= Makefiles/Makefile.unix
NO_CONFIGURE= yes
BUILD_DIRS= src
USE_LANGUAGES= c c++
+USE_TOOLS+= zip
# Uses i386 assembly code
ONLY_FOR_PLATFORM= *-*-i386
diff --git a/games/warzone2100/Makefile b/games/warzone2100/Makefile
index 768f54fc7ed..070c19b8dee 100644
--- a/games/warzone2100/Makefile
+++ b/games/warzone2100/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2011/11/01 06:01:22 sbd Exp $
+# $NetBSD: Makefile,v 1.14 2012/01/14 02:09:36 hans Exp $
#
DISTNAME= warzone2100-2.2.2
@@ -10,7 +10,6 @@ MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://wz2100.net/
COMMENT= Real-time strategy and real-time tactics hybrid computer game
-BUILD_DEPENDS+= zip-[0-9]*:../../archivers/zip
BUILD_DEPENDS+= unzip-[0-9]*:../../archivers/unzip
DEPENDS+= dejavu-ttf-[0-9]*:../../fonts/dejavu-ttf
@@ -18,7 +17,7 @@ PKG_DESTDIR_SUPPORT= user-destdir
GNU_CONFIGURE= yes
USE_LANGUAGES= c c++
-USE_TOOLS+= pkg-config bison msgfmt intltool gmake gawk flex
+USE_TOOLS+= pkg-config bison msgfmt intltool gmake gawk flex zip
CONFIGURE_ARGS+= --with-distributor=pkgsrc
diff --git a/graphics/zphoto/options.mk b/graphics/zphoto/options.mk
index 3b6c172eb08..4c8f538dd53 100644
--- a/graphics/zphoto/options.mk
+++ b/graphics/zphoto/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.4 2008/09/22 20:21:03 joerg Exp $
+# $NetBSD: options.mk,v 1.5 2012/01/14 02:09:36 hans Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.zphoto
PKG_SUPPORTED_OPTIONS= zip wx
@@ -25,7 +25,7 @@ CONFIGURE_ARGS+= --disable-imlib2
.endif
.if !empty(PKG_OPTIONS:Mzip)
-DEPENDS+= zip-[0-9]*:../../archivers/zip
+USE_TOOLS+= zip:run
.else
CONFIGURE_ARGS+= --disable-zip
.endif
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
diff --git a/misc/openoffice3/Makefile b/misc/openoffice3/Makefile
index b82407f9ba5..296b131ddc8 100644
--- a/misc/openoffice3/Makefile
+++ b/misc/openoffice3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.58 2012/01/13 10:55:22 obache Exp $
+# $NetBSD: Makefile,v 1.59 2012/01/14 02:09:37 hans Exp $
OO_VER= 3.1.1
OO_TAG= OOO310_m19
@@ -22,7 +22,6 @@ LICENSE= gnu-lgpl-v3
PKG_DESTDIR_SUPPORT= user-destdir
-BUILD_DEPENDS+= zip-[0-9]*:../../archivers/zip
BUILD_DEPENDS+= p5-Archive-Zip-[0-9]*:../../archivers/p5-Archive-Zip
DEPENDS+= libpaper-[0-9]*:../../print/libpaper
@@ -43,7 +42,7 @@ CONFLICTS+= openoffice2-bin-[0-9]*
CONFLICTS+= openoffice3-bin-[0-9]*
CONFLICTS+= openoffice-linux-[0-9]*
-USE_TOOLS+= bash bison gmake imake perl pkg-config tar unzip
+USE_TOOLS+= bash bison gmake imake perl pkg-config tar unzip zip
PTHREAD_OPTS+= require
PTHREAD_AUTO_VARS= yes
diff --git a/multimedia/dvdstyler/Makefile b/multimedia/dvdstyler/Makefile
index 579d3d53d51..59f7ba85d1c 100644
--- a/multimedia/dvdstyler/Makefile
+++ b/multimedia/dvdstyler/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2011/12/22 07:56:18 marino Exp $
+# $NetBSD: Makefile,v 1.36 2012/01/14 02:09:37 hans Exp $
#
DISTNAME= DVDStyler-1.8.2.1
@@ -19,11 +19,10 @@ DEPENDS+= dvdauthor>=0.6.10:../../multimedia/dvdauthor
DEPENDS+= dvd+rw-tools-[0-9]*:../../sysutils/dvd+rw-tools
DEPENDS+= mpgtx-[0-9]*:../../graphics/mpgtx
BUILD_DEPENDS+= xmlto-[0-9]*:../../textproc/xmlto
-BUILD_DEPENDS+= zip-[0-9]*:../../archivers/zip
USE_LANGUAGES= c c++
USE_PKGLOCALEDIR= yes
-USE_TOOLS+= gmake pkg-config msgfmt
+USE_TOOLS+= gmake pkg-config msgfmt zip
GNU_CONFIGURE= yes
LDFLAGS+= -ljpeg
diff --git a/net/rabbitmq/Makefile b/net/rabbitmq/Makefile
index e529f6e311b..12cda91aa4b 100644
--- a/net/rabbitmq/Makefile
+++ b/net/rabbitmq/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2011/12/14 13:07:38 fhajny Exp $
+# $NetBSD: Makefile,v 1.5 2012/01/14 02:09:37 hans Exp $
#
PKGNAME= rabbitmq-${RMQ_VERSION}
@@ -13,10 +13,9 @@ LICENSE= mpl-1.1
PKG_DESTDIR_SUPPORT= user-destdir
-USE_TOOLS+= bash:run coreutils gmake unzip
+USE_TOOLS+= bash:run coreutils gmake unzip zip
BUILD_DEPENDS+= libxslt-[0-9]*:../../textproc/libxslt
-BUILD_DEPENDS+= zip-[0-9]*:../../archivers/zip
BUILD_DEPENDS+= xmlto-[0-9]*:../../textproc/xmlto
DEPENDS+= coreutils-[0-9]*:../../sysutils/coreutils
DEPENDS+= ${PYPKGPREFIX}-simplejson>=2:../../converters/py-simplejson
diff --git a/textproc/jdom/Makefile b/textproc/jdom/Makefile
index 914960bbc80..e59f1e6bcc9 100644
--- a/textproc/jdom/Makefile
+++ b/textproc/jdom/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2010/07/15 12:12:10 obache Exp $
+# $NetBSD: Makefile,v 1.7 2012/01/14 02:09:37 hans Exp $
#
DISTNAME= jdom-1.1.1
@@ -12,18 +12,13 @@ COMMENT= Simple API for processing XML documents in Java
PKG_DESTDIR_SUPPORT= user-destdir
-BUILD_DEPENDS+= zip-[0-9]*:../../archivers/zip
-
USE_LANGUAGES= # only Java
-USE_TOOLS+= pax
+USE_TOOLS+= pax zip
AUTO_MKDIRS= yes
WRKSRC= ${WRKDIR}/jdom
-FIND_PREFIX:= ZIP_DIR=zip
-.include "../../mk/find-prefix.mk"
-
do-build:
- cd ${WRKSRC}/src/java && ${ZIP_DIR}/bin/zip -r ${WRKSRC}/jdom-src.zip org
+ cd ${WRKSRC}/src/java && ${TOOLS_PATH.zip} -r ${WRKSRC}/jdom-src.zip org
do-install:
cd ${WRKSRC} && ${INSTALL_DATA} build/jdom.jar jdom-src.zip ${DESTDIR}${PREFIX}/lib/java/
diff --git a/textproc/lit2epub/Makefile b/textproc/lit2epub/Makefile
index 13bd41b0bd0..c58179a628c 100644
--- a/textproc/lit2epub/Makefile
+++ b/textproc/lit2epub/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2010/06/06 23:41:12 markd Exp $
+# $NetBSD: Makefile,v 1.2 2012/01/14 02:09:37 hans Exp $
#
DISTNAME= ebook-tools-0.1.1
@@ -11,14 +11,13 @@ HOMEPAGE= http://ebook-tools.sourceforge.net/
COMMENT= Convert .lit files to valid epub
LICENSE= mit
-DEPENDS+= zip-[0-9]*:../../archivers/zip
DEPENDS+= convertlit-[0-9]*:../../textproc/convertlit
CONFLICTS+= ebook-tools<=0.1.1
PKG_DESTDIR_SUPPORT= user-destdir
-USE_TOOLS+= bash:run
+USE_TOOLS+= bash:run zip:run
REPLACE_BASH= src/tools/lit2epub
NO_BUILD= yes
diff --git a/www/SOGo/Makefile b/www/SOGo/Makefile
index b9553fa0e7f..03adf057fb3 100644
--- a/www/SOGo/Makefile
+++ b/www/SOGo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2011/12/15 05:37:31 dholland Exp $
+# $NetBSD: Makefile,v 1.4 2012/01/14 02:09:37 hans Exp $
#
DISTNAME= SOGo-2.0.0b3
@@ -15,7 +15,7 @@ PKG_DESTDIR_SUPPORT= user-destdir
WRKSRC= ${WRKDIR}/SOGo
HAS_CONFIGURE= yes
USE_LANGUAGES= c
-USE_TOOLS+= gmake
+USE_TOOLS+= gmake zip:run
CONFIGURE_ARGS= --enable-debug --disable-strip
@@ -62,7 +62,6 @@ pre-install:
.include "../../devel/SOPE/buildlink3.mk"
.include "../../devel/libmemcached/buildlink3.mk"
.include "../../textproc/libxml2/buildlink3.mk"
-DEPENDS+= zip-[0-9]*:../../archivers/zip
.include "../../mk/bsd.pkg.mk"
diff --git a/www/icedtea-web/Makefile b/www/icedtea-web/Makefile
index 24c2dd57577..ac06d2673af 100644
--- a/www/icedtea-web/Makefile
+++ b/www/icedtea-web/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2012/01/13 10:55:36 obache Exp $
+# $NetBSD: Makefile,v 1.6 2012/01/14 02:09:38 hans Exp $
#
DISTNAME= 61e08e67b176
@@ -15,11 +15,9 @@ COMMENT= Java browser plugin and Web Start launcher
PKG_DESTDIR_SUPPORT= user-destdir
-BUILD_DEPENDS+= zip-[0-9]*:../../archivers/zip
-
GNU_CONFIGURE= yes
USE_LANGUAGES+= c c++
-USE_TOOLS+= autoconf automake gmake pkg-config
+USE_TOOLS+= autoconf automake gmake pkg-config zip
WRKSRC= ${WRKDIR}/icedtea-web-${DISTNAME}
CONFIGURE_ARGS+= --with-jdk-home=${PREFIX}/java/openjdk7
diff --git a/www/nvu/Makefile b/www/nvu/Makefile
index e71830fa9b0..6f0d7e7a2eb 100644
--- a/www/nvu/Makefile
+++ b/www/nvu/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2011/04/22 13:44:59 obache Exp $
+# $NetBSD: Makefile,v 1.8 2012/01/14 02:09:38 hans Exp $
#
DISTNAME= nvu-1.0-sources
@@ -12,14 +12,12 @@ MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://www.nvu.com/
COMMENT= Web Authoring System
-BUILD_DEPENDS+= zip-[0-9]*:../../archivers/zip
-
PKG_DESTDIR_SUPPORT= user-destdir
WRKSRC= ${WRKDIR}/mozilla
GNU_CONFIGURE= yes
CONFIGURE_ENV+= ORBIT_CONFIG=orbit2-config
-USE_TOOLS+= gmake perl pkg-config unzip
+USE_TOOLS+= gmake perl pkg-config unzip zip
USE_LANGUAGES= c c++
PKGCONFIG_OVERRIDE+= build/unix/mozilla-gtkmozembed.pc.in
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-16 07:23:59 +0000