svn commit: r40891 - projects/xml-tools/share/mk

[Gabor Kovesdan]

Author: gabor
Date: Tue Feb  5 09:39:04 2013
New Revision: 40891
URL: http://svnweb.freebsd.org/changeset/doc/40891

Log:
  - Use bsdtar to create zip archives
  
  Submitted by:	hrs

Modified:
  projects/xml-tools/share/mk/doc.commands.mk
  projects/xml-tools/share/mk/doc.docbook.mk

Modified: projects/xml-tools/share/mk/doc.commands.mk
==============================================================================
--- projects/xml-tools/share/mk/doc.commands.mk	Tue Feb  5 09:29:28 2013	(r40890)
+++ projects/xml-tools/share/mk/doc.commands.mk	Tue Feb  5 09:39:04 2013	(r40891)
@@ -46,8 +46,8 @@ BZIPOPTS?=	-qf9
 GZIP?=		gzip
 GZIPOPTS?=	-qf9
 TAR?=		/usr/bin/tar
-ZIP?=		${PREFIX}/bin/zip
-ZIPOPTS?=	-j9
+ZIP?=		${TAR}
+ZIPOPTS?=	-c --format=zip --options zip:compression=deflate -f
 
 #
 # Rendering and format conversion

Modified: projects/xml-tools/share/mk/doc.docbook.mk
==============================================================================
--- projects/xml-tools/share/mk/doc.docbook.mk	Tue Feb  5 09:29:28 2013	(r40890)
+++ projects/xml-tools/share/mk/doc.docbook.mk	Tue Feb  5 09:39:04 2013	(r40891)
@@ -361,9 +361,7 @@ ${DOC}.epub: ${DOC}.parsed.xml ${LOCAL_I
 	${XSLTPROC} ${XSLTPROCOPTS} ${XSLEPUB} ${DOC}.parsed.xml
 	${ECHO} "application/epub+zip" > mimetype
 	${CP} ${CSS_SHEET} OEBPS/
-	zip -0Xq  ${DOC}.epub mimetype
-	zip -Xr9D ${DOC}.epub OEBPS META-INF
-	
+	${ZIP} ${ZIPOPTS} ${DOC}.epub mimetype OEBPS META-INF
 
 # TXT --------------------------------------------------------------------