From b4c23f696c8d44c39508a50af6ef99e98a52b02d Mon Sep 17 00:00:00 2001
From: joerg <joerg>
Date: Wed, 25 Nov 2009 22:45:07 +0000
Subject: Do not conflict implicitly with acroread7 itself.

---
 fonts/acroread7-font-share/Makefile        | 4 ++--
 fonts/acroread7-font-share/Makefile.common | 6 ++++--
 fonts/acroread7-font-share/PLIST           | 4 +---
 3 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'fonts')

diff --git a/fonts/acroread7-font-share/Makefile b/fonts/acroread7-font-share/Makefile
index e6ce0f307e8..431d56e2aaf 100644
--- a/fonts/acroread7-font-share/Makefile
+++ b/fonts/acroread7-font-share/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2008/08/26 12:57:38 joerg Exp $
+# $NetBSD: Makefile,v 1.5 2009/11/25 22:45:07 joerg Exp $
 #
 
 DISTNAME=	font-share
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	fonts
 DISTFILES=	korfont${EXTRACT_SUFX}
 
diff --git a/fonts/acroread7-font-share/Makefile.common b/fonts/acroread7-font-share/Makefile.common
index d83b30207fb..a48e6f72a83 100644
--- a/fonts/acroread7-font-share/Makefile.common
+++ b/fonts/acroread7-font-share/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.4 2009/05/19 08:59:14 wiz Exp $
+# $NetBSD: Makefile.common,v 1.5 2009/11/25 22:45:07 joerg Exp $
 #
 
 PKGNAME=	acroread7-${DISTNAME}-7.0
@@ -27,6 +27,8 @@ USE_TOOLS+=	tar
 INSTALLATION_DIRS=	Acrobat7/Resource
 
 do-install:
-	@${TAR} xf ${TAR_FILE} -C ${DESTDIR}${PREFIX}/Acrobat7/Resource
+	echo CMap/Identity-H > ${WRKSRC}/exclude.txt
+	echo CMap/Identity-V >> ${WRKSRC}/exclude.txt
+	${TAR} -xf ${TAR_FILE} -X ${WRKSRC}/exclude.txt -C ${DESTDIR}${PREFIX}/Acrobat7/Resource
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/fonts/acroread7-font-share/PLIST b/fonts/acroread7-font-share/PLIST
index 98f9cc9ee15..04873680ba7 100644
--- a/fonts/acroread7-font-share/PLIST
+++ b/fonts/acroread7-font-share/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2009/06/14 19:01:13 joerg Exp $
+@comment $NetBSD: PLIST,v 1.5 2009/11/25 22:45:07 joerg Exp $
 Acrobat7/Resource/CMap/83pv-RKSJ-H
 Acrobat7/Resource/CMap/90ms-RKSJ-H
 Acrobat7/Resource/CMap/90ms-RKSJ-UCS2
@@ -110,8 +110,6 @@ Acrobat7/Resource/CMap/HKm471-B5-H
 Acrobat7/Resource/CMap/HKm471-B5-V
 Acrobat7/Resource/CMap/HKscs-B5-H
 Acrobat7/Resource/CMap/HKscs-B5-V
-Acrobat7/Resource/CMap/Identity-H
-Acrobat7/Resource/CMap/Identity-V
 Acrobat7/Resource/CMap/UniCNS-UTF16-H
 Acrobat7/Resource/CMap/UniCNS-UTF16-V
 Acrobat7/Resource/CMap/UniGB-UTF16-H
-- 
cgit v1.2.3