From owner-svn-doc-projects@FreeBSD.ORG  Tue Feb  5 10:11:29 2013
Return-Path: <owner-svn-doc-projects@FreeBSD.ORG>
Delivered-To: svn-doc-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id D6431AFF;
 Tue,  5 Feb 2013 10:11:29 +0000 (UTC)
 (envelope-from gabor@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id C8FF7A9C;
 Tue,  5 Feb 2013 10:11:29 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r15ABTeB028815;
 Tue, 5 Feb 2013 10:11:29 GMT (envelope-from gabor@svn.freebsd.org)
Received: (from gabor@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r15ABTVP028813;
 Tue, 5 Feb 2013 10:11:29 GMT (envelope-from gabor@svn.freebsd.org)
Message-Id: <201302051011.r15ABTVP028813@svn.freebsd.org>
From: Gabor Kovesdan <gabor@FreeBSD.org>
Date: Tue, 5 Feb 2013 10:11:29 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-projects@freebsd.org
Subject: svn commit: r40893 - projects/xml-tools/share/mk
X-SVN-Group: doc-projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-projects@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for doc projects trees
 <svn-doc-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-projects>, 
 <mailto:svn-doc-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-projects>
List-Post: <mailto:svn-doc-projects@freebsd.org>
List-Help: <mailto:svn-doc-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-projects>, 
 <mailto:svn-doc-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 05 Feb 2013 10:11:29 -0000

Author: gabor
Date: Tue Feb  5 10:11:29 2013
New Revision: 40893
URL: http://svnweb.freebsd.org/changeset/doc/40893

Log:
  - Revert r40891 since the created archive has compatibility problems

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 10:02:36 2013	(r40892)
+++ projects/xml-tools/share/mk/doc.commands.mk	Tue Feb  5 10:11:29 2013	(r40893)
@@ -46,8 +46,8 @@ BZIPOPTS?=	-qf9
 GZIP?=		gzip
 GZIPOPTS?=	-qf9
 TAR?=		/usr/bin/tar
-ZIP?=		${TAR}
-ZIPOPTS?=	-c --format=zip --options zip:compression=deflate -f
+ZIP?=		${PREFIX}/bin/zip
+ZIPOPTS?=	-9X
 
 #
 # Rendering and format conversion

Modified: projects/xml-tools/share/mk/doc.docbook.mk
==============================================================================
--- projects/xml-tools/share/mk/doc.docbook.mk	Tue Feb  5 10:02:36 2013	(r40892)
+++ projects/xml-tools/share/mk/doc.docbook.mk	Tue Feb  5 10:11:29 2013	(r40893)
@@ -364,7 +364,8 @@ ${DOC}.epub: ${DOC}.parsed.xml ${LOCAL_I
 .if defined(LOCAL_IMAGES_LIB) || defined(LOCAL_IMAGES_PNG)
 	${CP} ${LOCAL_IMAGES_LIB} ${LOCAL_IMAGES_PNG} OEBPS/
 .endif
-	${ZIP} ${ZIPOPTS} ${DOC}.epub mimetype OEBPS META-INF
+	${ZIP} ${ZIPOPTS} ${DOC}.epub mimetype
+	${ZIP} ${ZIPOPTS} -Dr ${DOC}.epub OEBPS META-INF
 
 # TXT --------------------------------------------------------------------