Swap contents of PLIST.pre and PLIST.post; dirrm's should be in PLIST.post.

2 files changed, 226 insertions, 226 deletions

diff --git a/net/citrix_ica/pkg/PLIST.post b/net/citrix_ica/pkg/PLIST.post
index ca86d5451f4..07c3917f5e2 100644
--- a/net/citrix_ica/pkg/PLIST.post
+++ b/net/citrix_ica/pkg/PLIST.post
@@ -1,216 +1,10 @@
-@comment $NetBSD: PLIST.post,v 1.1 2001/05/05 17:24:14 dmcmahill Exp $
-bin/wfcmgr
-bin/wfica
-lib/ICAClient/Npica
-lib/ICAClient/Npica.ad
-lib/ICAClient/PDCRYPT1.DLL
-lib/ICAClient/PDCRYPT2.DLL
-lib/ICAClient/Wfcmgr
-lib/ICAClient/Wfica
-lib/ICAClient/Wfcmgr.ad
-lib/ICAClient/Wfica.ad
-lib/ICAClient/eula.txt
-lib/ICAClient/install.txt
-lib/ICAClient/npica.so
-lib/ICAClient/readme.txt
-lib/ICAClient/setupwfc
-lib/ICAClient/wfcmgr
-lib/ICAClient/wfica
-lib/ICAClient/.config/appsrv.ini
-lib/ICAClient/.config/keyboard.ini
-lib/ICAClient/.config/module.ini
-lib/ICAClient/.config/wfclient.ini
-lib/ICAClient/config/.server
-lib/ICAClient/config/appsrv.ini
-lib/ICAClient/config/module.ini
-lib/ICAClient/config/wfclient.ini
-lib/ICAClient/help/1a.gif
-lib/ICAClient/help/3a.gif
-lib/ICAClient/help/3b.gif
-lib/ICAClient/help/3c.gif
-lib/ICAClient/help/3d.gif
-lib/ICAClient/help/3f.gif
-lib/ICAClient/help/3g.gif
-lib/ICAClient/help/3h.gif
-lib/ICAClient/help/3i.gif
-lib/ICAClient/help/3l.gif
-lib/ICAClient/help/3m.gif
-lib/ICAClient/help/3n.gif
-lib/ICAClient/help/3o.gif
-lib/ICAClient/help/3p.gif
-lib/ICAClient/help/3q.gif
-lib/ICAClient/help/3r.gif
-lib/ICAClient/help/3s.gif
-lib/ICAClient/help/3t.gif
-lib/ICAClient/help/3u.gif
-lib/ICAClient/help/3v.gif
-lib/ICAClient/help/3w.gif
-lib/ICAClient/help/3x.gif
-lib/ICAClient/help/3y.gif
-lib/ICAClient/help/4a.gif
-lib/ICAClient/help/4b.gif
-lib/ICAClient/help/4c.gif
-lib/ICAClient/help/4d.gif
-lib/ICAClient/help/4e.gif
-lib/ICAClient/help/4f.gif
-lib/ICAClient/help/4g.gif
-lib/ICAClient/help/4h.gif
-lib/ICAClient/help/4i.gif
-lib/ICAClient/help/4k.gif
-lib/ICAClient/help/DIGITAL.gif
-lib/ICAClient/help/HP.gif
-lib/ICAClient/help/IBM.gif
-lib/ICAClient/help/LINUX.gif
-lib/ICAClient/help/SCO.gif
-lib/ICAClient/help/SG.gif
-lib/ICAClient/help/SPARC.gif
-lib/ICAClient/help/contents.gif
-lib/ICAClient/help/contents.htm
-lib/ICAClient/help/ctx00013.htm
-lib/ICAClient/help/ctx00014.htm
-lib/ICAClient/help/ctx00015.htm
-lib/ICAClient/help/ctx00016.htm
-lib/ICAClient/help/ctx00017.htm
-lib/ICAClient/help/ctx00018.htm
-lib/ICAClient/help/ctx00019.htm
-lib/ICAClient/help/ctx00020.htm
-lib/ICAClient/help/ctx00021.htm
-lib/ICAClient/help/ctx00022.htm
-lib/ICAClient/help/ctx00023.htm
-lib/ICAClient/help/ctx00025.htm
-lib/ICAClient/help/ctx00026.htm
-lib/ICAClient/help/ctx00027.htm
-lib/ICAClient/help/ctx00028.htm
-lib/ICAClient/help/ctx00029.htm
-lib/ICAClient/help/ctx00030.htm
-lib/ICAClient/help/ctx00031.htm
-lib/ICAClient/help/ctx00032.htm
-lib/ICAClient/help/ctx00033.htm
-lib/ICAClient/help/ctx00034.htm
-lib/ICAClient/help/ctx00035.htm
-lib/ICAClient/help/ctx00195.htm
-lib/ICAClient/help/ctx00196.htm
-lib/ICAClient/help/ctx00197.htm
-lib/ICAClient/help/ctx00198.htm
-lib/ICAClient/help/ctx00199.htm
-lib/ICAClient/help/ctx00200.htm
-lib/ICAClient/help/ctx00201.htm
-lib/ICAClient/help/ctx00202.htm
-lib/ICAClient/help/ctx00203.htm
-lib/ICAClient/help/ctx00204.htm
-lib/ICAClient/help/ctx00205.htm
-lib/ICAClient/help/ctx00206.htm
-lib/ICAClient/help/ctx00207.htm
-lib/ICAClient/help/ctx00208.htm
-lib/ICAClient/help/ctx00209.htm
-lib/ICAClient/help/ctx00210.htm
-lib/ICAClient/help/ctx00211.htm
-lib/ICAClient/help/comport.gif
-lib/ICAClient/help/firewall.gif
-lib/ICAClient/help/hotkeys.gif
-lib/ICAClient/help/index.gif
-lib/ICAClient/help/index.htm
-lib/ICAClient/help/index_a.gif
-lib/ICAClient/help/index_b.gif
-lib/ICAClient/help/index_c.gif
-lib/ICAClient/help/index_d.gif
-lib/ICAClient/help/index_e.gif
-lib/ICAClient/help/index_f.gif
-lib/ICAClient/help/index_g.gif
-lib/ICAClient/help/index_h.gif
-lib/ICAClient/help/index_i.gif
-lib/ICAClient/help/index_j.gif
-lib/ICAClient/help/index_k.gif
-lib/ICAClient/help/index_l.gif
-lib/ICAClient/help/index_m.gif
-lib/ICAClient/help/index_n.gif
-lib/ICAClient/help/index_o.gif
-lib/ICAClient/help/index_p.gif
-lib/ICAClient/help/index_q.gif
-lib/ICAClient/help/index_r.gif
-lib/ICAClient/help/index_s.gif
-lib/ICAClient/help/index_t.gif
-lib/ICAClient/help/index_u.gif
-lib/ICAClient/help/index_v.gif
-lib/ICAClient/help/index_w.gif
-lib/ICAClient/help/index_x.gif
-lib/ICAClient/help/index_y.gif
-lib/ICAClient/help/index_z.gif
-lib/ICAClient/help/login.gif
-lib/ICAClient/help/next0.gif
-lib/ICAClient/help/next1.gif
-lib/ICAClient/help/prev0.gif
-lib/ICAClient/help/prev1.gif
-lib/ICAClient/help/prop_conn.gif
-lib/ICAClient/help/properties_network.gif
-lib/ICAClient/help/sett_cache.gif
-lib/ICAClient/help/sett_cdm.gif
-lib/ICAClient/help/settings_diskc.gif
-lib/ICAClient/icons/ica16.xpm
-lib/ICAClient/icons/ica32.xpm
-lib/ICAClient/icons/ica48.xpm
-lib/ICAClient/icons/ica64.xpm
-lib/ICAClient/keyboard/age2.kbd
-lib/ICAClient/keyboard/agex2.kbd
-lib/ICAClient/keyboard/automatic.kbd
-lib/ICAClient/keyboard/dcint401.kbd
-lib/ICAClient/keyboard/dcintpcx.kbd
-lib/ICAClient/keyboard/dcus401.kbd
-lib/ICAClient/keyboard/dcuspcx.kbd
-lib/ICAClient/keyboard/dec401.kbd
-lib/ICAClient/keyboard/dec401uk.kbd
-lib/ICAClient/keyboard/decpcx.kbd
-lib/ICAClient/keyboard/decpcxuk.kbd
-lib/ICAClient/keyboard/dg.kbd
-lib/ICAClient/keyboard/dgfr.kbd
-lib/ICAClient/keyboard/dggr.kbd
-lib/ICAClient/keyboard/dguk.kbd
-lib/ICAClient/keyboard/dgus.kbd
-lib/ICAClient/keyboard/hp101.kbd
-lib/ICAClient/keyboard/hpfritf.kbd
-lib/ICAClient/keyboard/hpgritf.kbd
-lib/ICAClient/keyboard/hpint101.kbd
-lib/ICAClient/keyboard/hpintps2.kbd
-lib/ICAClient/keyboard/hpitf.kbd
-lib/ICAClient/keyboard/hpps2.kbd
-lib/ICAClient/keyboard/hpuk101.kbd
-lib/ICAClient/keyboard/hpukitf.kbd
-lib/ICAClient/keyboard/hpukps2.kbd
-lib/ICAClient/keyboard/hpus101.kbd
-lib/ICAClient/keyboard/hpusitf.kbd
-lib/ICAClient/keyboard/hpusps2.kbd
-lib/ICAClient/keyboard/ibm.kbd
-lib/ICAClient/keyboard/keyboard.ini
-lib/ICAClient/keyboard/linux.kbd
-lib/ICAClient/keyboard/mac101.kbd
-lib/ICAClient/keyboard/netbsd.kbd
-lib/ICAClient/keyboard/ncdn-101.kbd
-lib/ICAClient/keyboard/ncdn-102.kbd
-lib/ICAClient/keyboard/scoos5.kbd
-lib/ICAClient/keyboard/scouw2.kbd
-lib/ICAClient/keyboard/sg.kbd
-lib/ICAClient/keyboard/sgindy.kbd
-lib/ICAClient/keyboard/sgindyfr.kbd
-lib/ICAClient/keyboard/sgindygr.kbd
-lib/ICAClient/keyboard/sgindyuk.kbd
-lib/ICAClient/keyboard/sgindyus.kbd
-lib/ICAClient/keyboard/sngr.kbd
-lib/ICAClient/keyboard/sparc3.kbd
-lib/ICAClient/keyboard/sparc4.kbd
-lib/ICAClient/keyboard/sparc5.kbd
-lib/ICAClient/keyboard/sparcfr4.kbd
-lib/ICAClient/keyboard/sparcfr5.kbd
-lib/ICAClient/keyboard/sparcgr4.kbd
-lib/ICAClient/keyboard/sparcgr5.kbd
-lib/ICAClient/keyboard/sparcuk4.kbd
-lib/ICAClient/keyboard/sparcuk5.kbd
-lib/ICAClient/keyboard/sparcus3.kbd
-lib/ICAClient/keyboard/sparcus4.kbd
-lib/ICAClient/keyboard/sparcus5.kbd
-lib/ICAClient/keyboard/trimodal.kbd
-lib/ICAClient/util/XCapture
-lib/ICAClient/util/XCapture.ad
-lib/ICAClient/util/echo_cmd
-lib/ICAClient/util/hinst
-lib/ICAClient/util/icalicense.sh
-lib/ICAClient/util/xcapture
+@comment $NetBSD: PLIST.post,v 1.2 2001/06/26 11:09:28 wiz Exp $
+@dirrm lib/ICAClient/.config
+@dirrm lib/ICAClient/config
+@dirrm lib/ICAClient/cache
+@dirrm lib/ICAClient/help
+@dirrm lib/ICAClient/icons
+@dirrm lib/ICAClient/keyboard
+@dirrm lib/ICAClient/pkginf
+@dirrm lib/ICAClient/util
+@dirrm lib/ICAClient
diff --git a/net/citrix_ica/pkg/PLIST.pre b/net/citrix_ica/pkg/PLIST.pre
index fb9a35f8dc9..2b7a8908304 100644
--- a/net/citrix_ica/pkg/PLIST.pre
+++ b/net/citrix_ica/pkg/PLIST.pre
@@ -1,10 +1,216 @@
-@comment $NetBSD: PLIST.pre,v 1.1 2001/05/05 17:24:14 dmcmahill Exp $
-@dirrm lib/ICAClient/.config
-@dirrm lib/ICAClient/config
-@dirrm lib/ICAClient/cache
-@dirrm lib/ICAClient/help
-@dirrm lib/ICAClient/icons
-@dirrm lib/ICAClient/keyboard
-@dirrm lib/ICAClient/pkginf
-@dirrm lib/ICAClient/util
-@dirrm lib/ICAClient
+@comment $NetBSD: PLIST.pre,v 1.2 2001/06/26 11:09:29 wiz Exp $
+bin/wfcmgr
+bin/wfica
+lib/ICAClient/Npica
+lib/ICAClient/Npica.ad
+lib/ICAClient/PDCRYPT1.DLL
+lib/ICAClient/PDCRYPT2.DLL
+lib/ICAClient/Wfcmgr
+lib/ICAClient/Wfica
+lib/ICAClient/Wfcmgr.ad
+lib/ICAClient/Wfica.ad
+lib/ICAClient/eula.txt
+lib/ICAClient/install.txt
+lib/ICAClient/npica.so
+lib/ICAClient/readme.txt
+lib/ICAClient/setupwfc
+lib/ICAClient/wfcmgr
+lib/ICAClient/wfica
+lib/ICAClient/.config/appsrv.ini
+lib/ICAClient/.config/keyboard.ini
+lib/ICAClient/.config/module.ini
+lib/ICAClient/.config/wfclient.ini
+lib/ICAClient/config/.server
+lib/ICAClient/config/appsrv.ini
+lib/ICAClient/config/module.ini
+lib/ICAClient/config/wfclient.ini
+lib/ICAClient/help/1a.gif
+lib/ICAClient/help/3a.gif
+lib/ICAClient/help/3b.gif
+lib/ICAClient/help/3c.gif
+lib/ICAClient/help/3d.gif
+lib/ICAClient/help/3f.gif
+lib/ICAClient/help/3g.gif
+lib/ICAClient/help/3h.gif
+lib/ICAClient/help/3i.gif
+lib/ICAClient/help/3l.gif
+lib/ICAClient/help/3m.gif
+lib/ICAClient/help/3n.gif
+lib/ICAClient/help/3o.gif
+lib/ICAClient/help/3p.gif
+lib/ICAClient/help/3q.gif
+lib/ICAClient/help/3r.gif
+lib/ICAClient/help/3s.gif
+lib/ICAClient/help/3t.gif
+lib/ICAClient/help/3u.gif
+lib/ICAClient/help/3v.gif
+lib/ICAClient/help/3w.gif
+lib/ICAClient/help/3x.gif
+lib/ICAClient/help/3y.gif
+lib/ICAClient/help/4a.gif
+lib/ICAClient/help/4b.gif
+lib/ICAClient/help/4c.gif
+lib/ICAClient/help/4d.gif
+lib/ICAClient/help/4e.gif
+lib/ICAClient/help/4f.gif
+lib/ICAClient/help/4g.gif
+lib/ICAClient/help/4h.gif
+lib/ICAClient/help/4i.gif
+lib/ICAClient/help/4k.gif
+lib/ICAClient/help/DIGITAL.gif
+lib/ICAClient/help/HP.gif
+lib/ICAClient/help/IBM.gif
+lib/ICAClient/help/LINUX.gif
+lib/ICAClient/help/SCO.gif
+lib/ICAClient/help/SG.gif
+lib/ICAClient/help/SPARC.gif
+lib/ICAClient/help/contents.gif
+lib/ICAClient/help/contents.htm
+lib/ICAClient/help/ctx00013.htm
+lib/ICAClient/help/ctx00014.htm
+lib/ICAClient/help/ctx00015.htm
+lib/ICAClient/help/ctx00016.htm
+lib/ICAClient/help/ctx00017.htm
+lib/ICAClient/help/ctx00018.htm
+lib/ICAClient/help/ctx00019.htm
+lib/ICAClient/help/ctx00020.htm
+lib/ICAClient/help/ctx00021.htm
+lib/ICAClient/help/ctx00022.htm
+lib/ICAClient/help/ctx00023.htm
+lib/ICAClient/help/ctx00025.htm
+lib/ICAClient/help/ctx00026.htm
+lib/ICAClient/help/ctx00027.htm
+lib/ICAClient/help/ctx00028.htm
+lib/ICAClient/help/ctx00029.htm
+lib/ICAClient/help/ctx00030.htm
+lib/ICAClient/help/ctx00031.htm
+lib/ICAClient/help/ctx00032.htm
+lib/ICAClient/help/ctx00033.htm
+lib/ICAClient/help/ctx00034.htm
+lib/ICAClient/help/ctx00035.htm
+lib/ICAClient/help/ctx00195.htm
+lib/ICAClient/help/ctx00196.htm
+lib/ICAClient/help/ctx00197.htm
+lib/ICAClient/help/ctx00198.htm
+lib/ICAClient/help/ctx00199.htm
+lib/ICAClient/help/ctx00200.htm
+lib/ICAClient/help/ctx00201.htm
+lib/ICAClient/help/ctx00202.htm
+lib/ICAClient/help/ctx00203.htm
+lib/ICAClient/help/ctx00204.htm
+lib/ICAClient/help/ctx00205.htm
+lib/ICAClient/help/ctx00206.htm
+lib/ICAClient/help/ctx00207.htm
+lib/ICAClient/help/ctx00208.htm
+lib/ICAClient/help/ctx00209.htm
+lib/ICAClient/help/ctx00210.htm
+lib/ICAClient/help/ctx00211.htm
+lib/ICAClient/help/comport.gif
+lib/ICAClient/help/firewall.gif
+lib/ICAClient/help/hotkeys.gif
+lib/ICAClient/help/index.gif
+lib/ICAClient/help/index.htm
+lib/ICAClient/help/index_a.gif
+lib/ICAClient/help/index_b.gif
+lib/ICAClient/help/index_c.gif
+lib/ICAClient/help/index_d.gif
+lib/ICAClient/help/index_e.gif
+lib/ICAClient/help/index_f.gif
+lib/ICAClient/help/index_g.gif
+lib/ICAClient/help/index_h.gif
+lib/ICAClient/help/index_i.gif
+lib/ICAClient/help/index_j.gif
+lib/ICAClient/help/index_k.gif
+lib/ICAClient/help/index_l.gif
+lib/ICAClient/help/index_m.gif
+lib/ICAClient/help/index_n.gif
+lib/ICAClient/help/index_o.gif
+lib/ICAClient/help/index_p.gif
+lib/ICAClient/help/index_q.gif
+lib/ICAClient/help/index_r.gif
+lib/ICAClient/help/index_s.gif
+lib/ICAClient/help/index_t.gif
+lib/ICAClient/help/index_u.gif
+lib/ICAClient/help/index_v.gif
+lib/ICAClient/help/index_w.gif
+lib/ICAClient/help/index_x.gif
+lib/ICAClient/help/index_y.gif
+lib/ICAClient/help/index_z.gif
+lib/ICAClient/help/login.gif
+lib/ICAClient/help/next0.gif
+lib/ICAClient/help/next1.gif
+lib/ICAClient/help/prev0.gif
+lib/ICAClient/help/prev1.gif
+lib/ICAClient/help/prop_conn.gif
+lib/ICAClient/help/properties_network.gif
+lib/ICAClient/help/sett_cache.gif
+lib/ICAClient/help/sett_cdm.gif
+lib/ICAClient/help/settings_diskc.gif
+lib/ICAClient/icons/ica16.xpm
+lib/ICAClient/icons/ica32.xpm
+lib/ICAClient/icons/ica48.xpm
+lib/ICAClient/icons/ica64.xpm
+lib/ICAClient/keyboard/age2.kbd
+lib/ICAClient/keyboard/agex2.kbd
+lib/ICAClient/keyboard/automatic.kbd
+lib/ICAClient/keyboard/dcint401.kbd
+lib/ICAClient/keyboard/dcintpcx.kbd
+lib/ICAClient/keyboard/dcus401.kbd
+lib/ICAClient/keyboard/dcuspcx.kbd
+lib/ICAClient/keyboard/dec401.kbd
+lib/ICAClient/keyboard/dec401uk.kbd
+lib/ICAClient/keyboard/decpcx.kbd
+lib/ICAClient/keyboard/decpcxuk.kbd
+lib/ICAClient/keyboard/dg.kbd
+lib/ICAClient/keyboard/dgfr.kbd
+lib/ICAClient/keyboard/dggr.kbd
+lib/ICAClient/keyboard/dguk.kbd
+lib/ICAClient/keyboard/dgus.kbd
+lib/ICAClient/keyboard/hp101.kbd
+lib/ICAClient/keyboard/hpfritf.kbd
+lib/ICAClient/keyboard/hpgritf.kbd
+lib/ICAClient/keyboard/hpint101.kbd
+lib/ICAClient/keyboard/hpintps2.kbd
+lib/ICAClient/keyboard/hpitf.kbd
+lib/ICAClient/keyboard/hpps2.kbd
+lib/ICAClient/keyboard/hpuk101.kbd
+lib/ICAClient/keyboard/hpukitf.kbd
+lib/ICAClient/keyboard/hpukps2.kbd
+lib/ICAClient/keyboard/hpus101.kbd
+lib/ICAClient/keyboard/hpusitf.kbd
+lib/ICAClient/keyboard/hpusps2.kbd
+lib/ICAClient/keyboard/ibm.kbd
+lib/ICAClient/keyboard/keyboard.ini
+lib/ICAClient/keyboard/linux.kbd
+lib/ICAClient/keyboard/mac101.kbd
+lib/ICAClient/keyboard/netbsd.kbd
+lib/ICAClient/keyboard/ncdn-101.kbd
+lib/ICAClient/keyboard/ncdn-102.kbd
+lib/ICAClient/keyboard/scoos5.kbd
+lib/ICAClient/keyboard/scouw2.kbd
+lib/ICAClient/keyboard/sg.kbd
+lib/ICAClient/keyboard/sgindy.kbd
+lib/ICAClient/keyboard/sgindyfr.kbd
+lib/ICAClient/keyboard/sgindygr.kbd
+lib/ICAClient/keyboard/sgindyuk.kbd
+lib/ICAClient/keyboard/sgindyus.kbd
+lib/ICAClient/keyboard/sngr.kbd
+lib/ICAClient/keyboard/sparc3.kbd
+lib/ICAClient/keyboard/sparc4.kbd
+lib/ICAClient/keyboard/sparc5.kbd
+lib/ICAClient/keyboard/sparcfr4.kbd
+lib/ICAClient/keyboard/sparcfr5.kbd
+lib/ICAClient/keyboard/sparcgr4.kbd
+lib/ICAClient/keyboard/sparcgr5.kbd
+lib/ICAClient/keyboard/sparcuk4.kbd
+lib/ICAClient/keyboard/sparcuk5.kbd
+lib/ICAClient/keyboard/sparcus3.kbd
+lib/ICAClient/keyboard/sparcus4.kbd
+lib/ICAClient/keyboard/sparcus5.kbd
+lib/ICAClient/keyboard/trimodal.kbd
+lib/ICAClient/util/XCapture
+lib/ICAClient/util/XCapture.ad
+lib/ICAClient/util/echo_cmd
+lib/ICAClient/util/hinst
+lib/ICAClient/util/icalicense.sh
+lib/ICAClient/util/xcapture