[pkgsrc/trunk]: pkgsrc/print/acroread8 Use ${EMULDIR} instead of hard-coded /...

[obache <obache%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/4fc478d10731
branches:  trunk
changeset: 570011:4fc478d10731
user:      obache <obache%pkgsrc.org@localhost>
date:      Sat Jan 23 05:49:59 2010 +0000

description:
Use ${EMULDIR} instead of hard-coded /emul/linux, should fixes PR#42625.

Bump PKGREVISION.

diffstat:

 print/acroread8/Makefile            |  5 +++--
 print/acroread8/files/acroread.diff |  4 ++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diffs (36 lines):

diff -r 96335fa3f0fb -r 4fc478d10731 print/acroread8/Makefile
--- a/print/acroread8/Makefile  Sat Jan 23 04:50:22 2010 +0000
+++ b/print/acroread8/Makefile  Sat Jan 23 05:49:59 2010 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.11 2010/01/14 19:35:55 tez Exp $
+# $NetBSD: Makefile,v 1.12 2010/01/23 05:49:59 obache Exp $
 
 DISTNAME=      acroread8       # overridden below
 PKGNAME=       acroread8-8.1.7
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    print
 MASTER_SITES=  http://ardownload.adobe.com/pub/adobe/reader/unix/8.x/8.1.7/enu/
 
@@ -68,6 +68,7 @@
          ${BIN_PATCH} <${FILESDIR}/acroread.diff && \
          ${SED} -e 's:@PREFIX@:${PREFIX}:' \
            -e 's|@ACROREAD_FONTPATH@|${ACROREAD_FONTPATH}|' \
+           -e 's|@EMULDIR@|${EMULDIR}|' \
                <acroread >acroread.tmp && \
          ${MV} acroread.tmp acroread && \
          ${RM} -f acroread.orig acroread.tmp
diff -r 96335fa3f0fb -r 4fc478d10731 print/acroread8/files/acroread.diff
--- a/print/acroread8/files/acroread.diff       Sat Jan 23 04:50:22 2010 +0000
+++ b/print/acroread8/files/acroread.diff       Sat Jan 23 05:49:59 2010 +0000
@@ -4,8 +4,8 @@
  {
      if [ "`uname -s`" = "Linux" ] && [ ! -x /lib/ld-lsb.so.3 ]; then
          exec /lib/ld-linux.so.2 ${1+"$@"}
-+    elif [ "$ACRO_CONFIG" = intellinux ] && [ ! -x /emul/linux/lib/ld-lsb.so.3 ]; then
-+        exec /emul/linux/lib/ld-linux.so.2 ${1+"$@"}
++    elif [ "$ACRO_CONFIG" = intellinux ] && [ ! -x @EMULDIR@/lib/ld-lsb.so.3 ]; then
++        exec @EMULDIR@/lib/ld-linux.so.2 ${1+"$@"}
      else
          exec ${1+"$@"}
      fi