Upgrade these ports to new versions. While we are here, clean

up the IGNORE message, and make the manual install idiot proof.
Remove the need for a dist subdir, let the user rename the
distfile to a more useful distname. Fix pkg-plist.

6 files changed, 40 insertions, 14 deletions

diff --git a/net/citrix_ica/Makefile b/net/citrix_ica/Makefile
index b9a5e37366fb..a2e3b03b5828 100644
--- a/net/citrix_ica/Makefile
+++ b/net/citrix_ica/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	citrix_ica
-PORTVERSION=	6.30.1050
+PORTVERSION=	6.30.1052
 CATEGORIES=	net comms linux
 MASTER_SITES=
-DISTNAME=	linuxx86
+DISTNAME=	${PORTNAME}-linuxx86
 
 MAINTAINER=	mbr@FreeBSD.org
 
@@ -19,7 +19,6 @@ ONLY_FOR_ARCHS=	i386
 RESTRICTED=	"License prohibits redistribution"
 IS_INTERACTIVE=	"Noisy license agreement ignores stdin"
 
-DIST_SUBDIR=	citrix_ica
 NO_WRKSUBDIR=	yes
 NO_BUILD=	yes
 
@@ -36,8 +35,22 @@ NSCP=	/usr/local/libexec/netscape \
 
 .include <bsd.port.pre.mk>
 
-.if !exists(${DISTDIR}/${DIST_SUBDIR}/${DISTNAME}${EXTRACT_SUFX})
-IGNORE='The distribution file for this port may not be automatically fetched due to licensing restrictions.  You MUST fetch the file manually after reading and agreeing to the license at: http://www.citrix.com/download/bin/license.asp?client=linux   Once ${DISTFILES} has been downloaded, move it to ${DISTDIR}/${DIST_SUBDIR} and then restart this build.'
+.if defined(BATCH) || defined(PACKAGE_BUILDING)
+IGNORE='The distribution file for this port may not be automatically fetched due to licensing restrictions.'
+.endif
+
+do-fetch:
+.if !exists(${DISTDIR}/${DISTNAME}${EXTRACT_SUFX})
+	@${ECHO} ""
+	@${ECHO} "You have to fetch the file manually after reading and"
+	@${ECHO} "agreeing to the license at:"
+	@${ECHO} ""
+	@${ECHO} "http://www.citrix.com/download/bin/license.asp?client=linux"
+	@${ECHO} ""
+	@${ECHO} "Once linuxx86.tar.gz has been downloaded move it to"
+	@${ECHO} "${DISTDIR}/${DISTNAME}${EXTRACT_SUFX} and restart the build."
+	@${ECHO} ""
+	@${FALSE}
 .endif
 
 do-install:
diff --git a/net/citrix_ica/distinfo b/net/citrix_ica/distinfo
index 9ed1db6fb9c4..d1ac98e87fbd 100644
--- a/net/citrix_ica/distinfo
+++ b/net/citrix_ica/distinfo
@@ -1 +1 @@
-MD5 (citrix_ica/linuxx86.tar.gz) = be308027ab909478788997f7de2a8321
+MD5 (citrix_ica-linuxx86.tar.gz) = be308027ab909478788997f7de2a8321
diff --git a/net/citrix_ica/pkg-plist b/net/citrix_ica/pkg-plist
index a98b6ced07f5..8cb11d924943 100644
--- a/net/citrix_ica/pkg-plist
+++ b/net/citrix_ica/pkg-plist
@@ -74,6 +74,7 @@ ICAClient/keyboard/sngr.kbd
 ICAClient/keyboard/sparc3.kbd
 ICAClient/keyboard/sparc4.kbd
 ICAClient/keyboard/sparc5.kbd
+ICAClient/keyboard/sparc6usb.kbd
 ICAClient/keyboard/sparcfr4.kbd
 ICAClient/keyboard/sparcfr5.kbd
 ICAClient/keyboard/sparcgr4.kbd
@@ -83,7 +84,6 @@ ICAClient/keyboard/sparcuk5.kbd
 ICAClient/keyboard/sparcus3.kbd
 ICAClient/keyboard/sparcus4.kbd
 ICAClient/keyboard/sparcus5.kbd
-ICAClient/keyboard/sparc6usb.kbd
 ICAClient/keyboard/trimodal.kbd
 ICAClient/keystore/cacerts/BTCTRoot.crt
 ICAClient/keystore/cacerts/Class3PCA_G2_v2.crt
diff --git a/net/citrix_xenapp/Makefile b/net/citrix_xenapp/Makefile
index b9a5e37366fb..a2e3b03b5828 100644
--- a/net/citrix_xenapp/Makefile
+++ b/net/citrix_xenapp/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	citrix_ica
-PORTVERSION=	6.30.1050
+PORTVERSION=	6.30.1052
 CATEGORIES=	net comms linux
 MASTER_SITES=
-DISTNAME=	linuxx86
+DISTNAME=	${PORTNAME}-linuxx86
 
 MAINTAINER=	mbr@FreeBSD.org
 
@@ -19,7 +19,6 @@ ONLY_FOR_ARCHS=	i386
 RESTRICTED=	"License prohibits redistribution"
 IS_INTERACTIVE=	"Noisy license agreement ignores stdin"
 
-DIST_SUBDIR=	citrix_ica
 NO_WRKSUBDIR=	yes
 NO_BUILD=	yes
 
@@ -36,8 +35,22 @@ NSCP=	/usr/local/libexec/netscape \
 
 .include <bsd.port.pre.mk>
 
-.if !exists(${DISTDIR}/${DIST_SUBDIR}/${DISTNAME}${EXTRACT_SUFX})
-IGNORE='The distribution file for this port may not be automatically fetched due to licensing restrictions.  You MUST fetch the file manually after reading and agreeing to the license at: http://www.citrix.com/download/bin/license.asp?client=linux   Once ${DISTFILES} has been downloaded, move it to ${DISTDIR}/${DIST_SUBDIR} and then restart this build.'
+.if defined(BATCH) || defined(PACKAGE_BUILDING)
+IGNORE='The distribution file for this port may not be automatically fetched due to licensing restrictions.'
+.endif
+
+do-fetch:
+.if !exists(${DISTDIR}/${DISTNAME}${EXTRACT_SUFX})
+	@${ECHO} ""
+	@${ECHO} "You have to fetch the file manually after reading and"
+	@${ECHO} "agreeing to the license at:"
+	@${ECHO} ""
+	@${ECHO} "http://www.citrix.com/download/bin/license.asp?client=linux"
+	@${ECHO} ""
+	@${ECHO} "Once linuxx86.tar.gz has been downloaded move it to"
+	@${ECHO} "${DISTDIR}/${DISTNAME}${EXTRACT_SUFX} and restart the build."
+	@${ECHO} ""
+	@${FALSE}
 .endif
 
 do-install:
diff --git a/net/citrix_xenapp/distinfo b/net/citrix_xenapp/distinfo
index 9ed1db6fb9c4..d1ac98e87fbd 100644
--- a/net/citrix_xenapp/distinfo
+++ b/net/citrix_xenapp/distinfo
@@ -1 +1 @@
-MD5 (citrix_ica/linuxx86.tar.gz) = be308027ab909478788997f7de2a8321
+MD5 (citrix_ica-linuxx86.tar.gz) = be308027ab909478788997f7de2a8321
diff --git a/net/citrix_xenapp/pkg-plist b/net/citrix_xenapp/pkg-plist
index a98b6ced07f5..8cb11d924943 100644
--- a/net/citrix_xenapp/pkg-plist
+++ b/net/citrix_xenapp/pkg-plist
@@ -74,6 +74,7 @@ ICAClient/keyboard/sngr.kbd
 ICAClient/keyboard/sparc3.kbd
 ICAClient/keyboard/sparc4.kbd
 ICAClient/keyboard/sparc5.kbd
+ICAClient/keyboard/sparc6usb.kbd
 ICAClient/keyboard/sparcfr4.kbd
 ICAClient/keyboard/sparcfr5.kbd
 ICAClient/keyboard/sparcgr4.kbd
@@ -83,7 +84,6 @@ ICAClient/keyboard/sparcuk5.kbd
 ICAClient/keyboard/sparcus3.kbd
 ICAClient/keyboard/sparcus4.kbd
 ICAClient/keyboard/sparcus5.kbd
-ICAClient/keyboard/sparc6usb.kbd
 ICAClient/keyboard/trimodal.kbd
 ICAClient/keystore/cacerts/BTCTRoot.crt
 ICAClient/keystore/cacerts/Class3PCA_G2_v2.crt