From 476ff77f2723a8285429c475010c3077dcdd6ea7 Mon Sep 17 00:00:00 2001 From: cheusov Date: Tue, 6 Sep 2011 21:08:09 +0000 Subject: Convert print/acroread* packages to pkg_alternatives framework. Now they can coexist on the system. pkgrevisions were bumped. --- print/acroread9/ALTERNATIVES | 1 + print/acroread9/Makefile | 14 ++------------ print/acroread9/PLIST | 4 +--- 3 files changed, 4 insertions(+), 15 deletions(-) create mode 100644 print/acroread9/ALTERNATIVES (limited to 'print/acroread9') 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 -- cgit v1.2.3