Tue Feb 12 13:55:49 2013 UTC ()
Fix build on x64


(sborrill)
diff -r1.42 -r1.43 pkgsrc/net/citrix_ica/Makefile
diff -r1.17 -r1.18 pkgsrc/net/citrix_ica/distinfo
diff -r1.5 -r1.6 pkgsrc/net/citrix_ica/patches/patch-i386-ab
cvs diff -r1.42 -r1.43 pkgsrc/net/citrix_ica/Makefile (expand / switch to unified diff)

--- pkgsrc/net/citrix_ica/Makefile 2012/08/14 17:07:58 1.42
+++ pkgsrc/net/citrix_ica/Makefile 2013/02/12 13:55:48 1.43
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.42 2012/08/14 17:07:58 asau Exp $ 1# $NetBSD: Makefile,v 1.43 2013/02/12 13:55:48 sborrill Exp $
2 2
3DISTNAME= citrix_ica-10.6.115659 3DISTNAME= citrix_ica-10.6.115659
4PKGREVISION= 2 4PKGREVISION= 2
5CATEGORIES= net 5CATEGORIES= net
6MASTER_SITES= # empty 6MASTER_SITES= # empty
7 7
8MAINTAINER= sborrill@NetBSD.org 8MAINTAINER= sborrill@NetBSD.org
9HOMEPAGE= http://www.citrix.com/English/ss/downloads/results.asp?productID=186&c1=sot2755 9HOMEPAGE= http://www.citrix.com/English/ss/downloads/results.asp?productID=186&c1=sot2755
10COMMENT= Citrix(R) ICA client for the Citrix(R) Presentation Server(TM) 10COMMENT= Citrix(R) ICA client for the Citrix(R) Presentation Server(TM)
11LICENSE= citrix_ica-license 11LICENSE= citrix_ica-license
12 12
13RESTRICTED= License prohibits redistribution 13RESTRICTED= License prohibits redistribution
14NO_SRC_ON_FTP= ${RESTRICTED} 14NO_SRC_ON_FTP= ${RESTRICTED}
@@ -18,29 +18,31 @@ NO_BIN_ON_CDROM= ${RESTRICTED} @@ -18,29 +18,31 @@ NO_BIN_ON_CDROM= ${RESTRICTED}
18 18
19# "Abort Traps" indefinitely in pbulk 19# "Abort Traps" indefinitely in pbulk
20NOT_FOR_PLATFORM+= DragonFly-*-* 20NOT_FOR_PLATFORM+= DragonFly-*-*
21 21
22EMUL_PLATFORMS= linux-i386 22EMUL_PLATFORMS= linux-i386
23EMUL_PLATFORMS+= solaris-sparc 23EMUL_PLATFORMS+= solaris-sparc
24EMUL_PLATFORMS+= solaris-i386 24EMUL_PLATFORMS+= solaris-i386
25EMUL_MODULES.linux= locale motif x11 25EMUL_MODULES.linux= locale motif x11
26 26
27PKG_DESTDIR_SUPPORT= none 27PKG_DESTDIR_SUPPORT= none
28 28
29.include "../../mk/bsd.prefs.mk" 29.include "../../mk/bsd.prefs.mk"
30 30
 31PATCH_ARCH= ${MACHINE_ARCH}
31.if ${EMUL_PLATFORM} == "linux-i386" 32.if ${EMUL_PLATFORM} == "linux-i386"
32DISTNAME= en.linuxx86 33DISTNAME= en.linuxx86
33PKGNAME= citrix_ica-10.6.115659 34PKGNAME= citrix_ica-10.6.115659
 35PATCH_ARCH= i386
34MASTER_SITES= ftp://download2.citrix.com/FILES/en/products/Linux10/ 36MASTER_SITES= ftp://download2.citrix.com/FILES/en/products/Linux10/
35.elif ${EMUL_PLATFORM} == "solaris-sparc" 37.elif ${EMUL_PLATFORM} == "solaris-sparc"
36DISTNAME= en.solaris 38DISTNAME= en.solaris
37PKGNAME= citrix_ica-8.63.165401 39PKGNAME= citrix_ica-8.63.165401
38HOMEPAGE= http://www.citrix.com/English/ss/downloads/details.asp?downloadId=1859901&productId=186&c1=sot2755 40HOMEPAGE= http://www.citrix.com/English/ss/downloads/details.asp?downloadId=1859901&productId=186&c1=sot2755
39MASTER_SITES= manual 41MASTER_SITES= manual
40EXTRACT_SUFX= .tar.z 42EXTRACT_SUFX= .tar.z
41.elif ${EMUL_PLATFORM} == "solaris-i386" 43.elif ${EMUL_PLATFORM} == "solaris-i386"
42DISTNAME= en.solx86 44DISTNAME= en.solx86
43PKGNAME= citrix_ica-8.63.165401 45PKGNAME= citrix_ica-8.63.165401
44HOMEPAGE= http://www.citrix.com/English/ss/downloads/details.asp?downloadId=1859901&productId=186&c1=sot2755 46HOMEPAGE= http://www.citrix.com/English/ss/downloads/details.asp?downloadId=1859901&productId=186&c1=sot2755
45MASTER_SITES= manual 47MASTER_SITES= manual
46EXTRACT_SUFX= .tar.z 48EXTRACT_SUFX= .tar.z
@@ -53,27 +55,27 @@ CDIR= ${PREFIX}/lib/ICAClient @@ -53,27 +55,27 @@ CDIR= ${PREFIX}/lib/ICAClient
53USE_TOOLS+= patch 55USE_TOOLS+= patch
54 56
55INSTALLATION_DIRS= bin 57INSTALLATION_DIRS= bin
56 58
57.if ${MASTER_SITES} == "manual" 59.if ${MASTER_SITES} == "manual"
58FETCH_MESSAGE= "Please fetch ${DISTFILES} manually from" 60FETCH_MESSAGE= "Please fetch ${DISTFILES} manually from"
59FETCH_MESSAGE+= "${HOMEPAGE}" 61FETCH_MESSAGE+= "${HOMEPAGE}"
60FETCH_MESSAGE+= "and put into" 62FETCH_MESSAGE+= "and put into"
61FETCH_MESSAGE+= "${DISTDIR}/${PKGNAME_NOREV}" 63FETCH_MESSAGE+= "${DISTDIR}/${PKGNAME_NOREV}"
62.endif 64.endif
63 65
64do-patch: 66do-patch:
65 (cd ${WRKSRC}; \ 67 (cd ${WRKSRC}; \
66 for f in ${PATCHDIR}/patch-${MACHINE_ARCH}-*;do \ 68 for f in ${PATCHDIR}/patch-${PATCH_ARCH}-*;do \
67 ${PATCH} ${PATCH_ARGS} <$$f >/dev/null 2>&1 || ${TRUE}; \ 69 ${PATCH} ${PATCH_ARGS} <$$f >/dev/null 2>&1 || ${TRUE}; \
68 done) 70 done)
69 71
70do-build: 72do-build:
71 ${SED} s%DESTINATION%${CDIR}% ${FILESDIR}/response.${MACHINE_ARCH} \ 73 ${SED} s%DESTINATION%${CDIR}% ${FILESDIR}/response.${MACHINE_ARCH} \
72 > ${WRKSRC}/response 74 > ${WRKSRC}/response
73 ${SED} s%DESTINATION%${CDIR}% ${FILESDIR}/wfcmgr \ 75 ${SED} s%DESTINATION%${CDIR}% ${FILESDIR}/wfcmgr \
74 > ${WRKSRC}/wfcmgr.x 76 > ${WRKSRC}/wfcmgr.x
75 ${SED} s%DESTINATION%${CDIR}% ${FILESDIR}/wfica \ 77 ${SED} s%DESTINATION%${CDIR}% ${FILESDIR}/wfica \
76 > ${WRKSRC}/wfica.x 78 > ${WRKSRC}/wfica.x
77 79
78pre-install: 80pre-install:
79 ${RUN} if [ `${ID} -u` != 0 ]; then \ 81 ${RUN} if [ `${ID} -u` != 0 ]; then \
cvs diff -r1.17 -r1.18 pkgsrc/net/citrix_ica/distinfo (expand / switch to unified diff)

--- pkgsrc/net/citrix_ica/distinfo 2011/03/17 09:05:32 1.17
+++ pkgsrc/net/citrix_ica/distinfo 2013/02/12 13:55:48 1.18
@@ -1,15 +1,9 @@ @@ -1,15 +1,9 @@
1$NetBSD: distinfo,v 1.17 2011/03/17 09:05:32 sborrill Exp $ 1$NetBSD: distinfo,v 1.18 2013/02/12 13:55:48 sborrill Exp $
2 2
3SHA1 (citrix_ica-10.6.115659/en.linuxx86.tar.gz) = 674a113dc82e9add57f306cc24e143373532d709 3SHA1 (citrix_ica-10.6.115659/en.linuxx86.tar.gz) = 674a113dc82e9add57f306cc24e143373532d709
4RMD160 (citrix_ica-10.6.115659/en.linuxx86.tar.gz) = 45453f4a63baf2b0c10f3f31ca3e17574361dcfa 4RMD160 (citrix_ica-10.6.115659/en.linuxx86.tar.gz) = 45453f4a63baf2b0c10f3f31ca3e17574361dcfa
5Size (citrix_ica-10.6.115659/en.linuxx86.tar.gz) = 1801486 bytes 5Size (citrix_ica-10.6.115659/en.linuxx86.tar.gz) = 1801486 bytes
6SHA1 (citrix_ica-8.63.165401/en.solx86.tar.z) = b46716721eb7fa1d098252178e6add7b00fff718 
7RMD160 (citrix_ica-8.63.165401/en.solx86.tar.z) = 9ebc4425450b7f77fd3e838cc0f34089455c09e9 
8Size (citrix_ica-8.63.165401/en.solx86.tar.z) = 2530914 bytes 
9SHA1 (citrix_ica-8.63.165401/en.solaris.tar.z) = bee83d6acc55666444da6bb4ec43d1440c9c0982 
10RMD160 (citrix_ica-8.63.165401/en.solaris.tar.z) = 62de739de02c58e93070c21a0dcf9935f8057a7d 
11Size (citrix_ica-8.63.165401/en.solaris.tar.z) = 2633417 bytes 
12SHA1 (patch-i386-aa) = 18c4a63f9a4cfd040bcf1548dcd9587161ad84cb 6SHA1 (patch-i386-aa) = 18c4a63f9a4cfd040bcf1548dcd9587161ad84cb
13SHA1 (patch-i386-ab) = cdcaa91d329cab329702c2f1e215b5ea956c3d7f 7SHA1 (patch-i386-ab) = d83e0509369459aaf9d934cce4135de7356aec67
14SHA1 (patch-sparc-aa) = e1a03dd26746a4c0da0aa7633983c3cbe305eb4d 8SHA1 (patch-sparc-aa) = e1a03dd26746a4c0da0aa7633983c3cbe305eb4d
15SHA1 (patch-sparc-ab) = 7a203edc890e80dd26ea94d9882d81ab6d816bbe 9SHA1 (patch-sparc-ab) = 7a203edc890e80dd26ea94d9882d81ab6d816bbe
cvs diff -r1.5 -r1.6 pkgsrc/net/citrix_ica/patches/patch-i386-ab (expand / switch to unified diff)

--- pkgsrc/net/citrix_ica/patches/patch-i386-ab 2007/11/13 09:16:59 1.5
+++ pkgsrc/net/citrix_ica/patches/patch-i386-ab 2013/02/12 13:55:49 1.6
@@ -1,13 +1,17 @@ @@ -1,13 +1,17 @@
1$NetBSD: patch-i386-ab,v 1.5 2007/11/13 09:16:59 sborrill Exp $ 1$NetBSD: patch-i386-ab,v 1.6 2013/02/12 13:55:49 sborrill Exp $
2 2
3--- setupwfc.orig 2007-11-13 09:03:07.000000000 +0000 3--- setupwfc.orig 2007-06-12 12:19:38.000000000 +0100
4+++ setupwfc 2007-11-13 09:03:07.000000000 +0000 4+++ setupwfc 2013-02-12 13:43:20.000000000 +0000
5@@ -438,7 +438,7 @@ 5@@ -438,10 +438,10 @@
6 exit 1 6 exit 1
7 fi 7 fi
8 ;; 8 ;;
9- *BSD) 9- *BSD)
10+ *BSD|DragonFly) 10+ *BSD|DragonFly)
11 # Assume Free/Net/Open BSD on an X86 with Linux emulation. 11 # Assume Free/Net/Open BSD on an X86 with Linux emulation.
12  12
13 if uname -m | grep 86 2>&1 >/dev/null ; then 13- if uname -m | grep 86 2>&1 >/dev/null ; then
 14+ if uname -m | grep -E '64|86' 2>&1 >/dev/null ; then
 15 PLATFORM=linuxx86
 16 DISP_PLATFORM="Linux (x86)"
 17 echo