Convert print/acroread* packages to pkg_alternatives framework.

  Now they can coexist on the system.
  pkgrevisions were bumped.

14 files changed, 21 insertions, 53 deletions

diff --git a/print/acroread/ALTERNATIVES b/print/acroread/ALTERNATIVES
new file mode 100644
index 00000000000..3b6497d8d8d
--- /dev/null
+++ b/print/acroread/ALTERNATIVES
@@ -0,0 +1 @@
+bin/acroread @PREFIX@/bin/acroread4
diff --git a/print/acroread/Makefile b/print/acroread/Makefile
index 76bd536f576..6bde2762b6c 100644
--- a/print/acroread/Makefile
+++ b/print/acroread/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.56 2011/03/17 13:37:48 obache Exp $
+# $NetBSD: Makefile,v 1.57 2011/09/06 21:08:09 cheusov Exp $
 
 DISTNAME=	acroread	# overridden below
 PKGNAME=	acroread-4.05
-PKGREVISION=	5
+PKGREVISION=	6
 CATEGORIES=	print
 MASTER_SITES=	ftp://ftp-pac.adobe.com/pub/adobe/acrobatreader/unix/4.x/ \
 		http://download.adobe.com/pub/adobe/acrobatreader/unix/4.x/
@@ -59,17 +59,15 @@ NS_PLUGINS_DIR=	${PREFIX}/lib/netscape/plugins
 
 BIN_PATCH=	${PATCH} --quiet ${_PATCH_BACKUP_ARG} .orig
 
-INSTALLATION_DIRS=	bin
+INSTALLATION_DIRS=	bin ${PREFIX}/Acrobat4 ${NS_PLUGINS_DIR}
 
 do-install:
-	@${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/Acrobat4
 	@( ${ECHO} accept ) | PAGER=${CAT} ReadInstallDir=${DESTDIR}${PREFIX}/Acrobat4 ${WRKSRC}/INSTALL
 	@cd ${DESTDIR}${PREFIX}/Acrobat4/bin && \
 	  ${BIN_PATCH} <${FILESDIR}/acroread.diff && \
 	  ${INSTALL_SCRIPT} ${DESTDIR}${PREFIX}/Acrobat4/bin/acroread \
 	     ${DESTDIR}${PREFIX}/bin/acroread4 && ${RM} -f acroread.orig
 	${CHMOD} +x ${DESTDIR}${PREFIX}/bin/acroread4
-	${INSTALL_DATA_DIR} ${DESTDIR}${NS_PLUGINS_DIR}
 	${INSTALL_DATA} ${DESTDIR}${PREFIX}/Acrobat4/Browsers/${PLATFORM}/nppdf.so \
 		${DESTDIR}${NS_PLUGINS_DIR}
 	@${ECHO_MSG} "Be sure to read the license agreement in"
diff --git a/print/acroread5/ALTERNATIVES b/print/acroread5/ALTERNATIVES
new file mode 100644
index 00000000000..566c983ef12
--- /dev/null
+++ b/print/acroread5/ALTERNATIVES
@@ -0,0 +1 @@
+bin/acroread @PREFIX@/bin/acroread5
diff --git a/print/acroread5/Makefile b/print/acroread5/Makefile
index d2c033216f1..c209a3532ff 100644
--- a/print/acroread5/Makefile
+++ b/print/acroread5/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.41 2011/03/17 13:39:29 obache Exp $
+# $NetBSD: Makefile,v 1.42 2011/09/06 21:08:09 cheusov Exp $
 
 DISTNAME=	acroread5	# overridden below
 PKGNAME=	acroread5-5.10
-PKGREVISION=	4
+PKGREVISION=	5
 CATEGORIES=	print
 MASTER_SITES=	http://ardownload.adobe.com/pub/adobe/acrobatreader/unix/5.x/
 
@@ -17,11 +17,6 @@ NO_BIN_ON_CDROM=	${RESTRICTED}
 NO_BIN_ON_FTP=		${RESTRICTED}
 NO_SRC_ON_FTP=		${RESTRICTED}
 
-CONFLICTS+=	acroread-5.*
-# conflict with acroread7 due to bin/acroread
-CONFLICTS+=	acroread-7.*
-CONFLICTS+=	acroread7-7.*
-
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 WRKSRC=			${WRKDIR}/installers
@@ -47,10 +42,9 @@ PLIST_SUBST+=	PLATFORM=${PLATFORM:Q}
 
 BIN_PATCH=	${PATCH} --quiet ${_PATCH_BACKUP_ARG} .orig
 
-INSTALLATION_DIRS=	bin
+INSTALLATION_DIRS=	bin ${PREFIX}/Acrobat5
 
 do-install:
-	@${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/Acrobat5
 	@( ${ECHO} accept ) | PAGER=${CAT} ReadInstallDir=${DESTDIR}${PREFIX}/Acrobat5 ${WRKSRC}/INSTALL
 	@cd ${DESTDIR}${PREFIX}/Acrobat5/bin && \
 	  ${BIN_PATCH} <${FILESDIR}/acroread.diff && \
@@ -59,7 +53,6 @@ do-install:
 	${CHMOD} +x ${DESTDIR}${PREFIX}/bin/acroread5
 	@${ECHO_MSG} "Be sure to read the license agreement in"
 	@${ECHO_MSG} "${PREFIX}/Acrobat5/Reader/license.txt"
-	${LN} -sf ${PREFIX}/bin/acroread5 ${DESTDIR}${PREFIX}/bin/acroread
 
 SUBST_CLASSES+=		rmdestdir
 SUBST_STAGE.rmdestdir=	post-install
diff --git a/print/acroread5/PLIST.common b/print/acroread5/PLIST.common
index a5f8afa4fc9..16378c76eca 100644
--- a/print/acroread5/PLIST.common
+++ b/print/acroread5/PLIST.common
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.common,v 1.2 2006/03/13 19:54:37 joerg Exp $
+@comment $NetBSD: PLIST.common,v 1.3 2011/09/06 21:08:09 cheusov Exp $
 Acrobat5/Browsers/netscape
 Acrobat5/Browsers/${PLATFORM}/nppdf.so
 Acrobat5/Reader/AcroVersion
@@ -53,4 +53,3 @@ Acrobat5/Resource/Font/ZapfDingbats
 Acrobat5/Resource/LICFONT.TXT
 Acrobat5/bin/acroread
 bin/acroread5
-bin/acroread
diff --git a/print/acroread7/ALTERNATIVES b/print/acroread7/ALTERNATIVES
new file mode 100644
index 00000000000..91efb7bf69e
--- /dev/null
+++ b/print/acroread7/ALTERNATIVES
@@ -0,0 +1 @@
+bin/acroread @PREFIX@/bin/acroread7
diff --git a/print/acroread7/Makefile b/print/acroread7/Makefile
index 8046448ea5c..cb160b8bfe0 100644
--- a/print/acroread7/Makefile
+++ b/print/acroread7/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.23 2009/05/19 08:59:30 wiz Exp $
+# $NetBSD: Makefile,v 1.24 2011/09/06 21:08:09 cheusov Exp $
 
 DISTNAME=	acroread7	# overridden below
 PKGNAME=	acroread7-7.0.9
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	print
 MASTER_SITES=	http://ardownload.adobe.com/pub/adobe/reader/unix/7x/7.0.9/enu/
 
@@ -19,11 +19,6 @@ NO_SRC_ON_FTP=		${RESTRICTED}
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
-CONFLICTS+=	acroread-5.*
-# conflict with acroread5 due to bin/acroread
-# maybe should do ALTERNATIVES?
-CONFLICTS+=	acroread5-5.*
-
 WRKSRC=			${WRKDIR}/AdobeReader
 BUILD_DIRS=		# empty
 
@@ -66,7 +61,6 @@ post-install:
 	${CHMOD} +x ${DESTDIR}${PREFIX}/bin/acroread7
 	@${ECHO_MSG} "Be sure to read the license agreement in"
 	@${ECHO_MSG} "${DESTDIR}${PREFIX}/Acrobat7/Reader/Legal/ENU/License.html"
-	${LN} -sf ${PREFIX}/bin/acroread7 ${DESTDIR}${PREFIX}/bin/acroread
 	${RM} ${DESTDIR}${PREFIX}/Acrobat7/Reader/${PLATFORM}/plug_ins/PPKLite.api
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/print/acroread7/PLIST b/print/acroread7/PLIST
index fc217693c58..fa372283079 100644
--- a/print/acroread7/PLIST
+++ b/print/acroread7/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2009/06/14 18:11:53 joerg Exp $
+@comment $NetBSD: PLIST,v 1.6 2011/09/06 21:08:09 cheusov Exp $
 Acrobat7/Browser/HowTo/ENU/Browser_Plugin_HowTo.txt
 Acrobat7/Browser/install_browser_plugin
 Acrobat7/Browser/${PLATFORM}/nppdf.so
@@ -285,5 +285,4 @@ Acrobat7/Resource/Support/vnd.adobe.xdp+xml.desktop
 Acrobat7/Resource/Support/vnd.adobe.xfdf.desktop
 Acrobat7/Resource/Support/vnd.fdf.desktop
 Acrobat7/bin/acroread
-bin/acroread
 bin/acroread7
diff --git a/print/acroread8/ALTERNATIVES b/print/acroread8/ALTERNATIVES
new file mode 100644
index 00000000000..ea533a11bc8
--- /dev/null
+++ b/print/acroread8/ALTERNATIVES
@@ -0,0 +1 @@
+bin/acroread @PREFIX@/bin/acroread8
diff --git a/print/acroread8/Makefile b/print/acroread8/Makefile
index 725d6d88b8e..7e4f7c3ca77 100644
--- a/print/acroread8/Makefile
+++ b/print/acroread8/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.12 2010/01/23 05:49:59 obache Exp $
+# $NetBSD: Makefile,v 1.13 2011/09/06 21:08:09 cheusov Exp $
 
 DISTNAME=	acroread8	# overridden below
 PKGNAME=	acroread8-8.1.7
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	print
 MASTER_SITES=	http://ardownload.adobe.com/pub/adobe/reader/unix/8.x/8.1.7/enu/
 
@@ -19,12 +19,6 @@ NO_SRC_ON_FTP=		${RESTRICTED}
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
-CONFLICTS+=	acroread-5.*
-# conflict with acroread5 due to bin/acroread
-# maybe should do ALTERNATIVES?
-CONFLICTS+=	acroread5-5.*
-CONFLICTS+=	acroread7-7.*
-
 WRKSRC=			${WRKDIR}/AdobeReader
 BUILD_DIRS=		# empty
 
@@ -77,6 +71,5 @@ post-install:
 	${CHMOD} +x ${DESTDIR}${PREFIX}/bin/acroread8
 	@${ECHO_MSG} "Be sure to read the license agreement in"
 	@${ECHO_MSG} "${DESTDIR}${PREFIX}/Acrobat8/Reader/Legal/ENU/License.html"
-	${LN} -sf acroread8 ${DESTDIR}${PREFIX}/bin/acroread
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/print/acroread8/PLIST b/print/acroread8/PLIST
index 3b9db5025f1..2a4385f357b 100644
--- a/print/acroread8/PLIST
+++ b/print/acroread8/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2009/11/04 23:37:53 tez Exp $
+@comment $NetBSD: PLIST,v 1.4 2011/09/06 21:08:09 cheusov Exp $
 Acrobat8/Adobe/Reader8/bin/UNINSTALL
 Acrobat8/Adobe/Reader8/bin/acroread
 Acrobat8/Adobe/Reader8/Reader/help/ENU/ReadMe.htm
@@ -655,5 +655,4 @@ Acrobat8/Adobe/Help/en_US/Adobe Reader/8.0/WSDB9A75C3-9D33-4717-AF04-761385A6435
 Acrobat8/Adobe/Help/en_US/Adobe Reader/8.0/YAHOO.js
 Acrobat8/Adobe/HelpViewer/1.0/resources/help.html
 Acrobat8/Adobe/HelpViewer/1.0/resources/help.jpg
-bin/acroread
 bin/acroread8
diff --git a/print/acroread9/ALTERNATIVES b/print/acroread9/ALTERNATIVES
new file mode 100644
index 00000000000..f6d07e931d5
--- /dev/null
+++ b/print/acroread9/ALTERNATIVES
@@ -0,0 +1 @@
+bin/acroread @PREFIX@/bin/acroread9
diff --git a/print/acroread9/Makefile b/print/acroread9/Makefile
index d2cf7d04163..301b7d29076 100644
--- a/print/acroread9/Makefile
+++ b/print/acroread9/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2011/07/30 07:30:42 ryoon Exp $
+# $NetBSD: Makefile,v 1.2 2011/09/06 21:08:09 cheusov Exp $
 
 DISTNAME=	acroread9	# overridden below
 PKGNAME=	acroread9-9.4.2
@@ -18,13 +18,6 @@ NO_SRC_ON_FTP=		${RESTRICTED}
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
-CONFLICTS+=	acroread-5.*{,nb*}
-# conflict with acroread5 due to bin/acroread
-# maybe should do ALTERNATIVES?
-CONFLICTS+=	acroread5-5.*{,nb*}
-CONFLICTS+=	acroread7-7.*{,nb*}
-CONFLICTS+=	acroread8-8.*{,nb*}
-
 WRKSRC=			${WRKDIR}/AdobeReader
 BUILD_DIRS=		# empty
 
@@ -72,11 +65,8 @@ post-install:
 	     ${DESTDIR}${PREFIX}/bin/acroread9
 	${CHMOD} +x ${DESTDIR}${PREFIX}/bin/acroread9
 	${MV} ${DESTDIR}${PREFIX}/Acrobat9/Adobe/Reader9/Resource/Shell/acroread.1 \
-	${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
-	cd ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1 && \
-	${LN} -sf acroread.1 acroread9.1
+	  ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/acroread9.1
 	@${ECHO_MSG} "Be sure to read the license agreement in"
 	@${ECHO_MSG} "${DESTDIR}${PREFIX}/Acrobat9/Reader/Legal/ENU/License.html"
-	${LN} -sf acroread9 ${DESTDIR}${PREFIX}/bin/acroread
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/print/acroread9/PLIST b/print/acroread9/PLIST
index 159059e48ca..83de5150586 100644
--- a/print/acroread9/PLIST
+++ b/print/acroread9/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2011/07/30 07:30:41 ryoon Exp $
+@comment $NetBSD: PLIST,v 1.2 2011/09/06 21:08:09 cheusov Exp $
 Acrobat9/Adobe/Reader9/Browser/HowTo/ENU/Browser_Plugin_HowTo.txt
 Acrobat9/Adobe/Reader9/Browser/install_browser_plugin
 Acrobat9/Adobe/Reader9/Browser/intellinux/nppdf.so
@@ -315,7 +315,5 @@ Acrobat9/Adobe/Reader9/Resource/TypeSupport/Unicode/mappings/win/CP949.TXT
 Acrobat9/Adobe/Reader9/Resource/TypeSupport/Unicode/mappings/win/CP950.TXT
 Acrobat9/Adobe/Reader9/bin/UNINSTALL
 Acrobat9/Adobe/Reader9/bin/acroread
-bin/acroread
 bin/acroread9
-man/man1/acroread.1
 man/man1/acroread9.1