- add support for non-standard root certificates

- this patch gives the possibility to install extra certificates by
  setting the variable ICA_CERTS in /etc/make.conf
- bump PORTREVISION

PR:		ports/115944
Submitted by:	Edwin Groothuis <edwin_AT_mavetju.org>
Approved by:	clsung (mentor)

net/citrix_ica/Makefile

@@ -7,6 +7,7 @@
 
 PORTNAME=	citrix_ica
 PORTVERSION=	10.6
+PORTREVISION=	1
 CATEGORIES=	net comms linux
 MASTER_SITES=
 DISTNAME=	${PORTNAME}-linuxx86-${PORTVERSION}
@@ -26,23 +27,17 @@ NO_BUILD=	yes
 
 CDIR=		${PREFIX}/ICAClient
 BINDIR=		${PREFIX}/bin
-
+CERTDIR=	${CDIR}/keystore/cacerts
-NSCP=	${LOCALBASE}/libexec/netscape \
-	${LOCALBASE}/libexec/netscape-linux \
-	${LOCALBASE}/netscape \
-	${LOCALBASE}/netscape-linux \
-	${LOCALBASE}/lib/netscape \
-	${LOCALBASE}/lib/netscape-linux \
-	${MOZILLA_HOME}
 
 PLIST_SUB=	MOZILLA_HOME=${MOZILLA_HOME}
+.if defined(ICA_CERTS)
+PLIST_SUB+=	HAVE_ICA_CERTS="" ICA_CERTS="${ICA_CERTS}" CERTDIR="${CERTDIR}"
+.else
+PLIST_SUB+=	HAVE_ICA_CERTS="@comment "
+.endif
 
 .include <bsd.port.pre.mk>
 
-.if exists(${PREFIX}/bin/kde-config)
-HAVE_KDE=	"\\ny"
-.endif
-
 .if defined(BATCH) || defined(PACKAGE_BUILDING)
 IGNORE='The distribution file for this port may not be automatically fetched due to licensing restrictions.'
 .endif
@@ -60,6 +55,18 @@ do-fetch:
 	@${FALSE}
 .endif
 
+.if defined(ICA_CERTS)
+pre-fetch:
+.for f in ${ICA_CERTS}
+	@echo "Checking ${f}"
+.if !exists(${DISTDIR}/${f})
+	@echo "Cert ${f} not found."
+	@exit 1
+.endif
+.endfor
+.endif
+
+
 do-install:
 	@if (test -d "${CDIR}") ; \
 	then \
@@ -80,4 +87,10 @@ do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/wfica.x ${PREFIX}/bin/wfica
 # XXX: This is missing a "${BRANDELF} -t Linux <executables>".
 
+.if defined(ICA_CERTS)
+.for f in ${ICA_CERTS}
+	${INSTALL_DATA} ${DISTDIR}/${f} ${CERTDIR}
+.endfor
+.endif
+
 .include <bsd.port.post.mk>

net/citrix_ica/pkg-descr

@@ -10,4 +10,15 @@ Linux to access virtualized applications. Other important capabilities
 are powerful management and configuration tools and faster, more
 flexible printing.
 
+
+If your Citrix server does not have one of the supplied root-certificates,
+you can copy the certificate to /usr/ports/distfiles and add the
+following line to your /etc/make.conf:
+
+	ICA_CERTS=mycert.crt
+
+It will then automatically be installed and removed with the normal
+FreeBSD package tools.
+
+
 WWW: http://www.citrix.com/English/ps2/products/product.asp?contentID=186

net/citrix_ica/pkg-plist

@@ -98,6 +98,7 @@ ICAClient/keystore/cacerts/Class4PCA_G2_v2.crt
 ICAClient/keystore/cacerts/GTECTGlobalRoot.crt
 ICAClient/keystore/cacerts/Pcs3ss_v4.crt
 ICAClient/keystore/cacerts/SecureServer.crt
+%%HAVE_ICA_CERTS%%@unexec for f in %%ICA_CERTS%%; do rm %%CERTDIR%%/${f}; done
 ICAClient/libctxssl.so
 ICAClient/nls/en/UTF-8/Wfcmgr
 ICAClient/nls/en/UTF-8/Wfica

net/citrix_xenapp/Makefile

@@ -7,6 +7,7 @@
 
 PORTNAME=	citrix_ica
 PORTVERSION=	10.6
+PORTREVISION=	1
 CATEGORIES=	net comms linux
 MASTER_SITES=
 DISTNAME=	${PORTNAME}-linuxx86-${PORTVERSION}
@@ -26,23 +27,17 @@ NO_BUILD=	yes
 
 CDIR=		${PREFIX}/ICAClient
 BINDIR=		${PREFIX}/bin
-
+CERTDIR=	${CDIR}/keystore/cacerts
-NSCP=	${LOCALBASE}/libexec/netscape \
-	${LOCALBASE}/libexec/netscape-linux \
-	${LOCALBASE}/netscape \
-	${LOCALBASE}/netscape-linux \
-	${LOCALBASE}/lib/netscape \
-	${LOCALBASE}/lib/netscape-linux \
-	${MOZILLA_HOME}
 
 PLIST_SUB=	MOZILLA_HOME=${MOZILLA_HOME}
+.if defined(ICA_CERTS)
+PLIST_SUB+=	HAVE_ICA_CERTS="" ICA_CERTS="${ICA_CERTS}" CERTDIR="${CERTDIR}"
+.else
+PLIST_SUB+=	HAVE_ICA_CERTS="@comment "
+.endif
 
 .include <bsd.port.pre.mk>
 
-.if exists(${PREFIX}/bin/kde-config)
-HAVE_KDE=	"\\ny"
-.endif
-
 .if defined(BATCH) || defined(PACKAGE_BUILDING)
 IGNORE='The distribution file for this port may not be automatically fetched due to licensing restrictions.'
 .endif
@@ -60,6 +55,18 @@ do-fetch:
 	@${FALSE}
 .endif
 
+.if defined(ICA_CERTS)
+pre-fetch:
+.for f in ${ICA_CERTS}
+	@echo "Checking ${f}"
+.if !exists(${DISTDIR}/${f})
+	@echo "Cert ${f} not found."
+	@exit 1
+.endif
+.endfor
+.endif
+
+
 do-install:
 	@if (test -d "${CDIR}") ; \
 	then \
@@ -80,4 +87,10 @@ do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/wfica.x ${PREFIX}/bin/wfica
 # XXX: This is missing a "${BRANDELF} -t Linux <executables>".
 
+.if defined(ICA_CERTS)
+.for f in ${ICA_CERTS}
+	${INSTALL_DATA} ${DISTDIR}/${f} ${CERTDIR}
+.endfor
+.endif
+
 .include <bsd.port.post.mk>

net/citrix_xenapp/pkg-descr

@@ -10,4 +10,15 @@ Linux to access virtualized applications. Other important capabilities
 are powerful management and configuration tools and faster, more
 flexible printing.
 
+
+If your Citrix server does not have one of the supplied root-certificates,
+you can copy the certificate to /usr/ports/distfiles and add the
+following line to your /etc/make.conf:
+
+	ICA_CERTS=mycert.crt
+
+It will then automatically be installed and removed with the normal
+FreeBSD package tools.
+
+
 WWW: http://www.citrix.com/English/ps2/products/product.asp?contentID=186

net/citrix_xenapp/pkg-plist

@@ -98,6 +98,7 @@ ICAClient/keystore/cacerts/Class4PCA_G2_v2.crt
 ICAClient/keystore/cacerts/GTECTGlobalRoot.crt
 ICAClient/keystore/cacerts/Pcs3ss_v4.crt
 ICAClient/keystore/cacerts/SecureServer.crt
+%%HAVE_ICA_CERTS%%@unexec for f in %%ICA_CERTS%%; do rm %%CERTDIR%%/${f}; done
 ICAClient/libctxssl.so
 ICAClient/nls/en/UTF-8/Wfcmgr
 ICAClient/nls/en/UTF-8/Wfica