From 33f30156fb37245b360bbc293320402ecf1aba41 Mon Sep 17 00:00:00 2001 From: jlam Date: Sun, 29 Jul 2007 05:18:36 +0000 Subject: * Add new emulator framework in pkgsrc/mk/emulator that handles all binary-only packages that require binary "emulation" on the native operating system. Please see pkgsrc/mk/emulator/README for more details. * Teach the plist framework to automatically use any existing PLIST.${EMUL_PLATFORM} as part of the default PLIST_SRC definition. * Convert all of the binary-only packages in pkgsrc to use the emulator framework. Most of them have been tested to install and deinstall correctly. This involves the following cleanup actions: * Remove use of custom PLIST code and use PLIST.${EMUL_PLATFORM} more consistently. * Simplify packages by using default INSTALL and DEINSTALL scripts instead of custom INSTALL/DEINSTALL code. * Remove "SUSE_COMPAT32" and "PKG_OPTIONS.suse" from pkgsrc. Packages only need to state exactly which emulations they support, and the framework handles any i386-on-x86_64 or sparc-on-sparc64 uses. * Remove "USE_NATIVE_LINUX" from pkgsrc. The framework will automatically detect when the package is installing on Linux. Specific changes to packages include: * Bump the PKGREVISIONs for all of the suse100* and suse91* packages due to changes in the +INSTALL/+DEINSTALL scripts used in all of the packages. * Remove pkgsrc/emulators/suse_linux, which is unused by any packages. * cad/lc -- remove custom code to create the distinfo file for all supported platforms; just use "emul-fetch" and "emul-distinfo" instead. * lang/Cg-compiler -- install the shared libraries under ${EMULDIR} instead of ${PREFIX}/lib so that compiled programs will find the shared libraries. * mail/thunderbird-bin-nightly -- update to latest binary distributions for supported platforms. * multimedia/ns-flash -- update Linux version to 9.0.48 as the older version is no longer available for interactive fetch. * security/uvscan -- set LD_LIBRARY_PATH explicitly so that it's not necessary to install library symlinks into ${EMULDIR}/usr/local/lib. * www/firefox-bin-flash -- update Linux version to 9.0.48 as the older version is no longer available for interactive fetch. --- net/citrix_ica/Makefile | 70 +++++++++++++---------------------- net/citrix_ica/PLIST.i386 | 29 --------------- net/citrix_ica/PLIST.linux-i386 | 29 +++++++++++++++ net/citrix_ica/PLIST.solaris-sparc | 75 ++++++++++++++++++++++++++++++++++++++ net/citrix_ica/PLIST.sparc | 75 -------------------------------------- 5 files changed, 129 insertions(+), 149 deletions(-) delete mode 100644 net/citrix_ica/PLIST.i386 create mode 100644 net/citrix_ica/PLIST.linux-i386 create mode 100644 net/citrix_ica/PLIST.solaris-sparc delete mode 100644 net/citrix_ica/PLIST.sparc (limited to 'net/citrix_ica') diff --git a/net/citrix_ica/Makefile b/net/citrix_ica/Makefile index 1dd2485b04c..51a6af45e3d 100644 --- a/net/citrix_ica/Makefile +++ b/net/citrix_ica/Makefile @@ -1,66 +1,43 @@ -# $NetBSD: Makefile,v 1.35 2007/07/03 13:31:31 sborrill Exp $ -# +# $NetBSD: Makefile,v 1.36 2007/07/29 05:19:46 jlam Exp $ -# A default so lintpkgsrc is happy, overridden below -DISTNAME= citrix -PKGNAME= citrix_ica-10.6.115659 +DISTNAME= citrix_ica-10.6.115659 CATEGORIES= net -MASTER_SITES= http://download2.citrix.com/FILES/en/products/Linux10/ +MASTER_SITES= # empty MAINTAINER= sborrill@NetBSD.org HOMEPAGE= http://www.citrix.com/English/SS/downloads/downloads.asp?dID=2755 COMMENT= Citrix(R) ICA client for the Citrix(R) Presentation Server(TM) -.include "../../mk/bsd.prefs.mk" +LICENSE= citrix_ica-license +RESTRICTED= License prohibits redistribution +NO_SRC_ON_FTP= ${RESTRICTED} +NO_BIN_ON_FTP= ${RESTRICTED} +NO_SRC_ON_CDROM= ${RESTRICTED} +NO_BIN_ON_CDROM= ${RESTRICTED} -ONLY_FOR_PLATFORM= Linux-*-i[3-6]86 NetBSD-*-i386 NetBSD-*-sparc SunOS-*-sparc -ONLY_FOR_PLATFORM+= DragonFly-*-i386 +EMUL_PLATFORMS= linux-i386 +EMUL_PLATFORMS+= solaris-sparc +EMUL_MODULES.linux= locale motif x11 -.if ${OPSYS} == "NetBSD" -. if ${MACHINE_ARCH} == "i386" +.include "../../mk/bsd.prefs.mk" + +.if ${EMUL_PLATFORM} == "linux-i386" DISTNAME= en.linuxx86 PKGNAME= citrix_ica-10.6.115659 -. elif ${MACHINE_ARCH} == "sparc" -DISTNAME= en.solaris -PKGNAME= citrix_ica-8.46.110465 -MASTER_SITES= http://www.citrix.com/site/resources/dynamic/software/ -EXTRACT_SUFX= .tar.Z -. endif -.elif ${OPSYS} == "SunOS" +MASTER_SITES= http://download2.citrix.com/FILES/en/products/Linux10/ +.elif ${EMUL_PLATFORM} == "solaris-sparc" DISTNAME= en.solaris PKGNAME= citrix_ica-8.46.110465 MASTER_SITES= http://www.citrix.com/site/resources/dynamic/software/ EXTRACT_SUFX= .tar.Z -.elif ${OPSYS} == "Linux" || ${OPSYS} == "DragonFly" -DISTNAME= en.linuxx86 -PKGNAME= citrix_ica-10.0.110003 .endif -.if (${OPSYS} == "NetBSD" || ${OPSYS} == "DragonFly") && ${MACHINE_ARCH} == "i386" -DEPENDS+= suse_x11>=6.4:../../emulators/${SUSE_DIR_PREFIX}_x11 -DEPENDS+= suse_openmotif>=6.4:../../emulators/${SUSE_DIR_PREFIX}_openmotif -DEPENDS+= suse_locale>=6.4:../../emulators/${SUSE_DIR_PREFIX}_locale -.endif - -LICENSE= citrix_ica-license -RESTRICTED= License prohibits redistribution -NO_SRC_ON_FTP= ${RESTRICTED} -NO_BIN_ON_FTP= ${RESTRICTED} -NO_SRC_ON_CDROM= ${RESTRICTED} -NO_BIN_ON_CDROM= ${RESTRICTED} - WRKSRC= ${WRKDIR} DIST_SUBDIR= ${PKGNAME_NOREV} CDIR= ${PREFIX}/lib/ICAClient USE_TOOLS+= patch -.if ${OPSYS} == "NetBSD" && ${MACHINE_ARCH} == "sparc" -. if !exists(/emul/svr4/usr/lib/ld.so) -PKG_FAIL_REASON+= "${PKGNAME} requires SVR4 compability - see compat_svr4(8)" -. endif -.endif - INSTALLATION_DIRS= bin do-patch: @@ -78,7 +55,14 @@ do-build: > ${WRKSRC}/wfica.x pre-install: - if [ -d "${CDIR}" ]; then \ + ${RUN} if [ `${ID} -u` != 0 ]; then \ + ${ECHO} ""; \ + ${ECHO} "*** ${PKGNAME} must be installed with" \ + "superuser privileges ***"; \ + ${ECHO} ""; \ + ${FALSE}; \ + fi + ${RUN} if [ -d "${CDIR}" ]; then \ ${ECHO} ""; \ ${ECHO} "*** Please remove ${CDIR} and try again ***"; \ ${ECHO} ""; \ @@ -93,8 +77,4 @@ do-install: < ${CDIR}/util/icalicense.sh > ${CDIR}/util/icalicense.sh.fixed ${MV} ${CDIR}/util/icalicense.sh.fixed ${CDIR}/util/icalicense.sh -.if (${OPSYS} == "NetBSD" || ${OPSYS} == "DragonFly") && ${MACHINE_ARCH} == "i386" -. include "../../emulators/suse_linux/Makefile.application" -.endif - .include "../../mk/bsd.pkg.mk" diff --git a/net/citrix_ica/PLIST.i386 b/net/citrix_ica/PLIST.i386 deleted file mode 100644 index b16762a06ef..00000000000 --- a/net/citrix_ica/PLIST.i386 +++ /dev/null @@ -1,29 +0,0 @@ -@comment $NetBSD: PLIST.i386,v 1.5 2007/03/05 18:01:03 sborrill Exp $ -lib/ICAClient/CHARICONV.DLL -lib/ICAClient/pkginf/F.core.linuxx86 -lib/ICAClient/pkginf/Ver.core.linuxx86 -lib/ICAClient/NDS.DLL -lib/ICAClient/TW1.DLL -lib/ICAClient/VDEUEM.DLL -lib/ICAClient/VDSPMIKE.DLL -lib/ICAClient/util/pacexec -lib/ICAClient/util/pac.js -lib/ICAClient/config/All_Regions.ini -lib/ICAClient/config/Trusted_Region.ini -lib/ICAClient/config/Unknown_Region.ini -lib/ICAClient/config/Untrusted_Region.ini -lib/ICAClient/config/canonicalization.ini -lib/ICAClient/config/regions.ini -lib/ICAClient/config/usertemplate/All_Regions.ini -lib/ICAClient/config/usertemplate/Trusted_Region.ini -lib/ICAClient/config/usertemplate/Unknown_Region.ini -lib/ICAClient/config/usertemplate/Untrusted_Region.ini -lib/ICAClient/icons/manager.xpm -lib/ICAClient/icons/session.xpm -lib/ICAClient/nls/en/UTF-8/Wfcmgr -lib/ICAClient/nls/en/UTF-8/Wfica -lib/ICAClient/nls/en/UTF-8/pna.nls -lib/ICAClient/nls/en/Wfcmgr -lib/ICAClient/nls/en/Wfica -@dirrm lib/ICAClient/nls/en/UTF-8 -@dirrm lib/ICAClient/config/usertemplate diff --git a/net/citrix_ica/PLIST.linux-i386 b/net/citrix_ica/PLIST.linux-i386 new file mode 100644 index 00000000000..a01e0db3ca0 --- /dev/null +++ b/net/citrix_ica/PLIST.linux-i386 @@ -0,0 +1,29 @@ +@comment $NetBSD: PLIST.linux-i386,v 1.1 2007/07/29 05:19:46 jlam Exp $ +lib/ICAClient/CHARICONV.DLL +lib/ICAClient/pkginf/F.core.linuxx86 +lib/ICAClient/pkginf/Ver.core.linuxx86 +lib/ICAClient/NDS.DLL +lib/ICAClient/TW1.DLL +lib/ICAClient/VDEUEM.DLL +lib/ICAClient/VDSPMIKE.DLL +lib/ICAClient/util/pacexec +lib/ICAClient/util/pac.js +lib/ICAClient/config/All_Regions.ini +lib/ICAClient/config/Trusted_Region.ini +lib/ICAClient/config/Unknown_Region.ini +lib/ICAClient/config/Untrusted_Region.ini +lib/ICAClient/config/canonicalization.ini +lib/ICAClient/config/regions.ini +lib/ICAClient/config/usertemplate/All_Regions.ini +lib/ICAClient/config/usertemplate/Trusted_Region.ini +lib/ICAClient/config/usertemplate/Unknown_Region.ini +lib/ICAClient/config/usertemplate/Untrusted_Region.ini +lib/ICAClient/icons/manager.xpm +lib/ICAClient/icons/session.xpm +lib/ICAClient/nls/en/UTF-8/Wfcmgr +lib/ICAClient/nls/en/UTF-8/Wfica +lib/ICAClient/nls/en/UTF-8/pna.nls +lib/ICAClient/nls/en/Wfcmgr +lib/ICAClient/nls/en/Wfica +@dirrm lib/ICAClient/nls/en/UTF-8 +@dirrm lib/ICAClient/config/usertemplate diff --git a/net/citrix_ica/PLIST.solaris-sparc b/net/citrix_ica/PLIST.solaris-sparc new file mode 100644 index 00000000000..abf94b5ad4d --- /dev/null +++ b/net/citrix_ica/PLIST.solaris-sparc @@ -0,0 +1,75 @@ +@comment $NetBSD: PLIST.solaris-sparc,v 1.1 2007/07/29 05:19:46 jlam Exp $ +lib/ICAClient/.config/appsrv.ini +lib/ICAClient/.config/keyboard.ini +lib/ICAClient/.config/module.ini +lib/ICAClient/.config/wfclient.ini +lib/ICAClient/icons/citrix16.xpm +lib/ICAClient/icons/citrix32.xpm +lib/ICAClient/icons/citrix48.xpm +lib/ICAClient/Wfcmgr +lib/ICAClient/Wfcmgr.ad +lib/ICAClient/Wfica +lib/ICAClient/Wfica.ad +lib/ICAClient/dt/appconfig/appmanager/C/Citrix/Citrix_ica_client +lib/ICAClient/dt/appconfig/appmanager/C/Citrix/Citrix_ica_editor +lib/ICAClient/dt/appconfig/appmanager/C/Citrix/Citrix_ica_excel +lib/ICAClient/dt/appconfig/appmanager/C/Citrix/Citrix_ica_msaccess +lib/ICAClient/dt/appconfig/appmanager/C/Citrix/Citrix_ica_outlook +lib/ICAClient/dt/appconfig/appmanager/C/Citrix/Citrix_ica_powerpnt +lib/ICAClient/dt/appconfig/appmanager/C/Citrix/Citrix_ica_visio32 +lib/ICAClient/dt/appconfig/appmanager/C/Citrix/Citrix_ica_winproj +lib/ICAClient/dt/appconfig/appmanager/C/Citrix/Citrix_ica_winword +lib/ICAClient/dt/appconfig/appmanager/C/Citrix/Citrix_ica_winzip32 +lib/ICAClient/dt/appconfig/appmanager/C/Citrix/Citrix_xcapture +lib/ICAClient/dt/appconfig/icons/C/Citrix.l.pm +lib/ICAClient/dt/appconfig/icons/C/Citrix.m.pm +lib/ICAClient/dt/appconfig/icons/C/Citrix.s.pm +lib/ICAClient/dt/appconfig/icons/C/Citrix.t.pm +lib/ICAClient/dt/appconfig/icons/C/Citrix_ica_excel.m.pm +lib/ICAClient/dt/appconfig/icons/C/Citrix_ica_iexplore.m.pm +lib/ICAClient/dt/appconfig/icons/C/Citrix_ica_msaccess.m.pm +lib/ICAClient/dt/appconfig/icons/C/Citrix_ica_outlook.m.pm +lib/ICAClient/dt/appconfig/icons/C/Citrix_ica_powerpnt.m.pm +lib/ICAClient/dt/appconfig/icons/C/Citrix_ica_visio32.m.pm +lib/ICAClient/dt/appconfig/icons/C/Citrix_ica_winproj.m.pm +lib/ICAClient/dt/appconfig/icons/C/Citrix_ica_winword.m.pm +lib/ICAClient/dt/appconfig/icons/C/Citrix_ica_winzip32.m.pm +lib/ICAClient/dt/appconfig/icons/C/Editor.b.pm +lib/ICAClient/dt/appconfig/icons/C/Editor.l.pm +lib/ICAClient/dt/appconfig/icons/C/Editor.m.bm +lib/ICAClient/dt/appconfig/icons/C/Editor.m.pm +lib/ICAClient/dt/appconfig/icons/C/Editor.s.bm +lib/ICAClient/dt/appconfig/icons/C/Editor.s.pm +lib/ICAClient/dt/appconfig/icons/C/Editor.t.bm +lib/ICAClient/dt/appconfig/icons/C/Editor.t.pm +lib/ICAClient/dt/appconfig/icons/C/ICA.l.pm +lib/ICAClient/dt/appconfig/icons/C/ICA.m.pm +lib/ICAClient/dt/appconfig/icons/C/ICA.s.pm +lib/ICAClient/dt/appconfig/icons/C/ICA.t.pm +lib/ICAClient/dt/appconfig/types/C/Citrix.dt +lib/ICAClient/dt/appconfig/types/C/Citrix.fp +lib/ICAClient/dt/appconfig/types/C/Citrix_ica_excel.dt +lib/ICAClient/dt/appconfig/types/C/Citrix_ica_msaccess.dt +lib/ICAClient/dt/appconfig/types/C/Citrix_ica_outlook.dt +lib/ICAClient/dt/appconfig/types/C/Citrix_ica_powerpnt.dt +lib/ICAClient/dt/appconfig/types/C/Citrix_ica_visio32.dt +lib/ICAClient/dt/appconfig/types/C/Citrix_ica_winproj.dt +lib/ICAClient/dt/appconfig/types/C/Citrix_ica_winword.dt +lib/ICAClient/dt/appconfig/types/C/Citrix_ica_winzip32.dt +lib/ICAClient/keystore/cacerts/GTECTRoot.crt +lib/ICAClient/pkginf/F.core.solaris +lib/ICAClient/pkginf/Ver.core.solaris +@dirrm lib/ICAClient/.config +@dirrm lib/ICAClient/cache/zlcache +@dirrm lib/ICAClient/cache +@dirrm lib/ICAClient/dt/appconfig/help/C +@dirrm lib/ICAClient/dt/appconfig/help +@dirrm lib/ICAClient/dt/appconfig/icons/C +@dirrm lib/ICAClient/dt/appconfig/icons +@dirrm lib/ICAClient/dt/appconfig/types/C +@dirrm lib/ICAClient/dt/appconfig/types +@dirrm lib/ICAClient/dt/appconfig/appmanager/C/Citrix +@dirrm lib/ICAClient/dt/appconfig/appmanager/C +@dirrm lib/ICAClient/dt/appconfig/appmanager +@dirrm lib/ICAClient/dt/appconfig +@dirrm lib/ICAClient/dt diff --git a/net/citrix_ica/PLIST.sparc b/net/citrix_ica/PLIST.sparc deleted file mode 100644 index 42dca2d4097..00000000000 --- a/net/citrix_ica/PLIST.sparc +++ /dev/null @@ -1,75 +0,0 @@ -@comment $NetBSD: PLIST.sparc,v 1.4 2007/03/05 18:01:03 sborrill Exp $ -lib/ICAClient/.config/appsrv.ini -lib/ICAClient/.config/keyboard.ini -lib/ICAClient/.config/module.ini -lib/ICAClient/.config/wfclient.ini -lib/ICAClient/icons/citrix16.xpm -lib/ICAClient/icons/citrix32.xpm -lib/ICAClient/icons/citrix48.xpm -lib/ICAClient/Wfcmgr -lib/ICAClient/Wfcmgr.ad -lib/ICAClient/Wfica -lib/ICAClient/Wfica.ad -lib/ICAClient/dt/appconfig/appmanager/C/Citrix/Citrix_ica_client -lib/ICAClient/dt/appconfig/appmanager/C/Citrix/Citrix_ica_editor -lib/ICAClient/dt/appconfig/appmanager/C/Citrix/Citrix_ica_excel -lib/ICAClient/dt/appconfig/appmanager/C/Citrix/Citrix_ica_msaccess -lib/ICAClient/dt/appconfig/appmanager/C/Citrix/Citrix_ica_outlook -lib/ICAClient/dt/appconfig/appmanager/C/Citrix/Citrix_ica_powerpnt -lib/ICAClient/dt/appconfig/appmanager/C/Citrix/Citrix_ica_visio32 -lib/ICAClient/dt/appconfig/appmanager/C/Citrix/Citrix_ica_winproj -lib/ICAClient/dt/appconfig/appmanager/C/Citrix/Citrix_ica_winword -lib/ICAClient/dt/appconfig/appmanager/C/Citrix/Citrix_ica_winzip32 -lib/ICAClient/dt/appconfig/appmanager/C/Citrix/Citrix_xcapture -lib/ICAClient/dt/appconfig/icons/C/Citrix.l.pm -lib/ICAClient/dt/appconfig/icons/C/Citrix.m.pm -lib/ICAClient/dt/appconfig/icons/C/Citrix.s.pm -lib/ICAClient/dt/appconfig/icons/C/Citrix.t.pm -lib/ICAClient/dt/appconfig/icons/C/Citrix_ica_excel.m.pm -lib/ICAClient/dt/appconfig/icons/C/Citrix_ica_iexplore.m.pm -lib/ICAClient/dt/appconfig/icons/C/Citrix_ica_msaccess.m.pm -lib/ICAClient/dt/appconfig/icons/C/Citrix_ica_outlook.m.pm -lib/ICAClient/dt/appconfig/icons/C/Citrix_ica_powerpnt.m.pm -lib/ICAClient/dt/appconfig/icons/C/Citrix_ica_visio32.m.pm -lib/ICAClient/dt/appconfig/icons/C/Citrix_ica_winproj.m.pm -lib/ICAClient/dt/appconfig/icons/C/Citrix_ica_winword.m.pm -lib/ICAClient/dt/appconfig/icons/C/Citrix_ica_winzip32.m.pm -lib/ICAClient/dt/appconfig/icons/C/Editor.b.pm -lib/ICAClient/dt/appconfig/icons/C/Editor.l.pm -lib/ICAClient/dt/appconfig/icons/C/Editor.m.bm -lib/ICAClient/dt/appconfig/icons/C/Editor.m.pm -lib/ICAClient/dt/appconfig/icons/C/Editor.s.bm -lib/ICAClient/dt/appconfig/icons/C/Editor.s.pm -lib/ICAClient/dt/appconfig/icons/C/Editor.t.bm -lib/ICAClient/dt/appconfig/icons/C/Editor.t.pm -lib/ICAClient/dt/appconfig/icons/C/ICA.l.pm -lib/ICAClient/dt/appconfig/icons/C/ICA.m.pm -lib/ICAClient/dt/appconfig/icons/C/ICA.s.pm -lib/ICAClient/dt/appconfig/icons/C/ICA.t.pm -lib/ICAClient/dt/appconfig/types/C/Citrix.dt -lib/ICAClient/dt/appconfig/types/C/Citrix.fp -lib/ICAClient/dt/appconfig/types/C/Citrix_ica_excel.dt -lib/ICAClient/dt/appconfig/types/C/Citrix_ica_msaccess.dt -lib/ICAClient/dt/appconfig/types/C/Citrix_ica_outlook.dt -lib/ICAClient/dt/appconfig/types/C/Citrix_ica_powerpnt.dt -lib/ICAClient/dt/appconfig/types/C/Citrix_ica_visio32.dt -lib/ICAClient/dt/appconfig/types/C/Citrix_ica_winproj.dt -lib/ICAClient/dt/appconfig/types/C/Citrix_ica_winword.dt -lib/ICAClient/dt/appconfig/types/C/Citrix_ica_winzip32.dt -lib/ICAClient/keystore/cacerts/GTECTRoot.crt -lib/ICAClient/pkginf/F.core.solaris -lib/ICAClient/pkginf/Ver.core.solaris -@dirrm lib/ICAClient/.config -@dirrm lib/ICAClient/cache/zlcache -@dirrm lib/ICAClient/cache -@dirrm lib/ICAClient/dt/appconfig/help/C -@dirrm lib/ICAClient/dt/appconfig/help -@dirrm lib/ICAClient/dt/appconfig/icons/C -@dirrm lib/ICAClient/dt/appconfig/icons -@dirrm lib/ICAClient/dt/appconfig/types/C -@dirrm lib/ICAClient/dt/appconfig/types -@dirrm lib/ICAClient/dt/appconfig/appmanager/C/Citrix -@dirrm lib/ICAClient/dt/appconfig/appmanager/C -@dirrm lib/ICAClient/dt/appconfig/appmanager -@dirrm lib/ICAClient/dt/appconfig -@dirrm lib/ICAClient/dt -- cgit v1.2.3