diff options
| author | obache <obache> | 2010-01-23 05:49:59 +0000 |
|---|---|---|
| committer | obache <obache> | 2010-01-23 05:49:59 +0000 |
| commit | 5cb05d7d74e3fe2a303e64cf21fc2f34ef7ea863 (patch) | |
| tree | d33ad3cd7227f24a0dd71ce8757fe112245dd6da | |
| parent | 88372571610b4d1c312a9b21bb9e4fdc9f323e67 (diff) | |
| download | pkgsrc-5cb05d7d74e3fe2a303e64cf21fc2f34ef7ea863.tar.gz | |
Use ${EMULDIR} instead of hard-coded /emul/linux, should fixes PR#42625.
Bump PKGREVISION.
| -rw-r--r-- | print/acroread8/Makefile | 5 | ||||
| -rw-r--r-- | print/acroread8/files/acroread.diff | 4 |
2 files changed, 5 insertions, 4 deletions
diff --git a/print/acroread8/Makefile b/print/acroread8/Makefile index 28320435d6d..725d6d88b8e 100644 --- a/print/acroread8/Makefile +++ b/print/acroread8/Makefile @@ -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 @@ post-install: ${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 --git a/print/acroread8/files/acroread.diff b/print/acroread8/files/acroread.diff index 57ae5c17df6..fa1ed3b283f 100644 --- a/print/acroread8/files/acroread.diff +++ b/print/acroread8/files/acroread.diff @@ -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 |