- Use a distfile in tarball instead of one in rpm.

- Remove CONFLICTS.  All of the localized versions can coexist now.
- Update the localized versions to 7.0.5 if possible.
- Add support for print/acroreadwrapper.

Discussed with:	netchild and mezz
PR:		ports/90319

6 files changed, 14 insertions, 46 deletions

diff --git a/chinese/acroread-zh_CN/Makefile b/chinese/acroread-zh_CN/Makefile
index ba03b64..ea366eb 100644
--- a/chinese/acroread-zh_CN/Makefile
+++ b/chinese/acroread-zh_CN/Makefile
@@ -5,13 +5,14 @@
 # $FreeBSD$
 #
 
+PORTVERSION=	7.0.1
+PORTREVISION=	1
 CATEGORIES=	chinese print linux
 PKGNAMEPREFIX=	zh_CN-
 
 MASTERDIR=	${.CURDIR}/../../print/acroread7
-
-ADOBE_LANG=	chs
-CMD_SUFFIX=	-zh_CN
 MD5_FILE=	${.CURDIR}/distinfo
 
+ADOBE_LANG=	CHS
+
 .include "${MASTERDIR}/Makefile"
diff --git a/chinese/acroread-zh_CN/distinfo b/chinese/acroread-zh_CN/distinfo
index 51bc8a7..6ce6266 100644
--- a/chinese/acroread-zh_CN/distinfo
+++ b/chinese/acroread-zh_CN/distinfo
@@ -1,3 +1,3 @@
-MD5 (acroread/AdobeReader_chs-7.0.1-1.i386.rpm) = fb4d25a28e1be483cdb4a7a3c539bf5b
-SHA256 (acroread/AdobeReader_chs-7.0.1-1.i386.rpm) = 0a2128ace727dc7deeff32a1a05ebb5de439ed1257966ee83bde93c5ffa52b01
-SIZE (acroread/AdobeReader_chs-7.0.1-1.i386.rpm) = 55397021
+MD5 (acroread/AdbeRdr701_linux_chs.tar.gz) = ce1462de491daf71087b9fd48edf8632
+SHA256 (acroread/AdbeRdr701_linux_chs.tar.gz) = 6b006c6b2e22a7b278ccd6eabb4327d07f6314be8ce16f59548b74ef0acb3a67
+SIZE (acroread/AdbeRdr701_linux_chs.tar.gz) = 55620225
diff --git a/chinese/acroread-zh_CN/pkg-descr b/chinese/acroread-zh_CN/pkg-descr
deleted file mode 100644
index 5a7500b..0000000
--- a/chinese/acroread-zh_CN/pkg-descr
+++ /dev/null
@@ -1,17 +0,0 @@
-This program displays and prints Portable Document Format (PDF)
-files.  It also allows you to search for text in a PDF file, or in
-all the PDF files in a directory.
-
-This is the Simplified Chinese version.  It also has support for
-the English language.  To configure the language, navigate to
-Edit->Preferences->International->Application Language, set it to
-"Choose at application startup" and restart the program.
-
-After installation, use the "acroread7-zh_CN" command to run it.
-
-If fonts in the menus are displayed incorrectly (each character
-looks like three sides of a square), try setting the environment
-variable GDK_USE_XFT=0 before running the program, for example like:
-"GDK_USE_XFT=0 acroread7-zh_CN".
-
-WWW:  http://www.adobe.com/products/acrobat/readermain.html
diff --git a/chinese/acroread-zh_TW/Makefile b/chinese/acroread-zh_TW/Makefile
index 3f1dc53..3aa1983 100644
--- a/chinese/acroread-zh_TW/Makefile
+++ b/chinese/acroread-zh_TW/Makefile
@@ -5,13 +5,14 @@
 # $FreeBSD$
 #
 
+PORTVERSION=	7.0.1
+PORTREVISION=	1
 CATEGORIES=	chinese print linux
 PKGNAMEPREFIX=	zh_TW-
 
 MASTERDIR=	${.CURDIR}/../../print/acroread7
-
-ADOBE_LANG=	cht
-CMD_SUFFIX=	-zh_TW
 MD5_FILE=	${.CURDIR}/distinfo
 
+ADOBE_LANG=	CHT
+
 .include "${MASTERDIR}/Makefile"
diff --git a/chinese/acroread-zh_TW/distinfo b/chinese/acroread-zh_TW/distinfo
index 109eee1..5216116 100644
--- a/chinese/acroread-zh_TW/distinfo
+++ b/chinese/acroread-zh_TW/distinfo
@@ -1,3 +1,3 @@
-MD5 (acroread/AdobeReader_cht-7.0.1-1.i386.rpm) = 388235a714bde96a9b1ac4f84cf6a4e7
-SHA256 (acroread/AdobeReader_cht-7.0.1-1.i386.rpm) = b990439126abb9d829596e48471505b38a274756e536d476d683d53ad8301f46
-SIZE (acroread/AdobeReader_cht-7.0.1-1.i386.rpm) = 51054588
+MD5 (acroread/AdbeRdr701_linux_cht.tar.gz) = b66407d7e13b116f11f22ddfb94c5fde
+SHA256 (acroread/AdbeRdr701_linux_cht.tar.gz) = 159c965bee3e86b773bf696834a1a486952e8b2001ac3d6cf30dab34ff8b4494
+SIZE (acroread/AdbeRdr701_linux_cht.tar.gz) = 51276246
diff --git a/chinese/acroread-zh_TW/pkg-descr b/chinese/acroread-zh_TW/pkg-descr
deleted file mode 100644
index f1ae809..0000000
--- a/chinese/acroread-zh_TW/pkg-descr
+++ /dev/null
@@ -1,17 +0,0 @@
-This program displays and prints Portable Document Format (PDF)
-files.  It also allows you to search for text in a PDF file, or in
-all the PDF files in a directory.
-
-This is the Traditional Chinese version.  It also has support for
-the English language.  To configure the language, navigate to
-Edit->Preferences->International->Application Language, set it to
-"Choose at application startup" and restart the program.
-
-After installation, use the "acroread7-zh_TW" command to run it.
-
-If fonts in the menus are displayed incorrectly (each character
-looks like three sides of a square), try setting the environment
-variable GDK_USE_XFT=0 before running the program, for example like:
-"GDK_USE_XFT=0 acroread7-zh_TW".
-
-WWW:  http://www.adobe.com/products/acrobat/readermain.html