summaryrefslogtreecommitdiff
path: root/textproc
diff options
context:
space:
mode:
Diffstat (limited to 'textproc')
-rw-r--r--textproc/jdom/Makefile11
-rw-r--r--textproc/lit2epub/Makefile5
2 files changed, 5 insertions, 11 deletions
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