Update the port's supporting text and fetch behaviour as requested by

Citrix(R) via Michael Richtberg <michaelr@citrix.com>.

6 files changed, 72 insertions, 32 deletions

diff --git a/net/citrix_ica/Makefile b/net/citrix_ica/Makefile
index 21a8f7b13cf1..b60ce913c882 100644
--- a/net/citrix_ica/Makefile
+++ b/net/citrix_ica/Makefile
@@ -1,15 +1,15 @@
-# New ports collection makefile for:	Citrix ICA Client
+# New ports collection makefile for:	Citrix(R) ICA(R) Client
 # Version required:     2.80.76
 # Date created:         20 Sep 1998
 # Whom:                 msmith
 #
-# $Id: Makefile,v 1.1.1.1 1998/09/21 21:30:24 msmith Exp $
+# $Id: Makefile,v 1.2 1998/11/06 07:09:15 msmith Exp $
 #
 
 DISTNAME=       linux
 PKGNAME=	citrix_ica-2.8.1
 CATEGORIES=	comms
-MASTER_SITES=   http://citrix.com/bin/client/ICA/
+MASTER_SITES=   "Distfile must be fetched manually"
 EXTRACT_SUFX=	.tar.z
 
 MAINTAINER=     msmith@FreeBSD.ORG
@@ -25,6 +25,25 @@ IS_INTERACTIVE=	"Noisy license agreement ignores stdin"
 CDIR=           ${PREFIX}/lib/ICAClient
 BINDIR=		${PREFIX}/bin
 
+do-fetch:
+        @if [ ! -f ${DISTDIR}/${DISTFILES} ]; then \
+           ${ECHO} "" ; \
+           ${ECHO} "  The source to this port may not be automatically fetched" 
+; \
+           ${ECHO} "  due to licensing restrictions. You MUST fetch the source" 
+; \
+           ${ECHO} "  manually after reading and agreeing to the license at:" ; 
+\
+           ${ECHO} "" ; \
+           ${ECHO} "      http://download.citrix.com/download.asp?client=LINUX" ; \
+           ${ECHO} "" ; \
+           ${ECHO} "  Once ${DISTFILES} has been downloaded, move it to ${DISTDI
+R}" ; \
+           ${ECHO} "  and then restart this build." ; \
+           ${ECHO} "" ; \
+           exit 1 ; \
+        fi
+
 do-install:
 	${SED} s%DESTINATION%${CDIR}% < ${FILESDIR}/response \
 		> ${WRKSRC}/response
diff --git a/net/citrix_ica/pkg-comment b/net/citrix_ica/pkg-comment
index b8539a607a4d..8e8b719c4d86 100644
--- a/net/citrix_ica/pkg-comment
+++ b/net/citrix_ica/pkg-comment
@@ -1 +1 @@
-Citrix client for the Microsoft Windows Terminal Server.
+Citrix(R) client for the Microsoft Windows Terminal Server.
diff --git a/net/citrix_ica/pkg-descr b/net/citrix_ica/pkg-descr
index 26c4bbc6460b..251b29b00340 100644
--- a/net/citrix_ica/pkg-descr
+++ b/net/citrix_ica/pkg-descr
@@ -1,14 +1,15 @@
-Citrix MetaFrame is thin-client/server system software for Microsoft's
-Windows NT Server 4.0, Terminal Server Edition.  MetaFrame delivers a
-comprehensive thin-client/server solution to the enterprise by
-extending Windows Terminal Server with additional client and server
-functionality - including support for heterogeneous computing
-environments, enterprise-scale management and seamless desktop
-integration. MetaFrame transforms the way organizations deploy, manage
-and access business applications by providing improved application
-manageability, access, performance and security. Citrix MetaFrame
-system software, which incorporates Citrix's Independent Computing
-Architecture (ICA), provides a complete thin-client/server computing
-solution for multi-user NT 4.0 environments.
+Citrix(R) MetaFrame(TM) is thin-client/server system software for
+Microsoft's Windows NT Server 4.0, Terminal Server Edition.
+MetaFrame(TM) delivers a comprehensive thin-client/server solution to
+the enterprise by extending Windows Terminal Server with additional
+client and server functionality - including support for heterogeneous
+computing environments, enterprise-scale management and seamless
+desktop integration. MetaFrame(TM) transforms the way organizations
+deploy, manage and access business applications by providing improved
+application manageability, access, performance and security. Citrix(R)
+MetaFrame(TM) system software, which incorporates Citrix's Independent
+Computing Architecture (ICA)(R), provides a complete
+thin-client/server computing solution for multi-user NT 4.0
+environments.
 
 (From http://www.citrix.com/products/metaframe.asp)
diff --git a/net/citrix_xenapp/Makefile b/net/citrix_xenapp/Makefile
index 21a8f7b13cf1..b60ce913c882 100644
--- a/net/citrix_xenapp/Makefile
+++ b/net/citrix_xenapp/Makefile
@@ -1,15 +1,15 @@
-# New ports collection makefile for:	Citrix ICA Client
+# New ports collection makefile for:	Citrix(R) ICA(R) Client
 # Version required:     2.80.76
 # Date created:         20 Sep 1998
 # Whom:                 msmith
 #
-# $Id: Makefile,v 1.1.1.1 1998/09/21 21:30:24 msmith Exp $
+# $Id: Makefile,v 1.2 1998/11/06 07:09:15 msmith Exp $
 #
 
 DISTNAME=       linux
 PKGNAME=	citrix_ica-2.8.1
 CATEGORIES=	comms
-MASTER_SITES=   http://citrix.com/bin/client/ICA/
+MASTER_SITES=   "Distfile must be fetched manually"
 EXTRACT_SUFX=	.tar.z
 
 MAINTAINER=     msmith@FreeBSD.ORG
@@ -25,6 +25,25 @@ IS_INTERACTIVE=	"Noisy license agreement ignores stdin"
 CDIR=           ${PREFIX}/lib/ICAClient
 BINDIR=		${PREFIX}/bin
 
+do-fetch:
+        @if [ ! -f ${DISTDIR}/${DISTFILES} ]; then \
+           ${ECHO} "" ; \
+           ${ECHO} "  The source to this port may not be automatically fetched" 
+; \
+           ${ECHO} "  due to licensing restrictions. You MUST fetch the source" 
+; \
+           ${ECHO} "  manually after reading and agreeing to the license at:" ; 
+\
+           ${ECHO} "" ; \
+           ${ECHO} "      http://download.citrix.com/download.asp?client=LINUX" ; \
+           ${ECHO} "" ; \
+           ${ECHO} "  Once ${DISTFILES} has been downloaded, move it to ${DISTDI
+R}" ; \
+           ${ECHO} "  and then restart this build." ; \
+           ${ECHO} "" ; \
+           exit 1 ; \
+        fi
+
 do-install:
 	${SED} s%DESTINATION%${CDIR}% < ${FILESDIR}/response \
 		> ${WRKSRC}/response
diff --git a/net/citrix_xenapp/pkg-comment b/net/citrix_xenapp/pkg-comment
index b8539a607a4d..8e8b719c4d86 100644
--- a/net/citrix_xenapp/pkg-comment
+++ b/net/citrix_xenapp/pkg-comment
@@ -1 +1 @@
-Citrix client for the Microsoft Windows Terminal Server.
+Citrix(R) client for the Microsoft Windows Terminal Server.
diff --git a/net/citrix_xenapp/pkg-descr b/net/citrix_xenapp/pkg-descr
index 26c4bbc6460b..251b29b00340 100644
--- a/net/citrix_xenapp/pkg-descr
+++ b/net/citrix_xenapp/pkg-descr
@@ -1,14 +1,15 @@
-Citrix MetaFrame is thin-client/server system software for Microsoft's
-Windows NT Server 4.0, Terminal Server Edition.  MetaFrame delivers a
-comprehensive thin-client/server solution to the enterprise by
-extending Windows Terminal Server with additional client and server
-functionality - including support for heterogeneous computing
-environments, enterprise-scale management and seamless desktop
-integration. MetaFrame transforms the way organizations deploy, manage
-and access business applications by providing improved application
-manageability, access, performance and security. Citrix MetaFrame
-system software, which incorporates Citrix's Independent Computing
-Architecture (ICA), provides a complete thin-client/server computing
-solution for multi-user NT 4.0 environments.
+Citrix(R) MetaFrame(TM) is thin-client/server system software for
+Microsoft's Windows NT Server 4.0, Terminal Server Edition.
+MetaFrame(TM) delivers a comprehensive thin-client/server solution to
+the enterprise by extending Windows Terminal Server with additional
+client and server functionality - including support for heterogeneous
+computing environments, enterprise-scale management and seamless
+desktop integration. MetaFrame(TM) transforms the way organizations
+deploy, manage and access business applications by providing improved
+application manageability, access, performance and security. Citrix(R)
+MetaFrame(TM) system software, which incorporates Citrix's Independent
+Computing Architecture (ICA)(R), provides a complete
+thin-client/server computing solution for multi-user NT 4.0
+environments.
 
 (From http://www.citrix.com/products/metaframe.asp)