diff options
| author | sborrill <sborrill@pkgsrc.org> | 2013-02-12 13:55:48 +0000 |
|---|---|---|
| committer | sborrill <sborrill@pkgsrc.org> | 2013-02-12 13:55:48 +0000 |
| commit | 872e5698e8a4102b59eb755499658550a9a81875 (patch) | |
| tree | cb5e0adb31b63cb11075e0f6d492e2843f907887 /net | |
| parent | 24f5fa0ac2f6e38f6ead508de0610d035a1b09bf (diff) | |
| download | pkgsrc-872e5698e8a4102b59eb755499658550a9a81875.tar.gz | |
Fix build on x64
Diffstat (limited to 'net')
| -rw-r--r-- | net/citrix_ica/Makefile | 6 | ||||
| -rw-r--r-- | net/citrix_ica/distinfo | 10 | ||||
| -rw-r--r-- | net/citrix_ica/patches/patch-i386-ab | 14 |
3 files changed, 15 insertions, 15 deletions
diff --git a/net/citrix_ica/Makefile b/net/citrix_ica/Makefile index aa1cb7a0d4b..7889ae61e5b 100644 --- a/net/citrix_ica/Makefile +++ b/net/citrix_ica/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.42 2012/08/14 17:07:58 asau Exp $ +# $NetBSD: Makefile,v 1.43 2013/02/12 13:55:48 sborrill Exp $ DISTNAME= citrix_ica-10.6.115659 PKGREVISION= 2 @@ -28,9 +28,11 @@ PKG_DESTDIR_SUPPORT= none .include "../../mk/bsd.prefs.mk" +PATCH_ARCH= ${MACHINE_ARCH} .if ${EMUL_PLATFORM} == "linux-i386" DISTNAME= en.linuxx86 PKGNAME= citrix_ica-10.6.115659 +PATCH_ARCH= i386 MASTER_SITES= ftp://download2.citrix.com/FILES/en/products/Linux10/ .elif ${EMUL_PLATFORM} == "solaris-sparc" DISTNAME= en.solaris @@ -63,7 +65,7 @@ FETCH_MESSAGE+= "${DISTDIR}/${PKGNAME_NOREV}" do-patch: (cd ${WRKSRC}; \ - for f in ${PATCHDIR}/patch-${MACHINE_ARCH}-*;do \ + for f in ${PATCHDIR}/patch-${PATCH_ARCH}-*;do \ ${PATCH} ${PATCH_ARGS} <$$f >/dev/null 2>&1 || ${TRUE}; \ done) diff --git a/net/citrix_ica/distinfo b/net/citrix_ica/distinfo index b8b80d0c307..98fd9b4fb36 100644 --- a/net/citrix_ica/distinfo +++ b/net/citrix_ica/distinfo @@ -1,15 +1,9 @@ -$NetBSD: distinfo,v 1.17 2011/03/17 09:05:32 sborrill Exp $ +$NetBSD: distinfo,v 1.18 2013/02/12 13:55:48 sborrill Exp $ SHA1 (citrix_ica-10.6.115659/en.linuxx86.tar.gz) = 674a113dc82e9add57f306cc24e143373532d709 RMD160 (citrix_ica-10.6.115659/en.linuxx86.tar.gz) = 45453f4a63baf2b0c10f3f31ca3e17574361dcfa Size (citrix_ica-10.6.115659/en.linuxx86.tar.gz) = 1801486 bytes -SHA1 (citrix_ica-8.63.165401/en.solx86.tar.z) = b46716721eb7fa1d098252178e6add7b00fff718 -RMD160 (citrix_ica-8.63.165401/en.solx86.tar.z) = 9ebc4425450b7f77fd3e838cc0f34089455c09e9 -Size (citrix_ica-8.63.165401/en.solx86.tar.z) = 2530914 bytes -SHA1 (citrix_ica-8.63.165401/en.solaris.tar.z) = bee83d6acc55666444da6bb4ec43d1440c9c0982 -RMD160 (citrix_ica-8.63.165401/en.solaris.tar.z) = 62de739de02c58e93070c21a0dcf9935f8057a7d -Size (citrix_ica-8.63.165401/en.solaris.tar.z) = 2633417 bytes SHA1 (patch-i386-aa) = 18c4a63f9a4cfd040bcf1548dcd9587161ad84cb -SHA1 (patch-i386-ab) = cdcaa91d329cab329702c2f1e215b5ea956c3d7f +SHA1 (patch-i386-ab) = d83e0509369459aaf9d934cce4135de7356aec67 SHA1 (patch-sparc-aa) = e1a03dd26746a4c0da0aa7633983c3cbe305eb4d SHA1 (patch-sparc-ab) = 7a203edc890e80dd26ea94d9882d81ab6d816bbe diff --git a/net/citrix_ica/patches/patch-i386-ab b/net/citrix_ica/patches/patch-i386-ab index 4fdaa595789..1e40868e0f6 100644 --- a/net/citrix_ica/patches/patch-i386-ab +++ b/net/citrix_ica/patches/patch-i386-ab @@ -1,8 +1,8 @@ -$NetBSD: patch-i386-ab,v 1.5 2007/11/13 09:16:59 sborrill Exp $ +$NetBSD: patch-i386-ab,v 1.6 2013/02/12 13:55:49 sborrill Exp $ ---- setupwfc.orig 2007-11-13 09:03:07.000000000 +0000 -+++ setupwfc 2007-11-13 09:03:07.000000000 +0000 -@@ -438,7 +438,7 @@ +--- setupwfc.orig 2007-06-12 12:19:38.000000000 +0100 ++++ setupwfc 2013-02-12 13:43:20.000000000 +0000 +@@ -438,10 +438,10 @@ exit 1 fi ;; @@ -10,4 +10,8 @@ $NetBSD: patch-i386-ab,v 1.5 2007/11/13 09:16:59 sborrill Exp $ + *BSD|DragonFly) # Assume Free/Net/Open BSD on an X86 with Linux emulation. - if uname -m | grep 86 2>&1 >/dev/null ; then +- if uname -m | grep 86 2>&1 >/dev/null ; then ++ if uname -m | grep -E '64|86' 2>&1 >/dev/null ; then + PLATFORM=linuxx86 + DISP_PLATFORM="Linux (x86)" + echo |