Attachment #43541 for bug #67576

Lines 6-12 Link Here

(-)Makefile (-4 / +6 lines)
6	#	6	#
7		7
8	PORTNAME= citrix_ica	8	PORTNAME= citrix_ica
9	PORTVERSION= 7.00	9	PORTVERSION= 8.00
10	PORTREVISION= 1	10	PORTREVISION= 1
11	CATEGORIES= net comms linux	11	CATEGORIES= net comms linux
12	MASTER_SITES=	12	MASTER_SITES=
Lines 35-40 Link Here
35	/usr/local/lib/netscape-linux \	35	/usr/local/lib/netscape-linux \
36	${MOZILLA_HOME}	36	${MOZILLA_HOME}
37		37
		38	PLIST_SUB= MOZILLA_HOME=${MOZILLA_HOME}
		39
38	.include <bsd.port.pre.mk>	40	.include <bsd.port.pre.mk>
39		41
40	.if exists(${PREFIX}/bin/kde-config)	42	.if exists(${PREFIX}/bin/kde-config)
Lines 71-83 Link Here
71	${FALSE} ; \	73	${FALSE} ; \
72	fi	74	fi
73		75
74	@${ECHO_CMD} -e "1\n${CDIR}\ny\ny\ny\ny${HAVE_KDE}\n3" > ${WRKSRC}/response ;	76	@${ECHO_CMD} -e "1\n${CDIR}\ny\n1\ny${HAVE_KDE}\n3" > ${WRKSRC}/response ;
75	@for dir in ${NSCP}; do \	77	@for dir in ${NSCP}; do \
76	if [ -e $${dir}/plugins/libnullplugin.so ]; then \	78	if [ -e $${dir}/plugins/libnullplugin.so ]; then \
77	BIN=`${FILE} $${dir}/plugins/libnullplugin.so \| ${AWK} '{print $$11}'` ; \	79	BIN=`${FILE} ${dir}/plugins/libnullplugin.so \| ${AWK} '{print $11}'` ; \
78	case $${BIN} in \	80	case $${BIN} in \
79	$SYSV$,) \	81	$SYSV$,) \
80	${ECHO_CMD} -e "1\n${CDIR}\ny\ny\ny${HAVE_KDE}\n3" > ${WRKSRC}/response ; \	82	${ECHO_CMD} -e "1\n${CDIR}\ny\n1\ny${HAVE_KDE}\n3" > ${WRKSRC}/response ; \
81	esac \	83	esac \
82	fi \	84	fi \
83	done	85	done

Line 1 Link Here

(-)distinfo (-1 / +2 lines)
1	MD5 (citrix_ica-linuxx86-7.00.tar.gz) = d4efd8075afc1e96646cad4acb740033	1	MD5 (citrix_ica-linuxx86-8.00.tar.gz) = c6622eed6ac9666bac578dccfcb81cee
		2	SIZE (citrix_ica-linuxx86-8.00.tar.gz) = 1564536




@unexec for dir in /usr/local/libexec/netscape /usr/local/libexec/netscape-linux /usr/local/netscape /usr/local/netscape-linux /usr/local/lib/netscape /usr/local/lib/netscape-linux %%MOZILLA_HOME%% %D/lib/netscape-linux; do if [ -f ${dir}/mime.types ]; then (/bin/cat ${dir}/mime.types | /usr/bin/grep -v "application/x-ica" > ${dir}/mime.types.tmp; mv ${dir}/mime.types.tmp ${dir}/mime.types); fi ; done
@unexec for dir in /usr/local/libexec/netscape /usr/local/libexec/netscape-linux /usr/local/netscape /usr/local/netscape-linux /usr/local/lib/netscape /usr/local/lib/netscape-linux %%MOZILLA_HOME%% %D/lib/netscape-linux; do if [ -f ${dir}/mailcap ]; then (/bin/cat ${dir}/mailcap | /usr/bin/grep -v "application/x-ica" > ${dir}/mailcap.tmp; /bin/mv ${dir}/mailcap.tmp ${dir}/mailcap); fi ; done
@unexec for dir in /usr/local/libexec/netscape /usr/local/libexec/netscape-linux /usr/local/netscape /usr/local/netscape-linux /usr/local/lib/netscape /usr/local/lib/netscape-linux %%MOZILLA_HOME%% %D/lib/netscape-linux; do if [ -e ${dir}/plugins/npica.so ]; then (/bin/rm ${dir}/plugins/npica.so); fi ; done
ICAClient/.config/appsrv.ini
ICAClient/.config/keyboard.ini
ICAClient/.config/module.ini
ICAClient/.config/wfclient.ini
ICAClient/libctxssl.so
ICAClient/Npica
ICAClient/Npica.ad
ICAClient/CHARICONV.DLL
ICAClient/PDCRYPT1.DLL
ICAClient/PDCRYPT2.DLL
ICAClient/TW1.DLL
ICAClient/VDCM.DLL
ICAClient/VDSCARD.DLL
ICAClient/Wfcmgr
ICAClient/Wfcmgr.ad

ICAClient/desktop/Citrix_PNA.desktop
ICAClient/eula.txt
ICAClient/help/index.htm
ICAClient/icons/citrix16.xpm
ICAClient/icons/citrix32.xpm
ICAClient/icons/citrix48.xpm
ICAClient/icons/ica64.xpm
ICAClient/icons/pn32.xpm
ICAClient/install.txt
ICAClient/keyboard/age2.kbd
ICAClient/keyboard/agex2.kbd

ICAClient/keyboard/ibm.kbd
ICAClient/keyboard/keyboard.ini
ICAClient/keyboard/linux.kbd
ICAClient/keyboard/linux-ja.kbd
ICAClient/keyboard/mac101.kbd
ICAClient/keyboard/ncdn-101.kbd
ICAClient/keyboard/ncdn-102.kbd

bin/wfica
@dirrm ICAClient/.config
@dirrm ICAClient/cache/zlcache
@unexec find %D/ICAClient/cache/ -type f -exec rm {} \; 2>&1 >/dev/null || true
@dirrm ICAClient/cache
@dirrm ICAClient/config
@dirrm ICAClient/desktop




--- linuxx86/hinst.orig	Fri May  7 14:44:44 2004
+++ linuxx86/hinst	Fri Jun  4 17:44:53 2004
@@ -2142,10 +2142,34 @@
 #
 ###############################################################################
 

 PLUGIN_NAME=npica.so
 PLUGIN_CLASS=ICAClObj.class
 MAILCAP_FILE=mailcap
@@ -2218,36 +2242,29 @@
 
 netscape_integrate()
 {

 
     # Create utility script files in install root.
     create_wfica_script
@@ -2878,55 +2895,6 @@
     echo "$BINDIR"
 }
 

-    PROGS="netscape mozilla"
-    DIST_BIN_DIR=""
-    STANDARD_DIRS="/usr/local/netscape /usr/local/mozilla"
-
-    case $op_system in
-       SunOS) if
-                 /usr/bin/pkginfo -q $SOLARIS_PACKAGE_NAME
-              then
-                 relocation_base=`/usr/bin/pkginfo -r $SOLARIS_PACKAGE_NAME`
-                 STANDARD_DIRS="$STANDARD_DIRS $relocation_base/$SOLARIS_PACKAGE_DIRECTORY"
-
-                 # N.B. the Netscape 7 packages for SOLARIS 9 have an extended installation path built-in!
-                 case `uname -r` in
-                    5.9) STANDARD_DIRS="$STANDARD_DIRS $relocation_base/dt/appconfig/$SOLARIS_PACKAGE_DIRECTORY"
-                         ;;
-                    *)   ;;
-                 esac
-              fi;;
-       *) ;;
-    esac
-
-    for d in `echo $PATH | sed "s/:/ /g"` $STANDARD_DIRS
-    do
-	echo $d

 BROWSER_LIST_KEY="BROWSER_DIR"
 ################################################################################
 #
@@ -3151,6 +3119,8 @@
 wfcmgr_ja_NAME='Citrix ICA クライアント'
 
 DEFAULT_GNOME_TARGET_DIRS="/usr/share/applications \
+                           /usr/local/share/applnk/Internet \
+                           /usr/local/share/applnk/Networking \
                            /etc/opt/gnome/SuSE/Internet"
 DEFAULT_KDE_TARGET_DIRS="/usr/share/applnk/Applications \
                         /usr/share/applnk-redhat/Internet \
                         /usr/share/applnk-mdk/Networking"
 DEFAULT_DT_FOLDER="Applications"

Return to bug 67576

Lines 1-15 Link Here

(-)pkg-plist (-9 / +12 lines)
1	@unexec if [ -f %D/lib/netscape-linux/mime.types ]; then (/bin/cat %D/lib/netscape-linux/mime.types \| /usr/bin/grep -v "application/x-ica" > %D/lib/netscape-linux/mime.types.tmp; mv %D/lib/netscape-linux/mime.types.tmp %D/lib/netscape-linux/mime.types); fi	1	@unexec for dir in /usr/local/libexec/netscape /usr/local/libexec/netscape-linux /usr/local/netscape /usr/local/netscape-linux /usr/local/lib/netscape /usr/local/lib/netscape-linux %%MOZILLA_HOME%% %D/lib/netscape-linux; do if [ -f ${dir}/mime.types ]; then (/bin/cat ${dir}/mime.types \| /usr/bin/grep -v "application/x-ica" > ${dir}/mime.types.tmp; mv ${dir}/mime.types.tmp ${dir}/mime.types); fi ; done
2	@unexec if [ -f %D/lib/netscape-linux/mailcap ]; then (/bin/cat %D/lib/netscape-linux/mailcap \| /usr/bin/grep -v "application/x-ica" > %D/lib/netscape-linux/mailcap.tmp; /bin/mv %D/lib/netscape-linux/mailcap.tmp %D/lib/netscape-linux/mailcap); fi	2	@unexec for dir in /usr/local/libexec/netscape /usr/local/libexec/netscape-linux /usr/local/netscape /usr/local/netscape-linux /usr/local/lib/netscape /usr/local/lib/netscape-linux %%MOZILLA_HOME%% %D/lib/netscape-linux; do if [ -f ${dir}/mailcap ]; then (/bin/cat ${dir}/mailcap \| /usr/bin/grep -v "application/x-ica" > ${dir}/mailcap.tmp; /bin/mv ${dir}/mailcap.tmp ${dir}/mailcap); fi ; done
3	@unexec if [ -e %D/lib/netscape-linux/plugins/npica.so ]; then (/bin/rm %D/lib/netscape-linux/plugins/npica.so); fi	3	@unexec for dir in /usr/local/libexec/netscape /usr/local/libexec/netscape-linux /usr/local/netscape /usr/local/netscape-linux /usr/local/lib/netscape /usr/local/lib/netscape-linux %%MOZILLA_HOME%% %D/lib/netscape-linux; do if [ -e ${dir}/plugins/npica.so ]; then (/bin/rm ${dir}/plugins/npica.so); fi ; done
4	ICAClient/.config/appsrv.ini	4	ICAClient/.config/appsrv.ini
5	ICAClient/.config/keyboard.ini	5	ICAClient/.config/keyboard.ini
6	ICAClient/.config/module.ini	6	ICAClient/.config/module.ini
7	ICAClient/.config/wfclient.ini	7	ICAClient/.config/wfclient.ini
		8	ICAClient/libctxssl.so
8	ICAClient/Npica	9	ICAClient/Npica
9	ICAClient/Npica.ad	10	ICAClient/Npica.ad
		11	ICAClient/CHARICONV.DLL
10	ICAClient/PDCRYPT1.DLL	12	ICAClient/PDCRYPT1.DLL
11	ICAClient/PDCRYPT2.DLL	13	ICAClient/PDCRYPT2.DLL
12	ICAClient/SSL.DLL	14	ICAClient/TW1.DLL
		15	ICAClient/VDCM.DLL
13	ICAClient/VDSCARD.DLL	16	ICAClient/VDSCARD.DLL
14	ICAClient/Wfcmgr	17	ICAClient/Wfcmgr
15	ICAClient/Wfcmgr.ad	18	ICAClient/Wfcmgr.ad
Lines 23-33 Link Here
23	ICAClient/desktop/Citrix_PNA.desktop	26	ICAClient/desktop/Citrix_PNA.desktop
24	ICAClient/eula.txt	27	ICAClient/eula.txt
25	ICAClient/help/index.htm	28	ICAClient/help/index.htm
26	ICAClient/icons/ica16.xpm	29	ICAClient/icons/citrix16.xpm
27	ICAClient/icons/ica32.xpm	30	ICAClient/icons/citrix32.xpm
28	ICAClient/icons/ica48.xpm	31	ICAClient/icons/citrix48.xpm
29	ICAClient/icons/ica64.xpm
30	ICAClient/icons/pn32.xpm
31	ICAClient/install.txt	32	ICAClient/install.txt
32	ICAClient/keyboard/age2.kbd	33	ICAClient/keyboard/age2.kbd
33	ICAClient/keyboard/agex2.kbd	34	ICAClient/keyboard/agex2.kbd
Lines 61-66 Link Here
61	ICAClient/keyboard/ibm.kbd	62	ICAClient/keyboard/ibm.kbd
62	ICAClient/keyboard/keyboard.ini	63	ICAClient/keyboard/keyboard.ini
63	ICAClient/keyboard/linux.kbd	64	ICAClient/keyboard/linux.kbd
		65	ICAClient/keyboard/linux-ja.kbd
64	ICAClient/keyboard/mac101.kbd	66	ICAClient/keyboard/mac101.kbd
65	ICAClient/keyboard/ncdn-101.kbd	67	ICAClient/keyboard/ncdn-101.kbd
66	ICAClient/keyboard/ncdn-102.kbd	68	ICAClient/keyboard/ncdn-102.kbd
Lines 118-123 Link Here
118	bin/wfica	120	bin/wfica
119	@dirrm ICAClient/.config	121	@dirrm ICAClient/.config
120	@dirrm ICAClient/cache/zlcache	122	@dirrm ICAClient/cache/zlcache
		123	@unexec find %D/ICAClient/cache/ -type f -exec rm {} \; 2>&1 >/dev/null \|\| true
121	@dirrm ICAClient/cache	124	@dirrm ICAClient/cache
122	@dirrm ICAClient/config	125	@dirrm ICAClient/config
123	@dirrm ICAClient/desktop	126	@dirrm ICAClient/desktop

Lines 1-6 Link Here

(-)files/patch-linuxx86::hinst (-13 / +31 lines)
1	--- linuxx86/hinst.orig Thu May 22 12:30:28 2003	1	--- linuxx86/hinst.orig Fri May 7 14:44:44 2004
2	+++ linuxx86/hinst Mon Aug 11 16:52:05 2003	2	+++ linuxx86/hinst Fri Jun 4 17:44:53 2004
3	@@ -2132,10 +2132,34 @@	3	@@ -2142,10 +2142,34 @@
4	#	4	#
5	###############################################################################	5	###############################################################################
6		6
Lines 37-43 Link Here
37	PLUGIN_NAME=npica.so	37	PLUGIN_NAME=npica.so
38	PLUGIN_CLASS=ICAClObj.class	38	PLUGIN_CLASS=ICAClObj.class
39	MAILCAP_FILE=mailcap	39	MAILCAP_FILE=mailcap
40	@@ -2206,36 +2230,29 @@	40	@@ -2218,36 +2242,29 @@
41		41
42	netscape_integrate()	42	netscape_integrate()
43	{	43	{
Lines 83-89 Link Here
83		83
84	# Create utility script files in install root.	84	# Create utility script files in install root.
85	create_wfica_script	85	create_wfica_script
86	@@ -2866,37 +2883,6 @@	86	@@ -2878,55 +2895,6 @@
87	echo "$BINDIR"	87	echo "$BINDIR"
88	}	88	}
89		89
Lines 100-105 Link Here
100	- PROGS="netscape mozilla"	100	- PROGS="netscape mozilla"
101	- DIST_BIN_DIR=""	101	- DIST_BIN_DIR=""
102	- STANDARD_DIRS="/usr/local/netscape /usr/local/mozilla"	102	- STANDARD_DIRS="/usr/local/netscape /usr/local/mozilla"
		103	-
		104	- case $op_system in
		105	- SunOS) if
		106	- /usr/bin/pkginfo -q $SOLARIS_PACKAGE_NAME
		107	- then
		108	- relocation_base=`/usr/bin/pkginfo -r $SOLARIS_PACKAGE_NAME`
		109	- STANDARD_DIRS="$STANDARD_DIRS $relocation_base/$SOLARIS_PACKAGE_DIRECTORY"
		110	-
		111	- # N.B. the Netscape 7 packages for SOLARIS 9 have an extended installation path built-in!
		112	- case `uname -r` in
		113	- 5.9) STANDARD_DIRS="$STANDARD_DIRS $relocation_base/dt/appconfig/$SOLARIS_PACKAGE_DIRECTORY"
		114	- ;;
		115	- *) ;;
		116	- esac
		117	- fi;;
		118	- *) ;;
		119	- esac
		120	-
103	- for d in `echo $PATH \| sed "s/:/ /g"` $STANDARD_DIRS	121	- for d in `echo $PATH \| sed "s/:/ /g"` $STANDARD_DIRS
104	- do	122	- do
105	- echo $d	123	- echo $d
Lines 121-132 Link Here
121	BROWSER_LIST_KEY="BROWSER_DIR"	139	BROWSER_LIST_KEY="BROWSER_DIR"
122	################################################################################	140	################################################################################
123	#	141	#
124	@@ -3119,6 +3105,8 @@	142	@@ -3151,6 +3119,8 @@
125	wfcmgr_NAME='Citrix ICA Client'	143	wfcmgr_ja_NAME='Citrix ICA クライアント'
126	DEFAULT_DT_TARGET_DIRS="/usr/share/applications \	144
127	/usr/share/applnk/Applications \	145	DEFAULT_GNOME_TARGET_DIRS="/usr/share/applications \
128	+ /usr/local/share/applnk/Internet \	146	+ /usr/local/share/applnk/Internet \
129	+ /usr/local/share/applnk/Networking \	147	+ /usr/local/share/applnk/Networking \
		148	/etc/opt/gnome/SuSE/Internet"
		149	DEFAULT_KDE_TARGET_DIRS="/usr/share/applnk/Applications \
130	/usr/share/applnk-redhat/Internet \	150	/usr/share/applnk-redhat/Internet \
131	/usr/share/applnk-mdk/Networking"
132	DEFAULT_DT_FOLDER="Applications"