diff options
| author | ryoon <ryoon@pkgsrc.org> | 2012-09-21 11:46:56 +0000 |
|---|---|---|
| committer | ryoon <ryoon@pkgsrc.org> | 2012-09-21 11:46:56 +0000 |
| commit | 372fa4c02ab323426ea11e4046c07445e142da65 (patch) | |
| tree | beeaeb028272a28182de0f87d409e70986acd19d /print/acroread9 | |
| parent | fed1a2334494af901e28b8e51b1a17c335b87f0a (diff) | |
| download | pkgsrc-372fa4c02ab323426ea11e4046c07445e142da65.tar.gz | |
Fix PR pkg/46766
When run 'make package' as root, avoid /usr/bin/acroread symlink creation.
Diffstat (limited to 'print/acroread9')
| -rw-r--r-- | print/acroread9/distinfo | 4 | ||||
| -rw-r--r-- | print/acroread9/patches/patch-aa | 17 |
2 files changed, 16 insertions, 5 deletions
diff --git a/print/acroread9/distinfo b/print/acroread9/distinfo index f0673cf216c..14abfa75934 100644 --- a/print/acroread9/distinfo +++ b/print/acroread9/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.5 2012/08/25 12:34:53 wiz Exp $ +$NetBSD: distinfo,v 1.6 2012/09/21 11:46:56 ryoon Exp $ SHA1 (AdbeRdr9.5.1-1_i486linux_enu.tar.bz2) = 02985c18abbe7f530f7a29e76061c5bd362f5e42 RMD160 (AdbeRdr9.5.1-1_i486linux_enu.tar.bz2) = ba457c98384af6223a4bc11c28e8b5ce8a542325 Size (AdbeRdr9.5.1-1_i486linux_enu.tar.bz2) = 57138807 bytes -SHA1 (patch-aa) = 22ed139da12bf7cf593f6e4c91ecddcc1ad5eb44 +SHA1 (patch-aa) = 363a2b763233c633efa1d031f8a556368e8fe66b diff --git a/print/acroread9/patches/patch-aa b/print/acroread9/patches/patch-aa index a92444c0b3c..604e0d1960c 100644 --- a/print/acroread9/patches/patch-aa +++ b/print/acroread9/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.2 2012/08/25 12:34:53 wiz Exp $ +$NetBSD: patch-aa,v 1.3 2012/09/21 11:46:56 ryoon Exp $ Adapt ls(1) arguments for BSD. Do not install man page gzipped. @@ -16,7 +16,18 @@ Add case for NetBSD and DragonFly in the wrapper script. else size=`ls -lLon "$i" | ( read perm links owner size date ; echo $size )` fi -@@ -657,16 +659,8 @@ InstallReader() +@@ -637,10 +639,6 @@ InstallReader() + "$ReadInstallDir" \ + "$ReadPlatformTar" "$SearchPlatformTar" "$CustomPlatformTar" + +- rm -f /usr/bin/acroread 2>/dev/null && \ +- ln -s "$ReadInstallDir/Adobe/Reader9/bin/acroread" /usr/bin/acroread 2>/dev/null && \ +- record_config remove /usr/bin/acroread +- + if [ "${OSname}" = "Linux" ]; then + rm -f /etc/bash_completion.d/acroread.sh 2>/dev/null && \ + ln -s "$ReadInstallDir/Adobe/Reader9/Resource/Shell/acroread_tab" /etc/bash_completion.d/acroread.sh 2>/dev/null && \ +@@ -657,16 +655,8 @@ InstallReader() record_config remove /usr/local/etc/bash_completion.d/acroread.sh fi fi @@ -33,7 +44,7 @@ Add case for NetBSD and DragonFly in the wrapper script. if [ "${OSname}" = "Linux" -o \( "${OSname}" = "SunOS" -a "`uname -m`" = "i86pc" \) ]; then printf "%s" "Setting up libraries ... " -@@ -950,6 +944,19 @@ case "$OSname" in +@@ -950,6 +940,19 @@ case "$OSname" in ReadDefaultNum="$ReadIntelLinuxNum" DefaultName="Intel/Linux" ;; |