summaryrefslogtreecommitdiff
path: root/sysutils
diff options
context:
space:
mode:
authorjlam <jlam>2003-07-16 09:33:46 +0000
committerjlam <jlam>2003-07-16 09:33:46 +0000
commite664449b954368894a4fd85edc962c90bc7b4903 (patch)
tree491111004206c0c3cb92ae9f1dd439e854e373be /sysutils
parentf6cad14a16265838094c96c2784856bdf35df1a9 (diff)
downloadpkgsrc-e664449b954368894a4fd85edc962c90bc7b4903.tar.gz
Initial work in merging bits of the pkgviews branch into modern pkgsrc.
Currently, the pkgviews/buildlink2 integration is incomplete. People who work on this branch should also check out src/usr.sbin/pkg_install from the pkgviews branch.
Diffstat (limited to 'sysutils')
-rw-r--r--sysutils/GWLib/DESCR2
-rw-r--r--sysutils/GWLib/Makefile13
-rw-r--r--sysutils/GWLib/PLIST15
-rw-r--r--sysutils/GWLib/buildlink2.mk32
-rw-r--r--sysutils/Makefile170
-rw-r--r--sysutils/adjustkernel/DESCR1
-rw-r--r--sysutils/adjustkernel/Makefile27
-rw-r--r--sysutils/adjustkernel/PLIST3
-rw-r--r--sysutils/adjustkernel/files/adjustkernel135
-rw-r--r--sysutils/adjustkernel/files/adjustkernel.157
-rw-r--r--sysutils/amanda-client/DESCR180
-rw-r--r--sysutils/amanda-client/Makefile45
-rw-r--r--sysutils/amanda-client/PLIST16
-rw-r--r--sysutils/amanda-client/distinfo9
-rw-r--r--sysutils/amanda-client/patches/patch-aa15
-rw-r--r--sysutils/amanda-client/patches/patch-ab86
-rw-r--r--sysutils/amanda-client/patches/patch-ac17
-rw-r--r--sysutils/amanda-client/patches/patch-ad13
-rw-r--r--sysutils/amanda-client/patches/patch-ae24
-rw-r--r--sysutils/amanda-common/DESCR181
-rw-r--r--sysutils/amanda-common/Makefile43
-rw-r--r--sysutils/amanda-common/Makefile.common32
-rw-r--r--sysutils/amanda-common/PLIST10
-rw-r--r--sysutils/amanda-common/buildlink2.mk22
-rw-r--r--sysutils/amanda-common/distinfo10
-rw-r--r--sysutils/amanda-common/patches/patch-aa19
-rw-r--r--sysutils/amanda-common/patches/patch-ab32
-rw-r--r--sysutils/amanda-common/patches/patch-ac13
-rw-r--r--sysutils/amanda-common/patches/patch-ad22
-rw-r--r--sysutils/amanda-common/patches/patch-ba13
-rw-r--r--sysutils/amanda-common/patches/patch-bb13
-rw-r--r--sysutils/amanda-dev-client/DESCR183
-rw-r--r--sysutils/amanda-dev-client/Makefile40
-rw-r--r--sysutils/amanda-dev-client/PLIST16
-rw-r--r--sysutils/amanda-dev-client/distinfo9
-rw-r--r--sysutils/amanda-dev-client/patches/patch-aa15
-rw-r--r--sysutils/amanda-dev-client/patches/patch-ab99
-rw-r--r--sysutils/amanda-dev-client/patches/patch-ac28
-rw-r--r--sysutils/amanda-dev-client/patches/patch-ad15
-rw-r--r--sysutils/amanda-dev-client/patches/patch-ae28
-rw-r--r--sysutils/amanda-dev-common/DESCR184
-rw-r--r--sysutils/amanda-dev-common/Makefile38
-rw-r--r--sysutils/amanda-dev-common/Makefile.common38
-rw-r--r--sysutils/amanda-dev-common/PLIST14
-rw-r--r--sysutils/amanda-dev-common/buildlink2.mk20
-rw-r--r--sysutils/amanda-dev-common/distinfo10
-rw-r--r--sysutils/amanda-dev-common/patches/patch-aa20
-rw-r--r--sysutils/amanda-dev-common/patches/patch-ab36
-rw-r--r--sysutils/amanda-dev-common/patches/patch-ac27
-rw-r--r--sysutils/amanda-dev-common/patches/patch-ad22
-rw-r--r--sysutils/amanda-dev-common/patches/patch-ba13
-rw-r--r--sysutils/amanda-dev-common/patches/patch-bb13
-rw-r--r--sysutils/amanda-dev-plot/DESCR184
-rw-r--r--sysutils/amanda-dev-plot/Makefile22
-rw-r--r--sysutils/amanda-dev-plot/PLIST7
-rw-r--r--sysutils/amanda-dev-plot/distinfo7
-rw-r--r--sysutils/amanda-dev-plot/patches/patch-aa15
-rw-r--r--sysutils/amanda-dev-plot/patches/patch-ab44
-rw-r--r--sysutils/amanda-dev-plot/patches/patch-ac17
-rw-r--r--sysutils/amanda-dev-server/DESCR184
-rw-r--r--sysutils/amanda-dev-server/Makefile52
-rw-r--r--sysutils/amanda-dev-server/PLIST91
-rw-r--r--sysutils/amanda-dev-server/distinfo23
-rw-r--r--sysutils/amanda-dev-server/patches/patch-aa32
-rw-r--r--sysutils/amanda-dev-server/patches/patch-ab31
-rw-r--r--sysutils/amanda-dev-server/patches/patch-ac19
-rw-r--r--sysutils/amanda-dev-server/patches/patch-ad200
-rw-r--r--sysutils/amanda-dev-server/patches/patch-ae62
-rw-r--r--sysutils/amanda-dev-server/patches/patch-af205
-rw-r--r--sysutils/amanda-dev-server/patches/patch-ag23
-rw-r--r--sysutils/amanda-dev-server/patches/patch-ah30
-rw-r--r--sysutils/amanda-dev-server/patches/patch-ai34
-rw-r--r--sysutils/amanda-dev-server/patches/patch-aj30
-rw-r--r--sysutils/amanda-dev-server/patches/patch-ak13
-rw-r--r--sysutils/amanda-dev-server/patches/patch-al35
-rw-r--r--sysutils/amanda-dev-server/patches/patch-am40
-rw-r--r--sysutils/amanda-dev-server/patches/patch-ba13
-rw-r--r--sysutils/amanda-dev-server/patches/patch-bb13
-rw-r--r--sysutils/amanda-dev-server/patches/patch-bc13
-rw-r--r--sysutils/amanda-dev-server/patches/patch-bd13
-rw-r--r--sysutils/amanda-dev-server/patches/patch-be13
-rw-r--r--sysutils/amanda-dev-server/patches/patch-bf20
-rw-r--r--sysutils/amanda-dev/DESCR9
-rw-r--r--sysutils/amanda-dev/Makefile23
-rw-r--r--sysutils/amanda-dev/PLIST2
-rw-r--r--sysutils/amanda-plot/DESCR181
-rw-r--r--sysutils/amanda-plot/Makefile27
-rw-r--r--sysutils/amanda-plot/PLIST7
-rw-r--r--sysutils/amanda-plot/distinfo7
-rw-r--r--sysutils/amanda-plot/patches/patch-aa15
-rw-r--r--sysutils/amanda-plot/patches/patch-ab17
-rw-r--r--sysutils/amanda-plot/patches/patch-ac13
-rw-r--r--sysutils/amanda-server/DESCR181
-rw-r--r--sysutils/amanda-server/Makefile59
-rw-r--r--sysutils/amanda-server/PLIST91
-rw-r--r--sysutils/amanda-server/distinfo19
-rw-r--r--sysutils/amanda-server/patches/patch-aa32
-rw-r--r--sysutils/amanda-server/patches/patch-ab29
-rw-r--r--sysutils/amanda-server/patches/patch-ac19
-rw-r--r--sysutils/amanda-server/patches/patch-ad173
-rw-r--r--sysutils/amanda-server/patches/patch-ae27
-rw-r--r--sysutils/amanda-server/patches/patch-af165
-rw-r--r--sysutils/amanda-server/patches/patch-ag23
-rw-r--r--sysutils/amanda-server/patches/patch-ah30
-rw-r--r--sysutils/amanda-server/patches/patch-ai32
-rw-r--r--sysutils/amanda-server/patches/patch-aj31
-rw-r--r--sysutils/amanda-server/patches/patch-ak13
-rw-r--r--sysutils/amanda-server/patches/patch-al13
-rw-r--r--sysutils/amanda-server/patches/patch-ba13
-rw-r--r--sysutils/amanda-server/patches/patch-bb13
-rw-r--r--sysutils/amanda-server/patches/patch-bc22
-rw-r--r--sysutils/amanda/DESCR8
-rw-r--r--sysutils/amanda/Makefile24
-rw-r--r--sysutils/amanda/PLIST2
-rw-r--r--sysutils/apcupsd/DESCR5
-rw-r--r--sysutils/apcupsd/MESSAGE11
-rw-r--r--sysutils/apcupsd/Makefile111
-rw-r--r--sysutils/apcupsd/PLIST89
-rw-r--r--sysutils/apcupsd/distinfo17
-rw-r--r--sysutils/apcupsd/patches/patch-aa126
-rw-r--r--sysutils/apcupsd/patches/patch-ab64
-rw-r--r--sysutils/apcupsd/patches/patch-ac13
-rw-r--r--sysutils/apcupsd/patches/patch-ad66
-rw-r--r--sysutils/apcupsd/patches/patch-ae27
-rw-r--r--sysutils/apcupsd/patches/patch-af92
-rw-r--r--sysutils/apcupsd/patches/patch-aj2419
-rw-r--r--sysutils/apcupsd/patches/patch-ak36
-rw-r--r--sysutils/apcupsd/patches/patch-al13
-rw-r--r--sysutils/apcupsd/patches/patch-am13
-rw-r--r--sysutils/apcupsd/patches/patch-an13
-rw-r--r--sysutils/apcupsd/patches/patch-ao13
-rw-r--r--sysutils/apcupsd/patches/patch-ap13
-rw-r--r--sysutils/aperture/DESCR16
-rw-r--r--sysutils/aperture/MESSAGE13
-rw-r--r--sysutils/aperture/Makefile49
-rw-r--r--sysutils/aperture/PLIST12
-rw-r--r--sysutils/aperture/distinfo10
-rw-r--r--sysutils/aperture/patches/patch-aa15
-rw-r--r--sysutils/aperture/patches/patch-ab44
-rw-r--r--sysutils/aperture/patches/patch-ac15
-rw-r--r--sysutils/aperture/patches/patch-ad35
-rw-r--r--sysutils/aperture/patches/patch-ae22
-rw-r--r--sysutils/aperture/patches/patch-af13
-rw-r--r--sysutils/asapm/DESCR5
-rw-r--r--sysutils/asapm/MESSAGE7
-rw-r--r--sysutils/asapm/Makefile27
-rw-r--r--sysutils/asapm/PLIST3
-rw-r--r--sysutils/asapm/distinfo6
-rw-r--r--sysutils/asapm/patches/patch-aa27
-rw-r--r--sysutils/asapm/patches/patch-ab12
-rw-r--r--sysutils/bbsload/DESCR3
-rw-r--r--sysutils/bbsload/Makefile19
-rw-r--r--sysutils/bbsload/PLIST7
-rw-r--r--sysutils/bbsload/distinfo7
-rw-r--r--sysutils/bbsload/patches/patch-aa331
-rw-r--r--sysutils/bbsload/patches/patch-ab13
-rw-r--r--sysutils/bbsload/patches/patch-ac78
-rw-r--r--sysutils/bchunk/DESCR12
-rw-r--r--sysutils/bchunk/MESSAGE9
-rw-r--r--sysutils/bchunk/Makefile17
-rw-r--r--sysutils/bchunk/PLIST3
-rw-r--r--sysutils/bchunk/distinfo4
-rw-r--r--sysutils/bkpupsd/DESCR12
-rw-r--r--sysutils/bkpupsd/MESSAGE14
-rw-r--r--sysutils/bkpupsd/Makefile27
-rw-r--r--sysutils/bkpupsd/PLIST17
-rw-r--r--sysutils/bkpupsd/distinfo4
-rw-r--r--sysutils/c++rt0/DESCR9
-rw-r--r--sysutils/c++rt0/Makefile26
-rw-r--r--sysutils/c++rt0/PLIST5
-rw-r--r--sysutils/c++rt0/distinfo8
-rw-r--r--sysutils/cdbkup/DESCR4
-rw-r--r--sysutils/cdbkup/Makefile38
-rw-r--r--sysutils/cdbkup/PLIST17
-rw-r--r--sysutils/cdbkup/distinfo5
-rw-r--r--sysutils/cdbkup/patches/patch-aa12
-rw-r--r--sysutils/cdrdao/DESCR15
-rw-r--r--sysutils/cdrdao/Makefile65
-rw-r--r--sysutils/cdrdao/PLIST45
-rw-r--r--sysutils/cdrdao/distinfo8
-rw-r--r--sysutils/cdrdao/patches/patch-aa12
-rw-r--r--sysutils/cdrdao/patches/patch-ab18
-rw-r--r--sysutils/cdrdao/patches/patch-ac49
-rw-r--r--sysutils/cdrdao/patches/patch-ad12
-rw-r--r--sysutils/cdrecord-xcdroast/DESCR9
-rw-r--r--sysutils/cdrecord-xcdroast/Makefile52
-rw-r--r--sysutils/cdrecord-xcdroast/PLIST7
-rw-r--r--sysutils/cdrecord-xcdroast/distinfo10
-rw-r--r--sysutils/cdrecord-xcdroast/patches/patch-ac23
-rw-r--r--sysutils/cdrecord-xcdroast/patches/patch-ah40
-rw-r--r--sysutils/cdrecord-xcdroast/patches/patch-ai107
-rw-r--r--sysutils/cdrecord-xcdroast/patches/patch-aj25
-rw-r--r--sysutils/cdrecord-xcdroast/patches/patch-ba19
-rw-r--r--sysutils/cdrecord-xcdroast/patches/patch-bb19
-rw-r--r--sysutils/cdrecord/DESCR7
-rw-r--r--sysutils/cdrecord/MESSAGE.SunOS9
-rw-r--r--sysutils/cdrecord/MESSAGE.cdrecord.conf14
-rw-r--r--sysutils/cdrecord/Makefile93
-rw-r--r--sysutils/cdrecord/PLIST17
-rw-r--r--sysutils/cdrecord/distinfo13
-rw-r--r--sysutils/cdrecord/patches/patch-ac23
-rw-r--r--sysutils/cdrecord/patches/patch-ah40
-rw-r--r--sysutils/cdrecord/patches/patch-ai107
-rw-r--r--sysutils/cdrecord/patches/patch-aj25
-rw-r--r--sysutils/cdrecord/patches/patch-ba19
-rw-r--r--sysutils/cdrecord/patches/patch-bb19
-rw-r--r--sysutils/cdrecord/patches/patch-ca13
-rw-r--r--sysutils/cdrecord/patches/patch-cb24
-rw-r--r--sysutils/cdrecord/patches/patch-cc13
-rw-r--r--sysutils/cfengine/DESCR6
-rw-r--r--sysutils/cfengine/Makefile25
-rw-r--r--sysutils/cfengine/PLIST33
-rw-r--r--sysutils/cfengine/distinfo9
-rw-r--r--sysutils/cfengine/patches/patch-aa66
-rw-r--r--sysutils/cfengine/patches/patch-ab19
-rw-r--r--sysutils/cfengine/patches/patch-ac26
-rw-r--r--sysutils/cfengine/patches/patch-ad14
-rw-r--r--sysutils/cfengine/patches/patch-ae20
-rw-r--r--sysutils/cfengine2-doc/DESCR3
-rw-r--r--sysutils/cfengine2-doc/Makefile26
-rw-r--r--sysutils/cfengine2-doc/PLIST28
-rw-r--r--sysutils/cfengine2/DESCR6
-rw-r--r--sysutils/cfengine2/Makefile27
-rw-r--r--sysutils/cfengine2/Makefile.common14
-rw-r--r--sysutils/cfengine2/PLIST32
-rw-r--r--sysutils/cfengine2/distinfo13
-rw-r--r--sysutils/cfengine2/patches/patch-aa9
-rw-r--r--sysutils/cfengine2/patches/patch-ab31
-rw-r--r--sysutils/cfengine2/patches/patch-ad59
-rw-r--r--sysutils/cfengine2/patches/patch-ae20
-rw-r--r--sysutils/cfengine2/patches/patch-af24
-rw-r--r--sysutils/cfengine2/patches/patch-ag11
-rw-r--r--sysutils/cfengine2/patches/patch-ah18
-rw-r--r--sysutils/cfengine2/patches/patch-ai23
-rw-r--r--sysutils/cfengine2/patches/patch-aj108
-rw-r--r--sysutils/checkpassword/DESCR3
-rw-r--r--sysutils/checkpassword/Makefile18
-rw-r--r--sysutils/checkpassword/PLIST2
-rw-r--r--sysutils/checkpassword/distinfo4
-rw-r--r--sysutils/coreutils/DESCR7
-rw-r--r--sysutils/coreutils/Makefile40
-rw-r--r--sysutils/coreutils/PLIST182
-rw-r--r--sysutils/coreutils/distinfo5
-rw-r--r--sysutils/coreutils/patches/patch-aa13
-rw-r--r--sysutils/cpogm/DESCR2
-rw-r--r--sysutils/cpogm/Makefile17
-rw-r--r--sysutils/cpogm/PLIST3
-rw-r--r--sysutils/cpogm/distinfo4
-rw-r--r--sysutils/cpuburn/DESCR8
-rw-r--r--sysutils/cpuburn/Makefile28
-rw-r--r--sysutils/cpuburn/PLIST8
-rw-r--r--sysutils/cpuburn/distinfo5
-rw-r--r--sysutils/cpuburn/patches/patch-aa18
-rw-r--r--sysutils/cpuid/DESCR4
-rw-r--r--sysutils/cpuid/Makefile19
-rw-r--r--sysutils/cpuid/PLIST2
-rw-r--r--sysutils/cpuid/distinfo4
-rw-r--r--sysutils/crashme/DESCR16
-rw-r--r--sysutils/crashme/Makefile17
-rw-r--r--sysutils/crashme/PLIST4
-rw-r--r--sysutils/crashme/distinfo6
-rw-r--r--sysutils/crashme/patches/patch-aa28
-rw-r--r--sysutils/crashme/patches/patch-ab13
-rw-r--r--sysutils/daemontools/DEINSTALL16
-rw-r--r--sysutils/daemontools/DESCR3
-rw-r--r--sysutils/daemontools/Makefile49
-rw-r--r--sysutils/daemontools/PLIST32
-rw-r--r--sysutils/daemontools/distinfo6
-rw-r--r--sysutils/daemontools/files/svscan.sh.sample34
-rw-r--r--sysutils/depot/DESCR4
-rw-r--r--sysutils/depot/Makefile21
-rw-r--r--sysutils/depot/PLIST10
-rw-r--r--sysutils/depot/distinfo5
-rw-r--r--sysutils/depot/patches/patch-aa17
-rw-r--r--sysutils/dog/DESCR5
-rw-r--r--sysutils/dog/Makefile15
-rw-r--r--sysutils/dog/PLIST3
-rw-r--r--sysutils/dog/distinfo5
-rw-r--r--sysutils/dog/patches/patch-aa30
-rw-r--r--sysutils/dptutil/DESCR4
-rw-r--r--sysutils/dptutil/Makefile29
-rw-r--r--sysutils/dptutil/PLIST3
-rw-r--r--sysutils/dptutil/distinfo18
-rw-r--r--sysutils/dptutil/patches/patch-aa22
-rw-r--r--sysutils/dptutil/patches/patch-ab26
-rw-r--r--sysutils/dptutil/patches/patch-ac26
-rw-r--r--sysutils/dptutil/patches/patch-ad14
-rw-r--r--sysutils/dptutil/patches/patch-ae70
-rw-r--r--sysutils/dptutil/patches/patch-af26
-rw-r--r--sysutils/dptutil/patches/patch-ag30
-rw-r--r--sysutils/dptutil/patches/patch-ah22
-rw-r--r--sysutils/dptutil/patches/patch-ai12
-rw-r--r--sysutils/dptutil/patches/patch-aj30
-rw-r--r--sysutils/dptutil/patches/patch-ak22
-rw-r--r--sysutils/dptutil/patches/patch-al13
-rw-r--r--sysutils/dptutil/patches/patch-am20
-rw-r--r--sysutils/dptutil/patches/patch-an20
-rw-r--r--sysutils/dvd+rw-tools/DESCR5
-rw-r--r--sysutils/dvd+rw-tools/Makefile23
-rw-r--r--sysutils/dvd+rw-tools/PLIST7
-rw-r--r--sysutils/dvd+rw-tools/distinfo4
-rw-r--r--sysutils/dvdrecord/DESCR5
-rw-r--r--sysutils/dvdrecord/MESSAGE6
-rw-r--r--sysutils/dvdrecord/Makefile24
-rw-r--r--sysutils/dvdrecord/PLIST3
-rw-r--r--sysutils/dvdrecord/distinfo6
-rw-r--r--sysutils/dvdrecord/patches/patch-aa14
-rw-r--r--sysutils/dvdrecord/patches/patch-ab107
-rw-r--r--sysutils/dvdrip/DESCR7
-rw-r--r--sysutils/dvdrip/Makefile37
-rw-r--r--sysutils/dvdrip/PLIST1
-rw-r--r--sysutils/dvdrip/distinfo4
-rw-r--r--sysutils/e2fsprogs/DESCR2
-rw-r--r--sysutils/e2fsprogs/Makefile23
-rw-r--r--sysutils/e2fsprogs/PLIST.Linux3
-rw-r--r--sysutils/e2fsprogs/PLIST.common38
-rw-r--r--sysutils/e2fsprogs/distinfo7
-rw-r--r--sysutils/e2fsprogs/patches/patch-aa12
-rw-r--r--sysutils/e2fsprogs/patches/patch-ab13
-rw-r--r--sysutils/e2fsprogs/patches/patch-ac13
-rw-r--r--sysutils/easydiskpasswd/DESCR5
-rw-r--r--sysutils/easydiskpasswd/Makefile19
-rw-r--r--sysutils/easydiskpasswd/PLIST2
-rw-r--r--sysutils/easydiskpasswd/files/Makefile10
-rw-r--r--sysutils/easydiskpasswd/files/easydiskpasswd.c176
-rw-r--r--sysutils/etcupdate/DESCR9
-rw-r--r--sysutils/etcupdate/Makefile22
-rw-r--r--sysutils/etcupdate/PLIST3
-rwxr-xr-xsysutils/etcupdate/files/etcupdate534
-rw-r--r--sysutils/etcupdate/files/etcupdate.8318
-rw-r--r--sysutils/extipl/DESCR7
-rw-r--r--sysutils/extipl/Makefile17
-rw-r--r--sysutils/extipl/PLIST12
-rw-r--r--sysutils/extipl/distinfo5
-rw-r--r--sysutils/extipl/patches/patch-aa15
-rw-r--r--sysutils/fakeroot/DESCR4
-rw-r--r--sysutils/fakeroot/Makefile17
-rw-r--r--sysutils/fakeroot/PLIST17
-rw-r--r--sysutils/fakeroot/distinfo6
-rw-r--r--sysutils/fakeroot/patches/patch-aa48
-rw-r--r--sysutils/fakeroot/patches/patch-ab42
-rw-r--r--sysutils/fam/DESCR19
-rw-r--r--sysutils/fam/Makefile22
-rw-r--r--sysutils/fam/PLIST14
-rw-r--r--sysutils/fam/buildlink2.mk20
-rw-r--r--sysutils/fam/distinfo23
-rw-r--r--sysutils/fam/patches/patch-aa13
-rw-r--r--sysutils/fam/patches/patch-ab13
-rw-r--r--sysutils/fam/patches/patch-ac28
-rw-r--r--sysutils/fam/patches/patch-ae13
-rw-r--r--sysutils/fam/patches/patch-af30
-rw-r--r--sysutils/fam/patches/patch-ag21
-rw-r--r--sysutils/fam/patches/patch-ah13
-rw-r--r--sysutils/fam/patches/patch-ai14
-rw-r--r--sysutils/fam/patches/patch-aj48
-rw-r--r--sysutils/fam/patches/patch-ak13
-rw-r--r--sysutils/fam/patches/patch-al12
-rw-r--r--sysutils/fam/patches/patch-an12
-rw-r--r--sysutils/fam/patches/patch-ao61
-rw-r--r--sysutils/fam/patches/patch-ap179
-rw-r--r--sysutils/fam/patches/patch-at35
-rw-r--r--sysutils/fam/patches/patch-au29
-rw-r--r--sysutils/fam/patches/patch-av30
-rw-r--r--sysutils/fam/patches/patch-aw22
-rw-r--r--sysutils/fam/patches/patch-ax179
-rw-r--r--sysutils/fdgw/DESCR5
-rw-r--r--sysutils/fdgw/Makefile62
-rw-r--r--sysutils/fdgw/PLIST5
-rw-r--r--sysutils/fdgw/distinfo5
-rw-r--r--sysutils/fdgw/patches/patch-ae144
-rw-r--r--sysutils/file/DESCR9
-rw-r--r--sysutils/file/MESSAGE10
-rw-r--r--sysutils/file/Makefile18
-rw-r--r--sysutils/file/PLIST16
-rw-r--r--sysutils/file/distinfo5
-rw-r--r--sysutils/file/patches/patch-aa20
-rw-r--r--sysutils/findutils/DESCR1
-rw-r--r--sysutils/findutils/Makefile27
-rw-r--r--sysutils/findutils/PLIST23
-rw-r--r--sysutils/findutils/distinfo8
-rw-r--r--sysutils/findutils/patches/patch-aa62
-rw-r--r--sysutils/findutils/patches/patch-ab20
-rw-r--r--sysutils/findutils/patches/patch-ac22
-rw-r--r--sysutils/findutils/patches/patch-ad22
-rw-r--r--sysutils/fix4SA110rev2/DESCR10
-rw-r--r--sysutils/fix4SA110rev2/Makefile24
-rw-r--r--sysutils/fix4SA110rev2/PLIST3
-rw-r--r--sysutils/fix4SA110rev2/distinfo6
-rw-r--r--sysutils/fsviewer/DESCR3
-rw-r--r--sysutils/fsviewer/Makefile32
-rw-r--r--sysutils/fsviewer/PLIST163
-rw-r--r--sysutils/fsviewer/distinfo15
-rw-r--r--sysutils/fsviewer/patches/patch-aa17
-rw-r--r--sysutils/fsviewer/patches/patch-ab30
-rw-r--r--sysutils/fsviewer/patches/patch-ac32
-rw-r--r--sysutils/fsviewer/patches/patch-ad50
-rw-r--r--sysutils/fsviewer/patches/patch-ae37
-rw-r--r--sysutils/fsviewer/patches/patch-af30
-rw-r--r--sysutils/fsviewer/patches/patch-ag15
-rw-r--r--sysutils/fsviewer/patches/patch-ah13
-rw-r--r--sysutils/fsviewer/patches/patch-ai13
-rw-r--r--sysutils/gcdmaster/DESCR12
-rw-r--r--sysutils/gcdmaster/Makefile40
-rw-r--r--sysutils/gcdmaster/PLIST24
-rw-r--r--sysutils/gcdmaster/distinfo10
-rw-r--r--sysutils/gcdmaster/patches/patch-ab18
-rw-r--r--sysutils/gcdmaster/patches/patch-ac49
-rw-r--r--sysutils/gcdmaster/patches/patch-ad15
-rw-r--r--sysutils/gcdmaster/patches/patch-ae13
-rw-r--r--sysutils/gcdmaster/patches/patch-af24
-rw-r--r--sysutils/gcdmaster/patches/patch-ag13
-rw-r--r--sysutils/gcombust/DESCR12
-rw-r--r--sysutils/gcombust/Makefile24
-rw-r--r--sysutils/gcombust/PLIST20
-rw-r--r--sysutils/gcombust/distinfo5
-rw-r--r--sysutils/gcombust/patches/patch-ab20
-rw-r--r--sysutils/genpasswd/DESCR3
-rw-r--r--sysutils/genpasswd/Makefile15
-rw-r--r--sysutils/genpasswd/PLIST3
-rw-r--r--sysutils/genpasswd/distinfo4
-rw-r--r--sysutils/gentoo/DESCR6
-rw-r--r--sysutils/gentoo/Makefile30
-rw-r--r--sysutils/gentoo/PLIST133
-rw-r--r--sysutils/gentoo/distinfo6
-rw-r--r--sysutils/gentoo/patches/patch-aa13
-rw-r--r--sysutils/gentoo/patches/patch-ae13
-rw-r--r--sysutils/gkrellm/DESCR24
-rw-r--r--sysutils/gkrellm/Makefile36
-rw-r--r--sysutils/gkrellm/PLIST20
-rw-r--r--sysutils/gkrellm/buildlink2.mk22
-rw-r--r--sysutils/gkrellm/distinfo7
-rw-r--r--sysutils/gkrellm/patches/patch-aa80
-rw-r--r--sysutils/gkrellm/patches/patch-ab87
-rw-r--r--sysutils/gkrellm/patches/patch-ac31
-rw-r--r--sysutils/gkx86info/DESCR6
-rw-r--r--sysutils/gkx86info/Makefile21
-rw-r--r--sysutils/gkx86info/PLIST3
-rw-r--r--sysutils/gkx86info/distinfo6
-rw-r--r--sysutils/gkx86info/patches/patch-aa12
-rw-r--r--sysutils/gkx86info/patches/patch-ab28
-rw-r--r--sysutils/gmc/DESCR6
-rw-r--r--sysutils/gmc/Makefile19
-rw-r--r--sysutils/gmc/PLIST220
-rw-r--r--sysutils/gnome-vfs/DESCR7
-rw-r--r--sysutils/gnome-vfs/Makefile31
-rw-r--r--sysutils/gnome-vfs/PLIST152
-rw-r--r--sysutils/gnome-vfs/buildlink2.mk25
-rw-r--r--sysutils/gnome-vfs/distinfo9
-rw-r--r--sysutils/gnome-vfs/patches/patch-ab28
-rw-r--r--sysutils/gnome-vfs/patches/patch-ac44
-rw-r--r--sysutils/gnome-vfs/patches/patch-ae74
-rw-r--r--sysutils/gnome-vfs/patches/patch-af27
-rw-r--r--sysutils/gnome-vfs/patches/patch-ag14
-rw-r--r--sysutils/gnome-vfs2/DESCR5
-rw-r--r--sysutils/gnome-vfs2/Makefile66
-rw-r--r--sysutils/gnome-vfs2/PLIST278
-rw-r--r--sysutils/gnome-vfs2/buildlink2.mk37
-rw-r--r--sysutils/gnome-vfs2/distinfo8
-rw-r--r--sysutils/gnome-vfs2/patches/patch-ae12
-rw-r--r--sysutils/gnome-vfs2/patches/patch-ag13
-rw-r--r--sysutils/gnome-vfs2/patches/patch-ai13
-rw-r--r--sysutils/gnome-vfs2/patches/patch-al36
-rw-r--r--sysutils/gnometoaster/DESCR5
-rw-r--r--sysutils/gnometoaster/Makefile27
-rw-r--r--sysutils/gnometoaster/PLIST9
-rw-r--r--sysutils/gnometoaster/distinfo8
-rw-r--r--sysutils/gnometoaster/patches/patch-aa144
-rw-r--r--sysutils/gnometoaster/patches/patch-ab13
-rw-r--r--sysutils/gnometoaster/patches/patch-ac31
-rw-r--r--sysutils/gnometoaster/patches/patch-ad13
-rw-r--r--sysutils/gpart/DESCR3
-rw-r--r--sysutils/gpart/Makefile16
-rw-r--r--sysutils/gpart/PLIST3
-rw-r--r--sysutils/gpart/distinfo9
-rw-r--r--sysutils/gpart/patches/patch-aa22
-rw-r--r--sysutils/gpart/patches/patch-ab16
-rw-r--r--sysutils/gpart/patches/patch-ac14
-rw-r--r--sysutils/gpart/patches/patch-ad13
-rw-r--r--sysutils/gpart/patches/patch-ae13
-rw-r--r--sysutils/grub/DESCR17
-rw-r--r--sysutils/grub/MESSAGE16
-rw-r--r--sysutils/grub/Makefile45
-rw-r--r--sysutils/grub/PLIST32
-rw-r--r--sysutils/grub/distinfo14
-rw-r--r--sysutils/grub/patches/patch-aa13
-rw-r--r--sysutils/grub/patches/patch-ab13
-rw-r--r--sysutils/grub/patches/patch-ac166
-rw-r--r--sysutils/grub/patches/patch-ad166
-rw-r--r--sysutils/grub/patches/patch-ae13
-rw-r--r--sysutils/grub/patches/patch-af13
-rw-r--r--sysutils/grub/patches/patch-ag13
-rw-r--r--sysutils/grub/patches/patch-ah13
-rw-r--r--sysutils/grub/patches/patch-ai13
-rw-r--r--sysutils/grub/patches/patch-aj15
-rw-r--r--sysutils/grun/DESCR6
-rw-r--r--sysutils/grun/Makefile24
-rw-r--r--sysutils/grun/PLIST6
-rw-r--r--sysutils/grun/distinfo5
-rw-r--r--sysutils/grun/patches/patch-aa27
-rw-r--r--sysutils/gtop/DESCR1
-rw-r--r--sysutils/gtop/Makefile28
-rw-r--r--sysutils/gtop/PLIST46
-rw-r--r--sysutils/gtop/distinfo5
-rw-r--r--sysutils/gtop/patches/patch-aa29
-rw-r--r--sysutils/gworkspace/DESCR3
-rw-r--r--sysutils/gworkspace/Makefile13
-rw-r--r--sysutils/gworkspace/Makefile.common22
-rw-r--r--sysutils/gworkspace/PLIST1334
-rw-r--r--sysutils/gworkspace/distinfo6
-rw-r--r--sysutils/gworkspace/files/GNUmakefile9
-rw-r--r--sysutils/gworkspace/patches/patch-aa31
-rw-r--r--sysutils/gworkspace/patches/patch-ab21
-rw-r--r--sysutils/hfsutils/DESCR9
-rw-r--r--sysutils/hfsutils/Makefile20
-rw-r--r--sysutils/hfsutils/PLIST30
-rw-r--r--sysutils/hfsutils/distinfo5
-rw-r--r--sysutils/hfsutils/patches/patch-aa38
-rw-r--r--sysutils/i2ocfg/DESCR3
-rw-r--r--sysutils/i2ocfg/MESSAGE16
-rw-r--r--sysutils/i2ocfg/Makefile15
-rw-r--r--sysutils/i2ocfg/PLIST4
-rw-r--r--sysutils/i2ocfg/distinfo4
-rw-r--r--sysutils/isapnptools/DESCR3
-rw-r--r--sysutils/isapnptools/Makefile21
-rw-r--r--sysutils/isapnptools/PLIST19
-rw-r--r--sysutils/isapnptools/distinfo9
-rw-r--r--sysutils/isapnptools/patches/patch-aa35
-rw-r--r--sysutils/isapnptools/patches/patch-ab24
-rw-r--r--sysutils/isapnptools/patches/patch-ac27
-rw-r--r--sysutils/isapnptools/patches/patch-ad380
-rw-r--r--sysutils/isapnptools/patches/patch-ae13
-rw-r--r--sysutils/kapm/DESCR12
-rw-r--r--sysutils/kapm/Makefile29
-rw-r--r--sysutils/kapm/PLIST21
-rw-r--r--sysutils/kapm/distinfo8
-rw-r--r--sysutils/kapm/patches/patch-aa124
-rw-r--r--sysutils/kapm/patches/patch-ab30
-rw-r--r--sysutils/kapm/patches/patch-ac29
-rw-r--r--sysutils/kapm/patches/patch-ad20
-rw-r--r--sysutils/kdf/DESCR9
-rw-r--r--sysutils/kdf/Makefile34
-rw-r--r--sysutils/kdf/PLIST26
-rw-r--r--sysutils/kdf/distinfo9
-rw-r--r--sysutils/kdf/patches/patch-aa81
-rw-r--r--sysutils/kdf/patches/patch-ab13
-rw-r--r--sysutils/kdf/patches/patch-ac13
-rw-r--r--sysutils/kdf/patches/patch-ad16
-rw-r--r--sysutils/kdf/patches/patch-ae13
-rw-r--r--sysutils/kdirstat/DESCR3
-rw-r--r--sysutils/kdirstat/Makefile19
-rw-r--r--sysutils/kdirstat/PLIST34
-rw-r--r--sysutils/kdirstat/distinfo4
-rw-r--r--sysutils/klavg/DESCR10
-rw-r--r--sysutils/klavg/Makefile18
-rw-r--r--sysutils/klavg/PLIST2
-rw-r--r--sysutils/klavg/distinfo6
-rw-r--r--sysutils/klavg/patches/patch-aa35
-rw-r--r--sysutils/klavg/patches/patch-ab59
-rw-r--r--sysutils/koncd/DESCR15
-rw-r--r--sysutils/koncd/Makefile21
-rw-r--r--sysutils/koncd/PLIST43
-rw-r--r--sysutils/koncd/distinfo9
-rw-r--r--sysutils/koncd/patches/patch-aa115
-rw-r--r--sysutils/koncd/patches/patch-ab15
-rw-r--r--sysutils/koncd/patches/patch-ac13
-rw-r--r--sysutils/koncd/patches/patch-ad99
-rw-r--r--sysutils/koncd/patches/patch-ae13
-rw-r--r--sysutils/lambd/DESCR1
-rw-r--r--sysutils/lambd/Makefile23
-rw-r--r--sysutils/lambd/PLIST4
-rw-r--r--sysutils/lambd/files/Makefile14
-rw-r--r--sysutils/lambd/files/lambd.879
-rw-r--r--sysutils/lambd/files/lambd.c324
-rw-r--r--sysutils/lambd/files/lambio.c112
-rw-r--r--sysutils/lambd/files/lambio.h34
-rw-r--r--sysutils/lavaps/DESCR6
-rw-r--r--sysutils/lavaps/Makefile24
-rw-r--r--sysutils/lavaps/PLIST3
-rw-r--r--sysutils/lavaps/distinfo4
-rw-r--r--sysutils/libirman/DESCR8
-rw-r--r--sysutils/libirman/Makefile39
-rw-r--r--sysutils/libirman/PLIST9
-rw-r--r--sysutils/libirman/distinfo9
-rw-r--r--sysutils/libirman/patches/patch-aa21
-rw-r--r--sysutils/libirman/patches/patch-ab16
-rw-r--r--sysutils/libirman/patches/patch-ac13
-rw-r--r--sysutils/libirman/patches/patch-ad13
-rw-r--r--sysutils/libirman/patches/patch-ae13
-rw-r--r--sysutils/logrot/DESCR6
-rw-r--r--sysutils/logrot/Makefile13
-rw-r--r--sysutils/logrot/PLIST3
-rw-r--r--sysutils/logrot/distinfo4
-rw-r--r--sysutils/lsof/DESCR5
-rw-r--r--sysutils/lsof/Makefile64
-rw-r--r--sysutils/lsof/PLIST18
-rw-r--r--sysutils/lsof/distinfo5
-rw-r--r--sysutils/lsof/patches/patch-aa31
-rw-r--r--sysutils/mbmon/DESCR1
-rw-r--r--sysutils/mbmon/Makefile17
-rw-r--r--sysutils/mbmon/Makefile.common20
-rw-r--r--sysutils/mbmon/PLIST2
-rw-r--r--sysutils/mbmon/distinfo9
-rw-r--r--sysutils/mbmon/patches/patch-aa32
-rw-r--r--sysutils/mc/DESCR4
-rw-r--r--sysutils/mc/Makefile18
-rw-r--r--sysutils/mc/Makefile.common48
-rw-r--r--sysutils/mc/PLIST110
-rw-r--r--sysutils/mc/distinfo14
-rw-r--r--sysutils/mc/patches/patch-aa49
-rw-r--r--sysutils/mc/patches/patch-ab26
-rw-r--r--sysutils/mc/patches/patch-ac21
-rw-r--r--sysutils/mc/patches/patch-ad24
-rw-r--r--sysutils/mc/patches/patch-ae23
-rw-r--r--sysutils/mc/patches/patch-af31
-rw-r--r--sysutils/mc/patches/patch-ag13
-rw-r--r--sysutils/mc/patches/patch-ah13
-rw-r--r--sysutils/mc/patches/patch-ai13
-rw-r--r--sysutils/mc/patches/patch-aj16
-rw-r--r--sysutils/medusa/DESCR13
-rw-r--r--sysutils/medusa/MESSAGE8
-rw-r--r--sysutils/medusa/Makefile24
-rw-r--r--sysutils/medusa/PLIST58
-rw-r--r--sysutils/medusa/buildlink2.mk28
-rw-r--r--sysutils/medusa/distinfo16
-rw-r--r--sysutils/medusa/patches/patch-aa18
-rw-r--r--sysutils/medusa/patches/patch-ab15
-rw-r--r--sysutils/medusa/patches/patch-ad32
-rw-r--r--sysutils/medusa/patches/patch-ae13
-rw-r--r--sysutils/medusa/patches/patch-af13
-rw-r--r--sysutils/medusa/patches/patch-ag14
-rw-r--r--sysutils/medusa/patches/patch-ah10
-rw-r--r--sysutils/medusa/patches/patch-ai71
-rw-r--r--sysutils/medusa/patches/patch-aj10
-rw-r--r--sysutils/medusa/patches/patch-ak13
-rw-r--r--sysutils/medusa/patches/patch-al13
-rw-r--r--sysutils/medusa/patches/patch-am13
-rw-r--r--sysutils/memconf/DESCR6
-rw-r--r--sysutils/memconf/Makefile22
-rw-r--r--sysutils/memconf/PLIST2
-rw-r--r--sysutils/memconf/distinfo4
-rw-r--r--sysutils/memtest86/DESCR3
-rw-r--r--sysutils/memtest86/MESSAGE13
-rw-r--r--sysutils/memtest86/Makefile27
-rw-r--r--sysutils/memtest86/PLIST5
-rw-r--r--sysutils/memtest86/distinfo6
-rw-r--r--sysutils/memtest86/files/linkage.h54
-rw-r--r--sysutils/memtest86/patches/patch-aa13
-rw-r--r--sysutils/memtest86/patches/patch-ab13
-rw-r--r--sysutils/mgm/DESCR4
-rw-r--r--sysutils/mgm/Makefile48
-rw-r--r--sysutils/mgm/PLIST119
-rw-r--r--sysutils/mgm/distinfo4
-rwxr-xr-xsysutils/mgm/files/mgm.sh3
-rw-r--r--sysutils/mksunbootcd/DESCR13
-rw-r--r--sysutils/mksunbootcd/Makefile17
-rw-r--r--sysutils/mksunbootcd/PLIST4
-rw-r--r--sysutils/mksunbootcd/distinfo4
-rw-r--r--sysutils/mktemp/DESCR2
-rw-r--r--sysutils/mktemp/Makefile17
-rw-r--r--sysutils/mktemp/PLIST3
-rw-r--r--sysutils/mktemp/distinfo4
-rw-r--r--sysutils/mtools/DESCR4
-rw-r--r--sysutils/mtools/Makefile34
-rw-r--r--sysutils/mtools/PLIST63
-rw-r--r--sysutils/mtools/distinfo9
-rw-r--r--sysutils/mtools/patches/patch-aa30
-rw-r--r--sysutils/mtools/patches/patch-ab55
-rw-r--r--sysutils/mtools/patches/patch-ac21
-rw-r--r--sysutils/mtools/patches/patch-ad13
-rw-r--r--sysutils/mtools/patches/patch-af40
-rw-r--r--sysutils/mtoolsfm/DESCR19
-rw-r--r--sysutils/mtoolsfm/Makefile30
-rw-r--r--sysutils/mtoolsfm/PLIST5
-rw-r--r--sysutils/mtoolsfm/distinfo5
-rw-r--r--sysutils/mtoolsfm/patches/patch-aa22
-rw-r--r--sysutils/nautilus/DESCR3
-rw-r--r--sysutils/nautilus/Makefile68
-rw-r--r--sysutils/nautilus/PLIST358
-rw-r--r--sysutils/nautilus/buildlink2.mk48
-rw-r--r--sysutils/nautilus/distinfo10
-rw-r--r--sysutils/nautilus/patches/patch-aa33
-rw-r--r--sysutils/nautilus/patches/patch-ab16
-rw-r--r--sysutils/nautilus/patches/patch-ac14
-rw-r--r--sysutils/nautilus/patches/patch-ad282
-rw-r--r--sysutils/nautilus/patches/patch-ae13
-rw-r--r--sysutils/nautilus/patches/patch-af40
-rw-r--r--sysutils/osname/DESCR3
-rw-r--r--sysutils/osname/Makefile15
-rw-r--r--sysutils/osname/PLIST3
-rw-r--r--sysutils/osname/distinfo4
-rw-r--r--sysutils/p5-Unix-Syslog/DESCR5
-rw-r--r--sysutils/p5-Unix-Syslog/Makefile16
-rw-r--r--sysutils/p5-Unix-Syslog/PLIST1
-rw-r--r--sysutils/p5-Unix-Syslog/distinfo4
-rw-r--r--sysutils/pciutils/DESCR6
-rw-r--r--sysutils/pciutils/Makefile15
-rw-r--r--sysutils/pciutils/PLIST15
-rw-r--r--sysutils/pciutils/buildlink2.mk19
-rw-r--r--sysutils/pciutils/distinfo5
-rw-r--r--sysutils/pciutils/patches/patch-aa40
-rw-r--r--sysutils/pcvt-utils/DESCR6
-rw-r--r--sysutils/pcvt-utils/Makefile27
-rw-r--r--sysutils/pcvt-utils/PLIST11
-rw-r--r--sysutils/pcvt-utils/distinfo11
-rw-r--r--sysutils/pcvt-utils/patches/patch-aa28
-rw-r--r--sysutils/pcvt-utils/patches/patch-ab18
-rw-r--r--sysutils/pcvt-utils/patches/patch-ac12
-rw-r--r--sysutils/pcvt-utils/patches/patch-ad25
-rw-r--r--sysutils/pcvt-utils/patches/patch-ae53
-rw-r--r--sysutils/pcvt-utils/patches/patch-af12
-rw-r--r--sysutils/pcvt-utils/patches/patch-ag13
-rw-r--r--sysutils/pflogsumm/DESCR3
-rw-r--r--sysutils/pflogsumm/Makefile29
-rw-r--r--sysutils/pflogsumm/PLIST2
-rw-r--r--sysutils/pflogsumm/distinfo4
-rw-r--r--sysutils/psmisc/DESCR9
-rw-r--r--sysutils/psmisc/MESSAGE9
-rw-r--r--sysutils/psmisc/Makefile24
-rw-r--r--sysutils/psmisc/PLIST7
-rw-r--r--sysutils/psmisc/distinfo11
-rw-r--r--sysutils/psmisc/patches/patch-aa13
-rw-r--r--sysutils/psmisc/patches/patch-ab16
-rw-r--r--sysutils/psmisc/patches/patch-ac22
-rw-r--r--sysutils/psmisc/patches/patch-ad71
-rw-r--r--sysutils/psmisc/patches/patch-ae25
-rw-r--r--sysutils/psmisc/patches/patch-af92
-rw-r--r--sysutils/psmisc/patches/patch-ag82
-rw-r--r--sysutils/pstree/DESCR3
-rw-r--r--sysutils/pstree/Makefile21
-rw-r--r--sysutils/pstree/PLIST4
-rw-r--r--sysutils/pstree/distinfo4
-rw-r--r--sysutils/pv/DESCR5
-rw-r--r--sysutils/pv/Makefile30
-rw-r--r--sysutils/pv/PLIST24
-rw-r--r--sysutils/pv/distinfo7
-rw-r--r--sysutils/pv/patches/patch-aa9
-rw-r--r--sysutils/pv/patches/patch-ab31
-rw-r--r--sysutils/pv/patches/patch-ac13
-rw-r--r--sysutils/pwgen/DESCR2
-rw-r--r--sysutils/pwgen/Makefile13
-rw-r--r--sysutils/pwgen/PLIST3
-rw-r--r--sysutils/pwgen/distinfo4
-rw-r--r--sysutils/qlogtools/DESCR2
-rw-r--r--sysutils/qlogtools/Makefile19
-rw-r--r--sysutils/qlogtools/PLIST15
-rw-r--r--sysutils/qlogtools/distinfo4
-rw-r--r--sysutils/rconfig/DESCR5
-rw-r--r--sysutils/rconfig/Makefile22
-rw-r--r--sysutils/rconfig/PLIST4
-rw-r--r--sysutils/rconfig/distinfo4
-rw-r--r--sysutils/rdiff-backup/DESCR10
-rw-r--r--sysutils/rdiff-backup/Makefile30
-rw-r--r--sysutils/rdiff-backup/PLIST65
-rw-r--r--sysutils/rdiff-backup/distinfo6
-rw-r--r--sysutils/rdiff-backup/patches/patch-aa19
-rw-r--r--sysutils/rdiff-backup/patches/patch-ab18
-rw-r--r--sysutils/roller/DESCR1
-rw-r--r--sysutils/roller/Makefile28
-rw-r--r--sysutils/roller/PLIST19
-rw-r--r--sysutils/roller/distinfo4
-rw-r--r--sysutils/rox-archive/DESCR2
-rw-r--r--sysutils/rox-archive/Makefile38
-rw-r--r--sysutils/rox-archive/PLIST7
-rw-r--r--sysutils/rox-archive/distinfo5
-rw-r--r--sysutils/rox-archive/patches/patch-aa40
-rw-r--r--sysutils/rox-base/DESCR7
-rw-r--r--sysutils/rox-base/MESSAGE11
-rw-r--r--sysutils/rox-base/Makefile32
-rw-r--r--sysutils/rox-base/PLIST50
-rw-r--r--sysutils/rox-base/distinfo4
-rw-r--r--sysutils/rox-edit/DESCR7
-rw-r--r--sysutils/rox-edit/Makefile40
-rw-r--r--sysutils/rox-edit/PLIST16
-rw-r--r--sysutils/rox-edit/distinfo4
-rw-r--r--sysutils/rox-lib/DESCR5
-rw-r--r--sysutils/rox-lib/MESSAGE13
-rw-r--r--sysutils/rox-lib/Makefile41
-rw-r--r--sysutils/rox-lib/PLIST31
-rw-r--r--sysutils/rox-lib/distinfo4
-rw-r--r--sysutils/rox-memo/DESCR3
-rw-r--r--sysutils/rox-memo/Makefile40
-rw-r--r--sysutils/rox-memo/PLIST19
-rw-r--r--sysutils/rox-memo/distinfo4
-rw-r--r--sysutils/rox-session/DESCR6
-rw-r--r--sysutils/rox-session/Makefile41
-rw-r--r--sysutils/rox-session/PLIST16
-rw-r--r--sysutils/rox-session/distinfo8
-rw-r--r--sysutils/rox-session/patches/patch-aa23
-rw-r--r--sysutils/rox-session/patches/patch-ab14
-rw-r--r--sysutils/rox-session/patches/patch-ac12
-rw-r--r--sysutils/rox-session/patches/patch-ad13
-rw-r--r--sysutils/rox-system/DESCR2
-rw-r--r--sysutils/rox-system/Makefile40
-rw-r--r--sysutils/rox-system/PLIST10
-rw-r--r--sysutils/rox-system/distinfo6
-rw-r--r--sysutils/rox-system/patches/patch-aa14
-rw-r--r--sysutils/rox-system/patches/patch-ab14
-rw-r--r--sysutils/rox-wallpaper/DESCR4
-rw-r--r--sysutils/rox-wallpaper/Makefile41
-rw-r--r--sysutils/rox-wallpaper/PLIST12
-rw-r--r--sysutils/rox-wallpaper/distinfo4
-rw-r--r--sysutils/rox-wrappers/DESCR13
-rw-r--r--sysutils/rox-wrappers/Makefile27
-rw-r--r--sysutils/rox-wrappers/PLIST77
-rw-r--r--sysutils/rox-wrappers/distinfo5
-rw-r--r--sysutils/rox-wrappers/patches/patch-aa13
-rw-r--r--sysutils/rox/DESCR3
-rw-r--r--sysutils/rox/MESSAGE12
-rw-r--r--sysutils/rox/Makefile50
-rw-r--r--sysutils/rox/PLIST47
-rw-r--r--sysutils/rox/distinfo8
-rw-r--r--sysutils/rox/files/rox20
-rw-r--r--sysutils/rox/patches/patch-aa23
-rw-r--r--sysutils/rox/patches/patch-ab14
-rw-r--r--sysutils/rox/patches/patch-ac12
-rw-r--r--sysutils/rox/patches/patch-ad431
-rw-r--r--sysutils/rtty/DESCR5
-rw-r--r--sysutils/rtty/Makefile27
-rw-r--r--sysutils/rtty/PLIST24
-rw-r--r--sysutils/rtty/distinfo8
-rw-r--r--sysutils/rtty/patches/patch-aa43
-rw-r--r--sysutils/rtty/patches/patch-ab16
-rw-r--r--sysutils/rtty/patches/patch-ac53
-rw-r--r--sysutils/rtty/patches/patch-ad13
-rw-r--r--sysutils/ruby-quota/DESCR3
-rw-r--r--sysutils/ruby-quota/Makefile26
-rw-r--r--sysutils/ruby-quota/PLIST5
-rw-r--r--sysutils/ruby-quota/distinfo4
-rw-r--r--sysutils/safetynet/DESCR10
-rw-r--r--sysutils/safetynet/Makefile34
-rw-r--r--sysutils/safetynet/PLIST5
-rw-r--r--sysutils/safetynet/distinfo4
-rw-r--r--sysutils/sarah/DESCR3
-rw-r--r--sysutils/sarah/Makefile39
-rw-r--r--sysutils/sarah/PLIST7
-rw-r--r--sysutils/sarah/distinfo4
-rw-r--r--sysutils/screentest/DESCR3
-rw-r--r--sysutils/screentest/Makefile25
-rw-r--r--sysutils/screentest/PLIST7
-rw-r--r--sysutils/screentest/distinfo7
-rw-r--r--sysutils/screentest/patches/patch-aa12
-rw-r--r--sysutils/screentest/patches/patch-ab14
-rw-r--r--sysutils/screentest/patches/patch-ac12
-rw-r--r--sysutils/scsiinfo/DESCR6
-rw-r--r--sysutils/scsiinfo/Makefile27
-rw-r--r--sysutils/scsiinfo/PLIST3
-rw-r--r--sysutils/scsiinfo/distinfo5
-rw-r--r--sysutils/scsiinfo/patches/patch-aa19
-rw-r--r--sysutils/service-config/DESCR14
-rw-r--r--sysutils/service-config/Makefile27
-rw-r--r--sysutils/service-config/PLIST8
-rw-r--r--sysutils/service-config/distinfo4
-rw-r--r--sysutils/setquota/DESCR4
-rw-r--r--sysutils/setquota/Makefile16
-rw-r--r--sysutils/setquota/PLIST5
-rw-r--r--sysutils/setquota/distinfo10
-rw-r--r--sysutils/setquota/patches/patch-aa20
-rw-r--r--sysutils/setquota/patches/patch-ab13
-rw-r--r--sysutils/setquota/patches/patch-ac16
-rw-r--r--sysutils/setquota/patches/patch-ad23
-rw-r--r--sysutils/setquota/patches/patch-ae13
-rw-r--r--sysutils/setquota/patches/patch-af22
-rw-r--r--sysutils/shmux/DESCR6
-rw-r--r--sysutils/shmux/Makefile17
-rw-r--r--sysutils/shmux/PLIST4
-rw-r--r--sysutils/shmux/distinfo4
-rw-r--r--sysutils/skill/DESCR10
-rw-r--r--sysutils/skill/Makefile29
-rw-r--r--sysutils/skill/PLIST5
-rw-r--r--sysutils/skill/distinfo6
-rw-r--r--sysutils/skill/patches/patch-aa64
-rw-r--r--sysutils/skill/patches/patch-ab26
-rw-r--r--sysutils/socket/DESCR13
-rw-r--r--sysutils/socket/Makefile26
-rw-r--r--sysutils/socket/PLIST3
-rw-r--r--sysutils/socket/distinfo13
-rw-r--r--sysutils/socket/patches/patch-aa13
-rw-r--r--sysutils/socket/patches/patch-ab10
-rw-r--r--sysutils/socket/patches/patch-ac41
-rw-r--r--sysutils/socket/patches/patch-ad22
-rw-r--r--sysutils/socket/patches/patch-ae39
-rw-r--r--sysutils/socket/patches/patch-af10
-rw-r--r--sysutils/socket/patches/patch-ag297
-rw-r--r--sysutils/socket/patches/patch-ah329
-rw-r--r--sysutils/socket/patches/patch-ai24
-rw-r--r--sysutils/sshsh/DESCR2
-rw-r--r--sysutils/sshsh/Makefile15
-rw-r--r--sysutils/sshsh/PLIST3
-rw-r--r--sysutils/sshsh/distinfo4
-rw-r--r--sysutils/storage-manager/DESCR5
-rw-r--r--sysutils/storage-manager/Makefile89
-rw-r--r--sysutils/storage-manager/PLIST29
-rw-r--r--sysutils/storage-manager/distinfo4
-rwxr-xr-xsysutils/storage-manager/files/dptelog30
-rwxr-xr-xsysutils/storage-manager/files/dpteng33
-rw-r--r--sysutils/storage-manager/files/dptmgr.sh8
-rw-r--r--sysutils/storage-manager/files/dptsig.sh8
-rw-r--r--sysutils/storage-manager/files/raidutil.sh8
-rw-r--r--sysutils/stow/DESCR14
-rw-r--r--sysutils/stow/Makefile20
-rw-r--r--sysutils/stow/PLIST6
-rw-r--r--sysutils/stow/distinfo4
-rw-r--r--sysutils/su2/DESCR18
-rw-r--r--sysutils/su2/Makefile15
-rw-r--r--sysutils/su2/PLIST3
-rw-r--r--sysutils/su2/distinfo7
-rw-r--r--sysutils/su2/patches/patch-aa48
-rw-r--r--sysutils/su2/patches/patch-ab25
-rw-r--r--sysutils/su2/patches/patch-ac55
-rw-r--r--sysutils/sux/DESCR2
-rw-r--r--sysutils/sux/Makefile18
-rw-r--r--sysutils/sux/PLIST3
-rw-r--r--sysutils/sux/distinfo4
-rw-r--r--sysutils/sysbuild/DESCR10
-rw-r--r--sysutils/sysbuild/INSTALL27
-rw-r--r--sysutils/sysbuild/MESSAGE15
-rw-r--r--sysutils/sysbuild/Makefile69
-rw-r--r--sysutils/sysbuild/PLIST7
-rw-r--r--sysutils/sysbuild/files/crontab19
-rw-r--r--sysutils/sysbuild/files/default.conf66
-rw-r--r--sysutils/sysbuild/files/profile17
-rw-r--r--sysutils/sysbuild/files/sysbuild.8538
-rw-r--r--sysutils/sysbuild/files/sysbuild.sh781
-rw-r--r--sysutils/sysgen/DESCR8
-rw-r--r--sysutils/sysgen/Makefile20
-rw-r--r--sysutils/sysgen/PLIST3
-rw-r--r--sysutils/sysgen/distinfo4
-rw-r--r--sysutils/sysinfo/DESCR6
-rw-r--r--sysutils/sysinfo/Makefile23
-rw-r--r--sysutils/sysinfo/PLIST27
-rw-r--r--sysutils/sysinfo/distinfo5
-rw-r--r--sysutils/sysinfo/patches/patch-aa33
-rw-r--r--sysutils/tcx/DESCR8
-rw-r--r--sysutils/tcx/MESSAGE11
-rw-r--r--sysutils/tcx/Makefile17
-rw-r--r--sysutils/tcx/PLIST3
-rw-r--r--sysutils/tcx/distinfo8
-rw-r--r--sysutils/tcx/patches/patch-aa29
-rw-r--r--sysutils/tcx/patches/patch-ab41
-rw-r--r--sysutils/tcx/patches/patch-ac172
-rw-r--r--sysutils/tcx/patches/patch-ad36
-rw-r--r--sysutils/tdir/DESCR12
-rw-r--r--sysutils/tdir/Makefile16
-rw-r--r--sysutils/tdir/PLIST4
-rw-r--r--sysutils/tdir/distinfo4
-rw-r--r--sysutils/tits/DESCR8
-rw-r--r--sysutils/tits/Makefile26
-rw-r--r--sysutils/tits/PLIST5
-rw-r--r--sysutils/tits/distinfo5
-rw-r--r--sysutils/tits/patches/patch-aa14
-rw-r--r--sysutils/tkcron/DESCR2
-rw-r--r--sysutils/tkcron/Makefile24
-rw-r--r--sysutils/tkcron/PLIST2
-rw-r--r--sysutils/tkcron/distinfo5
-rw-r--r--sysutils/tkcron/patches/patch-aa13
-rw-r--r--sysutils/tkdesk/DESCR6
-rw-r--r--sysutils/tkdesk/Makefile28
-rw-r--r--sysutils/tkdesk/PLIST590
-rw-r--r--sysutils/tkdesk/distinfo15
-rw-r--r--sysutils/tkdesk/patches/patch-aa64
-rw-r--r--sysutils/tkdesk/patches/patch-ab50
-rw-r--r--sysutils/tkdesk/patches/patch-ac31
-rw-r--r--sysutils/tkdesk/patches/patch-ad22
-rw-r--r--sysutils/tkdesk/patches/patch-ae13
-rw-r--r--sysutils/tkdesk/patches/patch-af19
-rw-r--r--sysutils/tkdesk/patches/patch-ag23
-rw-r--r--sysutils/tkdesk/patches/patch-ah26
-rw-r--r--sysutils/tkdesk/patches/patch-ai13
-rw-r--r--sysutils/tkdesk/patches/patch-aj65
-rw-r--r--sysutils/tkdesk/patches/patch-ak44
-rw-r--r--sysutils/tload/DESCR6
-rw-r--r--sysutils/tload/Makefile21
-rw-r--r--sysutils/tload/PLIST3
-rw-r--r--sysutils/tload/distinfo5
-rw-r--r--sysutils/tload/patches/patch-aa70
-rw-r--r--sysutils/tob/DESCR13
-rw-r--r--sysutils/tob/Makefile37
-rw-r--r--sysutils/tob/PLIST8
-rw-r--r--sysutils/tob/distinfo6
-rw-r--r--sysutils/tob/patches/patch-aa63
-rw-r--r--sysutils/tob/patches/patch-ab13
-rw-r--r--sysutils/top/DESCR15
-rw-r--r--sysutils/top/Makefile38
-rw-r--r--sysutils/top/PLIST3
-rw-r--r--sysutils/top/distinfo12
-rw-r--r--sysutils/top/files/defaults.netbsd1319
-rw-r--r--sysutils/top/files/defaults.sunos519
-rw-r--r--sysutils/top/patches/patch-aa32
-rw-r--r--sysutils/top/patches/patch-ab892
-rw-r--r--sysutils/top/patches/patch-ac25
-rw-r--r--sysutils/top/patches/patch-ae35
-rw-r--r--sysutils/top/patches/patch-af570
-rw-r--r--sysutils/top/patches/patch-ag9
-rw-r--r--sysutils/top/patches/patch-ah13
-rw-r--r--sysutils/top/patches/patch-ai8
-rw-r--r--sysutils/toshutils/DESCR3
-rw-r--r--sysutils/toshutils/Makefile25
-rw-r--r--sysutils/toshutils/PLIST29
-rw-r--r--sysutils/toshutils/distinfo17
-rw-r--r--sysutils/toshutils/patches/patch-aa31
-rw-r--r--sysutils/toshutils/patches/patch-ab31
-rw-r--r--sysutils/toshutils/patches/patch-ac19
-rw-r--r--sysutils/toshutils/patches/patch-ad64
-rw-r--r--sysutils/toshutils/patches/patch-ae50
-rw-r--r--sysutils/toshutils/patches/patch-af16
-rw-r--r--sysutils/toshutils/patches/patch-ag37
-rw-r--r--sysutils/toshutils/patches/patch-ah34
-rw-r--r--sysutils/toshutils/patches/patch-ai37
-rw-r--r--sysutils/toshutils/patches/patch-aj51
-rw-r--r--sysutils/toshutils/patches/patch-ak37
-rw-r--r--sysutils/toshutils/patches/patch-al35
-rw-r--r--sysutils/toshutils/patches/patch-am22
-rw-r--r--sysutils/ups-nut-cgi/DESCR1
-rw-r--r--sysutils/ups-nut-cgi/Makefile43
-rw-r--r--sysutils/ups-nut-cgi/PLIST14
-rw-r--r--sysutils/ups-nut-cgi/distinfo7
-rw-r--r--sysutils/ups-nut-cgi/patches/patch-aa12
-rw-r--r--sysutils/ups-nut-cgi/patches/patch-ab12
-rw-r--r--sysutils/ups-nut-cgi/patches/patch-ac13
-rw-r--r--sysutils/ups-nut/DESCR5
-rw-r--r--sysutils/ups-nut/MESSAGE17
-rw-r--r--sysutils/ups-nut/Makefile75
-rw-r--r--sysutils/ups-nut/PLIST128
-rw-r--r--sysutils/ups-nut/distinfo9
-rw-r--r--sysutils/ups-nut/files/ups.sh55
-rw-r--r--sysutils/ups-nut/files/upsd.sh27
-rw-r--r--sysutils/ups-nut/files/upsdriver.sh58
-rw-r--r--sysutils/ups-nut/files/upslog.sh34
-rw-r--r--sysutils/ups-nut/files/upsmon.sh27
-rw-r--r--sysutils/ups-nut/patches/patch-ab13
-rw-r--r--sysutils/ups-nut/patches/patch-ad29
-rw-r--r--sysutils/ups-nut/patches/patch-af23
-rw-r--r--sysutils/ups-nut/patches/patch-ag13
-rw-r--r--sysutils/ups-nut/patches/patch-ah23
-rw-r--r--sysutils/usbutil/DESCR10
-rw-r--r--sysutils/usbutil/Makefile11
-rw-r--r--sysutils/usbutil/PLIST5
-rw-r--r--sysutils/usbutil/distinfo5
-rw-r--r--sysutils/usbutil/patches/patch-aa12
-rw-r--r--sysutils/user/DESCR10
-rw-r--r--sysutils/user/Makefile44
-rw-r--r--sysutils/user/PLIST15
-rw-r--r--sysutils/user/PLIST.catinstall11
-rw-r--r--sysutils/user/PLIST.maninstall11
-rw-r--r--sysutils/user/distinfo5
-rw-r--r--sysutils/user/patches/patch-aa13
-rw-r--r--sysutils/vcdimager-devel/DESCR16
-rw-r--r--sysutils/vcdimager-devel/Makefile22
-rw-r--r--sysutils/vcdimager-devel/PLIST12
-rw-r--r--sysutils/vcdimager-devel/distinfo4
-rw-r--r--sysutils/vcdimager/DESCR16
-rw-r--r--sysutils/vcdimager/Makefile20
-rw-r--r--sysutils/vcdimager/PLIST8
-rw-r--r--sysutils/vcdimager/distinfo5
-rw-r--r--sysutils/vcdimager/patches/patch-aa13
-rw-r--r--sysutils/vidc-tools/DESCR6
-rw-r--r--sysutils/vidc-tools/Makefile15
-rw-r--r--sysutils/vidc-tools/PLIST11
-rw-r--r--sysutils/vidc-tools/distinfo8
-rw-r--r--sysutils/vidc-tools/patches/patch-aa13
-rw-r--r--sysutils/vidc-tools/patches/patch-ab14
-rw-r--r--sysutils/vidc-tools/patches/patch-ac13
-rw-r--r--sysutils/vidc-tools/patches/patch-ad11
-rw-r--r--sysutils/vifm/DESCR11
-rw-r--r--sysutils/vifm/Makefile28
-rw-r--r--sysutils/vifm/PLIST8
-rw-r--r--sysutils/vifm/distinfo4
-rw-r--r--sysutils/whowatch/DESCR7
-rw-r--r--sysutils/whowatch/Makefile18
-rw-r--r--sysutils/whowatch/PLIST3
-rw-r--r--sysutils/whowatch/distinfo6
-rw-r--r--sysutils/whowatch/patches/patch-ab48
-rw-r--r--sysutils/whowatch/patches/patch-ac84
-rw-r--r--sysutils/wmcpuload/DESCR1
-rw-r--r--sysutils/wmcpuload/Makefile18
-rw-r--r--sysutils/wmcpuload/PLIST3
-rw-r--r--sysutils/wmcpuload/distinfo4
-rw-r--r--sysutils/wmmemmon/DESCR3
-rw-r--r--sysutils/wmmemmon/Makefile18
-rw-r--r--sysutils/wmmemmon/PLIST3
-rw-r--r--sysutils/wmmemmon/distinfo4
-rw-r--r--sysutils/wtail/DESCR2
-rw-r--r--sysutils/wtail/Makefile18
-rw-r--r--sysutils/wtail/PLIST9
-rw-r--r--sysutils/wtail/distinfo5
-rw-r--r--sysutils/wtail/patches/patch-aa41
-rw-r--r--sysutils/xbatt/DESCR4
-rw-r--r--sysutils/xbatt/Makefile30
-rw-r--r--sysutils/xbatt/PLIST5
-rw-r--r--sysutils/xbatt/distinfo6
-rw-r--r--sysutils/xbatt/files/XBatt4
-rw-r--r--sysutils/xbatt/patches/patch-aa17
-rw-r--r--sysutils/xbatt/patches/patch-ab20
-rw-r--r--sysutils/xbattbar/DESCR9
-rw-r--r--sysutils/xbattbar/Makefile23
-rw-r--r--sysutils/xbattbar/PLIST3
-rw-r--r--sysutils/xbattbar/distinfo6
-rw-r--r--sysutils/xbattbar/patches/patch-aa15
-rw-r--r--sysutils/xbattbar/patches/patch-ab12
-rw-r--r--sysutils/xcdroast/DESCR19
-rw-r--r--sysutils/xcdroast/INSTALL20
-rw-r--r--sysutils/xcdroast/MESSAGE6
-rw-r--r--sysutils/xcdroast/Makefile55
-rw-r--r--sysutils/xcdroast/PLIST92
-rw-r--r--sysutils/xcdroast/distinfo7
-rw-r--r--sysutils/xcdroast/patches/patch-aa12
-rw-r--r--sysutils/xcdroast/patches/patch-ac166
-rw-r--r--sysutils/xcdroast/patches/patch-ad70
-rw-r--r--sysutils/xdu/DESCR4
-rw-r--r--sysutils/xdu/Makefile17
-rw-r--r--sysutils/xdu/PLIST4
-rw-r--r--sysutils/xdu/distinfo5
-rw-r--r--sysutils/xdu/patches/patch-aa95
-rw-r--r--sysutils/xfm/DESCR10
-rw-r--r--sysutils/xfm/Makefile20
-rw-r--r--sysutils/xfm/PLIST443
-rw-r--r--sysutils/xfm/distinfo9
-rw-r--r--sysutils/xfm/patches/patch-aa24
-rw-r--r--sysutils/xfm/patches/patch-ab19
-rw-r--r--sysutils/xfm/patches/patch-ac16
-rw-r--r--sysutils/xfm/patches/patch-ad13
-rw-r--r--sysutils/xfm/patches/patch-ae28
-rw-r--r--sysutils/xhfs/DESCR7
-rw-r--r--sysutils/xhfs/Makefile23
-rw-r--r--sysutils/xhfs/PLIST7
-rw-r--r--sysutils/xhfs/distinfo6
-rw-r--r--sysutils/xhfs/patches/patch-aa78
-rw-r--r--sysutils/xhfs/patches/patch-ab21
-rw-r--r--sysutils/xmbmon/DESCR1
-rw-r--r--sysutils/xmbmon/Makefile18
-rw-r--r--sysutils/xmbmon/PLIST2
-rw-r--r--sysutils/xmeter/DESCR22
-rw-r--r--sysutils/xmeter/Makefile17
-rw-r--r--sysutils/xmeter/PLIST4
-rw-r--r--sysutils/xmeter/distinfo5
-rw-r--r--sysutils/xmeter/patches/patch-aa24
-rw-r--r--sysutils/xnc/DESCR8
-rw-r--r--sysutils/xnc/MESSAGE7
-rw-r--r--sysutils/xnc/Makefile34
-rw-r--r--sysutils/xnc/PLIST38
-rw-r--r--sysutils/xnc/distinfo15
-rw-r--r--sysutils/xnc/patches/patch-aa13
-rw-r--r--sysutils/xnc/patches/patch-ab58
-rw-r--r--sysutils/xnc/patches/patch-ac13
-rw-r--r--sysutils/xnc/patches/patch-ad13
-rw-r--r--sysutils/xnc/patches/patch-ae13
-rw-r--r--sysutils/xnc/patches/patch-af13
-rw-r--r--sysutils/xnc/patches/patch-ag42
-rw-r--r--sysutils/xnc/patches/patch-ah43
-rw-r--r--sysutils/xnc/patches/patch-ai16
-rw-r--r--sysutils/xnc/patches/patch-aj13
-rw-r--r--sysutils/xnc/patches/patch-ak12
-rw-r--r--sysutils/xosview/DESCR5
-rw-r--r--sysutils/xosview/Makefile40
-rw-r--r--sysutils/xosview/PLIST4
-rw-r--r--sysutils/xosview/distinfo12
-rw-r--r--sysutils/xosview/patches/patch-aa13
-rw-r--r--sysutils/xosview/patches/patch-ab30
-rw-r--r--sysutils/xosview/patches/patch-ac26
-rw-r--r--sysutils/xosview/patches/patch-ad85
-rw-r--r--sysutils/xosview/patches/patch-ae14
-rw-r--r--sysutils/xosview/patches/patch-af16
-rw-r--r--sysutils/xosview/patches/patch-ag24
-rw-r--r--sysutils/xosview/patches/patch-ah62
-rw-r--r--sysutils/xps/DESCR6
-rw-r--r--sysutils/xps/Makefile19
-rw-r--r--sysutils/xps/PLIST4
-rw-r--r--sysutils/xps/distinfo7
-rw-r--r--sysutils/xps/patches/patch-aa13
-rw-r--r--sysutils/xps/patches/patch-ab13
-rw-r--r--sysutils/xps/patches/patch-ac15
-rw-r--r--sysutils/xuvmstat/DESCR1
-rw-r--r--sysutils/xuvmstat/Makefile20
-rw-r--r--sysutils/xuvmstat/PLIST4
-rw-r--r--sysutils/xuvmstat/distinfo4
1175 files changed, 0 insertions, 39254 deletions
diff --git a/sysutils/GWLib/DESCR b/sysutils/GWLib/DESCR
deleted file mode 100644
index 2315677f92a..00000000000
--- a/sysutils/GWLib/DESCR
+++ /dev/null
@@ -1,2 +0,0 @@
- GWLib is the backend library for gworkspace, the official GNUstep
-workspace manager. GWorkspace is a clone of NeXT's workspace manager.
diff --git a/sysutils/GWLib/Makefile b/sysutils/GWLib/Makefile
deleted file mode 100644
index 0fb9c879353..00000000000
--- a/sysutils/GWLib/Makefile
+++ /dev/null
@@ -1,13 +0,0 @@
-# $NetBSD: Makefile,v 1.3 2003/07/13 13:53:13 wiz Exp $
-#
-
-.include "../../sysutils/gworkspace/Makefile.common"
-PKGNAME= ${DISTNAME:S/gworkspace/GWLib/}
-PKGREVISION= 1
-
-COMMENT= GWorkspace support library
-
-BUILD_DIRS= ${WRKSRC}/GWLib
-DISTINFO_FILE= ${.CURDIR}/../gworkspace/distinfo
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/GWLib/PLIST b/sysutils/GWLib/PLIST
deleted file mode 100644
index 1d646d59591..00000000000
--- a/sysutils/GWLib/PLIST
+++ /dev/null
@@ -1,15 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2003/07/06 08:51:33 rh Exp $
-share/GNUstep/System/Headers/GWorkspace/BNameEditor.h
-share/GNUstep/System/Headers/GWorkspace/Browser2.h
-share/GNUstep/System/Headers/GWorkspace/ContentViewersProtocol.h
-share/GNUstep/System/Headers/GWorkspace/GWFunctions.h
-share/GNUstep/System/Headers/GWorkspace/GWLib.h
-share/GNUstep/System/Headers/GWorkspace/GWNotifications.h
-share/GNUstep/System/Headers/GWorkspace/GWProtocol.h
-share/GNUstep/System/Headers/GWorkspace/IconViewsProtocol.h
-share/GNUstep/System/Headers/GWorkspace/InspectorsProtocol.h
-share/GNUstep/System/Headers/GWorkspace/PreferencesProtocol.h
-share/GNUstep/System/Headers/GWorkspace/ViewersProtocol.h
-share/GNUstep/System/Libraries/${GNUSTEP_HOST_CPU}/${GNUSTEP_HOST_OS}/gnu-gnu-gnu/libGWorkspace.so
-share/GNUstep/System/Libraries/${GNUSTEP_HOST_CPU}/${GNUSTEP_HOST_OS}/gnu-gnu-gnu/libGWorkspace.so.1.0.0
-@dirrm share/GNUstep/System/Headers/GWorkspace
diff --git a/sysutils/GWLib/buildlink2.mk b/sysutils/GWLib/buildlink2.mk
deleted file mode 100644
index ade5cfdc888..00000000000
--- a/sysutils/GWLib/buildlink2.mk
+++ /dev/null
@@ -1,32 +0,0 @@
-# $NetBSD: buildlink2.mk,v 1.4 2003/07/13 13:53:13 wiz Exp $
-#
-# This Makefile fragment is included by packages that use GWLib.
-#
-# This file was created automatically using createbuildlink 2.1.
-#
-
-.if !defined(GWLIB_BUILDLINK2_MK)
-GWLIB_BUILDLINK2_MK= # defined
-
-BUILDLINK_PACKAGES+= GWLib
-BUILDLINK_DEPENDS.GWLib?= GWLib>=0.5.3nb1
-BUILDLINK_PKGSRCDIR.GWLib?= ../../sysutils/GWLib
-
-EVAL_PREFIX+= BUILDLINK_PREFIX.GWLib=GWLib
-BUILDLINK_PREFIX.GWLib_DEFAULT= ${LOCALBASE}
-BUILDLINK_FILES.GWLib+= share/GNUstep/System/Headers/GWorkspace/ContentViewersProtocol.h
-BUILDLINK_FILES.GWLib+= share/GNUstep/System/Headers/GWorkspace/GWFunctions.h
-BUILDLINK_FILES.GWLib+= share/GNUstep/System/Headers/GWorkspace/GWNotifications.h
-BUILDLINK_FILES.GWLib+= share/GNUstep/System/Headers/GWorkspace/GWProtocol.h
-BUILDLINK_FILES.GWLib+= share/GNUstep/System/Headers/GWorkspace/IconViewsProtocol.h
-BUILDLINK_FILES.GWLib+= share/GNUstep/System/Headers/GWorkspace/InspectorsProtocol.h
-BUILDLINK_FILES.GWLib+= share/GNUstep/System/Headers/GWorkspace/ViewersProtocol.h
-BUILDLINK_FILES.GWLib+= share/GNUstep/System/Libraries/${GNUSTEP_HOST_CPU}/${LOWER_OPSYS}${APPEND_ELF}/gnu-gnu-gnu/libGWorkspace.*
-
-.include "../../x11/gnustep-back/buildlink2.mk"
-
-BUILDLINK_TARGETS+= GWLib-buildlink
-
-GWLib-buildlink: _BUILDLINK_USE
-
-.endif # GWLIB_BUILDLINK2_MK
diff --git a/sysutils/Makefile b/sysutils/Makefile
deleted file mode 100644
index 8e85f116a89..00000000000
--- a/sysutils/Makefile
+++ /dev/null
@@ -1,170 +0,0 @@
-# $NetBSD: Makefile,v 1.198 2003/07/03 10:22:15 agc Exp $
-
-COMMENT= System utilities
-
-SUBDIR+= GWLib
-SUBDIR+= adjustkernel
-SUBDIR+= amanda
-SUBDIR+= amanda-client
-SUBDIR+= amanda-common
-SUBDIR+= amanda-dev
-SUBDIR+= amanda-dev-client
-SUBDIR+= amanda-dev-common
-SUBDIR+= amanda-dev-plot
-SUBDIR+= amanda-dev-server
-SUBDIR+= amanda-plot
-SUBDIR+= amanda-server
-SUBDIR+= apcupsd
-SUBDIR+= aperture
-SUBDIR+= asapm
-SUBDIR+= bbsload
-SUBDIR+= bchunk
-SUBDIR+= bkpupsd
-SUBDIR+= c++rt0
-SUBDIR+= cdbkup
-SUBDIR+= cdrdao
-SUBDIR+= cdrecord
-SUBDIR+= cdrecord-xcdroast
-SUBDIR+= cfengine
-SUBDIR+= cfengine2
-SUBDIR+= cfengine2-doc
-SUBDIR+= checkpassword
-SUBDIR+= coreutils
-SUBDIR+= cpogm
-SUBDIR+= cpuburn
-SUBDIR+= cpuid
-SUBDIR+= crashme
-SUBDIR+= daemontools
-SUBDIR+= depot
-SUBDIR+= dog
-SUBDIR+= dptutil
-SUBDIR+= dvd+rw-tools
-SUBDIR+= dvdrecord
-SUBDIR+= dvdrip
-SUBDIR+= e2fsprogs
-SUBDIR+= easydiskpasswd
-SUBDIR+= etcupdate
-SUBDIR+= extipl
-SUBDIR+= fakeroot
-SUBDIR+= fam
-SUBDIR+= fdgw
-SUBDIR+= file
-SUBDIR+= findutils
-SUBDIR+= fix4SA110rev2
-SUBDIR+= fsviewer
-SUBDIR+= gcdmaster
-SUBDIR+= gcombust
-SUBDIR+= genpasswd
-SUBDIR+= gentoo
-SUBDIR+= gkrellm
-SUBDIR+= gkx86info
-SUBDIR+= gmc
-SUBDIR+= gnome-vfs
-SUBDIR+= gnome-vfs2
-SUBDIR+= gnometoaster
-SUBDIR+= gpart
-SUBDIR+= grub
-SUBDIR+= grun
-SUBDIR+= gtop
-SUBDIR+= gworkspace
-SUBDIR+= hfsutils
-SUBDIR+= i2ocfg
-SUBDIR+= isapnptools
-SUBDIR+= kapm
-SUBDIR+= kdf
-SUBDIR+= kdirstat
-SUBDIR+= klavg
-SUBDIR+= koncd
-SUBDIR+= lambd
-SUBDIR+= lavaps
-SUBDIR+= libirman
-SUBDIR+= logrot
-SUBDIR+= lsof
-SUBDIR+= mbmon
-SUBDIR+= mc
-SUBDIR+= medusa
-SUBDIR+= memconf
-SUBDIR+= memtest86
-SUBDIR+= mgm
-SUBDIR+= mksunbootcd
-SUBDIR+= mktemp
-SUBDIR+= mtools
-SUBDIR+= mtoolsfm
-SUBDIR+= nautilus
-SUBDIR+= osname
-SUBDIR+= p5-Unix-Syslog
-SUBDIR+= pciutils
-SUBDIR+= pcvt-utils
-SUBDIR+= pflogsumm
-SUBDIR+= psmisc
-SUBDIR+= pstree
-SUBDIR+= pv
-SUBDIR+= pwgen
-SUBDIR+= qlogtools
-SUBDIR+= rconfig
-SUBDIR+= rdiff-backup
-SUBDIR+= roller
-SUBDIR+= rox
-SUBDIR+= rox-archive
-SUBDIR+= rox-base
-SUBDIR+= rox-edit
-SUBDIR+= rox-lib
-SUBDIR+= rox-memo
-SUBDIR+= rox-session
-SUBDIR+= rox-system
-SUBDIR+= rox-wallpaper
-SUBDIR+= rox-wrappers
-SUBDIR+= rtty
-SUBDIR+= ruby-quota
-SUBDIR+= safetynet
-SUBDIR+= sarah
-SUBDIR+= screentest
-SUBDIR+= scsiinfo
-SUBDIR+= service-config
-SUBDIR+= setquota
-SUBDIR+= shmux
-SUBDIR+= skill
-SUBDIR+= socket
-SUBDIR+= sshsh
-SUBDIR+= storage-manager
-SUBDIR+= stow
-SUBDIR+= su2
-SUBDIR+= sux
-SUBDIR+= sysbuild
-SUBDIR+= sysgen
-SUBDIR+= sysinfo
-SUBDIR+= tcx
-SUBDIR+= tdir
-SUBDIR+= tits
-SUBDIR+= tkcron
-SUBDIR+= tkdesk
-SUBDIR+= tload
-SUBDIR+= tob
-SUBDIR+= top
-SUBDIR+= toshutils
-SUBDIR+= ups-nut
-SUBDIR+= ups-nut-cgi
-SUBDIR+= usbutil
-SUBDIR+= user
-SUBDIR+= vcdimager
-SUBDIR+= vcdimager-devel
-SUBDIR+= vidc-tools
-SUBDIR+= vifm
-SUBDIR+= whowatch
-SUBDIR+= wmcpuload
-SUBDIR+= wmmemmon
-SUBDIR+= wtail
-SUBDIR+= xbatt
-SUBDIR+= xbattbar
-SUBDIR+= xcdroast
-SUBDIR+= xdu
-SUBDIR+= xfm
-SUBDIR+= xhfs
-SUBDIR+= xmbmon
-SUBDIR+= xmeter
-SUBDIR+= xnc
-SUBDIR+= xosview
-SUBDIR+= xps
-SUBDIR+= xuvmstat
-
-.include "../mk/bsd.pkg.subdir.mk"
diff --git a/sysutils/adjustkernel/DESCR b/sysutils/adjustkernel/DESCR
deleted file mode 100644
index bd166219749..00000000000
--- a/sysutils/adjustkernel/DESCR
+++ /dev/null
@@ -1 +0,0 @@
-Build a kernel config file from dmesg output.
diff --git a/sysutils/adjustkernel/Makefile b/sysutils/adjustkernel/Makefile
deleted file mode 100644
index 4dfd618c537..00000000000
--- a/sysutils/adjustkernel/Makefile
+++ /dev/null
@@ -1,27 +0,0 @@
-# $NetBSD: Makefile,v 1.4 2003/03/29 12:42:26 jmmv Exp $
-
-DISTNAME= adjustkernel-1.5
-WRKSRC= ${WRKDIR}
-CATEGORIES= sysutils
-MASTER_SITES= # empty
-DISTFILES= # empty
-
-MAINTAINER= mjl@netbsd.org
-COMMENT= Generate a kernel config
-
-NO_CHECKSUM= yes
-NO_BUILD= yes
-NO_MTREE= yes
-
-USE_PERL5= YES
-
-REPLACE_PERL= adjustkernel
-
-do-extract:
- ${CP} ${FILESDIR}/adjustkernel ${WRKDIR}
-
-do-install:
- ${INSTALL_SCRIPT} ${WRKDIR}/adjustkernel ${PREFIX}/bin
- ${INSTALL_MAN} ${FILESDIR}/adjustkernel.1 ${PREFIX}/man/man1
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/adjustkernel/PLIST b/sysutils/adjustkernel/PLIST
deleted file mode 100644
index aee52141971..00000000000
--- a/sysutils/adjustkernel/PLIST
+++ /dev/null
@@ -1,3 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2002/03/01 01:32:13 mjl Exp $
-bin/adjustkernel
-man/man1/adjustkernel.1
diff --git a/sysutils/adjustkernel/files/adjustkernel b/sysutils/adjustkernel/files/adjustkernel
deleted file mode 100644
index f299e87f1e7..00000000000
--- a/sysutils/adjustkernel/files/adjustkernel
+++ /dev/null
@@ -1,135 +0,0 @@
-#!/usr/pkg/bin/perl
-#--------------------------------------------------------------------------
-# %Id: adjustkernel,v 1.1 1999/10/15 01:21:30 feyrer Exp feyrer %
-# $Emsi: adjustkernel,v 1.4 2001/10/04 22:26:26 mjl Exp $
-#
-# Usage: adjustkernel -f GENERIC [-o outfile] [-d]
-#
-# commends out any lines that aren't found in the current kernel (dmesg)
-#
-#--------------------------------------------------------------------------
-
-use strict;
-use Getopt::Long;
-
-#--------------------------------------------------------------------------
-sub findInDmesg($$);
-
-#--------------------------------------------------------------------------
-my $kernel;
-my $outname;
-my $debug = 0;
-my $remove = 0;
-my $mesg;
-
-die "Invalid command line" unless GetOptions(
- 'debug+' => \$debug,
- 'file=s' => \$kernel,
- 'outfile=s' => \$outname,
- 'remove+' => \$remove,
- 'mesg=s' => \$mesg
- );
-
-###########################################################################
-
-die "Usage: $0 [-debug] [-mesg dmesg-file] [-outfile new-config]\n\t\t[-remove] -file kernel-config\n" unless $kernel;
-
-$| = 1 if $debug;
-
-if($outname)
- {
- close STDOUT;
- open STDOUT, "> $outname" or die "Cannot write $outname: $!";
- }
-
-my @dmesg;
-
-if($mesg)
- {
- open DMESG, "< $mesg" or die "Cannot read $mesg: $!";
- @dmesg = <DMESG>;
- close DMESG;
- }
-else
- {
- @dmesg = `dmesg`;
- }
-
-@dmesg = grep /^\s*\w+\s+at\s+\w+/, @dmesg;
-
-#--------------------------------------------------------------------------
-open(K,"$kernel") or die "Cannot read $kernel: $!";
-while (<K>)
- {
- chomp;
- if (/^\s*#/)
- { # Already commented out
- # Nothing
- }
- elsif (/(\S*)\s+at\s+(\S*)(\s*.*)$/)
- {
- my ( $dev, $where, $comment ) = ( $1, $2, $3 );
-
- print STDERR "#>> Have? <$dev> at <$where><$comment>\n" if $debug;
-
- # Deal with inconsistencies
- $where = '\w+\d' if $where =~ /^mii/o;
-
- # Expand wildcards
- my $gdev=$dev;
- if ($dev =~ /[?*]$/o)
- {
- $gdev="$`\\d";
- }
-
- my $gwhere = $where;
- if ($where =~ /[?*]$/o)
- {
- $gwhere="$`\\d";
- }
-
- my $spat = "^${gdev}\\s+at\\s+${gwhere}";
- print STDERR "#>> ? $spat\n" if $debug;
-
- my $l = findInDmesg(\@dmesg, "^${gdev}\\s+at\\s+${gwhere}");
- if (! $l)
- {
- if ($dev !~ /mainbus/)
- { # inconsistent in dmesg, never comment out mainbus at something
- next if $remove;
-
- print "#(# ";
- }
- }
- }
-
- print "$_\n";
- }
-close(K);
-
-# Mention what we didn't find.
-foreach (@dmesg)
- {
- print "# NOTE: NoMatch: $_";
- }
-
-exit 0;
-
-#--------------------------------------------------------------------------
-sub findInDmesg($$)
- {
- my ( $dref, $pattern ) = @_;
-
- my @r = grep /$pattern/, @$dref;
-
- # We matched it once, so remove it from dmesg.
- # Ie. we match tr0 at isa once, but not tr* at isa later on
- @$dref = grep !/$pattern/, @$dref;
-
- print STDERR "#>> Have! @r" if @r && $debug;
-
- return scalar(@r) ? $r[0] : undef;
- }
-
-#--------------------------------------------------------------------------
-
diff --git a/sysutils/adjustkernel/files/adjustkernel.1 b/sysutils/adjustkernel/files/adjustkernel.1
deleted file mode 100644
index 9657cc10103..00000000000
--- a/sysutils/adjustkernel/files/adjustkernel.1
+++ /dev/null
@@ -1,57 +0,0 @@
-.\" $Emsi: adjustkernel.1,v 1.1 2002/03/01 01:25:37 mjl Exp $
-.\" $NetBSD: adjustkernel.1,v 1.3 2002/09/25 19:05:47 wiz Exp $
-.\"
-.Dd September 25, 2002
-.Dt ADJUSTKERNEL 1
-.Sh NAME
-.Nm adjustkernel
-.Nd generate kernel config from dmesg
-.Sh SYNOPSIS
-.Nm adjustkernel
-.Op Fl debug
-.Op Fl mesg Ar dmesg-file
-.Op Fl outfile Ar new-config
-.Op Fl remove
-.Fl file Ar source-config
-.Sh DESCRIPTION
-.Nm
-generates a new kernel configuration file from the
-current dmesg output and the current kernel config file.
-.Pp
-The generation can be customized by using the following options:
-.Bl -tag -width 22n -compact
-.It Fl debug
-be verbose and generate noise (mainly useful for debugging).
-.It Fl file Ar source-config
-read the currently booted kernel from source-config.
-This option is mandatory.
-.It Fl outfile Ar new-config
-saves the newly generated config file to
-.Ar new-config ;
-otherwise the new config will be written to stdout.
-.It Fl mesg Ar dmesg-file
-read the dmesg data from
-.Ar dmesg-file ,
-defaults to calling
-.Pa /sbin/dmesg
-and using its output.
-.It Fl remove
-causes the tool to remove entries in the config file instead
-of commenting them out.
-.El
-.Pp
-Note that options can be shortened, as long as they can be
-unambigously distinguished.
-.Sh EXAMPLES
-To generate a new kernel config after having booted a
-GENERIC kernel,
-.Bd -literal
-adjustkernel -f GENERIC -o MYKERNEL
-.Ed
-.Sh SEE ALSO
-.Xr options 4
-.Sh AUTHORS
-Originally created by Hubert Feyrer <hubert.feyrer@informatik.fh-regensburg.de>,
-later hacked in shape and packetized by Martin J. Laubach <mjl@netbsd.org>.
-.Sh BUGS
-On thursdays.
diff --git a/sysutils/amanda-client/DESCR b/sysutils/amanda-client/DESCR
deleted file mode 100644
index ae3624e07a0..00000000000
--- a/sysutils/amanda-client/DESCR
+++ /dev/null
@@ -1,180 +0,0 @@
-Amanda, The Advanced Maryland Automatic Network Disk Archiver
-Copyright (c) 1991-1998 University of Maryland at College Park
-All Rights Reserved.
-
-See the files COPYRIGHT, COPYRIGHT-REGEX and COPYRIGHT-APACHE for
-distribution conditions and official warranty disclaimer.
-
-PLEASE NOTE: THIS SOFTWARE IS BEING MADE AVAILABLE ``AS-IS''. UMD is making
-this work available so that other people can use it. This software is in
-production use at our home site - the UMCP Department of Computer Science -
-but we make no warranties that it will work for you. Amanda development is
-unfunded - the development team maintains the code in their spare time. As a
-result, there is no support available other than users helping each other on
-the Amanda mailing lists. See below for information on the mailing lists.
-
-
-WHAT IS AMANDA?
----------------
-
-This is a release of Amanda, the Advanced Maryland Automatic
-Network Disk Archiver. Amanda is a backup system designed to archive many
-computers on a network to a single large-capacity tape drive.
-
-Here are some features of Amanda:
-
- * written in C, freely distributable.
- * built on top of standard backup software: Unix dump/restore, GNU Tar
- and others.
- * will back up multiple machines in parallel to a holding disk, blasting
- finished dumps one by one to tape as fast as we can write files to
- tape. For example, a ~2 Gb 8mm tape on a ~240K/s interface to a host
- with a large holding disk can be filled by Amanda in under 4 hours.
- * does simple tape management: will not overwrite the wrong tape.
- * supports tape changers via a generic interface. Easily customizable to
- any type of tape carousel, robot, or stacker that can be controlled via
- the unix command line.
- * supports Kerberos 4 security, including encrypted dumps. The Kerberos
- support is available as a separate add-on package, see the file
- KERBEROS.HOW-TO-GET on the ftp site, and the file docs/KERBEROS in this
- package, for more details.
- * for a restore, tells you what tapes you need, and finds the proper
- backup image on the tape for you.
- * recovers gracefully from errors, including down or hung machines.
- * reports results, including all errors in detail, in email.
- * will dynamically adjust backup schedule to keep within constraints: no
- more juggling by hand when adding disks and computers to network.
- * includes a pre-run checker program, that conducts sanity checks on both
- the tape server host and all the client hosts (in parallel), and will
- send an e-mail report of any problems that could cause the backups to
- fail.
- * can compress dumps before sending or after sending over the net, with
- either compress or gzip.
- * can optionally synchronize with external backups, for those large
- timesharing computers where you want to do full dumps when the system
- is down in single-user mode (since BSD dump is not reliable on active
- filesystems): Amanda will still do your daily dumps.
- * lots of other options; Amanda is very configurable.
-
-
-WHAT ARE THE SYSTEM REQUIREMENTS FOR AMANDA?
---------------------------------------------
-
-Amanda requires a host that is mostly idle during the time backups are
-done, with a large capacity tape drive (e.g. an EXABYTE, DAT or DLT tape).
-This becomes the "tape server host". All the computers you are going to dump
-are the "backup client hosts". The server host can also be a client host.
-
-Amanda works best with one or more large "holding disk" partitions on the
-server host available to it for buffering dumps before writing to tape.
-The holding disk allows Amanda to run backups in parallel to the disk, only
-writing them to tape when the backup is finished. Note that the holding
-disk is not required: without it Amanda will run backups sequentially to
-the tape drive. Running it this way kills the great performance, but still
-allows you to take advantage of Amanda's other features.
-
-As a rule of thumb, for best performance the holding disk should be larger
-than the dump output from your largest disk partitions. For example, if
-you are backing up some full gigabyte disks that compress down to 500 MB,
-then you'll want 500 MB on your holding disk. On the other hand, if those
-gigabyte drives are partitioned into 500 MB filesystems, they'll probably
-compress down to 250 MB and you'll only need that much on your holding
-disk. Amanda will perform better with larger holding disks.
-
-Actually, Amanda will still work if you have full dumps that are larger
-than the holding disk: Amanda will send those dumps directly to tape one at
-a time. If you have many such dumps you will be limited by the dump speed
-of those machines.
-
-Amanda does not yet support single backup images larger than a tape.
-
-
-WHAT SYSTEMS DOES AMANDA RUN ON?
---------------------------------
-
-Amanda should run on any modern Unix system that supports dump or GNU
-tar, has sockets and inetd, and either system V shared memory, or BSD
-mmap implemented.
-
-In particular, Amanda 2.4.0 has been compiled, and the client side tested
-on the following systems:
- AIX 3.2 and 4.1
- BSDI BSD/OS 2.1 and 3.1
- DEC OSF/1 3.2 and 4.0
- FreeBSD 2.2.5
- IRIX 5.2 and 6.3
- Linux/GNU on x86, alpha and sparc
- NetBSD 1.0
- Nextstep 3 (*)
- SunOS 4.1.x (x >= 1) and 5.[56]
- Ultrix 4.2
- HP-UX 9.x and 10.x (x >= 01)
-
-The Amanda 2.4.0 server side is known to run on all of the other
-machines except on those marked with an asterisk.
-
-If you know of any system that is not listed here on which amanda
-builds successfully, either client&server or client-only, please
-report to amanda-hackers@amanda.org.
-
-
-WHERE DO I GET AMANDA?
-----------------------
-
-There are several versions of Amanda. The latest version at the time
-of this writing is available at:
-
- ftp://ftp.amanda.org/pub/amanda
-
-
-HOW DO I GET AMANDA UP AND RUNNING?
------------------------------------
-
-Read the file docs/INSTALL. There are a variety of steps, from compiling
-Amanda to installing it on the tape server host and the client machines.
- docs/INSTALL contains general installation instructions.
- docs/SYSTEM.NOTES contains system-specific information.
- docs/FAQ contains answers to frequently asked questions.
- docs/KERBEROS explains installation under Kerberos 4.
- docs/TAPE.CHANGERS explains how to customize the changer interface.
- docs/WHATS.NEW details new features.
-
-
-WHO DO I TALK TO IF I HAVE A PROBLEM?
--------------------------------------
-
-Amanda is completely unsupported and made available as-is. However,
-you may be able to get useful information in the Amanda mailing lists:
-
-==> To join a mailing list, DO NOT, EVER, send mail to that list. Send
- mail to <listname>-request@amanda.org, or amanda-lists@amanda.org,
- with the following line in the body of the message:
- subscribe <listname> <your-email-address>
-
-
- amanda-announce
- The amanda-announce mailing list is for important announcements
- related to the Amanda Network Backup Manager package, including new
- versions, contributions, and fixes. NOTE: the amanda-users list is
- itself on the amanda-announce distribution, so you only need to
- subscribe to one of the two lists, not both.
- To subscribe, send a message to amanda-announce-request@amanda.org.
-
- amanda-users
- The amanda-users mailing list is for questions and general discussion
- about the Amanda Network Backup Manager. This package and related
- files are available via anonymous FTP from ftp.amanda.org in the
- pub/amanda directory. NOTE: the amanda-users list is itself on the
- amanda-announce distribution, so you only need to subscribe to one of
- the two lists, not both.
- To subscribe, send a message to amanda-users-request@amanda.org.
-
- amanda-hackers
- The amanda-hackers mailing list is for discussion of the
- technical details of the Amanda package, including extensions,
- ports, bugs, fixes, and alpha testing of new versions.
- To subscribe, send a message to amanda-hackers-request@amanda.org.
-
-
-Share and Enjoy,
-The Amanda Development Team
diff --git a/sysutils/amanda-client/Makefile b/sysutils/amanda-client/Makefile
deleted file mode 100644
index 0d084768f30..00000000000
--- a/sysutils/amanda-client/Makefile
+++ /dev/null
@@ -1,45 +0,0 @@
-# $NetBSD: Makefile,v 1.31 2003/06/02 01:16:58 jschauma Exp $
-#
-
-DISTNAME= amanda-2.4.2p2
-PKGNAME= amanda-client-2.4.2p2
-SVR4_PKGNAME= amacl
-CATEGORIES= sysutils
-MASTER_SITES= ftp://ftp.cs.umd.edu/pub/amanda/
-
-MAINTAINER= tech-pkg@netbsd.org
-HOMEPAGE= http://www.amanda.org/
-COMMENT= Client part of Amanda, a network backup system
-
-DEPENDS+= amanda-common-2.4.2p2:../../sysutils/amanda-common
-
-USE_BUILDLINK2= yes
-GNU_CONFIGURE= yes
-
-.include "../../mk/bsd.prefs.mk"
-.include "../../sysutils/amanda-common/Makefile.common"
-.include "../../sysutils/amanda-common/buildlink2.mk"
-#.include "../../devel/readline/buildlink2.mk"
-
-.if ${OPSYS} != "Linux"
-DEPENDS+= {gtar,gtar-base}>=1.12:../../archivers/gtar-base
-.endif
-
-CONFIGURE_ARGS+= --without-server --without-restore
-
-# Prevent configure script from finding unnecessary libraries. We'll patch
-# the amrecover Makefile to add the readline libraries as it's the only
-# program that uses readline. (XXX: incorrect, does not happen)
-#
-CONFIGURE_ENV+= ac_cv_lib_intl_main=no
-CONFIGURE_ENV+= ac_cv_lib_termcap_tgetent=no
-CONFIGURE_ENV+= ac_cv_lib_curses_tgetent=no
-CONFIGURE_ENV+= ac_cv_lib_ncurses_tgetent=no
-CONFIGURE_ENV+= ac_cv_lib_readline_readline=no
-
-.if defined(AMANDA_SMB)
-CONFIGURE_ARGS+= --with-smbclient
-DEPENDS+= {samba>=2.0,ja-samba>=2.0}:../../net/samba
-.endif
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/amanda-client/PLIST b/sysutils/amanda-client/PLIST
deleted file mode 100644
index 3010d9766a7..00000000000
--- a/sysutils/amanda-client/PLIST
+++ /dev/null
@@ -1,16 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 22:52:47 zuntum Exp $
-lib/libamclient.a
-lib/libamclient.la
-lib/libamclient-2.4.2p2.so
-libexec/amandad
-libexec/calcsize
-libexec/killpgrp
-libexec/patch-system
-libexec/rundump
-libexec/runtar
-libexec/selfcheck
-libexec/sendbackup
-libexec/sendsize
-libexec/versionsuffix
-man/man8/amrecover.8
-sbin/amrecover
diff --git a/sysutils/amanda-client/distinfo b/sysutils/amanda-client/distinfo
deleted file mode 100644
index 5a2baf95a0b..00000000000
--- a/sysutils/amanda-client/distinfo
+++ /dev/null
@@ -1,9 +0,0 @@
-$NetBSD: distinfo,v 1.4 2001/06/26 03:15:16 christos Exp $
-
-SHA1 (amanda-2.4.2p2.tar.gz) = 721060b1357e9b939d06773f91a20de1d507521b
-Size (amanda-2.4.2p2.tar.gz) = 922404 bytes
-SHA1 (patch-aa) = e4f33a5e1a26d41344e337d046389ab1a748d111
-SHA1 (patch-ab) = 2038d93f6be6258c3432b534de7c6bfd010f7ecc
-SHA1 (patch-ac) = 806cbd9e4fcea98bbba2907e33a7092e2e773c59
-SHA1 (patch-ad) = 3debabdc26ca1f03f6bf8ff32d99d45ee65d5cea
-SHA1 (patch-ae) = 76a6de436b868f424cbc1371fc1cce93cecf5b25
diff --git a/sysutils/amanda-client/patches/patch-aa b/sysutils/amanda-client/patches/patch-aa
deleted file mode 100644
index 6df75402b21..00000000000
--- a/sysutils/amanda-client/patches/patch-aa
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-aa,v 1.4 2001/01/16 21:59:30 cjones Exp $
-
---- configure~ Sat Nov 25 06:59:40 2000
-+++ configure Mon Jan 15 16:39:41 2001
-@@ -4924,8 +4924,10 @@
- # This can be used to rebuild libtool when needed
- LIBTOOL_DEPS="$ac_aux_dir/ltconfig $ac_aux_dir/ltmain.sh"
-
-+if false ; then
- # Always use our own libtool.
- LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-+fi
-
- # Redirect the config.log output again, so that the ltconfig log is not
- # clobbered by the next message.
diff --git a/sysutils/amanda-client/patches/patch-ab b/sysutils/amanda-client/patches/patch-ab
deleted file mode 100644
index af550f9f6a0..00000000000
--- a/sysutils/amanda-client/patches/patch-ab
+++ /dev/null
@@ -1,86 +0,0 @@
-$NetBSD: patch-ab,v 1.5 2001/06/26 03:14:11 christos Exp $
-
---- client-src/Makefile.in.orig Tue Apr 3 15:55:44 2001
-+++ client-src/Makefile.in Mon Jun 25 22:05:53 2001
-@@ -174,7 +174,7 @@
- # routines, and second to pick up any references in the other libraries.
- ###
-
--LDADD = ../common-src/libamanda.$(LIB_EXTENSION) libamclient.$(LIB_EXTENSION) ../common-src/libamanda.$(LIB_EXTENSION)
-+LDADD = libamclient.$(LIB_EXTENSION) -lamanda
-
-
- SUFFIXES = .sh .pl
-@@ -228,62 +228,52 @@
-
- getfsent_OBJECTS = getfsent.test.$(OBJEXT)
- getfsent_LDADD = $(LDADD)
--getfsent_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \
--libamclient.$(LIB_EXTENSION) ../common-src/libamanda.$(LIB_EXTENSION)
-+getfsent_DEPENDENCIES = libamclient.$(LIB_EXTENSION)
- getfsent_LDFLAGS =
- amandad_SOURCES = amandad.c
- amandad_OBJECTS = amandad.$(OBJEXT)
- amandad_LDADD = $(LDADD)
--amandad_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \
--libamclient.$(LIB_EXTENSION) ../common-src/libamanda.$(LIB_EXTENSION)
-+amandad_DEPENDENCIES = libamclient.$(LIB_EXTENSION)
- amandad_LDFLAGS =
- calcsize_SOURCES = calcsize.c
- calcsize_OBJECTS = calcsize.$(OBJEXT)
- calcsize_LDADD = $(LDADD)
--calcsize_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \
--libamclient.$(LIB_EXTENSION) ../common-src/libamanda.$(LIB_EXTENSION)
-+calcsize_DEPENDENCIES = libamclient.$(LIB_EXTENSION)
- calcsize_LDFLAGS =
- killpgrp_SOURCES = killpgrp.c
- killpgrp_OBJECTS = killpgrp.$(OBJEXT)
- killpgrp_LDADD = $(LDADD)
--killpgrp_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \
--libamclient.$(LIB_EXTENSION) ../common-src/libamanda.$(LIB_EXTENSION)
-+killpgrp_DEPENDENCIES = libamclient.$(LIB_EXTENSION)
- killpgrp_LDFLAGS =
- rundump_SOURCES = rundump.c
- rundump_OBJECTS = rundump.$(OBJEXT)
- rundump_LDADD = $(LDADD)
--rundump_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \
--libamclient.$(LIB_EXTENSION) ../common-src/libamanda.$(LIB_EXTENSION)
-+rundump_DEPENDENCIES = libamclient.$(LIB_EXTENSION)
- rundump_LDFLAGS =
- runtar_SOURCES = runtar.c
- runtar_OBJECTS = runtar.$(OBJEXT)
- runtar_LDADD = $(LDADD)
--runtar_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \
--libamclient.$(LIB_EXTENSION) ../common-src/libamanda.$(LIB_EXTENSION)
-+runtar_DEPENDENCIES = libamclient.$(LIB_EXTENSION)
- runtar_LDFLAGS =
- selfcheck_SOURCES = selfcheck.c
- selfcheck_OBJECTS = selfcheck.$(OBJEXT)
- selfcheck_LDADD = $(LDADD)
--selfcheck_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \
--libamclient.$(LIB_EXTENSION) ../common-src/libamanda.$(LIB_EXTENSION)
-+selfcheck_DEPENDENCIES = libamclient.$(LIB_EXTENSION)
- selfcheck_LDFLAGS =
- sendbackup_OBJECTS = sendbackup.$(OBJEXT) sendbackup-dump.$(OBJEXT) \
- sendbackup-gnutar.$(OBJEXT)
- sendbackup_LDADD = $(LDADD)
--sendbackup_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \
--libamclient.$(LIB_EXTENSION) ../common-src/libamanda.$(LIB_EXTENSION)
-+sendbackup_DEPENDENCIES = libamclient.$(LIB_EXTENSION)
- sendbackup_LDFLAGS =
- sendsize_SOURCES = sendsize.c
- sendsize_OBJECTS = sendsize.$(OBJEXT)
- sendsize_LDADD = $(LDADD)
--sendsize_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \
--libamclient.$(LIB_EXTENSION) ../common-src/libamanda.$(LIB_EXTENSION)
-+sendsize_DEPENDENCIES = libamclient.$(LIB_EXTENSION)
- sendsize_LDFLAGS =
- versionsuffix_SOURCES = versionsuffix.c
- versionsuffix_OBJECTS = versionsuffix.$(OBJEXT)
- versionsuffix_LDADD = $(LDADD)
--versionsuffix_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \
--libamclient.$(LIB_EXTENSION) ../common-src/libamanda.$(LIB_EXTENSION)
-+versionsuffix_DEPENDENCIES = libamclient.$(LIB_EXTENSION)
- versionsuffix_LDFLAGS =
- SCRIPTS = $(libexec_SCRIPTS) $(sbin_SCRIPTS)
-
diff --git a/sysutils/amanda-client/patches/patch-ac b/sysutils/amanda-client/patches/patch-ac
deleted file mode 100644
index c5740498e6d..00000000000
--- a/sysutils/amanda-client/patches/patch-ac
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-ac,v 1.5 2001/06/26 03:14:11 christos Exp $
-
---- Makefile.in.orig Tue Apr 3 15:55:47 2001
-+++ Makefile.in Mon Jun 25 22:16:50 2001
-@@ -157,10 +157,10 @@
- @WANT_RECOVER_TRUE@RECOVER_SUBDIRS = recover-src
- @WANT_AMPLOT_TRUE@PLOT_SUBDIRS = amplot
- # order is significant, don't change it arbitrarily
--SUBDIRS = config common-src $(CLIENT_SUBDIRS) $(TAPE_SUBDIRS) $(SERVER_SUBDIRS) $(RESTORE_SUBDIRS) $(RECOVER_SUBDIRS) $(PLOT_SUBDIRS) man docs example
-+SUBDIRS = config $(CLIENT_SUBDIRS) $(TAPE_SUBDIRS) $(SERVER_SUBDIRS) $(RESTORE_SUBDIRS) $(RECOVER_SUBDIRS) man
-
-
--pkgdata_DATA = COPYRIGHT COPYRIGHT-APACHE COPYRIGHT-REGEX
-+pkgdata_DATA =
-
-
- EXTRA_DIST = $(SNAPSHOT_STAMP) $(pkgdata_DATA) contrib/README contrib/dbbackup.README contrib/dbbackup.ksh contrib/dbbackup.sql contrib/dbbackup.tcl contrib/set_prod_link.pl contrib/sst/Makefile contrib/sst/README contrib/sst/README.Amanda contrib/sst/sst.c contrib/sst/sst.conf contrib/sst/sst_def.h contrib/sst/sstest.c patches/regex-3.6alpha.patch patches/samba-largefs.patch patches/tar-1.12.patch regex-src/COPYRIGHT regex-src/Makefile regex-src/README regex-src/WHATSNEW regex-src/cclass.h regex-src/cname.h regex-src/debug.c regex-src/engine.c regex-src/main.c regex-src/mkh regex-src/regcomp.c regex-src/regerror.c regex-src/regex.3 regex-src/regex.7 regex-src/regex2.h regex-src/regexec.c regex-src/regfree.c regex-src/split.c regex-src/tests regex-src/utils.h regex-src/fake/limits.h regex-src/fake/memmove.c regex-src/fake/stdlib.h
diff --git a/sysutils/amanda-client/patches/patch-ad b/sysutils/amanda-client/patches/patch-ad
deleted file mode 100644
index 74d45935cef..00000000000
--- a/sysutils/amanda-client/patches/patch-ad
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ad,v 1.5 2001/06/26 03:14:11 christos Exp $
-
---- man/Makefile.in.orig Tue Apr 3 15:55:45 2001
-+++ man/Makefile.in Mon Jun 25 22:09:13 2001
-@@ -159,7 +159,7 @@
- # not autoconf-generated:
- EXTRA_DIST = amplot.8 amrestore.8 amtape.8
-
--man_MANS = $(AMPLOT_MAN_PAGES) $(COMMON_MAN_PAGES) $(SERVER_MAN_PAGES) $(RECOVER_MAN_PAGES) $(RESTORE_MAN_PAGES)
-+man_MANS = $(SERVER_MAN_PAGES) $(RECOVER_MAN_PAGES) $(RESTORE_MAN_PAGES)
-
- mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
- CONFIG_HEADER = ../config/config.h
diff --git a/sysutils/amanda-client/patches/patch-ae b/sysutils/amanda-client/patches/patch-ae
deleted file mode 100644
index 72660900711..00000000000
--- a/sysutils/amanda-client/patches/patch-ae
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-ae,v 1.6 2001/06/26 03:14:11 christos Exp $
-
---- recover-src/Makefile.in.orig Tue Apr 3 15:55:45 2001
-+++ recover-src/Makefile.in Mon Jun 25 22:23:26 2001
-@@ -159,7 +159,7 @@
- # routines, and second to pick up any references in the other libraries.
- ###
-
--LDADD = ../common-src/libamanda.$(LIB_EXTENSION) @LEXLIB@ ../client-src/libamclient.$(LIB_EXTENSION) ../common-src/libamanda.$(LIB_EXTENSION)
-+LDADD = @LEXLIB@ ../client-src/libamclient.$(LIB_EXTENSION) -lamanda
-
-
- amrecover_SOURCES = amrecover.c display_commands.c extract_list.c help.c set_commands.c uparse.y uscan.l
-@@ -183,9 +183,7 @@
- extract_list.$(OBJEXT) help.$(OBJEXT) set_commands.$(OBJEXT) \
- uparse.$(OBJEXT) uscan.$(OBJEXT)
- amrecover_LDADD = $(LDADD)
--amrecover_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \
--../client-src/libamclient.$(LIB_EXTENSION) \
--../common-src/libamanda.$(LIB_EXTENSION)
-+amrecover_DEPENDENCIES = ../client-src/libamclient.$(LIB_EXTENSION)
- amrecover_LDFLAGS =
- LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
- LEXLIB = @LEXLIB@
diff --git a/sysutils/amanda-common/DESCR b/sysutils/amanda-common/DESCR
deleted file mode 100644
index 97d0d402e6b..00000000000
--- a/sysutils/amanda-common/DESCR
+++ /dev/null
@@ -1,181 +0,0 @@
-Amanda, The Advanced Maryland Automatic Network Disk Archiver
-Copyright (c) 1991-1998 University of Maryland at College Park
-All Rights Reserved.
-
-See the files COPYRIGHT, COPYRIGHT-REGEX and COPYRIGHT-APACHE for
-distribution conditions and official warranty disclaimer.
-
-PLEASE NOTE: THIS SOFTWARE IS BEING MADE AVAILABLE ``AS-IS''. UMD is making
-this work available so that other people can use it. This software is in
-production use at our home site - the UMCP Department of Computer Science -
-but we make no warranties that it will work for you. Amanda development is
-unfunded - the development team maintains the code in their spare time. As a
-result, there is no support available other than users helping each other on
-the Amanda mailing lists. See below for information on the mailing lists.
-
-
-WHAT IS AMANDA?
----------------
-
-This is a release of Amanda, the Advanced Maryland Automatic
-Network Disk Archiver. Amanda is a backup system designed to archive many
-computers on a network to a single large-capacity tape drive.
-
-Here are some features of Amanda:
-
- * written in C, freely distributable.
- * built on top of standard backup software: Unix dump/restore, GNU Tar
- and others.
- * will back up multiple machines in parallel to a holding disk, blasting
- finished dumps one by one to tape as fast as we can write files to
- tape. For example, a ~2 Gb 8mm tape on a ~240K/s interface to a host
- with a large holding disk can be filled by Amanda in under 4 hours.
- * does simple tape management: will not overwrite the wrong tape.
- * supports tape changers via a generic interface. Easily customizable to
- any type of tape carousel, robot, or stacker that can be controlled via
- the unix command line.
- * supports Kerberos 4 security, including encrypted dumps. The Kerberos
- support is available as a separate add-on package, see the file
- KERBEROS.HOW-TO-GET on the ftp site, and the file docs/KERBEROS in this
- package, for more details.
- * for a restore, tells you what tapes you need, and finds the proper
- backup image on the tape for you.
- * recovers gracefully from errors, including down or hung machines.
- * reports results, including all errors in detail, in email.
- * will dynamically adjust backup schedule to keep within constraints: no
- more juggling by hand when adding disks and computers to network.
- * includes a pre-run checker program, that conducts sanity checks on both
- the tape server host and all the client hosts (in parallel), and will
- send an e-mail report of any problems that could cause the backups to
- fail.
- * can compress dumps before sending or after sending over the net, with
- either compress or gzip.
- * can optionally synchronize with external backups, for those large
- timesharing computers where you want to do full dumps when the system
- is down in single-user mode (since BSD dump is not reliable on active
- filesystems): Amanda will still do your daily dumps.
- * lots of other options; Amanda is very configurable.
-
-
-WHAT ARE THE SYSTEM REQUIREMENTS FOR AMANDA?
---------------------------------------------
-
-Amanda requires a host that is mostly idle during the time backups are
-done, with a large capacity tape drive (e.g. an EXABYTE, DAT or DLT tape).
-This becomes the "tape server host". All the computers you are going to dump
-are the "backup client hosts". The server host can also be a client host.
-
-Amanda works best with one or more large "holding disk" partitions on the
-server host available to it for buffering dumps before writing to tape.
-The holding disk allows Amanda to run backups in parallel to the disk, only
-writing them to tape when the backup is finished. Note that the holding
-disk is not required: without it Amanda will run backups sequentially to
-the tape drive. Running it this way kills the great performance, but still
-allows you to take advantage of Amanda's other features.
-
-As a rule of thumb, for best performance the holding disk should be larger
-than the dump output from your largest disk partitions. For example, if
-you are backing up some full gigabyte disks that compress down to 500 MB,
-then you'll want 500 MB on your holding disk. On the other hand, if those
-gigabyte drives are partitioned into 500 MB filesystems, they'll probably
-compress down to 250 MB and you'll only need that much on your holding
-disk. Amanda will perform better with larger holding disks.
-
-Actually, Amanda will still work if you have full dumps that are larger
-than the holding disk: Amanda will send those dumps directly to tape one at
-a time. If you have many such dumps you will be limited by the dump speed
-of those machines.
-
-Amanda does not yet support single backup images larger than a tape.
-
-
-WHAT SYSTEMS DOES AMANDA RUN ON?
---------------------------------
-
-Amanda should run on any modern Unix system that supports dump or GNU
-tar, has sockets and inetd, and either system V shared memory, or BSD
-mmap implemented.
-
-In particular, Amanda 2.4.1p1 has been compiled, and the client side tested
-on the following systems:
- AIX 3.2 and 4.1
- BSDI BSD/OS 2.1 and 3.1
- DEC OSF/1 3.2 and 4.0
- FreeBSD 2.2.5
- IRIX 5.2 and 6.3
- GNU/Linux on x86, alpha, sparc, arm and powerpc
- NetBSD 1.0
- Nextstep 3 (*)
- OpenBSD 2.5 x86, sparc, etc (ports available)
- SunOS 4.1.x (x >= 1) and 5.[567]
- Ultrix 4.2
- HP-UX 9.x and 10.x (x >= 01)
-
-The Amanda 2.4.1p1 server side is known to run on all of the other
-machines except on those marked with an asterisk.
-
-If you know of any system that is not listed here on which amanda
-builds successfully, either client&server or client-only, please
-report to amanda-hackers@amanda.org.
-
-
-WHERE DO I GET AMANDA?
-----------------------
-
-There are several versions of Amanda. The latest version at the time
-of this writing is available at:
-
- ftp://ftp.amanda.org/pub/amanda
-
-
-HOW DO I GET AMANDA UP AND RUNNING?
------------------------------------
-
-Read the file docs/INSTALL. There are a variety of steps, from compiling
-Amanda to installing it on the tape server host and the client machines.
- docs/INSTALL contains general installation instructions.
- docs/SYSTEM.NOTES contains system-specific information.
- docs/FAQ contains answers to frequently asked questions.
- docs/KERBEROS explains installation under Kerberos 4.
- docs/TAPE.CHANGERS explains how to customize the changer interface.
- docs/WHATS.NEW details new features.
-
-
-WHO DO I TALK TO IF I HAVE A PROBLEM?
--------------------------------------
-
-Amanda is completely unsupported and made available as-is. However,
-you may be able to get useful information in the Amanda mailing lists:
-
-==> To join a mailing list, DO NOT, EVER, send mail to that list. Send
- mail to <listname>-request@amanda.org, or amanda-lists@amanda.org,
- with the following line in the body of the message:
- subscribe <listname> <your-email-address>
-
-
- amanda-announce
- The amanda-announce mailing list is for important announcements
- related to the Amanda Network Backup Manager package, including new
- versions, contributions, and fixes. NOTE: the amanda-users list is
- itself on the amanda-announce distribution, so you only need to
- subscribe to one of the two lists, not both.
- To subscribe, send a message to amanda-announce-request@amanda.org.
-
- amanda-users
- The amanda-users mailing list is for questions and general discussion
- about the Amanda Network Backup Manager. This package and related
- files are available via anonymous FTP from ftp.amanda.org in the
- pub/amanda directory. NOTE: the amanda-users list is itself on the
- amanda-announce distribution, so you only need to subscribe to one of
- the two lists, not both.
- To subscribe, send a message to amanda-users-request@amanda.org.
-
- amanda-hackers
- The amanda-hackers mailing list is for discussion of the
- technical details of the Amanda package, including extensions,
- ports, bugs, fixes, and alpha testing of new versions.
- To subscribe, send a message to amanda-hackers-request@amanda.org.
-
-
-Share and Enjoy,
-The Amanda Development Team
diff --git a/sysutils/amanda-common/Makefile b/sysutils/amanda-common/Makefile
deleted file mode 100644
index b7a59d37c7b..00000000000
--- a/sysutils/amanda-common/Makefile
+++ /dev/null
@@ -1,43 +0,0 @@
-# $NetBSD: Makefile,v 1.26 2003/06/07 14:47:19 cjep Exp $
-# FreeBSD Id: Makefile,v 1.9 1997/03/08 05:00:11 gpalmer Exp
-#
-
-DISTNAME= amanda-2.4.2p2
-PKGNAME= amanda-common-2.4.2p2
-SVR4_PKGNAME= amaco
-CATEGORIES= sysutils
-MASTER_SITES= ftp://ftp.cs.umd.edu/pub/amanda/
-
-MAINTAINER= tech-pkg@netbsd.org
-HOMEPAGE= http://www.amanda.org/
-COMMENT= Common libraries and binaries for Amanda
-
-USE_BUILDLINK2= YES
-USE_PKGINSTALL= YES
-
-.include "../../mk/bsd.prefs.mk"
-.include "../../sysutils/amanda-common/Makefile.common"
-
-.if ${OPSYS} == "NetBSD"
-CPPFLAGS= # empty
-.elif ${OPSYS} == "SunOS"
-CPPFLAGS+= -D_LARGEFILE64_SOURCE
-.endif
-
-CONFIGURE_ARGS+= --without-server --without-restore --without-client
-
-# Prevent configure script from finding unnecessary libraries.
-#
-CONFIGURE_ENV+= ac_cv_lib_intl_main=no
-CONFIGURE_ENV+= ac_cv_lib_termcap_tgetent=no
-CONFIGURE_ENV+= ac_cv_lib_curses_tgetent=no
-CONFIGURE_ENV+= ac_cv_lib_ncurses_tgetent=no
-CONFIGURE_ENV+= ac_cv_lib_readline_readline=no
-
-PKG_GROUPS= ${AMANDA_GROUP}
-PKG_USERS= ${AMANDA_USER}:${AMANDA_GROUP}::Amanda\\ user::${SH}
-
-OWN_DIRS_PERMS= ${AMANDA_VAR} ${AMANDA_USER} ${AMANDA_GROUP} 0700
-OWN_DIRS_PERMS+= ${AMANDA_VAR}/gnutar-lists ${AMANDA_USER} ${AMANDA_GROUP} 0700
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/amanda-common/Makefile.common b/sysutils/amanda-common/Makefile.common
deleted file mode 100644
index b450e6d6200..00000000000
--- a/sysutils/amanda-common/Makefile.common
+++ /dev/null
@@ -1,32 +0,0 @@
-# $NetBSD: Makefile.common,v 1.10 2002/10/20 03:20:34 grant Exp $
-#
-# common make file fragment shared by all amanda-* pkgs.
-#
-
-.if ${OPSYS} == "SunOS"
-AMANDA_GROUP?= sysadmin
-.else
-# NetBSD, Linux and Darwin
-AMANDA_GROUP?= operator
-.endif
-
-AMANDA_USER?= backup
-AMANDA_VAR?= /var/amanda
-
-BUILD_DEFS+= AMANDA_USER AMANDA_GROUP AMANDA_SMB AMANDA_VAR
-
-USE_LIBTOOL= yes
-LTCONFIG_OVERRIDE= ${WRKSRC}/config/ltconfig
-CONFIG_GUESS_OVERRIDE= ${WRKSRC}/config/config.guess
-CONFIG_SUB_OVERRIDE= ${WRKSRC}/config/config.sub
-
-GNU_CONFIGURE= yes
-CONFIGURE_ARGS+= --with-user=${AMANDA_USER}
-CONFIGURE_ARGS+= --with-group=${AMANDA_GROUP}
-CONFIGURE_ARGS+= --with-owner=root
-CONFIGURE_ARGS+= --with-mmap
-CONFIGURE_ARGS+= --with-amandahosts
-CONFIGURE_ARGS+= --localstatedir=${AMANDA_VAR}
-CONFIGURE_ARGS+= --with-gnutar-listdir=${AMANDA_VAR}/gnutar-lists
-CONFIGURE_ARGS+= --with-dump-honor-nodump
-CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
diff --git a/sysutils/amanda-common/PLIST b/sysutils/amanda-common/PLIST
deleted file mode 100644
index 63ea81f6ffa..00000000000
--- a/sysutils/amanda-common/PLIST
+++ /dev/null
@@ -1,10 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 22:52:48 zuntum Exp $
-lib/libamanda-2.4.2p2.so
-lib/libamanda.a
-lib/libamanda.la
-lib/libamanda.so
-lib/libamtape-2.4.2p2.so
-lib/libamtape.a
-lib/libamtape.la
-lib/libamtape.so
-man/man8/amanda.8
diff --git a/sysutils/amanda-common/buildlink2.mk b/sysutils/amanda-common/buildlink2.mk
deleted file mode 100644
index 638795e81da..00000000000
--- a/sysutils/amanda-common/buildlink2.mk
+++ /dev/null
@@ -1,22 +0,0 @@
-# $NetBSD: buildlink2.mk,v 1.2 2002/10/25 18:59:42 wiz Exp $
-#
-
-.if !defined(AMANDA_COMMON_BUILDLINK2_MK)
-AMANDA_COMMON_BUILDLINK2_MK= # defined
-
-BUILDLINK_PACKAGES+= amanda-common
-BUILDLINK_DEPENDS.amanda-common?= amanda-common>=2.4.2p2
-BUILDLINK_PKGSRCDIR.amanda-common?= ../../sysutils/amanda-common
-
-EVAL_PREFIX+= BUILDLINK_PREFIX.amanda-common=amanda-common
-BUILDLINK_PREFIX.amanda-common_DEFAULT= ${LOCALBASE}
-BUILDLINK_FILES.amanda-common+= lib/libamanda-2.4.2p2.*
-BUILDLINK_FILES.amanda-common+= lib/libamanda.*
-BUILDLINK_FILES.amanda-common+= lib/libamtape-2.4.2p2.*
-BUILDLINK_FILES.amanda-common+= lib/libamtape.*
-
-BUILDLINK_TARGETS+= amanda-common-buildlink
-
-amanda-common-buildlink: _BUILDLINK_USE
-
-.endif # AMANDA_COMMON_BUILDLINK2_MK
diff --git a/sysutils/amanda-common/distinfo b/sysutils/amanda-common/distinfo
deleted file mode 100644
index 795c3682798..00000000000
--- a/sysutils/amanda-common/distinfo
+++ /dev/null
@@ -1,10 +0,0 @@
-$NetBSD: distinfo,v 1.3 2001/06/26 03:15:16 christos Exp $
-
-SHA1 (amanda-2.4.2p2.tar.gz) = 721060b1357e9b939d06773f91a20de1d507521b
-Size (amanda-2.4.2p2.tar.gz) = 922404 bytes
-SHA1 (patch-aa) = 2e208f279d4818bd7c4781f9d497a230a45594c7
-SHA1 (patch-ab) = 2049fa69571358e91598bfe257a1a6cff1a493d7
-SHA1 (patch-ac) = 1568881a280e08e4e0bd708234f6bbef04f7f1ed
-SHA1 (patch-ad) = 510e650c9e9976323b1d27a7895cee6281b89dcd
-SHA1 (patch-ba) = 7c2b47e1239bc2d0e31f8336a85ea058d8fb07b4
-SHA1 (patch-bb) = c8c91b848e669f2ccd3a753cfa7aba64e47d2166
diff --git a/sysutils/amanda-common/patches/patch-aa b/sysutils/amanda-common/patches/patch-aa
deleted file mode 100644
index f4f596fe002..00000000000
--- a/sysutils/amanda-common/patches/patch-aa
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-aa,v 1.6 2001/06/26 03:14:12 christos Exp $
-
---- client-src/Makefile.in.orig Mon Jun 25 21:44:46 2001
-+++ client-src/Makefile.in Mon Jun 25 22:29:03 2001
-@@ -281,11 +281,10 @@
- sendsize_LDFLAGS =
- versionsuffix_SOURCES = versionsuffix.c
- versionsuffix_OBJECTS = versionsuffix.$(OBJEXT)
--versionsuffix_LDADD = $(LDADD)
--versionsuffix_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \
--libamclient.$(LIB_EXTENSION) ../common-src/libamanda.$(LIB_EXTENSION)
-+versionsuffix_LDADD = ../common-src/libamanda.$(LIB_EXTENSION)
-+versionsuffix_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION)
- versionsuffix_LDFLAGS =
--SCRIPTS = $(libexec_SCRIPTS) $(sbin_SCRIPTS)
-+SCRIPTS = $(libexec_S:RIPTS) $(sbin_SCRIPTS)
-
- CFLAGS = @CFLAGS@
- COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
diff --git a/sysutils/amanda-common/patches/patch-ab b/sysutils/amanda-common/patches/patch-ab
deleted file mode 100644
index 922dee6dd84..00000000000
--- a/sysutils/amanda-common/patches/patch-ab
+++ /dev/null
@@ -1,32 +0,0 @@
-$NetBSD: patch-ab,v 1.5 2001/06/26 03:14:12 christos Exp $
-
---- Makefile.in.orig Tue Apr 3 15:55:47 2001
-+++ Makefile.in Mon Jun 25 21:50:51 2001
-@@ -151,11 +151,11 @@
- ACINCLUDE_M4_DEPS = $(ACINCLUDE_M4I) $(LIBTOOL_M4I)
-
- @WANT_CLIENT_TRUE@CLIENT_SUBDIRS = client-src
--@WANT_TAPE_TRUE@TAPE_SUBDIRS = tape-src
-+TAPE_SUBDIRS = tape-src
- @WANT_SERVER_TRUE@SERVER_SUBDIRS = server-src changer-src
- @WANT_RESTORE_TRUE@RESTORE_SUBDIRS = restore-src
- @WANT_RECOVER_TRUE@RECOVER_SUBDIRS = recover-src
--@WANT_AMPLOT_TRUE@PLOT_SUBDIRS = amplot
-+# PLOT_SUBDIRS = amplot
- # order is significant, don't change it arbitrarily
- SUBDIRS = config common-src $(CLIENT_SUBDIRS) $(TAPE_SUBDIRS) $(SERVER_SUBDIRS) $(RESTORE_SUBDIRS) $(RECOVER_SUBDIRS) $(PLOT_SUBDIRS) man docs example
-
-@@ -381,11 +381,11 @@
- install-exec-am:
- install-exec: install-exec-recursive
-
--install-data-am: install-pkgdataDATA
-+#install-data-am: install-pkgdataDATA
- install-data: install-data-recursive
-
- install-am: all-am
-- @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-+ @$(MAKE) $(AM_MAKEFLAGS) install-exec-am
- install: install-recursive
- uninstall-am: uninstall-pkgdataDATA
- uninstall: uninstall-recursive
diff --git a/sysutils/amanda-common/patches/patch-ac b/sysutils/amanda-common/patches/patch-ac
deleted file mode 100644
index 5d3a9d89c08..00000000000
--- a/sysutils/amanda-common/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.5 2001/06/26 03:14:12 christos Exp $
-
---- man/Makefile.in.orig Tue Apr 3 15:55:45 2001
-+++ man/Makefile.in Mon Jun 25 21:52:30 2001
-@@ -146,7 +146,7 @@
-
- transform = s,x,x,;
-
--@WANT_AMPLOT_TRUE@AMPLOT_MAN_PAGES = amplot.8
-+#AMPLOT_MAN_PAGES = amplot.8
-
- COMMON_MAN_PAGES = amanda.8
-
diff --git a/sysutils/amanda-common/patches/patch-ad b/sysutils/amanda-common/patches/patch-ad
deleted file mode 100644
index b93e48eb5ac..00000000000
--- a/sysutils/amanda-common/patches/patch-ad
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ad,v 1.2 2001/01/16 21:59:32 cjones Exp $
-
-Use the correct name for the statvfs struct.
-
---- common-src/statfs.c.orig Sun May 23 11:11:18 1999
-+++ common-src/statfs.c Thu Jan 11 12:53:12 2001
-@@ -55,7 +55,15 @@
- */
- # include <sys/statvfs.h>
- # define STATFS_TYP "SVR4 (Irix-5+, Solaris-2, Linux glibc 2.1)"
-+#if defined(__sun__) && defined(__svr4__)
-+#if defined(_LARGEFILE64_SOURCE)
-+# define STATFS_STRUCT statvfs64_t
-+#else
-+# define STATFS_STRUCT statvfs_t
-+#endif /* largefile source */
-+#else
- # define STATFS_STRUCT struct statvfs
-+#endif /* !Solaris */
- # define STATFS_TOTAL(buf) (buf).f_blocks
- # define STATFS_AVAIL(buf) (buf).f_bavail
- # define STATFS_FREE(buf) (buf).f_bfree
diff --git a/sysutils/amanda-common/patches/patch-ba b/sysutils/amanda-common/patches/patch-ba
deleted file mode 100644
index 9cd5764a8de..00000000000
--- a/sysutils/amanda-common/patches/patch-ba
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ba,v 1.1 2001/03/15 20:08:46 mjl Exp $
-
---- common-src/token.h.orig Thu Mar 15 20:30:31 2001
-+++ common-src/token.h Thu Mar 15 20:30:43 2001
-@@ -42,7 +42,7 @@
- extern char *quotef P((char *sep, char *format, ...));
- extern char *quote P((char *sep, char *str));
- extern char *rxquote P((char *str));
--extern char *shquote P((char *str));
-+extern char *am_shquote P((char *str));
- extern int table_lookup P((table_t *table, char *str));
- extern char *table_lookup_r P((table_t *table, int val));
-
diff --git a/sysutils/amanda-common/patches/patch-bb b/sysutils/amanda-common/patches/patch-bb
deleted file mode 100644
index 51635532dd7..00000000000
--- a/sysutils/amanda-common/patches/patch-bb
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-bb,v 1.1 2001/03/15 20:08:46 mjl Exp $
-
---- common-src/token.c.orig Thu Mar 15 20:30:23 2001
-+++ common-src/token.c Thu Mar 15 20:30:56 2001
-@@ -295,7 +295,7 @@
- }
-
- /* Quote a string so that it can be safely passed to a shell */
--char *shquote(str)
-+char *am_shquote(str)
- char *str; /* the string to quote */
- {
- char *pi, *po;
diff --git a/sysutils/amanda-dev-client/DESCR b/sysutils/amanda-dev-client/DESCR
deleted file mode 100644
index 600de939f2c..00000000000
--- a/sysutils/amanda-dev-client/DESCR
+++ /dev/null
@@ -1,183 +0,0 @@
-Please note that this is a package of a developement snapshot of the 2.4.3
-branch.
-
-Amanda, The Advanced Maryland Automatic Network Disk Archiver
-Copyright (c) 1991-1998 University of Maryland at College Park
-All Rights Reserved.
-
-See the files COPYRIGHT, COPYRIGHT-REGEX and COPYRIGHT-APACHE for
-distribution conditions and official warranty disclaimer.
-
-PLEASE NOTE: THIS SOFTWARE IS BEING MADE AVAILABLE ``AS-IS''. UMD is making
-this work available so that other people can use it. This software is in
-production use at our home site - the UMCP Department of Computer Science -
-but we make no warranties that it will work for you. Amanda development is
-unfunded - the development team maintains the code in their spare time. As a
-result, there is no support available other than users helping each other on
-the Amanda mailing lists. See below for information on the mailing lists.
-
-
-WHAT IS AMANDA?
----------------
-
-This is a release of Amanda, the Advanced Maryland Automatic
-Network Disk Archiver. Amanda is a backup system designed to archive many
-computers on a network to a single large-capacity tape drive.
-
-Here are some features of Amanda:
-
- * written in C, freely distributable.
- * built on top of standard backup software: Unix dump/restore, GNU Tar
- and others.
- * will back up multiple machines in parallel to a holding disk, blasting
- finished dumps one by one to tape as fast as we can write files to
- tape. For example, a ~2 Gb 8mm tape on a ~240K/s interface to a host
- with a large holding disk can be filled by Amanda in under 4 hours.
- * does simple tape management: will not overwrite the wrong tape.
- * supports tape changers via a generic interface. Easily customizable to
- any type of tape carousel, robot, or stacker that can be controlled via
- the unix command line.
- * supports Kerberos 4 security, including encrypted dumps. The Kerberos
- support is available as a separate add-on package, see the file
- KERBEROS.HOW-TO-GET on the ftp site, and the file docs/KERBEROS in this
- package, for more details.
- * for a restore, tells you what tapes you need, and finds the proper
- backup image on the tape for you.
- * recovers gracefully from errors, including down or hung machines.
- * reports results, including all errors in detail, in email.
- * will dynamically adjust backup schedule to keep within constraints: no
- more juggling by hand when adding disks and computers to network.
- * includes a pre-run checker program, that conducts sanity checks on both
- the tape server host and all the client hosts (in parallel), and will
- send an e-mail report of any problems that could cause the backups to
- fail.
- * can compress dumps before sending or after sending over the net, with
- either compress or gzip.
- * can optionally synchronize with external backups, for those large
- timesharing computers where you want to do full dumps when the system
- is down in single-user mode (since BSD dump is not reliable on active
- filesystems): Amanda will still do your daily dumps.
- * lots of other options; Amanda is very configurable.
-
-
-WHAT ARE THE SYSTEM REQUIREMENTS FOR AMANDA?
---------------------------------------------
-
-Amanda requires a host that is mostly idle during the time backups are
-done, with a large capacity tape drive (e.g. an EXABYTE, DAT or DLT tape).
-This becomes the "tape server host". All the computers you are going to dump
-are the "backup client hosts". The server host can also be a client host.
-
-Amanda works best with one or more large "holding disk" partitions on the
-server host available to it for buffering dumps before writing to tape.
-The holding disk allows Amanda to run backups in parallel to the disk, only
-writing them to tape when the backup is finished. Note that the holding
-disk is not required: without it Amanda will run backups sequentially to
-the tape drive. Running it this way kills the great performance, but still
-allows you to take advantage of Amanda's other features.
-
-As a rule of thumb, for best performance the holding disk should be larger
-than the dump output from your largest disk partitions. For example, if
-you are backing up some full gigabyte disks that compress down to 500 MB,
-then you'll want 500 MB on your holding disk. On the other hand, if those
-gigabyte drives are partitioned into 500 MB filesystems, they'll probably
-compress down to 250 MB and you'll only need that much on your holding
-disk. Amanda will perform better with larger holding disks.
-
-Actually, Amanda will still work if you have full dumps that are larger
-than the holding disk: Amanda will send those dumps directly to tape one at
-a time. If you have many such dumps you will be limited by the dump speed
-of those machines.
-
-Amanda does not yet support single backup images larger than a tape.
-
-
-WHAT SYSTEMS DOES AMANDA RUN ON?
---------------------------------
-
-Amanda should run on any modern Unix system that supports dump or GNU
-tar, has sockets and inetd, and either system V shared memory, or BSD
-mmap implemented.
-
-In particular, Amanda 2.4.0 has been compiled, and the client side tested
-on the following systems:
- AIX 3.2 and 4.1
- BSDI BSD/OS 2.1 and 3.1
- DEC OSF/1 3.2 and 4.0
- FreeBSD 2.2.5
- IRIX 5.2 and 6.3
- Linux/GNU on x86, alpha and sparc
- NetBSD 1.0
- Nextstep 3 (*)
- SunOS 4.1.x (x >= 1) and 5.[56]
- Ultrix 4.2
- HP-UX 9.x and 10.x (x >= 01)
-
-The Amanda 2.4.0 server side is known to run on all of the other
-machines except on those marked with an asterisk.
-
-If you know of any system that is not listed here on which amanda
-builds successfully, either client&server or client-only, please
-report to amanda-hackers@amanda.org.
-
-
-WHERE DO I GET AMANDA?
-----------------------
-
-There are several versions of Amanda. The latest version at the time
-of this writing is available at:
-
- ftp://ftp.amanda.org/pub/amanda
-
-
-HOW DO I GET AMANDA UP AND RUNNING?
------------------------------------
-
-Read the file docs/INSTALL. There are a variety of steps, from compiling
-Amanda to installing it on the tape server host and the client machines.
- docs/INSTALL contains general installation instructions.
- docs/SYSTEM.NOTES contains system-specific information.
- docs/FAQ contains answers to frequently asked questions.
- docs/KERBEROS explains installation under Kerberos 4.
- docs/TAPE.CHANGERS explains how to customize the changer interface.
- docs/WHATS.NEW details new features.
-
-
-WHO DO I TALK TO IF I HAVE A PROBLEM?
--------------------------------------
-
-Amanda is completely unsupported and made available as-is. However,
-you may be able to get useful information in the Amanda mailing lists:
-
-==> To join a mailing list, DO NOT, EVER, send mail to that list. Send
- mail to <listname>-request@amanda.org, or amanda-lists@amanda.org,
- with the following line in the body of the message:
- subscribe <listname> <your-email-address>
-
-
- amanda-announce
- The amanda-announce mailing list is for important announcements
- related to the Amanda Network Backup Manager package, including new
- versions, contributions, and fixes. NOTE: the amanda-users list is
- itself on the amanda-announce distribution, so you only need to
- subscribe to one of the two lists, not both.
- To subscribe, send a message to amanda-announce-request@amanda.org.
-
- amanda-users
- The amanda-users mailing list is for questions and general discussion
- about the Amanda Network Backup Manager. This package and related
- files are available via anonymous FTP from ftp.amanda.org in the
- pub/amanda directory. NOTE: the amanda-users list is itself on the
- amanda-announce distribution, so you only need to subscribe to one of
- the two lists, not both.
- To subscribe, send a message to amanda-users-request@amanda.org.
-
- amanda-hackers
- The amanda-hackers mailing list is for discussion of the
- technical details of the Amanda package, including extensions,
- ports, bugs, fixes, and alpha testing of new versions.
- To subscribe, send a message to amanda-hackers-request@amanda.org.
-
-
-Share and Enjoy,
-The Amanda Development Team
diff --git a/sysutils/amanda-dev-client/Makefile b/sysutils/amanda-dev-client/Makefile
deleted file mode 100644
index eb021a04f23..00000000000
--- a/sysutils/amanda-dev-client/Makefile
+++ /dev/null
@@ -1,40 +0,0 @@
-# $NetBSD: Makefile,v 1.4 2002/10/25 18:59:46 wiz Exp $
-#
-
-PKGNAME= amanda-client-${VERS}
-SVR4_PKGNAME= amacl
-
-COMMENT= Client part of Amanda, a network backup system
-
-DEPENDS+= amanda-common-${VERS}:../../sysutils/amanda-dev-common
-
-USE_BUILDLINK2= yes
-GNU_CONFIGURE= yes
-
-.include "../../mk/bsd.prefs.mk"
-.include "../../sysutils/amanda-dev-common/Makefile.common"
-.include "../../sysutils/amanda-dev-common/buildlink2.mk"
-#.include "../../devel/readline/buildlink2.mk"
-
-.if ${OPSYS} != "Linux"
-DEPENDS+= {gtar,gtar-base}>=1.12:../../archivers/gtar
-.endif
-
-CONFIGURE_ARGS+= --without-server --without-restore
-
-# Prevent configure script from finding unnecessary libraries. We'll patch
-# the amrecover Makefile to add the readline libraries as it's the only
-# program that uses readline. (XXX: incorrect, does not happen)
-#
-CONFIGURE_ENV+= ac_cv_lib_intl_main=no
-CONFIGURE_ENV+= ac_cv_lib_termcap_tgetent=no
-CONFIGURE_ENV+= ac_cv_lib_curses_tgetent=no
-CONFIGURE_ENV+= ac_cv_lib_ncurses_tgetent=no
-CONFIGURE_ENV+= ac_cv_lib_readline_readline=no
-
-.if defined(AMANDA_SMB)
-CONFIGURE_ARGS+= --with-smbclient
-DEPENDS+= {samba>=2.0,ja-samba>=2.0}:../../net/samba
-.endif
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/amanda-dev-client/PLIST b/sysutils/amanda-dev-client/PLIST
deleted file mode 100644
index 300d7dba0a0..00000000000
--- a/sysutils/amanda-dev-client/PLIST
+++ /dev/null
@@ -1,16 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2002/08/19 01:16:17 kei Exp $
-lib/libamclient.a
-lib/libamclient.la
-lib/libamclient-2.4.3b3.so
-libexec/amandad
-libexec/calcsize
-libexec/killpgrp
-libexec/patch-system
-libexec/rundump
-libexec/runtar
-libexec/selfcheck
-libexec/sendbackup
-libexec/sendsize
-libexec/versionsuffix
-man/man8/amrecover.8
-sbin/amrecover
diff --git a/sysutils/amanda-dev-client/distinfo b/sysutils/amanda-dev-client/distinfo
deleted file mode 100644
index 0e98e8404e8..00000000000
--- a/sysutils/amanda-dev-client/distinfo
+++ /dev/null
@@ -1,9 +0,0 @@
-$NetBSD: distinfo,v 1.1.1.1 2002/05/02 13:28:15 bouyer Exp $
-
-SHA1 (amanda-2.4.3b3.tar.gz) = 7028e5f060ee159d05c35635e79c5fd4701f08ee
-Size (amanda-2.4.3b3.tar.gz) = 1167303 bytes
-SHA1 (patch-aa) = 46fca5506e3f7f38f1f8c33db30cf53a5d1fcbb0
-SHA1 (patch-ab) = 9140b0c980927a1e4f8cc23985391ed3c6c76785
-SHA1 (patch-ac) = 7c94b9c5adbdf7266b76e2599e297dbb4be271aa
-SHA1 (patch-ad) = 75d2adc88cb2af6477762673baf0f62048dda4c8
-SHA1 (patch-ae) = d50d43cc2b557af326a29ed9ba918c10458b3545
diff --git a/sysutils/amanda-dev-client/patches/patch-aa b/sysutils/amanda-dev-client/patches/patch-aa
deleted file mode 100644
index 8871e3a8788..00000000000
--- a/sysutils/amanda-dev-client/patches/patch-aa
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2002/05/02 13:28:15 bouyer Exp $
-
---- configure.orig Fri Mar 8 20:28:05 2002
-+++ configure Tue Apr 30 11:39:11 2002
-@@ -9893,8 +9893,10 @@
- # This can be used to rebuild libtool when needed
- LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
-
-+if false ; then
- # Always use our own libtool.
- LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-+fi
-
- # Prevent multiple expansion
-
diff --git a/sysutils/amanda-dev-client/patches/patch-ab b/sysutils/amanda-dev-client/patches/patch-ab
deleted file mode 100644
index a74572c5410..00000000000
--- a/sysutils/amanda-dev-client/patches/patch-ab
+++ /dev/null
@@ -1,99 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 2002/05/02 13:28:15 bouyer Exp $
-
---- client-src/Makefile.in.orig Fri Mar 8 20:29:40 2002
-+++ client-src/Makefile.in Tue Apr 30 11:44:22 2002
-@@ -180,9 +180,7 @@
- # need to list libamanda twice here, first to override the system library
- # routines, and second to pick up any references in the other libraries.
- ###
--LDADD = ../common-src/libamanda.$(LIB_EXTENSION) \
-- libamclient.$(LIB_EXTENSION) \
-- ../common-src/libamanda.$(LIB_EXTENSION)
-+LDADD = libamclient.$(LIB_EXTENSION) -lamanda
-
-
- SUFFIXES = .sh .pl
-@@ -241,73 +239,53 @@
- amandad_SOURCES = amandad.c
- amandad_OBJECTS = amandad.$(OBJEXT)
- amandad_LDADD = $(LDADD)
--amandad_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \
-- libamclient.$(LIB_EXTENSION) \
-- ../common-src/libamanda.$(LIB_EXTENSION)
-+amandad_DEPENDENCIES = libamclient.$(LIB_EXTENSION)
- amandad_LDFLAGS =
- calcsize_SOURCES = calcsize.c
- calcsize_OBJECTS = calcsize.$(OBJEXT)
- calcsize_LDADD = $(LDADD)
--calcsize_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \
-- libamclient.$(LIB_EXTENSION) \
-- ../common-src/libamanda.$(LIB_EXTENSION)
-+calcsize_DEPENDENCIES = libamclient.$(LIB_EXTENSION)
- calcsize_LDFLAGS =
- am_getfsent_OBJECTS = getfsent.test.$(OBJEXT)
- getfsent_OBJECTS = $(am_getfsent_OBJECTS)
- getfsent_LDADD = $(LDADD)
--getfsent_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \
-- libamclient.$(LIB_EXTENSION) \
-- ../common-src/libamanda.$(LIB_EXTENSION)
-+getfsent_DEPENDENCIES = libamclient.$(LIB_EXTENSION)
- getfsent_LDFLAGS =
- killpgrp_SOURCES = killpgrp.c
- killpgrp_OBJECTS = killpgrp.$(OBJEXT)
- killpgrp_LDADD = $(LDADD)
--killpgrp_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \
-- libamclient.$(LIB_EXTENSION) \
-- ../common-src/libamanda.$(LIB_EXTENSION)
-+killpgrp_DEPENDENCIES = libamclient.$(LIB_EXTENSION)
- killpgrp_LDFLAGS =
- rundump_SOURCES = rundump.c
- rundump_OBJECTS = rundump.$(OBJEXT)
- rundump_LDADD = $(LDADD)
--rundump_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \
-- libamclient.$(LIB_EXTENSION) \
-- ../common-src/libamanda.$(LIB_EXTENSION)
-+rundump_DEPENDENCIES = libamclient.$(LIB_EXTENSION)
- rundump_LDFLAGS =
- runtar_SOURCES = runtar.c
- runtar_OBJECTS = runtar.$(OBJEXT)
- runtar_LDADD = $(LDADD)
--runtar_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \
-- libamclient.$(LIB_EXTENSION) \
-- ../common-src/libamanda.$(LIB_EXTENSION)
-+runtar_DEPENDENCIES = libamclient.$(LIB_EXTENSION)
- runtar_LDFLAGS =
- selfcheck_SOURCES = selfcheck.c
- selfcheck_OBJECTS = selfcheck.$(OBJEXT)
- selfcheck_LDADD = $(LDADD)
--selfcheck_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \
-- libamclient.$(LIB_EXTENSION) \
-- ../common-src/libamanda.$(LIB_EXTENSION)
-+selfcheck_DEPENDENCIES = libamclient.$(LIB_EXTENSION)
- selfcheck_LDFLAGS =
- am_sendbackup_OBJECTS = sendbackup.$(OBJEXT) sendbackup-dump.$(OBJEXT) \
- sendbackup-gnutar.$(OBJEXT)
- sendbackup_OBJECTS = $(am_sendbackup_OBJECTS)
- sendbackup_LDADD = $(LDADD)
--sendbackup_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \
-- libamclient.$(LIB_EXTENSION) \
-- ../common-src/libamanda.$(LIB_EXTENSION)
-+sendbackup_DEPENDENCIES = libamclient.$(LIB_EXTENSION)
- sendbackup_LDFLAGS =
- sendsize_SOURCES = sendsize.c
- sendsize_OBJECTS = sendsize.$(OBJEXT)
- sendsize_LDADD = $(LDADD)
--sendsize_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \
-- libamclient.$(LIB_EXTENSION) \
-- ../common-src/libamanda.$(LIB_EXTENSION)
-+sendsize_DEPENDENCIES = libamclient.$(LIB_EXTENSION)
- sendsize_LDFLAGS =
- versionsuffix_SOURCES = versionsuffix.c
- versionsuffix_OBJECTS = versionsuffix.$(OBJEXT)
- versionsuffix_LDADD = $(LDADD)
--versionsuffix_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \
-- libamclient.$(LIB_EXTENSION) \
-- ../common-src/libamanda.$(LIB_EXTENSION)
-+versionsuffix_DEPENDENCIES = libamclient.$(LIB_EXTENSION)
- versionsuffix_LDFLAGS =
- SCRIPTS = $(libexec_SCRIPTS) $(sbin_SCRIPTS)
-
diff --git a/sysutils/amanda-dev-client/patches/patch-ac b/sysutils/amanda-dev-client/patches/patch-ac
deleted file mode 100644
index ca20fb0e796..00000000000
--- a/sysutils/amanda-dev-client/patches/patch-ac
+++ /dev/null
@@ -1,28 +0,0 @@
-$NetBSD: patch-ac,v 1.1.1.1 2002/05/02 13:28:15 bouyer Exp $
-
---- Makefile.in.orig Fri Mar 8 20:29:29 2002
-+++ Makefile.in Tue Apr 30 11:46:35 2002
-@@ -163,21 +163,15 @@
- # order is significant, don't change it arbitrarily
- SUBDIRS = \
- config \
-- common-src \
- $(CLIENT_SUBDIRS) \
- $(TAPE_SUBDIRS) \
- $(SERVER_SUBDIRS) \
- $(RESTORE_SUBDIRS) \
- $(RECOVER_SUBDIRS) \
-- $(PLOT_SUBDIRS) \
-- man docs example
-+ man
-
-
--pkgdata_DATA = \
-- COPYRIGHT \
-- COPYRIGHT-APACHE \
-- COPYRIGHT-REGEX
--
-+pkgdata_DATA =
-
- EXTRA_DIST = $(SNAPSHOT_STAMP) \
- $(pkgdata_DATA) \
diff --git a/sysutils/amanda-dev-client/patches/patch-ad b/sysutils/amanda-dev-client/patches/patch-ad
deleted file mode 100644
index 82d621d6b7b..00000000000
--- a/sysutils/amanda-dev-client/patches/patch-ad
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ad,v 1.1.1.1 2002/05/02 13:28:15 bouyer Exp $
-
---- man/Makefile.in.orig Fri Mar 8 20:29:52 2002
-+++ man/Makefile.in Tue Apr 30 11:48:42 2002
-@@ -180,9 +180,7 @@
- # not autoconf-generated:
- EXTRA_DIST = amplot.8 amrestore.8 amtape.8 amdd.8 ammt.8
-
--man_MANS = $(AMPLOT_MAN_PAGES) \
-- $(COMMON_MAN_PAGES) \
-- $(SERVER_MAN_PAGES) \
-+man_MANS = $(SERVER_MAN_PAGES) \
- $(RECOVER_MAN_PAGES) \
- $(RESTORE_MAN_PAGES)
-
diff --git a/sysutils/amanda-dev-client/patches/patch-ae b/sysutils/amanda-dev-client/patches/patch-ae
deleted file mode 100644
index 8e4ebba83f4..00000000000
--- a/sysutils/amanda-dev-client/patches/patch-ae
+++ /dev/null
@@ -1,28 +0,0 @@
-$NetBSD: patch-ae,v 1.1.1.1 2002/05/02 13:28:15 bouyer Exp $
-
---- recover-src/Makefile.in.orig Fri Mar 8 20:29:49 2002
-+++ recover-src/Makefile.in Tue Apr 30 11:51:14 2002
-@@ -165,10 +165,9 @@
- # need to list libamanda twice here, first to override the system library
- # routines, and second to pick up any references in the other libraries.
- ###
--LDADD = ../common-src/libamanda.$(LIB_EXTENSION) \
-- @LEXLIB@ \
-+LDADD = @LEXLIB@ \
- ../client-src/libamclient.$(LIB_EXTENSION) \
-- ../common-src/libamanda.$(LIB_EXTENSION)
-+ -lamanda
-
-
- amrecover_SOURCES = amrecover.c \
-@@ -192,9 +191,7 @@
- uparse.$(OBJEXT) uscan.$(OBJEXT)
- amrecover_OBJECTS = $(am_amrecover_OBJECTS)
- amrecover_LDADD = $(LDADD)
--amrecover_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \
-- ../client-src/libamclient.$(LIB_EXTENSION) \
-- ../common-src/libamanda.$(LIB_EXTENSION)
-+amrecover_DEPENDENCIES = ../client-src/libamclient.$(LIB_EXTENSION)
- amrecover_LDFLAGS =
-
- DEFS = @DEFS@
diff --git a/sysutils/amanda-dev-common/DESCR b/sysutils/amanda-dev-common/DESCR
deleted file mode 100644
index 0ad4a7e8295..00000000000
--- a/sysutils/amanda-dev-common/DESCR
+++ /dev/null
@@ -1,184 +0,0 @@
-Please note that this is a package of a developement snapshot of the 2.4.3
-branch.
-
-Amanda, The Advanced Maryland Automatic Network Disk Archiver
-Copyright (c) 1991-1998 University of Maryland at College Park
-All Rights Reserved.
-
-See the files COPYRIGHT, COPYRIGHT-REGEX and COPYRIGHT-APACHE for
-distribution conditions and official warranty disclaimer.
-
-PLEASE NOTE: THIS SOFTWARE IS BEING MADE AVAILABLE ``AS-IS''. UMD is making
-this work available so that other people can use it. This software is in
-production use at our home site - the UMCP Department of Computer Science -
-but we make no warranties that it will work for you. Amanda development is
-unfunded - the development team maintains the code in their spare time. As a
-result, there is no support available other than users helping each other on
-the Amanda mailing lists. See below for information on the mailing lists.
-
-
-WHAT IS AMANDA?
----------------
-
-This is a release of Amanda, the Advanced Maryland Automatic
-Network Disk Archiver. Amanda is a backup system designed to archive many
-computers on a network to a single large-capacity tape drive.
-
-Here are some features of Amanda:
-
- * written in C, freely distributable.
- * built on top of standard backup software: Unix dump/restore, GNU Tar
- and others.
- * will back up multiple machines in parallel to a holding disk, blasting
- finished dumps one by one to tape as fast as we can write files to
- tape. For example, a ~2 Gb 8mm tape on a ~240K/s interface to a host
- with a large holding disk can be filled by Amanda in under 4 hours.
- * does simple tape management: will not overwrite the wrong tape.
- * supports tape changers via a generic interface. Easily customizable to
- any type of tape carousel, robot, or stacker that can be controlled via
- the unix command line.
- * supports Kerberos 4 security, including encrypted dumps. The Kerberos
- support is available as a separate add-on package, see the file
- KERBEROS.HOW-TO-GET on the ftp site, and the file docs/KERBEROS in this
- package, for more details.
- * for a restore, tells you what tapes you need, and finds the proper
- backup image on the tape for you.
- * recovers gracefully from errors, including down or hung machines.
- * reports results, including all errors in detail, in email.
- * will dynamically adjust backup schedule to keep within constraints: no
- more juggling by hand when adding disks and computers to network.
- * includes a pre-run checker program, that conducts sanity checks on both
- the tape server host and all the client hosts (in parallel), and will
- send an e-mail report of any problems that could cause the backups to
- fail.
- * can compress dumps before sending or after sending over the net, with
- either compress or gzip.
- * can optionally synchronize with external backups, for those large
- timesharing computers where you want to do full dumps when the system
- is down in single-user mode (since BSD dump is not reliable on active
- filesystems): Amanda will still do your daily dumps.
- * lots of other options; Amanda is very configurable.
-
-
-WHAT ARE THE SYSTEM REQUIREMENTS FOR AMANDA?
---------------------------------------------
-
-Amanda requires a host that is mostly idle during the time backups are
-done, with a large capacity tape drive (e.g. an EXABYTE, DAT or DLT tape).
-This becomes the "tape server host". All the computers you are going to dump
-are the "backup client hosts". The server host can also be a client host.
-
-Amanda works best with one or more large "holding disk" partitions on the
-server host available to it for buffering dumps before writing to tape.
-The holding disk allows Amanda to run backups in parallel to the disk, only
-writing them to tape when the backup is finished. Note that the holding
-disk is not required: without it Amanda will run backups sequentially to
-the tape drive. Running it this way kills the great performance, but still
-allows you to take advantage of Amanda's other features.
-
-As a rule of thumb, for best performance the holding disk should be larger
-than the dump output from your largest disk partitions. For example, if
-you are backing up some full gigabyte disks that compress down to 500 MB,
-then you'll want 500 MB on your holding disk. On the other hand, if those
-gigabyte drives are partitioned into 500 MB filesystems, they'll probably
-compress down to 250 MB and you'll only need that much on your holding
-disk. Amanda will perform better with larger holding disks.
-
-Actually, Amanda will still work if you have full dumps that are larger
-than the holding disk: Amanda will send those dumps directly to tape one at
-a time. If you have many such dumps you will be limited by the dump speed
-of those machines.
-
-Amanda does not yet support single backup images larger than a tape.
-
-
-WHAT SYSTEMS DOES AMANDA RUN ON?
---------------------------------
-
-Amanda should run on any modern Unix system that supports dump or GNU
-tar, has sockets and inetd, and either system V shared memory, or BSD
-mmap implemented.
-
-In particular, Amanda 2.4.1p1 has been compiled, and the client side tested
-on the following systems:
- AIX 3.2 and 4.1
- BSDI BSD/OS 2.1 and 3.1
- DEC OSF/1 3.2 and 4.0
- FreeBSD 2.2.5
- IRIX 5.2 and 6.3
- GNU/Linux on x86, alpha, sparc, arm and powerpc
- NetBSD 1.0
- Nextstep 3 (*)
- OpenBSD 2.5 x86, sparc, etc (ports available)
- SunOS 4.1.x (x >= 1) and 5.[567]
- Ultrix 4.2
- HP-UX 9.x and 10.x (x >= 01)
-
-The Amanda 2.4.1p1 server side is known to run on all of the other
-machines except on those marked with an asterisk.
-
-If you know of any system that is not listed here on which amanda
-builds successfully, either client&server or client-only, please
-report to amanda-hackers@amanda.org.
-
-
-WHERE DO I GET AMANDA?
-----------------------
-
-There are several versions of Amanda. The latest version at the time
-of this writing is available at:
-
- ftp://ftp.amanda.org/pub/amanda
-
-
-HOW DO I GET AMANDA UP AND RUNNING?
------------------------------------
-
-Read the file docs/INSTALL. There are a variety of steps, from compiling
-Amanda to installing it on the tape server host and the client machines.
- docs/INSTALL contains general installation instructions.
- docs/SYSTEM.NOTES contains system-specific information.
- docs/FAQ contains answers to frequently asked questions.
- docs/KERBEROS explains installation under Kerberos 4.
- docs/TAPE.CHANGERS explains how to customize the changer interface.
- docs/WHATS.NEW details new features.
-
-
-WHO DO I TALK TO IF I HAVE A PROBLEM?
--------------------------------------
-
-Amanda is completely unsupported and made available as-is. However,
-you may be able to get useful information in the Amanda mailing lists:
-
-==> To join a mailing list, DO NOT, EVER, send mail to that list. Send
- mail to <listname>-request@amanda.org, or amanda-lists@amanda.org,
- with the following line in the body of the message:
- subscribe <listname> <your-email-address>
-
-
- amanda-announce
- The amanda-announce mailing list is for important announcements
- related to the Amanda Network Backup Manager package, including new
- versions, contributions, and fixes. NOTE: the amanda-users list is
- itself on the amanda-announce distribution, so you only need to
- subscribe to one of the two lists, not both.
- To subscribe, send a message to amanda-announce-request@amanda.org.
-
- amanda-users
- The amanda-users mailing list is for questions and general discussion
- about the Amanda Network Backup Manager. This package and related
- files are available via anonymous FTP from ftp.amanda.org in the
- pub/amanda directory. NOTE: the amanda-users list is itself on the
- amanda-announce distribution, so you only need to subscribe to one of
- the two lists, not both.
- To subscribe, send a message to amanda-users-request@amanda.org.
-
- amanda-hackers
- The amanda-hackers mailing list is for discussion of the
- technical details of the Amanda package, including extensions,
- ports, bugs, fixes, and alpha testing of new versions.
- To subscribe, send a message to amanda-hackers-request@amanda.org.
-
-
-Share and Enjoy,
-The Amanda Development Team
diff --git a/sysutils/amanda-dev-common/Makefile b/sysutils/amanda-dev-common/Makefile
deleted file mode 100644
index 141147f0d72..00000000000
--- a/sysutils/amanda-dev-common/Makefile
+++ /dev/null
@@ -1,38 +0,0 @@
-# $NetBSD: Makefile,v 1.4 2003/06/07 14:47:19 cjep Exp $
-# FreeBSD Id: Makefile,v 1.9 1997/03/08 05:00:11 gpalmer Exp
-#
-
-PKGNAME= amanda-common-${VERS}
-SVR4_PKGNAME= amaco
-
-COMMENT= Common libraries and binaries for Amanda
-
-USE_BUILDLINK2= YES
-USE_PKGINSTALL= YES
-
-.include "../../mk/bsd.prefs.mk"
-.include "../../sysutils/amanda-dev-common/Makefile.common"
-
-.if ${OPSYS} == "NetBSD"
-CPPFLAGS= # empty
-.elif ${OPSYS} == "SunOS"
-CPPFLAGS+= -D_LARGEFILE64_SOURCE
-.endif
-
-CONFIGURE_ARGS+= --without-server --without-restore --without-client
-
-# Prevent configure script from finding unnecessary libraries.
-#
-CONFIGURE_ENV+= ac_cv_lib_intl_main=no
-CONFIGURE_ENV+= ac_cv_lib_termcap_tgetent=no
-CONFIGURE_ENV+= ac_cv_lib_curses_tgetent=no
-CONFIGURE_ENV+= ac_cv_lib_ncurses_tgetent=no
-CONFIGURE_ENV+= ac_cv_lib_readline_readline=no
-
-PKG_GROUPS= ${AMANDA_GROUP}
-PKG_USERS= ${AMANDA_USER}:${AMANDA_GROUP}::Amanda\\ user::${SH}
-
-OWN_DIRS_PERMS= ${AMANDA_VAR} ${AMANDA_USER} ${AMANDA_GROUP} 0700
-OWN_DIRS_PERMS+= ${AMANDA_VAR}/gnutar-lists ${AMANDA_USER} ${AMANDA_GROUP} 0700
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/amanda-dev-common/Makefile.common b/sysutils/amanda-dev-common/Makefile.common
deleted file mode 100644
index febc00fbf33..00000000000
--- a/sysutils/amanda-dev-common/Makefile.common
+++ /dev/null
@@ -1,38 +0,0 @@
-# $NetBSD: Makefile.common,v 1.4 2003/06/23 14:23:15 jschauma Exp $
-#
-# common make file fragment shared by all amanda-* pkgs.
-#
-
-VERS= 2.4.3b3
-DISTNAME?= amanda-${VERS}
-CATEGORIES= sysutils
-MASTER_SITES?= http://download.sourceforge.net/amanda/
-
-MAINTAINER= tech-pkg@netbsd.org
-HOMEPAGE= http://www.amanda.org/
-
-.if ${OPSYS} == "SunOS"
-AMANDA_GROUP?= sysadmin
-.else
-# NetBSD, Linux and Darwin
-AMANDA_GROUP?= operator
-.endif
-
-AMANDA_USER?= backup
-AMANDA_VAR?= /var/amanda
-
-BUILD_DEFS+= AMANDA_USER AMANDA_GROUP AMANDA_SMB AMANDA_VAR
-
-USE_LIBTOOL= yes
-LTCONFIG_OVERRIDE= ${WRKSRC}/config/ltconfig
-
-GNU_CONFIGURE= yes
-CONFIGURE_ARGS+= --with-user=${AMANDA_USER}
-CONFIGURE_ARGS+= --with-group=${AMANDA_GROUP}
-CONFIGURE_ARGS+= --with-owner=root
-CONFIGURE_ARGS+= --with-mmap
-CONFIGURE_ARGS+= --with-amandahosts
-CONFIGURE_ARGS+= --localstatedir=${AMANDA_VAR}
-CONFIGURE_ARGS+= --with-gnutar-listdir=${AMANDA_VAR}/gnutar-lists
-CONFIGURE_ARGS+= --with-dump-honor-nodump
-CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
diff --git a/sysutils/amanda-dev-common/PLIST b/sysutils/amanda-dev-common/PLIST
deleted file mode 100644
index 28b404a0491..00000000000
--- a/sysutils/amanda-dev-common/PLIST
+++ /dev/null
@@ -1,14 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2003/03/28 21:24:25 wiz Exp $
-lib/libamanda.a
-lib/libamanda.la
-lib/libamtape.a
-lib/libamtape.la
-man/man8/amanda.8
-man/man8/amdd.8
-man/man8/ammt.8
-share/doc/amanda/COPYRIGHT
-share/doc/amanda/COPYRIGHT-APACHE
-share/doc/amanda/COPYRIGHT-REGEX
-sbin/amdd
-sbin/ammt
-@dirrm share/doc/amanda
diff --git a/sysutils/amanda-dev-common/buildlink2.mk b/sysutils/amanda-dev-common/buildlink2.mk
deleted file mode 100644
index dc4e5cf36ae..00000000000
--- a/sysutils/amanda-dev-common/buildlink2.mk
+++ /dev/null
@@ -1,20 +0,0 @@
-# $NetBSD: buildlink2.mk,v 1.1 2002/10/25 18:59:25 wiz Exp $
-#
-
-.if !defined(AMANDA_COMMON_BUILDLINK2_MK)
-AMANDA_COMMON_BUILDLINK2_MK= # defined
-
-BUILDLINK_PACKAGES+= amanda-common
-BUILDLINK_DEPENDS.amanda-common?= amanda-common>=2.4.3b3
-BUILDLINK_PKGSRCDIR.amanda-common?= ../../sysutils/amanda-dev-common
-
-EVAL_PREFIX+= BUILDLINK_PREFIX.amanda-common=amanda-common
-BUILDLINK_PREFIX.amanda-common_DEFAULT= ${LOCALBASE}
-BUILDLINK_FILES.amanda-common+= lib/libamanda.*
-BUILDLINK_FILES.amanda-common+= lib/libamtape.*
-
-BUILDLINK_TARGETS+= amanda-common-buildlink
-
-amanda-common-buildlink: _BUILDLINK_USE
-
-.endif # AMANDA_COMMON_BUILDLINK2_MK
diff --git a/sysutils/amanda-dev-common/distinfo b/sysutils/amanda-dev-common/distinfo
deleted file mode 100644
index 3a72d86a68a..00000000000
--- a/sysutils/amanda-dev-common/distinfo
+++ /dev/null
@@ -1,10 +0,0 @@
-$NetBSD: distinfo,v 1.1.1.1 2002/05/02 13:28:15 bouyer Exp $
-
-SHA1 (amanda-2.4.3b3.tar.gz) = 7028e5f060ee159d05c35635e79c5fd4701f08ee
-Size (amanda-2.4.3b3.tar.gz) = 1167303 bytes
-SHA1 (patch-aa) = a173c2ff9ae91d4a347472deaeab440f5d1498d7
-SHA1 (patch-ab) = 8ad679e9df686bac180526daa4ed4b7a37410d58
-SHA1 (patch-ac) = a400a6308cd2e96bc30c8a6493cf7b90b442a35d
-SHA1 (patch-ad) = 510e650c9e9976323b1d27a7895cee6281b89dcd
-SHA1 (patch-ba) = 27a72a5585e3e6c2f191f337261ab25a2bcaa3a4
-SHA1 (patch-bb) = c8c91b848e669f2ccd3a753cfa7aba64e47d2166
diff --git a/sysutils/amanda-dev-common/patches/patch-aa b/sysutils/amanda-dev-common/patches/patch-aa
deleted file mode 100644
index 56184be25a0..00000000000
--- a/sysutils/amanda-dev-common/patches/patch-aa
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2002/05/02 13:28:15 bouyer Exp $
-
---- client-src/Makefile.in.orig Fri Mar 8 20:29:40 2002
-+++ client-src/Makefile.in Tue Apr 30 11:14:37 2002
-@@ -304,12 +304,10 @@
- sendsize_LDFLAGS =
- versionsuffix_SOURCES = versionsuffix.c
- versionsuffix_OBJECTS = versionsuffix.$(OBJEXT)
--versionsuffix_LDADD = $(LDADD)
--versionsuffix_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \
-- libamclient.$(LIB_EXTENSION) \
-- ../common-src/libamanda.$(LIB_EXTENSION)
-+versionsuffix_LDADD = ../common-src/libamanda.$(LIB_EXTENSION)
-+versionsuffix_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION)
- versionsuffix_LDFLAGS =
--SCRIPTS = $(libexec_SCRIPTS) $(sbin_SCRIPTS)
-+SCRIPTS = $(libexec_S:RIPTS) $(sbin_SCRIPTS)
-
-
- DEFS = @DEFS@
diff --git a/sysutils/amanda-dev-common/patches/patch-ab b/sysutils/amanda-dev-common/patches/patch-ab
deleted file mode 100644
index df3a6428adb..00000000000
--- a/sysutils/amanda-dev-common/patches/patch-ab
+++ /dev/null
@@ -1,36 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 2002/05/02 13:28:15 bouyer Exp $
-
---- Makefile.in.orig Fri Mar 8 20:29:29 2002
-+++ Makefile.in Tue Apr 30 13:23:44 2002
-@@ -33,7 +33,7 @@
- mandir = @mandir@
- includedir = @includedir@
- oldincludedir = /usr/include
--pkgdatadir = $(datadir)/@PACKAGE@
-+pkgdatadir = $(datadir)/doc/@PACKAGE@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
- top_builddir = .
-@@ -155,11 +155,11 @@
- ACINCLUDE_M4_DEPS = $(ACINCLUDE_M4I) $(LIBTOOL_M4I)
-
- @WANT_CLIENT_TRUE@CLIENT_SUBDIRS = client-src
--@WANT_TAPE_TRUE@TAPE_SUBDIRS = tape-src
-+TAPE_SUBDIRS = tape-src
- @WANT_SERVER_TRUE@SERVER_SUBDIRS = server-src changer-src
- @WANT_RESTORE_TRUE@RESTORE_SUBDIRS = restore-src
- @WANT_RECOVER_TRUE@RECOVER_SUBDIRS = recover-src
--@WANT_AMPLOT_TRUE@PLOT_SUBDIRS = amplot
-+#PLOT_SUBDIRS = amplot
- # order is significant, don't change it arbitrarily
- SUBDIRS = \
- config \
-@@ -170,7 +170,7 @@
- $(RESTORE_SUBDIRS) \
- $(RECOVER_SUBDIRS) \
- $(PLOT_SUBDIRS) \
-- man docs example
-+ man
-
-
- pkgdata_DATA = \
diff --git a/sysutils/amanda-dev-common/patches/patch-ac b/sysutils/amanda-dev-common/patches/patch-ac
deleted file mode 100644
index 37dca0baa97..00000000000
--- a/sysutils/amanda-dev-common/patches/patch-ac
+++ /dev/null
@@ -1,27 +0,0 @@
-$NetBSD: patch-ac,v 1.1.1.1 2002/05/02 13:28:15 bouyer Exp $
-
---- man/Makefile.in.orig Fri Mar 8 20:29:52 2002
-+++ man/Makefile.in Tue Apr 30 15:19:08 2002
-@@ -150,20 +150,18 @@
-
- transform = s,x,x,;
-
--@WANT_AMPLOT_TRUE@AMPLOT_MAN_PAGES = amplot.8
-+#AMPLOT_MAN_PAGES = amplot.8
-
--COMMON_MAN_PAGES = amanda.8
-+COMMON_MAN_PAGES = amanda.8 amdd.8 ammt.8
-
- @WANT_SERVER_TRUE@SERVER_MAN_PAGES = amadmin.8 \
- @WANT_SERVER_TRUE@ amcheck.8 \
- @WANT_SERVER_TRUE@ amcheckdb.8 \
- @WANT_SERVER_TRUE@ amcleanup.8 \
--@WANT_SERVER_TRUE@ amdd.8 \
- @WANT_SERVER_TRUE@ amdump.8 \
- @WANT_SERVER_TRUE@ amflush.8 \
- @WANT_SERVER_TRUE@ amgetconf.8 \
- @WANT_SERVER_TRUE@ amlabel.8 \
--@WANT_SERVER_TRUE@ ammt.8 \
- @WANT_SERVER_TRUE@ amoverview.8 \
- @WANT_SERVER_TRUE@ amreport.8 \
- @WANT_SERVER_TRUE@ amrmtape.8 \
diff --git a/sysutils/amanda-dev-common/patches/patch-ad b/sysutils/amanda-dev-common/patches/patch-ad
deleted file mode 100644
index c670d6a4196..00000000000
--- a/sysutils/amanda-dev-common/patches/patch-ad
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ad,v 1.1.1.1 2002/05/02 13:28:15 bouyer Exp $
-
-Use the correct name for the statvfs struct.
-
---- common-src/statfs.c.orig Sun May 23 11:11:18 1999
-+++ common-src/statfs.c Thu Jan 11 12:53:12 2001
-@@ -55,7 +55,15 @@
- */
- # include <sys/statvfs.h>
- # define STATFS_TYP "SVR4 (Irix-5+, Solaris-2, Linux glibc 2.1)"
-+#if defined(__sun__) && defined(__svr4__)
-+#if defined(_LARGEFILE64_SOURCE)
-+# define STATFS_STRUCT statvfs64_t
-+#else
-+# define STATFS_STRUCT statvfs_t
-+#endif /* largefile source */
-+#else
- # define STATFS_STRUCT struct statvfs
-+#endif /* !Solaris */
- # define STATFS_TOTAL(buf) (buf).f_blocks
- # define STATFS_AVAIL(buf) (buf).f_bavail
- # define STATFS_FREE(buf) (buf).f_bfree
diff --git a/sysutils/amanda-dev-common/patches/patch-ba b/sysutils/amanda-dev-common/patches/patch-ba
deleted file mode 100644
index b3f517608e9..00000000000
--- a/sysutils/amanda-dev-common/patches/patch-ba
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ba,v 1.1.1.1 2002/05/02 13:28:15 bouyer Exp $
-
---- common-src/token.h.orig Sun Feb 10 13:49:54 2002
-+++ common-src/token.h Tue Apr 30 11:18:43 2002
-@@ -43,7 +43,7 @@
- __attribute__ ((format (printf, 2, 3)));
- extern char *quote P((char *sep, char *str));
- extern char *rxquote P((char *str));
--extern char *shquote P((char *str));
-+extern char *am_shquote P((char *str));
- extern int table_lookup P((table_t *table, char *str));
- extern char *table_lookup_r P((table_t *table, int val));
-
diff --git a/sysutils/amanda-dev-common/patches/patch-bb b/sysutils/amanda-dev-common/patches/patch-bb
deleted file mode 100644
index cf9414b19ee..00000000000
--- a/sysutils/amanda-dev-common/patches/patch-bb
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-bb,v 1.1.1.1 2002/05/02 13:28:15 bouyer Exp $
-
---- common-src/token.c.orig Thu Mar 15 20:30:23 2001
-+++ common-src/token.c Thu Mar 15 20:30:56 2001
-@@ -295,7 +295,7 @@
- }
-
- /* Quote a string so that it can be safely passed to a shell */
--char *shquote(str)
-+char *am_shquote(str)
- char *str; /* the string to quote */
- {
- char *pi, *po;
diff --git a/sysutils/amanda-dev-plot/DESCR b/sysutils/amanda-dev-plot/DESCR
deleted file mode 100644
index 0ad4a7e8295..00000000000
--- a/sysutils/amanda-dev-plot/DESCR
+++ /dev/null
@@ -1,184 +0,0 @@
-Please note that this is a package of a developement snapshot of the 2.4.3
-branch.
-
-Amanda, The Advanced Maryland Automatic Network Disk Archiver
-Copyright (c) 1991-1998 University of Maryland at College Park
-All Rights Reserved.
-
-See the files COPYRIGHT, COPYRIGHT-REGEX and COPYRIGHT-APACHE for
-distribution conditions and official warranty disclaimer.
-
-PLEASE NOTE: THIS SOFTWARE IS BEING MADE AVAILABLE ``AS-IS''. UMD is making
-this work available so that other people can use it. This software is in
-production use at our home site - the UMCP Department of Computer Science -
-but we make no warranties that it will work for you. Amanda development is
-unfunded - the development team maintains the code in their spare time. As a
-result, there is no support available other than users helping each other on
-the Amanda mailing lists. See below for information on the mailing lists.
-
-
-WHAT IS AMANDA?
----------------
-
-This is a release of Amanda, the Advanced Maryland Automatic
-Network Disk Archiver. Amanda is a backup system designed to archive many
-computers on a network to a single large-capacity tape drive.
-
-Here are some features of Amanda:
-
- * written in C, freely distributable.
- * built on top of standard backup software: Unix dump/restore, GNU Tar
- and others.
- * will back up multiple machines in parallel to a holding disk, blasting
- finished dumps one by one to tape as fast as we can write files to
- tape. For example, a ~2 Gb 8mm tape on a ~240K/s interface to a host
- with a large holding disk can be filled by Amanda in under 4 hours.
- * does simple tape management: will not overwrite the wrong tape.
- * supports tape changers via a generic interface. Easily customizable to
- any type of tape carousel, robot, or stacker that can be controlled via
- the unix command line.
- * supports Kerberos 4 security, including encrypted dumps. The Kerberos
- support is available as a separate add-on package, see the file
- KERBEROS.HOW-TO-GET on the ftp site, and the file docs/KERBEROS in this
- package, for more details.
- * for a restore, tells you what tapes you need, and finds the proper
- backup image on the tape for you.
- * recovers gracefully from errors, including down or hung machines.
- * reports results, including all errors in detail, in email.
- * will dynamically adjust backup schedule to keep within constraints: no
- more juggling by hand when adding disks and computers to network.
- * includes a pre-run checker program, that conducts sanity checks on both
- the tape server host and all the client hosts (in parallel), and will
- send an e-mail report of any problems that could cause the backups to
- fail.
- * can compress dumps before sending or after sending over the net, with
- either compress or gzip.
- * can optionally synchronize with external backups, for those large
- timesharing computers where you want to do full dumps when the system
- is down in single-user mode (since BSD dump is not reliable on active
- filesystems): Amanda will still do your daily dumps.
- * lots of other options; Amanda is very configurable.
-
-
-WHAT ARE THE SYSTEM REQUIREMENTS FOR AMANDA?
---------------------------------------------
-
-Amanda requires a host that is mostly idle during the time backups are
-done, with a large capacity tape drive (e.g. an EXABYTE, DAT or DLT tape).
-This becomes the "tape server host". All the computers you are going to dump
-are the "backup client hosts". The server host can also be a client host.
-
-Amanda works best with one or more large "holding disk" partitions on the
-server host available to it for buffering dumps before writing to tape.
-The holding disk allows Amanda to run backups in parallel to the disk, only
-writing them to tape when the backup is finished. Note that the holding
-disk is not required: without it Amanda will run backups sequentially to
-the tape drive. Running it this way kills the great performance, but still
-allows you to take advantage of Amanda's other features.
-
-As a rule of thumb, for best performance the holding disk should be larger
-than the dump output from your largest disk partitions. For example, if
-you are backing up some full gigabyte disks that compress down to 500 MB,
-then you'll want 500 MB on your holding disk. On the other hand, if those
-gigabyte drives are partitioned into 500 MB filesystems, they'll probably
-compress down to 250 MB and you'll only need that much on your holding
-disk. Amanda will perform better with larger holding disks.
-
-Actually, Amanda will still work if you have full dumps that are larger
-than the holding disk: Amanda will send those dumps directly to tape one at
-a time. If you have many such dumps you will be limited by the dump speed
-of those machines.
-
-Amanda does not yet support single backup images larger than a tape.
-
-
-WHAT SYSTEMS DOES AMANDA RUN ON?
---------------------------------
-
-Amanda should run on any modern Unix system that supports dump or GNU
-tar, has sockets and inetd, and either system V shared memory, or BSD
-mmap implemented.
-
-In particular, Amanda 2.4.1p1 has been compiled, and the client side tested
-on the following systems:
- AIX 3.2 and 4.1
- BSDI BSD/OS 2.1 and 3.1
- DEC OSF/1 3.2 and 4.0
- FreeBSD 2.2.5
- IRIX 5.2 and 6.3
- GNU/Linux on x86, alpha, sparc, arm and powerpc
- NetBSD 1.0
- Nextstep 3 (*)
- OpenBSD 2.5 x86, sparc, etc (ports available)
- SunOS 4.1.x (x >= 1) and 5.[567]
- Ultrix 4.2
- HP-UX 9.x and 10.x (x >= 01)
-
-The Amanda 2.4.1p1 server side is known to run on all of the other
-machines except on those marked with an asterisk.
-
-If you know of any system that is not listed here on which amanda
-builds successfully, either client&server or client-only, please
-report to amanda-hackers@amanda.org.
-
-
-WHERE DO I GET AMANDA?
-----------------------
-
-There are several versions of Amanda. The latest version at the time
-of this writing is available at:
-
- ftp://ftp.amanda.org/pub/amanda
-
-
-HOW DO I GET AMANDA UP AND RUNNING?
------------------------------------
-
-Read the file docs/INSTALL. There are a variety of steps, from compiling
-Amanda to installing it on the tape server host and the client machines.
- docs/INSTALL contains general installation instructions.
- docs/SYSTEM.NOTES contains system-specific information.
- docs/FAQ contains answers to frequently asked questions.
- docs/KERBEROS explains installation under Kerberos 4.
- docs/TAPE.CHANGERS explains how to customize the changer interface.
- docs/WHATS.NEW details new features.
-
-
-WHO DO I TALK TO IF I HAVE A PROBLEM?
--------------------------------------
-
-Amanda is completely unsupported and made available as-is. However,
-you may be able to get useful information in the Amanda mailing lists:
-
-==> To join a mailing list, DO NOT, EVER, send mail to that list. Send
- mail to <listname>-request@amanda.org, or amanda-lists@amanda.org,
- with the following line in the body of the message:
- subscribe <listname> <your-email-address>
-
-
- amanda-announce
- The amanda-announce mailing list is for important announcements
- related to the Amanda Network Backup Manager package, including new
- versions, contributions, and fixes. NOTE: the amanda-users list is
- itself on the amanda-announce distribution, so you only need to
- subscribe to one of the two lists, not both.
- To subscribe, send a message to amanda-announce-request@amanda.org.
-
- amanda-users
- The amanda-users mailing list is for questions and general discussion
- about the Amanda Network Backup Manager. This package and related
- files are available via anonymous FTP from ftp.amanda.org in the
- pub/amanda directory. NOTE: the amanda-users list is itself on the
- amanda-announce distribution, so you only need to subscribe to one of
- the two lists, not both.
- To subscribe, send a message to amanda-users-request@amanda.org.
-
- amanda-hackers
- The amanda-hackers mailing list is for discussion of the
- technical details of the Amanda package, including extensions,
- ports, bugs, fixes, and alpha testing of new versions.
- To subscribe, send a message to amanda-hackers-request@amanda.org.
-
-
-Share and Enjoy,
-The Amanda Development Team
diff --git a/sysutils/amanda-dev-plot/Makefile b/sysutils/amanda-dev-plot/Makefile
deleted file mode 100644
index 388c0195d52..00000000000
--- a/sysutils/amanda-dev-plot/Makefile
+++ /dev/null
@@ -1,22 +0,0 @@
-# $NetBSD: Makefile,v 1.3 2002/10/25 19:36:08 wiz Exp $
-#
-
-PKGNAME= amanda-plot-${VERS}
-SVR4_PKGNAME= amapl
-
-COMMENT= Visualizes the behavior of Amanda, a network backup system
-
-DEPENDS+= gnuplot>=3.7:../../graphics/gnuplot
-DEPENDS+= amanda-server-${VERS}:../../sysutils/amanda-dev-server
-
-USE_BUILDLINK2= yes
-
-.include "../../mk/bsd.prefs.mk"
-.include "../../sysutils/amanda-dev-common/Makefile.common"
-
-CONFIGURE_ARGS+= --without-client
-CONFIGURE_ARGS+= --without-restore
-CONFIGURE_ARGS+= --without-amrecover
-CONFIGURE_ENV+= GNUPLOT="${LOCALBASE}/bin/gnuplot"
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/amanda-dev-plot/PLIST b/sysutils/amanda-dev-plot/PLIST
deleted file mode 100644
index 683ac110f16..00000000000
--- a/sysutils/amanda-dev-plot/PLIST
+++ /dev/null
@@ -1,7 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2002/05/02 13:28:15 bouyer Exp $
-libexec/amcat.awk
-libexec/amplot.awk
-libexec/amplot.g
-libexec/amplot.gp
-man/man8/amplot.8
-sbin/amplot
diff --git a/sysutils/amanda-dev-plot/distinfo b/sysutils/amanda-dev-plot/distinfo
deleted file mode 100644
index 72c3f24dc4e..00000000000
--- a/sysutils/amanda-dev-plot/distinfo
+++ /dev/null
@@ -1,7 +0,0 @@
-$NetBSD: distinfo,v 1.1.1.1 2002/05/02 13:28:15 bouyer Exp $
-
-SHA1 (amanda-2.4.3b3.tar.gz) = 7028e5f060ee159d05c35635e79c5fd4701f08ee
-Size (amanda-2.4.3b3.tar.gz) = 1167303 bytes
-SHA1 (patch-aa) = c98871c70e5b5a290abf0138695a0dd636178695
-SHA1 (patch-ab) = 00833fb7f08cf753c4d9e38f312ee08d38afee76
-SHA1 (patch-ac) = e3f2b28d1cccc6d1edcef3127491cd7e7143d56d
diff --git a/sysutils/amanda-dev-plot/patches/patch-aa b/sysutils/amanda-dev-plot/patches/patch-aa
deleted file mode 100644
index 67d575e39f2..00000000000
--- a/sysutils/amanda-dev-plot/patches/patch-aa
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2002/05/02 13:28:15 bouyer Exp $
-
---- configure.orig Fri Mar 8 20:28:05 2002
-+++ configure Tue Apr 30 15:28:37 2002
-@@ -9893,8 +9893,10 @@
- # This can be used to rebuild libtool when needed
- LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
-
-+if false ; then
- # Always use our own libtool.
- LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-+fi
-
- # Prevent multiple expansion
-
diff --git a/sysutils/amanda-dev-plot/patches/patch-ab b/sysutils/amanda-dev-plot/patches/patch-ab
deleted file mode 100644
index 2b18484e491..00000000000
--- a/sysutils/amanda-dev-plot/patches/patch-ab
+++ /dev/null
@@ -1,44 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 2002/05/02 13:28:15 bouyer Exp $
-
---- Makefile.in.orig Fri Mar 8 20:29:29 2002
-+++ Makefile.in Tue Apr 30 15:40:45 2002
-@@ -163,20 +163,14 @@
- # order is significant, don't change it arbitrarily
- SUBDIRS = \
- config \
-- common-src \
- $(CLIENT_SUBDIRS) \
-- $(TAPE_SUBDIRS) \
-- $(SERVER_SUBDIRS) \
- $(RESTORE_SUBDIRS) \
- $(RECOVER_SUBDIRS) \
- $(PLOT_SUBDIRS) \
-- man docs example
-+ man
-
-
--pkgdata_DATA = \
-- COPYRIGHT \
-- COPYRIGHT-APACHE \
-- COPYRIGHT-REGEX
-+pkgdata_DATA =
-
-
- EXTRA_DIST = $(SNAPSHOT_STAMP) \
-@@ -466,7 +460,6 @@
- all-am: Makefile $(DATA)
- installdirs: installdirs-recursive
- installdirs-am:
-- $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)
-
- install: install-recursive
- install-exec: install-exec-recursive
-@@ -511,7 +504,7 @@
-
- info-am:
-
--install-data-am: install-pkgdataDATA
-+install-data-am:
-
- install-exec-am:
-
diff --git a/sysutils/amanda-dev-plot/patches/patch-ac b/sysutils/amanda-dev-plot/patches/patch-ac
deleted file mode 100644
index acc3ff8835b..00000000000
--- a/sysutils/amanda-dev-plot/patches/patch-ac
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-ac,v 1.1.1.1 2002/05/02 13:28:15 bouyer Exp $
-
---- man/Makefile.in.orig Fri Mar 8 20:29:52 2002
-+++ man/Makefile.in Tue Apr 30 15:31:39 2002
-@@ -180,11 +180,7 @@
- # not autoconf-generated:
- EXTRA_DIST = amplot.8 amrestore.8 amtape.8 amdd.8 ammt.8
-
--man_MANS = $(AMPLOT_MAN_PAGES) \
-- $(COMMON_MAN_PAGES) \
-- $(SERVER_MAN_PAGES) \
-- $(RECOVER_MAN_PAGES) \
-- $(RESTORE_MAN_PAGES)
-+man_MANS = $(AMPLOT_MAN_PAGES)
-
- subdir = man
- mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
diff --git a/sysutils/amanda-dev-server/DESCR b/sysutils/amanda-dev-server/DESCR
deleted file mode 100644
index 0ad4a7e8295..00000000000
--- a/sysutils/amanda-dev-server/DESCR
+++ /dev/null
@@ -1,184 +0,0 @@
-Please note that this is a package of a developement snapshot of the 2.4.3
-branch.
-
-Amanda, The Advanced Maryland Automatic Network Disk Archiver
-Copyright (c) 1991-1998 University of Maryland at College Park
-All Rights Reserved.
-
-See the files COPYRIGHT, COPYRIGHT-REGEX and COPYRIGHT-APACHE for
-distribution conditions and official warranty disclaimer.
-
-PLEASE NOTE: THIS SOFTWARE IS BEING MADE AVAILABLE ``AS-IS''. UMD is making
-this work available so that other people can use it. This software is in
-production use at our home site - the UMCP Department of Computer Science -
-but we make no warranties that it will work for you. Amanda development is
-unfunded - the development team maintains the code in their spare time. As a
-result, there is no support available other than users helping each other on
-the Amanda mailing lists. See below for information on the mailing lists.
-
-
-WHAT IS AMANDA?
----------------
-
-This is a release of Amanda, the Advanced Maryland Automatic
-Network Disk Archiver. Amanda is a backup system designed to archive many
-computers on a network to a single large-capacity tape drive.
-
-Here are some features of Amanda:
-
- * written in C, freely distributable.
- * built on top of standard backup software: Unix dump/restore, GNU Tar
- and others.
- * will back up multiple machines in parallel to a holding disk, blasting
- finished dumps one by one to tape as fast as we can write files to
- tape. For example, a ~2 Gb 8mm tape on a ~240K/s interface to a host
- with a large holding disk can be filled by Amanda in under 4 hours.
- * does simple tape management: will not overwrite the wrong tape.
- * supports tape changers via a generic interface. Easily customizable to
- any type of tape carousel, robot, or stacker that can be controlled via
- the unix command line.
- * supports Kerberos 4 security, including encrypted dumps. The Kerberos
- support is available as a separate add-on package, see the file
- KERBEROS.HOW-TO-GET on the ftp site, and the file docs/KERBEROS in this
- package, for more details.
- * for a restore, tells you what tapes you need, and finds the proper
- backup image on the tape for you.
- * recovers gracefully from errors, including down or hung machines.
- * reports results, including all errors in detail, in email.
- * will dynamically adjust backup schedule to keep within constraints: no
- more juggling by hand when adding disks and computers to network.
- * includes a pre-run checker program, that conducts sanity checks on both
- the tape server host and all the client hosts (in parallel), and will
- send an e-mail report of any problems that could cause the backups to
- fail.
- * can compress dumps before sending or after sending over the net, with
- either compress or gzip.
- * can optionally synchronize with external backups, for those large
- timesharing computers where you want to do full dumps when the system
- is down in single-user mode (since BSD dump is not reliable on active
- filesystems): Amanda will still do your daily dumps.
- * lots of other options; Amanda is very configurable.
-
-
-WHAT ARE THE SYSTEM REQUIREMENTS FOR AMANDA?
---------------------------------------------
-
-Amanda requires a host that is mostly idle during the time backups are
-done, with a large capacity tape drive (e.g. an EXABYTE, DAT or DLT tape).
-This becomes the "tape server host". All the computers you are going to dump
-are the "backup client hosts". The server host can also be a client host.
-
-Amanda works best with one or more large "holding disk" partitions on the
-server host available to it for buffering dumps before writing to tape.
-The holding disk allows Amanda to run backups in parallel to the disk, only
-writing them to tape when the backup is finished. Note that the holding
-disk is not required: without it Amanda will run backups sequentially to
-the tape drive. Running it this way kills the great performance, but still
-allows you to take advantage of Amanda's other features.
-
-As a rule of thumb, for best performance the holding disk should be larger
-than the dump output from your largest disk partitions. For example, if
-you are backing up some full gigabyte disks that compress down to 500 MB,
-then you'll want 500 MB on your holding disk. On the other hand, if those
-gigabyte drives are partitioned into 500 MB filesystems, they'll probably
-compress down to 250 MB and you'll only need that much on your holding
-disk. Amanda will perform better with larger holding disks.
-
-Actually, Amanda will still work if you have full dumps that are larger
-than the holding disk: Amanda will send those dumps directly to tape one at
-a time. If you have many such dumps you will be limited by the dump speed
-of those machines.
-
-Amanda does not yet support single backup images larger than a tape.
-
-
-WHAT SYSTEMS DOES AMANDA RUN ON?
---------------------------------
-
-Amanda should run on any modern Unix system that supports dump or GNU
-tar, has sockets and inetd, and either system V shared memory, or BSD
-mmap implemented.
-
-In particular, Amanda 2.4.1p1 has been compiled, and the client side tested
-on the following systems:
- AIX 3.2 and 4.1
- BSDI BSD/OS 2.1 and 3.1
- DEC OSF/1 3.2 and 4.0
- FreeBSD 2.2.5
- IRIX 5.2 and 6.3
- GNU/Linux on x86, alpha, sparc, arm and powerpc
- NetBSD 1.0
- Nextstep 3 (*)
- OpenBSD 2.5 x86, sparc, etc (ports available)
- SunOS 4.1.x (x >= 1) and 5.[567]
- Ultrix 4.2
- HP-UX 9.x and 10.x (x >= 01)
-
-The Amanda 2.4.1p1 server side is known to run on all of the other
-machines except on those marked with an asterisk.
-
-If you know of any system that is not listed here on which amanda
-builds successfully, either client&server or client-only, please
-report to amanda-hackers@amanda.org.
-
-
-WHERE DO I GET AMANDA?
-----------------------
-
-There are several versions of Amanda. The latest version at the time
-of this writing is available at:
-
- ftp://ftp.amanda.org/pub/amanda
-
-
-HOW DO I GET AMANDA UP AND RUNNING?
------------------------------------
-
-Read the file docs/INSTALL. There are a variety of steps, from compiling
-Amanda to installing it on the tape server host and the client machines.
- docs/INSTALL contains general installation instructions.
- docs/SYSTEM.NOTES contains system-specific information.
- docs/FAQ contains answers to frequently asked questions.
- docs/KERBEROS explains installation under Kerberos 4.
- docs/TAPE.CHANGERS explains how to customize the changer interface.
- docs/WHATS.NEW details new features.
-
-
-WHO DO I TALK TO IF I HAVE A PROBLEM?
--------------------------------------
-
-Amanda is completely unsupported and made available as-is. However,
-you may be able to get useful information in the Amanda mailing lists:
-
-==> To join a mailing list, DO NOT, EVER, send mail to that list. Send
- mail to <listname>-request@amanda.org, or amanda-lists@amanda.org,
- with the following line in the body of the message:
- subscribe <listname> <your-email-address>
-
-
- amanda-announce
- The amanda-announce mailing list is for important announcements
- related to the Amanda Network Backup Manager package, including new
- versions, contributions, and fixes. NOTE: the amanda-users list is
- itself on the amanda-announce distribution, so you only need to
- subscribe to one of the two lists, not both.
- To subscribe, send a message to amanda-announce-request@amanda.org.
-
- amanda-users
- The amanda-users mailing list is for questions and general discussion
- about the Amanda Network Backup Manager. This package and related
- files are available via anonymous FTP from ftp.amanda.org in the
- pub/amanda directory. NOTE: the amanda-users list is itself on the
- amanda-announce distribution, so you only need to subscribe to one of
- the two lists, not both.
- To subscribe, send a message to amanda-users-request@amanda.org.
-
- amanda-hackers
- The amanda-hackers mailing list is for discussion of the
- technical details of the Amanda package, including extensions,
- ports, bugs, fixes, and alpha testing of new versions.
- To subscribe, send a message to amanda-hackers-request@amanda.org.
-
-
-Share and Enjoy,
-The Amanda Development Team
diff --git a/sysutils/amanda-dev-server/Makefile b/sysutils/amanda-dev-server/Makefile
deleted file mode 100644
index fdb2f2cf5df..00000000000
--- a/sysutils/amanda-dev-server/Makefile
+++ /dev/null
@@ -1,52 +0,0 @@
-# $NetBSD: Makefile,v 1.2 2002/10/25 19:29:00 wiz Exp $
-#
-
-PKGNAME= amanda-server-${VERS}
-
-COMMENT= Server part of Amanda, a network backup system
-
-USE_BUILDLINK2= yes
-USE_PERL5= yes
-USE_GMAKE= yes
-
-.include "../../mk/bsd.prefs.mk"
-.include "../../sysutils/amanda-dev-common/Makefile.common"
-
-CONFIGURE_ARGS+= --without-client
-
-# Prevent configure script from finding unnecessary libraries.
-#
-CONFIGURE_ENV+= ac_cv_lib_intl_main=no
-CONFIGURE_ENV+= ac_cv_lib_termcap_tgetent=no
-CONFIGURE_ENV+= ac_cv_lib_curses_tgetent=no
-CONFIGURE_ENV+= ac_cv_lib_ncurses_tgetent=no
-CONFIGURE_ENV+= ac_cv_lib_readline_readline=no
-
-# post-install:
-# ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/amanda
-# ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/amanda
-# for i in ${WRKDIR}/${DISTNAME}/docs/* ; do \
-# ${INSTALL_DATA} $$i ${PREFIX}/share/doc/amanda; \
-# done
-# for i in ${WRKDIR}/${DISTNAME}/example/8.5x11.ps \
-# ${WRKDIR}/${DISTNAME}/example/DIN-A4.ps \
-# ${WRKDIR}/${DISTNAME}/example/DLT.ps \
-# ${WRKDIR}/${DISTNAME}/example/EXB-8500.ps \
-# ${WRKDIR}/${DISTNAME}/example/HP-DAT.ps \
-# ${WRKDIR}/${DISTNAME}/example/amanda.conf \
-# ${WRKDIR}/${DISTNAME}/example/chg-multi.conf \
-# ${WRKDIR}/${DISTNAME}/example/chg-scsi.conf \
-# ${WRKDIR}/${DISTNAME}/example/config.site \
-# ${WRKDIR}/${DISTNAME}/example/disklist; do \
-# ${INSTALL_DATA} $$i ${PREFIX}/share/examples/amanda; \
-# done
-
-.if ${OPSYS} == "SunOS"
-PLIST_SRC= ${WRKDIR}/PLIST-src
-
-pre-install:
- ${SED} -e 's|^libexec/chg-scsi$$|@comment libexec/chg-scsi needs headers...|' ${PKGDIR}/PLIST > ${PLIST_SRC}
-.endif
-
-.include "../../sysutils/amanda-dev-common/buildlink2.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/amanda-dev-server/PLIST b/sysutils/amanda-dev-server/PLIST
deleted file mode 100644
index 3b347234b6d..00000000000
--- a/sysutils/amanda-dev-server/PLIST
+++ /dev/null
@@ -1,91 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2002/05/02 13:28:15 bouyer Exp $
-lib/libamserver-2.4.3b3.so
-lib/libamserver.a
-lib/libamserver.la
-lib/libamserver.so
-libexec/amcleanupdisk
-libexec/amidxtaped
-libexec/amindexd
-libexec/amlogroll
-libexec/amtrmidx
-libexec/amtrmlog
-libexec/chg-chio
-libexec/chg-chs
-libexec/chg-manual
-libexec/chg-mtx
-libexec/chg-multi
-libexec/chg-rth
-libexec/chg-scsi
-libexec/chg-zd-mtx
-libexec/driver
-libexec/dumper
-libexec/planner
-libexec/taper
-man/man8/amadmin.8
-man/man8/amcheck.8
-man/man8/amcheckdb.8
-man/man8/amcleanup.8
-man/man8/amdump.8
-man/man8/amflush.8
-man/man8/amgetconf.8
-man/man8/amlabel.8
-man/man8/amoverview.8
-man/man8/amreport.8
-man/man8/amrestore.8
-man/man8/amrmtape.8
-man/man8/amstatus.8
-man/man8/amtape.8
-man/man8/amtoc.8
-man/man8/amverify.8
-sbin/amadmin
-sbin/amcheck
-sbin/amcheckdb
-sbin/amcleanup
-sbin/amdump
-sbin/amflush
-sbin/amgetconf
-sbin/amlabel
-sbin/amoverview
-sbin/amreport
-sbin/amrestore
-sbin/amrmtape
-sbin/amstatus
-sbin/amtape
-sbin/amtoc
-sbin/amverify
-share/doc/amanda/DUMPER-API
-share/doc/amanda/EXCLUDE
-share/doc/amanda/FAQ
-share/doc/amanda/INDEXING
-share/doc/amanda/INSTALL
-share/doc/amanda/INTERNALS
-share/doc/amanda/KERBEROS
-share/doc/amanda/LABEL.PRINTING
-share/doc/amanda/MULTITAPE
-share/doc/amanda/PORT.USAGE
-share/doc/amanda/RAIT
-share/doc/amanda/RESTORE
-share/doc/amanda/SAMBA
-share/doc/amanda/SECURITY
-share/doc/amanda/SYSTEM.NOTES
-share/doc/amanda/TAPE.CHANGERS
-share/doc/amanda/TAPETYPES
-share/doc/amanda/UPGRADE
-share/doc/amanda/VTAPE-API
-share/doc/amanda/WHATS.NEW
-share/doc/amanda/WISHLIST
-share/doc/amanda/YEAR2000
-share/doc/amanda/ZFTAPE
-share/examples/amanda/3hole.ps
-share/examples/amanda/8.5x11.ps
-share/examples/amanda/DIN-A4.ps
-share/examples/amanda/DLT.ps
-share/examples/amanda/EXB-8500.ps
-share/examples/amanda/HP-DAT.ps
-share/examples/amanda/amanda.conf
-share/examples/amanda/amanda.conf.chg-scsi
-share/examples/amanda/chg-multi.conf
-share/examples/amanda/chg-scsi.conf
-share/examples/amanda/config.site
-share/examples/amanda/disklist
-@dirrm share/examples/amanda
diff --git a/sysutils/amanda-dev-server/distinfo b/sysutils/amanda-dev-server/distinfo
deleted file mode 100644
index f999f413fac..00000000000
--- a/sysutils/amanda-dev-server/distinfo
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD: distinfo,v 1.3 2002/06/04 15:44:54 bouyer Exp $
-
-SHA1 (amanda-2.4.3b3.tar.gz) = 7028e5f060ee159d05c35635e79c5fd4701f08ee
-Size (amanda-2.4.3b3.tar.gz) = 1167303 bytes
-SHA1 (patch-aa) = f18ea70e071e33ffda7abd82ceea463a680ce462
-SHA1 (patch-ab) = 20a87e2101f643c3935367d9f836eaaea8b3dfbd
-SHA1 (patch-ac) = 3ba9c95792e8ea99216c70958489b6a6f264db3c
-SHA1 (patch-ad) = 4a481994c8f1c7a2e804d247d07f20f52abc45e9
-SHA1 (patch-ae) = 0e607d5c9d67a144c83a265240f28f095f730b62
-SHA1 (patch-af) = a0a6a8e8fdbe5d24daf84669702dc755ff61b239
-SHA1 (patch-ag) = 4397a7c6bde844d80781e1ffd8fb81c289e92fe0
-SHA1 (patch-ah) = c3b30d72ec79b59c1b86b333a0e45f5fac1939eb
-SHA1 (patch-ai) = 71bc624cb27a2f3c7615450db2e36cf181e0cbb5
-SHA1 (patch-aj) = cab0a647cf0df0920f7aa658d473cf935adff2e1
-SHA1 (patch-ak) = 1fcc2579a2b20f500964536e2ce135f6a2b0769d
-SHA1 (patch-al) = aa7d3a2551190fe9cea8028880374e797e7d5f7d
-SHA1 (patch-am) = aac4ccd7cb42746ac8d43a8cb0f1470096886d83
-SHA1 (patch-ba) = b90d895f4c0b9c4dc725c340e936952d857c4f3e
-SHA1 (patch-bb) = c8c91b848e669f2ccd3a753cfa7aba64e47d2166
-SHA1 (patch-bc) = 640144ef583cb5871e893485f67bd0943ea020c7
-SHA1 (patch-bd) = 8b9277a48329993408e69ccd8e0ee9ed6b4bfc64
-SHA1 (patch-be) = f9c292d3b219f8125e82439fea3feefaa9682572
-SHA1 (patch-bf) = f8cd30f6054a4aceadbf26abd840a7f7d0f90d0a
diff --git a/sysutils/amanda-dev-server/patches/patch-aa b/sysutils/amanda-dev-server/patches/patch-aa
deleted file mode 100644
index 956ee630777..00000000000
--- a/sysutils/amanda-dev-server/patches/patch-aa
+++ /dev/null
@@ -1,32 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2002/05/02 13:28:16 bouyer Exp $
-
---- configure.orig Fri Mar 8 20:28:05 2002
-+++ configure Tue Apr 30 12:56:23 2002
-@@ -4317,6 +4317,7 @@
- test -n "$GETCONF" && break
- done
-
-+if false ;then
- for ac_prog in gnuplot
- do
- # Extract the first word of "$ac_prog", so it can be a program name with args.
-@@ -4358,6 +4359,8 @@
-
- test -n "$GNUPLOT" && break
- done
-+fi
-+GNUPLOT=""
-
- if test -z "$GNUPLOT"; then
- NO_AMPLOT_MODE=true
-@@ -9893,8 +9896,10 @@
- # This can be used to rebuild libtool when needed
- LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
-
-+if false; then
- # Always use our own libtool.
- LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-+fi
-
- # Prevent multiple expansion
-
diff --git a/sysutils/amanda-dev-server/patches/patch-ab b/sysutils/amanda-dev-server/patches/patch-ab
deleted file mode 100644
index e1e5c5007a4..00000000000
--- a/sysutils/amanda-dev-server/patches/patch-ab
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 2002/05/02 13:28:16 bouyer Exp $
-
---- Makefile.in.orig Fri Mar 8 20:29:29 2002
-+++ Makefile.in Tue Apr 30 13:37:17 2002
-@@ -33,7 +33,7 @@
- mandir = @mandir@
- includedir = @includedir@
- oldincludedir = /usr/include
--pkgdatadir = $(datadir)/@PACKAGE@
-+pkgdatadir = $(datadir)/doc/@PACKAGE@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
- top_builddir = .
-@@ -155,7 +155,7 @@
- ACINCLUDE_M4_DEPS = $(ACINCLUDE_M4I) $(LIBTOOL_M4I)
-
- @WANT_CLIENT_TRUE@CLIENT_SUBDIRS = client-src
--@WANT_TAPE_TRUE@TAPE_SUBDIRS = tape-src
-+#TAPE_SUBDIRS = tape-src
- @WANT_SERVER_TRUE@SERVER_SUBDIRS = server-src changer-src
- @WANT_RESTORE_TRUE@RESTORE_SUBDIRS = restore-src
- @WANT_RECOVER_TRUE@RECOVER_SUBDIRS = recover-src
-@@ -474,7 +474,7 @@
- uninstall: uninstall-recursive
-
- install-am: all-am
-- @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-+ @$(MAKE) $(AM_MAKEFLAGS) install-exec-am
-
- installcheck: installcheck-recursive
- install-strip:
diff --git a/sysutils/amanda-dev-server/patches/patch-ac b/sysutils/amanda-dev-server/patches/patch-ac
deleted file mode 100644
index 5d2bec0713c..00000000000
--- a/sysutils/amanda-dev-server/patches/patch-ac
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-ac,v 1.1.1.1 2002/05/02 13:28:16 bouyer Exp $
-
---- example/amanda.conf.chg-scsi.in.orig Fri Apr 13 19:35:18 2001
-+++ example/amanda.conf.chg-scsi.in Tue Apr 30 13:01:08 2002
-@@ -165,10 +165,10 @@
- # Note that, although the keyword below is infofile, it is only so for
- # historic reasons, since now it is supposed to be a directory (unless
- # you have selected some database format other than the `text' default)
--infofile "/usr/adm/amanda/@DEFAULT_CONFIG@/curinfo" # database DIRECTORY
--logdir "/usr/adm/amanda/@DEFAULT_CONFIG@" # log directory
--indexdir "/usr/adm/amanda/@DEFAULT_CONFIG@/index" # index directory
--#tapelist "/usr/adm/amanda/@DEFAULT_CONFIG@/tapelist" # list of used tapes
-+infofile "@localstatedir@/@DEFAULT_CONFIG@/curinfo" # database DIRECTORY
-+logdir "@localstatedir@/@DEFAULT_CONFIG@" # log directory
-+indexdir "@localstatedir@/@DEFAULT_CONFIG@/index" # index directory
-+#tapelist "@localstatedir@/@DEFAULT_CONFIG@/tapelist" # list of used tapes
- # tapelist is stored, by default, in the directory that contains amanda.conf
-
-
diff --git a/sysutils/amanda-dev-server/patches/patch-ad b/sysutils/amanda-dev-server/patches/patch-ad
deleted file mode 100644
index 692a24784d4..00000000000
--- a/sysutils/amanda-dev-server/patches/patch-ad
+++ /dev/null
@@ -1,200 +0,0 @@
-$NetBSD: patch-ad,v 1.1.1.1 2002/05/02 13:28:16 bouyer Exp $
-
---- server-src/Makefile.in.orig Fri Mar 8 20:29:44 2002
-+++ server-src/Makefile.in Tue Apr 30 13:08:50 2002
-@@ -196,10 +196,7 @@
- # need to list libamanda twice here, first to override the system library
- # routines, and second to pick up any references in the other libraries.
- ###
--LDADD = ../common-src/libamanda.$(LIB_EXTENSION) \
-- libamserver.$(LIB_EXTENSION) \
-- ../tape-src/libamtape.$(LIB_EXTENSION) \
-- ../common-src/libamanda.$(LIB_EXTENSION)
-+LDADD = libamserver.$(LIB_EXTENSION)
-
-
- SUFFIXES = .sh .pl
-@@ -264,155 +261,98 @@
- amadmin_SOURCES = amadmin.c
- amadmin_OBJECTS = amadmin.$(OBJEXT)
- amadmin_LDADD = $(LDADD)
--amadmin_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \
-- libamserver.$(LIB_EXTENSION) \
-- ../tape-src/libamtape.$(LIB_EXTENSION) \
-- ../common-src/libamanda.$(LIB_EXTENSION)
-+amadmin_DEPENDENCIES = libamserver.$(LIB_EXTENSION)
- amadmin_LDFLAGS =
- amcheck_SOURCES = amcheck.c
- amcheck_OBJECTS = amcheck.$(OBJEXT)
- amcheck_LDADD = $(LDADD)
--amcheck_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \
-- libamserver.$(LIB_EXTENSION) \
-- ../tape-src/libamtape.$(LIB_EXTENSION) \
-- ../common-src/libamanda.$(LIB_EXTENSION)
-+amcheck_DEPENDENCIES = libamserver.$(LIB_EXTENSION)
- amcheck_LDFLAGS =
- amcleanupdisk_SOURCES = amcleanupdisk.c
- amcleanupdisk_OBJECTS = amcleanupdisk.$(OBJEXT)
- amcleanupdisk_LDADD = $(LDADD)
--amcleanupdisk_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \
-- libamserver.$(LIB_EXTENSION) \
-- ../tape-src/libamtape.$(LIB_EXTENSION) \
-- ../common-src/libamanda.$(LIB_EXTENSION)
-+amcleanupdisk_DEPENDENCIES = libamserver.$(LIB_EXTENSION)
- amcleanupdisk_LDFLAGS =
- amflush_SOURCES = amflush.c
- amflush_OBJECTS = amflush.$(OBJEXT)
- amflush_LDADD = $(LDADD)
--amflush_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \
-- libamserver.$(LIB_EXTENSION) \
-- ../tape-src/libamtape.$(LIB_EXTENSION) \
-- ../common-src/libamanda.$(LIB_EXTENSION)
-+amflush_DEPENDENCIES = libamserver.$(LIB_EXTENSION)
- amflush_LDFLAGS =
- am_amgetconf_OBJECTS = getconf.$(OBJEXT)
- amgetconf_OBJECTS = $(am_amgetconf_OBJECTS)
- amgetconf_LDADD = $(LDADD)
--amgetconf_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \
-- libamserver.$(LIB_EXTENSION) \
-- ../tape-src/libamtape.$(LIB_EXTENSION) \
-- ../common-src/libamanda.$(LIB_EXTENSION)
-+amgetconf_DEPENDENCIES = libamserver.$(LIB_EXTENSION)
- amgetconf_LDFLAGS =
- am_amindexd_OBJECTS = amindexd.$(OBJEXT) disk_history.$(OBJEXT) \
- list_dir.$(OBJEXT)
- amindexd_OBJECTS = $(am_amindexd_OBJECTS)
- amindexd_LDADD = $(LDADD)
--amindexd_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \
-- libamserver.$(LIB_EXTENSION) \
-- ../tape-src/libamtape.$(LIB_EXTENSION) \
-- ../common-src/libamanda.$(LIB_EXTENSION)
-+amindexd_DEPENDENCIES = libamserver.$(LIB_EXTENSION)
- amindexd_LDFLAGS =
- amlabel_SOURCES = amlabel.c
- amlabel_OBJECTS = amlabel.$(OBJEXT)
- amlabel_LDADD = $(LDADD)
--amlabel_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \
-- libamserver.$(LIB_EXTENSION) \
-- ../tape-src/libamtape.$(LIB_EXTENSION) \
-- ../common-src/libamanda.$(LIB_EXTENSION)
-+amlabel_DEPENDENCIES = libamserver.$(LIB_EXTENSION)
- amlabel_LDFLAGS =
- amlogroll_SOURCES = amlogroll.c
- amlogroll_OBJECTS = amlogroll.$(OBJEXT)
- amlogroll_LDADD = $(LDADD)
--amlogroll_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \
-- libamserver.$(LIB_EXTENSION) \
-- ../tape-src/libamtape.$(LIB_EXTENSION) \
-- ../common-src/libamanda.$(LIB_EXTENSION)
-+amlogroll_DEPENDENCIES = libamserver.$(LIB_EXTENSION)
- amlogroll_LDFLAGS =
- am_amreport_OBJECTS = reporter.$(OBJEXT)
- amreport_OBJECTS = $(am_amreport_OBJECTS)
- amreport_LDADD = $(LDADD)
--amreport_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \
-- libamserver.$(LIB_EXTENSION) \
-- ../tape-src/libamtape.$(LIB_EXTENSION) \
-- ../common-src/libamanda.$(LIB_EXTENSION)
-+amreport_DEPENDENCIES = libamserver.$(LIB_EXTENSION)
- amreport_LDFLAGS =
- amtape_SOURCES = amtape.c
- amtape_OBJECTS = amtape.$(OBJEXT)
- amtape_LDADD = $(LDADD)
--amtape_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \
-- libamserver.$(LIB_EXTENSION) \
-- ../tape-src/libamtape.$(LIB_EXTENSION) \
-- ../common-src/libamanda.$(LIB_EXTENSION)
-+amtape_DEPENDENCIES = libamserver.$(LIB_EXTENSION)
- amtape_LDFLAGS =
- amtrmidx_SOURCES = amtrmidx.c
- amtrmidx_OBJECTS = amtrmidx.$(OBJEXT)
- amtrmidx_LDADD = $(LDADD)
--amtrmidx_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \
-- libamserver.$(LIB_EXTENSION) \
-- ../tape-src/libamtape.$(LIB_EXTENSION) \
-- ../common-src/libamanda.$(LIB_EXTENSION)
-+amtrmidx_DEPENDENCIES = libamserver.$(LIB_EXTENSION)
- amtrmidx_LDFLAGS =
- amtrmlog_SOURCES = amtrmlog.c
- amtrmlog_OBJECTS = amtrmlog.$(OBJEXT)
- amtrmlog_LDADD = $(LDADD)
--amtrmlog_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \
-- libamserver.$(LIB_EXTENSION) \
-- ../tape-src/libamtape.$(LIB_EXTENSION) \
-- ../common-src/libamanda.$(LIB_EXTENSION)
-+amtrmlog_DEPENDENCIES = libamserver.$(LIB_EXTENSION)
- amtrmlog_LDFLAGS =
- am_conffile_OBJECTS = conffile.test.$(OBJEXT)
- conffile_OBJECTS = $(am_conffile_OBJECTS)
- conffile_LDADD = $(LDADD)
--conffile_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \
-- libamserver.$(LIB_EXTENSION) \
-- ../tape-src/libamtape.$(LIB_EXTENSION) \
-- ../common-src/libamanda.$(LIB_EXTENSION)
-+conffile_DEPENDENCIES = libamserver.$(LIB_EXTENSION)
- conffile_LDFLAGS =
- am_diskfile_OBJECTS = diskfile.test.$(OBJEXT)
- diskfile_OBJECTS = $(am_diskfile_OBJECTS)
- diskfile_LDADD = $(LDADD)
--diskfile_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \
-- libamserver.$(LIB_EXTENSION) \
-- ../tape-src/libamtape.$(LIB_EXTENSION) \
-- ../common-src/libamanda.$(LIB_EXTENSION)
-+diskfile_DEPENDENCIES = libamserver.$(LIB_EXTENSION)
- diskfile_LDFLAGS =
- driver_SOURCES = driver.c
- driver_OBJECTS = driver.$(OBJEXT)
- driver_LDADD = $(LDADD)
--driver_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \
-- libamserver.$(LIB_EXTENSION) \
-- ../tape-src/libamtape.$(LIB_EXTENSION) \
-- ../common-src/libamanda.$(LIB_EXTENSION)
-+driver_DEPENDENCIES = libamserver.$(LIB_EXTENSION)
- driver_LDFLAGS =
- dumper_SOURCES = dumper.c
- dumper_OBJECTS = dumper.$(OBJEXT)
- dumper_LDADD = $(LDADD)
--dumper_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \
-- libamserver.$(LIB_EXTENSION) \
-- ../tape-src/libamtape.$(LIB_EXTENSION) \
-- ../common-src/libamanda.$(LIB_EXTENSION)
-+dumper_DEPENDENCIES = libamserver.$(LIB_EXTENSION)
- dumper_LDFLAGS =
- am_infofile_OBJECTS = infofile.test.$(OBJEXT)
- infofile_OBJECTS = $(am_infofile_OBJECTS)
- infofile_LDADD = $(LDADD)
--infofile_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \
-- libamserver.$(LIB_EXTENSION) \
-- ../tape-src/libamtape.$(LIB_EXTENSION) \
-- ../common-src/libamanda.$(LIB_EXTENSION)
-+infofile_DEPENDENCIES = libamserver.$(LIB_EXTENSION)
- infofile_LDFLAGS =
- planner_SOURCES = planner.c
- planner_OBJECTS = planner.$(OBJEXT)
- planner_LDADD = $(LDADD)
--planner_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \
-- libamserver.$(LIB_EXTENSION) \
-- ../tape-src/libamtape.$(LIB_EXTENSION) \
-- ../common-src/libamanda.$(LIB_EXTENSION)
-+planner_DEPENDENCIES = libamserver.$(LIB_EXTENSION)
- planner_LDFLAGS =
- taper_SOURCES = taper.c
- taper_OBJECTS = taper.$(OBJEXT)
- taper_LDADD = $(LDADD)
--taper_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \
-- libamserver.$(LIB_EXTENSION) \
-- ../tape-src/libamtape.$(LIB_EXTENSION) \
-- ../common-src/libamanda.$(LIB_EXTENSION)
-+taper_DEPENDENCIES = libamserver.$(LIB_EXTENSION)
- taper_LDFLAGS =
- SCRIPTS = $(sbin_SCRIPTS)
-
-@@ -421,7 +361,7 @@
- DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/config
- CPPFLAGS = @CPPFLAGS@
- LDFLAGS = @LDFLAGS@
--LIBS = @LIBS@
-+LIBS = @LIBS@ -lamtape -lamanda
- depcomp = $(SHELL) $(top_srcdir)/config/depcomp
- @AMDEP_TRUE@DEP_FILES = $(DEPDIR)/amadmin.Po $(DEPDIR)/amcheck.Po \
- @AMDEP_TRUE@ $(DEPDIR)/amcleanupdisk.Po $(DEPDIR)/amflush.Po \
diff --git a/sysutils/amanda-dev-server/patches/patch-ae b/sysutils/amanda-dev-server/patches/patch-ae
deleted file mode 100644
index 2cd0d267fea..00000000000
--- a/sysutils/amanda-dev-server/patches/patch-ae
+++ /dev/null
@@ -1,62 +0,0 @@
-$NetBSD: patch-ae,v 1.1.1.1 2002/05/02 13:28:16 bouyer Exp $
-
---- changer-src/Makefile.in.orig Fri Mar 8 20:29:46 2002
-+++ changer-src/Makefile.in Tue Apr 30 14:51:57 2002
-@@ -154,7 +154,7 @@
- @WANT_LIBTOOL_TRUE@LIB_EXTENSION = la
- @WANT_LIBTOOL_FALSE@LIB_EXTENSION = a
-
--@WANT_CHIO_SCSI_TRUE@CHIO_SCSI = chg-scsi-chio
-+#CHIO_SCSI = chg-scsi-chio
-
- @WANT_CHG_SCSI_TRUE@CHG_SCSI = chg-scsi
-
-@@ -172,10 +172,7 @@
- # need to list libamanda twice here, first to override the system library
- # routines, and second to pick up any references in the other libraries.
- ###
--LDADD = ../common-src/libamanda.$(LIB_EXTENSION) \
-- ../server-src/libamserver.$(LIB_EXTENSION) \
-- ../tape-src/libamtape.$(LIB_EXTENSION) \
-- ../common-src/libamanda.$(LIB_EXTENSION)
-+LDADD = ../server-src/libamserver.$(LIB_EXTENSION)
-
-
- SUFFIXES = .pl .sh
-@@ -194,11 +191,11 @@
- CONFIG_CLEAN_FILES = chg-manual.sh chg-multi.sh chg-mtx.sh chg-chs.sh \
- chg-rth.pl chg-chio.pl chg-zd-mtx.sh
- @WANT_CHG_SCSI_FALSE@@WANT_CHIO_SCSI_TRUE@libexec_PROGRAMS = \
--@WANT_CHG_SCSI_FALSE@@WANT_CHIO_SCSI_TRUE@ chg-scsi-chio$(EXEEXT)
-+# chg-scsi-chio$(EXEEXT)
- @WANT_CHG_SCSI_FALSE@@WANT_CHIO_SCSI_FALSE@libexec_PROGRAMS =
- @WANT_CHG_SCSI_TRUE@@WANT_CHIO_SCSI_TRUE@libexec_PROGRAMS = \
- @WANT_CHG_SCSI_TRUE@@WANT_CHIO_SCSI_TRUE@ chg-scsi$(EXEEXT) \
--@WANT_CHG_SCSI_TRUE@@WANT_CHIO_SCSI_TRUE@ chg-scsi-chio$(EXEEXT)
-+# chg-scsi-chio$(EXEEXT)
- @WANT_CHG_SCSI_TRUE@@WANT_CHIO_SCSI_FALSE@libexec_PROGRAMS = \
- @WANT_CHG_SCSI_TRUE@@WANT_CHIO_SCSI_FALSE@ chg-scsi$(EXEEXT)
- PROGRAMS = $(libexec_PROGRAMS)
-@@ -209,19 +206,13 @@
- scsi-bsd.$(OBJEXT) scsi-cam.$(OBJEXT) sense.$(OBJEXT)
- chg_scsi_OBJECTS = $(am_chg_scsi_OBJECTS)
- chg_scsi_LDADD = $(LDADD)
--chg_scsi_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \
-- ../server-src/libamserver.$(LIB_EXTENSION) \
-- ../tape-src/libamtape.$(LIB_EXTENSION) \
-- ../common-src/libamanda.$(LIB_EXTENSION)
--chg_scsi_LDFLAGS =
-+chg_scsi_DEPENDENCIES = ../server-src/libamserver.$(LIB_EXTENSION)
-+chg_scsi_LDFLAGS = -lamanda -lamtape
- am_chg_scsi_chio_OBJECTS = chg-scsi-chio.$(OBJEXT) scsi-hpux.$(OBJEXT) \
- scsi-chio.$(OBJEXT)
- chg_scsi_chio_OBJECTS = $(am_chg_scsi_chio_OBJECTS)
- chg_scsi_chio_LDADD = $(LDADD)
--chg_scsi_chio_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \
-- ../server-src/libamserver.$(LIB_EXTENSION) \
-- ../tape-src/libamtape.$(LIB_EXTENSION) \
-- ../common-src/libamanda.$(LIB_EXTENSION)
-+chg_scsi_chio_DEPENDENCIES = ../server-src/libamserver.$(LIB_EXTENSION)
- chg_scsi_chio_LDFLAGS =
- SCRIPTS = $(libexec_SCRIPTS)
-
diff --git a/sysutils/amanda-dev-server/patches/patch-af b/sysutils/amanda-dev-server/patches/patch-af
deleted file mode 100644
index c37bfd5c37c..00000000000
--- a/sysutils/amanda-dev-server/patches/patch-af
+++ /dev/null
@@ -1,205 +0,0 @@
-$NetBSD: patch-af,v 1.1.1.1 2002/05/02 13:28:16 bouyer Exp $
-
---- changer-src/scsi-chio.c.orig Thu Jun 17 20:33:19 1999
-+++ changer-src/scsi-chio.c Tue Apr 30 14:33:22 2002
-@@ -59,16 +59,26 @@
- */
- int GetCurrentSlot(int fd, int drive)
- {
-- struct changer_element_status ces;
-+#if defined(OCHIOGSTATUS)
-+struct ochanger_element_status_request cesr;
-+#else
-+struct changer_element_status ces;
-+#endif
- int slot;
- int i, rc;
-
- get_changer_info(fd);
-+#if defined(OCHIOGSTATUS)
-+ cesr.cesr_type = CHET_ST;
-+ cesr.cesr_data = malloc(changer_info.cp_nslots);
-
-+ rc = ioctl(fd, CHIOGSTATUS, &cesr);
-+#else
- ces.ces_type = CHET_ST;
- ces.ces_data = malloc(changer_info.cp_nslots);
-
- rc = ioctl(fd, CHIOGSTATUS, &ces);
-+#endif
- if (rc) {
- dbprintf(("%s: changer status query failed: 0x%x %s\n",
- get_pname(), rc,strerror(errno)));
-@@ -76,7 +86,11 @@
- }
- for (slot = 0; slot < changer_info.cp_nslots; slot++)
- {
-+#if defined(OCHIOGSTATUS)
-+ i = cesr.cesr_data[slot] & CESTATUS_FULL;
-+#else
- i = ces.ces_data[slot] & CESTATUS_FULL;
-+#endif
- dbprintf(("\tGetCurrentSlot slot %d = %d\n", slot, i));
- if (!i)
- return(slot);
-@@ -121,25 +135,41 @@
- */
- int isempty(int fd, int slot)
- {
-+#if defined(OCHIOGSTATUS)
-+struct ochanger_element_status_request cesr;
-+#else
- struct changer_element_status ces;
-+#endif
-+
- int i,rc;
- int type=CHET_ST;
-
- get_changer_info(fd);
-
-+#if defined(OCHIOGSTATUS)
-+ cesr.cesr_type = type;
-+ cesr.cesr_data = malloc(changer_info.cp_nslots);
-+ rc = ioctl(fd, OCHIOGSTATUS, &cesr);
-+#else
- ces.ces_type = type;
- ces.ces_data = malloc(changer_info.cp_nslots);
--
- rc = ioctl(fd, CHIOGSTATUS, &ces);
-+#endif
-+
- if (rc) {
- dbprintf(("%s: changer status query failed: 0x%x %s\n",
- get_pname(), rc,strerror(errno)));
- return -1;
- }
-
-+#if defined(OCHIOGSTATUS)
-+ i = cesr.cesr_data[slot] & CESTATUS_FULL;
-+ free(cesr.cesr_data);
-+#else
- i = ces.ces_data[slot] & CESTATUS_FULL;
--
- free(ces.ces_data);
-+#endif
-+
- return !i;
- }
-
-@@ -148,16 +178,27 @@
- */
- int find_empty(int fd, int start, int count)
- {
-+#if defined(OCHIOGSTATUS)
-+struct ochanger_element_status_request cesr;
-+#else
- struct changer_element_status ces;
-+#endif
-+
- int i,rc;
- int type=CHET_ST;
-
- get_changer_info(fd);
-
-+#if defined(OCHIOGSTATUS)
-+ cesr.cesr_type = type;
-+ cesr.cesr_data = malloc(changer_info.cp_nslots);
-+ rc = ioctl(fd, OCHIOGSTATUS, &cesr);
-+#else
- ces.ces_type = type;
- ces.ces_data = malloc(changer_info.cp_nslots);
-+ rc = ioctl(fd, CHIOGSTATUS, &ces);
-+#endif
-
-- rc = ioctl(fd,CHIOGSTATUS,&ces);
- if (rc) {
- dbprintf(("%s: changer status query failed: 0x%x %s\n",
- get_pname(), rc, strerror(errno)));
-@@ -165,9 +206,17 @@
- }
-
- i = 0;
-+
-+#if defined(OCHIOGSTATUS)
-+ while ((i < changer_info.cp_nslots)&&(cesr.cesr_data[i] & CESTATUS_FULL))
-+ i++;
-+ free(cesr.cesr_data);
-+#else
- while ((i < changer_info.cp_nslots)&&(ces.ces_data[i] & CESTATUS_FULL))
- i++;
- free(ces.ces_data);
-+#endif
-+
- return i;
- }
-
-@@ -176,25 +225,41 @@
- */
- int drive_loaded(int fd, int drivenum)
- {
-+#if defined(OCHIOGSTATUS)
-+struct ochanger_element_status_request cesr;
-+#else
- struct changer_element_status ces;
-+#endif
-+
- int i,rc;
- int type=CHET_DT;
-
- get_changer_info(fd);
-
-+#if defined(OCHIOGSTATUS)
-+ cesr.cesr_type = type;
-+ cesr.cesr_data = malloc(changer_info.cp_ndrives);
-+ rc = ioctl(fd, OCHIOGSTATUS, &cesr);
-+#else
- ces.ces_type = type;
- ces.ces_data = malloc(changer_info.cp_ndrives);
--
- rc = ioctl(fd, CHIOGSTATUS, &ces);
-+#endif
-+
- if (rc) {
- dbprintf(("%s: drive status query failed: 0x%x %s\n",
- get_pname(), rc, strerror(errno)));
- return -1;
- }
-
-+#if defined(OCHIOGSTATUS)
-+ i = (cesr.cesr_data[drivenum] & CESTATUS_FULL);
-+ free(cesr.cesr_data);
-+#else
- i = (ces.ces_data[drivenum] & CESTATUS_FULL);
--
- free(ces.ces_data);
-+#endif
-+
- return i;
- }
-
-@@ -204,7 +269,12 @@
- */
- int unload(int fd, int drive, int slot)
- {
-+#if defined(OCHIOGSTATUS)
-+struct changer_move_request move;
-+#else
- struct changer_move move;
-+#endif
-+
- int rc;
-
- dbprintf(("unload : fd = %d, drive = %d, slot =%d\n",fd, drive, slot));
-@@ -230,7 +300,12 @@
- */
- int load(int fd, int drive, int slot)
- {
-+#if defined(OCHIOGSTATUS)
-+struct changer_move_request move;
-+#else
- struct changer_move move;
-+#endif
-+
- int rc;
-
- dbprintf(("load : fd = %d, drive = %d, slot =%d\n",fd, drive, slot));
diff --git a/sysutils/amanda-dev-server/patches/patch-ag b/sysutils/amanda-dev-server/patches/patch-ag
deleted file mode 100644
index b5606d24148..00000000000
--- a/sysutils/amanda-dev-server/patches/patch-ag
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD: patch-ag,v 1.1.1.1 2002/05/02 13:28:16 bouyer Exp $
-
---- example/chg-scsi.conf.old Tue Feb 23 16:44:39 1999
-+++ example/chg-scsi.conf Tue Feb 23 16:46:38 1999
-@@ -2,6 +2,8 @@
- number_configs 2
- eject 1 # Tapedrives need an eject command
- sleep 5 # Seconds to wait until the tape gets ready
-+ # The driver first sleeps for <sleep>/2 seconds,
-+ # then pool the drive every seconds.
- cleanmax 10 # How many times could a cleaning tape get used
- changerdev /dev/sch0
- #
-@@ -13,7 +15,8 @@
- startuse 0 # The slots associated with the drive 0
- enduse 9 #
- statfile /usr/local/etc/amanda/tape5-slot # The file where the actual slot is stored
--cleancart 20 # the slot where the cleaningcartridge for drive 0 is located
-+cleancart -1 # the slot where the cleaningcartridge for drive 0 is
-+ # located. -1 means none.
- cleanfile /usr/local/etc/amanda/tape0-clean # The file where the cleanings are recorded
- usagecount /usr/local/etc/amanda/backup/totaltime
-
diff --git a/sysutils/amanda-dev-server/patches/patch-ah b/sysutils/amanda-dev-server/patches/patch-ah
deleted file mode 100644
index 88fe683240c..00000000000
--- a/sysutils/amanda-dev-server/patches/patch-ah
+++ /dev/null
@@ -1,30 +0,0 @@
-$NetBSD: patch-ah,v 1.1.1.1 2002/05/02 13:28:16 bouyer Exp $
-
---- example/amanda.conf.in.orig Fri Dec 7 20:24:58 2001
-+++ example/amanda.conf.in Tue Apr 30 13:10:50 2002
-@@ -90,8 +90,8 @@
- tpchanger "chg-manual" # the tape-changer glue script
- tapedev "@DEFAULT_TAPE_DEVICE@" # the no-rewind tape device to be used
- rawtapedev "@DEFAULT_RAW_TAPE_DEVICE@" # the raw device to be used (ftape only)
--changerfile "/usr/adm/amanda/@DEFAULT_CONFIG@/changer"
--changerfile "/usr/adm/amanda/@DEFAULT_CONFIG@/changer-status"
-+changerfile "@CONFIG_DIR@/@DEFAULT_CONFIG@/changer"
-+changerfile "@CONFIG_DIR@/@DEFAULT_CONFIG@/changer-status"
- changerfile "@CONFIG_DIR@/@DEFAULT_CONFIG@/changer.conf"
- changerdev "@DEFAULT_CHANGER_DEVICE@"
-
-@@ -182,10 +182,10 @@
- # Note that, although the keyword below is infofile, it is only so for
- # historic reasons, since now it is supposed to be a directory (unless
- # you have selected some database format other than the `text' default)
--infofile "/usr/adm/amanda/@DEFAULT_CONFIG@/curinfo" # database DIRECTORY
--logdir "/usr/adm/amanda/@DEFAULT_CONFIG@" # log directory
--indexdir "/usr/adm/amanda/@DEFAULT_CONFIG@/index" # index directory
--#tapelist "/usr/adm/amanda/@DEFAULT_CONFIG@/tapelist" # list of used tapes
-+infofile "@localstatedir@/@DEFAULT_CONFIG@/curinfo" # database DIRECTORY
-+logdir "@localstatedir@/@DEFAULT_CONFIG@" # log directory
-+indexdir "@localstatedir@/@DEFAULT_CONFIG@/index" # index directory
-+#tapelist "@localstatedir@/@DEFAULT_CONFIG@/tapelist" # list of used tapes
- # tapelist is stored, by default, in the directory that contains amanda.conf
-
-
diff --git a/sysutils/amanda-dev-server/patches/patch-ai b/sysutils/amanda-dev-server/patches/patch-ai
deleted file mode 100644
index 03b7ed6b890..00000000000
--- a/sysutils/amanda-dev-server/patches/patch-ai
+++ /dev/null
@@ -1,34 +0,0 @@
-$NetBSD: patch-ai,v 1.1.1.1 2002/05/02 13:28:16 bouyer Exp $
-
---- restore-src/Makefile.in.orig Fri Mar 8 20:29:48 2002
-+++ restore-src/Makefile.in Tue Apr 30 13:12:24 2002
-@@ -165,9 +165,7 @@
- # need to list libamanda twice here, first to override the system library
- # routines, and second to pick up any references in the other libraries.
- ###
--LDADD = ../common-src/libamanda.$(LIB_EXTENSION) \
-- ../tape-src/libamtape.$(LIB_EXTENSION) \
-- ../common-src/libamanda.$(LIB_EXTENSION)
-+LDADD = -lamtape -lamanda
-
-
- amidxtaped_SOURCES = amidxtaped.c
-@@ -182,16 +180,12 @@
- am_amidxtaped_OBJECTS = amidxtaped.$(OBJEXT)
- amidxtaped_OBJECTS = $(am_amidxtaped_OBJECTS)
- amidxtaped_LDADD = $(LDADD)
--amidxtaped_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \
-- ../tape-src/libamtape.$(LIB_EXTENSION) \
-- ../common-src/libamanda.$(LIB_EXTENSION)
-+amidxtaped_DEPENDENCIES =
- amidxtaped_LDFLAGS =
- amrestore_SOURCES = amrestore.c
- amrestore_OBJECTS = amrestore.$(OBJEXT)
- amrestore_LDADD = $(LDADD)
--amrestore_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \
-- ../tape-src/libamtape.$(LIB_EXTENSION) \
-- ../common-src/libamanda.$(LIB_EXTENSION)
-+amrestore_DEPENDENCIES =
- amrestore_LDFLAGS =
-
- DEFS = @DEFS@
diff --git a/sysutils/amanda-dev-server/patches/patch-aj b/sysutils/amanda-dev-server/patches/patch-aj
deleted file mode 100644
index 2be1e2781db..00000000000
--- a/sysutils/amanda-dev-server/patches/patch-aj
+++ /dev/null
@@ -1,30 +0,0 @@
-$NetBSD: patch-aj,v 1.1.1.1 2002/05/02 13:28:16 bouyer Exp $
-
---- example/Makefile.in.orig Fri Mar 8 20:29:55 2002
-+++ example/Makefile.in Tue Apr 30 13:14:30 2002
-@@ -35,7 +35,7 @@
- mandir = @mandir@
- includedir = @includedir@
- oldincludedir = /usr/include
--pkgdatadir = $(datadir)/@PACKAGE@
-+pkgdatadir = $(datadir)/examples/@PACKAGE@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
- top_builddir = ..
-@@ -265,7 +265,15 @@
-
- info-am:
-
--install-data-am:
-+install-data-am: $(noinst_DATA) $(EXTRA_DIST)
-+ @$(NORMAL_INSTALL)
-+ $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)
-+ @list='$(noinst_DATA) $(EXTRA_DIST)'; for p in $$list; do \
-+ if test -f "$$p"; then d= ; else d="$(srcdir)/"; fi; \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
-+ echo " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(pkgdatadir)/$$f"; \
-+ $(INSTALL_DATA) $$d$$p $(DESTDIR)$(pkgdatadir)/$$f; \
-+ done
-
- install-exec-am:
-
diff --git a/sysutils/amanda-dev-server/patches/patch-ak b/sysutils/amanda-dev-server/patches/patch-ak
deleted file mode 100644
index a415d66d622..00000000000
--- a/sysutils/amanda-dev-server/patches/patch-ak
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ak,v 1.1.1.1 2002/05/02 13:28:16 bouyer Exp $
-
---- docs/Makefile.in.orig Fri Mar 8 20:29:54 2002
-+++ docs/Makefile.in Tue Apr 30 13:15:40 2002
-@@ -33,7 +33,7 @@
- mandir = @mandir@
- includedir = @includedir@
- oldincludedir = /usr/include
--pkgdatadir = $(datadir)/@PACKAGE@
-+pkgdatadir = $(datadir)/doc/@PACKAGE@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
- top_builddir = ..
diff --git a/sysutils/amanda-dev-server/patches/patch-al b/sysutils/amanda-dev-server/patches/patch-al
deleted file mode 100644
index 92d3368bedf..00000000000
--- a/sysutils/amanda-dev-server/patches/patch-al
+++ /dev/null
@@ -1,35 +0,0 @@
-$NetBSD: patch-al,v 1.1.1.1 2002/05/02 13:28:16 bouyer Exp $
-
---- man/Makefile.in.orig Fri Mar 8 20:29:52 2002
-+++ man/Makefile.in Tue Apr 30 15:19:08 2002
-@@ -150,20 +150,18 @@
-
- transform = s,x,x,;
-
--@WANT_AMPLOT_TRUE@AMPLOT_MAN_PAGES = amplot.8
-+#AMPLOT_MAN_PAGES = amplot.8
-
--COMMON_MAN_PAGES = amanda.8
-+COMMON_MAN_PAGES = amanda.8 amdd.8 ammt.8
-
- @WANT_SERVER_TRUE@SERVER_MAN_PAGES = amadmin.8 \
- @WANT_SERVER_TRUE@ amcheck.8 \
- @WANT_SERVER_TRUE@ amcheckdb.8 \
- @WANT_SERVER_TRUE@ amcleanup.8 \
--@WANT_SERVER_TRUE@ amdd.8 \
- @WANT_SERVER_TRUE@ amdump.8 \
- @WANT_SERVER_TRUE@ amflush.8 \
- @WANT_SERVER_TRUE@ amgetconf.8 \
- @WANT_SERVER_TRUE@ amlabel.8 \
--@WANT_SERVER_TRUE@ ammt.8 \
- @WANT_SERVER_TRUE@ amoverview.8 \
- @WANT_SERVER_TRUE@ amreport.8 \
- @WANT_SERVER_TRUE@ amrmtape.8 \
-@@ -181,7 +179,6 @@
- EXTRA_DIST = amplot.8 amrestore.8 amtape.8 amdd.8 ammt.8
-
- man_MANS = $(AMPLOT_MAN_PAGES) \
-- $(COMMON_MAN_PAGES) \
- $(SERVER_MAN_PAGES) \
- $(RECOVER_MAN_PAGES) \
- $(RESTORE_MAN_PAGES)
diff --git a/sysutils/amanda-dev-server/patches/patch-am b/sysutils/amanda-dev-server/patches/patch-am
deleted file mode 100644
index ea8b64ebe01..00000000000
--- a/sysutils/amanda-dev-server/patches/patch-am
+++ /dev/null
@@ -1,40 +0,0 @@
-$NetBSD: patch-am,v 1.1.1.1 2002/05/02 13:28:16 bouyer Exp $
-
---- common-src/Makefile.in.orig Tue Apr 30 14:04:39 2002
-+++ common-src/Makefile.in Tue Apr 30 13:55:56 2002
-@@ -563,24 +563,19 @@
- done
- check-am: all-am
- check: check-am
--all-am: Makefile $(LIBRARIES) $(LTLIBRARIES) $(HEADERS)
-+all-am: Makefile genversion.h
-
- installdirs:
-- $(mkinstalldirs) $(DESTDIR)$(libdir)
-
- install: install-am
- install-exec: install-exec-am
- install-data: install-data-am
- uninstall: uninstall-am
-
--install-am: all-am
-- @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-+install-am:
-
- installcheck: installcheck-am
- install-strip:
-- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-- `test -z '$(STRIP)' || \
-- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
- mostlyclean-generic:
-
- clean-generic:
-@@ -613,7 +608,7 @@
-
- install-data-am:
-
--install-exec-am: install-libLTLIBRARIES
-+install-exec-am:
-
- install-info: install-info-am
-
diff --git a/sysutils/amanda-dev-server/patches/patch-ba b/sysutils/amanda-dev-server/patches/patch-ba
deleted file mode 100644
index 9021fb279a4..00000000000
--- a/sysutils/amanda-dev-server/patches/patch-ba
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ba,v 1.1.1.1 2002/05/02 13:28:16 bouyer Exp $
-
---- common-src/token.h.orig Sun Feb 10 13:49:54 2002
-+++ common-src/token.h Tue Apr 30 13:35:22 2002
-@@ -43,7 +43,7 @@
- __attribute__ ((format (printf, 2, 3)));
- extern char *quote P((char *sep, char *str));
- extern char *rxquote P((char *str));
--extern char *shquote P((char *str));
-+extern char *am_shquote P((char *str));
- extern int table_lookup P((table_t *table, char *str));
- extern char *table_lookup_r P((table_t *table, int val));
-
diff --git a/sysutils/amanda-dev-server/patches/patch-bb b/sysutils/amanda-dev-server/patches/patch-bb
deleted file mode 100644
index 24365f1e9b4..00000000000
--- a/sysutils/amanda-dev-server/patches/patch-bb
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-bb,v 1.1.1.1 2002/05/02 13:28:16 bouyer Exp $
-
---- common-src/token.c.orig Thu Mar 15 20:30:23 2001
-+++ common-src/token.c Thu Mar 15 20:30:56 2001
-@@ -295,7 +295,7 @@
- }
-
- /* Quote a string so that it can be safely passed to a shell */
--char *shquote(str)
-+char *am_shquote(str)
- char *str; /* the string to quote */
- {
- char *pi, *po;
diff --git a/sysutils/amanda-dev-server/patches/patch-bc b/sysutils/amanda-dev-server/patches/patch-bc
deleted file mode 100644
index 765c259e563..00000000000
--- a/sysutils/amanda-dev-server/patches/patch-bc
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-bc,v 1.1.1.1 2002/05/02 13:28:16 bouyer Exp $
-
---- server-src/taper.c.orig Tue Apr 30 13:44:04 2002
-+++ server-src/taper.c Tue Apr 30 13:44:49 2002
-@@ -1484,7 +1484,7 @@
- void detach_buffers(bufp)
- char *bufp;
- {
-- if(munmap((void *)bufp, saved_size)*conf_tapebufs) == -1) {
-+ if(munmap((void *)bufp, saved_size) == -1) {
- error("detach_buffers: munmap: %s", strerror(errno));
- }
-
diff --git a/sysutils/amanda-dev-server/patches/patch-bd b/sysutils/amanda-dev-server/patches/patch-bd
deleted file mode 100644
index f111c51d80e..00000000000
--- a/sysutils/amanda-dev-server/patches/patch-bd
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-bd,v 1.1.1.1 2002/05/02 13:28:16 bouyer Exp $
-
---- changer-src/chg-scsi-chio.c.orig Tue Apr 30 14:14:29 2002
-+++ changer-src/chg-scsi-chio.c Tue Apr 30 14:14:35 2002
-@@ -639,7 +639,7 @@
-
- if(read_conffile(CONFFILE_NAME)) {
- fprintf(stderr, "%s: could not find config file \"%s\"",
-- changer_dev, conffile);
-+ changer_dev, CONFFILE_NAME);
- exit(1);
- }
-
diff --git a/sysutils/amanda-dev-server/patches/patch-be b/sysutils/amanda-dev-server/patches/patch-be
deleted file mode 100644
index dc97745a857..00000000000
--- a/sysutils/amanda-dev-server/patches/patch-be
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-be,v 1.1.1.1 2002/05/02 13:28:16 bouyer Exp $
-
---- changer-src/scsi-bsd.c.orig Tue Apr 30 19:16:44 2002
-+++ changer-src/scsi-bsd.c Sun Sep 16 20:10:26 2001
-@@ -198,7 +198,7 @@
- {
- SCSI_OpenDevice(DeviceFD);
- }
-- Result = ioctl(DeviceFD, SCIOCCOMMAND, &ds);
-+ Result = ioctl(pDev[DeviceFD].fd, SCIOCCOMMAND, &ds);
- SCSI_CloseDevice(DeviceFD);
-
- memcpy(pRequestSense, ds.sense, RequestSenseLength);
diff --git a/sysutils/amanda-dev-server/patches/patch-bf b/sysutils/amanda-dev-server/patches/patch-bf
deleted file mode 100644
index ae22dda2741..00000000000
--- a/sysutils/amanda-dev-server/patches/patch-bf
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-bf,v 1.3 2002/06/04 15:44:06 bouyer Exp $
-
---- changer-src/scsi-changer-driver.c.orig Sun Feb 10 13:49:51 2002
-+++ changer-src/scsi-changer-driver.c Mon Jun 3 22:31:54 2002
-@@ -1318,13 +1318,14 @@
- {
- int ret = 0;
- extern OpenFiles_T *pDev;
-+ extern changer_t chg; /* Needed for the infos about havebarcode */
-
- DebugPrint(DEBUG_INFO, SECTION_BARCODE,"##### START BarCode\n");
- DebugPrint(DEBUG_INFO, SECTION_BARCODE,"%-20s : fd %d\n", "BarCode", fd);
-
- DebugPrint(DEBUG_INFO, SECTION_BARCODE,"Ident = [%s], function = [%s]\n", pDev[fd].ident,
- pDev[fd].functions->ident);
-- ret = pDev[fd].functions->function_barcode(fd);
-+ ret = (pDev[fd].functions->function_barcode(fd) | chg.havebarcode);
- DebugPrint(DEBUG_INFO, SECTION_BARCODE,"##### STOP BarCode (%d)\n",ret);
- return(ret);
- }
diff --git a/sysutils/amanda-dev/DESCR b/sysutils/amanda-dev/DESCR
deleted file mode 100644
index 7942c84f1af..00000000000
--- a/sysutils/amanda-dev/DESCR
+++ /dev/null
@@ -1,9 +0,0 @@
-Amanda is a backup system designed to archive many computers on a network to a
-single large-capacity tape drive. This is a package of a developement
-snapshot of the 2.4.3 branch.
-
-This package does not contain anything by itself -- it is a
-"meta-package" that depends on the amanda-client, amanda-server,
-and amanda-plot packages. Its purpose is to require dependencies
-so users can install this package only and have the complete
-Amanda software pulled in by the port/package dependency mechanism.
diff --git a/sysutils/amanda-dev/Makefile b/sysutils/amanda-dev/Makefile
deleted file mode 100644
index d7f56528c3f..00000000000
--- a/sysutils/amanda-dev/Makefile
+++ /dev/null
@@ -1,23 +0,0 @@
-# $NetBSD: Makefile,v 1.3 2003/06/04 18:21:49 jschauma Exp $
-#
-
-MASTER_SITES= # empty
-DISTFILES= # empty
-
-COMMENT= The "meta-package" for Amanda, a network backup system
-
-DEPENDS+= amanda-client-${VERS}:../../sysutils/amanda-dev-client
-DEPENDS+= amanda-server-${VERS}:../../sysutils/amanda-dev-server
-DEPENDS+= amanda-plot-${VERS}:../../sysutils/amanda-dev-plot
-
-.include "../../mk/bsd.prefs.mk"
-.include "../../sysutils/amanda-dev-common/Makefile.common"
-
-EXTRACT_ONLY= # empty
-NO_CHECKSUM= yes
-NO_CONFIGURE= yes
-NO_BUILD= yes
-
-do-install: # empty
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/amanda-dev/PLIST b/sysutils/amanda-dev/PLIST
deleted file mode 100644
index 7985ae05cea..00000000000
--- a/sysutils/amanda-dev/PLIST
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2002/05/02 13:28:15 bouyer Exp $
-@comment this plist intentionally left empty
diff --git a/sysutils/amanda-plot/DESCR b/sysutils/amanda-plot/DESCR
deleted file mode 100644
index 97d0d402e6b..00000000000
--- a/sysutils/amanda-plot/DESCR
+++ /dev/null
@@ -1,181 +0,0 @@
-Amanda, The Advanced Maryland Automatic Network Disk Archiver
-Copyright (c) 1991-1998 University of Maryland at College Park
-All Rights Reserved.
-
-See the files COPYRIGHT, COPYRIGHT-REGEX and COPYRIGHT-APACHE for
-distribution conditions and official warranty disclaimer.
-
-PLEASE NOTE: THIS SOFTWARE IS BEING MADE AVAILABLE ``AS-IS''. UMD is making
-this work available so that other people can use it. This software is in
-production use at our home site - the UMCP Department of Computer Science -
-but we make no warranties that it will work for you. Amanda development is
-unfunded - the development team maintains the code in their spare time. As a
-result, there is no support available other than users helping each other on
-the Amanda mailing lists. See below for information on the mailing lists.
-
-
-WHAT IS AMANDA?
----------------
-
-This is a release of Amanda, the Advanced Maryland Automatic
-Network Disk Archiver. Amanda is a backup system designed to archive many
-computers on a network to a single large-capacity tape drive.
-
-Here are some features of Amanda:
-
- * written in C, freely distributable.
- * built on top of standard backup software: Unix dump/restore, GNU Tar
- and others.
- * will back up multiple machines in parallel to a holding disk, blasting
- finished dumps one by one to tape as fast as we can write files to
- tape. For example, a ~2 Gb 8mm tape on a ~240K/s interface to a host
- with a large holding disk can be filled by Amanda in under 4 hours.
- * does simple tape management: will not overwrite the wrong tape.
- * supports tape changers via a generic interface. Easily customizable to
- any type of tape carousel, robot, or stacker that can be controlled via
- the unix command line.
- * supports Kerberos 4 security, including encrypted dumps. The Kerberos
- support is available as a separate add-on package, see the file
- KERBEROS.HOW-TO-GET on the ftp site, and the file docs/KERBEROS in this
- package, for more details.
- * for a restore, tells you what tapes you need, and finds the proper
- backup image on the tape for you.
- * recovers gracefully from errors, including down or hung machines.
- * reports results, including all errors in detail, in email.
- * will dynamically adjust backup schedule to keep within constraints: no
- more juggling by hand when adding disks and computers to network.
- * includes a pre-run checker program, that conducts sanity checks on both
- the tape server host and all the client hosts (in parallel), and will
- send an e-mail report of any problems that could cause the backups to
- fail.
- * can compress dumps before sending or after sending over the net, with
- either compress or gzip.
- * can optionally synchronize with external backups, for those large
- timesharing computers where you want to do full dumps when the system
- is down in single-user mode (since BSD dump is not reliable on active
- filesystems): Amanda will still do your daily dumps.
- * lots of other options; Amanda is very configurable.
-
-
-WHAT ARE THE SYSTEM REQUIREMENTS FOR AMANDA?
---------------------------------------------
-
-Amanda requires a host that is mostly idle during the time backups are
-done, with a large capacity tape drive (e.g. an EXABYTE, DAT or DLT tape).
-This becomes the "tape server host". All the computers you are going to dump
-are the "backup client hosts". The server host can also be a client host.
-
-Amanda works best with one or more large "holding disk" partitions on the
-server host available to it for buffering dumps before writing to tape.
-The holding disk allows Amanda to run backups in parallel to the disk, only
-writing them to tape when the backup is finished. Note that the holding
-disk is not required: without it Amanda will run backups sequentially to
-the tape drive. Running it this way kills the great performance, but still
-allows you to take advantage of Amanda's other features.
-
-As a rule of thumb, for best performance the holding disk should be larger
-than the dump output from your largest disk partitions. For example, if
-you are backing up some full gigabyte disks that compress down to 500 MB,
-then you'll want 500 MB on your holding disk. On the other hand, if those
-gigabyte drives are partitioned into 500 MB filesystems, they'll probably
-compress down to 250 MB and you'll only need that much on your holding
-disk. Amanda will perform better with larger holding disks.
-
-Actually, Amanda will still work if you have full dumps that are larger
-than the holding disk: Amanda will send those dumps directly to tape one at
-a time. If you have many such dumps you will be limited by the dump speed
-of those machines.
-
-Amanda does not yet support single backup images larger than a tape.
-
-
-WHAT SYSTEMS DOES AMANDA RUN ON?
---------------------------------
-
-Amanda should run on any modern Unix system that supports dump or GNU
-tar, has sockets and inetd, and either system V shared memory, or BSD
-mmap implemented.
-
-In particular, Amanda 2.4.1p1 has been compiled, and the client side tested
-on the following systems:
- AIX 3.2 and 4.1
- BSDI BSD/OS 2.1 and 3.1
- DEC OSF/1 3.2 and 4.0
- FreeBSD 2.2.5
- IRIX 5.2 and 6.3
- GNU/Linux on x86, alpha, sparc, arm and powerpc
- NetBSD 1.0
- Nextstep 3 (*)
- OpenBSD 2.5 x86, sparc, etc (ports available)
- SunOS 4.1.x (x >= 1) and 5.[567]
- Ultrix 4.2
- HP-UX 9.x and 10.x (x >= 01)
-
-The Amanda 2.4.1p1 server side is known to run on all of the other
-machines except on those marked with an asterisk.
-
-If you know of any system that is not listed here on which amanda
-builds successfully, either client&server or client-only, please
-report to amanda-hackers@amanda.org.
-
-
-WHERE DO I GET AMANDA?
-----------------------
-
-There are several versions of Amanda. The latest version at the time
-of this writing is available at:
-
- ftp://ftp.amanda.org/pub/amanda
-
-
-HOW DO I GET AMANDA UP AND RUNNING?
------------------------------------
-
-Read the file docs/INSTALL. There are a variety of steps, from compiling
-Amanda to installing it on the tape server host and the client machines.
- docs/INSTALL contains general installation instructions.
- docs/SYSTEM.NOTES contains system-specific information.
- docs/FAQ contains answers to frequently asked questions.
- docs/KERBEROS explains installation under Kerberos 4.
- docs/TAPE.CHANGERS explains how to customize the changer interface.
- docs/WHATS.NEW details new features.
-
-
-WHO DO I TALK TO IF I HAVE A PROBLEM?
--------------------------------------
-
-Amanda is completely unsupported and made available as-is. However,
-you may be able to get useful information in the Amanda mailing lists:
-
-==> To join a mailing list, DO NOT, EVER, send mail to that list. Send
- mail to <listname>-request@amanda.org, or amanda-lists@amanda.org,
- with the following line in the body of the message:
- subscribe <listname> <your-email-address>
-
-
- amanda-announce
- The amanda-announce mailing list is for important announcements
- related to the Amanda Network Backup Manager package, including new
- versions, contributions, and fixes. NOTE: the amanda-users list is
- itself on the amanda-announce distribution, so you only need to
- subscribe to one of the two lists, not both.
- To subscribe, send a message to amanda-announce-request@amanda.org.
-
- amanda-users
- The amanda-users mailing list is for questions and general discussion
- about the Amanda Network Backup Manager. This package and related
- files are available via anonymous FTP from ftp.amanda.org in the
- pub/amanda directory. NOTE: the amanda-users list is itself on the
- amanda-announce distribution, so you only need to subscribe to one of
- the two lists, not both.
- To subscribe, send a message to amanda-users-request@amanda.org.
-
- amanda-hackers
- The amanda-hackers mailing list is for discussion of the
- technical details of the Amanda package, including extensions,
- ports, bugs, fixes, and alpha testing of new versions.
- To subscribe, send a message to amanda-hackers-request@amanda.org.
-
-
-Share and Enjoy,
-The Amanda Development Team
diff --git a/sysutils/amanda-plot/Makefile b/sysutils/amanda-plot/Makefile
deleted file mode 100644
index 8b6ecaaa14d..00000000000
--- a/sysutils/amanda-plot/Makefile
+++ /dev/null
@@ -1,27 +0,0 @@
-# $NetBSD: Makefile,v 1.12 2003/06/02 01:16:57 jschauma Exp $
-#
-
-DISTNAME= amanda-2.4.2p2
-PKGNAME= amanda-plot-2.4.2p2
-SVR4_PKGNAME= amapl
-CATEGORIES= sysutils
-MASTER_SITES= ftp://ftp.cs.umd.edu/pub/amanda/
-
-MAINTAINER= tech-pkg@netbsd.org
-HOMEPAGE= http://www.amanda.org/
-COMMENT= Visualizes the behavior of Amanda, a network backup system
-
-DEPENDS+= gnuplot>=3.7:../../graphics/gnuplot
-DEPENDS+= amanda-server-2.4.2p2:../../sysutils/amanda-server
-
-USE_BUILDLINK2= yes
-
-.include "../../mk/bsd.prefs.mk"
-.include "../../sysutils/amanda-common/Makefile.common"
-
-CONFIGURE_ARGS+= --without-client
-CONFIGURE_ARGS+= --without-restore
-CONFIGURE_ARGS+= --without-amrecover
-CONFIGURE_ENV+= GNUPLOT="${LOCALBASE}/bin/gnuplot"
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/amanda-plot/PLIST b/sysutils/amanda-plot/PLIST
deleted file mode 100644
index 0d33d2b4d1e..00000000000
--- a/sysutils/amanda-plot/PLIST
+++ /dev/null
@@ -1,7 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 22:52:49 zuntum Exp $
-libexec/amcat.awk
-libexec/amplot.awk
-libexec/amplot.g
-libexec/amplot.gp
-man/man8/amplot.8
-sbin/amplot
diff --git a/sysutils/amanda-plot/distinfo b/sysutils/amanda-plot/distinfo
deleted file mode 100644
index 9462569f444..00000000000
--- a/sysutils/amanda-plot/distinfo
+++ /dev/null
@@ -1,7 +0,0 @@
-$NetBSD: distinfo,v 1.3 2001/06/26 03:15:17 christos Exp $
-
-SHA1 (amanda-2.4.2p2.tar.gz) = 721060b1357e9b939d06773f91a20de1d507521b
-Size (amanda-2.4.2p2.tar.gz) = 922404 bytes
-SHA1 (patch-aa) = 12ff93eea6d9f443ce2f236492d9e0362fd2d9ff
-SHA1 (patch-ab) = ff753e70a41d53ce296001a346fd7093312f31b4
-SHA1 (patch-ac) = 74dadd333fefc4d244d50b52b4a16c6b0df1fbba
diff --git a/sysutils/amanda-plot/patches/patch-aa b/sysutils/amanda-plot/patches/patch-aa
deleted file mode 100644
index e3e11acd54e..00000000000
--- a/sysutils/amanda-plot/patches/patch-aa
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2001/01/16 21:59:33 cjones Exp $
-
---- configure~ Sat Nov 25 06:59:40 2000
-+++ configure Mon Jan 15 16:27:32 2001
-@@ -4924,8 +4924,10 @@
- # This can be used to rebuild libtool when needed
- LIBTOOL_DEPS="$ac_aux_dir/ltconfig $ac_aux_dir/ltmain.sh"
-
-+if false ; then
- # Always use our own libtool.
- LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-+fi
-
- # Redirect the config.log output again, so that the ltconfig log is not
- # clobbered by the next message.
diff --git a/sysutils/amanda-plot/patches/patch-ab b/sysutils/amanda-plot/patches/patch-ab
deleted file mode 100644
index 43e71f2943e..00000000000
--- a/sysutils/amanda-plot/patches/patch-ab
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-ab,v 1.3 2001/06/26 03:14:12 christos Exp $
-
---- Makefile.in.orig Tue Apr 3 15:55:47 2001
-+++ Makefile.in Mon Jun 25 23:00:36 2001
-@@ -157,10 +157,10 @@
- @WANT_RECOVER_TRUE@RECOVER_SUBDIRS = recover-src
- @WANT_AMPLOT_TRUE@PLOT_SUBDIRS = amplot
- # order is significant, don't change it arbitrarily
--SUBDIRS = config common-src $(CLIENT_SUBDIRS) $(TAPE_SUBDIRS) $(SERVER_SUBDIRS) $(RESTORE_SUBDIRS) $(RECOVER_SUBDIRS) $(PLOT_SUBDIRS) man docs example
-+SUBDIRS = config $(CLIENT_SUBDIRS) $(RESTORE_SUBDIRS) $(RECOVER_SUBDIRS) $(PLOT_SUBDIRS) man
-
-
--pkgdata_DATA = COPYRIGHT COPYRIGHT-APACHE COPYRIGHT-REGEX
-+pkgdata_DATA =
-
-
- EXTRA_DIST = $(SNAPSHOT_STAMP) $(pkgdata_DATA) contrib/README contrib/dbbackup.README contrib/dbbackup.ksh contrib/dbbackup.sql contrib/dbbackup.tcl contrib/set_prod_link.pl contrib/sst/Makefile contrib/sst/README contrib/sst/README.Amanda contrib/sst/sst.c contrib/sst/sst.conf contrib/sst/sst_def.h contrib/sst/sstest.c patches/regex-3.6alpha.patch patches/samba-largefs.patch patches/tar-1.12.patch regex-src/COPYRIGHT regex-src/Makefile regex-src/README regex-src/WHATSNEW regex-src/cclass.h regex-src/cname.h regex-src/debug.c regex-src/engine.c regex-src/main.c regex-src/mkh regex-src/regcomp.c regex-src/regerror.c regex-src/regex.3 regex-src/regex.7 regex-src/regex2.h regex-src/regexec.c regex-src/regfree.c regex-src/split.c regex-src/tests regex-src/utils.h regex-src/fake/limits.h regex-src/fake/memmove.c regex-src/fake/stdlib.h
diff --git a/sysutils/amanda-plot/patches/patch-ac b/sysutils/amanda-plot/patches/patch-ac
deleted file mode 100644
index 540b209692e..00000000000
--- a/sysutils/amanda-plot/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.3 2001/06/26 03:14:12 christos Exp $
-
---- man/Makefile.in.orig Tue Apr 3 15:55:45 2001
-+++ man/Makefile.in Mon Jun 25 23:02:22 2001
-@@ -159,7 +159,7 @@
- # not autoconf-generated:
- EXTRA_DIST = amplot.8 amrestore.8 amtape.8
-
--man_MANS = $(AMPLOT_MAN_PAGES) $(COMMON_MAN_PAGES) $(SERVER_MAN_PAGES) $(RECOVER_MAN_PAGES) $(RESTORE_MAN_PAGES)
-+man_MANS = $(AMPLOT_MAN_PAGES)
-
- mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
- CONFIG_HEADER = ../config/config.h
diff --git a/sysutils/amanda-server/DESCR b/sysutils/amanda-server/DESCR
deleted file mode 100644
index 97d0d402e6b..00000000000
--- a/sysutils/amanda-server/DESCR
+++ /dev/null
@@ -1,181 +0,0 @@
-Amanda, The Advanced Maryland Automatic Network Disk Archiver
-Copyright (c) 1991-1998 University of Maryland at College Park
-All Rights Reserved.
-
-See the files COPYRIGHT, COPYRIGHT-REGEX and COPYRIGHT-APACHE for
-distribution conditions and official warranty disclaimer.
-
-PLEASE NOTE: THIS SOFTWARE IS BEING MADE AVAILABLE ``AS-IS''. UMD is making
-this work available so that other people can use it. This software is in
-production use at our home site - the UMCP Department of Computer Science -
-but we make no warranties that it will work for you. Amanda development is
-unfunded - the development team maintains the code in their spare time. As a
-result, there is no support available other than users helping each other on
-the Amanda mailing lists. See below for information on the mailing lists.
-
-
-WHAT IS AMANDA?
----------------
-
-This is a release of Amanda, the Advanced Maryland Automatic
-Network Disk Archiver. Amanda is a backup system designed to archive many
-computers on a network to a single large-capacity tape drive.
-
-Here are some features of Amanda:
-
- * written in C, freely distributable.
- * built on top of standard backup software: Unix dump/restore, GNU Tar
- and others.
- * will back up multiple machines in parallel to a holding disk, blasting
- finished dumps one by one to tape as fast as we can write files to
- tape. For example, a ~2 Gb 8mm tape on a ~240K/s interface to a host
- with a large holding disk can be filled by Amanda in under 4 hours.
- * does simple tape management: will not overwrite the wrong tape.
- * supports tape changers via a generic interface. Easily customizable to
- any type of tape carousel, robot, or stacker that can be controlled via
- the unix command line.
- * supports Kerberos 4 security, including encrypted dumps. The Kerberos
- support is available as a separate add-on package, see the file
- KERBEROS.HOW-TO-GET on the ftp site, and the file docs/KERBEROS in this
- package, for more details.
- * for a restore, tells you what tapes you need, and finds the proper
- backup image on the tape for you.
- * recovers gracefully from errors, including down or hung machines.
- * reports results, including all errors in detail, in email.
- * will dynamically adjust backup schedule to keep within constraints: no
- more juggling by hand when adding disks and computers to network.
- * includes a pre-run checker program, that conducts sanity checks on both
- the tape server host and all the client hosts (in parallel), and will
- send an e-mail report of any problems that could cause the backups to
- fail.
- * can compress dumps before sending or after sending over the net, with
- either compress or gzip.
- * can optionally synchronize with external backups, for those large
- timesharing computers where you want to do full dumps when the system
- is down in single-user mode (since BSD dump is not reliable on active
- filesystems): Amanda will still do your daily dumps.
- * lots of other options; Amanda is very configurable.
-
-
-WHAT ARE THE SYSTEM REQUIREMENTS FOR AMANDA?
---------------------------------------------
-
-Amanda requires a host that is mostly idle during the time backups are
-done, with a large capacity tape drive (e.g. an EXABYTE, DAT or DLT tape).
-This becomes the "tape server host". All the computers you are going to dump
-are the "backup client hosts". The server host can also be a client host.
-
-Amanda works best with one or more large "holding disk" partitions on the
-server host available to it for buffering dumps before writing to tape.
-The holding disk allows Amanda to run backups in parallel to the disk, only
-writing them to tape when the backup is finished. Note that the holding
-disk is not required: without it Amanda will run backups sequentially to
-the tape drive. Running it this way kills the great performance, but still
-allows you to take advantage of Amanda's other features.
-
-As a rule of thumb, for best performance the holding disk should be larger
-than the dump output from your largest disk partitions. For example, if
-you are backing up some full gigabyte disks that compress down to 500 MB,
-then you'll want 500 MB on your holding disk. On the other hand, if those
-gigabyte drives are partitioned into 500 MB filesystems, they'll probably
-compress down to 250 MB and you'll only need that much on your holding
-disk. Amanda will perform better with larger holding disks.
-
-Actually, Amanda will still work if you have full dumps that are larger
-than the holding disk: Amanda will send those dumps directly to tape one at
-a time. If you have many such dumps you will be limited by the dump speed
-of those machines.
-
-Amanda does not yet support single backup images larger than a tape.
-
-
-WHAT SYSTEMS DOES AMANDA RUN ON?
---------------------------------
-
-Amanda should run on any modern Unix system that supports dump or GNU
-tar, has sockets and inetd, and either system V shared memory, or BSD
-mmap implemented.
-
-In particular, Amanda 2.4.1p1 has been compiled, and the client side tested
-on the following systems:
- AIX 3.2 and 4.1
- BSDI BSD/OS 2.1 and 3.1
- DEC OSF/1 3.2 and 4.0
- FreeBSD 2.2.5
- IRIX 5.2 and 6.3
- GNU/Linux on x86, alpha, sparc, arm and powerpc
- NetBSD 1.0
- Nextstep 3 (*)
- OpenBSD 2.5 x86, sparc, etc (ports available)
- SunOS 4.1.x (x >= 1) and 5.[567]
- Ultrix 4.2
- HP-UX 9.x and 10.x (x >= 01)
-
-The Amanda 2.4.1p1 server side is known to run on all of the other
-machines except on those marked with an asterisk.
-
-If you know of any system that is not listed here on which amanda
-builds successfully, either client&server or client-only, please
-report to amanda-hackers@amanda.org.
-
-
-WHERE DO I GET AMANDA?
-----------------------
-
-There are several versions of Amanda. The latest version at the time
-of this writing is available at:
-
- ftp://ftp.amanda.org/pub/amanda
-
-
-HOW DO I GET AMANDA UP AND RUNNING?
------------------------------------
-
-Read the file docs/INSTALL. There are a variety of steps, from compiling
-Amanda to installing it on the tape server host and the client machines.
- docs/INSTALL contains general installation instructions.
- docs/SYSTEM.NOTES contains system-specific information.
- docs/FAQ contains answers to frequently asked questions.
- docs/KERBEROS explains installation under Kerberos 4.
- docs/TAPE.CHANGERS explains how to customize the changer interface.
- docs/WHATS.NEW details new features.
-
-
-WHO DO I TALK TO IF I HAVE A PROBLEM?
--------------------------------------
-
-Amanda is completely unsupported and made available as-is. However,
-you may be able to get useful information in the Amanda mailing lists:
-
-==> To join a mailing list, DO NOT, EVER, send mail to that list. Send
- mail to <listname>-request@amanda.org, or amanda-lists@amanda.org,
- with the following line in the body of the message:
- subscribe <listname> <your-email-address>
-
-
- amanda-announce
- The amanda-announce mailing list is for important announcements
- related to the Amanda Network Backup Manager package, including new
- versions, contributions, and fixes. NOTE: the amanda-users list is
- itself on the amanda-announce distribution, so you only need to
- subscribe to one of the two lists, not both.
- To subscribe, send a message to amanda-announce-request@amanda.org.
-
- amanda-users
- The amanda-users mailing list is for questions and general discussion
- about the Amanda Network Backup Manager. This package and related
- files are available via anonymous FTP from ftp.amanda.org in the
- pub/amanda directory. NOTE: the amanda-users list is itself on the
- amanda-announce distribution, so you only need to subscribe to one of
- the two lists, not both.
- To subscribe, send a message to amanda-users-request@amanda.org.
-
- amanda-hackers
- The amanda-hackers mailing list is for discussion of the
- technical details of the Amanda package, including extensions,
- ports, bugs, fixes, and alpha testing of new versions.
- To subscribe, send a message to amanda-hackers-request@amanda.org.
-
-
-Share and Enjoy,
-The Amanda Development Team
diff --git a/sysutils/amanda-server/Makefile b/sysutils/amanda-server/Makefile
deleted file mode 100644
index fbb5cb26c44..00000000000
--- a/sysutils/amanda-server/Makefile
+++ /dev/null
@@ -1,59 +0,0 @@
-# $NetBSD: Makefile,v 1.24 2003/06/02 01:16:57 jschauma Exp $
-# FreeBSD Id: Makefile,v 1.9 1997/03/08 05:00:11 gpalmer Exp
-#
-
-DISTNAME= amanda-2.4.2p2
-PKGNAME= amanda-server-2.4.2p2
-SVR4_PKGNAME= amase
-CATEGORIES= sysutils
-MASTER_SITES= ftp://ftp.cs.umd.edu/pub/amanda/
-
-MAINTAINER= tech-pkg@netbsd.org
-HOMEPAGE= http://www.amanda.org/
-COMMENT= Server part of Amanda, a network backup system
-
-USE_PERL5= yes
-USE_BUILDLINK2= yes
-USE_GMAKE= yes
-
-.include "../../mk/bsd.prefs.mk"
-.include "../../sysutils/amanda-common/Makefile.common"
-
-CONFIGURE_ARGS+= --without-client
-
-# Prevent configure script from finding unnecessary libraries.
-#
-CONFIGURE_ENV+= ac_cv_lib_intl_main=no
-CONFIGURE_ENV+= ac_cv_lib_termcap_tgetent=no
-CONFIGURE_ENV+= ac_cv_lib_curses_tgetent=no
-CONFIGURE_ENV+= ac_cv_lib_ncurses_tgetent=no
-CONFIGURE_ENV+= ac_cv_lib_readline_readline=no
-
-# post-install:
-# ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/amanda
-# ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/amanda
-# for i in ${WRKDIR}/${DISTNAME}/docs/* ; do \
-# ${INSTALL_DATA} $$i ${PREFIX}/share/doc/amanda; \
-# done
-# for i in ${WRKDIR}/${DISTNAME}/example/8.5x11.ps \
-# ${WRKDIR}/${DISTNAME}/example/DIN-A4.ps \
-# ${WRKDIR}/${DISTNAME}/example/DLT.ps \
-# ${WRKDIR}/${DISTNAME}/example/EXB-8500.ps \
-# ${WRKDIR}/${DISTNAME}/example/HP-DAT.ps \
-# ${WRKDIR}/${DISTNAME}/example/amanda.conf \
-# ${WRKDIR}/${DISTNAME}/example/chg-multi.conf \
-# ${WRKDIR}/${DISTNAME}/example/chg-scsi.conf \
-# ${WRKDIR}/${DISTNAME}/example/config.site \
-# ${WRKDIR}/${DISTNAME}/example/disklist; do \
-# ${INSTALL_DATA} $$i ${PREFIX}/share/examples/amanda; \
-# done
-
-.if ${OPSYS} == "SunOS"
-PLIST_SRC= ${WRKDIR}/PLIST-src
-
-pre-install:
- ${SED} -e 's|^libexec/chg-scsi$$|@comment libexec/chg-scsi needs headers...|' ${PKGDIR}/PLIST > ${PLIST_SRC}
-.endif
-
-.include "../../sysutils/amanda-common/buildlink2.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/amanda-server/PLIST b/sysutils/amanda-server/PLIST
deleted file mode 100644
index 44ef633fe1e..00000000000
--- a/sysutils/amanda-server/PLIST
+++ /dev/null
@@ -1,91 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 22:52:50 zuntum Exp $
-lib/libamserver-2.4.2p2.so
-lib/libamserver.a
-lib/libamserver.la
-lib/libamserver.so
-libexec/amcleanupdisk
-libexec/amidxtaped
-libexec/amindexd
-libexec/amlogroll
-libexec/amtrmidx
-libexec/amtrmlog
-libexec/chg-chio
-libexec/chg-chs
-libexec/chg-manual
-libexec/chg-mtx
-libexec/chg-multi
-libexec/chg-rth
-libexec/chg-scsi
-libexec/chg-zd-mtx
-libexec/driver
-libexec/dumper
-libexec/planner
-libexec/taper
-man/man8/amadmin.8
-man/man8/amcheck.8
-man/man8/amcheckdb.8
-man/man8/amcleanup.8
-man/man8/amdump.8
-man/man8/amflush.8
-man/man8/amgetconf.8
-man/man8/amlabel.8
-man/man8/amoverview.8
-man/man8/amreport.8
-man/man8/amrestore.8
-man/man8/amrmtape.8
-man/man8/amstatus.8
-man/man8/amtape.8
-man/man8/amtoc.8
-man/man8/amverify.8
-sbin/amadmin
-sbin/amcheck
-sbin/amcheckdb
-sbin/amcleanup
-sbin/amdump
-sbin/amflush
-sbin/amgetconf
-sbin/amlabel
-sbin/amoverview
-sbin/amreport
-sbin/amrestore
-sbin/amrmtape
-sbin/amstatus
-sbin/amtape
-sbin/amtoc
-sbin/amverify
-share/doc/amanda/COPYRIGHT
-share/doc/amanda/COPYRIGHT-APACHE
-share/doc/amanda/COPYRIGHT-REGEX
-share/doc/amanda/DUMPER-API
-share/doc/amanda/FAQ
-share/doc/amanda/INDEXING
-share/doc/amanda/INSTALL
-share/doc/amanda/INTERNALS
-share/doc/amanda/KERBEROS
-share/doc/amanda/LABEL.PRINTING
-share/doc/amanda/MULTITAPE
-share/doc/amanda/RESTORE
-share/doc/amanda/SAMBA
-share/doc/amanda/SECURITY
-share/doc/amanda/SYSTEM.NOTES
-share/doc/amanda/TAPE.CHANGERS
-share/doc/amanda/TAPETYPES
-share/doc/amanda/UPGRADE
-share/doc/amanda/WHATS.NEW
-share/doc/amanda/WISHLIST
-share/doc/amanda/YEAR2000
-share/doc/amanda/ZFTAPE
-share/examples/amanda/3hole.ps
-share/examples/amanda/8.5x11.ps
-share/examples/amanda/DIN-A4.ps
-share/examples/amanda/DLT.ps
-share/examples/amanda/EXB-8500.ps
-share/examples/amanda/HP-DAT.ps
-share/examples/amanda/amanda.conf
-share/examples/amanda/amanda.conf.chg-scsi
-share/examples/amanda/chg-multi.conf
-share/examples/amanda/chg-scsi.conf
-share/examples/amanda/config.site
-share/examples/amanda/disklist
-@dirrm share/examples/amanda
-@dirrm share/doc/amanda
diff --git a/sysutils/amanda-server/distinfo b/sysutils/amanda-server/distinfo
deleted file mode 100644
index be8a4335150..00000000000
--- a/sysutils/amanda-server/distinfo
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: distinfo,v 1.4 2002/06/06 01:38:41 simonb Exp $
-
-SHA1 (amanda-2.4.2p2.tar.gz) = 721060b1357e9b939d06773f91a20de1d507521b
-Size (amanda-2.4.2p2.tar.gz) = 922404 bytes
-SHA1 (patch-aa) = a9ffd6acad2c01da0f4707575ec311a5280bf48d
-SHA1 (patch-ab) = 8d99598899b52c9d99994ed831021648fff8a5f9
-SHA1 (patch-ac) = c353f92d692813b81858d55cf55fa28a9ee98355
-SHA1 (patch-ad) = 0ad5ec57b29948ea5b15a43ae2e7a4d3be2a2d40
-SHA1 (patch-ae) = fd831036b9ac3365d304d9e25c0eb1dd515a849e
-SHA1 (patch-af) = af41269882c8dfdb45bc177a45aa86122443d8df
-SHA1 (patch-ag) = 4397a7c6bde844d80781e1ffd8fb81c289e92fe0
-SHA1 (patch-ah) = ba156adca49704c23d04601c98ed14f3e0b206c1
-SHA1 (patch-ai) = 977d9249db26ecc26bdc0ebf3bd86131132ccda4
-SHA1 (patch-aj) = 912ec89bf8cca2f602a90621dfd818d21145f02b
-SHA1 (patch-ak) = d5036ee96d05dce8091209130da1747f0d6e5867
-SHA1 (patch-al) = 44b239e7ecff95472f012a6ee6ac6f5d8a41b62c
-SHA1 (patch-ba) = 7c2b47e1239bc2d0e31f8336a85ea058d8fb07b4
-SHA1 (patch-bb) = c8c91b848e669f2ccd3a753cfa7aba64e47d2166
-SHA1 (patch-bc) = a4268be6e5d70963f111de2a58d59417c2b33a0a
diff --git a/sysutils/amanda-server/patches/patch-aa b/sysutils/amanda-server/patches/patch-aa
deleted file mode 100644
index 35ce7e29f3e..00000000000
--- a/sysutils/amanda-server/patches/patch-aa
+++ /dev/null
@@ -1,32 +0,0 @@
-$NetBSD: patch-aa,v 1.4 2001/01/16 21:59:39 cjones Exp $
-
---- configure.orig Sat Nov 25 06:59:40 2000
-+++ configure Mon Jan 15 14:08:27 2001
-@@ -3268,6 +3268,7 @@
- done
-
-
-+if false ;then
- for ac_prog in gnuplot
- do
- # Extract the first word of "$ac_prog", so it can be a program name with args.
-@@ -3307,6 +3308,8 @@
-
- test -n "$GNUPLOT" && break
- done
-+fi
-+GNUPLOT=""
-
- if test -z "$GNUPLOT"; then
- NO_AMPLOT_MODE=true
-@@ -4924,8 +4927,10 @@
- # This can be used to rebuild libtool when needed
- LIBTOOL_DEPS="$ac_aux_dir/ltconfig $ac_aux_dir/ltmain.sh"
-
-+if false; then
- # Always use our own libtool.
- LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-+fi
-
- # Redirect the config.log output again, so that the ltconfig log is not
- # clobbered by the next message.
diff --git a/sysutils/amanda-server/patches/patch-ab b/sysutils/amanda-server/patches/patch-ab
deleted file mode 100644
index 9cb9037d670..00000000000
--- a/sysutils/amanda-server/patches/patch-ab
+++ /dev/null
@@ -1,29 +0,0 @@
-$NetBSD: patch-ab,v 1.5 2001/06/26 03:14:12 christos Exp $
-
---- Makefile.in.orig Tue Apr 3 15:55:47 2001
-+++ Makefile.in Mon Jun 25 22:42:55 2001
-@@ -34,7 +34,7 @@
-
- DESTDIR =
-
--pkgdatadir = $(datadir)/@PACKAGE@
-+pkgdatadir = $(datadir)/doc/@PACKAGE@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
-
-@@ -151,13 +151,13 @@
- ACINCLUDE_M4_DEPS = $(ACINCLUDE_M4I) $(LIBTOOL_M4I)
-
- @WANT_CLIENT_TRUE@CLIENT_SUBDIRS = client-src
--@WANT_TAPE_TRUE@TAPE_SUBDIRS = tape-src
-+#TAPE_SUBDIRS = tape-src
- @WANT_SERVER_TRUE@SERVER_SUBDIRS = server-src changer-src
- @WANT_RESTORE_TRUE@RESTORE_SUBDIRS = restore-src
- @WANT_RECOVER_TRUE@RECOVER_SUBDIRS = recover-src
- @WANT_AMPLOT_TRUE@PLOT_SUBDIRS = amplot
- # order is significant, don't change it arbitrarily
--SUBDIRS = config common-src $(CLIENT_SUBDIRS) $(TAPE_SUBDIRS) $(SERVER_SUBDIRS) $(RESTORE_SUBDIRS) $(RECOVER_SUBDIRS) $(PLOT_SUBDIRS) man docs example
-+SUBDIRS = config $(CLIENT_SUBDIRS) $(TAPE_SUBDIRS) $(SERVER_SUBDIRS) $(RESTORE_SUBDIRS) $(RECOVER_SUBDIRS) $(PLOT_SUBDIRS) man docs example
-
-
- pkgdata_DATA = COPYRIGHT COPYRIGHT-APACHE COPYRIGHT-REGEX
diff --git a/sysutils/amanda-server/patches/patch-ac b/sysutils/amanda-server/patches/patch-ac
deleted file mode 100644
index 2e2931efcc0..00000000000
--- a/sysutils/amanda-server/patches/patch-ac
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-ac,v 1.5 2001/01/16 21:59:39 cjones Exp $
-
---- example/amanda.conf.chg-scsi.in~ Thu Jun 17 12:33:43 1999
-+++ example/amanda.conf.chg-scsi.in Mon Jan 15 14:26:31 2001
-@@ -153,10 +153,10 @@
- # Note that, although the keyword below is infofile, it is only so for
- # historic reasons, since now it is supposed to be a directory (unless
- # you have selected some database format other than the `text' default)
--infofile "/usr/adm/amanda/@DEFAULT_CONFIG@/curinfo" # database DIRECTORY
--logdir "/usr/adm/amanda/@DEFAULT_CONFIG@" # log directory
--indexdir "/usr/adm/amanda/@DEFAULT_CONFIG@/index" # index directory
--#tapelist "/usr/adm/amanda/@DEFAULT_CONFIG@/tapelist" # list of used tapes
-+infofile "@localstatedir@/@DEFAULT_CONFIG@/curinfo" # database DIRECTORY
-+logdir "@localstatedir@/@DEFAULT_CONFIG@" # log directory
-+indexdir "@localstatedir@/@DEFAULT_CONFIG@/index" # index directory
-+#tapelist "@localstatedir@/@DEFAULT_CONFIG@/tapelist" # list of used tapes
- # tapelist is stored, by default, in the directory that contains amanda.conf
-
-
diff --git a/sysutils/amanda-server/patches/patch-ad b/sysutils/amanda-server/patches/patch-ad
deleted file mode 100644
index e69b02de5d6..00000000000
--- a/sysutils/amanda-server/patches/patch-ad
+++ /dev/null
@@ -1,173 +0,0 @@
-$NetBSD: patch-ad,v 1.6 2001/06/26 03:14:12 christos Exp $
-
---- server-src/Makefile.in.orig Tue Apr 3 15:55:46 2001
-+++ server-src/Makefile.in Mon Jun 25 22:49:20 2001
-@@ -175,7 +175,7 @@
- # routines, and second to pick up any references in the other libraries.
- ###
-
--LDADD = ../common-src/libamanda.$(LIB_EXTENSION) libamserver.$(LIB_EXTENSION) ../tape-src/libamtape.$(LIB_EXTENSION) ../common-src/libamanda.$(LIB_EXTENSION)
-+LDADD = libamserver.$(LIB_EXTENSION)
-
-
- SUFFIXES = .sh .pl
-@@ -210,7 +210,7 @@
- DEFS = @DEFS@ -I. -I$(srcdir) -I../config
- CPPFLAGS = @CPPFLAGS@
- LDFLAGS = @LDFLAGS@
--LIBS = @LIBS@
-+LIBS = @LIBS@ -lamtape -lamanda
- libamserver_a_LIBADD =
- libamserver_a_OBJECTS = amindex.$(OBJEXT) changer.$(OBJEXT) \
- clock.$(OBJEXT) conffile.$(OBJEXT) diskfile.$(OBJEXT) \
-@@ -232,131 +232,93 @@
-
- diskfile_OBJECTS = diskfile.test.$(OBJEXT)
- diskfile_LDADD = $(LDADD)
--diskfile_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \
--libamserver.$(LIB_EXTENSION) ../tape-src/libamtape.$(LIB_EXTENSION) \
--../common-src/libamanda.$(LIB_EXTENSION)
-+diskfile_DEPENDENCIES = libamserver.$(LIB_EXTENSION)
- diskfile_LDFLAGS =
- conffile_OBJECTS = conffile.test.$(OBJEXT)
- conffile_LDADD = $(LDADD)
--conffile_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \
--libamserver.$(LIB_EXTENSION) ../tape-src/libamtape.$(LIB_EXTENSION) \
--../common-src/libamanda.$(LIB_EXTENSION)
-+conffile_DEPENDENCIES = libamserver.$(LIB_EXTENSION)
- conffile_LDFLAGS =
- infofile_OBJECTS = infofile.test.$(OBJEXT)
- infofile_LDADD = $(LDADD)
--infofile_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \
--libamserver.$(LIB_EXTENSION) ../tape-src/libamtape.$(LIB_EXTENSION) \
--../common-src/libamanda.$(LIB_EXTENSION)
-+infofile_DEPENDENCIES = libamserver.$(LIB_EXTENSION)
- infofile_LDFLAGS =
- amindexd_OBJECTS = amindexd.$(OBJEXT) disk_history.$(OBJEXT) \
- list_dir.$(OBJEXT)
- amindexd_LDADD = $(LDADD)
--amindexd_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \
--libamserver.$(LIB_EXTENSION) ../tape-src/libamtape.$(LIB_EXTENSION) \
--../common-src/libamanda.$(LIB_EXTENSION)
-+amindexd_DEPENDENCIES = libamserver.$(LIB_EXTENSION)
- amindexd_LDFLAGS =
- amlogroll_SOURCES = amlogroll.c
- amlogroll_OBJECTS = amlogroll.$(OBJEXT)
- amlogroll_LDADD = $(LDADD)
--amlogroll_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \
--libamserver.$(LIB_EXTENSION) ../tape-src/libamtape.$(LIB_EXTENSION) \
--../common-src/libamanda.$(LIB_EXTENSION)
-+amlogroll_DEPENDENCIES = libamserver.$(LIB_EXTENSION)
- amlogroll_LDFLAGS =
- amtrmidx_SOURCES = amtrmidx.c
- amtrmidx_OBJECTS = amtrmidx.$(OBJEXT)
- amtrmidx_LDADD = $(LDADD)
--amtrmidx_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \
--libamserver.$(LIB_EXTENSION) ../tape-src/libamtape.$(LIB_EXTENSION) \
--../common-src/libamanda.$(LIB_EXTENSION)
-+amtrmidx_DEPENDENCIES = libamserver.$(LIB_EXTENSION)
- amtrmidx_LDFLAGS =
- amtrmlog_SOURCES = amtrmlog.c
- amtrmlog_OBJECTS = amtrmlog.$(OBJEXT)
- amtrmlog_LDADD = $(LDADD)
--amtrmlog_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \
--libamserver.$(LIB_EXTENSION) ../tape-src/libamtape.$(LIB_EXTENSION) \
--../common-src/libamanda.$(LIB_EXTENSION)
-+amtrmlog_DEPENDENCIES = libamserver.$(LIB_EXTENSION)
- amtrmlog_LDFLAGS =
- driver_SOURCES = driver.c
- driver_OBJECTS = driver.$(OBJEXT)
- driver_LDADD = $(LDADD)
--driver_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \
--libamserver.$(LIB_EXTENSION) ../tape-src/libamtape.$(LIB_EXTENSION) \
--../common-src/libamanda.$(LIB_EXTENSION)
-+driver_DEPENDENCIES = libamserver.$(LIB_EXTENSION)
- driver_LDFLAGS =
- dumper_SOURCES = dumper.c
- dumper_OBJECTS = dumper.$(OBJEXT)
- dumper_LDADD = $(LDADD)
--dumper_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \
--libamserver.$(LIB_EXTENSION) ../tape-src/libamtape.$(LIB_EXTENSION) \
--../common-src/libamanda.$(LIB_EXTENSION)
-+dumper_DEPENDENCIES = libamserver.$(LIB_EXTENSION)
- dumper_LDFLAGS =
- planner_SOURCES = planner.c
- planner_OBJECTS = planner.$(OBJEXT)
- planner_LDADD = $(LDADD)
--planner_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \
--libamserver.$(LIB_EXTENSION) ../tape-src/libamtape.$(LIB_EXTENSION) \
--../common-src/libamanda.$(LIB_EXTENSION)
-+planner_DEPENDENCIES = libamserver.$(LIB_EXTENSION)
- planner_LDFLAGS =
- taper_SOURCES = taper.c
- taper_OBJECTS = taper.$(OBJEXT)
- taper_LDADD = $(LDADD)
--taper_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \
--libamserver.$(LIB_EXTENSION) ../tape-src/libamtape.$(LIB_EXTENSION) \
--../common-src/libamanda.$(LIB_EXTENSION)
-+taper_DEPENDENCIES = libamserver.$(LIB_EXTENSION)
- taper_LDFLAGS =
- amcleanupdisk_SOURCES = amcleanupdisk.c
- amcleanupdisk_OBJECTS = amcleanupdisk.$(OBJEXT)
- amcleanupdisk_LDADD = $(LDADD)
--amcleanupdisk_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \
--libamserver.$(LIB_EXTENSION) ../tape-src/libamtape.$(LIB_EXTENSION) \
--../common-src/libamanda.$(LIB_EXTENSION)
-+amcleanupdisk_DEPENDENCIES = libamserver.$(LIB_EXTENSION)
- amcleanupdisk_LDFLAGS =
- amadmin_SOURCES = amadmin.c
- amadmin_OBJECTS = amadmin.$(OBJEXT)
- amadmin_LDADD = $(LDADD)
--amadmin_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \
--libamserver.$(LIB_EXTENSION) ../tape-src/libamtape.$(LIB_EXTENSION) \
--../common-src/libamanda.$(LIB_EXTENSION)
-+amadmin_DEPENDENCIES = libamserver.$(LIB_EXTENSION)
- amadmin_LDFLAGS =
- amcheck_SOURCES = amcheck.c
- amcheck_OBJECTS = amcheck.$(OBJEXT)
- amcheck_LDADD = $(LDADD)
--amcheck_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \
--libamserver.$(LIB_EXTENSION) ../tape-src/libamtape.$(LIB_EXTENSION) \
--../common-src/libamanda.$(LIB_EXTENSION)
-+amcheck_DEPENDENCIES = libamserver.$(LIB_EXTENSION)
- amcheck_LDFLAGS =
- amflush_SOURCES = amflush.c
- amflush_OBJECTS = amflush.$(OBJEXT)
- amflush_LDADD = $(LDADD)
--amflush_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \
--libamserver.$(LIB_EXTENSION) ../tape-src/libamtape.$(LIB_EXTENSION) \
--../common-src/libamanda.$(LIB_EXTENSION)
-+amflush_DEPENDENCIES = libamserver.$(LIB_EXTENSION)
- amflush_LDFLAGS =
- amgetconf_OBJECTS = getconf.$(OBJEXT)
- amgetconf_LDADD = $(LDADD)
--amgetconf_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \
--libamserver.$(LIB_EXTENSION) ../tape-src/libamtape.$(LIB_EXTENSION) \
--../common-src/libamanda.$(LIB_EXTENSION)
-+amgetconf_DEPENDENCIES = libamserver.$(LIB_EXTENSION)
- amgetconf_LDFLAGS =
- amlabel_SOURCES = amlabel.c
- amlabel_OBJECTS = amlabel.$(OBJEXT)
- amlabel_LDADD = $(LDADD)
--amlabel_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \
--libamserver.$(LIB_EXTENSION) ../tape-src/libamtape.$(LIB_EXTENSION) \
--../common-src/libamanda.$(LIB_EXTENSION)
-+amlabel_DEPENDENCIES = libamserver.$(LIB_EXTENSION)
- amlabel_LDFLAGS =
- amtape_SOURCES = amtape.c
- amtape_OBJECTS = amtape.$(OBJEXT)
- amtape_LDADD = $(LDADD)
--amtape_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \
--libamserver.$(LIB_EXTENSION) ../tape-src/libamtape.$(LIB_EXTENSION) \
--../common-src/libamanda.$(LIB_EXTENSION)
-+amtape_DEPENDENCIES = libamserver.$(LIB_EXTENSION)
- amtape_LDFLAGS =
- amreport_OBJECTS = reporter.$(OBJEXT)
- amreport_LDADD = $(LDADD)
--amreport_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \
--libamserver.$(LIB_EXTENSION) ../tape-src/libamtape.$(LIB_EXTENSION) \
--../common-src/libamanda.$(LIB_EXTENSION)
-+amreport_DEPENDENCIES = libamserver.$(LIB_EXTENSION)
- amreport_LDFLAGS =
- SCRIPTS = $(sbin_SCRIPTS)
-
diff --git a/sysutils/amanda-server/patches/patch-ae b/sysutils/amanda-server/patches/patch-ae
deleted file mode 100644
index b4953f66099..00000000000
--- a/sysutils/amanda-server/patches/patch-ae
+++ /dev/null
@@ -1,27 +0,0 @@
-$NetBSD: patch-ae,v 1.5 2001/06/26 03:14:12 christos Exp $
-
---- changer-src/Makefile.in.orig Tue Apr 3 15:55:43 2001
-+++ changer-src/Makefile.in Mon Jun 25 22:51:37 2001
-@@ -163,7 +163,7 @@
- # routines, and second to pick up any references in the other libraries.
- ###
-
--LDADD = ../common-src/libamanda.$(LIB_EXTENSION) ../server-src/libamserver.$(LIB_EXTENSION) ../tape-src/libamtape.$(LIB_EXTENSION) ../common-src/libamanda.$(LIB_EXTENSION)
-+LDADD = ../server-src/libamserver.$(LIB_EXTENSION)
-
-
- SUFFIXES = .pl .sh
-@@ -191,11 +191,8 @@
- scsi-irix.$(OBJEXT) scsi-linux.$(OBJEXT) scsi-solaris.$(OBJEXT) \
- scsi-bsd.$(OBJEXT)
- chg_scsi_LDADD = $(LDADD)
--chg_scsi_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \
--../server-src/libamserver.$(LIB_EXTENSION) \
--../tape-src/libamtape.$(LIB_EXTENSION) \
--../common-src/libamanda.$(LIB_EXTENSION)
--chg_scsi_LDFLAGS =
-+chg_scsi_DEPENDENCIES = ../server-src/libamserver.$(LIB_EXTENSION)
-+chg_scsi_LDFLAGS = -lamanda -lamtape
- chg_scsi_chio_OBJECTS = chg-scsi-chio.$(OBJEXT) scsi-hpux.$(OBJEXT) \
- scsi-chio.$(OBJEXT)
- chg_scsi_chio_LDADD = $(LDADD)
diff --git a/sysutils/amanda-server/patches/patch-af b/sysutils/amanda-server/patches/patch-af
deleted file mode 100644
index 2d62327eea2..00000000000
--- a/sysutils/amanda-server/patches/patch-af
+++ /dev/null
@@ -1,165 +0,0 @@
-$NetBSD: patch-af,v 1.4 2001/01/16 21:59:40 cjones Exp $
-
---- changer-src/scsi-chio.c.orig Thu Jun 17 12:33:19 1999
-+++ changer-src/scsi-chio.c Thu Jan 11 13:01:33 2001
-@@ -121,25 +121,41 @@
- */
- int isempty(int fd, int slot)
- {
-+#if defined(OCHIOGSTATUS)
-+struct ochanger_element_status_request cesr;
-+#else
- struct changer_element_status ces;
-+#endif
-+
- int i,rc;
- int type=CHET_ST;
-
- get_changer_info(fd);
-
-+#if defined(OCHIOGSTATUS)
-+ cesr.cesr_type = type;
-+ cesr.cesr_data = malloc(changer_info.cp_nslots);
-+ rc = ioctl(fd, OCHIOGSTATUS, &cesr);
-+#else
- ces.ces_type = type;
- ces.ces_data = malloc(changer_info.cp_nslots);
--
- rc = ioctl(fd, CHIOGSTATUS, &ces);
-+#endif
-+
- if (rc) {
- dbprintf(("%s: changer status query failed: 0x%x %s\n",
- get_pname(), rc,strerror(errno)));
- return -1;
- }
-
-+#if defined(OCHIOGSTATUS)
-+ i = cesr.cesr_data[slot] & CESTATUS_FULL;
-+ free(cesr.cesr_data);
-+#else
- i = ces.ces_data[slot] & CESTATUS_FULL;
--
- free(ces.ces_data);
-+#endif
-+
- return !i;
- }
-
-@@ -148,16 +164,27 @@
- */
- int find_empty(int fd, int start, int count)
- {
-+#if defined(OCHIOGSTATUS)
-+struct ochanger_element_status_request cesr;
-+#else
- struct changer_element_status ces;
-+#endif
-+
- int i,rc;
- int type=CHET_ST;
-
- get_changer_info(fd);
-
-+#if defined(OCHIOGSTATUS)
-+ cesr.cesr_type = type;
-+ cesr.cesr_data = malloc(changer_info.cp_nslots);
-+ rc = ioctl(fd, OCHIOGSTATUS, &cesr);
-+#else
- ces.ces_type = type;
- ces.ces_data = malloc(changer_info.cp_nslots);
-+ rc = ioctl(fd, CHIOGSTATUS, &ces);
-+#endif
-
-- rc = ioctl(fd,CHIOGSTATUS,&ces);
- if (rc) {
- dbprintf(("%s: changer status query failed: 0x%x %s\n",
- get_pname(), rc, strerror(errno)));
-@@ -165,9 +192,17 @@
- }
-
- i = 0;
-+
-+#if defined(OCHIOGSTATUS)
-+ while ((i < changer_info.cp_nslots)&&(cesr.cesr_data[i] & CESTATUS_FULL))
-+ i++;
-+ free(cesr.cesr_data);
-+#else
- while ((i < changer_info.cp_nslots)&&(ces.ces_data[i] & CESTATUS_FULL))
- i++;
- free(ces.ces_data);
-+#endif
-+
- return i;
- }
-
-@@ -176,25 +211,41 @@
- */
- int drive_loaded(int fd, int drivenum)
- {
-+#if defined(OCHIOGSTATUS)
-+struct ochanger_element_status_request cesr;
-+#else
- struct changer_element_status ces;
-+#endif
-+
- int i,rc;
- int type=CHET_DT;
-
- get_changer_info(fd);
-
-+#if defined(OCHIOGSTATUS)
-+ cesr.cesr_type = type;
-+ cesr.cesr_data = malloc(changer_info.cp_ndrives);
-+ rc = ioctl(fd, OCHIOGSTATUS, &cesr);
-+#else
- ces.ces_type = type;
- ces.ces_data = malloc(changer_info.cp_ndrives);
--
- rc = ioctl(fd, CHIOGSTATUS, &ces);
-+#endif
-+
- if (rc) {
- dbprintf(("%s: drive status query failed: 0x%x %s\n",
- get_pname(), rc, strerror(errno)));
- return -1;
- }
-
-+#if defined(OCHIOGSTATUS)
-+ i = (cesr.cesr_data[drivenum] & CESTATUS_FULL);
-+ free(cesr.cesr_data);
-+#else
- i = (ces.ces_data[drivenum] & CESTATUS_FULL);
--
- free(ces.ces_data);
-+#endif
-+
- return i;
- }
-
-@@ -204,7 +255,12 @@
- */
- int unload(int fd, int drive, int slot)
- {
-+#if defined(OCHIOGSTATUS)
-+struct changer_move_request move;
-+#else
- struct changer_move move;
-+#endif
-+
- int rc;
-
- dbprintf(("unload : fd = %d, drive = %d, slot =%d\n",fd, drive, slot));
-@@ -230,7 +286,12 @@
- */
- int load(int fd, int drive, int slot)
- {
-+#if defined(OCHIOGSTATUS)
-+struct changer_move_request move;
-+#else
- struct changer_move move;
-+#endif
-+
- int rc;
-
- dbprintf(("load : fd = %d, drive = %d, slot =%d\n",fd, drive, slot));
diff --git a/sysutils/amanda-server/patches/patch-ag b/sysutils/amanda-server/patches/patch-ag
deleted file mode 100644
index 942c30914de..00000000000
--- a/sysutils/amanda-server/patches/patch-ag
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD: patch-ag,v 1.3 1999/09/04 01:19:50 bad Exp $
-
---- example/chg-scsi.conf.old Tue Feb 23 16:44:39 1999
-+++ example/chg-scsi.conf Tue Feb 23 16:46:38 1999
-@@ -2,6 +2,8 @@
- number_configs 2
- eject 1 # Tapedrives need an eject command
- sleep 5 # Seconds to wait until the tape gets ready
-+ # The driver first sleeps for <sleep>/2 seconds,
-+ # then pool the drive every seconds.
- cleanmax 10 # How many times could a cleaning tape get used
- changerdev /dev/sch0
- #
-@@ -13,7 +15,8 @@
- startuse 0 # The slots associated with the drive 0
- enduse 9 #
- statfile /usr/local/etc/amanda/tape5-slot # The file where the actual slot is stored
--cleancart 20 # the slot where the cleaningcartridge for drive 0 is located
-+cleancart -1 # the slot where the cleaningcartridge for drive 0 is
-+ # located. -1 means none.
- cleanfile /usr/local/etc/amanda/tape0-clean # The file where the cleanings are recorded
- usagecount /usr/local/etc/amanda/backup/totaltime
-
diff --git a/sysutils/amanda-server/patches/patch-ah b/sysutils/amanda-server/patches/patch-ah
deleted file mode 100644
index a6f021ab4b8..00000000000
--- a/sysutils/amanda-server/patches/patch-ah
+++ /dev/null
@@ -1,30 +0,0 @@
-$NetBSD: patch-ah,v 1.4 2001/01/16 21:59:40 cjones Exp $
-
---- example/amanda.conf.in.orig Tue Nov 7 18:44:50 2000
-+++ example/amanda.conf.in Mon Jan 15 14:19:56 2001
-@@ -71,8 +71,8 @@
- tpchanger "chg-manual" # the tape-changer glue script
- tapedev "@DEFAULT_TAPE_DEVICE@" # the no-rewind tape device to be used
- rawtapedev "@DEFAULT_RAW_TAPE_DEVICE@" # the raw device to be used (ftape only)
--changerfile "/usr/adm/amanda/@DEFAULT_CONFIG@/changer"
--changerfile "/usr/adm/amanda/@DEFAULT_CONFIG@/changer-status"
-+changerfile "@CONFIG_DIR@/@DEFAULT_CONFIG@/changer"
-+changerfile "@CONFIG_DIR@/@DEFAULT_CONFIG@/changer-status"
- changerfile "@CONFIG_DIR@/@DEFAULT_CONFIG@/changer.conf"
- changerdev "@DEFAULT_CHANGER_DEVICE@"
-
-@@ -159,10 +159,10 @@
- # Note that, although the keyword below is infofile, it is only so for
- # historic reasons, since now it is supposed to be a directory (unless
- # you have selected some database format other than the `text' default)
--infofile "/usr/adm/amanda/@DEFAULT_CONFIG@/curinfo" # database DIRECTORY
--logdir "/usr/adm/amanda/@DEFAULT_CONFIG@" # log directory
--indexdir "/usr/adm/amanda/@DEFAULT_CONFIG@/index" # index directory
--#tapelist "/usr/adm/amanda/@DEFAULT_CONFIG@/tapelist" # list of used tapes
-+infofile "@localstatedir@/@DEFAULT_CONFIG@/curinfo" # database DIRECTORY
-+logdir "@localstatedir@/@DEFAULT_CONFIG@" # log directory
-+indexdir "@localstatedir@/@DEFAULT_CONFIG@/index" # index directory
-+#tapelist "@localstatedir@/@DEFAULT_CONFIG@/tapelist" # list of used tapes
- # tapelist is stored, by default, in the directory that contains amanda.conf
-
-
diff --git a/sysutils/amanda-server/patches/patch-ai b/sysutils/amanda-server/patches/patch-ai
deleted file mode 100644
index c34afe8f6d5..00000000000
--- a/sysutils/amanda-server/patches/patch-ai
+++ /dev/null
@@ -1,32 +0,0 @@
-$NetBSD: patch-ai,v 1.4 2001/06/26 03:14:12 christos Exp $
-
---- restore-src/Makefile.in.orig Tue Apr 3 15:55:46 2001
-+++ restore-src/Makefile.in Mon Jun 25 22:53:37 2001
-@@ -160,7 +160,7 @@
- # routines, and second to pick up any references in the other libraries.
- ###
-
--LDADD = ../common-src/libamanda.$(LIB_EXTENSION) ../tape-src/libamtape.$(LIB_EXTENSION) ../common-src/libamanda.$(LIB_EXTENSION)
-+LDADD = -lamtape -lamanda
-
-
- amidxtaped_SOURCES = amidxtaped.c
-@@ -178,16 +178,12 @@
- LIBS = @LIBS@
- amidxtaped_OBJECTS = amidxtaped.$(OBJEXT)
- amidxtaped_LDADD = $(LDADD)
--amidxtaped_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \
--../tape-src/libamtape.$(LIB_EXTENSION) \
--../common-src/libamanda.$(LIB_EXTENSION)
-+amidxtaped_DEPENDENCIES =
- amidxtaped_LDFLAGS =
- amrestore_SOURCES = amrestore.c
- amrestore_OBJECTS = amrestore.$(OBJEXT)
- amrestore_LDADD = $(LDADD)
--amrestore_DEPENDENCIES = ../common-src/libamanda.$(LIB_EXTENSION) \
--../tape-src/libamtape.$(LIB_EXTENSION) \
--../common-src/libamanda.$(LIB_EXTENSION)
-+amrestore_DEPENDENCIES =
- amrestore_LDFLAGS =
- CFLAGS = @CFLAGS@
- COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
diff --git a/sysutils/amanda-server/patches/patch-aj b/sysutils/amanda-server/patches/patch-aj
deleted file mode 100644
index de7789d4aed..00000000000
--- a/sysutils/amanda-server/patches/patch-aj
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD: patch-aj,v 1.1 2001/01/16 21:59:40 cjones Exp $
-
---- example/Makefile.in.orig Sat Nov 25 07:02:02 2000
-+++ example/Makefile.in Mon Jan 15 15:33:47 2001
-@@ -33,7 +33,7 @@
-
- DESTDIR =
-
--pkgdatadir = $(datadir)/@PACKAGE@
-+pkgdatadir = $(datadir)/examples/@PACKAGE@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
-
-@@ -216,7 +216,16 @@
- install-exec-am:
- install-exec: install-exec-am
-
--install-data-am:
-+install-data-am: $(noinst_DATA) $(EXTRA_DIST)
-+ @$(NORMAL_INSTALL)
-+ $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)
-+ @list='$(noinst_DATA) $(EXTRA_DIST)'; for p in $$list; do \
-+ if test -f "$$p"; then d= ; else d="$(srcdir)/"; fi; \
-+ f="`echo $$p | sed -e 's|^.*/||'`"; \
-+ echo " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(pkgdatadir)/$$f"; \
-+ $(INSTALL_DATA) $$d$$p $(DESTDIR)$(pkgdatadir)/$$f; \
-+ done
-+
- install-data: install-data-am
-
- install-am: all-am
diff --git a/sysutils/amanda-server/patches/patch-ak b/sysutils/amanda-server/patches/patch-ak
deleted file mode 100644
index c90054087ed..00000000000
--- a/sysutils/amanda-server/patches/patch-ak
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ak,v 1.1 2001/01/16 21:59:40 cjones Exp $
-
---- docs/Makefile.in.orig Sat Nov 25 07:02:01 2000
-+++ docs/Makefile.in Mon Jan 15 15:33:59 2001
-@@ -33,7 +33,7 @@
-
- DESTDIR =
-
--pkgdatadir = $(datadir)/@PACKAGE@
-+pkgdatadir = $(datadir)/doc/@PACKAGE@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
-
diff --git a/sysutils/amanda-server/patches/patch-al b/sysutils/amanda-server/patches/patch-al
deleted file mode 100644
index e82d941fd6c..00000000000
--- a/sysutils/amanda-server/patches/patch-al
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-al,v 1.2 2001/06/26 03:14:12 christos Exp $
-
---- man/Makefile.in.orig Tue Apr 3 15:55:45 2001
-+++ man/Makefile.in Mon Jun 25 22:54:40 2001
-@@ -159,7 +159,7 @@
- # not autoconf-generated:
- EXTRA_DIST = amplot.8 amrestore.8 amtape.8
-
--man_MANS = $(AMPLOT_MAN_PAGES) $(COMMON_MAN_PAGES) $(SERVER_MAN_PAGES) $(RECOVER_MAN_PAGES) $(RESTORE_MAN_PAGES)
-+man_MANS = $(AMPLOT_MAN_PAGES) $(SERVER_MAN_PAGES) $(RECOVER_MAN_PAGES) $(RESTORE_MAN_PAGES)
-
- mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
- CONFIG_HEADER = ../config/config.h
diff --git a/sysutils/amanda-server/patches/patch-ba b/sysutils/amanda-server/patches/patch-ba
deleted file mode 100644
index bbd7226500f..00000000000
--- a/sysutils/amanda-server/patches/patch-ba
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ba,v 1.1 2001/03/16 11:19:29 tron Exp $
-
---- common-src/token.h.orig Thu Mar 15 20:30:31 2001
-+++ common-src/token.h Thu Mar 15 20:30:43 2001
-@@ -42,7 +42,7 @@
- extern char *quotef P((char *sep, char *format, ...));
- extern char *quote P((char *sep, char *str));
- extern char *rxquote P((char *str));
--extern char *shquote P((char *str));
-+extern char *am_shquote P((char *str));
- extern int table_lookup P((table_t *table, char *str));
- extern char *table_lookup_r P((table_t *table, int val));
-
diff --git a/sysutils/amanda-server/patches/patch-bb b/sysutils/amanda-server/patches/patch-bb
deleted file mode 100644
index 6e099de9967..00000000000
--- a/sysutils/amanda-server/patches/patch-bb
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-bb,v 1.1 2001/03/16 11:19:29 tron Exp $
-
---- common-src/token.c.orig Thu Mar 15 20:30:23 2001
-+++ common-src/token.c Thu Mar 15 20:30:56 2001
-@@ -295,7 +295,7 @@
- }
-
- /* Quote a string so that it can be safely passed to a shell */
--char *shquote(str)
-+char *am_shquote(str)
- char *str; /* the string to quote */
- {
- char *pi, *po;
diff --git a/sysutils/amanda-server/patches/patch-bc b/sysutils/amanda-server/patches/patch-bc
deleted file mode 100644
index 5501efea5fa..00000000000
--- a/sysutils/amanda-server/patches/patch-bc
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-bc,v 1.1 2002/06/06 01:38:42 simonb Exp $
-
---- server-src/reporter.c.orig Sat Feb 3 06:07:57 2001
-+++ server-src/reporter.c
-@@ -168,13 +168,13 @@
- { "HostName", 0, 12, 12, 0, "%-*.*s", "HOSTNAME" },
- { "Disk", 1, 11, 11, 0, "%-*.*s", "DISK" },
- { "Level", 1, 1, 1, 0, "%*.*d", "L" },
-- { "OrigKB", 1, 7, 0, 0, "%*.*f", "ORIG-KB" },
-- { "OutKB", 0, 7, 0, 0, "%*.*f", "OUT-KB" },
-+ { "OrigKB", 1, 9, 0, 0, "%*.*f", "ORIG-KB" },
-+ { "OutKB", 0, 9, 0, 0, "%*.*f", "OUT-KB" },
- { "Compress", 0, 6, 1, 0, "%*.*f", "COMP%" },
- { "DumpTime", 0, 7, 7, 0, "%*.*s", "MMM:SS" },
-- { "DumpRate", 0, 6, 1, 0, "%*.*f", "KB/s" },
-+ { "DumpRate", 0, 7, 1, 0, "%*.*f", "KB/s" },
- { "TapeTime", 1, 6, 6, 0, "%*.*s", "MMM:SS" },
-- { "TapeRate", 0, 6, 1, 0, "%*.*f", "KB/s" },
-+ { "TapeRate", 0, 7, 1, 0, "%*.*f", "KB/s" },
- { NULL, 0, 0, 0, 0, NULL, NULL }
- };
- static char *ColumnSpec=""; /* filled from config */
diff --git a/sysutils/amanda/DESCR b/sysutils/amanda/DESCR
deleted file mode 100644
index fb4dae0fdae..00000000000
--- a/sysutils/amanda/DESCR
+++ /dev/null
@@ -1,8 +0,0 @@
-Amanda is a backup system designed to archive many computers on a network to a
-single large-capacity tape drive.
-
-This package does not contain anything by itself -- it is a
-"meta-package" that depends on the amanda-client, amanda-server,
-and amanda-plot packages. Its purpose is to require dependencies
-so users can install this package only and have the complete
-Amanda software pulled in by the port/package dependency mechanism.
diff --git a/sysutils/amanda/Makefile b/sysutils/amanda/Makefile
deleted file mode 100644
index 51ddfcd68e1..00000000000
--- a/sysutils/amanda/Makefile
+++ /dev/null
@@ -1,24 +0,0 @@
-# $NetBSD: Makefile,v 1.34 2003/06/04 18:21:48 jschauma Exp $
-#
-
-DISTNAME= amanda-2.4.2p2
-CATEGORIES= sysutils
-MASTER_SITES= # empty
-DISTFILES= # empty
-
-MAINTAINER= tech-pkg@netbsd.org
-HOMEPAGE= http://www.amanda.org/
-COMMENT= The "meta-package" for Amanda, a network backup system
-
-DEPENDS+= amanda-client-2.4.2p2:../../sysutils/amanda-client
-DEPENDS+= amanda-server-2.4.2p2:../../sysutils/amanda-server
-DEPENDS+= amanda-plot-2.4.2p2:../../sysutils/amanda-plot
-
-EXTRACT_ONLY= # empty
-NO_CHECKSUM= yes
-NO_CONFIGURE= yes
-NO_BUILD= yes
-
-do-install: # empty
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/amanda/PLIST b/sysutils/amanda/PLIST
deleted file mode 100644
index 68cccad7ccc..00000000000
--- a/sysutils/amanda/PLIST
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 22:52:46 zuntum Exp $
-@comment this plist intentionally left empty
diff --git a/sysutils/apcupsd/DESCR b/sysutils/apcupsd/DESCR
deleted file mode 100644
index 37a5018dbfe..00000000000
--- a/sysutils/apcupsd/DESCR
+++ /dev/null
@@ -1,5 +0,0 @@
-It allows your computer/server to run during power problems
-for a specified length of time or the life of the batteries
-in your BackUPS, BackUPS Pro, SmartUPS v/s, or SmartUPS, and
-then properly executes a controlled shutdown during an
-extended power failure.
diff --git a/sysutils/apcupsd/MESSAGE b/sysutils/apcupsd/MESSAGE
deleted file mode 100644
index 8099dbdcb36..00000000000
--- a/sysutils/apcupsd/MESSAGE
+++ /dev/null
@@ -1,11 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE,v 1.2 2002/12/01 22:32:25 bouyer Exp $
-
-NOTE: With most APC cables you must put a "local" flag in /etc/ttys for
- the port you connect your UPS to, and run "ttyflags -a" to turn it
- on the first time.
-
-for complete documentation, see the html docs in
-file://${PREFIX}/share/doc/html/apcupsd
-
-===========================================================================
diff --git a/sysutils/apcupsd/Makefile b/sysutils/apcupsd/Makefile
deleted file mode 100644
index 7654e3d7458..00000000000
--- a/sysutils/apcupsd/Makefile
+++ /dev/null
@@ -1,111 +0,0 @@
-# $NetBSD: Makefile,v 1.22 2003/07/13 13:53:13 wiz Exp $
-
-DISTNAME= apcupsd-3.8.6
-PKGREVISION= 1
-CATEGORIES= sysutils
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=apcupsd/}
-
-MAINTAINER= bouyer@netbsd.org
-HOMEPAGE= http://www.sibbald.com/apcupsd/
-COMMENT= UPS power management for APCC Products
-
-BUILD_USES_MSGFMT= yes
-
-USE_BUILDLINK2= yes
-USE_PKGINSTALL= yes
-USE_GMAKE= yes
-
-GNU_CONFIGURE= yes
-
-PKG_SYSCONFSUBDIR= apcupsd
-
-# Thread support is needed to for http support, and to compile powerflute,
-# which has a curses interface
-#
-#CONFIGURE_ARGS+= --enable-http # include http support
-#.include "../../devel/ncurses/buildlink2.mk"
-#CONFIGURE_ARGS+= --enable-threads # compile threading code
-#CONFIGURE_ARGS+= --enable-powerflute # compile powerflute program
-
-CONFIGURE_ARGS+= --with-catgets # use catgets functions
-CONFIGURE_ARGS+= --enable-nls # i18n support
-CONFIGURE_ARGS+= --with-lock-dir=/var/spool/lock
-CONFIGURE_ARGS+= --with-serial-dev=/dev/tty01
-CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
-# configure sets sbindir to '${prefix}/sbin' without expanding $prefix
-# this breaks .in files that uses @sbindir@
-CONFIGURE_ARGS+= --sbindir=${PREFIX}/sbin
-
-EGDIR= ${PREFIX}/share/examples/apcupsd
-
-CONF_FILES_PERMS+= ${EGDIR}/apcupsd.master.conf ${PKG_SYSCONFDIR}/apcupsd.conf ${ROOT_USER} ${ROOT_GROUP} 644
-CONF_FILES_PERMS+= ${EGDIR}/changeme ${PKG_SYSCONFDIR}/changeme ${ROOT_USER} ${ROOT_GROUP} 755
-CONF_FILES_PERMS+= ${EGDIR}/commfailure ${PKG_SYSCONFDIR}/commfailure ${ROOT_USER} ${ROOT_GROUP} 755
-CONF_FILES_PERMS+= ${EGDIR}/commok ${PKG_SYSCONFDIR}/commok ${ROOT_USER} ${ROOT_GROUP} 755
-CONF_FILES_PERMS+= ${EGDIR}/onbattery ${PKG_SYSCONFDIR}/onbattery ${ROOT_USER} ${ROOT_GROUP} 755
-CONF_FILES_PERMS+= ${EGDIR}/mainsback ${PKG_SYSCONFDIR}/mainsback ${ROOT_USER} ${ROOT_GROUP} 755
-SUPPORT_FILES_PERMS= ${EGDIR}/apccontrol ${PKG_SYSCONFDIR}/apccontrol ${ROOT_USER} ${ROOT_GROUP} 755
-RCD_SCRIPTS= apcupsd
-
-# we should probably allow the tty to be set in /etc/mk.conf too
-#
-post-build:
- ${SED} -e 's|@@PREFIX@@|${PREFIX}|' \
- ${WRKSRC}/examples/apcupsd.master.conf > \
- ${WRKDIR}/apcupsd.master.conf
- ${SED} -e 's|@@PREFIX@@|${PREFIX}|' \
- ${WRKSRC}/examples/apcupsd.slave.conf > \
- ${WRKDIR}/apcupsd.slave.conf
- ${SED} -e 's|@@PREFIX@@|${PREFIX}|'\
- -e 's|@@SYSCONFDIR@@|${PKG_SYSCONFDIR}|' \
- ${WRKSRC}/doc/apcupsd.man > ${WRKSRC}/doc/apcupsd.8
-
-DOCS= README.BackUPS \
- README.BackUPS-Pro \
- README.NewerBackUPS-Pro \
- README.Share-UPS \
- README.SmartUPS-VS \
- README.apcaccess \
- README.autoconfig \
- README.cable \
- Statement.APCC \
- apcupsd-bug-1 \
- apcupsd-bug-2 \
- minicom.txt \
- port.gif
-
-HTMLDOCS= apcaccess.html apcnisd.html apctest.html apcupsd-styles.css \
- apcupsd.book apcupsd.gif apcupsd.html batteries.html bugs.html \
- cables.html cgiprogs.html charging.gif config-examples.html \
- configure.html data.html eprom.html events.html faq.html index.html \
- install.html invoking.html kernel_config.html license.html \
- logging.html master-slave.html multiUPS.html multimon.gif \
- new_features_3_7_0.html new_features_3_8_0.html \
- new_features_3_8_1.html new_features_3_8_2.html \
- new_features_3_8_3.html new_features_3_8_4.html \
- new_features_3_8_5.html oldversions.html onbatt.gif online.gif \
- security.html shutdown.html status.gif status.html stopping.html \
- testing.html thanks.gif thanks.html troubles.html \
- upgrading_to_3_7_0.html upsbible.html usb.html win32.html \
- wininstall1.gif wininstall2.gif wininstall3.gif wininstall4.gif \
- wininstall5.gif wininstall6.gif wininstall7.gif
-
-post-install:
- ${INSTALL_DATA} ${WRKDIR}/apcupsd.master.conf \
- ${PREFIX}/share/examples/apcupsd
- ${INSTALL_DATA} ${WRKDIR}/apcupsd.slave.conf \
- ${PREFIX}/share/examples/apcupsd
- ${INSTALL_SCRIPT} ${WRKSRC}/distributions/netbsd/apcupsd \
- ${PREFIX}/etc/rc.d
- ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/apcupsd
-.for file in ${DOCS}
- ${INSTALL_DATA} ${WRKSRC}/doc/${file} ${PREFIX}/share/doc/apcupsd
-.endfor
- ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/html/apcupsd
-.for file in ${HTMLDOCS}
- ${INSTALL_DATA} ${WRKSRC}/doc/manual/${file} \
- ${PREFIX}/share/doc/html/apcupsd
-.endfor
-
-.include "../../devel/gettext-lib/buildlink2.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/apcupsd/PLIST b/sysutils/apcupsd/PLIST
deleted file mode 100644
index 6fcc96a486f..00000000000
--- a/sysutils/apcupsd/PLIST
+++ /dev/null
@@ -1,89 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2002/12/01 22:32:25 bouyer Exp $
-sbin/apcaccess
-sbin/apcnisd
-sbin/apctest
-sbin/apcupsd
-etc/rc.d/apcupsd
-man/man8/apcupsd.8
-share/doc/apcupsd/README.BackUPS
-share/doc/apcupsd/README.BackUPS-Pro
-share/doc/apcupsd/README.NewerBackUPS-Pro
-share/doc/apcupsd/README.Share-UPS
-share/doc/apcupsd/README.SmartUPS-VS
-share/doc/apcupsd/README.apcaccess
-share/doc/apcupsd/README.autoconfig
-share/doc/apcupsd/README.cable
-share/doc/apcupsd/Statement.APCC
-share/doc/apcupsd/apcupsd-bug-1
-share/doc/apcupsd/apcupsd-bug-2
-share/doc/apcupsd/minicom.txt
-share/doc/apcupsd/port.gif
-share/doc/html/apcupsd/apcaccess.html
-share/doc/html/apcupsd/apcnisd.html
-share/doc/html/apcupsd/apctest.html
-share/doc/html/apcupsd/apcupsd-styles.css
-share/doc/html/apcupsd/apcupsd.book
-share/doc/html/apcupsd/apcupsd.gif
-share/doc/html/apcupsd/apcupsd.html
-share/doc/html/apcupsd/batteries.html
-share/doc/html/apcupsd/bugs.html
-share/doc/html/apcupsd/cables.html
-share/doc/html/apcupsd/cgiprogs.html
-share/doc/html/apcupsd/charging.gif
-share/doc/html/apcupsd/config-examples.html
-share/doc/html/apcupsd/configure.html
-share/doc/html/apcupsd/data.html
-share/doc/html/apcupsd/eprom.html
-share/doc/html/apcupsd/events.html
-share/doc/html/apcupsd/faq.html
-share/doc/html/apcupsd/index.html
-share/doc/html/apcupsd/install.html
-share/doc/html/apcupsd/invoking.html
-share/doc/html/apcupsd/kernel_config.html
-share/doc/html/apcupsd/license.html
-share/doc/html/apcupsd/logging.html
-share/doc/html/apcupsd/master-slave.html
-share/doc/html/apcupsd/multiUPS.html
-share/doc/html/apcupsd/multimon.gif
-share/doc/html/apcupsd/new_features_3_7_0.html
-share/doc/html/apcupsd/new_features_3_8_0.html
-share/doc/html/apcupsd/new_features_3_8_1.html
-share/doc/html/apcupsd/new_features_3_8_2.html
-share/doc/html/apcupsd/new_features_3_8_3.html
-share/doc/html/apcupsd/new_features_3_8_4.html
-share/doc/html/apcupsd/new_features_3_8_5.html
-share/doc/html/apcupsd/oldversions.html
-share/doc/html/apcupsd/onbatt.gif
-share/doc/html/apcupsd/online.gif
-share/doc/html/apcupsd/security.html
-share/doc/html/apcupsd/shutdown.html
-share/doc/html/apcupsd/status.gif
-share/doc/html/apcupsd/status.html
-share/doc/html/apcupsd/stopping.html
-share/doc/html/apcupsd/testing.html
-share/doc/html/apcupsd/thanks.gif
-share/doc/html/apcupsd/thanks.html
-share/doc/html/apcupsd/troubles.html
-share/doc/html/apcupsd/upgrading_to_3_7_0.html
-share/doc/html/apcupsd/upsbible.html
-share/doc/html/apcupsd/usb.html
-share/doc/html/apcupsd/win32.html
-share/doc/html/apcupsd/wininstall1.gif
-share/doc/html/apcupsd/wininstall2.gif
-share/doc/html/apcupsd/wininstall3.gif
-share/doc/html/apcupsd/wininstall4.gif
-share/doc/html/apcupsd/wininstall5.gif
-share/doc/html/apcupsd/wininstall6.gif
-share/doc/html/apcupsd/wininstall7.gif
-share/examples/apcupsd/apcupsd.master.conf
-share/examples/apcupsd/apcupsd.slave.conf
-share/examples/apcupsd/apccontrol
-share/examples/apcupsd/changeme
-share/examples/apcupsd/commfailure
-share/examples/apcupsd/commok
-share/examples/apcupsd/onbattery
-share/examples/apcupsd/mainsback
-share/locale/it/LC_MESSAGES/apcupsd.mo
-@dirrm share/doc/apcupsd
-@dirrm share/doc/html/apcupsd
-@dirrm share/examples/apcupsd
diff --git a/sysutils/apcupsd/distinfo b/sysutils/apcupsd/distinfo
deleted file mode 100644
index d91f6d4a760..00000000000
--- a/sysutils/apcupsd/distinfo
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: distinfo,v 1.6 2003/03/27 20:01:22 bouyer Exp $
-
-SHA1 (apcupsd-3.8.6.tar.gz) = 443a9625d29312c46edcc24b69802a083ed22b69
-Size (apcupsd-3.8.6.tar.gz) = 2013820 bytes
-SHA1 (patch-aa) = 1b8e48b25be9ef1787a4f27a5a228088807a4a26
-SHA1 (patch-ab) = cbca60f56412513a2141f24a711affbef06c1299
-SHA1 (patch-ac) = f153727711fde0b3ea71b30a258d8d5e7b2472bb
-SHA1 (patch-ad) = 3411f109aa98799c686bd20cb5bce515a150dcbe
-SHA1 (patch-ae) = 230f307753c643944e66c8ab68129a9ec2581bce
-SHA1 (patch-af) = 82eebc194a45aeccd707370f52a0bebff4ea32b1
-SHA1 (patch-aj) = f6bb21d0ebc95501c3a5ea32f2bd7d9c500f68ef
-SHA1 (patch-ak) = 754803ca43d7f7d6d7a044f898e60f4246a1e54d
-SHA1 (patch-al) = 12b03c8426fd157946d2f41656f91b851d83d915
-SHA1 (patch-am) = acea61182b599f058bbdda439c221b1f84c7ca04
-SHA1 (patch-an) = 87b508441d8c1053cace47375a605c75e65aaa03
-SHA1 (patch-ao) = 81d92529336d9bbaf87e876cf1ee130ea90e71eb
-SHA1 (patch-ap) = 288f8d4d358a33f12771a2e1dac041d690f7da25
diff --git a/sysutils/apcupsd/patches/patch-aa b/sysutils/apcupsd/patches/patch-aa
deleted file mode 100644
index 6d29b2e2302..00000000000
--- a/sysutils/apcupsd/patches/patch-aa
+++ /dev/null
@@ -1,126 +0,0 @@
-$NetBSD: patch-aa,v 1.3 2002/12/01 22:32:26 bouyer Exp $
-
---- doc/apcupsd.man.orig Fri Feb 2 23:46:33 2001
-+++ doc/apcupsd.man Sun Dec 1 13:13:59 2002
-@@ -4,19 +4,19 @@
- .\" LP paragraph
- .\" IP indented paragraph
- .\" TP hanging label
--.TH apcupsd 8 "APC UPS management under Linux -- November 1999"
-+.TH apcupsd 8 "APC UPS management under Unix -- November 1999"
- .SH NAME
--apcupsd \- daemon for most APC's UPS for Linux
-+apcupsd \- daemon for most APC's UPS for Unix
- .SH SYNOPSIS
--.B /sbin/apcupsd
-+.B @@PREFIX@@/sbin/apcupsd
- .br
--.B /etc/apcupsd/apccontrol
-+.B @@SYSCONFDIR@@/apccontrol
- .br
--.B /etc/apcupsd/apcupsd.conf
-+.B @@SYSCONFDIR@@/apcupsd.conf
- .br
--.B /sbin/apcaccess
-+.B @@PREFIX@@/sbin/apcaccess
- .br
--.B /sbin/apcnetd
-+.B @@PREFIX@@/sbin/apcnetd
- .br
- .SH DESCRIPTION
- .LP
-@@ -29,7 +29,7 @@
- above shutdown conditions is met, "apcupsd" will inform users about this
- fact.
-
--The shutdown is made by script calls to "/etc/apcupsd/apccontrol", which
-+The shutdown is made by script calls to "@@SYSCONFDIR@@/apccontrol", which
- is called by "apcupsd". Consequently, no changes to /etc/inittab are necessary.
- There is no communication between "apcupsd" and init(1) process.
- Apcupsd modifies the halt script so that at the end of the shutdown
-@@ -50,22 +50,18 @@
- has a network connection with the slaves and sends them information
- about the UPS status.
-
--.LP
--RedHat and S.u.S.E. versions of Linux have direct install support. All
--other "FLAVORS" of Linux will need some fussing with to get the install
--correct.
- .SH OPTIONS
- .TP
- .B \-c --configure
- Attempts to configure the UPS EPROM to the values specified in the
--configuration file "/etc/apcupsd/apcupsd.conf".
-+configuration file "@@SYSCONFDIR@@/apcupsd.conf".
- .TP
- .B \-d --debug <level>
- Turns on debugging output for a NETSLAVE or a NETMASTER.
- .TP
- .B \-f --config-file <file>
- Specifies the location of the configuration file. The default
--is: /etc/apcupsd/apcupsd.conf
-+is: @@SYSCONFDIR@@/apcupsd.conf
- .TP
- .B \-k --killpower
- Attempt to turn the UPS off. This option is normally only
-@@ -74,7 +70,7 @@
- .TP
- .B \-n --rename-ups
- Attempts to change the UPS name stored in the UPS EPROM
--to that specified in your "/etc/apcupsd/apcupsd.conf" file.
-+to that specified in your "@@SYSCONFDIR@@/apcupsd.conf" file.
- .TP
- .B \-u --update-battery-date
- Attempts to update the battery date stored in the UPS EPROM. Normally
-@@ -88,12 +84,12 @@
-
- .SH CONFIGURATION
- It may be necessary to change the configuration information in the file
--"/etc/apcupsd/apcupsd.conf" to meet your needs and to correspond to your
-+"@@SYSCONFDIR@@/apcupsd.conf" to meet your needs and to correspond to your
- configuration. This file is a plain ASCII file and you can use your
- favorite editor to change it.
- .LP
- Configuration commands in
--.B /etc/apcupsd/apcupsd.conf
-+.B @@SYSCONFDIR@@/apcupsd.conf
- are:
-
- .LP
-@@ -131,7 +127,7 @@
- -- <name of serial port>
- .br
- Please specify which device is used for UPS communication.
--The default is /dev/ttyS[0|1|2|3].
-+The default is /dev/tty0[0|1|2|3].
- .LP
- .B LOCKFILE
- -- <path to lockfile>
-@@ -615,13 +611,13 @@
- .br
- 940-0023A Simple Signal UNIX, [BROKEN STILL].
- .SH FILES
--.B /etc/apcupsd/apcupsd.conf
-+.B @@SYSCONFDIR@@/apcupsd.conf
- - configuration file.
- .br
--.B /etc/apcupsd/apcupsd.status
-+.B /var/run/apcupsd.status
- - STATUS file
- .br
--.B /etc/apcupsd/apcupsd.events
-+.B /var/log/apcupsd.events
- - where up to the last 50 events are stored
- for the network information server.
- .SH EVENTS
-@@ -630,8 +626,8 @@
- ...
-
- These events are sent to the system log, optionally sent
--to the temporary events file (/etc/apcupsd/apcupsd.events),
--and they also generate a call to /etc/apcupsd/apccontrol
-+to the temporary events file (/var/run/apcupsd.events),
-+and they also generate a call to @@SYSCONFDIR@@/apccontrol
- which in turn will call any scripts you have placed in the
- /etc/apcupsd directory.
-
diff --git a/sysutils/apcupsd/patches/patch-ab b/sysutils/apcupsd/patches/patch-ab
deleted file mode 100644
index 34f83275120..00000000000
--- a/sysutils/apcupsd/patches/patch-ab
+++ /dev/null
@@ -1,64 +0,0 @@
-$NetBSD: patch-ab,v 1.3 2002/12/01 22:32:27 bouyer Exp $
-
---- examples/apcupsd.master.conf.orig Sun Dec 1 13:17:57 2002
-+++ examples/apcupsd.master.conf Sun Dec 1 13:20:07 2002
-@@ -33,11 +33,11 @@
- #
- #DEVICE <string> /dev/<serial port>
- # name of your serial port
--DEVICE /dev/ttyS0
-+DEVICE /dev/tty01
- #
- #LOCKFILE <path to lockfile>
- # path for serial port lock file
--LOCKFILE /var/lock
-+LOCKFILE /var/spool/lock
- #
- #
- #
-@@ -80,7 +80,7 @@
- # information server. If netstatus is on, a network information
- # server process will be started for serving the STATUS and
- # EVENT data over the network (used by CGI programs).
--NETSERVER on
-+NETSERVER off
- #
- # SERVERPORT <port> default is 7000
- # port to use for sending STATUS and EVENTS data over the network.
-@@ -91,7 +91,7 @@
- #
- # If you want the last few EVENTS to be available over the network
- # by the network information server, you must define an EVENTSFILE.
--EVENTSFILE /etc/apcupsd/apcupsd.events
-+EVENTSFILE /var/log/apcupsd.events
- #
- #
- #
-@@ -102,7 +102,7 @@
- STATTIME 0
- #
- # STATFILE
--STATFILE /etc/apcupsd/apcupsd.status
-+STATFILE /var/run/apcupsd.status
- #
- #
- # LOGSTATS [ on | off ] on enables, off disables
-@@ -134,15 +134,15 @@
- #
- # UPSCLASS [ standalone | shareslave | sharemaster | netslave | netmaster ]
- # normally standalone unless you share a UPS with multiple machines.
--UPSCLASS netmaster
-+UPSCLASS standalone
- #
- # Unless you want to share the UPS (power multiple machines).
- # this should be disable
- # UPSMODE [ disable | share | net | sharenet ]
--UPSMODE net
-+UPSMODE disable
- #
- #NETACCESS <string> [ true | false ] Enable Network Access Support
--NETACCESS true
-+NETACCESS false
- #
- # NETTIME <int>
- NETTIME 10
diff --git a/sysutils/apcupsd/patches/patch-ac b/sysutils/apcupsd/patches/patch-ac
deleted file mode 100644
index 6562d08c7df..00000000000
--- a/sysutils/apcupsd/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.3 2002/12/01 22:32:27 bouyer Exp $
-
---- include/apc_defines.h.orig Sun Dec 1 13:24:41 2002
-+++ include/apc_defines.h Sun Dec 1 13:24:45 2002
-@@ -86,7 +86,7 @@
- * -RF
- */
- #define APC_LOCK_PREFIX "/LCK.."
--#define LOCK_DEFAULT "/var/lock"
-+#define LOCK_DEFAULT "/var/spool/lock"
-
- /*
- * JHNC:
diff --git a/sysutils/apcupsd/patches/patch-ad b/sysutils/apcupsd/patches/patch-ad
deleted file mode 100644
index 30799ff2035..00000000000
--- a/sysutils/apcupsd/patches/patch-ad
+++ /dev/null
@@ -1,66 +0,0 @@
-$NetBSD: patch-ad,v 1.3 2002/12/01 22:32:27 bouyer Exp $
-
---- distributions/netbsd/apccontrol.sh.in.orig Sun Dec 1 13:32:57 2002
-+++ distributions/netbsd/apccontrol.sh.in Sun Dec 1 13:31:47 2002
-@@ -50,28 +50,36 @@
- ;;
- commfailure)
- printf "Warning serial port communications with UPS lost." | wall
-+ /usr/bin/logger -p user.info -t apccontrol "Warning serial port communications with UPS lost."
- ;;
- commok)
- printf "Serial communciations with UPS restored." | wall
-+ /usr/bin/logger -p user.info -t apccontrol "Serial communciations with UPS restored."
- ;;
- powerout)
- printf "Warning power loss detected." | wall
-+ /usr/bin/logger -p user.info -t apccontrol "Warning power loss detected."
- ;;
- onbattery)
- printf "Power failure. Running on UPS batteries." | wall
-+ /usr/bin/logger -p user.info -t apccontrol "Power failure. Running on UPS batteries."
- ;;
- failing)
- printf "UPS battery power exhaused. Doing shutdown.\n" | wall
-+ /usr/bin/logger -p user.info -t apccontrol "UPS battery power exhaused. Doing shutdown.\n"
- ;;
- timeout)
- printf "UPS battery runtime limit exceded. Doing shutdown.\n" | wall
-+ /usr/bin/logger -p user.info -t apccontrol "UPS battery runtime limit exceded. Doing shutdown.\n"
- ;;
- loadlimit)
- printf "UPS battery discharge limit reached. Doing shutdown.\n" | wall
-+ /usr/bin/logger -p user.info -t apccontrol "UPS battery discharge limit reached. Doing shutdown.\n"
- ;;
- runlimit)
- printf "UPS battery runtime percent reached. Doing shutdown.\n" \
- | wall
-+ /usr/bin/logger -p user.info -t apccontrol "UPS battery runtime percent reached. Doing shutdown.\n"
- ;;
- doreboot)
- printf "Beginning Reboot Sequence" | wall
-@@ -83,8 +91,10 @@
- ;;
- mainsback)
- printf "Power has returned..." | wall
-+ /usr/bin/logger -p user.info -t apccontrol "Power has returned..."
- if [ -f @PWRFAILDIR@/powerfail ] ; then
- printf "Continuing with shutdown. I hope you don't have a linux box as the UPS master ..." | wall
-+ /usr/bin/logger -p user.info -t apccontrol "Continuing with shutdown. I hope you don't have a linux box as the UPS master ..."
- fi
- ;;
- annoyme)
-@@ -93,11 +103,13 @@
- emergency)
- printf "Emergency Shutdown. Possible UPS battery failure." \
- | wall
-+ /usr/bin/logger -p user.info -t apccontrol "Emergency Shutdown. Possible UPS battery failure."
- ${SHUTDOWN} -h now "apcupsd emergency shutdown"
- ;;
- changeme)
- printf "Emergency! UPS batteries have failed\nChange them NOW" \
- | wall
-+ /usr/bin/logger -p user.info -t apccontrol "Emergency! UPS batteries have failed\nChange them NOW"
- ;;
- remotedown)
- printf "Remote Shutdown.\nBeginning Shutdown Sequence." | wall
diff --git a/sysutils/apcupsd/patches/patch-ae b/sysutils/apcupsd/patches/patch-ae
deleted file mode 100644
index ae2279939ab..00000000000
--- a/sysutils/apcupsd/patches/patch-ae
+++ /dev/null
@@ -1,27 +0,0 @@
-$NetBSD: patch-ae,v 1.3 2002/12/01 22:32:27 bouyer Exp $
-
---- autoconf/configure.in.orig Fri Dec 14 16:09:12 2001
-+++ autoconf/configure.in Sun Dec 1 15:42:34 2002
-@@ -57,13 +57,6 @@
- if test x$sysconfdir = x'${prefix}/etc' ; then
- sysconfdir='/etc/apcupsd'
- fi
--
--dnl
--dnl If the user has not set -sbindir, we set our default as /sbin
--dnl
-- if test x$sbindir = x'${exec_prefix}/sbin' ; then
-- sbindir='/sbin'
-- fi
- fi
-
- dnl
-@@ -155,7 +148,7 @@
- AC_SUBST(UTILPROGS)
-
- dnl Now check for programs
--AC_PATH_PROGS(SHUTDOWN, shutdown shutdown.bsd, no)
-+AC_PATH_PROGS(SHUTDOWN, shutdown shutdown.bsd, no, $PATH:/sbin:/usr/sbin)
- if test "$SHUTDOWN" = "no"
- then
- if test "$ac_cv_cygwin" = no
diff --git a/sysutils/apcupsd/patches/patch-af b/sysutils/apcupsd/patches/patch-af
deleted file mode 100644
index 0264d97d6b5..00000000000
--- a/sysutils/apcupsd/patches/patch-af
+++ /dev/null
@@ -1,92 +0,0 @@
-$NetBSD: patch-af,v 1.4 2002/12/01 22:32:27 bouyer Exp $
-
---- Makefile.in.orig Fri Jan 4 10:08:33 2002
-+++ Makefile.in Sun Dec 1 15:54:19 2002
-@@ -29,18 +29,12 @@
- #
- # this is a list of all subdirectories that contain or could contain Makefiles
- #
--subdirs = . @INTLSUB@ @POSUB@ cgi doc lib contrib distributions \
-- distributions/debian distributions/engarde \
-- distributions/freebsd distributions/hpux distributions/openbsd \
-- distributions/redhat \
-- distributions/slackware distributions/sun distributions/suse \
-- distributions/unifix distributions/netbsd distributions/caldera win32
-+subdirs = . @INTLSUB@ @POSUB@ cgi doc lib contrib
-
- CC = @CC@
-
- # For some losing Unix makes.
- SHELL = /bin/sh
--MAKE = make
-
- CFLAGS = @CFLAGS@ @PTHREAD_CFLAGS@
- LDFLAGS = @LDFLAGS@ @PTHREAD_LFLAGS@
-@@ -66,6 +60,8 @@
-
- # Program to install `make'.
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-+# Program to install scripts
-+INSTALL_SCRIPT = @INSTALL_SCRIPT@
- # Program to install the man page.
- INSTALL_DATA = @INSTALL_DATA@
- # Generic install program.
-@@ -209,7 +205,7 @@
- $(SHELL) ${srcdir}/scripts/mkinstalldirs $(sysconfdir); \
- chmod 755 $(sysconfdir); \
- fi;
-- $(SHELL) ${srcdir}/scripts/mkinstalldirs $(sbindir) $(mandir)
-+ $(SHELL) ${srcdir}/scripts/mkinstalldirs $(sbindir) $(mandir) $(prefix)/share/examples/apcupsd
- @echo "Installing apcupsd binary..."
- @strip $(srcdir)/apcupsd $(srcdir)/apcaccess
- @strip $(srcdir)/apcnisd $(srcdir)/apctest
-@@ -221,31 +217,16 @@
- @echo "Installing apctest binary..."
- $(INSTALL_PROGRAM) $(srcdir)/apctest $(sbindir)/apctest
- @echo "Installing apccontrol script..."
-- $(INSTALL_PROGRAM) -m 744 $(srcdir)/distributions/$(DISTNAME)/apccontrol.sh $(sysconfdir)/apccontrol
-+ $(INSTALL_SCRIPT) $(srcdir)/distributions/$(DISTNAME)/apccontrol.sh $(prefix)/share/examples/apcupsd/apccontrol
- @echo "Installing manual pages..."
-- $(INSTALL_DATA) $(srcdir)/doc/apcupsd.man $(mandir)/apcupsd.$(manext)
-+ $(INSTALL_DATA) $(srcdir)/doc/apcupsd.$(manext) $(mandir)/apcupsd.$(manext)
- @echo "Installing language catalogs..."
- @POMAKE@ install
--# don't overwrite any existing config file
-- echo "Installing apcupsd.conf..."; \
-- if [ -f $(srcdir)/distributions/$(DISTNAME)/apcupsd.conf ]; then \
-- srcconf=$(srcdir)/distributions/$(DISTNAME)/apcupsd.conf; \
-- else \
-- srcconf=etc/apcupsd.conf; \
-- fi; \
-- if test -f $(sysconfdir)/apcupsd.conf; then \
-- dstconf=apcupsd.conf.new; \
-- echo " found old apcupsd.conf, installing new conf file as $$dstconf"; \
-- else \
-- dstconf=apcupsd.conf; \
-- fi; \
-- echo "$(INSTALL_DATA) $$srcconf $(sysconfdir)/$$dstconf"; \
-- $(INSTALL_PROGRAM) -m 644 $$srcconf $(sysconfdir)/$$dstconf
-- $(INSTALL_PROGRAM) -m 744 $(srcdir)/etc/changeme $(sysconfdir)
-- $(INSTALL_PROGRAM) -m 744 $(srcdir)/etc/commfailure $(sysconfdir)
-- $(INSTALL_PROGRAM) -m 744 $(srcdir)/etc/commok $(sysconfdir)
-- $(INSTALL_PROGRAM) -m 744 $(srcdir)/etc/onbattery $(sysconfdir)
-- $(INSTALL_PROGRAM) -m 744 $(srcdir)/etc/mainsback $(sysconfdir)
-+ $(INSTALL_SCRIPT) $(srcdir)/etc/changeme $(prefix)/share/examples/apcupsd
-+ $(INSTALL_SCRIPT) $(srcdir)/etc/commfailure $(prefix)/share/examples/apcupsd
-+ $(INSTALL_SCRIPT) $(srcdir)/etc/commok $(prefix)/share/examples/apcupsd
-+ $(INSTALL_SCRIPT) $(srcdir)/etc/onbattery $(prefix)/share/examples/apcupsd
-+ $(INSTALL_SCRIPT) $(srcdir)/etc/mainsback $(prefix)/share/examples/apcupsd
-
-
- install-apcupsdwin32: apcupsd
-@@ -254,10 +235,6 @@
-
-
- install-distdir:
-- @if test @WIN32@x != win32x; then \
-- (cd $(srcdir)/distributions/$(DISTNAME); \
-- $(MAKE) "DISTVER=$(DISTVER)" install); \
-- fi
-
- install-cgi:
- @CGIMAKE@ install
diff --git a/sysutils/apcupsd/patches/patch-aj b/sysutils/apcupsd/patches/patch-aj
deleted file mode 100644
index 3e9a09cce3a..00000000000
--- a/sysutils/apcupsd/patches/patch-aj
+++ /dev/null
@@ -1,2419 +0,0 @@
-$NetBSD: patch-aj,v 1.4 2002/12/01 22:32:28 bouyer Exp $
-
---- configure.orig Sat Jan 5 16:13:02 2002
-+++ configure Sun Dec 1 15:42:56 2002
-@@ -704,17 +704,13 @@
- if test x$sysconfdir = x'${prefix}/etc' ; then
- sysconfdir='/etc/apcupsd'
- fi
--
-- if test x$sbindir = x'${exec_prefix}/sbin' ; then
-- sbindir='/sbin'
-- fi
- fi
-
-
- # Extract the first word of "gcc", so it can be a program name with args.
- set dummy gcc; ac_word=$2
- echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:718: checking for $ac_word" >&5
-+echo "configure:714: checking for $ac_word" >&5
- if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -744,7 +740,7 @@
- # Extract the first word of "cc", so it can be a program name with args.
- set dummy cc; ac_word=$2
- echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:748: checking for $ac_word" >&5
-+echo "configure:744: checking for $ac_word" >&5
- if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -795,7 +791,7 @@
- # Extract the first word of "cl", so it can be a program name with args.
- set dummy cl; ac_word=$2
- echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:799: checking for $ac_word" >&5
-+echo "configure:795: checking for $ac_word" >&5
- if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -827,7 +823,7 @@
- fi
-
- echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
--echo "configure:831: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
-+echo "configure:827: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
-
- ac_ext=c
- # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-@@ -838,12 +834,12 @@
-
- cat > conftest.$ac_ext << EOF
-
--#line 842 "configure"
-+#line 838 "configure"
- #include "confdefs.h"
-
- main(){return(0);}
- EOF
--if { (eval echo configure:847: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:843: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- ac_cv_prog_cc_works=yes
- # If we can't run a trivial program, we are probably using a cross compiler.
- if (./conftest; exit) 2>/dev/null; then
-@@ -869,12 +865,12 @@
- { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
- fi
- echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
--echo "configure:873: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
-+echo "configure:869: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
- echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
- cross_compiling=$ac_cv_prog_cc_cross
-
- echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
--echo "configure:878: checking whether we are using GNU C" >&5
-+echo "configure:874: checking whether we are using GNU C" >&5
- if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -883,7 +879,7 @@
- yes;
- #endif
- EOF
--if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:887: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
-+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:883: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
- ac_cv_prog_gcc=yes
- else
- ac_cv_prog_gcc=no
-@@ -902,7 +898,7 @@
- ac_save_CFLAGS="$CFLAGS"
- CFLAGS=
- echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
--echo "configure:906: checking whether ${CC-cc} accepts -g" >&5
-+echo "configure:902: checking whether ${CC-cc} accepts -g" >&5
- if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -933,7 +929,7 @@
- fi
- fi
- echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
--echo "configure:937: checking how to run the C preprocessor" >&5
-+echo "configure:933: checking how to run the C preprocessor" >&5
- # On Suns, sometimes $CPP names a directory.
- if test -n "$CPP" && test -d "$CPP"; then
- CPP=
-@@ -948,13 +944,13 @@
- # On the NeXT, cc -E runs the code through the compiler's parser,
- # not just through cpp.
- cat > conftest.$ac_ext <<EOF
--#line 952 "configure"
-+#line 948 "configure"
- #include "confdefs.h"
- #include <assert.h>
- Syntax Error
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:958: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:954: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
- ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
- if test -z "$ac_err"; then
- :
-@@ -965,13 +961,13 @@
- rm -rf conftest*
- CPP="${CC-cc} -E -traditional-cpp"
- cat > conftest.$ac_ext <<EOF
--#line 969 "configure"
-+#line 965 "configure"
- #include "confdefs.h"
- #include <assert.h>
- Syntax Error
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:975: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:971: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
- ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
- if test -z "$ac_err"; then
- :
-@@ -982,13 +978,13 @@
- rm -rf conftest*
- CPP="${CC-cc} -nologo -E"
- cat > conftest.$ac_ext <<EOF
--#line 986 "configure"
-+#line 982 "configure"
- #include "confdefs.h"
- #include <assert.h>
- Syntax Error
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:992: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:988: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
- ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
- if test -z "$ac_err"; then
- :
-@@ -1013,10 +1009,10 @@
- echo "$ac_t""$CPP" 1>&6
- if test "x$CC" != xcc; then
- echo $ac_n "checking whether $CC and cc understand -c and -o together""... $ac_c" 1>&6
--echo "configure:1017: checking whether $CC and cc understand -c and -o together" >&5
-+echo "configure:1013: checking whether $CC and cc understand -c and -o together" >&5
- else
- echo $ac_n "checking whether cc understands -c and -o together""... $ac_c" 1>&6
--echo "configure:1020: checking whether cc understands -c and -o together" >&5
-+echo "configure:1016: checking whether cc understands -c and -o together" >&5
- fi
- set dummy $CC; ac_cc="`echo $2 |
- sed -e 's/[^a-zA-Z0-9_]/_/g' -e 's/^[0-9]/_/'`"
-@@ -1028,16 +1024,16 @@
- # We do the test twice because some compilers refuse to overwrite an
- # existing .o file with -o, though they will create one.
- ac_try='${CC-cc} -c conftest.c -o conftest.o 1>&5'
--if { (eval echo configure:1032: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } &&
-- test -f conftest.o && { (eval echo configure:1033: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; };
-+if { (eval echo configure:1028: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } &&
-+ test -f conftest.o && { (eval echo configure:1029: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; };
- then
- eval ac_cv_prog_cc_${ac_cc}_c_o=yes
- if test "x$CC" != xcc; then
- # Test first that cc exists at all.
-- if { ac_try='cc -c conftest.c 1>&5'; { (eval echo configure:1038: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }; then
-+ if { ac_try='cc -c conftest.c 1>&5'; { (eval echo configure:1034: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }; then
- ac_try='cc -c conftest.c -o conftest.o 1>&5'
-- if { (eval echo configure:1040: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } &&
-- test -f conftest.o && { (eval echo configure:1041: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; };
-+ if { (eval echo configure:1036: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } &&
-+ test -f conftest.o && { (eval echo configure:1037: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; };
- then
- # cc works too.
- :
-@@ -1064,13 +1060,13 @@
- fi
- if test $ac_cv_prog_gcc = yes; then
- echo $ac_n "checking whether ${CC-cc} needs -traditional""... $ac_c" 1>&6
--echo "configure:1068: checking whether ${CC-cc} needs -traditional" >&5
-+echo "configure:1064: checking whether ${CC-cc} needs -traditional" >&5
- if eval "test \"`echo '$''{'ac_cv_prog_gcc_traditional'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- ac_pattern="Autoconf.*'x'"
- cat > conftest.$ac_ext <<EOF
--#line 1074 "configure"
-+#line 1070 "configure"
- #include "confdefs.h"
- #include <sgtty.h>
- Autoconf TIOCGETP
-@@ -1088,7 +1084,7 @@
-
- if test $ac_cv_prog_gcc_traditional = no; then
- cat > conftest.$ac_ext <<EOF
--#line 1092 "configure"
-+#line 1088 "configure"
- #include "confdefs.h"
- #include <termio.h>
- Autoconf TCGETA
-@@ -1120,7 +1116,7 @@
- # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
- # ./install, which can be erroneously created by make from ./install.sh.
- echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
--echo "configure:1124: checking for a BSD compatible install" >&5
-+echo "configure:1120: checking for a BSD compatible install" >&5
- if test -z "$INSTALL"; then
- if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-@@ -1171,12 +1167,12 @@
- test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
-
- test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
-- for ac_prog in gawk mawk nawk awk
-+ for ac_prog in mawk gawk nawk awk
- do
- # Extract the first word of "$ac_prog", so it can be a program name with args.
- set dummy $ac_prog; ac_word=$2
- echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:1180: checking for $ac_word" >&5
-+echo "configure:1176: checking for $ac_word" >&5
- if eval "test \"`echo '$''{'ac_cv_prog_AWK'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -1261,7 +1257,7 @@
- with_pthreads=no
- fi
- echo $ac_n "checking for pthreads""... $ac_c" 1>&6
--echo "configure:1265: checking for pthreads" >&5
-+echo "configure:1261: checking for pthreads" >&5
- # Check whether --enable-pthreads or --disable-pthreads was given.
- if test "${enable_pthreads+set}" = set; then
- enableval="$enable_pthreads"
-@@ -1286,12 +1282,12 @@
-
-
- echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6
--echo "configure:1290: checking for Cygwin environment" >&5
-+echo "configure:1286: checking for Cygwin environment" >&5
- if eval "test \"`echo '$''{'ac_cv_cygwin'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- cat > conftest.$ac_ext <<EOF
--#line 1295 "configure"
-+#line 1291 "configure"
- #include "confdefs.h"
-
- int main() {
-@@ -1302,7 +1298,7 @@
- return __CYGWIN__;
- ; return 0; }
- EOF
--if { (eval echo configure:1306: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:1302: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
- rm -rf conftest*
- ac_cv_cygwin=yes
- else
-@@ -1338,7 +1334,7 @@
- # Extract the first word of "$ac_prog", so it can be a program name with args.
- set dummy $ac_prog; ac_word=$2
- echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:1342: checking for $ac_word" >&5
-+echo "configure:1338: checking for $ac_word" >&5
- if eval "test \"`echo '$''{'ac_cv_path_SHUTDOWN'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -1351,7 +1347,7 @@
- ;;
- *)
- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
-- ac_dummy="$PATH"
-+ ac_dummy="$PATH:/sbin:/usr/sbin"
- for ac_dir in $ac_dummy; do
- test -z "$ac_dir" && ac_dir=.
- if test -f $ac_dir/$ac_word; then
-@@ -1388,7 +1384,7 @@
- # Extract the first word of "$ac_prog", so it can be a program name with args.
- set dummy $ac_prog; ac_word=$2
- echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:1392: checking for $ac_word" >&5
-+echo "configure:1388: checking for $ac_word" >&5
- if eval "test \"`echo '$''{'ac_cv_path_WALL'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -1438,7 +1434,7 @@
- # Extract the first word of "$ac_prog", so it can be a program name with args.
- set dummy $ac_prog; ac_word=$2
- echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:1442: checking for $ac_word" >&5
-+echo "configure:1438: checking for $ac_word" >&5
- if eval "test \"`echo '$''{'ac_cv_path_SCRIPTSHELL'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -1485,7 +1481,7 @@
- # Extract the first word of "$ac_prog", so it can be a program name with args.
- set dummy $ac_prog; ac_word=$2
- echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:1489: checking for $ac_word" >&5
-+echo "configure:1485: checking for $ac_word" >&5
- if eval "test \"`echo '$''{'ac_cv_path_MAKEDEPEND'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -1526,7 +1522,7 @@
- # Extract the first word of "$ac_prog", so it can be a program name with args.
- set dummy $ac_prog; ac_word=$2
- echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:1530: checking for $ac_word" >&5
-+echo "configure:1526: checking for $ac_word" >&5
- if eval "test \"`echo '$''{'ac_cv_path_RANLIB'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -1569,12 +1565,12 @@
- strncpy syslog tcgetattr vfprintf setpgrp
- do
- echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
--echo "configure:1573: checking for $ac_func" >&5
-+echo "configure:1569: checking for $ac_func" >&5
- if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- cat > conftest.$ac_ext <<EOF
--#line 1578 "configure"
-+#line 1574 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char $ac_func(); below. */
-@@ -1597,7 +1593,7 @@
-
- ; return 0; }
- EOF
--if { (eval echo configure:1601: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:1597: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_func_$ac_func=yes"
- else
-@@ -1625,12 +1621,12 @@
-
-
- echo $ac_n "checking for strftime""... $ac_c" 1>&6
--echo "configure:1629: checking for strftime" >&5
-+echo "configure:1625: checking for strftime" >&5
- if eval "test \"`echo '$''{'ac_cv_func_strftime'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- cat > conftest.$ac_ext <<EOF
--#line 1634 "configure"
-+#line 1630 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char strftime(); below. */
-@@ -1653,7 +1649,7 @@
-
- ; return 0; }
- EOF
--if { (eval echo configure:1657: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:1653: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_func_strftime=yes"
- else
-@@ -1675,7 +1671,7 @@
- echo "$ac_t""no" 1>&6
- # strftime is in -lintl on SCO UNIX.
- echo $ac_n "checking for strftime in -lintl""... $ac_c" 1>&6
--echo "configure:1679: checking for strftime in -lintl" >&5
-+echo "configure:1675: checking for strftime in -lintl" >&5
- ac_lib_var=`echo intl'_'strftime | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-@@ -1683,7 +1679,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-lintl $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 1687 "configure"
-+#line 1683 "configure"
- #include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error. */
- /* We use char because int might match the return type of a gcc2
-@@ -1694,7 +1690,7 @@
- strftime()
- ; return 0; }
- EOF
--if { (eval echo configure:1698: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:1694: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -1720,7 +1716,7 @@
-
- fi
- echo $ac_n "checking whether setpgrp takes no argument""... $ac_c" 1>&6
--echo "configure:1724: checking whether setpgrp takes no argument" >&5
-+echo "configure:1720: checking whether setpgrp takes no argument" >&5
- if eval "test \"`echo '$''{'ac_cv_func_setpgrp_void'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -1728,7 +1724,7 @@
- { echo "configure: error: cannot check setpgrp if cross compiling" 1>&2; exit 1; }
- else
- cat > conftest.$ac_ext <<EOF
--#line 1732 "configure"
-+#line 1728 "configure"
- #include "confdefs.h"
-
- #ifdef HAVE_UNISTD_H
-@@ -1748,7 +1744,7 @@
- }
-
- EOF
--if { (eval echo configure:1752: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:1748: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
- then
- ac_cv_func_setpgrp_void=no
- else
-@@ -1775,12 +1771,12 @@
- for ac_func in shmctl
- do
- echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
--echo "configure:1779: checking for $ac_func" >&5
-+echo "configure:1775: checking for $ac_func" >&5
- if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- cat > conftest.$ac_ext <<EOF
--#line 1784 "configure"
-+#line 1780 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char $ac_func(); below. */
-@@ -1803,7 +1799,7 @@
-
- ; return 0; }
- EOF
--if { (eval echo configure:1807: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:1803: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_func_$ac_func=yes"
- else
-@@ -1842,12 +1838,12 @@
- # - RF
- #
- echo $ac_n "checking for socket""... $ac_c" 1>&6
--echo "configure:1846: checking for socket" >&5
-+echo "configure:1842: checking for socket" >&5
- if eval "test \"`echo '$''{'ac_cv_func_socket'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- cat > conftest.$ac_ext <<EOF
--#line 1851 "configure"
-+#line 1847 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char socket(); below. */
-@@ -1870,7 +1866,7 @@
-
- ; return 0; }
- EOF
--if { (eval echo configure:1874: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:1870: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_func_socket=yes"
- else
-@@ -1888,7 +1884,7 @@
- else
- echo "$ac_t""no" 1>&6
- echo $ac_n "checking for socket in -lxnet""... $ac_c" 1>&6
--echo "configure:1892: checking for socket in -lxnet" >&5
-+echo "configure:1888: checking for socket in -lxnet" >&5
- ac_lib_var=`echo xnet'_'socket | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-@@ -1896,7 +1892,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-lxnet $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 1900 "configure"
-+#line 1896 "configure"
- #include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error. */
- /* We use char because int might match the return type of a gcc2
-@@ -1907,7 +1903,7 @@
- socket()
- ; return 0; }
- EOF
--if { (eval echo configure:1911: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:1907: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -1935,7 +1931,7 @@
- fi
-
- echo $ac_n "checking for socket in -lsocket""... $ac_c" 1>&6
--echo "configure:1939: checking for socket in -lsocket" >&5
-+echo "configure:1935: checking for socket in -lsocket" >&5
- ac_lib_var=`echo socket'_'socket | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-@@ -1943,7 +1939,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-lsocket $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 1947 "configure"
-+#line 1943 "configure"
- #include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error. */
- /* We use char because int might match the return type of a gcc2
-@@ -1954,7 +1950,7 @@
- socket()
- ; return 0; }
- EOF
--if { (eval echo configure:1958: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:1954: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -1982,7 +1978,7 @@
- fi
-
- echo $ac_n "checking for socket in -linet""... $ac_c" 1>&6
--echo "configure:1986: checking for socket in -linet" >&5
-+echo "configure:1982: checking for socket in -linet" >&5
- ac_lib_var=`echo inet'_'socket | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-@@ -1990,7 +1986,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-linet $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 1994 "configure"
-+#line 1990 "configure"
- #include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error. */
- /* We use char because int might match the return type of a gcc2
-@@ -2001,7 +1997,7 @@
- socket()
- ; return 0; }
- EOF
--if { (eval echo configure:2005: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:2001: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -2033,12 +2029,12 @@
-
- # If resolver functions are not in libc check for -lnsl or -lresolv.
- echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6
--echo "configure:2037: checking for gethostbyname" >&5
-+echo "configure:2033: checking for gethostbyname" >&5
- if eval "test \"`echo '$''{'ac_cv_func_gethostbyname'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- cat > conftest.$ac_ext <<EOF
--#line 2042 "configure"
-+#line 2038 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char gethostbyname(); below. */
-@@ -2061,7 +2057,7 @@
-
- ; return 0; }
- EOF
--if { (eval echo configure:2065: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:2061: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_func_gethostbyname=yes"
- else
-@@ -2079,7 +2075,7 @@
- else
- echo "$ac_t""no" 1>&6
- echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6
--echo "configure:2083: checking for gethostbyname in -lnsl" >&5
-+echo "configure:2079: checking for gethostbyname in -lnsl" >&5
- ac_lib_var=`echo nsl'_'gethostbyname | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-@@ -2087,7 +2083,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-lnsl $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 2091 "configure"
-+#line 2087 "configure"
- #include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error. */
- /* We use char because int might match the return type of a gcc2
-@@ -2098,7 +2094,7 @@
- gethostbyname()
- ; return 0; }
- EOF
--if { (eval echo configure:2102: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:2098: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -2126,7 +2122,7 @@
- fi
-
- echo $ac_n "checking for gethostbyname in -lresolv""... $ac_c" 1>&6
--echo "configure:2130: checking for gethostbyname in -lresolv" >&5
-+echo "configure:2126: checking for gethostbyname in -lresolv" >&5
- ac_lib_var=`echo resolv'_'gethostbyname | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-@@ -2134,7 +2130,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-lresolv $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 2138 "configure"
-+#line 2134 "configure"
- #include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error. */
- /* We use char because int might match the return type of a gcc2
-@@ -2145,7 +2141,7 @@
- gethostbyname()
- ; return 0; }
- EOF
--if { (eval echo configure:2149: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:2145: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -2177,12 +2173,12 @@
-
- # If gettext isn't in the C library, maybe there's a -lintl.
- echo $ac_n "checking for gettext""... $ac_c" 1>&6
--echo "configure:2181: checking for gettext" >&5
-+echo "configure:2177: checking for gettext" >&5
- if eval "test \"`echo '$''{'ac_cv_func_gettext'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- cat > conftest.$ac_ext <<EOF
--#line 2186 "configure"
-+#line 2182 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char gettext(); below. */
-@@ -2205,7 +2201,7 @@
-
- ; return 0; }
- EOF
--if { (eval echo configure:2209: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:2205: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_func_gettext=yes"
- else
-@@ -2223,7 +2219,7 @@
- else
- echo "$ac_t""no" 1>&6
- echo $ac_n "checking for gettext in -lintl""... $ac_c" 1>&6
--echo "configure:2227: checking for gettext in -lintl" >&5
-+echo "configure:2223: checking for gettext in -lintl" >&5
- ac_lib_var=`echo intl'_'gettext | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-@@ -2231,7 +2227,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-lintl $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 2235 "configure"
-+#line 2231 "configure"
- #include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error. */
- /* We use char because int might match the return type of a gcc2
-@@ -2242,7 +2238,7 @@
- gettext()
- ; return 0; }
- EOF
--if { (eval echo configure:2246: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:2242: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -2274,12 +2270,12 @@
-
- # The condition in this test copes with the presence of inet_addr in libc6.
- echo $ac_n "checking for inet_addr""... $ac_c" 1>&6
--echo "configure:2278: checking for inet_addr" >&5
-+echo "configure:2274: checking for inet_addr" >&5
- if eval "test \"`echo '$''{'ac_cv_func_inet_addr'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- cat > conftest.$ac_ext <<EOF
--#line 2283 "configure"
-+#line 2279 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char inet_addr(); below. */
-@@ -2302,7 +2298,7 @@
-
- ; return 0; }
- EOF
--if { (eval echo configure:2306: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:2302: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_func_inet_addr=yes"
- else
-@@ -2320,7 +2316,7 @@
- else
- echo "$ac_t""no" 1>&6
- echo $ac_n "checking for inet_addr in -lnsl""... $ac_c" 1>&6
--echo "configure:2324: checking for inet_addr in -lnsl" >&5
-+echo "configure:2320: checking for inet_addr in -lnsl" >&5
- ac_lib_var=`echo nsl'_'inet_addr | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-@@ -2328,7 +2324,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-lnsl $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 2332 "configure"
-+#line 2328 "configure"
- #include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error. */
- /* We use char because int might match the return type of a gcc2
-@@ -2339,7 +2335,7 @@
- inet_addr()
- ; return 0; }
- EOF
--if { (eval echo configure:2343: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:2339: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -2371,12 +2367,12 @@
-
- # The condition in this test copes with the presence of inet_addr in libc6.
- echo $ac_n "checking for strchr""... $ac_c" 1>&6
--echo "configure:2375: checking for strchr" >&5
-+echo "configure:2371: checking for strchr" >&5
- if eval "test \"`echo '$''{'ac_cv_func_strchr'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- cat > conftest.$ac_ext <<EOF
--#line 2380 "configure"
-+#line 2376 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char strchr(); below. */
-@@ -2399,7 +2395,7 @@
-
- ; return 0; }
- EOF
--if { (eval echo configure:2403: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:2399: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_func_strchr=yes"
- else
-@@ -2417,7 +2413,7 @@
- else
- echo "$ac_t""no" 1>&6
- echo $ac_n "checking for strchr in -lcposix""... $ac_c" 1>&6
--echo "configure:2421: checking for strchr in -lcposix" >&5
-+echo "configure:2417: checking for strchr in -lcposix" >&5
- ac_lib_var=`echo cposix'_'strchr | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-@@ -2425,7 +2421,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-lcposix $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 2429 "configure"
-+#line 2425 "configure"
- #include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error. */
- /* We use char because int might match the return type of a gcc2
-@@ -2436,7 +2432,7 @@
- strchr()
- ; return 0; }
- EOF
--if { (eval echo configure:2440: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:2436: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -2461,12 +2457,12 @@
-
-
- echo $ac_n "checking for strstr""... $ac_c" 1>&6
--echo "configure:2465: checking for strstr" >&5
-+echo "configure:2461: checking for strstr" >&5
- if eval "test \"`echo '$''{'ac_cv_func_strstr'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- cat > conftest.$ac_ext <<EOF
--#line 2470 "configure"
-+#line 2466 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char strstr(); below. */
-@@ -2489,7 +2485,7 @@
-
- ; return 0; }
- EOF
--if { (eval echo configure:2493: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:2489: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_func_strstr=yes"
- else
-@@ -2515,12 +2511,12 @@
-
-
- echo $ac_n "checking for strcasecmp""... $ac_c" 1>&6
--echo "configure:2519: checking for strcasecmp" >&5
-+echo "configure:2515: checking for strcasecmp" >&5
- if eval "test \"`echo '$''{'ac_cv_func_strcasecmp'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- cat > conftest.$ac_ext <<EOF
--#line 2524 "configure"
-+#line 2520 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char strcasecmp(); below. */
-@@ -2543,7 +2539,7 @@
-
- ; return 0; }
- EOF
--if { (eval echo configure:2547: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:2543: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_func_strcasecmp=yes"
- else
-@@ -2569,12 +2565,12 @@
-
-
- echo $ac_n "checking for memmove""... $ac_c" 1>&6
--echo "configure:2573: checking for memmove" >&5
-+echo "configure:2569: checking for memmove" >&5
- if eval "test \"`echo '$''{'ac_cv_func_memmove'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- cat > conftest.$ac_ext <<EOF
--#line 2578 "configure"
-+#line 2574 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char memmove(); below. */
-@@ -2597,7 +2593,7 @@
-
- ; return 0; }
- EOF
--if { (eval echo configure:2601: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:2597: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_func_memmove=yes"
- else
-@@ -2623,12 +2619,12 @@
-
-
- echo $ac_n "checking for getopt_long""... $ac_c" 1>&6
--echo "configure:2627: checking for getopt_long" >&5
-+echo "configure:2623: checking for getopt_long" >&5
- if eval "test \"`echo '$''{'ac_cv_func_getopt_long'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- cat > conftest.$ac_ext <<EOF
--#line 2632 "configure"
-+#line 2628 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char getopt_long(); below. */
-@@ -2651,7 +2647,7 @@
-
- ; return 0; }
- EOF
--if { (eval echo configure:2655: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:2651: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_func_getopt_long=yes"
- else
-@@ -2677,12 +2673,12 @@
-
-
- echo $ac_n "checking for setproctitle""... $ac_c" 1>&6
--echo "configure:2681: checking for setproctitle" >&5
-+echo "configure:2677: checking for setproctitle" >&5
- if eval "test \"`echo '$''{'ac_cv_func_setproctitle'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- cat > conftest.$ac_ext <<EOF
--#line 2686 "configure"
-+#line 2682 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char setproctitle(); below. */
-@@ -2705,7 +2701,7 @@
-
- ; return 0; }
- EOF
--if { (eval echo configure:2709: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:2705: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_func_setproctitle=yes"
- else
-@@ -2739,17 +2735,17 @@
- do
- ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
- echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
--echo "configure:2743: checking for $ac_hdr" >&5
-+echo "configure:2739: checking for $ac_hdr" >&5
- if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- cat > conftest.$ac_ext <<EOF
--#line 2748 "configure"
-+#line 2744 "configure"
- #include "confdefs.h"
- #include <$ac_hdr>
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:2753: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:2749: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
- ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
- if test -z "$ac_err"; then
- rm -rf conftest*
-@@ -2783,17 +2779,17 @@
- do
- ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
- echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
--echo "configure:2787: checking for $ac_hdr" >&5
-+echo "configure:2783: checking for $ac_hdr" >&5
- if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- cat > conftest.$ac_ext <<EOF
--#line 2792 "configure"
-+#line 2788 "configure"
- #include "confdefs.h"
- #include <$ac_hdr>
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:2797: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:2793: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
- ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
- if test -z "$ac_err"; then
- rm -rf conftest*
-@@ -2823,12 +2819,12 @@
- fi
-
- echo $ac_n "checking whether stat file-mode macros are broken""... $ac_c" 1>&6
--echo "configure:2827: checking whether stat file-mode macros are broken" >&5
-+echo "configure:2823: checking whether stat file-mode macros are broken" >&5
- if eval "test \"`echo '$''{'ac_cv_header_stat_broken'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- cat > conftest.$ac_ext <<EOF
--#line 2832 "configure"
-+#line 2828 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- #include <sys/stat.h>
-@@ -2878,12 +2874,12 @@
-
- fi
- echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6
--echo "configure:2882: checking whether time.h and sys/time.h may both be included" >&5
-+echo "configure:2878: checking whether time.h and sys/time.h may both be included" >&5
- if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- cat > conftest.$ac_ext <<EOF
--#line 2887 "configure"
-+#line 2883 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- #include <sys/time.h>
-@@ -2892,7 +2888,7 @@
- struct tm *tp;
- ; return 0; }
- EOF
--if { (eval echo configure:2896: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:2892: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
- rm -rf conftest*
- ac_cv_header_time=yes
- else
-@@ -2912,12 +2908,12 @@
-
- fi
- echo $ac_n "checking for sys/wait.h that is POSIX.1 compatible""... $ac_c" 1>&6
--echo "configure:2916: checking for sys/wait.h that is POSIX.1 compatible" >&5
-+echo "configure:2912: checking for sys/wait.h that is POSIX.1 compatible" >&5
- if eval "test \"`echo '$''{'ac_cv_header_sys_wait_h'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- cat > conftest.$ac_ext <<EOF
--#line 2921 "configure"
-+#line 2917 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- #include <sys/wait.h>
-@@ -2933,7 +2929,7 @@
- s = WIFEXITED (s) ? WEXITSTATUS (s) : 1;
- ; return 0; }
- EOF
--if { (eval echo configure:2937: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:2933: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
- rm -rf conftest*
- ac_cv_header_sys_wait_h=yes
- else
-@@ -2953,12 +2949,12 @@
-
- fi
- echo $ac_n "checking whether struct tm is in sys/time.h or time.h""... $ac_c" 1>&6
--echo "configure:2957: checking whether struct tm is in sys/time.h or time.h" >&5
-+echo "configure:2953: checking whether struct tm is in sys/time.h or time.h" >&5
- if eval "test \"`echo '$''{'ac_cv_struct_tm'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- cat > conftest.$ac_ext <<EOF
--#line 2962 "configure"
-+#line 2958 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- #include <time.h>
-@@ -2966,7 +2962,7 @@
- struct tm *tp; tp->tm_sec;
- ; return 0; }
- EOF
--if { (eval echo configure:2970: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:2966: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
- rm -rf conftest*
- ac_cv_struct_tm=time.h
- else
-@@ -2986,12 +2982,12 @@
-
- fi
- echo $ac_n "checking for tm_zone in struct tm""... $ac_c" 1>&6
--echo "configure:2990: checking for tm_zone in struct tm" >&5
-+echo "configure:2986: checking for tm_zone in struct tm" >&5
- if eval "test \"`echo '$''{'ac_cv_struct_tm_zone'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- cat > conftest.$ac_ext <<EOF
--#line 2995 "configure"
-+#line 2991 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- #include <$ac_cv_struct_tm>
-@@ -2999,7 +2995,7 @@
- struct tm tm; tm.tm_zone;
- ; return 0; }
- EOF
--if { (eval echo configure:3003: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:2999: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
- rm -rf conftest*
- ac_cv_struct_tm_zone=yes
- else
-@@ -3019,12 +3015,12 @@
-
- else
- echo $ac_n "checking for tzname""... $ac_c" 1>&6
--echo "configure:3023: checking for tzname" >&5
-+echo "configure:3019: checking for tzname" >&5
- if eval "test \"`echo '$''{'ac_cv_var_tzname'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- cat > conftest.$ac_ext <<EOF
--#line 3028 "configure"
-+#line 3024 "configure"
- #include "confdefs.h"
- #include <time.h>
- #ifndef tzname /* For SGI. */
-@@ -3034,7 +3030,7 @@
- atoi(*tzname);
- ; return 0; }
- EOF
--if { (eval echo configure:3038: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:3034: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- ac_cv_var_tzname=yes
- else
-@@ -3055,12 +3051,12 @@
- fi
- fi
- echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6
--echo "configure:3059: checking for uid_t in sys/types.h" >&5
-+echo "configure:3055: checking for uid_t in sys/types.h" >&5
- if eval "test \"`echo '$''{'ac_cv_type_uid_t'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- cat > conftest.$ac_ext <<EOF
--#line 3064 "configure"
-+#line 3060 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- EOF
-@@ -3089,7 +3085,7 @@
- fi
-
- echo $ac_n "checking type of array argument to getgroups""... $ac_c" 1>&6
--echo "configure:3093: checking type of array argument to getgroups" >&5
-+echo "configure:3089: checking type of array argument to getgroups" >&5
- if eval "test \"`echo '$''{'ac_cv_type_getgroups'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -3097,7 +3093,7 @@
- ac_cv_type_getgroups=cross
- else
- cat > conftest.$ac_ext <<EOF
--#line 3101 "configure"
-+#line 3097 "configure"
- #include "confdefs.h"
-
- /* Thanks to Mike Rendell for this test. */
-@@ -3122,7 +3118,7 @@
- }
-
- EOF
--if { (eval echo configure:3126: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:3122: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
- then
- ac_cv_type_getgroups=gid_t
- else
-@@ -3136,7 +3132,7 @@
-
- if test $ac_cv_type_getgroups = cross; then
- cat > conftest.$ac_ext <<EOF
--#line 3140 "configure"
-+#line 3136 "configure"
- #include "confdefs.h"
- #include <unistd.h>
- EOF
-@@ -3160,12 +3156,12 @@
-
-
- echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
--echo "configure:3164: checking for ANSI C header files" >&5
-+echo "configure:3160: checking for ANSI C header files" >&5
- if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- cat > conftest.$ac_ext <<EOF
--#line 3169 "configure"
-+#line 3165 "configure"
- #include "confdefs.h"
- #include <stdlib.h>
- #include <stdarg.h>
-@@ -3173,7 +3169,7 @@
- #include <float.h>
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:3177: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:3173: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
- ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
- if test -z "$ac_err"; then
- rm -rf conftest*
-@@ -3190,7 +3186,7 @@
- if test $ac_cv_header_stdc = yes; then
- # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
- cat > conftest.$ac_ext <<EOF
--#line 3194 "configure"
-+#line 3190 "configure"
- #include "confdefs.h"
- #include <string.h>
- EOF
-@@ -3208,7 +3204,7 @@
- if test $ac_cv_header_stdc = yes; then
- # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
- cat > conftest.$ac_ext <<EOF
--#line 3212 "configure"
-+#line 3208 "configure"
- #include "confdefs.h"
- #include <stdlib.h>
- EOF
-@@ -3229,7 +3225,7 @@
- :
- else
- cat > conftest.$ac_ext <<EOF
--#line 3233 "configure"
-+#line 3229 "configure"
- #include "confdefs.h"
- #include <ctype.h>
- #define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
-@@ -3240,7 +3236,7 @@
- exit (0); }
-
- EOF
--if { (eval echo configure:3244: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:3240: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
- then
- :
- else
-@@ -3264,12 +3260,12 @@
- fi
-
- echo $ac_n "checking for mode_t""... $ac_c" 1>&6
--echo "configure:3268: checking for mode_t" >&5
-+echo "configure:3264: checking for mode_t" >&5
- if eval "test \"`echo '$''{'ac_cv_type_mode_t'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- cat > conftest.$ac_ext <<EOF
--#line 3273 "configure"
-+#line 3269 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- #if STDC_HEADERS
-@@ -3297,12 +3293,12 @@
- fi
-
- echo $ac_n "checking for off_t""... $ac_c" 1>&6
--echo "configure:3301: checking for off_t" >&5
-+echo "configure:3297: checking for off_t" >&5
- if eval "test \"`echo '$''{'ac_cv_type_off_t'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- cat > conftest.$ac_ext <<EOF
--#line 3306 "configure"
-+#line 3302 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- #if STDC_HEADERS
-@@ -3330,12 +3326,12 @@
- fi
-
- echo $ac_n "checking for pid_t""... $ac_c" 1>&6
--echo "configure:3334: checking for pid_t" >&5
-+echo "configure:3330: checking for pid_t" >&5
- if eval "test \"`echo '$''{'ac_cv_type_pid_t'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- cat > conftest.$ac_ext <<EOF
--#line 3339 "configure"
-+#line 3335 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- #if STDC_HEADERS
-@@ -3363,12 +3359,12 @@
- fi
-
- echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6
--echo "configure:3367: checking return type of signal handlers" >&5
-+echo "configure:3363: checking return type of signal handlers" >&5
- if eval "test \"`echo '$''{'ac_cv_type_signal'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- cat > conftest.$ac_ext <<EOF
--#line 3372 "configure"
-+#line 3368 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- #include <signal.h>
-@@ -3385,7 +3381,7 @@
- int i;
- ; return 0; }
- EOF
--if { (eval echo configure:3389: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:3385: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
- rm -rf conftest*
- ac_cv_type_signal=void
- else
-@@ -3404,12 +3400,12 @@
-
-
- echo $ac_n "checking for size_t""... $ac_c" 1>&6
--echo "configure:3408: checking for size_t" >&5
-+echo "configure:3404: checking for size_t" >&5
- if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- cat > conftest.$ac_ext <<EOF
--#line 3413 "configure"
-+#line 3409 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- #if STDC_HEADERS
-@@ -3437,12 +3433,12 @@
- fi
-
- echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6
--echo "configure:3441: checking for uid_t in sys/types.h" >&5
-+echo "configure:3437: checking for uid_t in sys/types.h" >&5
- if eval "test \"`echo '$''{'ac_cv_type_uid_t'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- cat > conftest.$ac_ext <<EOF
--#line 3446 "configure"
-+#line 3442 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- EOF
-@@ -3471,14 +3467,14 @@
- fi
-
- echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6
--echo "configure:3475: checking whether byte ordering is bigendian" >&5
-+echo "configure:3471: checking whether byte ordering is bigendian" >&5
- if eval "test \"`echo '$''{'ac_cv_c_bigendian'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- ac_cv_c_bigendian=unknown
- # See if sys/param.h defines the BYTE_ORDER macro.
- cat > conftest.$ac_ext <<EOF
--#line 3482 "configure"
-+#line 3478 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- #include <sys/param.h>
-@@ -3489,11 +3485,11 @@
- #endif
- ; return 0; }
- EOF
--if { (eval echo configure:3493: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:3489: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
- rm -rf conftest*
- # It does; now see whether it defined to BIG_ENDIAN or not.
- cat > conftest.$ac_ext <<EOF
--#line 3497 "configure"
-+#line 3493 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- #include <sys/param.h>
-@@ -3504,7 +3500,7 @@
- #endif
- ; return 0; }
- EOF
--if { (eval echo configure:3508: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:3504: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
- rm -rf conftest*
- ac_cv_c_bigendian=yes
- else
-@@ -3524,7 +3520,7 @@
- { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
- else
- cat > conftest.$ac_ext <<EOF
--#line 3528 "configure"
-+#line 3524 "configure"
- #include "confdefs.h"
- main () {
- /* Are we little or big endian? From Harbison&Steele. */
-@@ -3537,7 +3533,7 @@
- exit (u.c[sizeof (long) - 1] == 1);
- }
- EOF
--if { (eval echo configure:3541: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:3537: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
- then
- ac_cv_c_bigendian=no
- else
-@@ -3560,12 +3556,12 @@
-
- fi
- echo $ac_n "checking for working const""... $ac_c" 1>&6
--echo "configure:3564: checking for working const" >&5
-+echo "configure:3560: checking for working const" >&5
- if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- cat > conftest.$ac_ext <<EOF
--#line 3569 "configure"
-+#line 3565 "configure"
- #include "confdefs.h"
-
- int main() {
-@@ -3614,7 +3610,7 @@
-
- ; return 0; }
- EOF
--if { (eval echo configure:3618: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:3614: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
- rm -rf conftest*
- ac_cv_c_const=yes
- else
-@@ -3634,21 +3630,21 @@
-
- fi
- echo $ac_n "checking for inline""... $ac_c" 1>&6
--echo "configure:3638: checking for inline" >&5
-+echo "configure:3634: checking for inline" >&5
- if eval "test \"`echo '$''{'ac_cv_c_inline'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- ac_cv_c_inline=no
- for ac_kw in inline __inline__ __inline; do
- cat > conftest.$ac_ext <<EOF
--#line 3645 "configure"
-+#line 3641 "configure"
- #include "confdefs.h"
-
- int main() {
- } $ac_kw foo() {
- ; return 0; }
- EOF
--if { (eval echo configure:3652: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:3648: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
- rm -rf conftest*
- ac_cv_c_inline=$ac_kw; break
- else
-@@ -3673,14 +3669,14 @@
- ;;
- esac
- echo $ac_n "checking whether char is unsigned""... $ac_c" 1>&6
--echo "configure:3677: checking whether char is unsigned" >&5
-+echo "configure:3673: checking whether char is unsigned" >&5
- if eval "test \"`echo '$''{'ac_cv_c_char_unsigned'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- if test "$GCC" = yes; then
- # GCC predefines this symbol on systems where it applies.
- cat > conftest.$ac_ext <<EOF
--#line 3684 "configure"
-+#line 3680 "configure"
- #include "confdefs.h"
- #ifdef __CHAR_UNSIGNED__
- yes
-@@ -3702,7 +3698,7 @@
- { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
- else
- cat > conftest.$ac_ext <<EOF
--#line 3706 "configure"
-+#line 3702 "configure"
- #include "confdefs.h"
- /* volatile prevents gcc2 from optimizing the test away on sparcs. */
- #if !defined(__STDC__) || __STDC__ != 1
-@@ -3712,7 +3708,7 @@
- volatile char c = 255; exit(c < 0);
- }
- EOF
--if { (eval echo configure:3716: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:3712: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
- then
- ac_cv_c_char_unsigned=yes
- else
-@@ -3737,12 +3733,12 @@
-
-
- echo $ac_n "checking for preprocessor stringizing operator""... $ac_c" 1>&6
--echo "configure:3741: checking for preprocessor stringizing operator" >&5
-+echo "configure:3737: checking for preprocessor stringizing operator" >&5
- if eval "test \"`echo '$''{'ac_cv_c_stringize'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- cat > conftest.$ac_ext <<EOF
--#line 3746 "configure"
-+#line 3742 "configure"
- #include "confdefs.h"
-
- #define x(y) #y
-@@ -3771,19 +3767,19 @@
- fi
- echo "$ac_t""${ac_cv_c_stringize}" 1>&6
- echo $ac_n "checking for mingw32 environment""... $ac_c" 1>&6
--echo "configure:3775: checking for mingw32 environment" >&5
-+echo "configure:3771: checking for mingw32 environment" >&5
- if eval "test \"`echo '$''{'ac_cv_mingw32'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- cat > conftest.$ac_ext <<EOF
--#line 3780 "configure"
-+#line 3776 "configure"
- #include "confdefs.h"
-
- int main() {
- return __MINGW32__;
- ; return 0; }
- EOF
--if { (eval echo configure:3787: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:3783: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
- rm -rf conftest*
- ac_cv_mingw32=yes
- else
-@@ -3802,7 +3798,7 @@
-
-
- echo $ac_n "checking for executable suffix""... $ac_c" 1>&6
--echo "configure:3806: checking for executable suffix" >&5
-+echo "configure:3802: checking for executable suffix" >&5
- if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -3812,7 +3808,7 @@
- rm -f conftest*
- echo 'int main () { return 0; }' > conftest.$ac_ext
- ac_cv_exeext=
-- if { (eval echo configure:3816: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
-+ if { (eval echo configure:3812: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
- for file in conftest.*; do
- case $file in
- *.c | *.o | *.obj) ;;
-@@ -3834,7 +3830,7 @@
- # Pull the hash mark out of the macro call to avoid m4 problems.
- ac_msg="whether #! works in shell scripts"
- echo $ac_n "checking $ac_msg""... $ac_c" 1>&6
--echo "configure:3838: checking $ac_msg" >&5
-+echo "configure:3834: checking $ac_msg" >&5
- if eval "test \"`echo '$''{'ac_cv_sys_interpreter'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -4153,17 +4149,17 @@
- _libs=${LIBS}
- ac_safe=`echo "tcpd.h" | sed 'y%./+-%__p_%'`
- echo $ac_n "checking for tcpd.h""... $ac_c" 1>&6
--echo "configure:4157: checking for tcpd.h" >&5
-+echo "configure:4153: checking for tcpd.h" >&5
- if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- cat > conftest.$ac_ext <<EOF
--#line 4162 "configure"
-+#line 4158 "configure"
- #include "confdefs.h"
- #include <tcpd.h>
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:4167: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:4163: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
- ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
- if test -z "$ac_err"; then
- rm -rf conftest*
-@@ -4181,9 +4177,9 @@
- echo "$ac_t""yes" 1>&6
- LIBS="$LIBS -lwrap -lnsl"
- echo $ac_n "checking for TCP wrappers library -lwrap""... $ac_c" 1>&6
--echo "configure:4185: checking for TCP wrappers library -lwrap" >&5
-+echo "configure:4181: checking for TCP wrappers library -lwrap" >&5
- cat > conftest.$ac_ext <<EOF
--#line 4187 "configure"
-+#line 4183 "configure"
- #include "confdefs.h"
- #include <tcpd.h>
- int allow_severity = 0;
-@@ -4195,7 +4191,7 @@
- hosts_access (req)
- ; return 0; }
- EOF
--if { (eval echo configure:4199: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:4195: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- echo "$ac_t""yes" 1>&6
- cat >> confdefs.h <<\EOF
-@@ -4280,7 +4276,7 @@
- enableval="$enable_powerflute"
- if test "$enableval" = "yes" ; then
- echo $ac_n "checking for initscr in -lncurses""... $ac_c" 1>&6
--echo "configure:4284: checking for initscr in -lncurses" >&5
-+echo "configure:4280: checking for initscr in -lncurses" >&5
- ac_lib_var=`echo ncurses'_'initscr | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-@@ -4288,7 +4284,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-lncurses $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 4292 "configure"
-+#line 4288 "configure"
- #include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error. */
- /* We use char because int might match the return type of a gcc2
-@@ -4299,7 +4295,7 @@
- initscr()
- ; return 0; }
- EOF
--if { (eval echo configure:4303: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:4299: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -4321,7 +4317,7 @@
- fi
-
- echo $ac_n "checking for new_menu in -lmenu""... $ac_c" 1>&6
--echo "configure:4325: checking for new_menu in -lmenu" >&5
-+echo "configure:4321: checking for new_menu in -lmenu" >&5
- ac_lib_var=`echo menu'_'new_menu | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-@@ -4329,7 +4325,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-lmenu $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 4333 "configure"
-+#line 4329 "configure"
- #include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error. */
- /* We use char because int might match the return type of a gcc2
-@@ -4340,7 +4336,7 @@
- new_menu()
- ; return 0; }
- EOF
--if { (eval echo configure:4344: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:4340: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -4362,7 +4358,7 @@
- fi
-
- echo $ac_n "checking for new_form in -lform""... $ac_c" 1>&6
--echo "configure:4366: checking for new_form in -lform" >&5
-+echo "configure:4362: checking for new_form in -lform" >&5
- ac_lib_var=`echo form'_'new_form | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-@@ -4370,7 +4366,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-lform $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 4374 "configure"
-+#line 4370 "configure"
- #include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error. */
- /* We use char because int might match the return type of a gcc2
-@@ -4381,7 +4377,7 @@
- new_form()
- ; return 0; }
- EOF
--if { (eval echo configure:4385: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:4381: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -4403,7 +4399,7 @@
- fi
-
- echo $ac_n "checking for new_panel in -lpanel""... $ac_c" 1>&6
--echo "configure:4407: checking for new_panel in -lpanel" >&5
-+echo "configure:4403: checking for new_panel in -lpanel" >&5
- ac_lib_var=`echo panel'_'new_panel | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-@@ -4411,7 +4407,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-lpanel $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 4415 "configure"
-+#line 4411 "configure"
- #include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error. */
- /* We use char because int might match the return type of a gcc2
-@@ -4422,7 +4418,7 @@
- new_panel()
- ; return 0; }
- EOF
--if { (eval echo configure:4426: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:4422: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -4509,7 +4505,7 @@
- # Extract the first word of "$ac_prog", so it can be a program name with args.
- set dummy $ac_prog; ac_word=$2
- echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:4513: checking for $ac_word" >&5
-+echo "configure:4509: checking for $ac_word" >&5
- if eval "test \"`echo '$''{'ac_cv_path_MSGFMT'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -4552,7 +4548,7 @@
- USE_INCLUDED_LIBINTL=no
- else
- echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
--echo "configure:4556: checking whether ${MAKE-make} sets \${MAKE}" >&5
-+echo "configure:4552: checking whether ${MAKE-make} sets \${MAKE}" >&5
- set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-@@ -4581,7 +4577,7 @@
- # Extract the first word of "ranlib", so it can be a program name with args.
- set dummy ranlib; ac_word=$2
- echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:4585: checking for $ac_word" >&5
-+echo "configure:4581: checking for $ac_word" >&5
- if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -4609,7 +4605,7 @@
- fi
-
- echo $ac_n "checking for POSIXized ISC""... $ac_c" 1>&6
--echo "configure:4613: checking for POSIXized ISC" >&5
-+echo "configure:4609: checking for POSIXized ISC" >&5
- if test -d /etc/conf/kconfig.d &&
- grep _POSIX_VERSION /usr/include/sys/unistd.h >/dev/null 2>&1
- then
-@@ -4632,19 +4628,19 @@
- # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
- # for constant arguments. Useless!
- echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6
--echo "configure:4636: checking for working alloca.h" >&5
-+echo "configure:4632: checking for working alloca.h" >&5
- if eval "test \"`echo '$''{'ac_cv_header_alloca_h'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- cat > conftest.$ac_ext <<EOF
--#line 4641 "configure"
-+#line 4637 "configure"
- #include "confdefs.h"
- #include <alloca.h>
- int main() {
- char *p = alloca(2 * sizeof(int));
- ; return 0; }
- EOF
--if { (eval echo configure:4648: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:4644: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- ac_cv_header_alloca_h=yes
- else
-@@ -4665,12 +4661,12 @@
- fi
-
- echo $ac_n "checking for alloca""... $ac_c" 1>&6
--echo "configure:4669: checking for alloca" >&5
-+echo "configure:4665: checking for alloca" >&5
- if eval "test \"`echo '$''{'ac_cv_func_alloca_works'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- cat > conftest.$ac_ext <<EOF
--#line 4674 "configure"
-+#line 4670 "configure"
- #include "confdefs.h"
-
- #ifdef __GNUC__
-@@ -4698,7 +4694,7 @@
- char *p = (char *) alloca(1);
- ; return 0; }
- EOF
--if { (eval echo configure:4702: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:4698: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- ac_cv_func_alloca_works=yes
- else
-@@ -4730,12 +4726,12 @@
-
-
- echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6
--echo "configure:4734: checking whether alloca needs Cray hooks" >&5
-+echo "configure:4730: checking whether alloca needs Cray hooks" >&5
- if eval "test \"`echo '$''{'ac_cv_os_cray'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- cat > conftest.$ac_ext <<EOF
--#line 4739 "configure"
-+#line 4735 "configure"
- #include "confdefs.h"
- #if defined(CRAY) && ! defined(CRAY2)
- webecray
-@@ -4760,12 +4756,12 @@
- if test $ac_cv_os_cray = yes; then
- for ac_func in _getb67 GETB67 getb67; do
- echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
--echo "configure:4764: checking for $ac_func" >&5
-+echo "configure:4760: checking for $ac_func" >&5
- if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- cat > conftest.$ac_ext <<EOF
--#line 4769 "configure"
-+#line 4765 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char $ac_func(); below. */
-@@ -4788,7 +4784,7 @@
-
- ; return 0; }
- EOF
--if { (eval echo configure:4792: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:4788: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_func_$ac_func=yes"
- else
-@@ -4815,7 +4811,7 @@
- fi
-
- echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6
--echo "configure:4819: checking stack direction for C alloca" >&5
-+echo "configure:4815: checking stack direction for C alloca" >&5
- if eval "test \"`echo '$''{'ac_cv_c_stack_direction'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -4823,7 +4819,7 @@
- ac_cv_c_stack_direction=0
- else
- cat > conftest.$ac_ext <<EOF
--#line 4827 "configure"
-+#line 4823 "configure"
- #include "confdefs.h"
- find_stack_direction ()
- {
-@@ -4842,7 +4838,7 @@
- exit (find_stack_direction() < 0);
- }
- EOF
--if { (eval echo configure:4846: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:4842: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
- then
- ac_cv_c_stack_direction=1
- else
-@@ -4867,17 +4863,17 @@
- do
- ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
- echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
--echo "configure:4871: checking for $ac_hdr" >&5
-+echo "configure:4867: checking for $ac_hdr" >&5
- if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- cat > conftest.$ac_ext <<EOF
--#line 4876 "configure"
-+#line 4872 "configure"
- #include "confdefs.h"
- #include <$ac_hdr>
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:4881: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:4877: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
- ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
- if test -z "$ac_err"; then
- rm -rf conftest*
-@@ -4906,12 +4902,12 @@
- for ac_func in getpagesize
- do
- echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
--echo "configure:4910: checking for $ac_func" >&5
-+echo "configure:4906: checking for $ac_func" >&5
- if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- cat > conftest.$ac_ext <<EOF
--#line 4915 "configure"
-+#line 4911 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char $ac_func(); below. */
-@@ -4934,7 +4930,7 @@
-
- ; return 0; }
- EOF
--if { (eval echo configure:4938: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:4934: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_func_$ac_func=yes"
- else
-@@ -4959,7 +4955,7 @@
- done
-
- echo $ac_n "checking for working mmap""... $ac_c" 1>&6
--echo "configure:4963: checking for working mmap" >&5
-+echo "configure:4959: checking for working mmap" >&5
- if eval "test \"`echo '$''{'ac_cv_func_mmap_fixed_mapped'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -4967,7 +4963,7 @@
- ac_cv_func_mmap_fixed_mapped=no
- else
- cat > conftest.$ac_ext <<EOF
--#line 4971 "configure"
-+#line 4967 "configure"
- #include "confdefs.h"
-
- /* Thanks to Mike Haertel and Jim Avera for this test.
-@@ -5107,7 +5103,7 @@
- }
-
- EOF
--if { (eval echo configure:5111: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:5107: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
- then
- ac_cv_func_mmap_fixed_mapped=yes
- else
-@@ -5135,17 +5131,17 @@
- do
- ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
- echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
--echo "configure:5139: checking for $ac_hdr" >&5
-+echo "configure:5135: checking for $ac_hdr" >&5
- if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- cat > conftest.$ac_ext <<EOF
--#line 5144 "configure"
-+#line 5140 "configure"
- #include "confdefs.h"
- #include <$ac_hdr>
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:5149: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:5145: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
- ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
- if test -z "$ac_err"; then
- rm -rf conftest*
-@@ -5175,12 +5171,12 @@
- strdup __argz_count __argz_stringify __argz_next
- do
- echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
--echo "configure:5179: checking for $ac_func" >&5
-+echo "configure:5175: checking for $ac_func" >&5
- if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- cat > conftest.$ac_ext <<EOF
--#line 5184 "configure"
-+#line 5180 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char $ac_func(); below. */
-@@ -5203,7 +5199,7 @@
-
- ; return 0; }
- EOF
--if { (eval echo configure:5207: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:5203: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_func_$ac_func=yes"
- else
-@@ -5232,12 +5228,12 @@
- for ac_func in stpcpy
- do
- echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
--echo "configure:5236: checking for $ac_func" >&5
-+echo "configure:5232: checking for $ac_func" >&5
- if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- cat > conftest.$ac_ext <<EOF
--#line 5241 "configure"
-+#line 5237 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char $ac_func(); below. */
-@@ -5260,7 +5256,7 @@
-
- ; return 0; }
- EOF
--if { (eval echo configure:5264: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:5260: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_func_$ac_func=yes"
- else
-@@ -5294,19 +5290,19 @@
-
- if test $ac_cv_header_locale_h = yes; then
- echo $ac_n "checking for LC_MESSAGES""... $ac_c" 1>&6
--echo "configure:5298: checking for LC_MESSAGES" >&5
-+echo "configure:5294: checking for LC_MESSAGES" >&5
- if eval "test \"`echo '$''{'am_cv_val_LC_MESSAGES'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- cat > conftest.$ac_ext <<EOF
--#line 5303 "configure"
-+#line 5299 "configure"
- #include "confdefs.h"
- #include <locale.h>
- int main() {
- return LC_MESSAGES
- ; return 0; }
- EOF
--if { (eval echo configure:5310: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:5306: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- am_cv_val_LC_MESSAGES=yes
- else
-@@ -5327,7 +5323,7 @@
- fi
- fi
- echo $ac_n "checking whether NLS is requested""... $ac_c" 1>&6
--echo "configure:5331: checking whether NLS is requested" >&5
-+echo "configure:5327: checking whether NLS is requested" >&5
- # Check whether --enable-nls or --disable-nls was given.
- if test "${enable_nls+set}" = set; then
- enableval="$enable_nls"
-@@ -5347,7 +5343,7 @@
- EOF
-
- echo $ac_n "checking whether included gettext is requested""... $ac_c" 1>&6
--echo "configure:5351: checking whether included gettext is requested" >&5
-+echo "configure:5347: checking whether included gettext is requested" >&5
- # Check whether --with-included-gettext or --without-included-gettext was given.
- if test "${with_included_gettext+set}" = set; then
- withval="$with_included_gettext"
-@@ -5366,17 +5362,17 @@
-
- ac_safe=`echo "libintl.h" | sed 'y%./+-%__p_%'`
- echo $ac_n "checking for libintl.h""... $ac_c" 1>&6
--echo "configure:5370: checking for libintl.h" >&5
-+echo "configure:5366: checking for libintl.h" >&5
- if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- cat > conftest.$ac_ext <<EOF
--#line 5375 "configure"
-+#line 5371 "configure"
- #include "confdefs.h"
- #include <libintl.h>
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:5380: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:5376: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
- ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
- if test -z "$ac_err"; then
- rm -rf conftest*
-@@ -5393,19 +5389,19 @@
- if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
- echo "$ac_t""yes" 1>&6
- echo $ac_n "checking for gettext in libc""... $ac_c" 1>&6
--echo "configure:5397: checking for gettext in libc" >&5
-+echo "configure:5393: checking for gettext in libc" >&5
- if eval "test \"`echo '$''{'gt_cv_func_gettext_libc'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- cat > conftest.$ac_ext <<EOF
--#line 5402 "configure"
-+#line 5398 "configure"
- #include "confdefs.h"
- #include <libintl.h>
- int main() {
- return (int) gettext ("")
- ; return 0; }
- EOF
--if { (eval echo configure:5409: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:5405: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- gt_cv_func_gettext_libc=yes
- else
-@@ -5421,7 +5417,7 @@
-
- if test "$gt_cv_func_gettext_libc" != "yes"; then
- echo $ac_n "checking for bindtextdomain in -lintl""... $ac_c" 1>&6
--echo "configure:5425: checking for bindtextdomain in -lintl" >&5
-+echo "configure:5421: checking for bindtextdomain in -lintl" >&5
- ac_lib_var=`echo intl'_'bindtextdomain | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-@@ -5429,7 +5425,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-lintl $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 5433 "configure"
-+#line 5429 "configure"
- #include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error. */
- /* We use char because int might match the return type of a gcc2
-@@ -5440,7 +5436,7 @@
- bindtextdomain()
- ; return 0; }
- EOF
--if { (eval echo configure:5444: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:5440: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -5456,12 +5452,12 @@
- if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
- echo "$ac_t""yes" 1>&6
- echo $ac_n "checking for gettext in libintl""... $ac_c" 1>&6
--echo "configure:5460: checking for gettext in libintl" >&5
-+echo "configure:5456: checking for gettext in libintl" >&5
- if eval "test \"`echo '$''{'gt_cv_func_gettext_libintl'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- echo $ac_n "checking for gettext in -lintl""... $ac_c" 1>&6
--echo "configure:5465: checking for gettext in -lintl" >&5
-+echo "configure:5461: checking for gettext in -lintl" >&5
- ac_lib_var=`echo intl'_'gettext | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-@@ -5469,7 +5465,7 @@
- ac_save_LIBS="$LIBS"
- LIBS="-lintl $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 5473 "configure"
-+#line 5469 "configure"
- #include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error. */
- /* We use char because int might match the return type of a gcc2
-@@ -5480,7 +5476,7 @@
- gettext()
- ; return 0; }
- EOF
--if { (eval echo configure:5484: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:5480: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -5519,7 +5515,7 @@
- # Extract the first word of "msgfmt", so it can be a program name with args.
- set dummy msgfmt; ac_word=$2
- echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:5523: checking for $ac_word" >&5
-+echo "configure:5519: checking for $ac_word" >&5
- if eval "test \"`echo '$''{'ac_cv_path_MSGFMT'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -5553,12 +5549,12 @@
- for ac_func in dcgettext
- do
- echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
--echo "configure:5557: checking for $ac_func" >&5
-+echo "configure:5553: checking for $ac_func" >&5
- if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- cat > conftest.$ac_ext <<EOF
--#line 5562 "configure"
-+#line 5558 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char $ac_func(); below. */
-@@ -5581,7 +5577,7 @@
-
- ; return 0; }
- EOF
--if { (eval echo configure:5585: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:5581: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_func_$ac_func=yes"
- else
-@@ -5608,7 +5604,7 @@
- # Extract the first word of "gmsgfmt", so it can be a program name with args.
- set dummy gmsgfmt; ac_word=$2
- echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:5612: checking for $ac_word" >&5
-+echo "configure:5608: checking for $ac_word" >&5
- if eval "test \"`echo '$''{'ac_cv_path_GMSGFMT'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -5644,7 +5640,7 @@
- # Extract the first word of "xgettext", so it can be a program name with args.
- set dummy xgettext; ac_word=$2
- echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:5648: checking for $ac_word" >&5
-+echo "configure:5644: checking for $ac_word" >&5
- if eval "test \"`echo '$''{'ac_cv_path_XGETTEXT'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -5676,7 +5672,7 @@
- fi
-
- cat > conftest.$ac_ext <<EOF
--#line 5680 "configure"
-+#line 5676 "configure"
- #include "confdefs.h"
-
- int main() {
-@@ -5684,7 +5680,7 @@
- return _nl_msg_cat_cntr
- ; return 0; }
- EOF
--if { (eval echo configure:5688: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:5684: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- CATOBJEXT=.gmo
- DATADIRNAME=share
-@@ -5707,7 +5703,7 @@
-
- if test "$CATOBJEXT" = "NONE"; then
- echo $ac_n "checking whether catgets can be used""... $ac_c" 1>&6
--echo "configure:5711: checking whether catgets can be used" >&5
-+echo "configure:5707: checking whether catgets can be used" >&5
- # Check whether --with-catgets or --without-catgets was given.
- if test "${with_catgets+set}" = set; then
- withval="$with_catgets"
-@@ -5720,7 +5716,7 @@
-
- if test "$nls_cv_use_catgets" = "yes"; then
- echo $ac_n "checking for main in -li""... $ac_c" 1>&6
--echo "configure:5724: checking for main in -li" >&5
-+echo "configure:5720: checking for main in -li" >&5
- ac_lib_var=`echo i'_'main | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-@@ -5728,14 +5724,14 @@
- ac_save_LIBS="$LIBS"
- LIBS="-li $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 5732 "configure"
-+#line 5728 "configure"
- #include "confdefs.h"
-
- int main() {
- main()
- ; return 0; }
- EOF
--if { (eval echo configure:5739: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:5735: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -5763,12 +5759,12 @@
- fi
-
- echo $ac_n "checking for catgets""... $ac_c" 1>&6
--echo "configure:5767: checking for catgets" >&5
-+echo "configure:5763: checking for catgets" >&5
- if eval "test \"`echo '$''{'ac_cv_func_catgets'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- cat > conftest.$ac_ext <<EOF
--#line 5772 "configure"
-+#line 5768 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char catgets(); below. */
-@@ -5791,7 +5787,7 @@
-
- ; return 0; }
- EOF
--if { (eval echo configure:5795: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:5791: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_func_catgets=yes"
- else
-@@ -5813,7 +5809,7 @@
- # Extract the first word of "gencat", so it can be a program name with args.
- set dummy gencat; ac_word=$2
- echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:5817: checking for $ac_word" >&5
-+echo "configure:5813: checking for $ac_word" >&5
- if eval "test \"`echo '$''{'ac_cv_path_GENCAT'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -5849,7 +5845,7 @@
- # Extract the first word of "gmsgfmt", so it can be a program name with args.
- set dummy gmsgfmt; ac_word=$2
- echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:5853: checking for $ac_word" >&5
-+echo "configure:5849: checking for $ac_word" >&5
- if eval "test \"`echo '$''{'ac_cv_path_GMSGFMT'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -5886,7 +5882,7 @@
- # Extract the first word of "msgfmt", so it can be a program name with args.
- set dummy msgfmt; ac_word=$2
- echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:5890: checking for $ac_word" >&5
-+echo "configure:5886: checking for $ac_word" >&5
- if eval "test \"`echo '$''{'ac_cv_path_GMSGFMT'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -5921,7 +5917,7 @@
- # Extract the first word of "xgettext", so it can be a program name with args.
- set dummy xgettext; ac_word=$2
- echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:5925: checking for $ac_word" >&5
-+echo "configure:5921: checking for $ac_word" >&5
- if eval "test \"`echo '$''{'ac_cv_path_XGETTEXT'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -5980,7 +5976,7 @@
- # Extract the first word of "msgfmt", so it can be a program name with args.
- set dummy msgfmt; ac_word=$2
- echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:5984: checking for $ac_word" >&5
-+echo "configure:5980: checking for $ac_word" >&5
- if eval "test \"`echo '$''{'ac_cv_path_MSGFMT'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -6014,7 +6010,7 @@
- # Extract the first word of "gmsgfmt", so it can be a program name with args.
- set dummy gmsgfmt; ac_word=$2
- echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:6018: checking for $ac_word" >&5
-+echo "configure:6014: checking for $ac_word" >&5
- if eval "test \"`echo '$''{'ac_cv_path_GMSGFMT'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -6050,7 +6046,7 @@
- # Extract the first word of "xgettext", so it can be a program name with args.
- set dummy xgettext; ac_word=$2
- echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:6054: checking for $ac_word" >&5
-+echo "configure:6050: checking for $ac_word" >&5
- if eval "test \"`echo '$''{'ac_cv_path_XGETTEXT'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -6145,7 +6141,7 @@
- LINGUAS=
- else
- echo $ac_n "checking for catalogs to be installed""... $ac_c" 1>&6
--echo "configure:6149: checking for catalogs to be installed" >&5
-+echo "configure:6145: checking for catalogs to be installed" >&5
- NEW_LINGUAS=
- for lang in ${LINGUAS=$ALL_LINGUAS}; do
- case "$ALL_LINGUAS" in
-@@ -6173,17 +6169,17 @@
- if test "$CATOBJEXT" = ".cat"; then
- ac_safe=`echo "linux/version.h" | sed 'y%./+-%__p_%'`
- echo $ac_n "checking for linux/version.h""... $ac_c" 1>&6
--echo "configure:6177: checking for linux/version.h" >&5
-+echo "configure:6173: checking for linux/version.h" >&5
- if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- cat > conftest.$ac_ext <<EOF
--#line 6182 "configure"
-+#line 6178 "configure"
- #include "confdefs.h"
- #include <linux/version.h>
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:6187: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:6183: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
- ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
- if test -z "$ac_err"; then
- rm -rf conftest*
-@@ -6259,12 +6255,12 @@
- for ac_func in wait waitpid wait3
- do
- echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
--echo "configure:6263: checking for $ac_func" >&5
-+echo "configure:6259: checking for $ac_func" >&5
- if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- cat > conftest.$ac_ext <<EOF
--#line 6268 "configure"
-+#line 6264 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char $ac_func(); below. */
-@@ -6287,7 +6283,7 @@
-
- ; return 0; }
- EOF
--if { (eval echo configure:6291: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:6287: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_func_$ac_func=yes"
- else
-@@ -6312,9 +6308,9 @@
- done
-
- echo $ac_n "checking for union wait""... $ac_c" 1>&6
--echo "configure:6316: checking for union wait" >&5;
-+echo "configure:6312: checking for union wait" >&5;
- cat > conftest.$ac_ext <<EOF
--#line 6318 "configure"
-+#line 6314 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- #include <sys/wait.h>
-@@ -6333,7 +6329,7 @@
-
- ; return 0; }
- EOF
--if { (eval echo configure:6337: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:6333: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- cat >> confdefs.h <<\EOF
- #define HAVE_UNION_WAIT 1
-@@ -6375,12 +6371,12 @@
- for ac_func in snprintf
- do
- echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
--echo "configure:6379: checking for $ac_func" >&5
-+echo "configure:6375: checking for $ac_func" >&5
- if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- cat > conftest.$ac_ext <<EOF
--#line 6384 "configure"
-+#line 6380 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char $ac_func(); below. */
-@@ -6403,7 +6399,7 @@
-
- ; return 0; }
- EOF
--if { (eval echo configure:6407: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:6403: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_func_$ac_func=yes"
- else
-@@ -6446,17 +6442,17 @@
- do
- ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
- echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
--echo "configure:6450: checking for $ac_hdr" >&5
-+echo "configure:6446: checking for $ac_hdr" >&5
- if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- cat > conftest.$ac_ext <<EOF
--#line 6455 "configure"
-+#line 6451 "configure"
- #include "confdefs.h"
- #include <$ac_hdr>
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:6460: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:6456: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
- ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
- if test -z "$ac_err"; then
- rm -rf conftest*
-@@ -6489,17 +6485,17 @@
- do
- ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
- echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
--echo "configure:6493: checking for $ac_hdr" >&5
-+echo "configure:6489: checking for $ac_hdr" >&5
- if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- cat > conftest.$ac_ext <<EOF
--#line 6498 "configure"
-+#line 6494 "configure"
- #include "confdefs.h"
- #include <$ac_hdr>
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:6503: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:6499: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
- ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
- if test -z "$ac_err"; then
- rm -rf conftest*
diff --git a/sysutils/apcupsd/patches/patch-ak b/sysutils/apcupsd/patches/patch-ak
deleted file mode 100644
index 765fa87b55c..00000000000
--- a/sysutils/apcupsd/patches/patch-ak
+++ /dev/null
@@ -1,36 +0,0 @@
-$NetBSD: patch-ak,v 1.1 2002/12/01 22:32:28 bouyer Exp $
-
---- examples/apcupsd.slave.conf.orig Sun Dec 1 13:18:09 2002
-+++ examples/apcupsd.slave.conf Sun Dec 1 13:21:27 2002
-@@ -33,11 +33,11 @@
- #
- #DEVICE <string> /dev/<serial port>
- # name of your serial port
--DEVICE /dev/ttyS0
-+DEVICE /dev/tty01
- #
- #LOCKFILE <path to lockfile>
- # path for serial port lock file
--LOCKFILE /var/lock
-+LOCKFILE /var/spool/lock
- #
- #
- #
-@@ -91,7 +91,7 @@
- #
- # If you want the last few EVENTS to be available over the network
- # by the network information server, you must define an EVENTSFILE.
--EVENTSFILE /etc/apcupsd/apcupsd.events
-+EVENTSFILE /var/log/apcupsd.events
- #
- #
- #
-@@ -102,7 +102,7 @@
- STATTIME 0
- #
- # STATFILE
--STATFILE /etc/apcupsd/apcupsd.status
-+STATFILE /var/run/apcupsd.status
- #
- #
- # LOGSTATS [ on | off ] on enables, off disables
diff --git a/sysutils/apcupsd/patches/patch-al b/sysutils/apcupsd/patches/patch-al
deleted file mode 100644
index 30395a284ba..00000000000
--- a/sysutils/apcupsd/patches/patch-al
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-al,v 1.1 2002/12/01 22:32:28 bouyer Exp $
-
---- etc/changeme.in.orig Sun Dec 1 16:13:05 2002
-+++ etc/changeme.in Sun Dec 1 16:13:19 2002
-@@ -6,7 +6,7 @@
- # We send an email message to root to notify him.
- #
- SYSADMIN=root
--MAIL="/bin/mail"
-+MAIL="mail"
-
- HOSTNAME=`hostname`
- MSG="$HOSTNAME UPS battery needs changing NOW."
diff --git a/sysutils/apcupsd/patches/patch-am b/sysutils/apcupsd/patches/patch-am
deleted file mode 100644
index 8d9df2e3ff6..00000000000
--- a/sysutils/apcupsd/patches/patch-am
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-am,v 1.1 2002/12/01 22:32:29 bouyer Exp $
-
---- etc/commfailure.in.orig Sun Dec 1 16:13:19 2002
-+++ etc/commfailure.in Sun Dec 1 16:13:27 2002
-@@ -6,7 +6,7 @@
- # We send an email message to root to notify him.
- #
- SYSADMIN=root
--MAIL="/bin/mail"
-+MAIL="mail"
-
- HOSTNAME=`hostname`
- MSG="$HOSTNAME Serial port communications with UPS lost"
diff --git a/sysutils/apcupsd/patches/patch-an b/sysutils/apcupsd/patches/patch-an
deleted file mode 100644
index 444c74d4216..00000000000
--- a/sysutils/apcupsd/patches/patch-an
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-an,v 1.1 2002/12/01 22:32:29 bouyer Exp $
-
---- etc/commok.in.orig Sun Dec 1 16:13:27 2002
-+++ etc/commok.in Sun Dec 1 16:13:32 2002
-@@ -6,7 +6,7 @@
- # We send an email message to root to notify him.
- #
- SYSADMIN=root
--MAIL="/bin/mail"
-+MAIL="mail"
-
- HOSTNAME=`hostname`
- MSG="$HOSTNAME Serial port communications with UPS restored"
diff --git a/sysutils/apcupsd/patches/patch-ao b/sysutils/apcupsd/patches/patch-ao
deleted file mode 100644
index a4522949845..00000000000
--- a/sysutils/apcupsd/patches/patch-ao
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ao,v 1.1 2002/12/01 22:32:29 bouyer Exp $
-
---- etc/mainsback.in.orig Sun Dec 1 16:13:32 2002
-+++ etc/mainsback.in Sun Dec 1 16:13:37 2002
-@@ -6,7 +6,7 @@
- # We send an email message to root to notify him.
- #
- SYSADMIN=root
--MAIL="/bin/mail"
-+MAIL="mail"
-
- HOSTNAME=`hostname`
- MSG="$HOSTNAME Power has returned"
diff --git a/sysutils/apcupsd/patches/patch-ap b/sysutils/apcupsd/patches/patch-ap
deleted file mode 100644
index db720f680e5..00000000000
--- a/sysutils/apcupsd/patches/patch-ap
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ap,v 1.1 2002/12/01 22:32:29 bouyer Exp $
-
---- etc/onbattery.in.orig Sun Dec 1 16:13:37 2002
-+++ etc/onbattery.in Sun Dec 1 16:13:42 2002
-@@ -6,7 +6,7 @@
- # We send an email message to root to notify him.
- #
- SYSADMIN=root
--MAIL="/bin/mail"
-+MAIL="mail"
-
- HOSTNAME=`hostname`
- MSG="$HOSTNAME Power Failure !!!"
diff --git a/sysutils/aperture/DESCR b/sysutils/aperture/DESCR
deleted file mode 100644
index 58cd39010e5..00000000000
--- a/sysutils/aperture/DESCR
+++ /dev/null
@@ -1,16 +0,0 @@
-This module was originally written to help work around the security
-feature of NetBSD that prevents read/write access to /dev/mem. It also
-provide Pentium II and AMD K6 MTRR control in order to control
-write-combining to the framebuffer memory.
-
-XFree86 can take advantage of having direct access to video
-memory (especially with VLB and PCI cards) and even requires it for
-the most recent PCI or AGP video boards.
-
-This driver works like the standard /dev/mem driver. It just allows
-mapping of the VGA framebuffer and BIOS even if kernel security level
-is > 0. The driver only implements the open(), close(), ioctl() and
-mmap() calls. In order not to defeat kernel security, only one open()
-at a time is allowed and only a process with effective user id of 0 can
-perform it. So while you're running XFree86, no other process will be
-allowed to open /dev/xf86.
diff --git a/sysutils/aperture/MESSAGE b/sysutils/aperture/MESSAGE
deleted file mode 100644
index ef16e5512a1..00000000000
--- a/sysutils/aperture/MESSAGE
+++ /dev/null
@@ -1,13 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE,v 1.1 2002/01/27 19:31:59 jlam Exp $
-
-Add the following line to /etc/lkm.conf:
-
- ${PREFIX}/lkm/xf86.o - - ${PREFIX}/lkm/xf86_mod_install - AFTERMOUNT
-
-and set:
-
- lkm=YES
-
-in /etc/rc.conf. Then, reboot your system.
-===========================================================================
diff --git a/sysutils/aperture/Makefile b/sysutils/aperture/Makefile
deleted file mode 100644
index 6845009a2a3..00000000000
--- a/sysutils/aperture/Makefile
+++ /dev/null
@@ -1,49 +0,0 @@
-# $NetBSD: Makefile,v 1.26 2003/03/29 12:42:26 jmmv Exp $
-
-DISTNAME= apNetBSD
-PKGNAME= aperture-2.0
-PKGREVISION= 4
-WRKSRC= ${WRKDIR}
-CATEGORIES= sysutils x11
-EXTRACT_SUFX= .shar
-
-# Not sure why ${MASTER_SITE_LOCAL:=${PKGNAME}} doesn't work, but the
-# following does the correct substitution.
-#
-.for subdir in ${PKGNAME}
-MASTER_SITES= ${MASTER_SITE_LOCAL:=${subdir}nb1/}
-.endfor
-
-# The definitive location of the distfile is as below, but it's risky to depend
-# on NetBSD-current files to stay stable, so don't we'll place new copies at
-# MASTER_SITE_LOCAL and update this package accordingly.
-#
-#MASTER_SITES+= ftp://ftp.netbsd.org/pub/NetBSD/NetBSD-current/xsrc/xfree/xc/programs/Xserver/hw/xfree86/etc/
-
-MAINTAINER= jlam@netbsd.org
-COMMENT= XFree86 Framebuffer "aperture" driver for NetBSD/i386
-
-ONLY_FOR_PLATFORM= NetBSD-*-i386
-
-NO_SRC_ON_FTP= Already in MASTER_SITE_LOCAL
-
-ALL_TARGET= cleandir depend all
-DIST_SUBDIR= ${PKGNAME}
-INSTALL_TARGET= dirs includes install
-MANCOMPRESSED_IF_MANZ= YES
-NO_CONFIGURE= YES
-OSVERSION_SPECIFIC= YES
-MAKE_ENV+= BSDSRCDIR="${BSDSRCDIR}"
-
-.include "../../mk/bsd.prefs.mk"
-
-pre-extract:
-.if !exists(${BSDSRCDIR}/sys/lib/libkern/libkern.h)
- @${ECHO_MSG} "Need a kernel source tree in ${BSDSRCDIR}/sys."
- @${ECHO_MSG} "(Or set BSDSRCDIR correctly in /etc/mk.conf.)"
- @${FALSE}
-.endif
-
-.include "../../mk/bsd.pkg.mk"
-
-LDFLAGS= # empty since we use BSD-style makefiles
diff --git a/sysutils/aperture/PLIST b/sysutils/aperture/PLIST
deleted file mode 100644
index 09af3c67f23..00000000000
--- a/sysutils/aperture/PLIST
+++ /dev/null
@@ -1,12 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2002/02/15 10:12:59 skrll Exp $
-bin/memconfig
-bin/xf86test
-include/memrange.h
-lkm/xf86.o
-lkm/xf86_mod_install
-@unexec ${RM} -f %D/lkm/xf86
-man/cat4/xf86.0
-man/cat8/memconfig.0
-man/man4/xf86.4
-man/man8/memconfig.8
-@dirrm lkm
diff --git a/sysutils/aperture/distinfo b/sysutils/aperture/distinfo
deleted file mode 100644
index dbaa596df6a..00000000000
--- a/sysutils/aperture/distinfo
+++ /dev/null
@@ -1,10 +0,0 @@
-$NetBSD: distinfo,v 1.7 2003/03/19 17:56:38 jmmv Exp $
-
-SHA1 (aperture-2.0nb4/apNetBSD.shar) = 66022d35f41df667bbc9ad86a8f2ded292e1098b
-Size (aperture-2.0nb4/apNetBSD.shar) = 66731 bytes
-SHA1 (patch-aa) = 544d71b6524b7aaeb5deb985372599f1962af4fe
-SHA1 (patch-ab) = 16daeea3a8372df2de8b7502dc9e95ea9e175947
-SHA1 (patch-ac) = 676b2f426d6f9e725262342e0d7e9ac1c8418362
-SHA1 (patch-ad) = ff298db28cf5d4ca0cfe42f4be28c8b1908c828e
-SHA1 (patch-ae) = b6ae1d888db3a0cbefd7088a7acf7ca881fdc767
-SHA1 (patch-af) = 475c127658ba1050154a7dcabe39482c088e2d02
diff --git a/sysutils/aperture/patches/patch-aa b/sysutils/aperture/patches/patch-aa
deleted file mode 100644
index b68ce31b580..00000000000
--- a/sysutils/aperture/patches/patch-aa
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2001/01/17 23:57:53 jlam Exp $
-
---- Makefile.inc.orig Fri Jan 12 14:09:51 2001
-+++ Makefile.inc
-@@ -3,8 +3,9 @@
- # NetBSDApertureDir variable in xc/config/cf/host.def before rebuilding
- # the X server
-
--APDIR= /usr/local/aperture
-+APDIR= ${PREFIX}
-
-+S= ${BSDSRCDIR}/sys
- KMODDIR= ${APDIR}/lkm
- BINDIR= ${APDIR}/bin
- MANDIR= ${APDIR}/man
diff --git a/sysutils/aperture/patches/patch-ab b/sysutils/aperture/patches/patch-ab
deleted file mode 100644
index 790df0be3fa..00000000000
--- a/sysutils/aperture/patches/patch-ab
+++ /dev/null
@@ -1,44 +0,0 @@
-$NetBSD: patch-ab,v 1.6 2002/11/10 07:59:03 tron Exp $
-
---- module/xf86_mod.c.orig Fri Jul 5 01:36:35 2002
-+++ module/xf86_mod.c Thu Oct 10 22:37:41 2002
-@@ -17,9 +17,15 @@
- #include "memrange.h"
-
- /* Pull in the cpuid values from locore.s */
-+#if __NetBSD_Version__ >= 106080000
-+extern struct cpu_info cpu_info_primary;
-+#define cpu_vendor ((char *)cpu_info_primary.ci_vendor)
-+#define cpu_id cpu_info_primary.ci_signature
-+#else
- extern int cpu_id;
- extern int cpu_feature;
- extern char cpu_vendor[];
-+#endif
-
- extern struct mem_range_ops i686_mrops, k6_mrops;
-
-@@ -31,7 +37,11 @@
- 0,
- seltrue, xf86mmap, 0};
-
-+#if __NetBSD_Version__ >= 106080000
-+MOD_DEV("xf86", "xf86ap", NULL, -1, &newdev, -1)
-+#else
- MOD_DEV("xf86", LM_DT_CHAR, -1, &newdev)
-+#endif
-
- char *xf86_major_version = "2";
- char *xf86_minor_version = "0";
-@@ -76,7 +86,10 @@
-
- case LKM_E_UNLOAD:
- /* Free allocated memory */
-- free(mem_range_softc.mr_desc, M_MEMDESC);
-+ if (mem_range_softc.mr_desc != NULL) {
-+ free(mem_range_softc.mr_desc, M_MEMDESC);
-+ mem_range_softc.mr_desc = NULL;
-+ }
- break;
-
- case LKM_E_STAT:
diff --git a/sysutils/aperture/patches/patch-ac b/sysutils/aperture/patches/patch-ac
deleted file mode 100644
index 5216559ad54..00000000000
--- a/sysutils/aperture/patches/patch-ac
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ac,v 1.3 2002/09/14 08:14:22 tron Exp $
-
---- module/xf86_mod_install.orig Fri Sep 13 18:29:17 2002
-+++ module/xf86_mod_install Fri Sep 13 18:34:52 2002
-@@ -4,8 +4,8 @@
- #
- # Copyright (C) 1994,1999 The XFree86 Project Inc.
- #
--if [ $# -ne 3 ]; then
-- echo "$0: should be called by modload(8) with 3 arguments"
-+if [ $# -lt 3 ]; then
-+ echo "$0: should be called by modload(8) with at least 3 arguments"
- exit 1
- fi
-
diff --git a/sysutils/aperture/patches/patch-ad b/sysutils/aperture/patches/patch-ad
deleted file mode 100644
index a7dec6c5f73..00000000000
--- a/sysutils/aperture/patches/patch-ad
+++ /dev/null
@@ -1,35 +0,0 @@
-$NetBSD: patch-ad,v 1.6 2003/03/19 17:56:39 jmmv Exp $
-
---- module/aperture.c.orig 2003-03-19 18:52:51.000000000 +0100
-+++ module/aperture.c
-@@ -117,8 +117,17 @@ xf86close(dev, cflags, devtype, p)
- * allow only section in the vga framebuffer and above main memory
- * to be mapped
- */
-+/*
-+ * Technically, the change to the kernel mmap interface happened
-+ * during 1.5A, but after the interface changed, the kernel version
-+ * was inexplicably not bumped. Starting with 1.5B _and_ with the
-+ * 1.5-branch releases, the change to the kernel mmap interface
-+ * appears.
-+ */
- #if !defined(__NetBSD_Version__) || \
-- (defined(__NetBSD_Version__) && (__NetBSD_Version__ < 105000000))
-+ (defined(__NetBSD_Version__) && \
-+ ((__NetBSD_Version__ < 105000000) || \
-+ (__NetBSD_Version__ >= 105010000) && (__NetBSD_Version__ < 105020000)))
- int
- xf86mmap(dev, offset, length)
- dev_t dev;
-@@ -144,7 +153,11 @@ xf86mmap(dev, offset, length)
- && (unsigned)offset <= HOLE16M_END)
- #endif
- )) {
-+#if __NetBSD_Version__ >= 106160000
-+ return x86_btop(offset);
-+#else
- return i386_btop(offset);
-+#endif
- } else {
- return(-1);
- }
diff --git a/sysutils/aperture/patches/patch-ae b/sysutils/aperture/patches/patch-ae
deleted file mode 100644
index a59f7c37ebf..00000000000
--- a/sysutils/aperture/patches/patch-ae
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ae,v 1.1 2000/07/15 06:11:20 jlam Exp $
-
---- memconfig/memconfig.c.orig Sat Jul 15 01:35:01 2000
-+++ memconfig/memconfig.c Sat Jul 15 02:07:45 2000
-@@ -34,7 +34,17 @@
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
-+/*
-+ * This doesn't work if your kernel sources are too divergent from your
-+ * installed headers. Just declare the prototypes for getopt() directly.
-+ */
-+#if 0
- #include <unistd.h>
-+#else
-+int getopt(int, char * const [], const char *);
-+extern char *optarg;
-+extern int optind;
-+#endif
-
- #include "memrange.h"
-
diff --git a/sysutils/aperture/patches/patch-af b/sysutils/aperture/patches/patch-af
deleted file mode 100644
index 5ec70970da1..00000000000
--- a/sysutils/aperture/patches/patch-af
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-af,v 1.1 2001/01/17 23:57:53 jlam Exp $
-
---- module/k6_mem.c.orig Wed Jan 17 12:36:06 2001
-+++ module/k6_mem.c
-@@ -89,7 +89,7 @@
- return EOPNOTSUPP;
-
- for (bit = ffs(desc->mr_len >> 17) - 1; bit < 15; bit++)
-- len |= 1 << (14 - bit);
-+ len |= 1 << bit;
- wc = (desc->mr_flags & MDF_WRITECOMBINE) ? 1 : 0;
- uc = (desc->mr_flags & MDF_UNCACHEABLE) ? 1 : 0;
-
diff --git a/sysutils/asapm/DESCR b/sysutils/asapm/DESCR
deleted file mode 100644
index 2fafa36d493..00000000000
--- a/sysutils/asapm/DESCR
+++ /dev/null
@@ -1,5 +0,0 @@
-'asapm' is an X11 client which displays a battery status of your
-notebook computer equiped with APM (Advanced Power Management) BIOS.
-The status displayed consists remaining battery life, an AC line
-status, a charging status and a digital readout with (a) Percent
-battery remaining and (b) estimated time to dead.
diff --git a/sysutils/asapm/MESSAGE b/sysutils/asapm/MESSAGE
deleted file mode 100644
index 4f062510e7f..00000000000
--- a/sysutils/asapm/MESSAGE
+++ /dev/null
@@ -1,7 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE,v 1.1 2001/10/31 22:52:53 zuntum Exp $
-
-This package requires that the APM driver be enabled in your kernel.
-See apm(4) for details.
-
-===========================================================================
diff --git a/sysutils/asapm/Makefile b/sysutils/asapm/Makefile
deleted file mode 100644
index 8f565d92a9f..00000000000
--- a/sysutils/asapm/Makefile
+++ /dev/null
@@ -1,27 +0,0 @@
-# $NetBSD: Makefile,v 1.23 2003/01/11 15:21:49 cjep Exp $
-#
-
-DISTNAME= asapm-2.11
-CATEGORIES= sysutils x11
-MASTER_SITES= http://www.tigr.net/afterstep/download/asapm/ \
- ftp://ftp.afterstep.org/apps/asapm/ \
- ftp://fuf.sh.cvut.cz/pub/AfterStep/apps/asapm/
-
-MAINTAINER= jlam@netbsd.org
-HOMEPAGE= http://www.tigr.net/afterstep/detail.pl?applet=asapm
-COMMENT= Laptop battery status display for X11
-
-.if !exists(/usr/include/machine/apmvar.h)
-PKG_SKIP_REASON= "APM is not available for ${MACHINE_PLATFORM}"
-.endif
-
-USE_BUILDLINK2= YES
-USE_X11= YES
-GNU_CONFIGURE= YES
-CONFIGURE_ARGS+= --disable-jpeg # there actually is no JPEG support
-CONFIGURE_ARGS+= --with-xpm
-CONFIGURE_ARGS+= --with-xpm-includes=${BUILDLINK_PREFIX.xpm}/include
-CONFIGURE_ARGS+= --with-xpm-library=${BUILDLINK_PREFIX.xpm}/lib
-
-.include "../../graphics/xpm/buildlink2.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/asapm/PLIST b/sysutils/asapm/PLIST
deleted file mode 100644
index 22475261eb6..00000000000
--- a/sysutils/asapm/PLIST
+++ /dev/null
@@ -1,3 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 22:52:53 zuntum Exp $
-bin/asapm
-man/man1/asapm.1
diff --git a/sysutils/asapm/distinfo b/sysutils/asapm/distinfo
deleted file mode 100644
index a42572c346c..00000000000
--- a/sysutils/asapm/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.4 2001/11/26 19:55:40 wiz Exp $
-
-SHA1 (asapm-2.11.tar.gz) = cd89c5557d76dbb19ee565435b533ab48f05f102
-Size (asapm-2.11.tar.gz) = 58729 bytes
-SHA1 (patch-aa) = 570d2240f6afbf78d3cd72e1c1b963beb7ae074d
-SHA1 (patch-ab) = 8796f1f6220ecdbd23d360bb18f721e1ef83febf
diff --git a/sysutils/asapm/patches/patch-aa b/sysutils/asapm/patches/patch-aa
deleted file mode 100644
index 50d932dbe17..00000000000
--- a/sysutils/asapm/patches/patch-aa
+++ /dev/null
@@ -1,27 +0,0 @@
-$NetBSD: patch-aa,v 1.3 2000/01/16 18:37:05 jlam Exp $
-
---- autoconf/Makefile.common.in.orig Tue Mar 9 05:35:24 1999
-+++ autoconf/Makefile.common.in Sun Jan 16 13:23:25 2000
-@@ -13,11 +13,11 @@
- $(INSTALL_PROGRAM) $(PROG) $(AFTER_BIN_DIR)
-
- install.man:
-- $(INSTALL_DATA) $(PROG).man $(AFTER_MAN_DIR)/$(PROG).1x
-+ $(INSTALL_DATA) $(PROG).man $(AFTER_MAN_DIR)/$(PROG).1
-
- uninstall:
- $(RMF) $(AFTER_BIN_DIR)/$(PROG)
-- $(RMF) $(AFTER_MAN_DIR)/$(PROG).1x
-+ $(RMF) $(AFTER_MAN_DIR)/$(PROG).1
-
- clean:
- $(RMF) $(PROG) *.o *~ *% *.bak \#* core
-@@ -34,7 +34,7 @@
- done
-
- $(PROG): $(OBJS)
-- $(CC) $(OBJS) $(LIBRARIES) $(EXTRA_LIBRARIES) -o $(@)
-+ $(CC) $(LDFLAGS) $(OBJS) $(LIBRARIES) $(EXTRA_LIBRARIES) -o $(@)
-
- .c.o:
- $(CC) $(CCFLAGS) $(EXTRA_DEFINES) $(INCLUDES) $(EXTRA_INCLUDES) -c $*.c
diff --git a/sysutils/asapm/patches/patch-ab b/sysutils/asapm/patches/patch-ab
deleted file mode 100644
index e1787d4eb22..00000000000
--- a/sysutils/asapm/patches/patch-ab
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ab,v 1.2 2000/01/16 18:37:05 jlam Exp $
-
---- autoconf/Makefile.defines.in.orig Tue Mar 9 05:35:24 1999
-+++ autoconf/Makefile.defines.in Sun Jan 16 13:24:05 2000
-@@ -28,6 +28,7 @@
- INCS_XPM = @XPM_CFLAGS@
- INCLUDES = $(INCS_X) $(INCS_XPM)
-
-+LDFLAGS = @LDFLAGS@
- LIBS_X = @X_LIBS@ @x_libs@
- LIBS_XPM =
- LIBS_JPEG = @JPEG_LIB@
diff --git a/sysutils/bbsload/DESCR b/sysutils/bbsload/DESCR
deleted file mode 100644
index 2f91fc3d714..00000000000
--- a/sysutils/bbsload/DESCR
+++ /dev/null
@@ -1,3 +0,0 @@
-Small (in dimensions) tool to display various statistics like average
-load during the last minute, last 5 minutes and 15 minutes, memory
-usage, swap usage and CPU usage. Especially suited for BlackBox.
diff --git a/sysutils/bbsload/Makefile b/sysutils/bbsload/Makefile
deleted file mode 100644
index 8a5be182b52..00000000000
--- a/sysutils/bbsload/Makefile
+++ /dev/null
@@ -1,19 +0,0 @@
-# $NetBSD: Makefile,v 1.3 2003/03/18 01:07:56 jschauma Exp $
-#
-
-DISTNAME= bbsload-0.2.5
-CATEGORIES= sysutils x11 wm
-MASTER_SITES= http://bbtools.thelinuxcommunity.org/sources/
-
-MAINTAINER= pino@dohd.org
-HOMEPAGE= http://bbtools.thelinuxcommunity.org/
-COMMENT= Small (in dimensions) tool to display the avarage load
-
-GNU_CONFIGURE= YES
-USE_BUILDLINK2= YES
-USE_X11BASE= YES
-
-post-install:
- ${INSTALL_MAN} ${WRKSRC}/bbsload.1 ${PREFIX}/man/man1/bbsload.1
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/bbsload/PLIST b/sysutils/bbsload/PLIST
deleted file mode 100644
index eaf7cc1f2f5..00000000000
--- a/sysutils/bbsload/PLIST
+++ /dev/null
@@ -1,7 +0,0 @@
-@comment $NetBSD: PLIST,v 1.3 2003/03/18 01:07:56 jschauma Exp $
-bin/bbsload
-man/man1/bbsload.1
-share/bbtools/README.bbsload
-share/bbtools/bbsload.bb
-share/bbtools/bbsload.nobb
-@unexec ${RMDIR} %D/share/bbtools 2>/dev/null || ${TRUE}
diff --git a/sysutils/bbsload/distinfo b/sysutils/bbsload/distinfo
deleted file mode 100644
index 8cd37ffc433..00000000000
--- a/sysutils/bbsload/distinfo
+++ /dev/null
@@ -1,7 +0,0 @@
-$NetBSD: distinfo,v 1.2 2003/03/18 01:07:56 jschauma Exp $
-
-SHA1 (bbsload-0.2.5.tar.gz) = 4c4a023dd8ded57b959167e64877cc86c2709e52
-Size (bbsload-0.2.5.tar.gz) = 79203 bytes
-SHA1 (patch-aa) = 51a725db6d11831f48bf2896304569a584ce41ef
-SHA1 (patch-ab) = 3a14f1b186939e75a74468f481583d49a2a30b4e
-SHA1 (patch-ac) = 476ca12d419d2057ce256d0dcbcf262883f86bed
diff --git a/sysutils/bbsload/patches/patch-aa b/sysutils/bbsload/patches/patch-aa
deleted file mode 100644
index 5c5890dc15a..00000000000
--- a/sysutils/bbsload/patches/patch-aa
+++ /dev/null
@@ -1,331 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2002/04/16 21:49:27 wiz Exp $
-
---- bbsload.cc.orig Mon May 22 20:53:37 2000
-+++ bbsload.cc
-@@ -21,6 +21,12 @@
-
- #include "bbsload.hh"
-
-+#ifdef __NetBSD__
-+#include <sys/param.h>
-+#include <sys/sysctl.h>
-+#include <uvm/uvm_param.h>
-+#endif
-+
- CheckLoad::CheckLoad(ToolWindow *toolwindow) {
- bbtool=toolwindow;
- timer=new BTimer(bbtool->getCurrentScreenInfo()->getBaseDisplay(),this) ;
-@@ -40,97 +46,81 @@
-
- void CheckLoad::timeout()
- {
-- FILE *fp;
--
-- char loadstr[28];
-- char buffer[128];
-- bool redraw=False;
-- struct stat file_status;
-- static time_t last_mtime;
-- static unsigned long old_user=0;
-- static unsigned long old_nice=0;
-- static unsigned long old_system=0;
-- static unsigned long old_idle=0;
-- broken=False;
-+ static u_int64_t old_user=0, old_nice=0, old_system=0,
-+ old_idle=0;
-+ u_int64_t user,nice,system,idle,total;
-+ u_int64_t cputimes[5];
-+ double lavg[3];
-+ struct uvmexp uvm_stat;
-+ int ctl_name[3];
-+ size_t ctllen;
-
-- if (!(fp = fopen("/proc/loadavg", "r")))
-- broken=True;
-- else
-- {
-- fstat(fileno(fp),&file_status);
-- if (file_status.st_mtime != last_mtime)
-- {
-- fgets(loadstr, 28, fp);
-- sscanf(loadstr,"%e %e %e %d/%d",&load.average1m,
-- &load.average5m,&load.average15m,&task.running,
-- &task.total);
-- redraw=true;
-- }
-- }
-- fclose(fp);
-- if (!(fp = fopen("/proc/meminfo", "r")))
-- broken=True;
-- else
-- {
-- fstat(fileno(fp),&file_status);
-- if (file_status.st_mtime != last_mtime)
-- {
-- /* should work for now */
-- fgets(buffer,128,fp);
-- fgets(buffer,128,fp);
-- sscanf(buffer,"Mem: %lu %lu %lu %lu %lu %lu",&mem.total,
-- &mem.used,&mem.free,&mem.shared,&mem.buffers,
-- &mem.cached);
-- fgets(buffer,128,fp);
-- sscanf(buffer,"Swap: %lu %lu %lu",
-- &swap.total,&swap.used,&swap.free);
--
-- norm.total_used=(double)(mem.used+swap.used)/
-- (double)(mem.total+swap.total);
-- norm.mem_used=(double)mem.used/(double)mem.total;
-- if (swap.total!=0)
-- norm.swap_used=(double)swap.used/(double)swap.total;
--
-- redraw=true;
-- }
-- }
-- fclose(fp);
-+ int i;
-
-- if (!(fp = fopen("/proc/stat", "r")))
-- broken=True;
-- else
-- {
-- fstat(fileno(fp),&file_status);
-- if (file_status.st_mtime != last_mtime)
-- {
-- unsigned long user,nice,system,idle,total;
-- /* should work for now */
-- fgets(buffer,128,fp);
-- sscanf(buffer,"cpu %lu %lu %lu %lu",&user,
-- &nice,&system,&idle);
-- total=(user-old_user)+(nice-old_nice)+
-- (system-old_system)+(idle-old_idle);
-+ broken=False;
-
-- if ((total!=0)&(old_user!=0))
-- {
-- cpu.user=(user-old_user)/(double)total;
-- cpu.nice=(nice-old_nice)/(double)user;
-- cpu.system=(system-old_system)/(double)total;
-- cpu.idle=(idle-old_idle)/(double)total;
-- }
-- else
-- cpu.user=cpu.nice=cpu.system=cpu.idle=0;
-+ /* Get system load */
-
-- old_user=user;
-- old_nice=nice;
-- old_system=system;
-- old_idle=idle;
-- redraw=true;
-- }
-- }
-- fclose(fp);
-- if (redraw)
-- bbtool->Redraw();
-+ getloadavg(lavg,3);
-+ load.average1m=lavg[0];
-+ load.average5m=lavg[1];
-+ load.average15m=lavg[2];
-+
-+ /* Get total amount of processes */
-+
-+ ctl_name[0]=CTL_KERN;
-+ ctl_name[1]=KERN_PROC;
-+ ctl_name[2]=KERN_PROC_ALL;
-+ sysctl(ctl_name, 3, NULL, &ctllen,NULL,0); /* get size of proc table */
-+ task.total=ctllen/sizeof(struct kinfo_proc); /* Anybody have an
-+ alternative ? */
-+
-+ /* task.running is missing */
-+ /* get memory statistics */
-+ ctllen=sizeof(uvm_stat);
-+ ctl_name[0]=CTL_VM;
-+ ctl_name[1]=VM_UVMEXP;
-+ sysctl(ctl_name,2,&uvm_stat,&ctllen,NULL,0);
-+
-+ mem.total=uvm_stat.npages;
-+ mem.used=uvm_stat.npages-uvm_stat.free;
-+
-+ swap.total=uvm_stat.swpages;
-+ swap.used=uvm_stat.swpgonly; /* Only count pages in swap which are
-+ not also present in memory */
-+
-+ norm.total_used=(double)(mem.used+swap.used)/
-+ (double)(mem.total+swap.total);
-+ norm.mem_used=(double)mem.used/(double)mem.total;
-+ if (swap.total!=0)
-+ norm.swap_used=(double)swap.used/(double)swap.total;
-+
-+ ctl_name[0]=CTL_KERN;
-+ ctl_name[1]=KERN_CP_TIME;
-+ ctllen=sizeof(cputimes);
-+ if(sysctl(ctl_name,2,cputimes,&ctllen,NULL,0))
-+ perror("sysctl");
-+ user=cputimes[0];
-+ nice=cputimes[1];
-+ system=cputimes[2] /*sys*/
-+ +cputimes[3]/*intr*/;
-+ idle=cputimes[4];
-+ total=(user-old_user)+(nice-old_nice)+
-+ (system-old_system)+(idle-old_idle);
-+ if ((total!=0)&(old_user!=0))
-+ {
-+ cpu.user=(double)(user-old_user)/(double)total;
-+ cpu.nice=(double)(nice-old_nice)/(double)total;
-+ cpu.system=(double)(system-old_system)/(double)total;
-+ cpu.idle=(double)(idle-old_idle)/(double)total;
-+ }
-+ else
-+ cpu.user=cpu.nice=cpu.system=cpu.idle=0;
-+ old_user=user;
-+ old_nice=nice;
-+ old_system=system;
-+ old_idle=idle;
-+ bbtool->Redraw();
- }
-
-
-@@ -233,15 +223,15 @@
- label_counter++;
- }
- if (resource->show.label_totalused) {
-- label.width[6] = XTextWidth(resource->label.font,"0.00",strlen("0.00"));
-+ label.width[8] = XTextWidth(resource->label.font,"0.00",strlen("0.00"));
- label_counter++;
- }
- if (resource->show.label_memused) {
-- label.width[7] = XTextWidth(resource->label.font,"0.00",strlen("0.00"));
-+ label.width[6] = XTextWidth(resource->label.font,"0.00",strlen("0.00"));
- label_counter++;
- }
- if (resource->show.label_swapused) {
-- label.width[8] = XTextWidth(resource->label.font,"0.00",strlen("0.00"));
-+ label.width[7] = XTextWidth(resource->label.font,"0.00",strlen("0.00"));
- label_counter++;
- }
- if (resource->show.label_usercpu) {
-@@ -545,7 +535,7 @@
- }
- }
-
--void ToolWindow::RedrawLabel(double level,int labelnr)
-+void ToolWindow::RedrawLabel(double level,int labelnr,int idx, BColor colour)
- {
- char t[6];
-
-@@ -561,15 +551,14 @@
- xposition+=label.seperator_width;
- }
-
-- XSetForeground(getXDisplay(),frameGC,
-- resource->label.load1m_textColor.getPixel());
-+ XSetForeground(getXDisplay(),frameGC, colour.getPixel());
- labelnr++;
- sprintf(t,"%1.2f",level);
- XDrawString(getXDisplay(), labelwin, frameGC, xposition,
- (label.height+resource->label.font->ascent-
- resource->label.font->descent) / 2,
- t, strlen(t));
-- xposition+=label.width[2];
-+ xposition+=label.width[idx];
- }
-
- void ToolWindow::Redraw()
-@@ -577,12 +566,12 @@
- int offset=0;
- if (resource->show.load1m)
- {
-- RedrawGauge(check_load->getLoad().average1m,offset);
-+ RedrawGauge(check_load->getLoad().average1m,offset);
- offset++;
- }
- if (resource->show.load5m)
- {
-- RedrawGauge(check_load->getLoad().average5m,offset);
-+ RedrawGauge(check_load->getLoad().average5m,offset);
- offset++;
- }
- if (resource->show.load15m)
-@@ -678,53 +667,63 @@
-
- if (resource->show.label_load1m)
- {
-- RedrawLabel(check_load->getLoad().average1m,labelnr);
-- labelnr++;
-+ RedrawLabel(check_load->getLoad().average1m,offset,2,
-+ resource->label.load1m_textColor);
-+ offset++;
- }
- if (resource->show.label_load5m)
- {
-- RedrawLabel(check_load->getLoad().average5m,labelnr);
-- labelnr++;
-+ RedrawLabel(check_load->getLoad().average5m,offset,3,
-+ resource->label.load5m_textColor);
-+ offset++;
- }
- if (resource->show.label_load15m)
- {
-- RedrawLabel(check_load->getLoad().average15m,labelnr);
-- labelnr++;
-+ RedrawLabel(check_load->getLoad().average15m,offset,4,
-+ resource->label.load15m_textColor);
-+ offset++;
- }
- if (resource->show.label_memused)
- {
-- RedrawLabel(check_load->getNorm().mem_used,labelnr);
-- labelnr++;
-+ RedrawLabel(check_load->getNorm().mem_used,offset,6,
-+ resource->label.memUsed_textColor);
-+ offset++;
- }
- if (resource->show.label_swapused)
- {
-- RedrawLabel(check_load->getNorm().swap_used,labelnr);
-- labelnr++;
-+ RedrawLabel(check_load->getNorm().swap_used,offset,7,
-+ resource->label.swapUsed_textColor);
-+ offset++;
- }
- if (resource->show.label_totalused)
- {
-- RedrawLabel(check_load->getNorm().total_used,labelnr);
-- labelnr++;
-+ RedrawLabel(check_load->getNorm().total_used,offset,8,
-+ resource->label.totalUsed_textColor);
-+ offset++;
- }
- if (resource->show.label_usercpu)
- {
-- RedrawLabel(check_load->getCpu().user,labelnr);
-- labelnr++;
-+ RedrawLabel(check_load->getCpu().user,offset,9,
-+ resource->label.seperator_textColor);
-+ offset++;
- }
- if (resource->show.label_nicecpu)
- {
-- RedrawLabel(check_load->getCpu().nice,labelnr);
-- labelnr++;
-+ RedrawLabel(check_load->getCpu().nice,offset,10,
-+ resource->label.seperator_textColor);
-+ offset++;
- }
- if (resource->show.label_systemcpu)
- {
-- RedrawLabel(check_load->getCpu().system,labelnr);
-- labelnr++;
-+ RedrawLabel(check_load->getCpu().system,offset,11,
-+ resource->label.seperator_textColor);
-+ offset++;
- }
- if (resource->show.label_idlecpu)
- {
-- RedrawLabel(check_load->getCpu().idle,labelnr);
-- labelnr++;
-+ RedrawLabel(check_load->getCpu().idle,offset,12,
-+ resource->label.seperator_textColor);
-+ offset++;
- }
- }
-
diff --git a/sysutils/bbsload/patches/patch-ab b/sysutils/bbsload/patches/patch-ab
deleted file mode 100644
index 5ac16a450cb..00000000000
--- a/sysutils/bbsload/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 2002/04/16 21:49:27 wiz Exp $
-
---- bbsload.hh.orig Sun Apr 9 12:27:34 2000
-+++ bbsload.hh
-@@ -150,7 +150,7 @@
- void reconfigure(void);
- void CheckConfig(void);
- void RedrawGauge(double,int);
-- void RedrawLabel(double,int);
-+ void RedrawLabel(double,int,int,BColor);
- bool raised;
- Resource *getResource(void) { return(resource); }
- protected:
diff --git a/sysutils/bbsload/patches/patch-ac b/sysutils/bbsload/patches/patch-ac
deleted file mode 100644
index 525a96e1edb..00000000000
--- a/sysutils/bbsload/patches/patch-ac
+++ /dev/null
@@ -1,78 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2003/03/18 01:07:57 jschauma Exp $
-
---- /dev/null Mon Mar 17 19:52:07 2003
-+++ bbsload.1 Mon Mar 17 19:53:44 2003
-@@ -0,0 +1,73 @@
-+.TH BBSLOAD 1 "March 14, 2003" bbsload "bbtools"
-+.SH NAME
-+bbsload \- system load tool for Blackbox
-+
-+.SH SYNOPSIS
-+.B bbsload
-+[\fIOPTIONS\fR]
-+
-+.SH DESCRIPTION
-+\fBbbsload\fR is a Blackbox tool to display your system load.
-+
-+It can show simple system bar graphs, including load averages for 1, 5 and 15
-+minute periods, memory usage, swap usage, total system usage, as well as CPU
-+loads for user, nice and system processes and idle time.
-+
-+.SH USAGE
-+By default \fBbbsload\fR reads the Blackbox style-file as defined in
-+\fI$HOME/.blackboxrc\fR and copies as much of the style as possible. The
-+result is an application which looks a lot like the toolbar.
-+
-+The \fI-geometry\fR is given as +x+y or -x-y (or combination)
-+where -x-y is the (x,y) distance of the right bottom of screen
-+to the right bottom of \fBbbsload\fR.
-+
-+So \fI-geometry -0-0\fR puts the application in the lower right corner of the
-+screen.
-+
-+.SH OPTIONS
-+A summary of the options supported by \fBbbsload\fR is included below.
-+
-+.TP
-+\fB\-display\fR \fIdisplay name\fR
-+X server to connect to
-+.TP
-+\fB\-c[onfig]\fR \fIfilename\fR
-+use alternate config file
-+.TP
-+.B \-d[ecorated]
-+Show 'normal' decorated window
-+.TP
-+\fB\-geom[etry]\fR \fIgeometry\fR
-+Set geometry of window
-+.TP
-+\fB\-h[elp]\fR
-+Show summary of options and exit.
-+.TP
-+\fB\-n[obb]\fR
-+fall back on default configuration
-+.TP
-+\fB\-s[hape]\fR
-+Don't display groundplate
-+.TP
-+\fB\-v[ersion]\fR
-+Display version number
-+.TP
-+\fB\-w[ithdrawn]\fR
-+Place bbtool in the Slit
-+
-+.SH FILES
-+Default: \fI$datadir=/usr/local/share/\fR
-+.br
-+.SS "Under Blackbox"
-+.nf
-+\fI$datadir/bbtools/bbsload.bb\fR the global configuration file
-+\fI$HOME/.bbtools/bbsload.bb\fR a local configuration file
-+
-+.SS "Under other Window managers"
-+.nf
-+\fI$datadir/bbtools/bbsload.nobb\fR the global configuration file
-+\fI$HOME/.bbtools/bbsload.nobb\fR a local configuration file
-+
-+.SH AUTHOR
-+This manual page was written by Emanuele Rocca <emarocca@libero.it>, for the Debian GNU/Linux system (but may be used by others).
diff --git a/sysutils/bchunk/DESCR b/sysutils/bchunk/DESCR
deleted file mode 100644
index 368fa53bfa8..00000000000
--- a/sysutils/bchunk/DESCR
+++ /dev/null
@@ -1,12 +0,0 @@
-binchunker converts a CD image in a ".bin / .cue" format (sometimes
-".raw / .cue") to a set of .iso and .cdr tracks.
-
-The bin/cue format is used by some non-Unix cd-writing software, but is
-not supported on most other cd-writing programs.
-
-The .iso track contains an ISO file system, which can be vnconfiged and
-mounted, or written on a CD-R using cdrecord.
-
-The .cdr tracks are in the native CD audio format. They can be either
-written on a CD-R using cdrecord -audio, or converted to WAV (or any
-other sound format for that matter) using sox.
diff --git a/sysutils/bchunk/MESSAGE b/sysutils/bchunk/MESSAGE
deleted file mode 100644
index d940f3655d7..00000000000
--- a/sysutils/bchunk/MESSAGE
+++ /dev/null
@@ -1,9 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE,v 1.2 2002/09/24 12:30:36 wiz Exp $
-
-It is advisable that you edit the .cue file to either MODE2/2352/2048 or
-MODE2/2352/2324 depending on whether you want an ISO filesystem or a VCD,
-respectively. The format itself does not contain this feature and in an
-ambiguous case it can only guess.
-
-===========================================================================
diff --git a/sysutils/bchunk/Makefile b/sysutils/bchunk/Makefile
deleted file mode 100644
index fcd1532aee2..00000000000
--- a/sysutils/bchunk/Makefile
+++ /dev/null
@@ -1,17 +0,0 @@
-# $NetBSD: Makefile,v 1.4 2001/11/04 03:28:45 tv Exp $
-
-DISTNAME= bchunk-1.1.1
-CATEGORIES= sysutils
-MASTER_SITES= http://hes.iki.fi/bchunk/
-
-MAINTAINER= pooka@netbsd.org
-HOMEPAGE= http://hes.iki.fi/bchunk/
-COMMENT= ".bin/.cue" CD image converter
-
-MAKE_FLAGS+= CC="${CC}" LD="${CC}" CFLAGS="${CFLAGS}"
-
-do-install:
- ${INSTALL_PROGRAM} ${WRKSRC}/bchunk ${PREFIX}/bin/bchunk
- ${INSTALL_MAN} ${WRKSRC}/bchunk.1 ${PREFIX}/man/man1/bchunk.1
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/bchunk/PLIST b/sysutils/bchunk/PLIST
deleted file mode 100644
index c10891f0fca..00000000000
--- a/sysutils/bchunk/PLIST
+++ /dev/null
@@ -1,3 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2001/11/04 03:28:45 tv Exp $@
-bin/bchunk
-man/man1/bchunk.1
diff --git a/sysutils/bchunk/distinfo b/sysutils/bchunk/distinfo
deleted file mode 100644
index 5c3ccd71c63..00000000000
--- a/sysutils/bchunk/distinfo
+++ /dev/null
@@ -1,4 +0,0 @@
-$NetBSD: distinfo,v 1.4 2001/11/04 03:28:45 tv Exp $
-
-SHA1 (bchunk-1.1.1.tar.gz) = a3d25cf8a53e2b4f1793f44b53569ffe587a6a2b
-Size (bchunk-1.1.1.tar.gz) = 14633 bytes
diff --git a/sysutils/bkpupsd/DESCR b/sysutils/bkpupsd/DESCR
deleted file mode 100644
index a42077f3917..00000000000
--- a/sysutils/bkpupsd/DESCR
+++ /dev/null
@@ -1,12 +0,0 @@
-This is a simple uninterruptible power source (UPS) daemon which
-supports BKPro(TM) and BK UPS(TM) series by APC, and FREQUPS F series
-by Mitsubishi Electric Corp.
-
-Bkpupsd works as UPS monitor, sensing line-failures, shutting down the
-system cleanly, and finally shutting down the UPS itself.
-
-This UPSd provides only the "dumb mode", and the advanced features are
-not supported.
-
-Original was written by Yoshifumi Watanabe <mwatts@edu1.tokyo-med.ac.jp>.
-Heavily re-written by Takahiro Kambe <taca@back-street.net>.
diff --git a/sysutils/bkpupsd/MESSAGE b/sysutils/bkpupsd/MESSAGE
deleted file mode 100644
index 6cb94390a4d..00000000000
--- a/sysutils/bkpupsd/MESSAGE
+++ /dev/null
@@ -1,14 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE,v 1.2 2003/03/12 16:43:45 taca Exp $
-
-${DOCDIR}/rc.conf.d.sample contains some shell variables
-for helping bkpupsd start up.
-
-Simple way to install NetBSD 1.5 or later is bellow.
-
-(1) Copy ${PKGRCDIR}/bkpupsd to ${ETCDIR}/rc.d/bkpupsd.
-(2) Append ${DOCDIR}/rc.conf.d.sample to ${ETCDIR}/rc.conf.
-(3) Edit ${ETCDIR}/rc.conf for your needs, serial device and
- UPS type for example.
-
-===========================================================================
diff --git a/sysutils/bkpupsd/Makefile b/sysutils/bkpupsd/Makefile
deleted file mode 100644
index ae81ce945a9..00000000000
--- a/sysutils/bkpupsd/Makefile
+++ /dev/null
@@ -1,27 +0,0 @@
-# $NetBSD: Makefile,v 1.6 2003/03/12 16:43:45 taca Exp $
-#
-
-DISTNAME= bkpupsd-2.1.2
-CATEGORIES= sysutils
-MASTER_SITES= ftp://ftp.jone-system.com/pub/misc/ \
- ftp://ftp.back-street.net/pub/misc/
-EXTRACT_SUFX= .tar.bz2
-
-MAINTAINER= taca@netbsd.org
-HOMEPAGE= # not exist
-COMMENT= simple UPS daemon for BK-Pro, BK series and FREQUPS F series
-
-.include "../../mk/bsd.prefs.mk"
-
-DOCDIR= ${PREFIX}/share/doc/bkpupsd
-PKGRCDIR= ${PREFIX}/etc/rc.d
-ETCDIR= ${DESTDIR}/etc
-MAKE_ENV+= DEFAULT_DEVICE=${DEFAULT_SERIAL_DEVICE} DOCDIR=${DOCDIR}
-
-MESSAGE_SUBST+= DOCDIR=${DOCDIR} ETCDIR=${ETCDIR} PKGRCDIR=${PKGRCDIR}
-
-post-install:
- ${INSTALL_DATA} ${WRKSRC}/README ${DOCDIR}
- ${INSTALL_DATA} ${WRKSRC}/README.ja ${DOCDIR}
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/bkpupsd/PLIST b/sysutils/bkpupsd/PLIST
deleted file mode 100644
index a9fa28bc935..00000000000
--- a/sysutils/bkpupsd/PLIST
+++ /dev/null
@@ -1,17 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2001/12/19 15:38:00 taca Exp $
-etc/rc.d/bkpupsd
-etc/upstab
-libexec/bkpupsd/battery.shutdown
-libexec/bkpupsd/line.lost
-libexec/bkpupsd/line.recover
-libexec/bkpupsd/line.shutdown
-@dirrm libexec/bkpupsd
-man/cat5/upstab.0
-man/cat8/bkpupsd.0
-man/man5/upstab.5
-man/man8/bkpupsd.8
-sbin/bkpupsd
-share/doc/bkpupsd/README
-share/doc/bkpupsd/README.ja
-share/doc/bkpupsd/rc.conf.d.sample
-@dirrm share/doc/bkpupsd
diff --git a/sysutils/bkpupsd/distinfo b/sysutils/bkpupsd/distinfo
deleted file mode 100644
index 4cff7100d50..00000000000
--- a/sysutils/bkpupsd/distinfo
+++ /dev/null
@@ -1,4 +0,0 @@
-$NetBSD: distinfo,v 1.7 2003/03/12 16:43:45 taca Exp $
-
-SHA1 (bkpupsd-2.1.2.tar.bz2) = 742e6d7bc99c777077b9e0cc8cf6016fc63d18a6
-Size (bkpupsd-2.1.2.tar.bz2) = 35054 bytes
diff --git a/sysutils/c++rt0/DESCR b/sysutils/c++rt0/DESCR
deleted file mode 100644
index 81ddfc9972e..00000000000
--- a/sysutils/c++rt0/DESCR
+++ /dev/null
@@ -1,9 +0,0 @@
-The default NetBSD/sparc /usr/lib/c++rt0.o is compiled -fpic. This means
-it can only handle offsets up to a certain size, and can fail to work in
-large programs. Compiling -fPIC allows larger offsets and should permit
-large programs to function. As mixing object files compiled with -fpic
-and -fPIC isn't allowed, the system c++rt0.o must be exchanged so that
--fPIC can be used everywhere.
-
-This package allows most of pkgsrc to compile on NetBSD/sparc systems
-which run an OS version prior to 1.4.3 (which already contains this fix).
diff --git a/sysutils/c++rt0/Makefile b/sysutils/c++rt0/Makefile
deleted file mode 100644
index a2da4b025d6..00000000000
--- a/sysutils/c++rt0/Makefile
+++ /dev/null
@@ -1,26 +0,0 @@
-# $NetBSD: Makefile,v 1.6 2003/03/28 21:14:34 wiz Exp $
-#
-
-DISTNAME= c++rt0-1.0
-CATEGORIES= sysutils
-MASTER_SITES+= ftp://ftp.netbsd.org/pub/NetBSD/arch/sparc/c++rt0/
-DISTFILES= c++rt0.o.PIC c++rt0.o.pic README
-
-MAINTAINER= hubertf@netbsd.org
-COMMENT= 1.4.x/sparc PIC c++rt0.o file
-
-DIST_SUBDIR= c++rt0
-ONLY_FOR_PLATFORM= NetBSD-1.4-sparc NetBSD-1.4.[12]-sparc
-
-EXTRACT_ONLY= # empty
-
-do-build:
- @${ECHO} Nothing to do.
-
-do-install:
- ${INSTALL_DATA_DIR} ${PREFIX}/lib/c++rt0
- ${INSTALL_DATA} ${_DISTDIR}/c++rt0.o.pic ${PREFIX}/lib/c++rt0
- ${INSTALL_DATA} ${_DISTDIR}/c++rt0.o.PIC ${PREFIX}/lib/c++rt0
- ${INSTALL_DATA} ${_DISTDIR}/README ${PREFIX}/lib/c++rt0
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/c++rt0/PLIST b/sysutils/c++rt0/PLIST
deleted file mode 100644
index 7457b5ba5f7..00000000000
--- a/sysutils/c++rt0/PLIST
+++ /dev/null
@@ -1,5 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 22:52:56 zuntum Exp $
-lib/c++rt0/c++rt0.o.PIC
-lib/c++rt0/c++rt0.o.pic
-lib/c++rt0/README
-@dirrm lib/c++rt0
diff --git a/sysutils/c++rt0/distinfo b/sysutils/c++rt0/distinfo
deleted file mode 100644
index cbd1e590f71..00000000000
--- a/sysutils/c++rt0/distinfo
+++ /dev/null
@@ -1,8 +0,0 @@
-$NetBSD: distinfo,v 1.2 2001/04/19 11:28:59 agc Exp $
-
-SHA1 (c++rt0/c++rt0.o.PIC) = 7b15f31308893d0167f30cd5d381302bcd57f281
-Size (c++rt0/c++rt0.o.PIC) = 667 bytes
-SHA1 (c++rt0/c++rt0.o.pic) = 4c1aa645c23669fa04cabc786747ba4daae7fcce
-Size (c++rt0/c++rt0.o.pic) = 607 bytes
-SHA1 (c++rt0/README) = 5ca6492df0bef33e192e3ad1c478533445005f6c
-Size (c++rt0/README) = 444 bytes
diff --git a/sysutils/cdbkup/DESCR b/sysutils/cdbkup/DESCR
deleted file mode 100644
index 32f124846bc..00000000000
--- a/sysutils/cdbkup/DESCR
+++ /dev/null
@@ -1,4 +0,0 @@
-cdbkup performs full or incremental backups of local or remote
-filesystems onto CD-R(W)s. Results are stored as tarballs on
-single- or multi-session ISO CDs. It works either interactively
-for multi-CD backups, or non-interactively for single-CD backups.
diff --git a/sysutils/cdbkup/Makefile b/sysutils/cdbkup/Makefile
deleted file mode 100644
index 5c493273593..00000000000
--- a/sysutils/cdbkup/Makefile
+++ /dev/null
@@ -1,38 +0,0 @@
-# $NetBSD: Makefile,v 1.2 2002/12/22 22:24:56 jmmv Exp $
-
-DISTNAME= cdbkup-1.0
-PKGREVISION= 1
-CATEGORIES= sysutils
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=cdbkup/} \
- ftp://batraq.anything3d.com/pub/cdbkup/cdbkup-1/ \
- http://mishka.terabyte.com.ua/cdbkup/
-
-MAINTAINER= mishka@terabyte.com.ua
-HOMEPAGE= http://sourceforge.net/projects/cdbkup/
-COMMENT= CD-R(W) backup/restore system
-
-.include "../../mk/bsd.prefs.mk"
-
-DEPENDS+= cdrecord>=1.10:../../sysutils/cdrecord
-.if ${OPSYS} == "NetBSD" && ${OS_VERSION:M1.6[K-Z]}
-DEPENDS+= gtar-base>=1.13.25:../../archivers/gtar-base
-.endif
-
-GNU_CONFIGURE= YES
-USE_PERL5= YES
-
-.if (${OPSYS} == SunOS)
-CDBKUP_SNARDIR?= /var/${PKGBASE}
-CDBKUP_DUMPGRP?= sys
-.else
-CDBKUP_SNARDIR?= /var/db/${PKGBASE}
-CDBKUP_DUMPGRP?= operator
-.endif
-
-CONFIGURE_ARGS+= --with-snardir=${CDBKUP_SNARDIR} \
- --with-dumpgrp=${CDBKUP_DUMPGRP}
-PLIST_SUBST+= CDBKUP_SNARDIR=${CDBKUP_SNARDIR} \
- CDBKUP_DUMPGRP=${CDBKUP_DUMPGRP} \
- INSTALL=${INSTALL} RMDIR=${RMDIR} TRUE=${TRUE}
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/cdbkup/PLIST b/sysutils/cdbkup/PLIST
deleted file mode 100644
index b3eb65bb38d..00000000000
--- a/sysutils/cdbkup/PLIST
+++ /dev/null
@@ -1,17 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2002/07/11 11:37:52 tron Exp $
-man/man1/cdappend.1
-man/man1/cdbkup.1
-man/man1/cdcat.1
-man/man1/cdrstr.1
-man/man1/cdsplit.1
-sbin/cdappend
-sbin/cdbkup
-sbin/cdcat
-sbin/cdrstr
-sbin/cdsplit
-share/doc/cdbkup/COMPLIANCE
-share/doc/cdbkup/README
-share/doc/cdbkup/TODO
-@dirrm share/doc/cdbkup
-@exec ${INSTALL} -d -m 750 -o root -g ${CDBKUP_DUMPGRP} ${CDBKUP_SNARDIR}
-@unexec ${RMDIR} ${CDBKUP_SNARDIR} 2>/dev/null || ${TRUE}
diff --git a/sysutils/cdbkup/distinfo b/sysutils/cdbkup/distinfo
deleted file mode 100644
index e130f8d59dc..00000000000
--- a/sysutils/cdbkup/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.1.1.1 2002/07/11 11:37:52 tron Exp $
-
-SHA1 (cdbkup-1.0.tar.gz) = 78d02726eaa8e55138639b4b6a0164251a3d0766
-Size (cdbkup-1.0.tar.gz) = 38252 bytes
-SHA1 (patch-aa) = 96084141e52169a1759891d12f77ec6111c4ee78
diff --git a/sysutils/cdbkup/patches/patch-aa b/sysutils/cdbkup/patches/patch-aa
deleted file mode 100644
index ff345e2228b..00000000000
--- a/sysutils/cdbkup/patches/patch-aa
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2002/07/11 11:37:52 tron Exp $
---- src/cdcat.in Wed Feb 13 01:20:57 2002
-+++ src/cdcat.in Tue Feb 19 22:09:50 2002
-@@ -98,7 +98,7 @@
-
- sub mount {
- return if( $test);
-- if( system("@MOUNT@ -t iso9660 ".esc_shell($device)." $mntpt") != 0)
-+ if( system("@MOUNT@ -t cd9660 ".esc_shell($device)." $mntpt") != 0)
- {
- die "Can't mount $device: $!\n";
- }
diff --git a/sysutils/cdrdao/DESCR b/sysutils/cdrdao/DESCR
deleted file mode 100644
index 390c691115d..00000000000
--- a/sysutils/cdrdao/DESCR
+++ /dev/null
@@ -1,15 +0,0 @@
-Disk at Once CD recording, featuring:
-
-Full control over length and contents of pre-gaps (pause areas between tracks).
- Pre-gaps may be completely omitted,
- e.g. for dividing live recordings into tracks.
- Control over sub-channel data like:
- catalog number
- copy, pre-emphasis, 2-/4-channel flags
- ISRC code
- index marks
- Support for exact audio or data CD copying.
- Tracks may be composed of different audio files supporting
- non destructive cut.
- Accepts WAVE and raw audio files.
- CD-TEXT reading and writing with drives that support it.
diff --git a/sysutils/cdrdao/Makefile b/sysutils/cdrdao/Makefile
deleted file mode 100644
index 175e5793208..00000000000
--- a/sysutils/cdrdao/Makefile
+++ /dev/null
@@ -1,65 +0,0 @@
-# $NetBSD: Makefile,v 1.11 2003/06/18 09:22:24 agc Exp $
-#
-
-DISTNAME= ${PKGNAME}.src
-PKGNAME= cdrdao-1.1.7
-WRKSRC= ${WRKDIR}/${PKGNAME_NOREV}
-CATEGORIES= sysutils
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=cdrdao/}
-
-MAINTAINER= david@maxwell.net
-HOMEPAGE= http://cdrdao.sourceforge.net/
-COMMENT= Records audio or data CD-Rs in disk-at-once (DAO) mode
-
-GNU_CONFIGURE= YES
-USE_GMAKE= YES
-CONFIGURE_ARGS+= --with-pcctsbin=${PREFIX}/bin
-CONFIGURE_ARGS+= --with-pcctsinc=${PREFIX}/include/pccts
-CONFIGURE_ARGS+= --without-posix-threads
-CONFIGURE_ARGS+= --with-gtkmm-exec-prefix=/dev/null
-# don't pick up an installed libcdda_paranoia
-LDFLAGS+= -L../paranoia
-
-#override ARCH to avoid picking up a bad ${ARCH} during the build
-MAKE_ENV+= ARCH=""
-
-USE_BUILDLINK2= yes
-
-post-configure:
- cd ${WRKSRC}/scsilib/RULES ; \
- ${TEST} -f netbsd-cc.rul || ${MV} i386-netbsd-cc.rul netbsd-cc.rul; \
- ${TEST} -f netbsd-gcc.rul || ${MV} i386-netbsd-gcc.rul netbsd-gcc.rul; \
- ${LN} -sf netbsd-gcc.rul ${MACHINE}-netbsd-gcc.rul; \
- ${LN} -sf netbsd-cc.rul ${MACHINE}-netbsd-cc.rul;
-
-post-install:
- ${INSTALL_MAN_DIR} ${PREFIX}/share/doc/cdrdao
- ${INSTALL_MAN} ${WRKSRC}/COPYING \
- ${WRKSRC}/README \
- ${WRKSRC}/Release-1.1.2 \
- ${WRKSRC}/Release-1.1.3 \
- ${WRKSRC}/CREDITS \
- ${WRKSRC}/README.FreeBSD \
- ${WRKSRC}/INSTALL \
- ${WRKSRC}/README.PlexDAE \
- ${PREFIX}/share/doc/cdrdao
- ${INSTALL_MAN_DIR} ${PREFIX}/share/doc/cdrdao/testtocs
- ${INSTALL_MAN} ${WRKSRC}/testtocs/*.toc \
- ${PREFIX}/share/doc/cdrdao/testtocs
- ${INSTALL_MAN_DIR} ${PREFIX}/share/examples/cdrdao
- ${INSTALL_MAN} ${WRKSRC}/contrib/mp32dao/mp32dao.pl \
- ${PREFIX}/share/examples/cdrdao
- ${INSTALL_MAN_DIR} ${PREFIX}/share/examples/cdrdao/psxcopy
- ${INSTALL_MAN} ${WRKSRC}/contrib/psxcopy-0.2/Makefile \
- ${WRKSRC}/contrib/psxcopy-0.2/README \
- ${WRKSRC}/contrib/psxcopy-0.2/cdjob.c \
- ${WRKSRC}/contrib/psxcopy-0.2/cdjob.c \
- ${WRKSRC}/contrib/psxcopy-0.2/psxdump.c \
- ${WRKSRC}/contrib/psxcopy-0.2/read-psx \
- ${WRKSRC}/contrib/psxcopy-0.2/write-psx \
- ${PREFIX}/share/examples/cdrdao/psxcopy
- ${INSTALL_MAN} ${WRKSRC}/contrib/wav2dao/wav2dao.pl \
- ${PREFIX}/share/examples/cdrdao
-
-.include "../../devel/pccts/buildlink2.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/cdrdao/PLIST b/sysutils/cdrdao/PLIST
deleted file mode 100644
index b785b6be68d..00000000000
--- a/sysutils/cdrdao/PLIST
+++ /dev/null
@@ -1,45 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2002/10/29 16:47:52 drochner Exp $
-bin/cdrdao
-bin/toc2cue
-man/man1/cdrdao.1
-share/cdrdao/drivers
-share/doc/cdrdao/COPYING
-share/doc/cdrdao/CREDITS
-share/doc/cdrdao/INSTALL
-share/doc/cdrdao/README
-share/doc/cdrdao/README.FreeBSD
-share/doc/cdrdao/README.PlexDAE
-share/doc/cdrdao/Release-1.1.2
-share/doc/cdrdao/Release-1.1.3
-share/doc/cdrdao/testtocs/cdtext.toc
-share/doc/cdrdao/testtocs/data1.toc
-share/doc/cdrdao/testtocs/data2.toc
-share/doc/cdrdao/testtocs/data3.toc
-share/doc/cdrdao/testtocs/data4.toc
-share/doc/cdrdao/testtocs/data5.toc
-share/doc/cdrdao/testtocs/data6.toc
-share/doc/cdrdao/testtocs/data7.toc
-share/doc/cdrdao/testtocs/mode1_rw.toc
-share/doc/cdrdao/testtocs/mode1_rw_raw.toc
-share/doc/cdrdao/testtocs/t1.toc
-share/doc/cdrdao/testtocs/t2.toc
-share/doc/cdrdao/testtocs/t3.toc
-share/doc/cdrdao/testtocs/t4.toc
-share/doc/cdrdao/testtocs/t5.toc
-share/doc/cdrdao/testtocs/t6.toc
-share/doc/cdrdao/testtocs/t7.toc
-share/doc/cdrdao/testtocs/t8.toc
-share/doc/cdrdao/testtocs/t9.toc
-share/examples/cdrdao/mp32dao.pl
-share/examples/cdrdao/psxcopy/Makefile
-share/examples/cdrdao/psxcopy/README
-share/examples/cdrdao/psxcopy/cdjob.c
-share/examples/cdrdao/psxcopy/psxdump.c
-share/examples/cdrdao/psxcopy/read-psx
-share/examples/cdrdao/psxcopy/write-psx
-share/examples/cdrdao/wav2dao.pl
-@dirrm share/examples/cdrdao/psxcopy
-@dirrm share/examples/cdrdao
-@dirrm share/doc/cdrdao/testtocs
-@dirrm share/doc/cdrdao
-@dirrm share/cdrdao
diff --git a/sysutils/cdrdao/distinfo b/sysutils/cdrdao/distinfo
deleted file mode 100644
index ff81bb6d031..00000000000
--- a/sysutils/cdrdao/distinfo
+++ /dev/null
@@ -1,8 +0,0 @@
-$NetBSD: distinfo,v 1.6 2002/10/29 16:47:52 drochner Exp $
-
-SHA1 (cdrdao-1.1.7.src.tar.gz) = d688f8b117de367841958f1ca977100fc4e8484b
-Size (cdrdao-1.1.7.src.tar.gz) = 1433366 bytes
-SHA1 (patch-aa) = 1856f36a9dd0a5d248e94a079a63fafcff045554
-SHA1 (patch-ab) = 071fedfbc598400d9d41e050aa01c5902e97caaa
-SHA1 (patch-ac) = 7392aad2b18b670023396b47715b292d8046b495
-SHA1 (patch-ad) = e10ec407f4c4200e443364077ab6d56e1d3cd2d3
diff --git a/sysutils/cdrdao/patches/patch-aa b/sysutils/cdrdao/patches/patch-aa
deleted file mode 100644
index eb9916c513d..00000000000
--- a/sysutils/cdrdao/patches/patch-aa
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-aa,v 1.3 2002/01/07 10:16:45 tron Exp $
-
---- dao/cdrdao.drivers.orig Sun Apr 29 15:42:09 2001
-+++ dao/cdrdao.drivers Mon Jan 7 10:45:34 2002
-@@ -105,6 +105,7 @@
- W|PLEXTOR|CD-R PX-W1210|generic-mmc|OPT_MMC_CD_TEXT
- W|PLEXTOR|CD-R PX-W124|generic-mmc
- W|PLEXTOR|CD-R PX-W1610|generic-mmc|OPT_MMC_CD_TEXT
-+W|PLEXTOR|CD-R PX-W2410|generic-mmc|OPT_MMC_CD_TEXT
- W|PLEXTOR|CD-R PX-W4220|generic-mmc|OPT_MMC_CD_TEXT
- W|PLEXTOR|CD-R PX-W8220|generic-mmc|OPT_MMC_CD_TEXT
- W|PLEXTOR|CD-R PX-W8432|generic-mmc|OPT_MMC_CD_TEXT
diff --git a/sysutils/cdrdao/patches/patch-ab b/sysutils/cdrdao/patches/patch-ab
deleted file mode 100644
index 603997182bd..00000000000
--- a/sysutils/cdrdao/patches/patch-ab
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-ab,v 1.2 2000/07/07 16:25:04 dmcmahill Exp $
-
-have a default scsi device which is likely to be correct (at least
-on single CD systems).
-
---- dao/main.cc.orig Tue Oct 26 12:13:46 1999
-+++ dao/main.cc Fri Jul 7 12:20:08 2000
-@@ -157,5 +157,9 @@
- #else
-
--static const char *SCSI_DEVICE = "0,0,0";
-+#if defined (__i386__)
-+static const char *SCSI_DEVICE = "/dev/rcd0d";
-+#else
-+static const char *SCSI_DEVICE = "/dev/rcd0c";
-+#endif /* __i386__ */
- static int FIFO_BUFFERS = 32;
-
diff --git a/sysutils/cdrdao/patches/patch-ac b/sysutils/cdrdao/patches/patch-ac
deleted file mode 100644
index b2efa4f0c55..00000000000
--- a/sysutils/cdrdao/patches/patch-ac
+++ /dev/null
@@ -1,49 +0,0 @@
-$NetBSD: patch-ac,v 1.3 2002/10/29 16:47:53 drochner Exp $
-
---- ./scsilib/include/btorder.h.orig Sun Nov 25 16:35:10 2001
-+++ ./scsilib/include/btorder.h Tue Oct 29 09:33:02 2002
-@@ -63,35 +63,21 @@
- #endif
-
-
--/*
-- * Convert byte-order definitions from xconfig.h into our values
-- * and verify them.
-- */
--#if defined(HAVE_C_BIGENDIAN) && \
-- !defined(WORDS_BIGENDIAN)
--#define WORDS_LITTLEENDIAN
--#define _LITTLE_ENDIAN
--#endif
--
--#if defined(HAVE_C_BIGENDIAN) && \
-- defined(WORDS_BIGENDIAN)
--#define _BIG_ENDIAN
--#endif
--
--#if defined(_LITTLE_ENDIAN) && defined(_BIG_ENDIAN)
--/*
-- * #error will not work for all compilers (e.g. sunos4)
-- * The following line will abort compilation on all compilers
-- * if none of the above is defines. And that's what we want.
-- */
--error Only one of _LITTLE_ENDIAN or _BIG_ENDIAN may be defined
--#endif
-
-
- #if defined(_BIT_FIELDS_LTOH) || defined(_BIT_FIELDS_HTOL)
- /*
- * Bitorder is already known.
- */
-+
-+#elif defined(__NetBSD__)
-+#include <machine/endian.h>
-+#if BYTE_ORDER == LITTLE_ENDIAN
-+#define _BIT_FIELDS_LTOH
-+#else
-+#define _BIT_FIELDS_HTOL
-+#endif /* BYTE_ORDER == LITTLE_ENDIAN */
-+
- #else
- /*
- * Bitorder not yet known.
diff --git a/sysutils/cdrdao/patches/patch-ad b/sysutils/cdrdao/patches/patch-ad
deleted file mode 100644
index 31859137fc4..00000000000
--- a/sysutils/cdrdao/patches/patch-ad
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2002/08/30 08:19:12 drochner Exp $
-
---- dao/GenericMMC.cc.orig Thu Aug 15 17:54:49 2002
-+++ dao/GenericMMC.cc Thu Aug 15 17:57:53 2002
-@@ -1693,6 +1693,7 @@
- }
-
- dataLen = ((reqData[0] << 8) | reqData[1]) + 2;
-+ dataLen = (dataLen + 1) & ~1;
-
- message(4, "Raw toc data len: %d", dataLen);
-
diff --git a/sysutils/cdrecord-xcdroast/DESCR b/sysutils/cdrecord-xcdroast/DESCR
deleted file mode 100644
index 48cbdc9893a..00000000000
--- a/sysutils/cdrecord-xcdroast/DESCR
+++ /dev/null
@@ -1,9 +0,0 @@
-Cdrecord allows you to burn CDs with a CD-R/CD-RW recorder. It
-works as a burn engine for several applications. Cdrecord supports
-CD recorders from many different vendors; all SCSI-3/mmc and
-ATAPI/mmc compliant drives should also work. Supported features
-include: IDE/ATAPI, parallel-port, and SCSI drives; audio CDs, data
-CDs, and mixed CDs; full multi-session support, CD-RWs (rewritable),
-TAO, DAO and human-readable error messages.
-
-This is a development release of the software.
diff --git a/sysutils/cdrecord-xcdroast/Makefile b/sysutils/cdrecord-xcdroast/Makefile
deleted file mode 100644
index 07a81605a60..00000000000
--- a/sysutils/cdrecord-xcdroast/Makefile
+++ /dev/null
@@ -1,52 +0,0 @@
-# $NetBSD: Makefile,v 1.4 2003/06/05 16:12:11 drochner Exp $
-
-DISTNAME= cdrtools-2.00.3
-PKGNAME= cdrecord-xcdroast-0.98a13.2.00.3
-WRKSRC= ${WRKDIR}/${DISTNAME:C/a.*//}
-CATEGORIES= sysutils
-MASTER_SITES= ftp://ftp.berlios.de/pub/cdrecord/
-
-MAINTAINER= lukem@netbsd.org
-HOMEPAGE= http://www.fokus.gmd.de/research/cc/glone/employees/joerg.schilling/private/cdrecord.html
-COMMENT= cdrecord bits for xcdroast
-
-CONFLICTS+= cdrecord-xcdroast098a11-*
-CONFLICTS+= cdrecord-xcdroast098a13-*
-
-.include "../../mk/bsd.prefs.mk"
-
-USE_BUILDLINK2= # defined
-USE_GMAKE= # defined
-
-.if ${LOCALBASE} != "/opt/schily"
-BUILDLINK_TRANSFORM= r:-I/opt/schily
-BUILDLINK_TRANSFORM+= r:-L/opt/schily
-.endif
-
-# avoid picking up a bad ${ARCH} during the build
-MAKE_ENV+= ARCH=""
-MAKE_ENV+= MAKEPROG="gmake"
-
-do-configure:
- cd ${WRKSRC}/RULES; \
- for suffix in netbsd-cc.rul netbsd-gcc.rul; do \
- if [ ! -f ${MACHINE}-$$suffix ]; then \
- ${LN} -sf i386-$$suffix ${MACHINE}-$$suffix; \
- fi; \
- done
-
-XCDRTOOLDIR= ${PREFIX}/lib/xcdroast-0.98/bin
-
-do-install:
- ${INSTALL_DATA_DIR} ${XCDRTOOLDIR}
- cd ${WRKSRC}/cdda2wav; \
- ${INSTALL_PROGRAM} OBJ/*/cdda2wav ${XCDRTOOLDIR}
- cd ${WRKSRC}/cdrecord; \
- ${INSTALL_PROGRAM} OBJ/*/cdrecord ${XCDRTOOLDIR}
- cd ${WRKSRC}/mkisofs; \
- ${INSTALL_PROGRAM} OBJ/*/mkisofs ${XCDRTOOLDIR}
- cd ${WRKSRC}/readcd; \
- ${INSTALL_PROGRAM} OBJ/*/readcd ${XCDRTOOLDIR}
-
-.include "../../mk/ossaudio.buildlink2.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/cdrecord-xcdroast/PLIST b/sysutils/cdrecord-xcdroast/PLIST
deleted file mode 100644
index d2eba0ab993..00000000000
--- a/sysutils/cdrecord-xcdroast/PLIST
+++ /dev/null
@@ -1,7 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2002/12/02 18:41:20 drochner Exp $
-lib/xcdroast-0.98/bin/cdda2wav
-lib/xcdroast-0.98/bin/cdrecord
-lib/xcdroast-0.98/bin/mkisofs
-lib/xcdroast-0.98/bin/readcd
-@dirrm lib/xcdroast-0.98/bin
-@dirrm lib/xcdroast-0.98
diff --git a/sysutils/cdrecord-xcdroast/distinfo b/sysutils/cdrecord-xcdroast/distinfo
deleted file mode 100644
index 9a14152e3a0..00000000000
--- a/sysutils/cdrecord-xcdroast/distinfo
+++ /dev/null
@@ -1,10 +0,0 @@
-$NetBSD: distinfo,v 1.4 2003/06/05 16:12:11 drochner Exp $
-
-SHA1 (cdrtools-2.00.3.tar.gz) = 744795871f516dd8dc3918d3cf59f880abc73e4c
-Size (cdrtools-2.00.3.tar.gz) = 1638876 bytes
-SHA1 (patch-ac) = 50e13054951073b1fee9cda12abb722fc86adcea
-SHA1 (patch-ah) = 34ecab01125bcac2a28e295b198edce0de8b8777
-SHA1 (patch-ai) = 38f6bc8a9deee6861d5589dcf65dcd4968614457
-SHA1 (patch-aj) = 7e8328ad3478a43cc9311158c30b0acfe48fbb7b
-SHA1 (patch-ba) = 8d7038282ba5a6b133544cc8e440f6e12a475990
-SHA1 (patch-bb) = c5ee1e00e1f8723fe28d4d360bcede7680a7e4b9
diff --git a/sysutils/cdrecord-xcdroast/patches/patch-ac b/sysutils/cdrecord-xcdroast/patches/patch-ac
deleted file mode 100644
index 10f54b5736e..00000000000
--- a/sysutils/cdrecord-xcdroast/patches/patch-ac
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD: patch-ac,v 1.2 2003/04/03 12:04:04 wiz Exp $
-
---- include/btorder.h.orig Mon Dec 10 00:54:27 2001
-+++ include/btorder.h
-@@ -28,6 +28,9 @@
- #include <sys/types.h> /* try to load isa_defs.h on Solaris */
- #define _INCL_SYS_TYPES_H
- #endif
-+#ifdef __NetBSD__
-+#include <machine/endian.h>
-+#endif
-
- #ifndef _MCONFIG_H
- #include <mconfig.h> /* load bit/byte-oder from xmconfig.h*/
-@@ -108,7 +111,7 @@ error Only one of _BIT_FIELDS_LTOH or _
- # if defined(__ppc__) || defined(ppc) || defined(__ppc) || \
- defined(__PPC) || defined(powerpc) || defined(__powerpc__)
-
--# if defined(__BIG_ENDIAN__)
-+# if defined(__BIG_ENDIAN__) || BYTE_ORDER == BIG_ENDIAN
- # define _BIT_FIELDS_HTOL
- # else
- # define _BIT_FIELDS_LTOH
diff --git a/sysutils/cdrecord-xcdroast/patches/patch-ah b/sysutils/cdrecord-xcdroast/patches/patch-ah
deleted file mode 100644
index ea4a60f955e..00000000000
--- a/sysutils/cdrecord-xcdroast/patches/patch-ah
+++ /dev/null
@@ -1,40 +0,0 @@
-$NetBSD: patch-ah,v 1.1.1.1 2002/12/02 18:41:20 drochner Exp $
-
---- cdda2wav/setuid.c.orig Thu Nov 21 16:12:35 2002
-+++ cdda2wav/setuid.c Sat Nov 30 18:17:51 2002
-@@ -92,7 +92,7 @@
-
- if (geteuid() == 0) return; /* nothing to do */
-
--#if defined _POSIX_SAVED_IDS && defined (HAVE_SETEUID)
-+#if defined (HAVE_SETEUID)
- if (seteuid(effective_uid)) {
- perror("seteuid in needroot()");
- exit(PERM_ERROR);
-@@ -126,7 +126,7 @@
- return;
- if (geteuid() != 0) return; /* nothing to do */
-
--#if defined _POSIX_SAVED_IDS && defined (HAVE_SETEUID)
-+#if defined (HAVE_SETEUID)
- if (seteuid(real_uid)) {
- perror("seteuid in dontneedroot()");
- exit(PERM_ERROR);
-@@ -186,7 +186,7 @@
-
- if (getegid() == effective_gid) return; /* nothing to do */
-
--#if defined _POSIX_SAVED_IDS && defined (HAVE_SETEGID)
-+#if defined (HAVE_SETEGID)
- if (setegid(effective_gid)) {
- perror("setegid in needgroup()");
- exit(PERM_ERROR);
-@@ -217,7 +217,7 @@
- exit(INTERNAL_ERROR);
- }
- if (getegid() != effective_gid) return; /* nothing to do */
--#if defined _POSIX_SAVED_IDS && defined (HAVE_SETEGID)
-+#if defined (HAVE_SETEGID)
- if (setegid(real_gid)) {
- perror("setegid in dontneedgroup()");
- exit(PERM_ERROR);
diff --git a/sysutils/cdrecord-xcdroast/patches/patch-ai b/sysutils/cdrecord-xcdroast/patches/patch-ai
deleted file mode 100644
index a3c6cdcd27a..00000000000
--- a/sysutils/cdrecord-xcdroast/patches/patch-ai
+++ /dev/null
@@ -1,107 +0,0 @@
-$NetBSD: patch-ai,v 1.1.1.1 2002/12/02 18:41:20 drochner Exp $
-
---- libscg/scsi-bsd.c.orig Mon Oct 21 15:57:07 2002
-+++ libscg/scsi-bsd.c Sat Nov 30 18:20:19 2002
-@@ -48,7 +48,7 @@
- * Choose your name instead of "schily" and make clear that the version
- * string is related to a modified source.
- */
--LOCAL char _scg_trans_version[] = "scsi-bsd.c-1.41"; /* The version for this transport*/
-+LOCAL char _scg_trans_version[] = "scsi-bsd.c-1.41nb1"; /* The version for this transport*/
-
- #define MAX_SCG 16 /* Max # of SCSI controllers */
- #define MAX_TGT 16
-@@ -108,7 +108,7 @@
- * return "schily" for the SCG_AUTHOR request.
- */
- case SCG_AUTHOR:
-- return (_scg_auth_schily);
-+ return ("frueauf");
- case SCG_SCCS_ID:
- return (__sccsid);
- }
-@@ -140,6 +140,15 @@
- register int l;
- register int nopen = 0;
- char devname[64];
-+#if defined(__NetBSD__)
-+ struct scsi_addr mysaddr;
-+#if defined(__i386__)
-+ char slicename[] = "d"; /* i386 is special */
-+#else
-+ char slicename[] = "c"; /* this is what the rest uses */
-+#endif
-+ char *myslicename = slicename;
-+#endif
-
- if (busno >= MAX_SCG || tgt >= MAX_TGT || tlun >= MAX_LUN) {
- errno = EINVAL;
-@@ -166,6 +175,60 @@
- if ((device != NULL && *device != '\0') || (busno == -2 && tgt == -2))
- goto openbydev;
-
-+
-+/*
-+ * I know of no method in NetBSD to probe the scsibus and get the mapping
-+ * busnumber,target,lun --> devicename.
-+ *
-+ * Because of this implement a true bruteforce hack to find
-+ * out what cdroms there are.
-+ *
-+ * Note that this method only finds cd0-cd7. Anything higher
-+ * than this needs additional tweaks.
-+ *
-+ * Feel free to implement this cleanly if you have better knowledge.
-+ * Until then this helps to get -scanbus und thus xcdroast working :-)
-+ *
-+ */
-+#if defined(__NetBSD__)
-+ if (busno >= 0 && tgt >= 0 && tlun >= 0) {
-+ for (l=0; l < MAX_LUN ; l++) {
-+ sprintf(devname, "/dev/rcd%d%s", l, myslicename);
-+ f = open(devname, O_RDWR);
-+ if (f >= 0) {
-+ if (ioctl(f, SCIOCIDENTIFY, &mysaddr) < 0) {
-+ close(f);
-+ errno = EINVAL;
-+ return (0);
-+ }
-+ if (busno == SADDR_BUS(mysaddr) && tgt == SADDR_TARGET(mysaddr) && tlun == SADDR_LUN(mysaddr)) {
-+ scglocal(scgp)->scgfiles[busno][tgt][tlun] = f;
-+ return(1);
-+ }
-+ } else goto openbydev;
-+ }
-+ } else for (l=0; l < MAX_LUN ; l++) {
-+ sprintf(devname, "/dev/rcd%d%s", l, myslicename);
-+ f = open(devname, O_RDWR);
-+ if (f >= 0) {
-+ if (ioctl(f, SCIOCIDENTIFY, &mysaddr) < 0) {
-+ close(f);
-+ errno = EINVAL;
-+ return (0);
-+ }
-+ scg_scsibus(scgp) = busno = SADDR_BUS(mysaddr);
-+ scg_target(scgp) = tgt = SADDR_TARGET(mysaddr);
-+ if ((tlun >= 0) && (tlun != SADDR_LUN(mysaddr))) {
-+ close(f);
-+ errno = EINVAL;
-+ return (0);
-+ }
-+ scg_lun(scgp) = tlun = SADDR_LUN(mysaddr);
-+ if (scg_setup(scgp, f, busno, tgt, tlun))
-+ nopen++;
-+ }
-+ }
-+#else /* not __NetBSD__ */
- if (busno >= 0 && tgt >= 0 && tlun >= 0) {
-
- js_snprintf(devname, sizeof(devname),
-@@ -202,6 +265,7 @@
- }
- }
- }
-+#endif /* end of not __NetBSD__ */
- /*
- * Could not open /dev/su-* or got dev=devname:b,l,l / dev=devname:@,l
- * We do the apropriate tests and try our best.
diff --git a/sysutils/cdrecord-xcdroast/patches/patch-aj b/sysutils/cdrecord-xcdroast/patches/patch-aj
deleted file mode 100644
index 0aaf9363f52..00000000000
--- a/sysutils/cdrecord-xcdroast/patches/patch-aj
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD: patch-aj,v 1.1.1.1 2002/12/02 18:41:20 drochner Exp $
-
---- cdrecord/scsi_cdr.c.orig Thu Sep 12 22:39:35 2002
-+++ cdrecord/scsi_cdr.c
-@@ -282,6 +282,12 @@ EXPORT int
- request_sense(scgp)
- SCSI *scgp;
- {
-+
-+#ifdef __NetBSD__
-+ /* request sense already done by kernel */
-+ scg_prsense((Uchar *)scgp->scmd->u_sense.cmd_sense,
-+ scgp->scmd->sense_count);
-+#else
- char sensebuf[CCS_SENSE_LEN];
- register struct scg_cmd *scmd = scgp->scmd;
-
-@@ -301,6 +307,7 @@ request_sense(scgp)
- if (scg_cmd(scgp) < 0)
- return (-1);
- scg_prsense((Uchar *)sensebuf, CCS_SENSE_LEN - scg_getresid(scgp));
-+#endif
- return (0);
- }
-
diff --git a/sysutils/cdrecord-xcdroast/patches/patch-ba b/sysutils/cdrecord-xcdroast/patches/patch-ba
deleted file mode 100644
index 619235ca1a5..00000000000
--- a/sysutils/cdrecord-xcdroast/patches/patch-ba
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-ba,v 1.1.1.1 2002/12/02 18:41:20 drochner Exp $
-
---- readcd/readcd.c.orig Fri Sep 20 09:00:12 2002
-+++ readcd/readcd.c
-@@ -341,11 +341,11 @@ main(ac, av)
- /*
- * We don't need root privilleges anymore.
- */
--#ifdef HAVE_SETREUID
-- if (setreuid(-1, getuid()) < 0)
--#else
- #ifdef HAVE_SETEUID
- if (seteuid(getuid()) < 0)
-+#else
-+#ifdef HAVE_SETREUID
-+ if (setreuid(-1, getuid()) < 0)
- #else
- if (setuid(getuid()) < 0)
- #endif
diff --git a/sysutils/cdrecord-xcdroast/patches/patch-bb b/sysutils/cdrecord-xcdroast/patches/patch-bb
deleted file mode 100644
index c0a74b7344e..00000000000
--- a/sysutils/cdrecord-xcdroast/patches/patch-bb
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-bb,v 1.1.1.1 2002/12/02 18:41:20 drochner Exp $
-
---- mkisofs/mkisofs.c.orig Fri Apr 20 17:45:50 2001
-+++ mkisofs/mkisofs.c Mon Aug 6 10:46:21 2001
-@@ -2072,11 +2072,11 @@
- }
- }
- /* We don't need root privilleges anymore. */
--#ifdef HAVE_SETREUID
-- if (setreuid(-1, getuid()) < 0)
--#else
- #ifdef HAVE_SETEUID
- if (seteuid(getuid()) < 0)
-+#else
-+#ifdef HAVE_SETREUID
-+ if (setreuid(-1, getuid()) < 0)
- #else
- if (setuid(getuid()) < 0)
- #endif
diff --git a/sysutils/cdrecord/DESCR b/sysutils/cdrecord/DESCR
deleted file mode 100644
index 8cd5fe6525c..00000000000
--- a/sysutils/cdrecord/DESCR
+++ /dev/null
@@ -1,7 +0,0 @@
-Cdrecord allows you to burn CDs with a CD-R/CD-RW recorder. It
-works as a burn engine for several applications. Cdrecord supports
-CD recorders from many different vendors; all SCSI-3/mmc and
-ATAPI/mmc compliant drives should also work. Supported features
-include: IDE/ATAPI, parallel-port, and SCSI drives; audio CDs, data
-CDs, and mixed CDs; full multi-session support, CD-RWs (rewritable),
-TAO, DAO and human-readable error messages.
diff --git a/sysutils/cdrecord/MESSAGE.SunOS b/sysutils/cdrecord/MESSAGE.SunOS
deleted file mode 100644
index 217fe9cd1d4..00000000000
--- a/sysutils/cdrecord/MESSAGE.SunOS
+++ /dev/null
@@ -1,9 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE.SunOS,v 1.2 2003/05/06 18:38:32 grant Exp $
-
-You will need to stop Solaris volume management before using
-${PKGNAME_NOREV}:
-
- /etc/init.d/volmgt stop
-
-===========================================================================
diff --git a/sysutils/cdrecord/MESSAGE.cdrecord.conf b/sysutils/cdrecord/MESSAGE.cdrecord.conf
deleted file mode 100644
index e710d5e0ccf..00000000000
--- a/sysutils/cdrecord/MESSAGE.cdrecord.conf
+++ /dev/null
@@ -1,14 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE.cdrecord.conf,v 1.1 2003/03/08 08:16:58 grant Exp $
-
-Note: The location of the ${PKGNAME_NOREV} `defaults' file has been set to
-
- ${CDRECORD_CONF}
-
-This is the pkgsrc standard config file location, NOT the ${PKGNAME_NOREV}
-standard location, which is /etc/default/cdrecord.
-
-The reason for this is that pkgsrc packages should not use configuration
-files outside ${LOCALBASE} unless they are explicitly set by the user.
-
-===========================================================================
diff --git a/sysutils/cdrecord/Makefile b/sysutils/cdrecord/Makefile
deleted file mode 100644
index 45c759ca0cc..00000000000
--- a/sysutils/cdrecord/Makefile
+++ /dev/null
@@ -1,93 +0,0 @@
-# $NetBSD: Makefile,v 1.50 2003/06/05 16:12:10 drochner Exp $
-
-DISTNAME= cdrtools-2.00.3
-PKGNAME= cdrecord-2.00.3
-CATEGORIES= sysutils
-MASTER_SITES= ftp://ftp.berlios.de/pub/cdrecord/
-
-MAINTAINER= lukem@netbsd.org
-HOMEPAGE= http://www.fokus.gmd.de/research/cc/glone/employees/joerg.schilling/private/cdrecord.html
-COMMENT= Software for creating ISO9660 images and writing CDs/CD-RWs
-
-CONFLICTS= mkisofs-[0-9]*
-
-.include "../../mk/bsd.prefs.mk"
-
-USE_BUILDLINK2= # defined
-USE_GMAKE= # defined
-TBL?= tbl
-
-.if ${LOCALBASE} != "/opt/schily"
-BUILDLINK_TRANSFORM= r:/opt/schily
-BUILDLINK_TRANSFORM+= r:/opt/schily
-.endif
-
-# avoid picking up a bad ${ARCH} during the build
-MAKE_ENV+= ARCH=""
-MAKE_ENV+= MAKEPROG="gmake"
-MAKE_ENV+= COPTX="${CFLAGS}"
-MAKE_ENV+= LDOPTX="${LDFLAGS}"
-
-# if we're using a gcc which is named gcc, we need to set CCOM=gcc
-# in MAKE_ENV so the make infrastructure picks the right options.
-.if !empty(CC:M*gcc*)
-MAKE_ENV+= CCOM="gcc"
-.endif
-
-# allow us to override the default /etc/default/cdrecord by patching
-# the documentation appropriately. Additionally, we also provide a
-# MESSAGE stating the reasons we do this, as required by the license.
-CDRECORD_CONF?= ${PKG_SYSCONFDIR}/cdrecord.conf
-
-.if ${CDRECORD_CONF} != "/etc/default/cdrecord"
-MESSAGE_SRC+= MESSAGE.cdrecord.conf
-MESSAGE_SUBST+= PKGNAME_NOREV=${PKGNAME_NOREV}
-MESSAGE_SUBST+= CDRECORD_CONF=${CDRECORD_CONF}
-.endif
-
-CDRECORD_CONF_FILES= cdrecord/defaults.c cdrecord/cdrecord.1
-CDRECORD_CONF_FILES+= readcd/readcd.1
-
-post-patch:
- @cd ${WRKSRC}; for file in ${CDRECORD_CONF_FILES}; do \
- ${MV} ${WRKSRC}/$$file ${WRKSRC}/$${file}.old && \
- ${SED} -e 's|@CDRECORD_CONF@|${CDRECORD_CONF}|' \
- ${WRKSRC}/$${file}.old > ${WRKSRC}/$$file; \
- done
-
-do-configure:
- cd ${WRKSRC}/RULES; \
- for suffix in netbsd-cc.rul netbsd-gcc.rul; do \
- if [ ! -f ${MACHINE}-$$suffix ]; then \
- ${LN} -sf i386-$$suffix ${MACHINE}-$$suffix; \
- fi; \
- done
-
-post-build:
- cd ${WRKSRC}; \
- for file in cdda2wav/cdda2wav.1 mkisofs/mkisofs.8; do \
- ${TBL} $${file} > $${file}.tmp; \
- ${MV} -f $${file}.tmp $${file}; \
- done
-
-do-install:
- cd ${WRKSRC}/cdda2wav; \
- ${INSTALL_PROGRAM} OBJ/*/cdda2wav ${PREFIX}/bin; \
- ${INSTALL_MAN} cdda2wav.1 ${PREFIX}/man/man1
- cd ${WRKSRC}/cdrecord; \
- ${INSTALL_PROGRAM} OBJ/*/cdrecord ${PREFIX}/bin; \
- ${INSTALL_MAN} cdrecord.1 ${PREFIX}/man/man1
- cd ${WRKSRC}/mkisofs; \
- ${INSTALL_PROGRAM} OBJ/*/mkisofs ${PREFIX}/bin; \
- ${INSTALL_MAN} mkisofs.8 ${PREFIX}/man/man8
- cd ${WRKSRC}/mkisofs/diag; \
- for f in devdump isodump isoinfo isovfy; do \
- ${INSTALL_PROGRAM} OBJ/*/$$f ${PREFIX}/bin; \
- ${INSTALL_MAN} isoinfo.8 ${PREFIX}/man/man8/$$f.8; \
- done
- cd ${WRKSRC}/readcd; \
- ${INSTALL_PROGRAM} OBJ/*/readcd ${PREFIX}/bin; \
- ${INSTALL_MAN} readcd.1 ${PREFIX}/man/man1
-
-.include "../../mk/ossaudio.buildlink2.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/cdrecord/PLIST b/sysutils/cdrecord/PLIST
deleted file mode 100644
index c4e99a854ab..00000000000
--- a/sysutils/cdrecord/PLIST
+++ /dev/null
@@ -1,17 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2003/01/03 16:27:09 lukem Exp $
-bin/cdda2wav
-bin/cdrecord
-bin/mkisofs
-bin/readcd
-bin/devdump
-bin/isodump
-bin/isoinfo
-bin/isovfy
-man/man1/cdda2wav.1
-man/man1/cdrecord.1
-man/man1/readcd.1
-man/man8/mkisofs.8
-man/man8/devdump.8
-man/man8/isodump.8
-man/man8/isoinfo.8
-man/man8/isovfy.8
diff --git a/sysutils/cdrecord/distinfo b/sysutils/cdrecord/distinfo
deleted file mode 100644
index 8ae46ebedd1..00000000000
--- a/sysutils/cdrecord/distinfo
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: distinfo,v 1.11 2003/06/05 16:12:10 drochner Exp $
-
-SHA1 (cdrtools-2.00.3.tar.gz) = 744795871f516dd8dc3918d3cf59f880abc73e4c
-Size (cdrtools-2.00.3.tar.gz) = 1638876 bytes
-SHA1 (patch-ac) = 9e091493ccce1a78d3bf764fae89cf040f22045a
-SHA1 (patch-ah) = 34ecab01125bcac2a28e295b198edce0de8b8777
-SHA1 (patch-ai) = 38f6bc8a9deee6861d5589dcf65dcd4968614457
-SHA1 (patch-aj) = 7e8328ad3478a43cc9311158c30b0acfe48fbb7b
-SHA1 (patch-ba) = 8d7038282ba5a6b133544cc8e440f6e12a475990
-SHA1 (patch-bb) = c5ee1e00e1f8723fe28d4d360bcede7680a7e4b9
-SHA1 (patch-ca) = 5dbc3d3f248781627b6d6100808c70db60e83bd4
-SHA1 (patch-cb) = 8119e171e7308c0bb095b6a1d760473d8cc89120
-SHA1 (patch-cc) = a14098dd14e0b58d3fed1167341a22167eea7c19
diff --git a/sysutils/cdrecord/patches/patch-ac b/sysutils/cdrecord/patches/patch-ac
deleted file mode 100644
index 00a0cae35fe..00000000000
--- a/sysutils/cdrecord/patches/patch-ac
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD: patch-ac,v 1.14 2003/05/06 19:52:44 grant Exp $
-
---- include/btorder.h.orig Mon Dec 10 10:54:27 2001
-+++ include/btorder.h
-@@ -28,6 +28,9 @@
- #include <sys/types.h> /* try to load isa_defs.h on Solaris */
- #define _INCL_SYS_TYPES_H
- #endif
-+#ifdef __NetBSD__
-+#include <machine/endian.h>
-+#endif
-
- #ifndef _MCONFIG_H
- #include <mconfig.h> /* load bit/byte-oder from xmconfig.h*/
-@@ -108,7 +111,7 @@ error Only one of _BIT_FIELDS_LTOH or _
- # if defined(__ppc__) || defined(ppc) || defined(__ppc) || \
- defined(__PPC) || defined(powerpc) || defined(__powerpc__)
-
--# if defined(__BIG_ENDIAN__)
-+# if defined(__BIG_ENDIAN__) || BYTE_ORDER == BIG_ENDIAN
- # define _BIT_FIELDS_HTOL
- # else
- # define _BIT_FIELDS_LTOH
diff --git a/sysutils/cdrecord/patches/patch-ah b/sysutils/cdrecord/patches/patch-ah
deleted file mode 100644
index 69a453b9ff1..00000000000
--- a/sysutils/cdrecord/patches/patch-ah
+++ /dev/null
@@ -1,40 +0,0 @@
-$NetBSD: patch-ah,v 1.3 2003/01/03 16:27:10 lukem Exp $
-
---- cdda2wav/setuid.c.orig Thu Nov 21 16:12:35 2002
-+++ cdda2wav/setuid.c Sat Nov 30 18:17:51 2002
-@@ -92,7 +92,7 @@
-
- if (geteuid() == 0) return; /* nothing to do */
-
--#if defined _POSIX_SAVED_IDS && defined (HAVE_SETEUID)
-+#if defined (HAVE_SETEUID)
- if (seteuid(effective_uid)) {
- perror("seteuid in needroot()");
- exit(PERM_ERROR);
-@@ -126,7 +126,7 @@
- return;
- if (geteuid() != 0) return; /* nothing to do */
-
--#if defined _POSIX_SAVED_IDS && defined (HAVE_SETEUID)
-+#if defined (HAVE_SETEUID)
- if (seteuid(real_uid)) {
- perror("seteuid in dontneedroot()");
- exit(PERM_ERROR);
-@@ -186,7 +186,7 @@
-
- if (getegid() == effective_gid) return; /* nothing to do */
-
--#if defined _POSIX_SAVED_IDS && defined (HAVE_SETEGID)
-+#if defined (HAVE_SETEGID)
- if (setegid(effective_gid)) {
- perror("setegid in needgroup()");
- exit(PERM_ERROR);
-@@ -217,7 +217,7 @@
- exit(INTERNAL_ERROR);
- }
- if (getegid() != effective_gid) return; /* nothing to do */
--#if defined _POSIX_SAVED_IDS && defined (HAVE_SETEGID)
-+#if defined (HAVE_SETEGID)
- if (setegid(real_gid)) {
- perror("setegid in dontneedgroup()");
- exit(PERM_ERROR);
diff --git a/sysutils/cdrecord/patches/patch-ai b/sysutils/cdrecord/patches/patch-ai
deleted file mode 100644
index 55a6ab5dce1..00000000000
--- a/sysutils/cdrecord/patches/patch-ai
+++ /dev/null
@@ -1,107 +0,0 @@
-$NetBSD: patch-ai,v 1.3 2003/01/03 16:27:10 lukem Exp $
-
---- libscg/scsi-bsd.c.orig Mon Oct 21 15:57:07 2002
-+++ libscg/scsi-bsd.c Sat Nov 30 18:20:19 2002
-@@ -48,7 +48,7 @@
- * Choose your name instead of "schily" and make clear that the version
- * string is related to a modified source.
- */
--LOCAL char _scg_trans_version[] = "scsi-bsd.c-1.41"; /* The version for this transport*/
-+LOCAL char _scg_trans_version[] = "scsi-bsd.c-1.41nb1"; /* The version for this transport*/
-
- #define MAX_SCG 16 /* Max # of SCSI controllers */
- #define MAX_TGT 16
-@@ -108,7 +108,7 @@
- * return "schily" for the SCG_AUTHOR request.
- */
- case SCG_AUTHOR:
-- return (_scg_auth_schily);
-+ return ("frueauf");
- case SCG_SCCS_ID:
- return (__sccsid);
- }
-@@ -140,6 +140,15 @@
- register int l;
- register int nopen = 0;
- char devname[64];
-+#if defined(__NetBSD__)
-+ struct scsi_addr mysaddr;
-+#if defined(__i386__)
-+ char slicename[] = "d"; /* i386 is special */
-+#else
-+ char slicename[] = "c"; /* this is what the rest uses */
-+#endif
-+ char *myslicename = slicename;
-+#endif
-
- if (busno >= MAX_SCG || tgt >= MAX_TGT || tlun >= MAX_LUN) {
- errno = EINVAL;
-@@ -166,6 +175,60 @@
- if ((device != NULL && *device != '\0') || (busno == -2 && tgt == -2))
- goto openbydev;
-
-+
-+/*
-+ * I know of no method in NetBSD to probe the scsibus and get the mapping
-+ * busnumber,target,lun --> devicename.
-+ *
-+ * Because of this implement a true bruteforce hack to find
-+ * out what cdroms there are.
-+ *
-+ * Note that this method only finds cd0-cd7. Anything higher
-+ * than this needs additional tweaks.
-+ *
-+ * Feel free to implement this cleanly if you have better knowledge.
-+ * Until then this helps to get -scanbus und thus xcdroast working :-)
-+ *
-+ */
-+#if defined(__NetBSD__)
-+ if (busno >= 0 && tgt >= 0 && tlun >= 0) {
-+ for (l=0; l < MAX_LUN ; l++) {
-+ sprintf(devname, "/dev/rcd%d%s", l, myslicename);
-+ f = open(devname, O_RDWR);
-+ if (f >= 0) {
-+ if (ioctl(f, SCIOCIDENTIFY, &mysaddr) < 0) {
-+ close(f);
-+ errno = EINVAL;
-+ return (0);
-+ }
-+ if (busno == SADDR_BUS(mysaddr) && tgt == SADDR_TARGET(mysaddr) && tlun == SADDR_LUN(mysaddr)) {
-+ scglocal(scgp)->scgfiles[busno][tgt][tlun] = f;
-+ return(1);
-+ }
-+ } else goto openbydev;
-+ }
-+ } else for (l=0; l < MAX_LUN ; l++) {
-+ sprintf(devname, "/dev/rcd%d%s", l, myslicename);
-+ f = open(devname, O_RDWR);
-+ if (f >= 0) {
-+ if (ioctl(f, SCIOCIDENTIFY, &mysaddr) < 0) {
-+ close(f);
-+ errno = EINVAL;
-+ return (0);
-+ }
-+ scg_scsibus(scgp) = busno = SADDR_BUS(mysaddr);
-+ scg_target(scgp) = tgt = SADDR_TARGET(mysaddr);
-+ if ((tlun >= 0) && (tlun != SADDR_LUN(mysaddr))) {
-+ close(f);
-+ errno = EINVAL;
-+ return (0);
-+ }
-+ scg_lun(scgp) = tlun = SADDR_LUN(mysaddr);
-+ if (scg_setup(scgp, f, busno, tgt, tlun))
-+ nopen++;
-+ }
-+ }
-+#else /* not __NetBSD__ */
- if (busno >= 0 && tgt >= 0 && tlun >= 0) {
-
- js_snprintf(devname, sizeof(devname),
-@@ -202,6 +265,7 @@
- }
- }
- }
-+#endif /* end of not __NetBSD__ */
- /*
- * Could not open /dev/su-* or got dev=devname:b,l,l / dev=devname:@,l
- * We do the apropriate tests and try our best.
diff --git a/sysutils/cdrecord/patches/patch-aj b/sysutils/cdrecord/patches/patch-aj
deleted file mode 100644
index fe127071cd2..00000000000
--- a/sysutils/cdrecord/patches/patch-aj
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD: patch-aj,v 1.5 2003/01/03 16:27:10 lukem Exp $
-
---- cdrecord/scsi_cdr.c.orig Thu Sep 12 22:39:35 2002
-+++ cdrecord/scsi_cdr.c
-@@ -282,6 +282,12 @@ EXPORT int
- request_sense(scgp)
- SCSI *scgp;
- {
-+
-+#ifdef __NetBSD__
-+ /* request sense already done by kernel */
-+ scg_prsense((Uchar *)scgp->scmd->u_sense.cmd_sense,
-+ scgp->scmd->sense_count);
-+#else
- char sensebuf[CCS_SENSE_LEN];
- register struct scg_cmd *scmd = scgp->scmd;
-
-@@ -301,6 +307,7 @@ request_sense(scgp)
- if (scg_cmd(scgp) < 0)
- return (-1);
- scg_prsense((Uchar *)sensebuf, CCS_SENSE_LEN - scg_getresid(scgp));
-+#endif
- return (0);
- }
-
diff --git a/sysutils/cdrecord/patches/patch-ba b/sysutils/cdrecord/patches/patch-ba
deleted file mode 100644
index 09b0fb82337..00000000000
--- a/sysutils/cdrecord/patches/patch-ba
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-ba,v 1.2 2003/01/03 16:27:10 lukem Exp $
-
---- readcd/readcd.c.orig Fri Sep 20 09:00:12 2002
-+++ readcd/readcd.c
-@@ -341,11 +341,11 @@ main(ac, av)
- /*
- * We don't need root privilleges anymore.
- */
--#ifdef HAVE_SETREUID
-- if (setreuid(-1, getuid()) < 0)
--#else
- #ifdef HAVE_SETEUID
- if (seteuid(getuid()) < 0)
-+#else
-+#ifdef HAVE_SETREUID
-+ if (setreuid(-1, getuid()) < 0)
- #else
- if (setuid(getuid()) < 0)
- #endif
diff --git a/sysutils/cdrecord/patches/patch-bb b/sysutils/cdrecord/patches/patch-bb
deleted file mode 100644
index a788057c205..00000000000
--- a/sysutils/cdrecord/patches/patch-bb
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-bb,v 1.1 2001/08/07 11:23:57 drochner Exp $
-
---- mkisofs/mkisofs.c.orig Fri Apr 20 17:45:50 2001
-+++ mkisofs/mkisofs.c Mon Aug 6 10:46:21 2001
-@@ -2072,11 +2072,11 @@
- }
- }
- /* We don't need root privilleges anymore. */
--#ifdef HAVE_SETREUID
-- if (setreuid(-1, getuid()) < 0)
--#else
- #ifdef HAVE_SETEUID
- if (seteuid(getuid()) < 0)
-+#else
-+#ifdef HAVE_SETREUID
-+ if (setreuid(-1, getuid()) < 0)
- #else
- if (setuid(getuid()) < 0)
- #endif
diff --git a/sysutils/cdrecord/patches/patch-ca b/sysutils/cdrecord/patches/patch-ca
deleted file mode 100644
index 0df50707d4a..00000000000
--- a/sysutils/cdrecord/patches/patch-ca
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ca,v 1.1 2003/03/08 08:16:59 grant Exp $
-
---- cdrecord/defaults.c.orig Thu Aug 15 03:52:00 2002
-+++ cdrecord/defaults.c
-@@ -53,7 +53,7 @@ open_cdrdefaults()
- * don't contribute work and don't give support, they are causing extra
- * work for me and this way slow down the cdrecord development.
- */
-- return (defltopen("/etc/default/cdrecord"));
-+ return (defltopen("@CDRECORD_CONF@"));
- }
-
- EXPORT void
diff --git a/sysutils/cdrecord/patches/patch-cb b/sysutils/cdrecord/patches/patch-cb
deleted file mode 100644
index 88a2ea95c19..00000000000
--- a/sysutils/cdrecord/patches/patch-cb
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-cb,v 1.1 2003/03/08 08:16:59 grant Exp $
-
---- cdrecord/cdrecord.1.orig Sat Mar 8 18:45:54 2003
-+++ cdrecord/cdrecord.1
-@@ -1418,8 +1418,8 @@ login shell.
-
- .SH FILES
- .TP
--/etc/default/cdrecord
--Default values can be set for the following options in /etc/default/cdrecord.
-+@CDRECORD_CONF@
-+Default values can be set for the following options in @CDRECORD_CONF@.
- For example:
- .SM CDR_FIFOSIZE=8m
- or
-@@ -1428,7 +1428,7 @@ or
- .TP
- CDR_DEVICE
- This may either hold a device identifier that is suitable to the open
--call of the SCSI transport library or a label in the file /etc/default/cdrecord
-+call of the SCSI transport library or a label in the file @CDRECORD_CONF@
- that allows to identify a specific drive on the system.
- .TP
- CDR_SPEED
diff --git a/sysutils/cdrecord/patches/patch-cc b/sysutils/cdrecord/patches/patch-cc
deleted file mode 100644
index 795fe862e6e..00000000000
--- a/sysutils/cdrecord/patches/patch-cc
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-cc,v 1.1 2003/03/08 08:16:59 grant Exp $
-
---- readcd/readcd.1.orig Wed Dec 25 02:28:41 2002
-+++ readcd/readcd.1
-@@ -186,7 +186,7 @@ If the argument to the
- .B dev=
- option does not contain the characters ',', '/', '@' or ':',
- it is interpreted as an label name that may be found in the file
--/etc/default/cdrecord (see FILES section).
-+@CDRECORD_CONF@ (see FILES section).
- .TP
- .BI timeout= #
- Set the default SCSI command timeout value to
diff --git a/sysutils/cfengine/DESCR b/sysutils/cfengine/DESCR
deleted file mode 100644
index 81eca51babf..00000000000
--- a/sysutils/cfengine/DESCR
+++ /dev/null
@@ -1,6 +0,0 @@
-Cfengine, or the "configuration engine" is a very high level language
-for building expert systems which administrate and configure large
-computer networks. Cfengine uses the idea of classes and a primitive
-form of intelligence to define and automate the configuration of
-large systems in the most economical way possible. Cfengine is
-designed to be a part of computer immune system
diff --git a/sysutils/cfengine/Makefile b/sysutils/cfengine/Makefile
deleted file mode 100644
index b01b44c26bb..00000000000
--- a/sysutils/cfengine/Makefile
+++ /dev/null
@@ -1,25 +0,0 @@
-# $NetBSD: Makefile,v 1.12 2003/06/19 11:45:02 seb Exp $
-#
-
-DISTNAME= cfengine-1.6.5
-CATEGORIES= sysutils net
-MASTER_SITES= ftp://ftp.iu.hio.no/pub/cfengine/ \
- http://sunsite.utk.edu/ftp/pub/cfengine/cfengine-ftp/
-
-MAINTAINER= seb@netbsd.org
-HOMEPAGE= http://www.cfengine.org/
-COMMENT= Automate configuration and administration of large systems
-
-USE_BUILDLINK2= YES
-GNU_CONFIGURE= YES
-CONFIGURE_ARGS= --without-pthreads
-
-pre-configure:
- cd ${WRKSRC}; \
- ${ACLOCAL}; \
- ${AUTOHEADER}; \
- ${AUTOMAKE} -a --foreign -i; \
- ${AUTOCONF}
-
-.include "../../mk/automake.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/cfengine/PLIST b/sysutils/cfengine/PLIST
deleted file mode 100644
index 88f11338e2d..00000000000
--- a/sysutils/cfengine/PLIST
+++ /dev/null
@@ -1,33 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2003/06/19 11:45:02 seb Exp $
-sbin/cfcron
-sbin/cfd
-sbin/cfdoc
-sbin/cfengine
-sbin/cfkey
-sbin/cfmail
-sbin/cfmailfilter
-sbin/cfrun
-sbin/cfwrap
-share/cfengine/cf.chflags.example
-share/cfengine/cf.freebsd.example
-share/cfengine/cf.ftp.example
-share/cfengine/cf.groups.example
-share/cfengine/cf.linux.example
-share/cfengine/cf.main.example
-share/cfengine/cf.motd.example
-share/cfengine/cf.preconf.example
-share/cfengine/cf.services.example
-share/cfengine/cf.site.example
-share/cfengine/cf.solaris.example
-share/cfengine/cf.sun4.example
-share/cfengine/cf.users.example
-share/cfengine/cfd.conf.example
-share/cfengine/cfdaily
-share/cfengine/cfengine.conf.example
-share/cfengine/cfengine.el
-share/cfengine/cfrc.example
-share/cfengine/cfrun.hosts.example
-share/cfengine/start-cfd
-share/examples/cfengine/vicf
-@dirrm share/examples/cfengine
-@dirrm share/cfengine
diff --git a/sysutils/cfengine/distinfo b/sysutils/cfengine/distinfo
deleted file mode 100644
index 771a1a0a829..00000000000
--- a/sysutils/cfengine/distinfo
+++ /dev/null
@@ -1,9 +0,0 @@
-$NetBSD: distinfo,v 1.5 2003/06/19 11:45:02 seb Exp $
-
-SHA1 (cfengine-1.6.5.tar.gz) = 0e40c6094cb4fa12b34920d30e789719e04df511
-Size (cfengine-1.6.5.tar.gz) = 879792 bytes
-SHA1 (patch-aa) = 49deaa907644bdc2199a861f653d888581d4a681
-SHA1 (patch-ab) = dc6a9d7381778b5f3c2fdb16e65204d5c3faac0d
-SHA1 (patch-ac) = 417ca3785c7d7d668a08d4aad298a8d2ec4a6571
-SHA1 (patch-ad) = 047e02555d541c22f07cb3e3a102beb0be32df6d
-SHA1 (patch-ae) = 283e129a515b664f651fd2272e3f9f8d7f99b60f
diff --git a/sysutils/cfengine/patches/patch-aa b/sysutils/cfengine/patches/patch-aa
deleted file mode 100644
index f934eba3628..00000000000
--- a/sysutils/cfengine/patches/patch-aa
+++ /dev/null
@@ -1,66 +0,0 @@
-$NetBSD: patch-aa,v 1.4 2003/06/19 11:45:02 seb Exp $
-
---- configure.in.orig 2002-08-15 05:59:16.000000000 +0000
-+++ configure.in
-@@ -159,17 +159,17 @@ dnl ####################################
- dnl Handle DCE + threading stuff
- dnl #######################################################################
-
--AC_CHECK_LIB(pthread,main) dnl POSIX threads
-+dnl AC_CHECK_LIB(pthread,main) dnl POSIX threads
-
--if test "$ac_cv_lib_pthread_main" = "yes"; then
-- AC_CHECK_HEADERS(pthread.h)
-- AC_CHECK_HEADERS(sched.h)
--fi
-+dnl if test "$ac_cv_lib_pthread_main" = "yes"; then
-+dnl AC_CHECK_HEADERS(pthread.h)
-+dnl AC_CHECK_HEADERS(sched.h)
-+dnl fi
-
- AC_CHECK_FUNC(lchown, AC_DEFINE(HAVE_LCHOWN))
-
--AC_CHECK_FUNC(pthread_attr_setstacksize, AC_DEFINE(HAVE_PTHREAD_ATTR_SETSTACKSIZE), AC_CHECK_LIB(pthread, pthread_create))
--AC_CHECK_FUNC(pthread_sigmask, AC_DEFINE(HAVE_PTHREAD_SIGMASK), AC_CHECK_LIB(pthread, pthread_create))
-+dnl AC_CHECK_FUNC(pthread_attr_setstacksize, AC_DEFINE(HAVE_PTHREAD_ATTR_SETSTACKSIZE), AC_CHECK_LIB(pthread, pthread_create))
-+dnl AC_CHECK_FUNC(pthread_sigmask, AC_DEFINE(HAVE_PTHREAD_SIGMASK), AC_CHECK_LIB(pthread, pthread_create))
-
- AC_ARG_ENABLE(DCE,[ --enable-DCE support for DCE and ACLs],[
- case "$enableval" in
-@@ -235,8 +235,8 @@ case "$target_os" in
- aix*)
- AC_DEFINE(AIX)
- CPPFLAGS="$CPPFLAGS -w"
-- AC_CHECK_LIB(pthreads, main)
-- AC_CHECK_HEADER(pthreads.h)
-+dnl AC_CHECK_LIB(pthreads, main)
-+dnl AC_CHECK_HEADER(pthreads.h)
- ;;
- osf*)
- AC_DEFINE(OSF)
-@@ -261,8 +261,8 @@ case "$target_os" in
- ;;
- freebsd*)
- AC_DEFINE(FREEBSD)
-- CFLAGS="$CFLAGS -pthread"
-- AC_CHECK_HEADERS(pthread.h)
-+dnl CFLAGS="$CFLAGS -pthread"
-+dnl AC_CHECK_HEADERS(pthread.h)
- ;;
- netbsd*)
- AC_DEFINE(NETBSD)
-@@ -301,10 +301,10 @@ case "$target_os" in
-
- sysv4.2MP|unix_sv*)
- AC_DEFINE(UNIXWARE)
-- AC_CHECK_LIB(thread,main) dnl POSIX threads, weird setup
-- if test "$ac_cv_lib_thread_main" = "yes"; then
-- AC_CHECK_HEADERS(thread.h)
-- fi
-+dnl AC_CHECK_LIB(thread,main) dnl POSIX threads, weird setup
-+dnl if test "$ac_cv_lib_thread_main" = "yes"; then
-+dnl AC_CHECK_HEADERS(thread.h)
-+dnl fi
- ;;
-
- cygwin*)
diff --git a/sysutils/cfengine/patches/patch-ab b/sysutils/cfengine/patches/patch-ab
deleted file mode 100644
index ec1e08fffa4..00000000000
--- a/sysutils/cfengine/patches/patch-ab
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-ab,v 1.6 2003/06/19 11:45:02 seb Exp $
-
---- contrib/Makefile.am.orig 2002-06-20 13:38:34.000000000 +0000
-+++ contrib/Makefile.am
-@@ -1,10 +1,12 @@
- s1 = cfdoc
- s2 = cfengine.el
-
--sbin_SCRIPTS = cfcron
--bin_SCRIPTS = cfdoc vicf
-+sbin_SCRIPTS = cfcron cfdoc
- pkgdata_SCRIPTS = $(s2)
-
-+exampledir = $(prefix)/share/examples/cfengine
-+example_SCRIPTS = vicf
-+
- EXTRA_DIST = README README.cfcron README.vicf $(s1) $(s2)
-
- #
diff --git a/sysutils/cfengine/patches/patch-ac b/sysutils/cfengine/patches/patch-ac
deleted file mode 100644
index 25775b9ddbe..00000000000
--- a/sysutils/cfengine/patches/patch-ac
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD: patch-ac,v 1.5 2003/06/19 11:45:02 seb Exp $
-
---- contrib/vicf.in.orig 2002-06-20 13:38:34.000000000 +0000
-+++ contrib/vicf.in
-@@ -8,9 +8,9 @@ CFINPUTS="${CFINPUTS-"@pkgdata@"}
- export EDITOR CFINPUTS
- NOPARSE="cf.preconf|cfd.conf"
-
--if [ "`hostname`" != "sentral" ]
-+if [ "`hostname`" != "CHANGEME" ]
- then
-- echo $0 can only be run on host sentral.
-+ echo $0 can only be run on host CHANGEME.
- exit 1
- fi
-
-@@ -39,7 +39,8 @@ EdFile () {
- i=`expr $i - 1`
- if [ $i = 0 ]
- then
-- echo "\nSorry, file is busy -- try again later."
-+ echo
-+ echo "Sorry, file is busy -- try again later."
- exit 0
- fi
- sleep 1
diff --git a/sysutils/cfengine/patches/patch-ad b/sysutils/cfengine/patches/patch-ad
deleted file mode 100644
index 56a49487f96..00000000000
--- a/sysutils/cfengine/patches/patch-ad
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ad,v 1.6 2003/06/19 11:45:02 seb Exp $
-
---- src/Makefile.am.orig 2002-06-20 13:38:34.000000000 +0000
-+++ src/Makefile.am
-@@ -5,8 +5,7 @@ LEXLIB = @LEXLIB@
- LDADD = -L../pub -lpub
-
-
--sbin_PROGRAMS = cfd cfrun cfkey
--bin_PROGRAMS = cfengine
-+sbin_PROGRAMS = cfd cfrun cfkey cfengine
-
- cfengine_SOURCES = \
- cfengine.c \
diff --git a/sysutils/cfengine/patches/patch-ae b/sysutils/cfengine/patches/patch-ae
deleted file mode 100644
index 268e6630a61..00000000000
--- a/sysutils/cfengine/patches/patch-ae
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-ae,v 1.4 2003/06/19 11:45:02 seb Exp $
-
---- src/image.c.orig 2002-06-20 17:53:53.000000000 +0000
-+++ src/image.c
-@@ -206,9 +206,12 @@ if (ip->purge == 'y')
- DeleteItemList(namecache);
- }
-
--DeleteCompressedArray(ip->inode_cache);
--
--ip->inode_cache = NULL;
-+ /* Only flush when exiting initial call to RecursiveImage() */
-+if (strcmp(from,ip->path) == 0)
-+ {
-+ DeleteCompressedArray(ip->inode_cache);
-+ ip->inode_cache = NULL;
-+ }
-
- cfclosedir(dirh);
- }
diff --git a/sysutils/cfengine2-doc/DESCR b/sysutils/cfengine2-doc/DESCR
deleted file mode 100644
index e4c6e6e5c72..00000000000
--- a/sysutils/cfengine2-doc/DESCR
+++ /dev/null
@@ -1,3 +0,0 @@
-Documentation for cfengine, a very high level language for building
-expert systems to administrate and configure large computer
-networks.
diff --git a/sysutils/cfengine2-doc/Makefile b/sysutils/cfengine2-doc/Makefile
deleted file mode 100644
index cb7d2ec06b5..00000000000
--- a/sysutils/cfengine2-doc/Makefile
+++ /dev/null
@@ -1,26 +0,0 @@
-# $NetBSD: Makefile,v 1.2 2003/03/28 21:14:34 wiz Exp $
-#
-
-PKGNAME= cfengine-doc-${CFENGINE_VERSION}
-
-.include "../../sysutils/cfengine2/Makefile.common"
-
-COMMENT= Documentation for cfengine
-
-NO_CONFIGURE= yes
-NO_BUILD= yes
-
-do-install:
- ${INSTALL_MAN_DIR} ${PREFIX}/man/man8
- ${INSTALL_MAN} ${WRKSRC}/doc/cfengine.8 ${PREFIX}/man/man8
- ${INSTALL_DATA} ${WRKSRC}/doc/cfengine-*.info* ${PREFIX}/info
- ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/html/cfengine
- ${INSTALL_DATA} ${WRKSRC}/doc/cfengine-*.html ${PREFIX}/share/doc/html/cfengine
-
-post-install:
- ${INSTALL_INFO} --info-dir=${PREFIX}/info ${PREFIX}/info/cfengine-Reference.info
- ${INSTALL_INFO} --info-dir=${PREFIX}/info ${PREFIX}/info/cfengine-Tutorial.info
- ${INSTALL_INFO} --info-dir=${PREFIX}/info ${PREFIX}/info/cfengine-Anomalies.info
-
-.include "../../mk/texinfo.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/cfengine2-doc/PLIST b/sysutils/cfengine2-doc/PLIST
deleted file mode 100644
index 7fc141a65a9..00000000000
--- a/sysutils/cfengine2-doc/PLIST
+++ /dev/null
@@ -1,28 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2002/12/22 13:08:59 seb Exp $
-@unexec ${INSTALL_INFO} --delete --info-dir=%D/info %D/info/cfengine-Anomalies.info
-@unexec ${INSTALL_INFO} --delete --info-dir=%D/info %D/info/cfengine-Reference.info
-@unexec ${INSTALL_INFO} --delete --info-dir=%D/info %D/info/cfengine-Tutorial.info
-info/cfengine-Anomalies.info
-info/cfengine-Reference.info
-info/cfengine-Reference.info-1
-info/cfengine-Reference.info-2
-info/cfengine-Reference.info-3
-info/cfengine-Reference.info-4
-info/cfengine-Reference.info-5
-info/cfengine-Reference.info-6
-info/cfengine-Reference.info-7
-info/cfengine-Reference.info-8
-info/cfengine-Tutorial.info
-info/cfengine-Tutorial.info-1
-info/cfengine-Tutorial.info-2
-info/cfengine-Tutorial.info-3
-info/cfengine-Tutorial.info-4
-info/cfengine-Tutorial.info-5
-info/cfengine-Tutorial.info-6
-@exec ${INSTALL_INFO} --info-dir=%D/info %D/info/cfengine-Anomalies.info
-@exec ${INSTALL_INFO} --info-dir=%D/info %D/info/cfengine-Reference.info
-@exec ${INSTALL_INFO} --info-dir=%D/info %D/info/cfengine-Tutorial.info
-man/man8/cfengine.8
-share/doc/html/cfengine/cfengine-Reference.html
-share/doc/html/cfengine/cfengine-Tutorial.html
-@dirrm share/doc/html/cfengine
diff --git a/sysutils/cfengine2/DESCR b/sysutils/cfengine2/DESCR
deleted file mode 100644
index 99d78817c8b..00000000000
--- a/sysutils/cfengine2/DESCR
+++ /dev/null
@@ -1,6 +0,0 @@
-Cfengine, or the "configuration engine" is a very high level language
-for building expert systems which administrate and configure large
-computer networks. Cfengine uses the idea of classes and a primitive
-form of intelligence to define and automate the configuration of
-large systems in the most economical way possible. Cfengine is
-designed to be a part of computer immune system.
diff --git a/sysutils/cfengine2/Makefile b/sysutils/cfengine2/Makefile
deleted file mode 100644
index f25963d6ee1..00000000000
--- a/sysutils/cfengine2/Makefile
+++ /dev/null
@@ -1,27 +0,0 @@
-# $NetBSD: Makefile,v 1.4 2003/06/10 09:56:18 wiz Exp $
-#
-
-.include "../../sysutils/cfengine2/Makefile.common"
-
-PKGREVISION= 1
-
-COMMENT= Automate configuration and administration of large systems
-
-USE_BUILDLINK2= YES
-GNU_CONFIGURE= YES
-PTHREAD_OPTS+= require
-
-BUILD_DEFS+= USE_INET6
-
-CONFIGURE_ARGS+= --with-berkeleydb=${BUILDLINK_PREFIX.db4}
-CONFIGURE_ARGS+= --with-openssl=${BUILDLINK_PREFIX.openssl}
-
-pre-configure:
- ${MV} -f ${WRKSRC}/contrib/vicf.in ${WRKSRC}/contrib/vicf.in.orig
- ${SED} -e "s|@ECHO@|${ECHO}|" \
- ${WRKSRC}/contrib/vicf.in.orig > ${WRKSRC}/contrib/vicf.in
-
-.include "../../mk/pthread.buildlink2.mk"
-.include "../../databases/db4/buildlink2.mk"
-.include "../../security/openssl/buildlink2.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/cfengine2/Makefile.common b/sysutils/cfengine2/Makefile.common
deleted file mode 100644
index 8ba443d3711..00000000000
--- a/sysutils/cfengine2/Makefile.common
+++ /dev/null
@@ -1,14 +0,0 @@
-# $NetBSD: Makefile.common,v 1.5 2003/05/29 21:08:26 seb Exp $
-#
-
-CFENGINE_VERSION= 2.0.7p3
-DISTNAME= cfengine-${CFENGINE_VERSION}
-CATEGORIES= sysutils net
-MASTER_SITES= ftp://ftp.iu.hio.no/pub/cfengine/ \
- http://sunsite.utk.edu/ftp/pub/cfengine/cfengine-ftp/
-
-MAINTAINER= mike@ethmoid.org
-HOMEPAGE= http://www.cfengine.org/
-
-DISTINFO_FILE= ${.CURDIR}/../../sysutils/cfengine2/distinfo
-PATCHDIR= ${.CURDIR}/../../sysutils/cfengine2/patches
diff --git a/sysutils/cfengine2/PLIST b/sysutils/cfengine2/PLIST
deleted file mode 100644
index 382ebf94cff..00000000000
--- a/sysutils/cfengine2/PLIST
+++ /dev/null
@@ -1,32 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2003/04/26 08:33:00 seb Exp $
-sbin/cfagent
-sbin/cfdoc
-sbin/cfenvd
-sbin/cfenvgraph
-sbin/cfexecd
-sbin/cfkey
-sbin/cfrun
-sbin/cfservd
-share/cfengine/cf.chflags.example
-share/cfengine/cf.freebsd.example
-share/cfengine/cf.ftp.example
-share/cfengine/cf.groups.example
-share/cfengine/cf.linux.example
-share/cfengine/cf.main.example
-share/cfengine/cf.motd.example
-share/cfengine/cf.preconf.example
-share/cfengine/cf.services.example
-share/cfengine/cf.site.example
-share/cfengine/cf.solaris.example
-share/cfengine/cf.sun4.example
-share/cfengine/cf.users.example
-share/cfengine/cfagent.conf-advanced.example
-share/cfengine/cfagent.conf.example
-share/cfengine/cfengine.el
-share/cfengine/cfrc.example
-share/cfengine/cfrun.hosts.example
-share/cfengine/cfservd.conf.example
-share/cfengine/update.conf.example
-share/examples/cfengine/vicf
-@dirrm share/examples/cfengine
-@dirrm share/cfengine
diff --git a/sysutils/cfengine2/distinfo b/sysutils/cfengine2/distinfo
deleted file mode 100644
index 25cca4b0929..00000000000
--- a/sysutils/cfengine2/distinfo
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: distinfo,v 1.3 2003/05/29 21:08:27 seb Exp $
-
-SHA1 (cfengine-2.0.7p3.tar.gz) = 8798a49c02841ecc7e493a577978fb271c57204a
-Size (cfengine-2.0.7p3.tar.gz) = 1216634 bytes
-SHA1 (patch-aa) = 93a957af8d124d5b6e584c1c3d3cdda73190d58c
-SHA1 (patch-ab) = caf7e63f25d0bba61d37a0060c586c84b2742fe4
-SHA1 (patch-ad) = 559b8378c1cad5e88e1eba55c7f62e2336153186
-SHA1 (patch-ae) = 99496b14f80c8605886cd78a520af4d1c6cc0475
-SHA1 (patch-af) = 470e6e6b89b70caaaecc036ebb5d6a4071d1c3ed
-SHA1 (patch-ag) = f64e2d1f9f3a5c0e0dc37a40c56f0188382e02ed
-SHA1 (patch-ah) = d0a79d2c5ce636e401486ff9740bd126fd94f172
-SHA1 (patch-ai) = 074eaadc318bb11a9f7987199f60e3d0dd69c4b0
-SHA1 (patch-aj) = 4953a018297d59a21201703f5a019d623587d97f
diff --git a/sysutils/cfengine2/patches/patch-aa b/sysutils/cfengine2/patches/patch-aa
deleted file mode 100644
index b628e0e1f76..00000000000
--- a/sysutils/cfengine2/patches/patch-aa
+++ /dev/null
@@ -1,9 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2002/12/22 13:04:38 seb Exp $
-
---- Makefile.am.orig Wed Dec 18 08:39:09 2002
-+++ Makefile.am Wed Dec 18 08:39:16 2002
-@@ -1,3 +1,3 @@
--SUBDIRS = pub src contrib inputs doc
-+SUBDIRS = pub src contrib inputs
-
- EXTRA_DIST = acconfig.h DOCUMENTATION doc/cfengine.8 COPYING ChangeLog INSTALL NEWS README
diff --git a/sysutils/cfengine2/patches/patch-ab b/sysutils/cfengine2/patches/patch-ab
deleted file mode 100644
index 413d4e4b486..00000000000
--- a/sysutils/cfengine2/patches/patch-ab
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD: patch-ab,v 1.2 2003/05/29 21:08:27 seb Exp $
-
---- Makefile.in.orig 2003-05-28 16:54:45.000000000 +0000
-+++ Makefile.in
-@@ -142,7 +142,7 @@ target_alias = @target_alias@
- target_cpu = @target_cpu@
- target_os = @target_os@
- target_vendor = @target_vendor@
--SUBDIRS = pub src contrib inputs doc
-+SUBDIRS = pub src contrib inputs
-
- EXTRA_DIST = acconfig.h DOCUMENTATION doc/cfengine.8 COPYING ChangeLog INSTALL NEWS README
-
-@@ -176,6 +176,8 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = $(top_builddir)/src/conf.h
- CONFIG_CLEAN_FILES =
-+depcomp =
-+am__depfiles_maybe =
- DIST_SOURCES =
-
- RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
-@@ -196,7 +198,7 @@ am__CONFIG_DISTCLEAN_FILES = config.stat
- configure.lineno
- $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4)
- cd $(top_srcdir) && \
-- $(AUTOMAKE) --gnu Makefile
-+ $(AUTOMAKE) --foreign --ignore-deps Makefile
- Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)
-
diff --git a/sysutils/cfengine2/patches/patch-ad b/sysutils/cfengine2/patches/patch-ad
deleted file mode 100644
index d4768bafe1b..00000000000
--- a/sysutils/cfengine2/patches/patch-ad
+++ /dev/null
@@ -1,59 +0,0 @@
-$NetBSD: patch-ad,v 1.2 2003/04/26 08:33:01 seb Exp $
-
---- contrib/vicf.in.orig 2003-02-09 11:33:04.000000000 +0000
-+++ contrib/vicf.in
-@@ -3,14 +3,15 @@
- prefix=@prefix@
- exec_prefix=@exec_prefix@
- sbindir=@sbindir@
-+ECHO=@ECHO@
- EDITOR="${EDITOR-vi}"
- CFINPUTS="${CFINPUTS-"@pkgdata@"}"
- export EDITOR CFINPUTS
- NOPARSE="cf.preconf|cfd.conf"
-
--if [ "`hostname`" != "sentral" ]
-+if [ "`hostname`" != "CHANGEME" ]
- then
-- echo $0 can only be run on host sentral.
-+ echo $0 can only be run on host CHANGEME.
- exit 1
- fi
-
-@@ -20,7 +21,7 @@ EdFile () {
- echo "File not found: ${file}"
- echo "Only these files are eligible for editing:"
- \ls $CFINPUTS
-- /usr/ucb/echo -n "Create new file? (Y/n) "
-+ ${ECHO} -n "Create new file? (Y/n) "
- read answer
- if [ "$answer" = "n" ]
- then
-@@ -32,14 +33,15 @@ EdFile () {
- if [ -f ${CFINPUTS}/.${file}.lock -a "$force" = "n" ]
- then
- i=30
-- /usr/ucb/echo -n "File ${file} is busy -- waiting up to $i seconds..."
-+ ${ECHO} -n "File ${file} is busy -- waiting up to $i seconds..."
- while [ -f ${CFINPUTS}/.${file}.lock ]
- do
-- /usr/ucb/echo -n .
-+ ${ECHO} -n .
- i=`expr $i - 1`
- if [ $i = 0 ]
- then
-- echo "\nSorry, file is busy -- try again later."
-+ ${ECHO} ""
-+ ${ECHO} "Sorry, file is busy -- try again later."
- exit 0
- fi
- sleep 1
-@@ -62,7 +64,7 @@ EdFile () {
- then
- echo PARSE ERROR IN NEW INPUT-FILE:
- cat /tmp/cfparse.$$
-- /usr/ucb/echo -n "Re-edit file? (Y/n) "
-+ ${ECHO} -n "Re-edit file? (Y/n) "
- read answer
- if [ "$answer" = "n" ]
- then
diff --git a/sysutils/cfengine2/patches/patch-ae b/sysutils/cfengine2/patches/patch-ae
deleted file mode 100644
index 1879a33d6c3..00000000000
--- a/sysutils/cfengine2/patches/patch-ae
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-ae,v 1.1.1.1 2002/12/22 13:04:38 seb Exp $
-
---- src/image.c.orig Thu Feb 15 07:23:22 2001
-+++ src/image.c
-@@ -206,9 +206,12 @@
- DeleteItemList(namecache);
- }
-
--DeleteCompressedArray(ip->inode_cache);
--
--ip->inode_cache = NULL;
-+ /* Only flush when exiting initial call to RecursiveImage() */
-+if (strcmp(from,ip->path) == 0)
-+ {
-+ DeleteCompressedArray(ip->inode_cache);
-+ ip->inode_cache = NULL;
-+ }
-
- cfclosedir(dirh);
- }
diff --git a/sysutils/cfengine2/patches/patch-af b/sysutils/cfengine2/patches/patch-af
deleted file mode 100644
index 1c88d7d51c3..00000000000
--- a/sysutils/cfengine2/patches/patch-af
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-af,v 1.3 2003/05/29 21:08:27 seb Exp $
-
---- configure.orig 2003-05-28 16:53:58.000000000 +0000
-+++ configure
-@@ -7611,6 +7611,19 @@ echo "$as_me: error: Cannot find Berkele
- echo "$as_me:$LINENO: result: $BERKELEY_DB_DIR" >&5
- echo "${ECHO_T}$BERKELEY_DB_DIR" >&6
- else
-+ d="$BERKELEY_DB_DIR"
-+ for v in db-4 db4 db3 db; do
-+ if test -f "$d/include/$v/db.h" ; then
-+ test "x$d" != "x/usr" && BERKELEY_DB_LDFLAGS="-L$d/lib"
-+ BERKELEY_DB_CFLAGS="-I$d/include/$v"
-+ BERKELEY_DB_LIB="-l$v"
-+ echo "$as_me:$LINENO: result: $d" >&5
-+echo "${ECHO_T}$d" >&6
-+ break
-+ fi
-+ done
-+ fi
-+ if test x"$BERKELEY_DB_LIB" = "x"; then
- { { echo "$as_me:$LINENO: error: Cannot find BerkeleyDB" >&5
- echo "$as_me: error: Cannot find BerkeleyDB" >&2;}
- { (exit 1); exit 1; }; }
diff --git a/sysutils/cfengine2/patches/patch-ag b/sysutils/cfengine2/patches/patch-ag
deleted file mode 100644
index d329b296ba6..00000000000
--- a/sysutils/cfengine2/patches/patch-ag
+++ /dev/null
@@ -1,11 +0,0 @@
-$NetBSD: patch-ag,v 1.1.1.1 2002/12/22 13:04:38 seb Exp $
-
---- src/cfservd.c.orig Thu Dec 19 13:24:23 2002
-+++ src/cfservd.c Thu Dec 19 13:24:50 2002
-@@ -722,5 +722,5 @@
- Debug("Bound to address %s on %s=%d\n",sockaddr_ntop(ap->ai_addr),CLASSTEXT[VSYSTEMHARDCLASS],VSYSTEMHARDCLASS);
-
-- if (VSYSTEMHARDCLASS == openbsd)
-+ if (VSYSTEMHARDCLASS == openbsd || VSYSTEMHARDCLASS == netbsd)
- {
- continue; /* openbsd doesn't map ipv6 addresses */
diff --git a/sysutils/cfengine2/patches/patch-ah b/sysutils/cfengine2/patches/patch-ah
deleted file mode 100644
index a8a83c62af6..00000000000
--- a/sysutils/cfengine2/patches/patch-ah
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-ah,v 1.2 2003/04/26 08:33:01 seb Exp $
-
---- contrib/Makefile.am.orig 2001-11-21 18:59:51.000000000 +0000
-+++ contrib/Makefile.am
-@@ -1,9 +1,12 @@
- s1 = cfdoc
- s2 = cfengine.el
-
--sbin_SCRIPTS = vicf $(s1)
-+sbin_SCRIPTS = $(s1)
- pkgdata_SCRIPTS = $(s2)
-
-+exampledir = $(prefix)/share/examples/cfengine
-+example_SCRIPTS = vicf
-+
- EXTRA_DIST = README README.vicf $(s1) $(s2)
-
- #
diff --git a/sysutils/cfengine2/patches/patch-ai b/sysutils/cfengine2/patches/patch-ai
deleted file mode 100644
index 39538feff43..00000000000
--- a/sysutils/cfengine2/patches/patch-ai
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD: patch-ai,v 1.2 2003/04/26 08:33:01 seb Exp $
-
---- configure.ac.orig 2003-04-07 17:47:46.000000000 +0000
-+++ configure.ac
-@@ -133,6 +133,18 @@ else
- BERKELEY_DB_LIB="-ldb"
- AC_MSG_RESULT($BERKELEY_DB_DIR)
- else
-+ d="$BERKELEY_DB_DIR"
-+ for v in db-4 db4 db3 db; do
-+ if test -f "$d/include/$v/db.h" ; then
-+ test "x$d" != "x/usr" && BERKELEY_DB_LDFLAGS="-L$d/lib"
-+ BERKELEY_DB_CFLAGS="-I$d/include/$v"
-+ BERKELEY_DB_LIB="-l$v"
-+ AC_MSG_RESULT($d)
-+ break
-+ fi
-+ done
-+ fi
-+ if test x"$BERKELEY_DB_LIB" = "x"; then
- AC_MSG_ERROR(Cannot find BerkeleyDB)
- fi
- AC_DEFINE(USE_BERKELEY_DB, 1, [Define if BerkeleyDB is available.])
diff --git a/sysutils/cfengine2/patches/patch-aj b/sysutils/cfengine2/patches/patch-aj
deleted file mode 100644
index 11ffb950e94..00000000000
--- a/sysutils/cfengine2/patches/patch-aj
+++ /dev/null
@@ -1,108 +0,0 @@
-$NetBSD: patch-aj,v 1.2 2003/05/29 21:08:27 seb Exp $
-
---- contrib/Makefile.in.orig 2003-05-28 16:55:26.000000000 +0000
-+++ contrib/Makefile.in
-@@ -145,9 +145,12 @@ target_vendor = @target_vendor@
- s1 = cfdoc
- s2 = cfengine.el
-
--sbin_SCRIPTS = vicf $(s1)
-+sbin_SCRIPTS = $(s1)
- pkgdata_SCRIPTS = $(s2)
-
-+exampledir = $(prefix)/share/examples/cfengine
-+example_SCRIPTS = vicf
-+
- EXTRA_DIST = README README.vicf $(s1) $(s2)
-
- #
-@@ -178,8 +181,10 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = $(top_builddir)/src/conf.h
- CONFIG_CLEAN_FILES = vicf
--SCRIPTS = $(pkgdata_SCRIPTS) $(sbin_SCRIPTS)
-+SCRIPTS = $(example_SCRIPTS) $(pkgdata_SCRIPTS) $(sbin_SCRIPTS)
-
-+depcomp =
-+am__depfiles_maybe =
- DIST_SOURCES =
- DIST_COMMON = README Makefile.am Makefile.in vicf.in
- all: all-am
-@@ -187,11 +192,31 @@ all: all-am
- .SUFFIXES:
- $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4)
- cd $(top_srcdir) && \
-- $(AUTOMAKE) --gnu contrib/Makefile
-+ $(AUTOMAKE) --foreign --ignore-deps contrib/Makefile
- Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
- vicf: $(top_builddir)/config.status vicf.in
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-+exampleSCRIPT_INSTALL = $(INSTALL_SCRIPT)
-+install-exampleSCRIPTS: $(example_SCRIPTS)
-+ @$(NORMAL_INSTALL)
-+ $(mkinstalldirs) $(DESTDIR)$(exampledir)
-+ @list='$(example_SCRIPTS)'; for p in $$list; do \
-+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-+ if test -f $$d$$p; then \
-+ f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
-+ echo " $(exampleSCRIPT_INSTALL) $$d$$p $(DESTDIR)$(exampledir)/$$f"; \
-+ $(exampleSCRIPT_INSTALL) $$d$$p $(DESTDIR)$(exampledir)/$$f; \
-+ else :; fi; \
-+ done
-+
-+uninstall-exampleSCRIPTS:
-+ @$(NORMAL_UNINSTALL)
-+ @list='$(example_SCRIPTS)'; for p in $$list; do \
-+ f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
-+ echo " rm -f $(DESTDIR)$(exampledir)/$$f"; \
-+ rm -f $(DESTDIR)$(exampledir)/$$f; \
-+ done
- pkgdataSCRIPT_INSTALL = $(INSTALL_SCRIPT)
- install-pkgdataSCRIPTS: $(pkgdata_SCRIPTS)
- @$(NORMAL_INSTALL)
-@@ -276,7 +301,7 @@ check: check-am
- all-am: Makefile $(SCRIPTS)
-
- installdirs:
-- $(mkinstalldirs) $(DESTDIR)$(pkgdatadir) $(DESTDIR)$(sbindir)
-+ $(mkinstalldirs) $(DESTDIR)$(exampledir) $(DESTDIR)$(pkgdatadir) $(DESTDIR)$(sbindir)
-
- install: install-am
- install-exec: install-exec-am
-@@ -322,7 +347,7 @@ info: info-am
-
- info-am:
-
--install-data-am: install-pkgdataSCRIPTS
-+install-data-am: install-exampleSCRIPTS install-pkgdataSCRIPTS
-
- install-exec-am: install-sbinSCRIPTS
-
-@@ -348,17 +373,18 @@ ps: ps-am
-
- ps-am:
-
--uninstall-am: uninstall-info-am uninstall-pkgdataSCRIPTS \
-- uninstall-sbinSCRIPTS
-+uninstall-am: uninstall-exampleSCRIPTS uninstall-info-am \
-+ uninstall-pkgdataSCRIPTS uninstall-sbinSCRIPTS
-
- .PHONY: all all-am check check-am clean clean-generic distclean \
- distclean-generic distdir dvi dvi-am info info-am install \
-- install-am install-data install-data-am install-exec \
-- install-exec-am install-info install-info-am install-man \
-- install-pkgdataSCRIPTS install-sbinSCRIPTS install-strip \
-- installcheck installcheck-am installdirs maintainer-clean \
-- maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
-- pdf-am ps ps-am uninstall uninstall-am uninstall-info-am \
-+ install-am install-data install-data-am install-exampleSCRIPTS \
-+ install-exec install-exec-am install-info install-info-am \
-+ install-man install-pkgdataSCRIPTS install-sbinSCRIPTS \
-+ install-strip installcheck installcheck-am installdirs \
-+ maintainer-clean maintainer-clean-generic mostlyclean \
-+ mostlyclean-generic pdf pdf-am ps ps-am uninstall uninstall-am \
-+ uninstall-exampleSCRIPTS uninstall-info-am \
- uninstall-pkgdataSCRIPTS uninstall-sbinSCRIPTS
-
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/sysutils/checkpassword/DESCR b/sysutils/checkpassword/DESCR
deleted file mode 100644
index ac0b7759827..00000000000
--- a/sysutils/checkpassword/DESCR
+++ /dev/null
@@ -1,3 +0,0 @@
-checkpassword provides a simple, uniform password-checking interface to all
-root applications. It is suitable for use by applications such as login,
-ftpd, and pop3d.
diff --git a/sysutils/checkpassword/Makefile b/sysutils/checkpassword/Makefile
deleted file mode 100644
index ea5c6ffff7b..00000000000
--- a/sysutils/checkpassword/Makefile
+++ /dev/null
@@ -1,18 +0,0 @@
-# $NetBSD: Makefile,v 1.1.1.1 2001/08/13 10:29:54 zuntum Exp $
-#
-
-DISTNAME= checkpassword-0.90
-CATEGORIES= sysutils
-MASTER_SITES= http://cr.yp.to/checkpwd/
-
-MAINTAINER= zuntum@netbsd.org
-HOMEPAGE= http://cr.yp.to/checkpwd.html
-COMMENT= simple, uniform password-checking interface to all root applications
-
-ALL_TARGET= #
-INSTALL_TARGET= setup check
-
-post-patch:
- ${ECHO} ${PREFIX} > ${WRKSRC}/conf-home
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/checkpassword/PLIST b/sysutils/checkpassword/PLIST
deleted file mode 100644
index e656ce868cd..00000000000
--- a/sysutils/checkpassword/PLIST
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 22:52:59 zuntum Exp $
-bin/checkpassword
diff --git a/sysutils/checkpassword/distinfo b/sysutils/checkpassword/distinfo
deleted file mode 100644
index 3e132360d06..00000000000
--- a/sysutils/checkpassword/distinfo
+++ /dev/null
@@ -1,4 +0,0 @@
-$NetBSD: distinfo,v 1.1.1.1 2001/08/13 10:29:54 zuntum Exp $
-
-SHA1 (checkpassword-0.90.tar.gz) = 6c591a541a2d69c2112dbad35b0f0ccab0978d85
-Size (checkpassword-0.90.tar.gz) = 15631 bytes
diff --git a/sysutils/coreutils/DESCR b/sysutils/coreutils/DESCR
deleted file mode 100644
index b7f451b0255..00000000000
--- a/sysutils/coreutils/DESCR
+++ /dev/null
@@ -1,7 +0,0 @@
-The GNU Core Utilities are the basic file, shell and text manipulation
-utilities of the GNU operating system. These are the core utilities which
-are expected to exist on every operating system.
-
-Previously these utilities were offered as three individual sets of GNU
-utilities, fileutils, shellutils, and textutils. Those three have been
-combined into a single set of utilities called the coreutils.
diff --git a/sysutils/coreutils/Makefile b/sysutils/coreutils/Makefile
deleted file mode 100644
index 8a8f2f800bc..00000000000
--- a/sysutils/coreutils/Makefile
+++ /dev/null
@@ -1,40 +0,0 @@
-# $NetBSD: Makefile,v 1.7 2003/07/13 13:53:13 wiz Exp $
-
-DISTNAME= coreutils-5.0
-PKGREVISION= 2
-CATEGORIES= sysutils
-MASTER_SITES= ${MASTER_SITE_GNU:=coreutils/}
-EXTRACT_SUFX= .tar.bz2
-
-MAINTAINER= marc@informatik.uni-bremen.de
-HOMEPAGE= http://www.gnu.org/software/coreutils/
-COMMENT= GNU basic file, shell and text manipulation utilities
-
-BUILD_USES_MSGFMT= YES
-
-CONFLICTS= sh-utils-* fileutils-* textutils-*
-
-GNU_CONFIGURE= YES
-USE_BUILDLINK2= YES
-USE_PERL5= build
-
-.include "../../mk/bsd.prefs.mk"
-
-CONFIGURE_ARGS= --program-prefix=${GNU_PROGRAM_PREFIX}
-# devel/id-utils installs a 'gid' program, so conflict with it if
-# GNU_PROGRAM_PREFIX == 'g'
-.if ${GNU_PROGRAM_PREFIX} == "g"
-CONFLICTS+= id-utils-[0-9]* gnome-utils<1.4.1.2nb2
-.endif
-# print/teTeX*-bin installs a 'readlink' program, so conflict with it if
-# GNU_PROGRAM_PREFIX == ''
-.if ${GNU_PROGRAM_PREFIX} == ""
-CONFLICTS+= teTeX-bin-[0-9]*
-.endif
-PLIST_SUBST+= GNU_PROGRAM_PREFIX=${GNU_PROGRAM_PREFIX}
-BUILD_DEFS+= GNU_PROGRAM_PREFIX
-
-.include "../../converters/libiconv/buildlink2.mk"
-.include "../../devel/gettext-lib/buildlink2.mk"
-.include "../../mk/texinfo.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/coreutils/PLIST b/sysutils/coreutils/PLIST
deleted file mode 100644
index 3c7e6fe99ce..00000000000
--- a/sysutils/coreutils/PLIST
+++ /dev/null
@@ -1,182 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2003/04/10 13:18:36 wiz Exp $
-bin/${GNU_PROGRAM_PREFIX}basename
-bin/${GNU_PROGRAM_PREFIX}cat
-bin/${GNU_PROGRAM_PREFIX}chgrp
-bin/${GNU_PROGRAM_PREFIX}chmod
-bin/${GNU_PROGRAM_PREFIX}chown
-bin/${GNU_PROGRAM_PREFIX}chroot
-bin/${GNU_PROGRAM_PREFIX}cksum
-bin/${GNU_PROGRAM_PREFIX}comm
-bin/${GNU_PROGRAM_PREFIX}cp
-bin/${GNU_PROGRAM_PREFIX}csplit
-bin/${GNU_PROGRAM_PREFIX}cut
-bin/${GNU_PROGRAM_PREFIX}date
-bin/${GNU_PROGRAM_PREFIX}dd
-bin/${GNU_PROGRAM_PREFIX}df
-bin/${GNU_PROGRAM_PREFIX}dir
-bin/${GNU_PROGRAM_PREFIX}dircolors
-bin/${GNU_PROGRAM_PREFIX}dirname
-bin/${GNU_PROGRAM_PREFIX}du
-bin/${GNU_PROGRAM_PREFIX}echo
-bin/${GNU_PROGRAM_PREFIX}env
-bin/${GNU_PROGRAM_PREFIX}expand
-bin/${GNU_PROGRAM_PREFIX}expr
-bin/${GNU_PROGRAM_PREFIX}factor
-bin/${GNU_PROGRAM_PREFIX}false
-bin/${GNU_PROGRAM_PREFIX}fmt
-bin/${GNU_PROGRAM_PREFIX}fold
-bin/${GNU_PROGRAM_PREFIX}groups
-bin/${GNU_PROGRAM_PREFIX}head
-bin/${GNU_PROGRAM_PREFIX}hostid
-bin/${GNU_PROGRAM_PREFIX}hostname
-bin/${GNU_PROGRAM_PREFIX}id
-bin/${GNU_PROGRAM_PREFIX}install
-bin/${GNU_PROGRAM_PREFIX}join
-bin/${GNU_PROGRAM_PREFIX}kill
-bin/${GNU_PROGRAM_PREFIX}link
-bin/${GNU_PROGRAM_PREFIX}ln
-bin/${GNU_PROGRAM_PREFIX}logname
-bin/${GNU_PROGRAM_PREFIX}ls
-bin/${GNU_PROGRAM_PREFIX}md5sum
-bin/${GNU_PROGRAM_PREFIX}mkdir
-bin/${GNU_PROGRAM_PREFIX}mkfifo
-bin/${GNU_PROGRAM_PREFIX}mknod
-bin/${GNU_PROGRAM_PREFIX}mv
-bin/${GNU_PROGRAM_PREFIX}nice
-bin/${GNU_PROGRAM_PREFIX}nl
-bin/${GNU_PROGRAM_PREFIX}nohup
-bin/${GNU_PROGRAM_PREFIX}od
-bin/${GNU_PROGRAM_PREFIX}paste
-bin/${GNU_PROGRAM_PREFIX}pathchk
-bin/${GNU_PROGRAM_PREFIX}pinky
-bin/${GNU_PROGRAM_PREFIX}pr
-bin/${GNU_PROGRAM_PREFIX}printenv
-bin/${GNU_PROGRAM_PREFIX}printf
-bin/${GNU_PROGRAM_PREFIX}ptx
-bin/${GNU_PROGRAM_PREFIX}pwd
-bin/${GNU_PROGRAM_PREFIX}readlink
-bin/${GNU_PROGRAM_PREFIX}rm
-bin/${GNU_PROGRAM_PREFIX}rmdir
-bin/${GNU_PROGRAM_PREFIX}seq
-bin/${GNU_PROGRAM_PREFIX}sha1sum
-bin/${GNU_PROGRAM_PREFIX}shred
-bin/${GNU_PROGRAM_PREFIX}sleep
-bin/${GNU_PROGRAM_PREFIX}sort
-bin/${GNU_PROGRAM_PREFIX}split
-bin/${GNU_PROGRAM_PREFIX}stat
-bin/${GNU_PROGRAM_PREFIX}stty
-bin/${GNU_PROGRAM_PREFIX}su
-bin/${GNU_PROGRAM_PREFIX}sum
-bin/${GNU_PROGRAM_PREFIX}sync
-bin/${GNU_PROGRAM_PREFIX}tac
-bin/${GNU_PROGRAM_PREFIX}tail
-bin/${GNU_PROGRAM_PREFIX}tee
-bin/${GNU_PROGRAM_PREFIX}test
-bin/${GNU_PROGRAM_PREFIX}touch
-bin/${GNU_PROGRAM_PREFIX}tr
-bin/${GNU_PROGRAM_PREFIX}true
-bin/${GNU_PROGRAM_PREFIX}tsort
-bin/${GNU_PROGRAM_PREFIX}tty
-bin/${GNU_PROGRAM_PREFIX}uname
-bin/${GNU_PROGRAM_PREFIX}unexpand
-bin/${GNU_PROGRAM_PREFIX}uniq
-bin/${GNU_PROGRAM_PREFIX}unlink
-bin/${GNU_PROGRAM_PREFIX}uptime
-bin/${GNU_PROGRAM_PREFIX}users
-bin/${GNU_PROGRAM_PREFIX}vdir
-bin/${GNU_PROGRAM_PREFIX}wc
-bin/${GNU_PROGRAM_PREFIX}who
-bin/${GNU_PROGRAM_PREFIX}whoami
-bin/${GNU_PROGRAM_PREFIX}yes
-@unexec ${INSTALL_INFO} --delete --info-dir=%D/info %D/info/coreutils.info
-info/coreutils.info
-@exec ${INSTALL_INFO} --info-dir=%D/info %D/info/coreutils.info
-@comment belongs to libiconv: lib/charset.alias
-man/man1/${GNU_PROGRAM_PREFIX}basename.1
-man/man1/${GNU_PROGRAM_PREFIX}cat.1
-man/man1/${GNU_PROGRAM_PREFIX}chgrp.1
-man/man1/${GNU_PROGRAM_PREFIX}chmod.1
-man/man1/${GNU_PROGRAM_PREFIX}chown.1
-man/man1/${GNU_PROGRAM_PREFIX}chroot.1
-man/man1/${GNU_PROGRAM_PREFIX}cksum.1
-man/man1/${GNU_PROGRAM_PREFIX}comm.1
-man/man1/${GNU_PROGRAM_PREFIX}cp.1
-man/man1/${GNU_PROGRAM_PREFIX}csplit.1
-man/man1/${GNU_PROGRAM_PREFIX}cut.1
-man/man1/${GNU_PROGRAM_PREFIX}date.1
-man/man1/${GNU_PROGRAM_PREFIX}dd.1
-man/man1/${GNU_PROGRAM_PREFIX}df.1
-man/man1/${GNU_PROGRAM_PREFIX}dir.1
-man/man1/${GNU_PROGRAM_PREFIX}dircolors.1
-man/man1/${GNU_PROGRAM_PREFIX}dirname.1
-man/man1/${GNU_PROGRAM_PREFIX}du.1
-man/man1/${GNU_PROGRAM_PREFIX}echo.1
-man/man1/${GNU_PROGRAM_PREFIX}env.1
-man/man1/${GNU_PROGRAM_PREFIX}expand.1
-man/man1/${GNU_PROGRAM_PREFIX}expr.1
-man/man1/${GNU_PROGRAM_PREFIX}factor.1
-man/man1/${GNU_PROGRAM_PREFIX}false.1
-man/man1/${GNU_PROGRAM_PREFIX}fmt.1
-man/man1/${GNU_PROGRAM_PREFIX}fold.1
-man/man1/${GNU_PROGRAM_PREFIX}groups.1
-man/man1/${GNU_PROGRAM_PREFIX}head.1
-man/man1/${GNU_PROGRAM_PREFIX}hostid.1
-man/man1/${GNU_PROGRAM_PREFIX}hostname.1
-man/man1/${GNU_PROGRAM_PREFIX}id.1
-man/man1/${GNU_PROGRAM_PREFIX}install.1
-man/man1/${GNU_PROGRAM_PREFIX}join.1
-man/man1/${GNU_PROGRAM_PREFIX}link.1
-man/man1/${GNU_PROGRAM_PREFIX}ln.1
-man/man1/${GNU_PROGRAM_PREFIX}logname.1
-man/man1/${GNU_PROGRAM_PREFIX}ls.1
-man/man1/${GNU_PROGRAM_PREFIX}md5sum.1
-man/man1/${GNU_PROGRAM_PREFIX}mkdir.1
-man/man1/${GNU_PROGRAM_PREFIX}mkfifo.1
-man/man1/${GNU_PROGRAM_PREFIX}mknod.1
-man/man1/${GNU_PROGRAM_PREFIX}mv.1
-man/man1/${GNU_PROGRAM_PREFIX}nice.1
-man/man1/${GNU_PROGRAM_PREFIX}nl.1
-man/man1/${GNU_PROGRAM_PREFIX}nohup.1
-man/man1/${GNU_PROGRAM_PREFIX}od.1
-man/man1/${GNU_PROGRAM_PREFIX}paste.1
-man/man1/${GNU_PROGRAM_PREFIX}pathchk.1
-man/man1/${GNU_PROGRAM_PREFIX}pinky.1
-man/man1/${GNU_PROGRAM_PREFIX}pr.1
-man/man1/${GNU_PROGRAM_PREFIX}printenv.1
-man/man1/${GNU_PROGRAM_PREFIX}printf.1
-man/man1/${GNU_PROGRAM_PREFIX}ptx.1
-man/man1/${GNU_PROGRAM_PREFIX}pwd.1
-man/man1/${GNU_PROGRAM_PREFIX}readlink.1
-man/man1/${GNU_PROGRAM_PREFIX}rm.1
-man/man1/${GNU_PROGRAM_PREFIX}rmdir.1
-man/man1/${GNU_PROGRAM_PREFIX}seq.1
-man/man1/${GNU_PROGRAM_PREFIX}sha1sum.1
-man/man1/${GNU_PROGRAM_PREFIX}shred.1
-man/man1/${GNU_PROGRAM_PREFIX}sleep.1
-man/man1/${GNU_PROGRAM_PREFIX}sort.1
-man/man1/${GNU_PROGRAM_PREFIX}split.1
-man/man1/${GNU_PROGRAM_PREFIX}stat.1
-man/man1/${GNU_PROGRAM_PREFIX}stty.1
-man/man1/${GNU_PROGRAM_PREFIX}su.1
-man/man1/${GNU_PROGRAM_PREFIX}sum.1
-man/man1/${GNU_PROGRAM_PREFIX}sync.1
-man/man1/${GNU_PROGRAM_PREFIX}tac.1
-man/man1/${GNU_PROGRAM_PREFIX}tail.1
-man/man1/${GNU_PROGRAM_PREFIX}tee.1
-man/man1/${GNU_PROGRAM_PREFIX}test.1
-man/man1/${GNU_PROGRAM_PREFIX}touch.1
-man/man1/${GNU_PROGRAM_PREFIX}tr.1
-man/man1/${GNU_PROGRAM_PREFIX}true.1
-man/man1/${GNU_PROGRAM_PREFIX}tsort.1
-man/man1/${GNU_PROGRAM_PREFIX}tty.1
-man/man1/${GNU_PROGRAM_PREFIX}uname.1
-man/man1/${GNU_PROGRAM_PREFIX}unexpand.1
-man/man1/${GNU_PROGRAM_PREFIX}uniq.1
-man/man1/${GNU_PROGRAM_PREFIX}unlink.1
-man/man1/${GNU_PROGRAM_PREFIX}uptime.1
-man/man1/${GNU_PROGRAM_PREFIX}users.1
-man/man1/${GNU_PROGRAM_PREFIX}vdir.1
-man/man1/${GNU_PROGRAM_PREFIX}wc.1
-man/man1/${GNU_PROGRAM_PREFIX}who.1
-man/man1/${GNU_PROGRAM_PREFIX}whoami.1
-man/man1/${GNU_PROGRAM_PREFIX}yes.1
diff --git a/sysutils/coreutils/distinfo b/sysutils/coreutils/distinfo
deleted file mode 100644
index 3a5bc68872a..00000000000
--- a/sysutils/coreutils/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.1.1.1 2003/04/10 13:18:36 wiz Exp $
-
-SHA1 (coreutils-5.0.tar.bz2) = ce67aacedfc917a92b5be62dd32095393c2f220c
-Size (coreutils-5.0.tar.bz2) = 3952653 bytes
-SHA1 (patch-aa) = 352b6b8eeff29159ebdbae4929db75d243a19354
diff --git a/sysutils/coreutils/patches/patch-aa b/sysutils/coreutils/patches/patch-aa
deleted file mode 100644
index 0a1ef5c1b45..00000000000
--- a/sysutils/coreutils/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2003/04/10 13:18:36 wiz Exp $
-
---- lib/Makefile.in.orig 2003-04-06 12:47:18.000000000 +0200
-+++ lib/Makefile.in 2003-04-06 12:48:17.000000000 +0200
-@@ -769,7 +769,7 @@
-
- install-data-am:
-
--install-exec-am: install-exec-local
-+install-exec-am:
-
- install-info: install-info-am
-
diff --git a/sysutils/cpogm/DESCR b/sysutils/cpogm/DESCR
deleted file mode 100644
index d4b96af5cea..00000000000
--- a/sysutils/cpogm/DESCR
+++ /dev/null
@@ -1,2 +0,0 @@
-cpogm sets the owner, group and mode of a destination file to
-those of a source file.
diff --git a/sysutils/cpogm/Makefile b/sysutils/cpogm/Makefile
deleted file mode 100644
index 0377a74aebf..00000000000
--- a/sysutils/cpogm/Makefile
+++ /dev/null
@@ -1,17 +0,0 @@
-# $NetBSD: Makefile,v 1.2 2001/02/17 17:42:11 wiz Exp $
-#
-
-DISTNAME= cpogm-1.0
-CATEGORIES= sysutils
-MASTER_SITES= ftp://ftp.gw.com/pub/people/kim/
-
-MAINTAINER= kim@tac.nyc.ny.us
-COMMENT= copy owner, group and mode of a file
-
-USE_PERL5= yes
-
-NO_CONFIGURE= yes
-ALL_TARGET= all PREFIX=${PREFIX}
-INSTALL_TARGET= install PREFIX=${PREFIX}
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/cpogm/PLIST b/sysutils/cpogm/PLIST
deleted file mode 100644
index 16238fd7223..00000000000
--- a/sysutils/cpogm/PLIST
+++ /dev/null
@@ -1,3 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 22:53:00 zuntum Exp $
-sbin/cpogm
-man/man8/cpogm.8
diff --git a/sysutils/cpogm/distinfo b/sysutils/cpogm/distinfo
deleted file mode 100644
index cdedfcd1e77..00000000000
--- a/sysutils/cpogm/distinfo
+++ /dev/null
@@ -1,4 +0,0 @@
-$NetBSD: distinfo,v 1.2 2001/04/19 11:29:00 agc Exp $
-
-SHA1 (cpogm-1.0.tar.gz) = 676cc5d6220c29c9a7832500a86b133c474e395a
-Size (cpogm-1.0.tar.gz) = 981 bytes
diff --git a/sysutils/cpuburn/DESCR b/sysutils/cpuburn/DESCR
deleted file mode 100644
index ed5e80bbe5e..00000000000
--- a/sysutils/cpuburn/DESCR
+++ /dev/null
@@ -1,8 +0,0 @@
-The cpuburn programs are designed to load x86 CPUs as heavily as
-possible for the purposes of system testing. They have been
-optimized for different processors. FPU and ALU instructions are
-coded an assembler endless loop. They do not test every instruction.
-The goal has been to maximize heat production from the CPU, putting
-stress on the CPU itself, cooling system, motherboard (especially
-voltage regulators) and power supply (likely cause of burnBX/MMX
-errors).
diff --git a/sysutils/cpuburn/Makefile b/sysutils/cpuburn/Makefile
deleted file mode 100644
index dfdf4fad012..00000000000
--- a/sysutils/cpuburn/Makefile
+++ /dev/null
@@ -1,28 +0,0 @@
-# $NetBSD: Makefile,v 1.5 2003/03/29 12:42:26 jmmv Exp $
-#
-
-DISTNAME= cpuburn_1_4
-PKGNAME= cpuburn-1.4
-PKGREVISION= 2
-WRKSRC= ${WRKDIR}/${PKGNAME_NOREV}
-CATEGORIES= sysutils
-MASTER_SITES= http://users.ev1.net/~redelm/
-EXTRACT_SUFX= _tar.gz
-
-MAINTAINER= abs@netbsd.org
-HOMEPAGE= http://users.ev1.net/~redelm/
-COMMENT= CPU load testing utilities for Pentium pro and later
-
-ONLY_FOR_PLATFORM= *-*-i[3456]86
-EXTRACT_CMD= ${GZCAT} ${DOWNLOADED_DISTFILE} | ${GTAR} -xf -
-
-do-install:
- ${INSTALL_PROGRAM} ${WRKSRC}/burnBX ${PREFIX}/bin/burnBX
- ${INSTALL_PROGRAM} ${WRKSRC}/burnK6 ${PREFIX}/bin/burnK6
- ${INSTALL_PROGRAM} ${WRKSRC}/burnK7 ${PREFIX}/bin/burnK7
- ${INSTALL_PROGRAM} ${WRKSRC}/burnMMX ${PREFIX}/bin/burnMMX
- ${INSTALL_PROGRAM} ${WRKSRC}/burnP5 ${PREFIX}/bin/burnP5
- ${INSTALL_PROGRAM} ${WRKSRC}/burnP6 ${PREFIX}/bin/burnP6
- ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/cpuburn.README
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/cpuburn/PLIST b/sysutils/cpuburn/PLIST
deleted file mode 100644
index 3370839f37b..00000000000
--- a/sysutils/cpuburn/PLIST
+++ /dev/null
@@ -1,8 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2002/03/04 20:06:57 abs Exp $
-share/doc/cpuburn.README
-bin/burnBX
-bin/burnK6
-bin/burnK7
-bin/burnMMX
-bin/burnP5
-bin/burnP6
diff --git a/sysutils/cpuburn/distinfo b/sysutils/cpuburn/distinfo
deleted file mode 100644
index fffd9a165f6..00000000000
--- a/sysutils/cpuburn/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.4 2002/09/17 17:02:30 abs Exp $
-
-SHA1 (cpuburn_1_4_tar.gz) = 291e163d17ce528fd8301f821babed74d9caffaf
-Size (cpuburn_1_4_tar.gz) = 7373 bytes
-SHA1 (patch-aa) = 6427616decd8c19a5e79e6eedf1ff59e60323b45
diff --git a/sysutils/cpuburn/patches/patch-aa b/sysutils/cpuburn/patches/patch-aa
deleted file mode 100644
index 8094aeef033..00000000000
--- a/sysutils/cpuburn/patches/patch-aa
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2002/09/17 17:02:30 abs Exp $
-
---- Makefile.orig Sat Jun 16 04:39:17 2001
-+++ Makefile
-@@ -1,3 +1,12 @@
-+OPSYS!= uname -s
-+# On NetBSD -nostdlib will exclude the ELF note that tags binaries as native.
-+.if (${OPSYS} == NetBSD)
-+COMPILEFLAGS=-D_main=main -DWINDOWS
-+.else
-+COMPILEFLAGS=-nostdlib
-+.endif
-+
- all : burnP5 burnP6 burnK6 burnK7 burnBX burnMMX
-+
- .S:
-- gcc -s -nostdlib -o $@ $<
-+ gcc -s ${COMPILEFLAGS} -o $@ $<
diff --git a/sysutils/cpuid/DESCR b/sysutils/cpuid/DESCR
deleted file mode 100644
index ab1b18d6170..00000000000
--- a/sysutils/cpuid/DESCR
+++ /dev/null
@@ -1,4 +0,0 @@
-This is a fairly complete CPU identification utility. It has been
-tested on several Intel, AMD and Cyrix CPUs. If the Pentium III
-serial number misfeature is present and enabled, this program will
-display it.
diff --git a/sysutils/cpuid/Makefile b/sysutils/cpuid/Makefile
deleted file mode 100644
index f2ab797d3b6..00000000000
--- a/sysutils/cpuid/Makefile
+++ /dev/null
@@ -1,19 +0,0 @@
-# $NetBSD: Makefile,v 1.1.1.1 2003/07/03 10:21:31 agc Exp $
-
-DISTNAME= cpuid-3.3
-CATEGORIES= sysutils
-MASTER_SITES= http://www.ka9q.net/code/cpuid/
-
-MAINTAINER= tech-pkg@netbsd.org
-HOMEPAGE= http://www.gnu.org/directory/System_administration/Configuration/cpuid.html
-COMMENT= CPU identification feature
-
-ONLY_FOR_PLATFORM= *-*-i386
-
-do-build:
- cd ${WRKSRC} && ${CC} ${CFLAGS} cpuid.c -o cpuid
-
-do-install:
- ${INSTALL_PROGRAM} ${WRKSRC}/cpuid ${PREFIX}/bin
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/cpuid/PLIST b/sysutils/cpuid/PLIST
deleted file mode 100644
index baefdb5fbe2..00000000000
--- a/sysutils/cpuid/PLIST
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2003/07/03 10:21:31 agc Exp $
-bin/cpuid
diff --git a/sysutils/cpuid/distinfo b/sysutils/cpuid/distinfo
deleted file mode 100644
index 27f372eb297..00000000000
--- a/sysutils/cpuid/distinfo
+++ /dev/null
@@ -1,4 +0,0 @@
-$NetBSD: distinfo,v 1.1.1.1 2003/07/03 10:21:31 agc Exp $
-
-SHA1 (cpuid-3.3.tar.gz) = b9dba38c59d1e83cc8e511590d05523898888894
-Size (cpuid-3.3.tar.gz) = 5762 bytes
diff --git a/sysutils/crashme/DESCR b/sysutils/crashme/DESCR
deleted file mode 100644
index c1510c84687..00000000000
--- a/sysutils/crashme/DESCR
+++ /dev/null
@@ -1,16 +0,0 @@
-A bit of background on crashme. It is a tool for testing the robustness
-of an operating environment using a technique of "Random Input" response
-analysis. This I first saw formally proposed in the book Cybernetics
-by Norbert Wiener, but which any parent who has observed his children
-playing and learning would be well disposed to describe in detail.
-
-* The operating environment under consideration is the user-mode process.
-
-* The Random Input is provided by the execution of a sequence of pseudo-random
- data as an instruction stream.
-
-* The response analysis is to catch and record machine and software
- generated exceptions/errors/signals and to retry using new random data
- in both the current user-mode process and in newly created subprocesses.
-
-Crashme: (c) Copyright 1990, 1991 George J. Carrette
diff --git a/sysutils/crashme/Makefile b/sysutils/crashme/Makefile
deleted file mode 100644
index 0ff96d8c4c2..00000000000
--- a/sysutils/crashme/Makefile
+++ /dev/null
@@ -1,17 +0,0 @@
-# $NetBSD: Makefile,v 1.11 2003/03/29 12:42:27 jmmv Exp $
-#
-
-DISTNAME= crashme-2.4
-WRKSRC= ${WRKDIR}
-CATEGORIES= sysutils
-MASTER_SITES= http://ochimizu-www.jaist.ac.jp:8000/linux/vger/crashme/
-EXTRACT_SUFX= -shar
-
-MAINTAINER= agc@netbsd.org
-HOMEPAGE= http://people.delphi.com/gjc/crashme.html
-COMMENT= Try to crash machine with random arguments to random system calls
-
-EXTRACT_CMD= ${EXTRACT_CMD.shar}
-MAKEFILE= makefile
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/crashme/PLIST b/sysutils/crashme/PLIST
deleted file mode 100644
index 999612f28cd..00000000000
--- a/sysutils/crashme/PLIST
+++ /dev/null
@@ -1,4 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 22:53:01 zuntum Exp $
-sbin/crashme
-sbin/pddet
-man/man1/crashme.1
diff --git a/sysutils/crashme/distinfo b/sysutils/crashme/distinfo
deleted file mode 100644
index 6bf3d55cdf4..00000000000
--- a/sysutils/crashme/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.2 2001/04/19 11:29:00 agc Exp $
-
-SHA1 (crashme-2.4-shar) = 0648322959634f21e61a5d5e1b308e3c89dc2841
-Size (crashme-2.4-shar) = 57010 bytes
-SHA1 (patch-aa) = a23fe7c1ea008913f3e085f0eb67f997b155e21b
-SHA1 (patch-ab) = 4c7bdcbaae5c802ee27142b3a41638151dff3638
diff --git a/sysutils/crashme/patches/patch-aa b/sysutils/crashme/patches/patch-aa
deleted file mode 100644
index dd68b5d8f56..00000000000
--- a/sysutils/crashme/patches/patch-aa
+++ /dev/null
@@ -1,28 +0,0 @@
-$NetBSD: patch-aa,v 1.4 1998/11/24 05:23:23 mycroft Exp $
-
---- makefile.orig Tue Nov 24 01:08:49 1998
-+++ makefile Tue Nov 24 01:09:26 1998
-@@ -1,12 +1,19 @@
-+CFLAGS= -O2
-+
- all: crashme pddet
-
- crashme: crashme.o
-- cc -o crashme crashme.o
-+ ${CC} ${CFLAGS} -o crashme crashme.o
- crashme.o: crashme.c
-- cc -c crashme.c
-+ ${CC} ${CFLAGS} -c crashme.c
-
- pddet: pddet.o
-- cc -o pddet pddet.o
-+ ${CC} ${CFLAGS} -o pddet pddet.o
- pddet.o: pddet.c
-- cc -c pddet.c
-+ ${CC} ${CFLAGS} -c pddet.c
-+
-
-+install: crashme pddet
-+ ${INSTALL} -c -m 0755 crashme ${PREFIX}/sbin/crashme
-+ ${INSTALL} -c -m 0755 pddet ${PREFIX}/sbin/pddet
-+ ${INSTALL} -c -m 0444 crashme.1 ${PREFIX}/man/man1
diff --git a/sysutils/crashme/patches/patch-ab b/sysutils/crashme/patches/patch-ab
deleted file mode 100644
index c8e0e118089..00000000000
--- a/sysutils/crashme/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.1 1999/06/27 01:41:46 abs Exp $
-
---- crashme.c.orig Sat Jun 26 18:35:17 1999
-+++ crashme.c Sat Jun 26 18:36:01 1999
-@@ -591,7 +591,7 @@
- status = fork();
- #endif
- if (status == 0)
-- {status = execl(cmd,cmd,nb,arg2,nt,arg4,arg5,subprocess_ind,0);
-+ {status = execlp(cmd,cmd,nb,arg2,nt,arg4,arg5,subprocess_ind,0);
- if (status == -1)
- {perror(cmd);
- exit(1);}}
diff --git a/sysutils/daemontools/DEINSTALL b/sysutils/daemontools/DEINSTALL
deleted file mode 100644
index d77d41a71a7..00000000000
--- a/sysutils/daemontools/DEINSTALL
+++ /dev/null
@@ -1,16 +0,0 @@
-#! /bin/sh
-#
-# $NetBSD: DEINSTALL,v 1.1 2001/10/31 22:53:02 zuntum Exp $
-#
-
-case "$2" in
- DEINSTALL) rmdir 2>/dev/null @@SERVICEDIR@@ || cat <<EOF
-
-=============================================================
-Note that /service directory was not removed. If you
-no longer need it, remove it by hand.
-=============================================================
-
-EOF
- ;;
-esac
diff --git a/sysutils/daemontools/DESCR b/sysutils/daemontools/DESCR
deleted file mode 100644
index ef8ef5ac5f3..00000000000
--- a/sysutils/daemontools/DESCR
+++ /dev/null
@@ -1,3 +0,0 @@
-Daemontools is a small set of /very/ useful utilities, from Dan
-Bernstein. They are mainly used for controlling processes, and
-maintaining logfiles.
diff --git a/sysutils/daemontools/Makefile b/sysutils/daemontools/Makefile
deleted file mode 100644
index ef39808ccbf..00000000000
--- a/sysutils/daemontools/Makefile
+++ /dev/null
@@ -1,49 +0,0 @@
-# $NetBSD: Makefile,v 1.10 2002/04/18 16:23:22 yyamano Exp $
-# FreeBSD Id: ports/sysutils/daemontools/Makefile,v 1.8 2000/12/03 05:16:41 steve Exp
-
-DISTNAME= daemontools-0.70
-CATEGORIES= sysutils
-MASTER_SITES= http://cr.yp.to/daemontools/ \
- ftp://cr.yp.to/daemontools/ \
- ftp://ftp.innominate.org/pub/pape/djb/
-DISTFILES= ${DISTNAME}.tar.gz \
- ${DISTNAME}-man-20001116.tar.gz
-
-MAINTAINER= zuntum@netbsd.org
-HOMEPAGE= http://cr.yp.to/daemontools.html
-COMMENT= Service monitoring and logging utilities by djb
-
-RESTRICTED= "Redistribution of modified package is forbidden"
-NO_BIN_ON_CDROM=${RESTRICTED}
-NO_BIN_ON_FTP= ${RESTRICTED}
-
-ALL_TARGET= it
-INSTALL_TARGET= setup check
-SAMPLERC= svscan.sh.sample
-SERVICEDIR?= /var/spool/service
-
-PLIST_SUBST+= SERVICEDIR=${SERVICEDIR}
-DEINSTALL_FILE= ${WRKDIR}/.DEINSTALL
-
-post-patch:
- @${ECHO} ${CC} ${CFLAGS} > ${WRKSRC}/conf-cc
- @${ECHO} ${CC} ${_STRIPFLAG_CC} > ${WRKSRC}/conf-ld
- @${ECHO} ${PREFIX} > ${WRKSRC}/conf-home
-
-post-build:
- ${SED} -e "s,@@PREFIX@@,${PREFIX}," \
- -e "s,@@SERVICEDIR@@,${SERVICEDIR},g" \
- ${FILESDIR}/${SAMPLERC} > ${WRKDIR}/${SAMPLERC}
- ${SED} "s,@@SERVICEDIR@@,${SERVICEDIR},g" \
- ${PKGDIR}/DEINSTALL > ${DEINSTALL_FILE}
-
-post-install:
- ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/daemontools
- ${INSTALL_DATA} ${WRKDIR}/${SAMPLERC} \
- ${PREFIX}/share/examples/daemontools
- ${INSTALL_DATA_DIR} ${SERVICEDIR}
-
- cd ${WRKDIR}/${DISTNAME}-man && \
- ${INSTALL_MAN} *.8 ${PREFIX}/man/man8
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/daemontools/PLIST b/sysutils/daemontools/PLIST
deleted file mode 100644
index 31b6abe6349..00000000000
--- a/sysutils/daemontools/PLIST
+++ /dev/null
@@ -1,32 +0,0 @@
-@comment $NetBSD: PLIST,v 1.3 2002/12/09 16:01:43 tron Exp $
-bin/envdir
-bin/envuidgid
-bin/fghack
-bin/multilog
-bin/setlock
-bin/setuidgid
-bin/softlimit
-bin/supervise
-bin/svc
-bin/svok
-bin/svscan
-bin/svstat
-bin/tai64n
-bin/tai64nlocal
-man/man8/envdir.8
-man/man8/envuidgid.8
-man/man8/fghack.8
-man/man8/multilog.8
-man/man8/setlock.8
-man/man8/setuidgid.8
-man/man8/softlimit.8
-man/man8/supervise.8
-man/man8/svc.8
-man/man8/svok.8
-man/man8/svscan.8
-man/man8/svstat.8
-man/man8/tai64n.8
-man/man8/tai64nlocal.8
-share/examples/daemontools/svscan.sh.sample
-@dirrm share/examples/daemontools
-@exec ${MKDIR} ${SERVICEDIR} || ${TRUE}
diff --git a/sysutils/daemontools/distinfo b/sysutils/daemontools/distinfo
deleted file mode 100644
index fdb46667d3b..00000000000
--- a/sysutils/daemontools/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.3 2001/10/22 13:42:28 zuntum Exp $
-
-SHA1 (daemontools-0.70.tar.gz) = e4af3b5e6fa5a85fb86fe8d80248421f0f8765ff
-Size (daemontools-0.70.tar.gz) = 36144 bytes
-SHA1 (daemontools-0.70-man-20001116.tar.gz) = 08fd1d5c1af4b620cc80116470468b2f92130d6c
-Size (daemontools-0.70-man-20001116.tar.gz) = 8279 bytes
diff --git a/sysutils/daemontools/files/svscan.sh.sample b/sysutils/daemontools/files/svscan.sh.sample
deleted file mode 100644
index 7060aafd3ad..00000000000
--- a/sysutils/daemontools/files/svscan.sh.sample
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/bin/sh
-
-# Surely advice you to enable some of the below
-# control variables and the apropriate ulimit.
-# These are only examples.
-# Furthermore, you should think about additional
-# limits you might need.
-# Or, check login.conf(5) for a suitable
-# alternative
-#
-# I really do suggest you use @@SERVICEDIR@@ as your
-# service spool directory. Check hier(7) for
-# reasons.
-
-# 10 Mb
-#MINSEGMENT=10240
-# 20 Mb
-#MAXSEGMENT=20480
-# 10 Mb
-#MAXFILESIZE=10240
-# 100
-#MAXFD=100
-# 40
-#MAXCHILD=40
-
-# ulimits
-#ulimit -d ${MINSEGMENT}
-#ulimit -f ${MAXFILESIZE}
-#ulimit -m ${MAXSEGMENT}
-#ulimit -n ${MAXFD}
-#ulimit -s ${MINSEGMENT}
-#ulimit -u ${MAXCHILD}
-
-exec /bin/csh -cf '@@PREFIX@@/bin/svscan @@SERVICEDIR@@ &'
diff --git a/sysutils/depot/DESCR b/sysutils/depot/DESCR
deleted file mode 100644
index 614401b3ee3..00000000000
--- a/sysutils/depot/DESCR
+++ /dev/null
@@ -1,4 +0,0 @@
-Depot manages packages similar to pkg_* and RPM, but does so by mapping
-several installation trees into a common base (such as /usr/local) using
-symbolic links. GNU's `stow' was inspired by Depot, though both have
-features that the other does not.
diff --git a/sysutils/depot/Makefile b/sysutils/depot/Makefile
deleted file mode 100644
index 4eebfb1076f..00000000000
--- a/sysutils/depot/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# $NetBSD: Makefile,v 1.11 2003/06/02 01:16:56 jschauma Exp $
-#
-
-DISTNAME= depot-5.14
-CATEGORIES= sysutils
-MASTER_SITES= ftp://ftp.andrew.cmu.edu/pub/depot/alpha/
-
-MAINTAINER= tech-pkg@netbsd.org
-HOMEPAGE= http://andrew2.andrew.cmu.edu/depot/depot.html
-COMMENT= Maps several separate packages into a tree without merging them
-
-GNU_CONFIGURE= yes
-CONFIGURE_ENV+= INSTALL="" CC="${CC}"
-MAKE_ENV+= CC="${CC}"
-
-do-install:
- @cd ${WRKSRC}/src/cmd && ${MAKE} DESTDIR=${PREFIX} install
- @cd ${WRKSRC}/man/man1 && ${MAKE} DESTDIR=${PREFIX} install
- @cd ${WRKSRC}/man/man5 && ${MAKE} DESTDIR=${PREFIX} install
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/depot/PLIST b/sysutils/depot/PLIST
deleted file mode 100644
index 54a94a900f9..00000000000
--- a/sysutils/depot/PLIST
+++ /dev/null
@@ -1,10 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 22:53:03 zuntum Exp $
-bin/depot
-bin/depot_getcollectioninfo
-bin/fsi_generate
-bin/hintservice
-man/man1/depot.1.gz
-man/man1/fsi_generate.1.gz
-man/man1/hintservice.1.gz
-man/man5/depot.conf.5.gz
-man/man5/depot.pref.5.gz
diff --git a/sysutils/depot/distinfo b/sysutils/depot/distinfo
deleted file mode 100644
index 7c2a59f26a2..00000000000
--- a/sysutils/depot/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.2 2001/04/19 11:29:01 agc Exp $
-
-SHA1 (depot-5.14.tar.gz) = 378e09973fcc5f42e69d3988b04fc64fde5c974a
-Size (depot-5.14.tar.gz) = 204216 bytes
-SHA1 (patch-aa) = 5b11b84bf134b292e65b05c42bf2dce277f6bc37
diff --git a/sysutils/depot/patches/patch-aa b/sysutils/depot/patches/patch-aa
deleted file mode 100644
index 25edbf2fddd..00000000000
--- a/sysutils/depot/patches/patch-aa
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-aa,v 1.2 1998/08/07 11:14:04 agc Exp $
-
---- src/lib/DepotDB/DepotDB_Write.c.orig Tue Feb 10 18:54:48 1998
-+++ src/lib/DepotDB/DepotDB_Write.c Tue Feb 10 18:55:52 1998
-@@ -45,6 +45,12 @@
- #include "CollectionList.h"
- #include "DepotDB.h"
-
-+#include <sys/param.h>
-+
-+#if (defined(BSD) && BSD >= 199306)
-+#include <limits.h>
-+#define MAXLONG LONG_MAX
-+#endif
-
- static int DepotDB_LongSkipSize();
-
diff --git a/sysutils/dog/DESCR b/sysutils/dog/DESCR
deleted file mode 100644
index 7e369b513e4..00000000000
--- a/sysutils/dog/DESCR
+++ /dev/null
@@ -1,5 +0,0 @@
-Dog writes the contents of each given file, URL, or the standard
-input if none are given or when a file named '-' is given, to the
-standard output. It currently supports the file, http, and
-raw URL types. It is designed as a compatible, but enhanced,
-replacement of cat(1).
diff --git a/sysutils/dog/Makefile b/sysutils/dog/Makefile
deleted file mode 100644
index 1af00d8420c..00000000000
--- a/sysutils/dog/Makefile
+++ /dev/null
@@ -1,15 +0,0 @@
-# $NetBSD: Makefile,v 1.4 2001/03/16 20:53:05 zuntum Exp $
-# FreeBSD Id: ports/misc/dog/Makefile,v 1.1 2000/06/10 05:45:34 will Exp
-
-DISTNAME= dog-1.7
-CATEGORIES= misc
-MASTER_SITES= http://jl.photodex.com/dog/
-
-MAINTAINER= zuntum@netbsd.org
-HOMEPAGE= http://jl.photodex.com/dog/
-COMMENT= Dog writes the contents of each given file, URL, or stdin
-
-USE_GMAKE= yes
-ALL_TARGET= dog
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/dog/PLIST b/sysutils/dog/PLIST
deleted file mode 100644
index 9b28aa84a82..00000000000
--- a/sysutils/dog/PLIST
+++ /dev/null
@@ -1,3 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 22:53:04 zuntum Exp $
-bin/dog
-man/man1/dog.1
diff --git a/sysutils/dog/distinfo b/sysutils/dog/distinfo
deleted file mode 100644
index 78bb74e9c87..00000000000
--- a/sysutils/dog/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.2 2001/04/19 11:29:01 agc Exp $
-
-SHA1 (dog-1.7.tar.gz) = a1af9c76daa0c9768cdf0c31839b3004e6ccc417
-Size (dog-1.7.tar.gz) = 30433 bytes
-SHA1 (patch-aa) = c0dc5315d16950f3cc927074ea7b7536adac880c
diff --git a/sysutils/dog/patches/patch-aa b/sysutils/dog/patches/patch-aa
deleted file mode 100644
index b7126b382b4..00000000000
--- a/sysutils/dog/patches/patch-aa
+++ /dev/null
@@ -1,30 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2001/01/19 01:35:05 hubertf Exp $
-
---- Makefile.orig Tue Jul 13 20:32:24 1999
-+++ Makefile
-@@ -12,18 +12,20 @@
- # dogboy@photodex.com!
-
- INSTALL = /usr/bin/install -c
--OBJS = dog.o getopt.o getopt1.o
--CFLAGS = -O3 -Wall
-+#HF#OBJS = dog.o getopt.o getopt1.o
-+OBJS = dog.o # NetBSD (and about any other Unix) has getopt in libc :-)
-+CC ?= cc
-+CFLAGS ?= -O -pipe
-
--prefix = /usr/local
-+prefix = ${PREFIX}
- bindir = ${prefix}/bin
- mandir = ${prefix}/man
-
- %.o: %.c
-- gcc ${CFLAGS} -c $< -o $@
-+ $(CC) ${CFLAGS} -c $< -o $@
-
- dog: ${OBJS}
-- gcc ${CFLAGS} -o dog ${OBJS}
-+ $(CC) ${CFLAGS} -o dog ${OBJS}
-
- install: dog
- $(INSTALL) -m 644 dog.1 ${mandir}/man1
diff --git a/sysutils/dptutil/DESCR b/sysutils/dptutil/DESCR
deleted file mode 100644
index 0c1ae340f3e..00000000000
--- a/sysutils/dptutil/DESCR
+++ /dev/null
@@ -1,4 +0,0 @@
-Adaptec raidutil and dpteng. For use with DPT and Adaptec
-EATA and I2O RAID adapters.
-
-See also the "sysutils/storage-manager" package.
diff --git a/sysutils/dptutil/Makefile b/sysutils/dptutil/Makefile
deleted file mode 100644
index 2af44a922e3..00000000000
--- a/sysutils/dptutil/Makefile
+++ /dev/null
@@ -1,29 +0,0 @@
-# $NetBSD: Makefile,v 1.2 2003/01/27 23:39:02 ad Exp $
-
-DISTNAME= raidmgt-3.31
-PKGNAME= dptutil-3.31
-PKGREVISION= 1
-CATEGORIES= sysutils
-MASTER_SITES= http://www.interlude.eu.org/~ad/raidmgt/
-
-MAINTAINER= ad@netbsd.org
-HOMEPAGE= http://opensource.adaptec.com/
-COMMENT= DPT/Adaptec Storage Management software (dptutil)
-
-# Should work for 32-bit PowerPC and SPARC, but untested. 64-bit platforms
-# may have problems.
-ONLY_FOR_PLATFORM= NetBSD-*-i386
-
-post-patch:
- ${SED} -e "s,@SBINDIR@,${PREFIX}/sbin,g" \
- ${WRKSRC}/dpteng/makefile > ${WRKSRC}/dpteng/makefile.tmp
- ${MV} ${WRKSRC}/dpteng/makefile.tmp ${WRKSRC}/dpteng/makefile
- ${SED} -e "s,@SBINDIR@,${PREFIX}/sbin,g" \
- ${WRKSRC}/dptutil/makefile > ${WRKSRC}/dptutil/makefile.tmp
- ${MV} ${WRKSRC}/dptutil/makefile.tmp ${WRKSRC}/dptutil/makefile
-
-do-install:
- ${INSTALL_PROGRAM} ${WRKSRC}/dpteng/dpteng ${PREFIX}/sbin/dpteng
- ${INSTALL_PROGRAM} ${WRKSRC}/dptutil/raidutil ${PREFIX}/sbin/dptutil
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/dptutil/PLIST b/sysutils/dptutil/PLIST
deleted file mode 100644
index f6635be1162..00000000000
--- a/sysutils/dptutil/PLIST
+++ /dev/null
@@ -1,3 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2002/12/09 11:07:20 ad Exp $
-sbin/dpteng
-sbin/dptutil
diff --git a/sysutils/dptutil/distinfo b/sysutils/dptutil/distinfo
deleted file mode 100644
index de68e85926c..00000000000
--- a/sysutils/dptutil/distinfo
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: distinfo,v 1.2 2003/01/27 23:39:02 ad Exp $
-
-SHA1 (raidmgt-3.31.tar.gz) = d55d573fbdd22c4c9c44003b9230b29c1c728848
-Size (raidmgt-3.31.tar.gz) = 723349 bytes
-SHA1 (patch-aa) = 23e5cc93f26cd3e12d8465fccf1ded6e91b114fb
-SHA1 (patch-ab) = 54ed1a72d070b234598b7e0da88f65fc64088300
-SHA1 (patch-ac) = fb9cad0e76f9f2aef416cc731e271cae8eade6ee
-SHA1 (patch-ad) = 57ff83cdbfc2acd384f4e3ee56ed0b6a103ab834
-SHA1 (patch-ae) = 789c9aa558307f5daaf9c273a952c964e86014cf
-SHA1 (patch-af) = daeea5d535ea206e698f69eb9d5466cac115b308
-SHA1 (patch-ag) = 9b08ca81ce8cbc80f94c0ffc5a8b69c89a65e07a
-SHA1 (patch-ah) = f80b40f5f6a6cc1c39949af301c7c39d26b9cd4d
-SHA1 (patch-ai) = e40e81bc2896693ab9f51bf6dcec2e1667ea993a
-SHA1 (patch-aj) = e055f4a137399ca7f85c4b0ad5fc67765e327cee
-SHA1 (patch-ak) = 928681b9b01f3d126c70eb82ba169c54865a542b
-SHA1 (patch-al) = f9884d55ae1b85a2912f6042cbe5485ff9f8f46d
-SHA1 (patch-am) = d8c6397f7868492faefaf1c127df9d129a667592
-SHA1 (patch-an) = 8c18f8015c131690a3fdd9e8ee96b5576d70eb9a
diff --git a/sysutils/dptutil/patches/patch-aa b/sysutils/dptutil/patches/patch-aa
deleted file mode 100644
index e22dfb07c89..00000000000
--- a/sysutils/dptutil/patches/patch-aa
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2003/01/27 23:39:02 ad Exp $
-
---- dpteng/eng_unix.c.orig Fri Dec 13 14:17:47 2002
-+++ dpteng/eng_unix.c Fri Dec 13 14:18:13 2002
-@@ -319,7 +319,7 @@
- if (ExitEngine) {
- int i;
- struct msqid_ds CtlBuf;
-- MsqID = msgget(DPT_EngineKey, MSG_ALLRD | MSG_ALLWR);
-+ MsqID = msgget(DPT_EngineKey, MSG_URD | MSG_UWR);
- if(MsqID != -1) {
- msgctl(MsqID, IPC_STAT, &CtlBuf);
- // Stop engine only, if no dptmgr still running
-@@ -359,7 +359,7 @@
-
- /* Try To Create The Unique Message Que Of This ID */
-
-- MsqID = msgget(DPT_EngineKey,IPC_CREAT | IPC_EXCL | MSG_ALLRD | MSG_ALLWR);
-+ MsqID = msgget(DPT_EngineKey,IPC_CREAT | IPC_EXCL | MSG_URD | MSG_UWR);
-
- /* If We Could Not Allocate The Message Que, Print A Message And Exit */
-
diff --git a/sysutils/dptutil/patches/patch-ab b/sysutils/dptutil/patches/patch-ab
deleted file mode 100644
index 29ce7d5a5f5..00000000000
--- a/sysutils/dptutil/patches/patch-ab
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD: patch-ab,v 1.2 2003/01/27 23:39:03 ad Exp $
-
---- dpteng/engcalls.c.orig Tue Aug 13 16:02:24 2002
-+++ dpteng/engcalls.c Fri Dec 13 14:14:51 2002
-@@ -118,6 +118,12 @@
- char *CommEnginePathNameDefault = "/opt/SUNWhwrdg/dptcom";
- char *DefaultPathName = "/opt/SUNWhwrdg/";
-
-+#elif defined (__NetBSD__)
-+
-+char *EnginePathNameDefault = _NBSD_LIBEXEC "/dpteng &";
-+char *CommEnginePathNameDefault = _NBSD_LIBEXEC "/dptcom &";
-+char *DefaultPathName = _NBSD_LIBEXEC;
-+
- #else
-
- char *EnginePathNameDefault = "/usr/dpt/dpteng &";
-@@ -954,7 +960,7 @@
- /* Get The Shared Memory Segment */
-
- BufferID = shmget(IPC_PRIVATE,(int)(toEngTotalSize + fromEngTotalSize),
-- SHM_ALLRD | SHM_ALLWR | IPC_CREAT);
-+ SHM_URD | SHM_UWR | IPC_CREAT);
-
- /* If We Got The Segment, Try To Attach To It */
-
diff --git a/sysutils/dptutil/patches/patch-ac b/sysutils/dptutil/patches/patch-ac
deleted file mode 100644
index 975de1bdc66..00000000000
--- a/sysutils/dptutil/patches/patch-ac
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD: patch-ac,v 1.1.1.1 2002/12/09 11:07:20 ad Exp $
-
-diff -ur dpteng/makefile dpteng/makefile
---- odpteng/makefile Fri Aug 30 19:40:36 2002
-+++ dpteng/makefile Fri Dec 6 09:55:31 2002
-@@ -9,7 +9,10 @@
- CPP_EXTENSION = .cpp
- C_EXTENSION = .c
-
--CFLAGS= $(INCLUDE_DIR) -D__UNIX__ -DMESSAGES -D_DPT_ACTIVE_ALIGNMENT -DI_WANT_SNI_DEBUG -DNEW_LOGGER -c
-+CFLAGS= $(INCLUDE_DIR) -Dunix -D__unix__ -D_DPT_FREE_BSD -D__UNIX__ -DMESSAGES \
-+ -D_DPT_ACTIVE_ALIGNMENT -D_DPT_DEFINE_SEMUN -DI_WANT_SNI_DEBUG \
-+ -DNEW_LOGGER -DDEFAULT_PATH=\"@SBINDIR@\" \
-+ -D_NBSD_LIBEXEC=\"@SBINDIR@\" -c
-
- SRCS = \
- addr_rng.cpp \
-@@ -105,7 +108,7 @@
- rm -f *.o dpteng
-
- depend :
-- makedepend $(INCLUDE_DIR) -D_DPT_UNIX -D_DPT_LINUX -D__linux__ ${SRCS}
-+ makedepend $(INCLUDE_DIR) -D_DPT_UNIX -D_DPT_FREE_BSD -D_DPT_DEFINE_SEMUN -D__unix__ -Dunix ${SRCS}
-
-
- $(C_EXTENSION).o:
diff --git a/sysutils/dptutil/patches/patch-ad b/sysutils/dptutil/patches/patch-ad
deleted file mode 100644
index b93b43b7e47..00000000000
--- a/sysutils/dptutil/patches/patch-ad
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ad,v 1.1.1.1 2002/12/09 11:07:20 ad Exp $
-
-diff -ur dpteng/osd_defs.h dpteng/osd_defs.h
---- odpteng/osd_defs.h Tue Aug 13 16:02:26 2002
-+++ dpteng/osd_defs.h Fri Dec 6 07:48:17 2002
-@@ -56,7 +56,7 @@
- # define _DPT_LINUX
- #elif (defined(__bsdi__))
- # define _DPT_BSDI
--#elif (defined(__FreeBSD__))
-+#elif (defined(__FreeBSD__)) || (defined(__NetBSD__))
- # undef _DPT_FREE_BSD
- # define _DPT_FREE_BSD
- #else
diff --git a/sysutils/dptutil/patches/patch-ae b/sysutils/dptutil/patches/patch-ae
deleted file mode 100644
index 349fb014570..00000000000
--- a/sysutils/dptutil/patches/patch-ae
+++ /dev/null
@@ -1,70 +0,0 @@
-$NetBSD: patch-ae,v 1.2 2003/01/27 23:39:03 ad Exp $
-
---- dpteng/osd_unix.c.orig Tue Aug 13 16:02:26 2002
-+++ dpteng/osd_unix.c Fri Dec 13 14:15:13 2002
-@@ -2588,7 +2588,7 @@
-
- BufferID = shmget(IPC_PRIVATE,(int)(toLoggerTotalSize +
- fromLoggerTotalSize),
-- SHM_ALLRD | SHM_ALLWR | IPC_CREAT);
-+ SHM_URD | SHM_UWR | IPC_CREAT);
-
- /* If We Got The Segment, Try To Attach To It */
-
-@@ -3676,7 +3676,7 @@
- uCHAR DataBuff[100];
- EATA_CP pkt;
- int IoctlRtn;
--# if (defined(_DPT_FREE_BSD))
-+# if (defined(_DPT_FREE_BSD)) && !defined(__NetBSD__)
- int c;
- int i2oMajorNode = 0;
- FILE *fp = popen (
-@@ -3695,7 +3695,7 @@
- NumEntries = 0;
- for(i = 0; i < MAX_HAS; ++i)
- {
--# if (defined(_DPT_BSDI) || defined(_DPT_FREE_BSD))
-+# if (defined(_DPT_BSDI) || defined(_DPT_FREE_BSD)) && !defined(__NetBSD__)
- int created = 0;
- # endif
-
-@@ -3710,7 +3710,7 @@
- IoctlRtn = osdSendIoctl(&HbaDevs[NumEntries],DPT_SIGNATURE,
- DataBuff,&pkt);
-
--# if (defined(_DPT_BSDI) || defined(_DPT_FREE_BSD))
-+# if (defined(_DPT_BSDI) || defined(_DPT_FREE_BSD)) && !defined(__NetBSD__)
- /*
- * Use Alternate access.
- */
-@@ -3758,7 +3758,7 @@
- HbaDevs[NumEntries].IoAddress = 0xffffffff;
- ++NumEntries;
- }
--# if (defined(_DPT_BSDI) || defined(_DPT_FREE_BSD))
-+# if (defined(_DPT_BSDI) || defined(_DPT_FREE_BSD)) && !defined(__NetBSD__)
- else if (created)
- {
- unlink (HbaDevs[NumEntries].NodeName);
-@@ -3777,8 +3777,10 @@
- }
- HbaDevs[NumEntries].Flags = 0;
- strcpy(HbaDevs[NumEntries].NodeName,"/dev");
--# if (defined(_DPT_BSDI) || defined(_DPT_FREE_BSD))
-+# if (defined(_DPT_BSDI) || defined(_DPT_FREE_BSD)) && !defined(__NetBSD__)
- strcat(HbaDevs[NumEntries].NodeName,"/rdptr");
-+# elif (defined(__NetBSD__))
-+ strcat(HbaDevs[NumEntries].NodeName,"/dpt");
- # else
- strcat(HbaDevs[NumEntries].NodeName,"/dptr");
- # endif
-@@ -3789,7 +3791,7 @@
- mknod(HbaDevs[NumEntries].NodeName, S_IFCHR|S_IRUSR|S_IWUSR,
- (MAJOR_NODE << 20) + (i << 10) + 0);
- # undef MAJOR_NODE
--# elif (defined(_DPT_FREE_BSD))
-+# elif (defined(_DPT_FREE_BSD)) && !defined(__NetBSD__)
- # define MAJOR_NODE 88
- mknod(HbaDevs[NumEntries].NodeName, S_IFCHR|S_IRUSR|S_IWUSR,
- (MAJOR_NODE << 8) + i);
diff --git a/sysutils/dptutil/patches/patch-af b/sysutils/dptutil/patches/patch-af
deleted file mode 100644
index 08e7751c15d..00000000000
--- a/sysutils/dptutil/patches/patch-af
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD: patch-af,v 1.3 2003/04/21 20:28:45 cjep Exp $
-
---- dptutil/engcalls.c.orig Tue Aug 13 16:02:24 2002
-+++ dptutil/engcalls.c Fri Dec 13 14:19:12 2002
-@@ -118,6 +118,12 @@
- char *CommEnginePathNameDefault = "/opt/SUNWhwrdg/dptcom";
- char *DefaultPathName = "/opt/SUNWhwrdg/";
-
-+#elif defined (__NetBSD__)
-+
-+char *EnginePathNameDefault = _NBSD_LIBEXEC "/dpteng &";
-+char *CommEnginePathNameDefault = _NBSD_LIBEXEC "/dptcom &";
-+char *DefaultPathName = _NBSD_LIBEXEC;
-+
- #else
-
- char *EnginePathNameDefault = "/usr/dpt/dpteng &";
-@@ -954,7 +960,7 @@
- /* Get The Shared Memory Segment */
-
- BufferID = shmget(IPC_PRIVATE,(int)(toEngTotalSize + fromEngTotalSize),
-- SHM_ALLRD | SHM_ALLWR | IPC_CREAT);
-+ SHM_URD | SHM_UWR | IPC_CREAT);
-
- /* If We Got The Segment, Try To Attach To It */
-
diff --git a/sysutils/dptutil/patches/patch-ag b/sysutils/dptutil/patches/patch-ag
deleted file mode 100644
index 4fa6bf39948..00000000000
--- a/sysutils/dptutil/patches/patch-ag
+++ /dev/null
@@ -1,30 +0,0 @@
-$NetBSD: patch-ag,v 1.1.1.1 2002/12/09 11:07:20 ad Exp $
-
-diff -ur dptutil/makefile dptutil/makefile
---- odptutil/makefile Fri Aug 30 19:50:02 2002
-+++ dptutil/makefile Fri Dec 6 09:05:21 2002
-@@ -11,11 +11,13 @@
-
- DEBUG_FLAGS=-DDEBUG_ENTER_EXIT
- DEBUG_FLAGS=
--CFLAGS= -O3 -c $(I) -DMESSAGES \
-+CFLAGS= -O2 -c $(I) -DMESSAGES \
- $(extra_cflags) -D_DPT_ACTIVE_ALIGNMENT $(DEBUG_FLAGS) \
- -Dtrue=1 -Dfalse=0 \
- -DHORIZONTAL -DNEW_RSC_MGR -DNEW_RSC_HDR \
-- -D_DPT_FLASH
-+ -DDEFAULT_PATH=\"@SBINDIR@\" \
-+ -D_NBSD_LIBEXEC=\"@SBINDIR@\" \
-+ -D_DPT_FLASH -D_DPT_FREE_BSD -Dunix -D__unix__
-
- LINK_FLAGS = -v
-
-@@ -140,7 +142,7 @@
- $(LINK) $(LINK_FLAGS) -o $@ $(OBJS) $(LIBS)
-
- depend :
-- makedepend -DFLG_STAT_LAP=0x20 -D_DPT_UNIX -D_DPT_LINUX -D__linux__ -- ${CFLAGS} -- ${SRCS}
-+ makedepend -DFLG_STAT_LAP=0x20 -D_DPT_UNIX -D_DPT_FREE_BSD -- ${CFLAGS} -- ${SRCS}
-
- $(CPP_EXTENSION).o:
- $(CC) $(CFLAGS) -c $<
diff --git a/sysutils/dptutil/patches/patch-ah b/sysutils/dptutil/patches/patch-ah
deleted file mode 100644
index 7f765f2c0b2..00000000000
--- a/sysutils/dptutil/patches/patch-ah
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ah,v 1.1 2003/01/27 23:39:03 ad Exp $
-
---- dpteng/engmsg.c.orig Fri Dec 13 14:18:21 2002
-+++ dpteng/engmsg.c Fri Dec 13 14:18:40 2002
-@@ -259,7 +259,7 @@
- /* Try To Get The Unique Message Que Of This ID */
-
- // need to get ENGINE's q - old code -> msqID = msgget(EngineMsgKey, ...
-- msqID = msgget(DPT_EngineKey, MSG_ALLRD | MSG_ALLWR);
-+ msqID = msgget(DPT_EngineKey, MSG_URD | MSG_UWR);
-
- /* If There Is One Out There, Try To Send A Message To It */
-
-@@ -374,7 +374,7 @@
-
- /* Try To Get The Unique Message Que Of This ID */
- /* (we need to look for the ENGINE's msq) */
-- msqID = msgget(DPT_EngineKey, MSG_ALLRD | MSG_ALLWR);
-+ msqID = msgget(DPT_EngineKey, MSG_URD | MSG_UWR);
-
- /* If There Is One Out There, Try To Send A Message To It */
-
diff --git a/sysutils/dptutil/patches/patch-ai b/sysutils/dptutil/patches/patch-ai
deleted file mode 100644
index c65d83f25dc..00000000000
--- a/sysutils/dptutil/patches/patch-ai
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ai,v 1.1.1.1 2002/12/09 11:07:20 ad Exp $
-
---- /dev/null Sat Dec 7 19:02:30 2002
-+++ Makefile Sat Dec 7 19:22:44 2002
-@@ -0,0 +1,7 @@
-+all:
-+ cd dpteng && make depend && make
-+ cd dptutil && make depend && make
-+
-+clean:
-+ cd dpteng && make clean
-+ cd dptutil && make clean
diff --git a/sysutils/dptutil/patches/patch-aj b/sysutils/dptutil/patches/patch-aj
deleted file mode 100644
index 4f5d0bd860d..00000000000
--- a/sysutils/dptutil/patches/patch-aj
+++ /dev/null
@@ -1,30 +0,0 @@
-$NetBSD: patch-aj,v 1.1 2003/01/27 23:39:03 ad Exp $
-
---- dpteng/lockunix.c.orig Fri Dec 13 14:04:11 2002
-+++ dpteng/lockunix.c Fri Dec 13 14:07:56 2002
-@@ -31,6 +31,7 @@
- #include "lockunix.h"
-
- static char Lock[] = "/tmp/%s.LOCK";
-+static const int LockMode = 0600;
- extern int errno;
-
- static char *
-@@ -73,7 +74,7 @@
- return (-1);
- }
- sprintf (templateBuffer, Template, Name);
-- if ((fd = open(mktemp (templateBuffer), O_WRONLY|O_CREAT|O_EXCL)) < 0) {
-+ if ((fd = open(mktemp (templateBuffer), O_WRONLY|O_CREAT|O_EXCL, LockMode)) < 0) {
- free (templateBuffer);
- free (lock);
- return (-1);
-@@ -143,7 +144,7 @@
-
- if (lock != (char *)NULL) {
- sprintf (lock, Lock, Name);
-- if ((fd = open(lock, O_WRONLY|O_CREAT|O_TRUNC)) >= 0) {
-+ if ((fd = open(lock, O_WRONLY|O_CREAT|O_TRUNC, LockMode)) >= 0) {
- sprintf (buffer, "%d\n", pid);
- write (fd, buffer, strlen(buffer));
- close (fd);
diff --git a/sysutils/dptutil/patches/patch-ak b/sysutils/dptutil/patches/patch-ak
deleted file mode 100644
index ba5e4e59998..00000000000
--- a/sysutils/dptutil/patches/patch-ak
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ak,v 1.1 2003/01/27 23:39:03 ad Exp $
-
---- dpteng/semaphor.c.orig Fri Dec 13 14:16:50 2002
-+++ dpteng/semaphor.c Fri Dec 13 14:17:22 2002
-@@ -204,7 +204,7 @@
- // Get the semaphore handle and create it if it isn't already there.
- // Let other processes access it as well
-
-- rtnVal->semID = semget(key, 1, IPC_CREAT | S_IRWXU | S_IRWXG);
-+ rtnVal->semID = semget(key, 1, IPC_CREAT | S_IRUSR | S_IWUSR);
-
- if (rtnVal->semID == -1) {
- if (Verbose)
-@@ -328,7 +328,7 @@
-
- // Get the semaphore ID for the block of unnamed semaphores
-
-- LocalSemID = semget(key, MAX_LOCAL_SEM, IPC_CREAT);
-+ LocalSemID = semget(key, MAX_LOCAL_SEM, IPC_CREAT | S_IWUSR | S_IRUSR);
-
- if (LocalSemID == -1) {
-
diff --git a/sysutils/dptutil/patches/patch-al b/sysutils/dptutil/patches/patch-al
deleted file mode 100644
index eeb93cf0dd1..00000000000
--- a/sysutils/dptutil/patches/patch-al
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-al,v 1.1 2003/01/27 23:39:04 ad Exp $
-
---- dpteng/sharmem.c.orig Fri Dec 13 14:15:20 2002
-+++ dpteng/sharmem.c Fri Dec 13 14:15:29 2002
-@@ -82,7 +82,7 @@
- /* Get The Shared Memory Segment */
-
- BufferID = shmget(IPC_PRIVATE,(int)TotalSize,
-- SHM_ALLRD | SHM_ALLWR | IPC_CREAT);
-+ SHM_URD | SHM_UWR | IPC_CREAT);
-
- /* If We Got The Segment, Try To Attach To It */
-
diff --git a/sysutils/dptutil/patches/patch-am b/sysutils/dptutil/patches/patch-am
deleted file mode 100644
index 7b9b5420026..00000000000
--- a/sysutils/dptutil/patches/patch-am
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-am,v 1.1 2003/01/27 23:39:04 ad Exp $
-
---- dpteng/osd_util.h.orig Fri Dec 13 14:57:20 2002
-+++ dpteng/osd_util.h Fri Dec 13 15:03:59 2002
-@@ -108,6 +108,15 @@
- /* OS dependent defines */
- /*--------------------- */
-
-+#ifdef __NetBSD__
-+# if defined(__powerpc__) || defined(__sparc__) || defined(__sparc64__)
-+# define _DPT_BIG_ENDIAN
-+# endif
-+# if defined(_DPT_BIG_ENDIAN) || defined(__alpha__)
-+# define _DPT_STRICT_ALIGN
-+# endif
-+#endif
-+
- #if defined (_DPT_MSDOS) || defined (_DPT_WIN_3X)
- #define _DPT_16_BIT
- #else
diff --git a/sysutils/dptutil/patches/patch-an b/sysutils/dptutil/patches/patch-an
deleted file mode 100644
index 5ac0d4a155b..00000000000
--- a/sysutils/dptutil/patches/patch-an
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-an,v 1.1 2003/01/27 23:39:04 ad Exp $
-
---- dptutil/osd_util.h.orig Fri Dec 13 14:57:20 2002
-+++ dptutil/osd_util.h Fri Dec 13 15:03:59 2002
-@@ -108,6 +108,15 @@
- /* OS dependent defines */
- /*--------------------- */
-
-+#ifdef __NetBSD__
-+# if defined(__powerpc__) || defined(__sparc__) || defined(__sparc64__)
-+# define _DPT_BIG_ENDIAN
-+# endif
-+# if defined(_DPT_BIG_ENDIAN) || defined(__alpha__)
-+# define _DPT_STRICT_ALIGN
-+# endif
-+#endif
-+
- #if defined (_DPT_MSDOS) || defined (_DPT_WIN_3X)
- #define _DPT_16_BIT
- #else
diff --git a/sysutils/dvd+rw-tools/DESCR b/sysutils/dvd+rw-tools/DESCR
deleted file mode 100644
index bcc8706a71a..00000000000
--- a/sysutils/dvd+rw-tools/DESCR
+++ /dev/null
@@ -1,5 +0,0 @@
-This package contains tools to write images (such as iso-9660 produced
-by mkisofs) to DVD+R/RW drives. It includes "growisofs" as a wrapper
-around mkisofs for appending or modifying contents of existing media.
-
-It is also able to write to some DVD- drives and media.
diff --git a/sysutils/dvd+rw-tools/Makefile b/sysutils/dvd+rw-tools/Makefile
deleted file mode 100644
index 01afbc2cf13..00000000000
--- a/sysutils/dvd+rw-tools/Makefile
+++ /dev/null
@@ -1,23 +0,0 @@
-# $NetBSD: Makefile,v 1.4 2003/06/15 01:32:16 dan Exp $
-#
-
-DISTNAME= dvd+rw-tools-5.6.4.4.4
-#PKGREVISION= 0
-CATEGORIES= sysutils
-MASTER_SITES= http://fy.chalmers.se/~appro/linux/DVD+RW/tools/
-
-MAINTAINER= dan@netbsd.org
-HOMEPAGE= http://fy.chalmers.se/~appro/linux/DVD+RW/
-COMMENT= Tools for writing DVD+R[W] disks
-
-DEPENDS+= cdrecord-[1-9]*:../../sysutils/cdrecord
-
-do-install:
- ${INSTALL_PROGRAM} ${WRKSRC}/growisofs ${PREFIX}/bin
- ${INSTALL_PROGRAM} ${WRKSRC}/dvd+rw-booktype ${PREFIX}/bin
- ${INSTALL_PROGRAM} ${WRKSRC}/dvd+rw-format ${PREFIX}/bin
- ${INSTALL_PROGRAM} ${WRKSRC}/dvd+rw-mediainfo ${PREFIX}/bin
- ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/html/dvd+rw-tools
- ${INSTALL_DATA} ${WRKSRC}/index.html ${PREFIX}/share/doc/html/dvd+rw-tools
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/dvd+rw-tools/PLIST b/sysutils/dvd+rw-tools/PLIST
deleted file mode 100644
index c2734a55c62..00000000000
--- a/sysutils/dvd+rw-tools/PLIST
+++ /dev/null
@@ -1,7 +0,0 @@
-@comment $NetBSD: PLIST,v 1.3 2003/06/04 16:12:11 reinoud Exp $
-bin/growisofs
-bin/dvd+rw-booktype
-bin/dvd+rw-format
-bin/dvd+rw-mediainfo
-share/doc/html/dvd+rw-tools/index.html
-@dirrm share/doc/html/dvd+rw-tools
diff --git a/sysutils/dvd+rw-tools/distinfo b/sysutils/dvd+rw-tools/distinfo
deleted file mode 100644
index 72e290ee819..00000000000
--- a/sysutils/dvd+rw-tools/distinfo
+++ /dev/null
@@ -1,4 +0,0 @@
-$NetBSD: distinfo,v 1.2 2003/06/04 16:12:11 reinoud Exp $
-
-SHA1 (dvd+rw-tools-5.6.4.4.4.tar.gz) = 7a3b616f44f44680f6a556cec067037e9f65055d
-Size (dvd+rw-tools-5.6.4.4.4.tar.gz) = 59790 bytes
diff --git a/sysutils/dvdrecord/DESCR b/sysutils/dvdrecord/DESCR
deleted file mode 100644
index 6f0e3abb42c..00000000000
--- a/sysutils/dvdrecord/DESCR
+++ /dev/null
@@ -1,5 +0,0 @@
-Dvdrtools is a fork of cdrtools, with the primary goal of supporting
-writable DVD drives.
-The original version of the DVD driver was written by Nicolae Mihalache.
-It is presently being developed by bero@gnu.org using a Pioneer DVR-A03 DVD
-writer; any other MMC compliant hardware is likely to work.
diff --git a/sysutils/dvdrecord/MESSAGE b/sysutils/dvdrecord/MESSAGE
deleted file mode 100644
index 1fcd9442055..00000000000
--- a/sysutils/dvdrecord/MESSAGE
+++ /dev/null
@@ -1,6 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE,v 1.1.1.1 2003/01/17 13:53:11 toshii Exp $
-
-To create DVD filesystem images, you will probably need mkisofs,
-which is contained in pkgsrc/sysutils/cdrecord.
-===========================================================================
diff --git a/sysutils/dvdrecord/Makefile b/sysutils/dvdrecord/Makefile
deleted file mode 100644
index a1e0980dcb1..00000000000
--- a/sysutils/dvdrecord/Makefile
+++ /dev/null
@@ -1,24 +0,0 @@
-# $NetBSD: Makefile,v 1.4 2003/06/02 01:16:56 jschauma Exp $
-
-DISTNAME= dvdrtools-${VERSION}
-PKGNAME= ${DISTNAME:S/dvdrtools/dvdrecord/}
-PKGREVISION= 1
-CATEGORIES= sysutils
-MASTER_SITES= http://freesoftware.fsf.org/download/dvdrtools/dvdrtools.pkg/${VERSION}/
-EXTRACT_SUFX= .tar.bz2
-
-MAINTAINER= tech-pkg@netbsd.org
-HOMEPAGE= http://www.nongnu.org/dvdrtools/
-COMMENT= This program allows you to create DVD's on a DVD-Recorder
-
-VERSION= 0.1.3
-
-USE_BUILDLINK2= # defined
-GNU_CONFIGURE= # defined
-
-do-install:
- cd ${WRKSRC}/cdrecord; \
- ${INSTALL_PROGRAM} dvdrecord ${PREFIX}/bin; \
- ${INSTALL_MAN} dvdrecord.1 ${PREFIX}/man/man1
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/dvdrecord/PLIST b/sysutils/dvdrecord/PLIST
deleted file mode 100644
index 467bf54e3fe..00000000000
--- a/sysutils/dvdrecord/PLIST
+++ /dev/null
@@ -1,3 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2003/01/17 13:53:11 toshii Exp $
-bin/dvdrecord
-man/man1/dvdrecord.1
diff --git a/sysutils/dvdrecord/distinfo b/sysutils/dvdrecord/distinfo
deleted file mode 100644
index c2f081d50f1..00000000000
--- a/sysutils/dvdrecord/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.2 2003/01/31 11:02:29 abs Exp $
-
-SHA1 (dvdrtools-0.1.3.tar.bz2) = ec654042b669b06324e0dc46919426ea6588d613
-Size (dvdrtools-0.1.3.tar.bz2) = 1165042 bytes
-SHA1 (patch-aa) = 6463dd7852df43089724976c75a24ea41d9a66bc
-SHA1 (patch-ab) = 3ba572ffbe59a068e01e73af1035711c4a373578
diff --git a/sysutils/dvdrecord/patches/patch-aa b/sysutils/dvdrecord/patches/patch-aa
deleted file mode 100644
index 9c61a7a5ff9..00000000000
--- a/sysutils/dvdrecord/patches/patch-aa
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2003/01/31 11:02:29 abs Exp $
-
---- Makefile.in.orig Wed Jan 1 14:32:41 2003
-+++ Makefile.in
-@@ -133,8 +133,7 @@ target_os = @target_os@
- target_vendor = @target_vendor@
- SRCDIR = $(shell pwd)
-
--SUBDIRS = libdeflt librscg libscg libschily cdrecord cdda2wav \
-- libhfs_iso libfile libunls mkisofs readcd video
-+SUBDIRS = libdeflt librscg libscg libschily cdrecord
-
- subdir = .
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
diff --git a/sysutils/dvdrecord/patches/patch-ab b/sysutils/dvdrecord/patches/patch-ab
deleted file mode 100644
index 4691cf0b7e7..00000000000
--- a/sysutils/dvdrecord/patches/patch-ab
+++ /dev/null
@@ -1,107 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2003/01/31 11:02:29 abs Exp $
-
---- libscg/scsi-bsd.c.orig Tue Jan 29 17:23:22 2002
-+++ libscg/scsi-bsd.c
-@@ -48,7 +48,7 @@ static char __sccsid[] =
- * Choose your name instead of "schily" and make clear that the version
- * string is related to a modified source.
- */
--LOCAL char _scg_trans_version[] = "scsi-bsd.c-1.40"; /* The version for this transport*/
-+LOCAL char _scg_trans_version[] = "scsi-bsd.c-1.40nb1"; /* The version for this transport*/
-
- #define MAX_SCG 16 /* Max # of SCSI controllers */
- #define MAX_TGT 16
-@@ -108,7 +108,7 @@ scgo_version(scgp, what)
- * return "schily" for the SCG_AUTHOR request.
- */
- case SCG_AUTHOR:
-- return (_scg_auth_schily);
-+ return ("frueauf");
- case SCG_SCCS_ID:
- return (__sccsid);
- }
-@@ -130,6 +130,15 @@ scgo_open(scgp, device)
- register int l;
- register int nopen = 0;
- char devname[64];
-+#if defined(__NetBSD__)
-+ struct scsi_addr mysaddr;
-+#if defined(__i386__)
-+ char slicename[] = "d"; /* i386 is special */
-+#else
-+ char slicename[] = "c"; /* this is what the rest uses */
-+#endif
-+ char *myslicename = slicename;
-+#endif
-
- if (busno >= MAX_SCG || tgt >= MAX_TGT || tlun >= MAX_LUN) {
- errno = EINVAL;
-@@ -156,6 +165,60 @@ scgo_open(scgp, device)
- if ((device != NULL && *device != '\0') || (busno == -2 && tgt == -2))
- goto openbydev;
-
-+
-+/*
-+ * I know of no method in NetBSD to probe the scsibus and get the mapping
-+ * busnumber,target,lun --> devicename.
-+ *
-+ * Because of this implement a true bruteforce hack to find
-+ * out what cdroms there are.
-+ *
-+ * Note that this method only finds cd0-cd7. Anything higher
-+ * than this needs additional tweaks.
-+ *
-+ * Feel free to implement this cleanly if you have better knowledge.
-+ * Until then this helps to get -scanbus und thus xcdroast working :-)
-+ *
-+ */
-+#if defined(__NetBSD__)
-+ if (busno >= 0 && tgt >= 0 && tlun >= 0) {
-+ for (l=0; l < MAX_LUN ; l++) {
-+ sprintf(devname, "/dev/rcd%d%s", l, myslicename);
-+ f = open(devname, O_RDWR);
-+ if (f >= 0) {
-+ if (ioctl(f, SCIOCIDENTIFY, &mysaddr) < 0) {
-+ close(f);
-+ errno = EINVAL;
-+ return (0);
-+ }
-+ if (busno == SADDR_BUS(mysaddr) && tgt == SADDR_TARGET(mysaddr) && tlun == SADDR_LUN(mysaddr)) {
-+ scglocal(scgp)->scgfiles[busno][tgt][tlun] = f;
-+ return(1);
-+ }
-+ } else goto openbydev;
-+ }
-+ } else for (l=0; l < MAX_LUN ; l++) {
-+ sprintf(devname, "/dev/rcd%d%s", l, myslicename);
-+ f = open(devname, O_RDWR);
-+ if (f >= 0) {
-+ if (ioctl(f, SCIOCIDENTIFY, &mysaddr) < 0) {
-+ close(f);
-+ errno = EINVAL;
-+ return (0);
-+ }
-+ scg_scsibus(scgp) = busno = SADDR_BUS(mysaddr);
-+ scg_target(scgp) = tgt = SADDR_TARGET(mysaddr);
-+ if ((tlun >= 0) && (tlun != SADDR_LUN(mysaddr))) {
-+ close(f);
-+ errno = EINVAL;
-+ return (0);
-+ }
-+ scg_lun(scgp) = tlun = SADDR_LUN(mysaddr);
-+ if (scg_setup(scgp, f, busno, tgt, tlun))
-+ nopen++;
-+ }
-+ }
-+#else /* not __NetBSD__ */
- if (busno >= 0 && tgt >= 0 && tlun >= 0) {
-
- js_snprintf(devname, sizeof(devname),
-@@ -192,6 +255,7 @@ scgo_open(scgp, device)
- }
- }
- }
-+#endif /* end of not __NetBSD__ */
- /*
- * Could not open /dev/su-* or got dev=devname:b,l,l / dev=devname:@,l
- * We do the apropriate tests and try our best.
diff --git a/sysutils/dvdrip/DESCR b/sysutils/dvdrip/DESCR
deleted file mode 100644
index 746b861de87..00000000000
--- a/sysutils/dvdrip/DESCR
+++ /dev/null
@@ -1,7 +0,0 @@
-dvd::rip is a full featured DVD copy program written in Perl. It
-provides an easy to use but feature-rich Gtk+ GUI to control almost
-all aspects of the ripping and transcoding process. It uses the widely
-known video processing swissknife transcode and many other Open Source
-tools. dvd::rip itself is licensed under GPL / Perl Artistic License.
-
- "And note: it's spelled dvd::rip, and nothing else."
diff --git a/sysutils/dvdrip/Makefile b/sysutils/dvdrip/Makefile
deleted file mode 100644
index 52ca70f9c5c..00000000000
--- a/sysutils/dvdrip/Makefile
+++ /dev/null
@@ -1,37 +0,0 @@
-# $NetBSD: Makefile,v 1.2 2003/07/13 13:53:14 wiz Exp $
-#
-
-VERS= 0.50.13
-DISTNAME= Video-DVDRip-${VERS}
-PKGNAME= dvdrip-${VERS}
-PKGREVISION= 1
-CATEGORIES= x11 sysutils
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=Video/}
-
-MAINTAINER= tech-pkg@netbsd.org
-HOMEPAGE= http://www.exit1.org/dvdrip/
-COMMENT= Graphical frontend for DVD ripping
-
-DEPENDS+= cdrdao>=1.1.7:../../sysutils/cdrdao
-DEPENDS+= transcode>=0.6.2:../../graphics/transcode
-DEPENDS+= mplayer>=0.90:../../graphics/mplayer
-DEPENDS+= ogmtools-[0-9]*:../../graphics/ogmtools
-DEPENDS+= vcdimager>=0.7.12:../../sysutils/vcdimager-devel
-DEPENDS+= cdrecord>=1.10:../../sysutils/cdrecord
-DEPENDS+= subtitleripper-[0-9]*:../../textproc/subtitleripper
-.if (${MACHINE_ARCH} == "i386")
-DEPENDS+= rar>=2.02:../../archivers/rar
-.endif
-
-BUILDLINK_DEPENDS.perl= perl>=5.6.0
-
-USE_BUILDLINK2= YES
-USE_PKGLOCALEDIR= YES
-
-# XXX xine support
-# XXX fping support
-.include "../../devel/gettext-lib/buildlink2.mk"
-.include "../../graphics/ImageMagick/buildlink2.mk"
-.include "../../graphics/mjpegtools/buildlink2.mk"
-.include "../../lang/perl5/module.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/dvdrip/PLIST b/sysutils/dvdrip/PLIST
deleted file mode 100644
index efb2d328169..00000000000
--- a/sysutils/dvdrip/PLIST
+++ /dev/null
@@ -1 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2003/06/23 07:36:14 mrg Exp $
diff --git a/sysutils/dvdrip/distinfo b/sysutils/dvdrip/distinfo
deleted file mode 100644
index 9f1e44d9a59..00000000000
--- a/sysutils/dvdrip/distinfo
+++ /dev/null
@@ -1,4 +0,0 @@
-$NetBSD: distinfo,v 1.1.1.1 2003/06/23 07:36:14 mrg Exp $
-
-SHA1 (Video-DVDRip-0.50.13.tar.gz) = 17c13105ae69bf0bd1b5a81af4f8ed518bffb493
-Size (Video-DVDRip-0.50.13.tar.gz) = 225065 bytes
diff --git a/sysutils/e2fsprogs/DESCR b/sysutils/e2fsprogs/DESCR
deleted file mode 100644
index f76c3096763..00000000000
--- a/sysutils/e2fsprogs/DESCR
+++ /dev/null
@@ -1,2 +0,0 @@
-The filesystem utilities for the EXT2 filesystem, including e2fsck, mke2fs,
-dumpe2fs, fsck, and others.
diff --git a/sysutils/e2fsprogs/Makefile b/sysutils/e2fsprogs/Makefile
deleted file mode 100644
index 25a95ceea71..00000000000
--- a/sysutils/e2fsprogs/Makefile
+++ /dev/null
@@ -1,23 +0,0 @@
-# $NetBSD: Makefile,v 1.5 2003/04/14 23:15:54 hubertf Exp $
-#
-
-DISTNAME= e2fsprogs-1.32
-CATEGORIES= sysutils
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=e2fsprogs/} \
- ftp://ftp.dei.uc.pt/.d4/linuxberg/files/console/system/ \
- ftp://tsx-11.mit.edu/pub/linux/packages/ext2fs/ \
- ftp://ftp.gwdg.de/pub/linux/mirrors/tsx-11/packages/ext2fs/
-
-MAINTAINER= hubert.feyrer@rz.uni-regensburg.de
-HOMEPAGE= http://web.mit.edu/tytso/www/linux/e2fsprogs.html
-COMMENT= Second extended file system (ext2fs) management programs
-
-GNU_CONFIGURE= yes
-
-.include "../../mk/bsd.prefs.mk"
-
-.if ${OPSYS} != "Linux"
-CONFIGURE_ARGS+=--disable-fsck
-.endif
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/e2fsprogs/PLIST.Linux b/sysutils/e2fsprogs/PLIST.Linux
deleted file mode 100644
index 1208db58540..00000000000
--- a/sysutils/e2fsprogs/PLIST.Linux
+++ /dev/null
@@ -1,3 +0,0 @@
-@comment $NetBSD: PLIST.Linux,v 1.2 2003/02/16 19:21:16 jschauma Exp $
-sbin/fsck
-man/man8/fsck.8
diff --git a/sysutils/e2fsprogs/PLIST.common b/sysutils/e2fsprogs/PLIST.common
deleted file mode 100644
index c174a4b285d..00000000000
--- a/sysutils/e2fsprogs/PLIST.common
+++ /dev/null
@@ -1,38 +0,0 @@
-@comment $NetBSD: PLIST.common,v 1.2 2003/04/14 23:15:54 hubertf Exp $
-bin/chattr
-bin/lsattr
-bin/uuidgen
-info/libext2fs.info.gz
-man/man1/chattr.1
-man/man1/lsattr.1
-man/man1/uuidgen.1
-man/man8/badblocks.8
-man/man8/debugfs.8
-man/man8/dumpe2fs.8
-man/man8/e2fsck.8
-man/man8/e2image.8
-man/man8/e2label.8
-man/man8/findfs.8
-man/man8/fsck.ext2.8
-man/man8/fsck.ext3.8
-man/man8/mke2fs.8
-man/man8/mkfs.ext2.8
-man/man8/mkfs.ext3.8
-man/man8/mklost+found.8
-man/man8/resize2fs.8
-man/man8/tune2fs.8
-sbin/badblocks
-sbin/debugfs
-sbin/dumpe2fs
-sbin/e2fsck
-sbin/e2image
-sbin/e2label
-sbin/findfs
-sbin/fsck.ext2
-sbin/fsck.ext3
-sbin/mke2fs
-sbin/mkfs.ext2
-sbin/mkfs.ext3
-sbin/mklost+found
-sbin/resize2fs
-sbin/tune2fs
diff --git a/sysutils/e2fsprogs/distinfo b/sysutils/e2fsprogs/distinfo
deleted file mode 100644
index f9b4c852113..00000000000
--- a/sysutils/e2fsprogs/distinfo
+++ /dev/null
@@ -1,7 +0,0 @@
-$NetBSD: distinfo,v 1.3 2003/04/14 23:15:54 hubertf Exp $
-
-SHA1 (e2fsprogs-1.32.tar.gz) = 409bbdbc48b5f8ec5006e283962d8432d971d51f
-Size (e2fsprogs-1.32.tar.gz) = 2894603 bytes
-SHA1 (patch-aa) = 61561b5c12345aceee3d8b46249b805a3f97822b
-SHA1 (patch-ab) = 932d19e15eed6589e124de60c35712b32e86eb83
-SHA1 (patch-ac) = 171e7e887f62831ebf8c48c6aa84cd3804f02067
diff --git a/sysutils/e2fsprogs/patches/patch-aa b/sysutils/e2fsprogs/patches/patch-aa
deleted file mode 100644
index 2dc5b4dc3a1..00000000000
--- a/sysutils/e2fsprogs/patches/patch-aa
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2003/04/14 23:15:54 hubertf Exp $
-
---- lib/ext2fs/flushb.c.orig Thu Oct 31 12:17:24 2002
-+++ lib/ext2fs/flushb.c
-@@ -11,6 +11,7 @@
- */
-
- #include <stdio.h>
-+#include <sys/param.h>
- #if HAVE_ERRNO_H
- #include <errno.h>
- #endif
diff --git a/sysutils/e2fsprogs/patches/patch-ab b/sysutils/e2fsprogs/patches/patch-ab
deleted file mode 100644
index 63985361780..00000000000
--- a/sysutils/e2fsprogs/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2003/04/14 23:15:54 hubertf Exp $
-
---- e2fsck/journal.c.orig Thu Apr 10 13:59:22 2003
-+++ e2fsck/journal.c
-@@ -13,6 +13,8 @@
- */
-
- #ifdef HAVE_SYS_MOUNT_H
-+#include <sys/types.h>
-+#include <sys/param.h>
- #include <sys/mount.h>
- #define MNT_FL (MS_MGC_VAL | MS_RDONLY)
- #endif
diff --git a/sysutils/e2fsprogs/patches/patch-ac b/sysutils/e2fsprogs/patches/patch-ac
deleted file mode 100644
index 326ca7233a2..00000000000
--- a/sysutils/e2fsprogs/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2003/04/14 23:15:55 hubertf Exp $
-
---- e2fsck/pass1.c.orig Fri Nov 8 17:37:28 2002
-+++ e2fsck/pass1.c
-@@ -162,7 +162,7 @@
- * Incredibly, libc5 doesn't appear to have strnlen. So we have to
- * provide our own.
- */
--static int strnlen(const char * s, int count)
-+int strnlen(const char * s, int count)
- {
- const char *cp = s;
-
diff --git a/sysutils/easydiskpasswd/DESCR b/sysutils/easydiskpasswd/DESCR
deleted file mode 100644
index 1c33aa004bf..00000000000
--- a/sysutils/easydiskpasswd/DESCR
+++ /dev/null
@@ -1,5 +0,0 @@
-This is a tool to unlock a password protected USB "EasyDisk".
-Formatting for password use and password setting still has to be done by
-the Windows utilities.
-This tool should be applied before mounting.
-Use at own risk!
diff --git a/sysutils/easydiskpasswd/Makefile b/sysutils/easydiskpasswd/Makefile
deleted file mode 100644
index 59775983194..00000000000
--- a/sysutils/easydiskpasswd/Makefile
+++ /dev/null
@@ -1,19 +0,0 @@
-# $NetBSD: Makefile,v 1.2 2003/03/29 12:42:27 jmmv Exp $
-
-DISTNAME= easydiskpasswd-1.0
-WRKSRC= ${WRKDIR}
-CATEGORIES= sysutils
-DISTFILES= # empty
-
-MAINTAINER= drochner@netbsd.org
-COMMENT= tool to unlock a password protected USB "EasyDisk"
-
-NO_CHECKSUM= yes
-
-# we depend on SCIOCCOMMAND and the "make" infrastructure
-ONLY_FOR_PLATFORM= NetBSD-*
-
-do-extract:
- ${CP} ${FILESDIR}/easydiskpasswd.c ${FILESDIR}/Makefile ${WRKSRC}
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/easydiskpasswd/PLIST b/sysutils/easydiskpasswd/PLIST
deleted file mode 100644
index c34ef64a934..00000000000
--- a/sysutils/easydiskpasswd/PLIST
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2002/09/19 20:56:57 drochner Exp $
-bin/easydiskpasswd
diff --git a/sysutils/easydiskpasswd/files/Makefile b/sysutils/easydiskpasswd/files/Makefile
deleted file mode 100644
index 940b271a3b3..00000000000
--- a/sysutils/easydiskpasswd/files/Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
-# $NetBSD: Makefile,v 1.1.1.1 2002/09/19 20:56:57 drochner Exp $
-
-PROG= easydiskpasswd
-NOMAN= sorry
-
-BINDIR= ${PREFIX}/bin
-LDADD= -lutil
-WARNS= 2
-
-.include <bsd.prog.mk>
diff --git a/sysutils/easydiskpasswd/files/easydiskpasswd.c b/sysutils/easydiskpasswd/files/easydiskpasswd.c
deleted file mode 100644
index 2de296bf3f0..00000000000
--- a/sysutils/easydiskpasswd/files/easydiskpasswd.c
+++ /dev/null
@@ -1,176 +0,0 @@
-/* $NetBSD: easydiskpasswd.c,v 1.1.1.1 2002/09/19 20:56:57 drochner Exp $ */
-/*
- * Copyright (c) 2002
- * Matthias Drochner. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
-
-/*
- * a tool to unlock a password protected USB "EasyDisk" (3SYSTEM) flash disk
- */
-
-#include <sys/types.h>
-#include <sys/param.h>
-#include <sys/scsiio.h>
-#include <dev/scsipi/scsipi_all.h>
-#include <util.h>
-#include <string.h>
-#include <fcntl.h>
-#include <stdio.h>
-#include <err.h>
-#include <pwd.h>
-#include <unistd.h>
-#include <stdlib.h>
-#include <errno.h>
-
-static int getstatus(int, int *);
-static void usage(void);
-int main(int, char **);
-
-/* SCSI command 0xff is in the "vendor defined" range */
-static const u_char cmd_getstatus[12] = {0xff, 0x01};
-static const u_char cmd_putpasswd[12] = {0xff, 0x05, 0x01};
-
-static char passwdbuf[20] = " ";
-static const char *defpasswd = "1111";
-
-/*
- * status:
- * 1: OK, no password
- * 5, 7: password unlocked
- * 21: password, locked
- */
-static int
-getstatus(fd, statp)
- int fd;
- int *statp;
-{
- int res;
- struct scsireq cmd;
- char status[1];
-
- bzero(&cmd, sizeof(cmd));
- cmd.flags = SCCMD_READ;
- cmd.timeout = 10000;
- bcopy(cmd_getstatus, &cmd.cmd, 12);
- cmd.cmdlen = 12;
- cmd.databuf = status;
- cmd.datalen = 1;
- cmd.senselen = SENSEBUFLEN;
-
- res = ioctl(fd, SCIOCCOMMAND, &cmd);
- if (res < 0)
- err(2, "SCIOCCOMMAND");
- if (cmd.retsts == SCCMD_SENSE)
- return (EINVAL);
- else if (cmd.retsts != SCCMD_OK)
- return (EIO);
-
- *statp = (unsigned char)status[0];
- return (0);
-}
-
-static void
-usage()
-{
- fprintf(stderr, "%s [ -d | -p <passwd> ] disk\n", getprogname());
- exit(1);
-}
-
-int
-main(argc, argv)
- int argc;
- char **argv;
-{
- int ch, fd, res, status;
- char pathbuf[MAXPATHLEN];
- const char *passwd = 0;
- struct scsireq cmd;
- struct scsipi_sense_data *sd;
-
- while ((ch = getopt(argc, argv, "dp:")) != -1)
- switch (ch) {
- case 'd':
- passwd = defpasswd;
- break;
- case 'p':
- passwd = optarg;
- break;
- case '?':
- default:
- usage();
- }
- argc -= optind;
- argv += optind;
-
- if (argc != 1)
- usage();
-
- fd = opendisk(argv[0], O_RDWR, pathbuf, MAXPATHLEN, 0);
- if (fd < 0)
- err(2, "opendisk %s", argv[0]);
-
- res = getstatus(fd, &status);
- if (res)
- errx(2, "wrong device");
- if (status != 21) {
- warnx("no password set, or unlocked");
- exit (0);
- }
-
- if (!passwd)
- passwd = getpass("flash disk password: ");
-
- bcopy(passwd, passwdbuf, MIN(strlen(passwd), 20));
-
- bzero(&cmd, sizeof(cmd));
- cmd.flags = SCCMD_WRITE;
- cmd.timeout = 10000;
- bcopy(cmd_putpasswd, &cmd.cmd, 12);
- cmd.cmdlen = 12;
- cmd.databuf = passwdbuf;
- cmd.datalen = 20;
- cmd.datalen_used = 20;
- cmd.senselen = SENSEBUFLEN;
-
- res = ioctl(fd, SCIOCCOMMAND, &cmd);
- if (res < 0)
- err(2, "SCIOCCOMMAND");
-
- if (cmd.retsts == SCCMD_SENSE) {
- sd = (struct scsipi_sense_data *)&cmd.sense;
- if ((sd->flags & SSD_KEY) == SKEY_ILLEGAL_REQUEST) {
- if (sd->add_sense_code == 0x24)
- errx(3, "wrong password");
- if (sd->add_sense_code == 0x20) {
- /* XXX shouldn't get here (caught above) */
- warnx("no password set");
- exit (0);
- }
- }
- errx(2, "SCSI command error");
- } else if (cmd.retsts != SCCMD_OK)
- errx(2, "scsi driver error %d", cmd.retsts);
-
- return (0);
-}
diff --git a/sysutils/etcupdate/DESCR b/sysutils/etcupdate/DESCR
deleted file mode 100644
index 8f2a7473cbd..00000000000
--- a/sysutils/etcupdate/DESCR
+++ /dev/null
@@ -1,9 +0,0 @@
-etcupdate helps you to update the configuration files in /etc after
-performing an operating system upgrade.
-
-The idea for this script (including code fragments, variable names etc.)
-came from the FreeBSD mergemaster (by Douglas Barton). Unlike the FreeBSD
-mergemaster, this does not use CVS version tags to compare if the files
-need to be updated. Files are compared with /usr/bin/cmp as this is more
-reliable and the only way if the version numbers are same even though the
-files are different.
diff --git a/sysutils/etcupdate/Makefile b/sysutils/etcupdate/Makefile
deleted file mode 100644
index a5957500c3b..00000000000
--- a/sysutils/etcupdate/Makefile
+++ /dev/null
@@ -1,22 +0,0 @@
-# $NetBSD: Makefile,v 1.24 2003/05/09 08:03:08 martti Exp $
-
-DISTNAME= etcupdate-20030509
-WRKSRC= ${WRKDIR}
-CATEGORIES= sysutils
-MASTER_SITES= # empty
-DISTFILES= # empty
-
-MAINTAINER= martti@netbsd.org
-HOMEPAGE= http://www.netbsd.org/Documentation/current/
-COMMENT= Script to update the configuration and startup files in /etc
-
-EXTRACT_ONLY= # defined
-NO_CHECKSUM= # defined
-NO_CONFIGURE= # defined
-NO_BUILD= # defined
-
-do-install:
- ${INSTALL_SCRIPT} ${FILESDIR}/etcupdate ${PREFIX}/bin/etcupdate
- ${INSTALL_MAN} ${FILESDIR}/etcupdate.8 ${PREFIX}/man/man8
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/etcupdate/PLIST b/sysutils/etcupdate/PLIST
deleted file mode 100644
index b2cbb95e97f..00000000000
--- a/sysutils/etcupdate/PLIST
+++ /dev/null
@@ -1,3 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2001/11/20 09:53:54 martti Exp $
-bin/etcupdate
-man/man8/etcupdate.8
diff --git a/sysutils/etcupdate/files/etcupdate b/sysutils/etcupdate/files/etcupdate
deleted file mode 100755
index f1c829ead88..00000000000
--- a/sysutils/etcupdate/files/etcupdate
+++ /dev/null
@@ -1,534 +0,0 @@
-#!/bin/sh
-#
-# $NetBSD: etcupdate,v 1.22 2003/05/09 08:03:10 martti Exp $
-#
-# Copyright (c) 2001 The NetBSD Foundation, Inc.
-# All rights reserved.
-#
-# This code is derived from software contributed to The NetBSD Foundation
-# by Martti Kuparinen.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-# 1. Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-# notice, this list of conditions and the following disclaimer in the
-# documentation and/or other materials provided with the distribution.
-# 3. All advertising materials mentioning features or use of this software
-# must display the following acknowledgement:
-# This product includes software developed by the NetBSD
-# Foundation, Inc. and its contributors.
-# 4. Neither the name of The NetBSD Foundation nor the names of its
-# contributors may be used to endorse or promote products derived
-# from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
-# ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-# TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
-# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
-#
-#
-# This script helps you to update the configuration files in /etc
-# after an operating system upgrade. Instead of running "make distribution"
-# in /usr/src/etc (and losing your current configuration) you can easily
-# see the modifications and either install the new version or merge the
-# changes in to your current configuration files.
-#
-# This script was written by Martti Kuparinen <martti@netbsd.org> and
-# improved by several other NetBSD users.
-#
-# The idea for this script (including code fragments, variable names etc.)
-# came from the FreeBSD mergemaster (by Douglas Barton).
-#
-PATH="/sbin:/usr/sbin:/bin:/usr/bin:${PATH}"
-
-# Default settings
-TEMPROOT="${TEMPROOT:=/tmp/temproot}"
-SRCDIR="${SRCDIR:=/usr/src/etc}"
-PAGER="${PAGER:=/usr/bin/more}"
-SWIDTH=`stty -a | awk '/columns/{w=$6}END{if(w==0){w=80}print w}'`
-WIDTH="${WIDTH:=${SWIDTH}}"
-VERBOSE=
-CONTINUE=
-BINARY=
-AUTOMATIC=
-LOCALSKIP=
-
-# Settings for post-installation procedures
-NEED_MTREE=
-NEED_MAKEDEV=
-NEED_NEWALIASES=
-NEED_PWD_MKDB=
-
-usage() {
- cat << EOF
-
-Usage: `basename $0` [options]
-
-Options:
-
- -b srcdir Location of the extracted sets
- -p pager Which pager to use (default: /usr/bin/more)
- -s srcdir Location of the source files (default: /usr/src/etc)
- -t temproot Where to store temporary files (default: /tmp/temproot)
- -w width Screen width (default: 80)
-
- -a Automatically update unmodified files
- -l Automatically skip files with strictly local changes
- (this option has no effect on files lacking RCS Ids)
- -h This help text
- -v Be more verbose
-
-EOF
- exit 1
-}
-
-verbose() {
- # $* = message to display if in verbose mode
-
- [ ! -z "${VERBOSE}" ] && echo ${*}
-}
-
-yesno() {
- # $* = message to display
-
- echo -n "${*}? (y/[n]) "
- read ANSWER
- case "${ANSWER}" in
- y|Y)
- return 0
- ;;
- *)
- return 1
- ;;
- esac
-}
-
-install_dir() {
- # $1 = target directory
-
- if yesno "Create ${1}"; then
- verbose "Creating ${1}"
- mkdir -p "${1}" || exit 1
- NEED_MTREE=YES
- fi
-}
-
-install_file() {
- # $1 = target file
-
- # Install the new file
- verbose "Installing ${1}"
- cp -p "${TEMPROOT}${1}" "${1}" && rm -f "${TEMPROOT}${1}"
-
- # Check if this was a special file
- case "${1}" in
- /dev/MAKEDEV)
- NEED_MAKEDEV=YES
- ;;
- /dev/MAKEDEV.local)
- NEED_MAKEDEV=YES
- ;;
- /etc/mail/aliases)
- NEED_NEWALIASES=YES
- ;;
- /etc/master.passwd)
- NEED_PWD_MKDB=YES
- ;;
- esac
-}
-
-install_checksum() {
- # $1 = target file
-
- [ "${AUTOMATIC}" != "YES" ] && return
-
- D=`dirname "${1}"`
- mkdir -p "/var/etcupdate/${D}"
- md5 "${1}" > "/var/etcupdate/${1}"
-}
-
-diff_and_merge_file() {
- # $1 = target file
-
- if cmp -s "${TEMPROOT}${1}" "${1}"; then
- verbose "===> ${1} (ok)"
- rm -f "${TEMPROOT}${1}"
- install_checksum "${1}"
- return
- fi
-
- if [ "${AUTOMATIC}" = "YES" -a -f "/var/etcupdate/${1}" ] ; then
- SUM1=`md5 "${1}"`
- SUM2=`cat "/var/etcupdate/${1}"`
- if [ "${SUM1}" = "${SUM2}" ] ; then
- install_file "${1}"
- install_checksum "${1}"
- return
- fi
- fi
-
- if [ "${LOCALSKIP}" = "YES" ] ; then
- ID1=`ident -q "${TEMPROOT}${1}" | sed -n 2p`
- ID1="${ID1:-0}"
- ID2=`ident -q "${1}" | sed -n 2p`
- ID2="${ID2:-1}"
- if [ "${ID1}" = "${ID2}" ] ; then
- verbose "===> ${1} (ok:RCS)"
- rm -f "${TEMPROOT}${1}"
- return
- fi
- fi
-
- clear
- if [ ! -f "${1}" ]; then
- verbose "===> ${1} (missing)"
- DOES_EXIST=
- else
- verbose "===> ${1} (modified)"
- verbose ""
- DOES_EXIST=YES
- diff -u "${1}" "${TEMPROOT}${1}" | ${PAGER}
- fi
-
- STAY_HERE=YES
- ALREADY_MERGED=
-
- # Determine name for the backup file (/foo/._etcupdate.bar)
- D=`dirname "${TEMPROOT}${1}"`
- F=`basename "${TEMPROOT}${1}"`
- B="${D}/.etcupdate.${F}"
- F="${D}/${F}"
-
- while [ "x${STAY_HERE}" = "xYES" ]; do
-
- # Ask the user if (s)he wants to install the new
- # version or perform a more complicated manual work.
- echo ""
- echo -n "File: ${1}"
- if [ ! -f "${1}" ]; then
- echo -n " (missing)"
- else
- echo -n " (modified)"
- fi
- echo ""
- echo ""
- echo "Please select one of the following operations:"
- echo ""
- if [ -z "${DOES_EXIST}" ]; then
- cat << EOF
- d Don't install the missing file
- i Install the missing file
- v Show the missing file
-
-EOF
- elif [ -z "${ALREADY_MERGED}" ]; then
- cat << EOF
- d Don't install the new file
- i Install the new file (overwrites your modifications!)
- m Merge the currently installed and new files
- s Show the differences between the currently installed and new files
- v Show the new file
-
-EOF
- else
- cat << EOF
- d Don't install the new file
- i Install the new file (overwrites your modifications!)
- m Merge again the currently installed and new files
- s Show the differences between the currently installed and new files
- u Undo merge and restore the temporary file from backup
- v Show the merged file
-
-EOF
- fi
- echo -n "What do you want to do? [Leave it for later] "
- read ANSWER
- case "${ANSWER}" in
-
- [dD])
- verbose "Removing ${TEMPROOT}${1}"
- rm -f "${TEMPROOT}${1}"
- STAY_HERE=NO
- ;;
- [iI])
- install_file "${1}"
- if [ -z "${ALREADY_MERGED}" ]; then
- install_checksum "${1}"
- fi
- STAY_HERE=NO
- ;;
- [mM])
- [ -z "${DOES_EXIST}" ] && continue
- [ ! -f "${B}" ] && cp "${F}" "${B}"
- cp "${TEMPROOT}${1}" "${TEMPROOT}${1}.merged"
- sdiff -o "${TEMPROOT}${1}.merged" \
- --width=${WIDTH} \
- --suppress-common-lines --text \
- "${1}" "${TEMPROOT}${1}"
- mv -f "${TEMPROOT}${1}.merged" "${TEMPROOT}${1}"
- ALREADY_MERGED=YES
- ;;
- [sS])
- [ -z "${DOES_EXIST}" ] && continue
- diff -u "${1}" "${TEMPROOT}${1}" | ${PAGER}
- ;;
- [uU])
- if [ -f "${B}" ]; then
- echo "*** Restoring ${F}"
- mv -f "${B}" "${F}"
- fi
- ALREADY_MERGED=
- ;;
- [vV])
- ${PAGER} "${TEMPROOT}${1}"
- ;;
- "")
- STAY_HERE=NO
- ;;
- *)
- echo "*** Invalid selection!"
- ;;
- esac
- done
- rm -f "._etcupdate_${TEMPROOT}${1}"
-}
-
-#
-# main()
-#
-
-# Read global configuration
-GLOBALRC="/etc/`basename $0`.conf"
-[ -r ${GLOBALRC} ] && . ${GLOBALRC}
-
-# Read user configuration
-USERRC="${HOME}/.`basename $0`rc"
-[ -r ${USERRC} ] && . ${USERRC}
-
-# Read command line arguments
-ARGV=`getopt ab:hlp:s:t:vw: $*`
-[ $? != 0 ] && usage
-set -- ${ARGV}
-for i; do
- case "${i}" in
- -a)
- AUTOMATIC=YES
- shift
- ;;
- -b)
- BINARY=YES
- SRCDIR="${2}"
- shift 2
- ;;
- -h)
- usage
- ;;
- -l)
- LOCALSKIP=YES
- shift
- ;;
- -p)
- PAGER="${2}"
- shift 2
- ;;
- -s)
- SRCDIR="${2}"
- shift 2
- ;;
- -t)
- TEMPROOT="${2}"
- shift 2
- ;;
- -v)
- VERBOSE=YES
- shift
- ;;
- -w)
- WIDTH="${2}"
- shift 2
- ;;
- --)
- shift
- break
- ;;
- esac
-done
-
-# Last minute sanity checks
-if [ `id -u` -ne 0 ]; then
- echo "*** ERROR: You MUST be root"
- exit 1
-fi
-if [ ! -z "${BINARY}" ]; then
- TEMPROOT="${SRCDIR}"
-fi
-if [ -z "${SRCDIR}" -o -z "${TEMPROOT}" ]; then
- echo "*** ERROR: One of the following variables is undefined"
- echo ""
- echo "SRCDIR=\"${SRCDIR}\""
- echo "TEMPROOT=\"${TEMPROOT}\""
- echo ""
- exit 1
-fi
-if [ -z "${BINARY}" -a -r "${TEMPROOT}" ]; then
- echo ""
- echo "*** WARNING: ${TEMPROOT} already exists"
- echo ""
- if yesno "Continue previously aborted update"; then
- CONTINUE=YES
- elif yesno "Remove the old ${TEMPROOT}"; then
- echo "*** Removing ${TEMPROOT}"
- rm -rf "${TEMPROOT}"
- fi
-fi
-
-if [ -z "${CONTINUE}" ]; then
- # Are we using the sources or binaries?
- if [ -z "${BINARY}" ]; then
- # Create the temporary root directory
- echo "*** Creating ${TEMPROOT}"
- mkdir -p "${TEMPROOT}"
- if [ ! -d "${TEMPROOT}" ]; then
- echo "*** ERROR: Unable to create ${TEMPROOT}"
- exit 1
- fi
-
- # Populate ${TEMPROOT} from ${SRCDIR}
- if [ ! -f "${SRCDIR}/Makefile" ]; then
- echo "*** ERROR: Unable to find ${SRCDIR}/Makefile"
- exit 1
- fi
- # Set the environment for make
- MAKE_ENV=" \
- DESTDIR=${TEMPROOT} \
- MAKE=make \
- MTREE=mtree \
- INSTALL_DONE=1 \
- USETOOLS=never"
- echo "*** Populating ${TEMPROOT} from ${SRCDIR}"
- cd ${SRCDIR}
- if [ -z "${VERBOSE}" ]; then
- eval ${MAKE_ENV} make distribution > /dev/null
- else
- eval ${MAKE_ENV} make distribution
- fi
- [ $? -ne 0 ] && exit 1
- elif [ ! -f "${TEMPROOT}/dev/MAKEDEV" ]; then
- echo ""
- echo "*** WARNING: ${TEMPROOT}/dev/MAKEDEV not found"
- echo "Make sure you update /dev/MAKEDEV later and run"
- echo "(cd /dev && ./MAKEDEV all) to rebuild the device nodes"
- echo ""
- fi
-
- # Ignore the following files during comparision
- rm -f "${TEMPROOT}"/etc/passwd
- rm -f "${TEMPROOT}"/etc/pwd.db
- rm -f "${TEMPROOT}"/etc/spwd.db
- find "${TEMPROOT}" -type f -size 0 -exec rm {} \;
-
- # Ignore files we're told to ignore
- if [ ! -z "${IGNOREFILES}" ]; then
- echo "*** Ignoring files: ${IGNOREFILES}"
- for file in ${IGNOREFILES}; do
- rm -f "${TEMPROOT}"${file}
- done
- fi
-
- # Are there any new directories?
- echo "*** Checking for new directories"
- for i in `find ${TEMPROOT} -type d`; do
- D=`echo ${i} | sed "s#${TEMPROOT}##"`
- [ "x${i}" = "x${TEMPROOT}" ] && continue
- [ ! -d "${D}" ] && install_dir "${D}"
- done
-fi
-
-# Start the comparision
-echo "*** Checking for added/modified files"
-for i in `find ${TEMPROOT} -type f -a ! -name \*.etcupdate.\*`; do
- D=`echo ${i} | sed "s#${TEMPROOT}##"`
- diff_and_merge_file "${D}"
-done
-
-# Do we have files which were not processed?
-REMAINING=`find "${TEMPROOT}" -type f -a ! -name \*.etcupdate.\*`
-if [ ! -z "${REMAINING}" ]; then
- echo ""
- echo "*** The following files need your attention:"
- echo ""
- for i in ${REMAINING}; do
- echo " ${i}"
- done
- echo ""
-fi
-if yesno "Remove ${TEMPROOT}"; then
- echo "*** Removing ${TEMPROOT}"
- rm -rf "${TEMPROOT}"
-else
- echo "*** Keeping ${TEMPROOT}"
-fi
-
-# Do some post-installation tasks
-if [ ! -z "${NEED_MTREE}" ]; then
- if yesno "You have created new directories. Run mtree to set" \
- "permissions"
- then
- (cd / && mtree -Udef /etc/mtree/NetBSD.dist)
- fi
-fi
-if [ ! -z "${NEED_MAKEDEV}" ]; then
- if yesno "Do you want to rebuild the device nodes in /dev"; then
- verbose "Running MAKEDEV in /dev"
- (cd "/dev" && ./MAKEDEV all)
- else
- echo ""
- echo "*** You SHOULD rebuild the device nodes in /dev"
- echo "*** This is done by running \"(cd /dev &&" \
- "./MAKEDEV all)\" as root".
- echo ""
- fi
-fi
-if [ ! -z "${NEED_NEWALIASES}" ]; then
- if yesno "Do you want to rebuild the mail alias database"; then
- verbose "Running newaliases"
- newaliases
- else
- echo ""
- echo "*** You MUST rebuild the mail alias database to make" \
- "the changes visible"
- echo "*** This is done by running \"newaliases\" as root"
- echo ""
- fi
-fi
-if [ ! -z "${NEED_PWD_MKDB}" ]; then
- if yesno "Do you want to rebuild the password databases from the" \
- "new master.passwd"
- then
- verbose "Running pwd_mkdb"
- pwd_mkdb -p "/etc/master.passwd"
- else
- echo ""
- echo "*** You MUST rebuild the password databases to make" \
- "the changes visible"
- echo "*** This is done by running \"pwd_mkdb -p" \
- "/etc/master.passwd\" as root"
- echo ""
- fi
-fi
-if [ -x /etc/postinstall -a -z "${BINARY}" ]; then
- S=`echo ${SRCDIR} | sed 's+/etc++'`
- echo "*** Running /etc/postinstall"
- /etc/postinstall -s "${S}" check
-fi
-echo "*** All done"
diff --git a/sysutils/etcupdate/files/etcupdate.8 b/sysutils/etcupdate/files/etcupdate.8
deleted file mode 100644
index 279711eca5f..00000000000
--- a/sysutils/etcupdate/files/etcupdate.8
+++ /dev/null
@@ -1,318 +0,0 @@
-.\" $NetBSD: etcupdate.8,v 1.9 2003/04/05 18:17:23 perry Exp $
-.\"
-.\" Copyright (c) 2001 The NetBSD Foundation, Inc.
-.\" All rights reserved.
-.\"
-.\" This code is derived from software contributed to The NetBSD Foundation
-.\" by Martti Kuparinen.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\" notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\" notice, this list of conditions and the following disclaimer in the
-.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the NetBSD
-.\" Foundation, Inc. and its contributors.
-.\" 4. Neither the name of The NetBSD Foundation nor the names of its
-.\" contributors may be used to endorse or promote products derived
-.\" from this software without specific prior written permission.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
-.\" ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-.\" TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-.\" PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
-.\" BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-.\" CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-.\" SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-.\" INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-.\" CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-.\" POSSIBILITY OF SUCH DAMAGE.
-.\"
-.Dd April 2, 2003
-.Dt ETCUPDATE 8
-.Os
-.Sh NAME
-.Nm etcupdate
-.Nd update the configuration and startup files in
-.Pa /etc
-.Sh SYNOPSIS
-.Nm
-.Op Fl a
-.Op Fl b Ar srcdir
-.Op Fl h
-.Op Fl l
-.Op Fl p Ar pager
-.Op Fl s Ar srcdir
-.Op Fl t Ar temproot
-.Op Fl v
-.Op Fl w Ar width
-.Sh DESCRIPTION
-.Nm
-is a tool that lets the administrator update the configuration and
-startup files in
-.Pa /etc
-(and some other directories like
-.Pa /dev ,
-.Pa /root
-and
-.Pa /var )
-without having to manually check and modify every file.
-The administrator should run this script after performing an operating
-system update (e.g. after running
-.Pa make build
-in
-.Pa /usr/src
-or after extracting new binary distribution files)
-to update to the latest configuration and startup files.
-.Pp
-.Nm
-compares the new configuration files against the currently installed files.
-The user is given the option of installing, merging or deleting each
-modified or missing file.
-.Nm
-also detects if the user installs certain special files and performs
-corresponding tasks like remaking device nodes or rebuilding a database
-from the
-.Xr aliases 5
-file.
-.Pp
-.Nm
-needs a clean set of new configuration files to compare the
-existing files against.
-These files, called the
-.Dq reference files
-in this manual, may be derived from either a source or binary
-distribution of
-.Nx .
-.Pp
-If the user is updating from sources (which is the default mode),
-.Nm
-will first create a copy of the reference files
-by running
-.Pa make distribution
-in
-.Pa /usr/src/etc ,
-installing the files to a so-called
-.Pa temproot .
-(See usage of the
-.Fl s Ar srcdir ,
-and
-.Fl t Ar temproot
-options later in this manual page.)
-.Pp
-Instead of using sources, the user can also extract one or more binary
-distribution sets in a special location and use those as the reference
-files (see usage of the
-.Fl b Ar srcdir
-option later in this manual page).
-.Pp
-The following options are available:
-.Bl -tag -width indent
-.It Fl a
-.Nm
-can automatically update files which have not been modified locally.
-The
-.Fl a
-flag instructs
-.Nm
-to store MD5 checksums in
-.Pa /var/etcupdate
-and use these checksums to determine if there have been any
-local modifications.
-.It Fl b
-Location of reference files extracted from a binary distribution of
-.Nx .
-Note that reference files in
-.Pa srcdir
-will be altered and removed by
-.Nm
-when using the
-.Fl b Ar srcdir
-option (as the
-.Pa srcdir
-directory is treated like
-.Pa temproot ) .
-.It Fl h
-Prints a help text.
-.It Fl l
-Automatically skip files with unchanged RCS IDs.
-This has the effect of leaving alone files that have been altered
-locally but which have not been changed in the
-reference files.
-Since this works using RCS IDs, files without RCS IDs will not be
-skipped even if only modified locally.
-This flag may be used together with the
-.Fl a
-flag described above.
-.It Fl p
-The pager to use when displaying files.
-By default this is
-.Xr more 1
-but it can be changed either with this option
-or by defining the
-.Ev PAGER
-variable.
-.It Fl s
-The location of the
-.Nx
-sources files used to create the reference files.
-By default this is
-.Pa /usr/src/etc
-but it can be changed either with this option
-or the
-.Ev SRCDIR
-variable.
-.It Fl t
-Specifies the location of the
-.Pa temproot
-directory.
-The temporary reference files created from
-.Pa /usr/src/etc
-will be stored there.
-By default this is
-.Pa /tmp/temproot
-but can be changed either with this option or the
-.Ev TEMPROOT
-environment variable.
-.It Fl v
-Makes
-.Nm
-verbose about its actions.
-.It Fl w
-Sets screen width used during interactive merge.
-By default this is the number of columns
-.Xr stty 1
-reports but it can be changed either with this
-option or by defining the
-.Ev WIDTH
-variable.
-This is useful for
-.Xr xterm 1
-users with wider shell windows.
-.El
-.Sh ENVIRONMENT
-.Bl -tag -width TEMPROOT
-.It Ev TEMPROOT
-Sets a default value for
-.Pa temproot .
-See
-.Fl t
-above.
-.It Ev SRCDIR
-The location of the
-.Nx
-sources files.
-See
-.Fl s
-above.
-.It Ev PAGER
-The pager to use when displaying files.
-See
-.Fl p
-above.
-.It Ev WIDTH
-The screen width used during interactive merge.
-See
-.Fl w
-above.
-.It Ev IGNOREFILES
-A list of files that
-.Nm
-should ignore.
-Files listed in this
-variable will never be considered for updating by
-.Nm .
-.El
-.Sh FILES
-The environment variables can also be defined in the following configuration
-files.
-The user's personal configuration file settings override the global
-settings.
-.Pp
-/etc/etcupdate.conf
-.Pp
-~/.etcupdaterc
-.Sh EXAMPLES
-You have just upgraded your
-.Nx
-host from 1.6 to 1.6.1 and now it's time
-to update the configuration files as well.
-To update the configuration files from the sources (if you have the
-.Pa /usr/src/etc
-directory):
-.Pp
-.Dl etcupdate
-.Pp
-The default location of the source files is
-.Pa /usr/src/etc
-but this may be overridden with the
-.Fl s Ar srcdir
-command line argument:
-.Pp
-.Dl etcupdate -s /some/where/src/etc
-.Pp
-To update the configuration files from binary distribution sets
-do something like this:
-.Pp
-.Dl mkdir /tmp/temproot
-.Dl cd /tmp/temproot
-.Dl tar xpzf /some/where/etc.tgz
-.Dl etcupdate -b /tmp/temproot
-.Pp
-You have modified only few files in the
-.Pa /etc
-directory so you would like install most of the updates without being asked.
-To automatically update the unmodified configuration files:
-.Pp
-.Dl etcupdate -a
-.Pp
-To get a better idea what's going on, use the
-.Fl v
-flag:
-.Pp
-.Dl etcupdate -v
-.Sh SEE ALSO
-.Xr cmp 1 ,
-.Xr more 1 ,
-.Xr rcs 1 ,
-.Xr sdiff 1 ,
-.Xr stty 1 ,
-.Xr aliases 5
-.Sh HISTORY
-The
-.Nm
-command appeared in
-.Nx 1.6 .
-.Sh AUTHORS
-The script was written by
-.An Martti Kuparinen
-.Aq martti@NetBSD.org
-and improved by several other
-.Nx
-users.
-.Pp
-The idea for this script (including code fragments, variable names etc.)
-came from the
-.Fx
-mergemaster (by Douglas Barton).
-Unlike the
-.Fx
-mergemaster, this does not use CVS version tags by default to compare if
-the files need to be updated.
-Files are compared with
-.Xr cmp 1
-as this is more reliable and the only way if the version numbers are the
-same even though the files are different.
-.\" when exactly are the version the same even though the file changes?
-.\" .Pp
-.\" .Sh BUGS
-.\" Because of the use of
-.\" .Xr cmp 1
-.\" to compare files, rather than CVS versions, files that are locally changed
-.\" from the distribution are always considered needing to be updated.
diff --git a/sysutils/extipl/DESCR b/sysutils/extipl/DESCR
deleted file mode 100644
index 59b9f7969c2..00000000000
--- a/sysutils/extipl/DESCR
+++ /dev/null
@@ -1,7 +0,0 @@
-ExtIPL is a boot selector compatible with IBM-IPL. ExtIPL has
-many extended features such as
-
- - boot an OS in a nonactive partition
- - boot an OS in an extended partition
- - boot an OS in the second or later hard disks
- - support LBA access
diff --git a/sysutils/extipl/Makefile b/sysutils/extipl/Makefile
deleted file mode 100644
index c00534d8c9b..00000000000
--- a/sysutils/extipl/Makefile
+++ /dev/null
@@ -1,17 +0,0 @@
-# $NetBSD: Makefile,v 1.5 2003/06/18 09:22:24 agc Exp $
-#
-
-DISTNAME= extipl-5.04
-WRKSRC= ${WRKDIR}/${PKGNAME_NOREV}/src
-CATEGORIES= sysutils
-MASTER_SITES= http://www.tsden.org/takamiti/extipl/archs/
-
-MAINTAINER= hiramatu@boreas.dti.ne.jp
-HOMEPAGE= http://www.tsden.org/takamiti/extipl/
-COMMENT= IPL compatible OS boot selector
-
-BUILD_DEPENDS+= nasm-[0-9]*:../../devel/nasm
-
-USE_GMAKE= #defined
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/extipl/PLIST b/sysutils/extipl/PLIST
deleted file mode 100644
index a267678ce6c..00000000000
--- a/sysutils/extipl/PLIST
+++ /dev/null
@@ -1,12 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 22:53:05 zuntum Exp $
-man/man8/extipl.8
-sbin/extipl
-share/doc/extipl/English/extipl.txt
-share/doc/extipl/English/techical.txt
-share/doc/extipl/English/scorpius.txt
-share/doc/extipl/Japanese/extipl.txt
-share/doc/extipl/Japanese/techical.txt
-share/doc/extipl/Japanese/scorpius.txt
-@dirrm share/doc/extipl/English
-@dirrm share/doc/extipl/Japanese
-@dirrm share/doc/extipl
diff --git a/sysutils/extipl/distinfo b/sysutils/extipl/distinfo
deleted file mode 100644
index 64af168733d..00000000000
--- a/sysutils/extipl/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.2 2002/07/10 13:05:32 agc Exp $
-
-SHA1 (extipl-5.04.tar.gz) = 41b42bc4ba0bfad86e6abdc2b02620c9934c2cd9
-Size (extipl-5.04.tar.gz) = 85382 bytes
-SHA1 (patch-aa) = 12240b347d1d5d6d363a070376b1c115a004f454
diff --git a/sysutils/extipl/patches/patch-aa b/sysutils/extipl/patches/patch-aa
deleted file mode 100644
index 291dbc06ba5..00000000000
--- a/sysutils/extipl/patches/patch-aa
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2001/10/11 09:56:57 agc Exp $
---- Makefile.orig Sun Sep 16 00:29:47 2001
-+++ Makefile Sun Sep 16 00:30:51 2001
-@@ -80,9 +80,9 @@
- install:
- @test -d $(BINDIR) || (set -x; mkdir -p -m 0755 $(BINDIR))
- install -c -s -o root -m 700 extipl $(BINDIR)
-- sed -e 's#!!DOCDIR!!#$(DOCDIR)#g' extipl.8.in | gzip > extipl.8.gz
-+ sed -e 's#!!DOCDIR!!#$(DOCDIR)#g' extipl.8.in > extipl.8
- @test -d $(MAN8) || (set -x; mkdir -p -m 0755 $(MAN8))
-- install -o root -m 644 extipl.8.gz $(MAN8)
-+ install -o root -m 644 extipl.8 $(MAN8)
- @test -d $(ENGDIR) || (set -x; mkdir -p -m 0755 $(ENGDIR))
- install -c -o root -m 644 ../doc/English/*.txt $(ENGDIR)
- @test -d $(JPNDIR) || (set -x; mkdir -p -m 0755 $(JPNDIR))
diff --git a/sysutils/fakeroot/DESCR b/sysutils/fakeroot/DESCR
deleted file mode 100644
index d8d9b3515fd..00000000000
--- a/sysutils/fakeroot/DESCR
+++ /dev/null
@@ -1,4 +0,0 @@
-Fakeroot creates a `faked root' environment.
-
-A typical use case is creating tar (or somesuch) packages that should have
-proper file ownerships and modes without needing root access to the machine.
diff --git a/sysutils/fakeroot/Makefile b/sysutils/fakeroot/Makefile
deleted file mode 100644
index 24600ff439d..00000000000
--- a/sysutils/fakeroot/Makefile
+++ /dev/null
@@ -1,17 +0,0 @@
-# $NetBSD: Makefile,v 1.4 2003/06/05 17:20:27 jmmv Exp $
-#
-
-DISTNAME= fakeroot_0.5.8
-PKGNAME= fakeroot-0.5.8
-WRKSRC= ${WRKDIR}/fakeroot-0.5.8
-CATEGORIES= sysutils
-MASTER_SITES= ${MASTER_SITE_DEBIAN:=pool/main/f/fakeroot/}
-
-MAINTAINER= lonewolf@netbsd.org
-COMMENT= Creates a fake root environment
-
-USE_LIBTOOL= YES
-LIBTOOL_OVERRIDE=${WRKSRC}/libtool
-GNU_CONFIGURE= YES
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/fakeroot/PLIST b/sysutils/fakeroot/PLIST
deleted file mode 100644
index 4bf79653fe9..00000000000
--- a/sysutils/fakeroot/PLIST
+++ /dev/null
@@ -1,17 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2002/12/20 11:23:54 lonewolf Exp $
-bin/faked
-bin/fakeroot
-lib/libfakeroot.a
-lib/libfakeroot.la
-lib/libfakeroot.so
-lib/libfakeroot.so.0
-lib/libfakeroot.so.0.1
-man/fr/man1/fakeroot.1
-man/man1/faked.1
-man/man1/fakeroot.1
-man/sv/man1/faked.1
-man/sv/man1/fakeroot.1
-@dirrm man/sv/man1
-@dirrm man/sv
-@dirrm man/fr/man1
-@dirrm man/fr
diff --git a/sysutils/fakeroot/distinfo b/sysutils/fakeroot/distinfo
deleted file mode 100644
index 9b6e464874c..00000000000
--- a/sysutils/fakeroot/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.2 2003/01/04 11:27:44 cjep Exp $
-
-SHA1 (fakeroot_0.5.8.tar.gz) = 84931109b1f734e0aeedd5ada2ef79d503de198b
-Size (fakeroot_0.5.8.tar.gz) = 420642 bytes
-SHA1 (patch-aa) = f0d712b2880c9d4309ba426b98e8600e8ca14ffb
-SHA1 (patch-ab) = cb921a4b9babe356e17cde41a07e92e46d6ebd0a
diff --git a/sysutils/fakeroot/patches/patch-aa b/sysutils/fakeroot/patches/patch-aa
deleted file mode 100644
index e96c6271ee1..00000000000
--- a/sysutils/fakeroot/patches/patch-aa
+++ /dev/null
@@ -1,48 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2002/12/20 11:23:54 lonewolf Exp $
-
---- scripts/fakeroot.orig Sun Nov 24 02:02:55 2002
-+++ scripts/fakeroot
-@@ -14,7 +14,7 @@ BINDIR=`dirname $0`
- PREFIX=`dirname ${BINDIR}`
-
- LIB=libfakeroot.so.0
--PATHS=${PREFIX}/lib/libfakeroot:${PREFIX}/lib64/libfakeroot
-+PATHS=${PREFIX}/lib:${PREFIX}/lib64
- FAKED=${BINDIR}/faked
-
- libfound=no
-@@ -63,8 +63,10 @@ then
- if test -r "$dir/$LIB"
- then
- libfound=yes
-+ uselib=$dir/$LIB
- fi
- done
-+ LIB=$uselib
- else
- if test -r "$LIB"
- then
-@@ -90,20 +92,16 @@ if test -z "$FAKEROOTKEY" || test -z "$P
- exit 1
- fi
-
--# Keep other library paths
--if test -n "$LD_LIBRARY_PATH"; then
-- PATHS="$PATHS:$LD_LIBRARY_PATH"
--fi
--# ...and preloaded libs
-+# Keep preloaded libs
- if test -n "$LD_PRELOAD"; then
- LIB="$LIB $LD_PRELOAD"
- fi
-
- if test -z "$*"; then
-- FAKEROOTKEY=$FAKEROOTKEY LD_LIBRARY_PATH="$PATHS" LD_PRELOAD="$LIB" ${SHELL:-/bin/sh}
-+ FAKEROOTKEY=$FAKEROOTKEY LD_PRELOAD="$LIB" ${SHELL:-/bin/sh}
- RESULT=$?
- else
-- FAKEROOTKEY=$FAKEROOTKEY LD_LIBRARY_PATH="$PATHS" LD_PRELOAD="$LIB" "$@"
-+ FAKEROOTKEY=$FAKEROOTKEY LD_PRELOAD="$LIB" "$@"
- RESULT=$?
- fi
-
diff --git a/sysutils/fakeroot/patches/patch-ab b/sysutils/fakeroot/patches/patch-ab
deleted file mode 100644
index 3a2425b5c3a..00000000000
--- a/sysutils/fakeroot/patches/patch-ab
+++ /dev/null
@@ -1,42 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2003/01/04 11:27:45 cjep Exp $
-
---- configure.orig Wed Dec 11 23:47:39 2002
-+++ configure
-@@ -10587,29 +10587,28 @@ fi
-
-
- case $target_cpu:$target_os in
-- (alpha*:linux*)
-- (ia64*:linux*)
-+ alpha*:linux*|ia64*:linux*)
- libcpath="/lib/libc.so.6.1"
- ;;
-- (*:linux*)
-+ *:linux*)
- libcpath="/lib/libc.so.6"
- ;;
-- (*:freebsd*)
-+ *:freebsd*)
- libcpath="/usr/lib/libc.so.4"
- ;;
-- (*:netbsd*)
-+ *:netbsd*)
- libcpath="/usr/lib/libc.so.12"
- ;;
-- (*:openbsd*)
-+ *:openbsd*)
- libcpath="/usr/lib/libc.so.25.2"
- ;;
-- (*:hpux*)
-+ *:hpux*)
- libcpath="/usr/lib/hpux32/libc.so.1"
- ;;
-- (*:osf*)
-+ *:osf*)
- libcpath="/shlib/libc.so"
- ;;
-- (*)
-+ *)
- { echo "$as_me:$LINENO: WARNING: don't know where libc is for $target_os on
- $target_cpu, setting to /lib/libc.so" >&5
- echo "$as_me: WARNING: don't know where libc is for $target_os on
diff --git a/sysutils/fam/DESCR b/sysutils/fam/DESCR
deleted file mode 100644
index 71542380423..00000000000
--- a/sysutils/fam/DESCR
+++ /dev/null
@@ -1,19 +0,0 @@
- FAM, the File Alteration Monitor, provides an API which applications
-can use to be notified when specific files or directories are changed.
-
- FAM comes in two parts: fam, the daemon which listens for requests and
-delivers notification, and libfam, a library which client applications can
-use to communicate with fam.
-
- If the monitored files are mounted from a remote host, the local FAM
-will attempt to contact FAM on the remote host, and will pass the requests
-on to the remote FAM.
-
- FAM can also notify its clients when a file starts and stops execution.
-(The IRIX Interactive Desktop uses this to change a program's icon while
-it's running, for example.)
-
- FAM was originally written for IRIX in 1989 by Bruce Karsh, and was
-rewritten in 1995 by Bob Miller. This open-source release of FAM builds
-and runs on NetBSD, FreeBSD, Linux, and IRIX, and is the same FAM that
-will be included with IRIX 6.5.8.
diff --git a/sysutils/fam/Makefile b/sysutils/fam/Makefile
deleted file mode 100644
index 47c43995c18..00000000000
--- a/sysutils/fam/Makefile
+++ /dev/null
@@ -1,22 +0,0 @@
-# $NetBSD: Makefile,v 1.6 2003/06/02 01:16:56 jschauma Exp $
-#
-
-DISTNAME= fam-2.6.9
-PKGREVISION= 1
-CATEGORIES= sysutils devel
-MASTER_SITES= ftp://oss.sgi.com/projects/fam/download/stable/ \
- ftp://ftp.tuwien.ac.at/opsys/linux/gentoo/distfiles/ \
- http://gd.tuwien.ac.at/opsys/linux/gentoo/distfiles/
-
-MAINTAINER= tech-pkg@netbsd.org
-HOMEPAGE= http://oss.sgi.com/projects/fam/
-COMMENT= File Alteration Monitor
-
-USE_BUILDLINK2= YES
-USE_GMAKE= YES
-USE_LIBTOOL= YES
-GNU_CONFIGURE= YES
-LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
-CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/fam/PLIST b/sysutils/fam/PLIST
deleted file mode 100644
index f73d3826abd..00000000000
--- a/sysutils/fam/PLIST
+++ /dev/null
@@ -1,14 +0,0 @@
-@comment $NetBSD: PLIST,v 1.3 2002/12/17 19:43:39 jmmv Exp $
-bin/fam
-include/fam.h
-lib/fam/editconf.perl
-lib/libfam.a
-lib/libfam.la
-lib/libfam.so
-lib/libfam.so.0
-lib/libfam.so.0.0
-man/man1/fam.1
-man/man3/fam.3
-share/examples/fam/fam.conf
-@dirrm share/examples/fam
-@dirrm lib/fam
diff --git a/sysutils/fam/buildlink2.mk b/sysutils/fam/buildlink2.mk
deleted file mode 100644
index 9382dbc6d0d..00000000000
--- a/sysutils/fam/buildlink2.mk
+++ /dev/null
@@ -1,20 +0,0 @@
-# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:23:20 jlam Exp $
-
-.if !defined(FAM_BUILDLINK2_MK)
-FAM_BUILDLINK2_MK= # defined
-
-BUILDLINK_PACKAGES+= fam
-BUILDLINK_DEPENDS.fam?= fam>=2.6.7
-BUILDLINK_PKGSRCDIR.fam?= ../../sysutils/fam
-
-EVAL_PREFIX+= BUILDLINK_PREFIX.fam=fam
-BUILDLINK_PREFIX.fam_DEFAULT= ${LOCALBASE}
-BUILDLINK_FILES.fam+= include/fam.h
-BUILDLINK_FILES.fam+= lib/fam/editconf.perl
-BUILDLINK_FILES.fam+= lib/libfam.*
-
-BUILDLINK_TARGETS+= fam-buildlink
-
-fam-buildlink: _BUILDLINK_USE
-
-.endif # FAM_BUILDLINK2_MK
diff --git a/sysutils/fam/distinfo b/sysutils/fam/distinfo
deleted file mode 100644
index c19e9bbc509..00000000000
--- a/sysutils/fam/distinfo
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD: distinfo,v 1.5 2002/12/17 19:43:39 jmmv Exp $
-
-SHA1 (fam-2.6.9.tar.gz) = 44fb01afce9bd209a01575ba6a6ecc71af5d9add
-Size (fam-2.6.9.tar.gz) = 282627 bytes
-SHA1 (patch-aa) = 6aa9a0ecda1d51ffa3e4ac2a45c02a9e629bb8bd
-SHA1 (patch-ab) = 60897dc25f7e18f584cba0c6d22538b1d0b11ecf
-SHA1 (patch-ac) = 5e76e34ebb14e9db2c76f5bdcbfd31cb70991d70
-SHA1 (patch-ae) = e07e52e8011e2f22e0391d33764a223e6ac769a4
-SHA1 (patch-af) = c982b3e2ada3274881990c5ea183ca692ff543fe
-SHA1 (patch-ag) = 059eb7191fc03765e0840a0faed0b27eb6919b74
-SHA1 (patch-ah) = a31f816d61127636663d16ad8e87169715661e3c
-SHA1 (patch-ai) = 62e013a8559aa5207085d80ed0bb77e005a4788e
-SHA1 (patch-aj) = c442ff2fd4afc1e011953b421d20f1adc9e92b06
-SHA1 (patch-ak) = dc18202214fc0ce153ecbab2a4f7759e32d9e11f
-SHA1 (patch-al) = dee33dd3c235be568b35a57a34f6ca703bc8f411
-SHA1 (patch-an) = 8416a0de32fec6cbf615083d44fd0b5add5cd8e3
-SHA1 (patch-ao) = aa9e0cd237460004d4e1f89a3f4bced11ee620b7
-SHA1 (patch-ap) = 75ca4b6a32f1c3ed1a085457b4de9bb228242fad
-SHA1 (patch-at) = 83f5680d43ad0e06e5eca517cbba2d0866ae42bc
-SHA1 (patch-au) = f6ba3953b892f40158e6e4bde5d8b28bf930f241
-SHA1 (patch-av) = 18a90c53d641305ef02f71bf443c84d50a2c3fff
-SHA1 (patch-aw) = a6b75b6c2b85d1b8247cee16fd23fbaffa346c05
-SHA1 (patch-ax) = 4f18da00e202b397615588480b78e4dc4248cc23
diff --git a/sysutils/fam/patches/patch-aa b/sysutils/fam/patches/patch-aa
deleted file mode 100644
index 894a9271d86..00000000000
--- a/sysutils/fam/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2002/08/25 19:23:20 jlam Exp $
-
---- acconfig.h.orig Tue Dec 18 11:03:36 2001
-+++ acconfig.h
-@@ -47,6 +47,8 @@
- ** Otherwise, we'll use MNTTYPE_NFS. */
- #undef HAVE_FSID_NFS2
-
-+#undef HAVE_MNTENT_H
-+
- /* Define if we have MNTTYPE_NFS2 */
- #define HAVE_MNTTYPE_NFS2 0
-
diff --git a/sysutils/fam/patches/patch-ab b/sysutils/fam/patches/patch-ab
deleted file mode 100644
index 8c3c15b6137..00000000000
--- a/sysutils/fam/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.2 2002/08/25 19:23:20 jlam Exp $
-
---- config.h.in.orig Fri Dec 21 10:00:06 2001
-+++ config.h.in
-@@ -12,6 +12,8 @@
- /* Define if the system has imon and IMONIOC_ ioctl flags. */
- #undef HAVE_IMON
-
-+#undef HAVE_MNTENT_H
-+
- /* Define if the system has the struct revokdi and the IMONIOC_REVOKDI
- ** ioctl flag. (IRIX 5.3 doesn't.)
- */
diff --git a/sysutils/fam/patches/patch-ac b/sysutils/fam/patches/patch-ac
deleted file mode 100644
index cada84d7a08..00000000000
--- a/sysutils/fam/patches/patch-ac
+++ /dev/null
@@ -1,28 +0,0 @@
-$NetBSD: patch-ac,v 1.2 2002/08/25 19:23:20 jlam Exp $
-
---- configure.in.orig Fri Dec 21 08:18:48 2001
-+++ configure.in
-@@ -95,6 +95,8 @@
- dnl AC_HEADER_SYS_WAIT
- dnl AC_CHECK_HEADERS(fcntl.h limits.h sys/time.h syslog.h unistd.h)
-
-+AC_CHECK_HEADER(mntent.h, AC_DEFINE(HAVE_MNTENT_H))
-+
- dnl
- dnl See if imon is available; if so, is it IRIX or Linux?
- dnl
-@@ -310,10 +312,10 @@
- dnl If we don't have MNTTYPE_NFS , we croak.
- dnl
-
--FAM_DECL_IN_MNTENT(MNTTYPE_NFS, ,AC_MSG_ERROR(Didn't find MNTTYPE_NFS in mntent.h))
--FAM_DECL_IN_MNTENT(MNTTYPE_NFS2, AC_DEFINE(HAVE_MNTTYPE_NFS2))
--FAM_DECL_IN_MNTENT(MNTTYPE_NFS3, AC_DEFINE(HAVE_MNTTYPE_NFS3))
--FAM_DECL_IN_MNTENT(MNTTYPE_CACHEFS, AC_DEFINE(HAVE_MNTTYPE_CACHEFS))
-+dnl FAM_DECL_IN_MNTENT(MNTTYPE_NFS, ,AC_MSG_ERROR(Didn't find MNTTYPE_NFS in mntent.h))
-+dnl FAM_DECL_IN_MNTENT(MNTTYPE_NFS2, AC_DEFINE(HAVE_MNTTYPE_NFS2))
-+dnl FAM_DECL_IN_MNTENT(MNTTYPE_NFS3, AC_DEFINE(HAVE_MNTTYPE_NFS3))
-+dnl FAM_DECL_IN_MNTENT(MNTTYPE_CACHEFS, AC_DEFINE(HAVE_MNTTYPE_CACHEFS))
-
- dnl
- dnl Test for bindresvport() prototype.
diff --git a/sysutils/fam/patches/patch-ae b/sysutils/fam/patches/patch-ae
deleted file mode 100644
index 7114ccbb021..00000000000
--- a/sysutils/fam/patches/patch-ae
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ae,v 1.2 2002/08/25 19:23:21 jlam Exp $
-
---- fam/FileSystem.c++.orig Tue Dec 18 11:03:37 2001
-+++ fam/FileSystem.c++
-@@ -22,7 +22,7 @@
-
- #include "FileSystem.h"
-
--#include <mntent.h>
-+#include "mntent.h"
- #include <string.h>
-
- #include "Event.h"
diff --git a/sysutils/fam/patches/patch-af b/sysutils/fam/patches/patch-af
deleted file mode 100644
index 31f15d1fd40..00000000000
--- a/sysutils/fam/patches/patch-af
+++ /dev/null
@@ -1,30 +0,0 @@
-$NetBSD: patch-af,v 1.2 2002/08/25 19:23:21 jlam Exp $
-
---- fam/FileSystemTable.c++.orig Tue Dec 18 11:03:37 2001
-+++ fam/FileSystemTable.c++
-@@ -21,11 +21,13 @@
- // Temple Place - Suite 330, Boston MA 02111-1307, USA.
-
- #include <stddef.h>
-+#include <stdio.h>
- #include "FileSystemTable.h"
-
--#include <mntent.h>
-+#include "mntent.h"
- #include <stdlib.h>
- #include <string.h>
-+#include <sys/param.h>
-
- #if HAVE_STATVFS
- #include <sys/statvfs.h>
-@@ -255,7 +257,10 @@
- // create_fs_by_name initializes our "root" member variable.
- if (!fs_by_name)
- { create_fs_by_name();
-+#if !defined(BSD)
-+ /* there is no mtab "file" in BSD */
- mtab_watcher = new InternalClient(mtab_name, mtab_event_handler, NULL);
-+#endif
- }
-
- cr.become_user();
diff --git a/sysutils/fam/patches/patch-ag b/sysutils/fam/patches/patch-ag
deleted file mode 100644
index 12ddec90b46..00000000000
--- a/sysutils/fam/patches/patch-ag
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-ag,v 1.3 2002/12/17 19:43:40 jmmv Exp $
-
---- fam/IMon.c++.orig Tue Jul 16 08:14:41 2002
-+++ fam/IMon.c++
-@@ -25,6 +25,7 @@
- #include <assert.h>
- #include <errno.h>
- #include <fcntl.h>
-+#include <sys/param.h>
-
- #if HAVE_IMON
- #ifdef __sgi
-@@ -34,7 +35,7 @@
- #endif
- #endif
-
--#if !defined(__FreeBSD__)
-+#if !defined(__FreeBSD__) && !defined(__OpenBSD__) && !defined(__NetBSD__)
- # include <sys/sysmacros.h>
- #endif
- #include <unistd.h>
diff --git a/sysutils/fam/patches/patch-ah b/sysutils/fam/patches/patch-ah
deleted file mode 100644
index 6dd509643b7..00000000000
--- a/sysutils/fam/patches/patch-ah
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ah,v 1.3 2002/12/17 19:43:40 jmmv Exp $
-
---- fam/Interest.c++.orig Tue Jul 16 08:14:41 2002
-+++ fam/Interest.c++
-@@ -25,7 +25,7 @@
- #include <string.h>
- #include <errno.h>
- #include <sys/param.h>
--#if !defined(__FreeBSD__)
-+#if !defined(__FreeBSD__) && !defined(__OpenBSD__) && !defined(__NetBSD__)
- # include <sys/sysmacros.h>
- #endif
-
diff --git a/sysutils/fam/patches/patch-ai b/sysutils/fam/patches/patch-ai
deleted file mode 100644
index 17c73de7666..00000000000
--- a/sysutils/fam/patches/patch-ai
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ai,v 1.2 2002/08/25 19:23:21 jlam Exp $
-
---- fam/InternalClient.c++.orig Tue Dec 18 11:03:37 2001
-+++ fam/InternalClient.c++
-@@ -35,8 +35,8 @@
- {
- assert(filename);
- assert(h);
-- assert(filename[0] == '/');
- Log::debug("%s watching %s", name(), filename);
-+ assert(filename[0] == '/');
- interest = new File(filename, this, Request(0), Cred::SuperUser);
- }
-
diff --git a/sysutils/fam/patches/patch-aj b/sysutils/fam/patches/patch-aj
deleted file mode 100644
index 466ad57bc67..00000000000
--- a/sysutils/fam/patches/patch-aj
+++ /dev/null
@@ -1,48 +0,0 @@
-$NetBSD: patch-aj,v 1.3 2002/12/17 19:43:41 jmmv Exp $
-
---- fam/Listener.c++.orig Tue Jul 16 08:14:41 2002
-+++ fam/Listener.c++
-@@ -22,6 +22,8 @@
-
- #include "Listener.h"
-
-+#include <stdio.h>
-+#include <stdlib.h>
- #include <assert.h>
- #include <fcntl.h>
- #include <sys/types.h>
-@@ -32,6 +34,7 @@
- #include <rpc/clnt.h>
- #include <sys/ioctl.h>
- #include <sys/socket.h>
-+#include <sys/param.h>
- #include <sys/stat.h>
- #include <sys/un.h>
- #include <unistd.h>
-@@ -205,7 +208,7 @@ Listener::create_local_client(TCP_Client
- unsetenv("TMPDIR");
-
- char *tmpfile = tempnam("/tmp", ".fam");
--#if defined(__FreeBSD__)
-+#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__)
- sockaddr_un sun = { sizeof(sockaddr_un), AF_UNIX, "" };
- #else
- sockaddr_un sun = { AF_UNIX, "" };
-@@ -279,7 +282,7 @@ Listener::accept_localclient(int ofd, vo
-
- // Get the new socket.
-
--#if defined(__FreeBSD__)
-+#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__)
- struct sockaddr_un sun = { sizeof(sockaddr_un), AF_UNIX, "" };
- #else
- struct sockaddr_un sun = { AF_UNIX, "" };
-@@ -345,7 +348,7 @@ Listener::accept_localclient(int ofd, vo
- void
- Listener::dirty_ugly_hack()
- {
--#if defined(__FreeBSD__)
-+#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__)
- static sockaddr_un sun = { sizeof (sockaddr_un), AF_UNIX, "/tmp/.fam_socket" };
- #else
- static sockaddr_un sun = { AF_UNIX, "/tmp/.fam_socket" };
diff --git a/sysutils/fam/patches/patch-ak b/sysutils/fam/patches/patch-ak
deleted file mode 100644
index bd8591edf69..00000000000
--- a/sysutils/fam/patches/patch-ak
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ak,v 1.3 2002/12/17 19:43:41 jmmv Exp $
-
---- fam/Log.c++.orig Tue Jul 16 08:16:14 2002
-+++ fam/Log.c++
-@@ -28,6 +28,8 @@
- #include <stdlib.h>
- #include <string.h>
- #include <syslog.h>
-+#include <sys/time.h>
-+#include <sys/types.h>
- #include <sys/resource.h>
- #include <sys/stat.h>
- #include <sys/time.h>
diff --git a/sysutils/fam/patches/patch-al b/sysutils/fam/patches/patch-al
deleted file mode 100644
index d1c30c51abb..00000000000
--- a/sysutils/fam/patches/patch-al
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-al,v 1.2 2002/08/25 19:23:21 jlam Exp $
-
---- fam/Makefile.am.orig Tue Dec 18 11:03:37 2001
-+++ fam/Makefile.am
-@@ -72,6 +72,7 @@
- main.c++ \
- timeval.c++ \
- timeval.h \
-+ mntent_compat.c++ \
- @IMON_FUNCS@.c++
-
- EXTRA_fam_SOURCES = IMonIrix.c++ IMonLinux.c++ IMonNone.c++
diff --git a/sysutils/fam/patches/patch-an b/sysutils/fam/patches/patch-an
deleted file mode 100644
index 3333283de63..00000000000
--- a/sysutils/fam/patches/patch-an
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-an,v 1.2 2002/08/25 19:23:21 jlam Exp $
-
---- fam/StringTable.h.orig Tue Dec 18 11:03:37 2001
-+++ fam/StringTable.h
-@@ -25,6 +25,7 @@
-
- #include <assert.h>
- #include <string.h>
-+#include "mntent.h"
-
- // A StringTable maps C strings onto values. It is a cheap O(n)
- // implementation, suitable only for small tables that are
diff --git a/sysutils/fam/patches/patch-ao b/sysutils/fam/patches/patch-ao
deleted file mode 100644
index 57b32eed875..00000000000
--- a/sysutils/fam/patches/patch-ao
+++ /dev/null
@@ -1,61 +0,0 @@
-$NetBSD: patch-ao,v 1.2 2002/08/25 19:23:22 jlam Exp $
-
---- fam/mntent.h.orig Sun May 12 19:15:01 2002
-+++ fam/mntent.h
-@@ -0,0 +1,56 @@
-+/*
-+ * mntent
-+ * mntent.h - compatability header for BSD
-+ *
-+ * Copyright (c) 2001 David Rufino <daverufino@btinternet.com>
-+ * All rights reserved.
-+ *
-+ * Redistribution and use in source and binary forms, with or without
-+ * modification, are permitted provided that the following conditions
-+ * are met:
-+ * 1. Redistributions of source code must retain the above copyright
-+ * notice, this list of conditions and the following disclaimer.
-+ * 2. Redistributions in binary form must reproduce the above copyright
-+ * notice, this list of conditions and the following disclaimer in the
-+ * documentation and/or other materials provided with the distribution.
-+ *
-+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
-+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-+ * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
-+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-+ * SUCH DAMAGE.
-+ */
-+
-+#if defined(HAVE_MNTENT_H)
-+#include <mntent.h>
-+#else
-+#ifndef _MNTENT_H
-+#define _MNTENT_H
-+#include <stdio.h>
-+
-+#define MOUNTED "dummy"
-+
-+#define MNTTYPE_NFS "nfs"
-+
-+struct mntent {
-+ char *mnt_fsname;
-+ char *mnt_dir;
-+ char *mnt_type;
-+ char *mnt_opts;
-+ int mnt_freq;
-+ int mnt_passno;
-+};
-+
-+#define setmntent(x,y) ((FILE *)0x1)
-+struct mntent *getmntent __P ((FILE *fp));
-+char *hasmntopt __P ((const struct mntent *mnt, const char *option));
-+#define endmntent(x) ((int)1)
-+
-+#endif /* _MNTENT_H */
-+#endif /* HAVE_MNTENT_H */
diff --git a/sysutils/fam/patches/patch-ap b/sysutils/fam/patches/patch-ap
deleted file mode 100644
index f38ba19a80f..00000000000
--- a/sysutils/fam/patches/patch-ap
+++ /dev/null
@@ -1,179 +0,0 @@
-$NetBSD: patch-ap,v 1.2 2002/08/25 19:23:22 jlam Exp $
-
---- fam/mntent_compat.c++.orig Sun May 12 19:37:49 2002
-+++ fam/mntent_compat.c++
-@@ -0,0 +1,174 @@
-+/*
-+ * Copyright (c) 1980, 1989, 1993, 1994
-+ * The Regents of the University of California. All rights reserved.
-+ * Copyright (c) 2001
-+ * David Rufino <daverufino@btinternet.com>
-+ *
-+ * Redistribution and use in source and binary forms, with or without
-+ * modification, are permitted provided that the following conditions
-+ * are met:
-+ * 1. Redistributions of source code must retain the above copyright
-+ * notice, this list of conditions and the following disclaimer.
-+ * 2. Redistributions in binary form must reproduce the above copyright
-+ * notice, this list of conditions and the following disclaimer in the
-+ * documentation and/or other materials provided with the distribution.
-+ * 3. All advertising materials mentioning features or use of this software
-+ * must display the following acknowledgement:
-+ * This product includes software developed by the University of
-+ * California, Berkeley and its contributors.
-+ * 4. Neither the name of the University nor the names of its contributors
-+ * may be used to endorse or promote products derived from this software
-+ * without specific prior written permission.
-+ *
-+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
-+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-+ * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
-+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-+ * SUCH DAMAGE.
-+ */
-+
-+/* most of this was ripped from the mount(3) source */
-+
-+#include "config.h"
-+#include "mntent.h"
-+#if !defined(HAVE_MNTENT_H)
-+#include <stdlib.h>
-+#include <string.h>
-+#include <sys/param.h>
-+#include <sys/ucred.h>
-+#include <sys/mount.h>
-+
-+static int pos = -1;
-+static int mntsize = -1;
-+static struct mntent _mntent;
-+
-+char *
-+hasmntopt (const struct mntent *mnt, const char *option)
-+{
-+ int found;
-+ char *opt, *optbuf;
-+
-+ optbuf = strdup(mnt->mnt_opts);
-+ found = 0;
-+ for (opt = optbuf; (opt = strtok(opt, " ")) != NULL; opt = NULL) {
-+ if (!strcasecmp(opt, option)) {
-+ opt = opt - optbuf + mnt->mnt_opts;
-+ free (optbuf);
-+ return (opt);
-+ }
-+ }
-+ free (optbuf);
-+ return (NULL);
-+}
-+
-+static char *
-+catopt (char *s0, const char *s1)
-+{
-+ size_t i;
-+ char *cp;
-+
-+ if (s1 == NULL || *s1 == '\0')
-+ return s0;
-+ if (s0 && *s0) {
-+ i = strlen(s0) + strlen(s1) + 1 + 1;
-+ if ((cp = (char *)malloc(i)) == NULL)
-+ return (NULL);
-+ (void)snprintf(cp, i, "%s %s", s0, s1);
-+ } else
-+ cp = strdup(s1);
-+
-+ if (s0)
-+ free(s0);
-+ return (cp);
-+}
-+
-+
-+static char *
-+flags2opts (int flags)
-+{
-+ char *res;
-+ res = NULL;
-+ res = catopt(res, (flags & MNT_RDONLY) ? "ro" : "rw");
-+ if (flags & MNT_SYNCHRONOUS) res = catopt(res, "sync");
-+ if (flags & MNT_NOEXEC) res = catopt(res, "noexec");
-+ if (flags & MNT_NOSUID) res = catopt(res, "nosuid");
-+ if (flags & MNT_NODEV) res = catopt(res, "nodev");
-+ if (flags & MNT_UNION) res = catopt(res, "union");
-+ if (flags & MNT_ASYNC) res = catopt(res, "async");
-+ if (flags & MNT_NOATIME) res = catopt(res, "noatime");
-+#ifdef MNT_NOCLUSTERR
-+ if (flags & MNT_NOCLUSTERR) res = catopt(res, "noclusterr");
-+#endif
-+#ifdef MNT_NOCLUSTERW
-+ if (flags & MNT_NOCLUSTERW) res = catopt(res, "noclusterw");
-+#endif
-+#ifdef MNT_NOSYMFOLLOW
-+ if (flags & MNT_NOSYMFOLLOW) res = catopt(res, "nosymfollow");
-+#endif
-+#ifdef MNT_SUIDDIR
-+ if (flags & MNT_SUIDDIR) res = catopt(res, "suiddir");
-+#endif
-+#ifdef MNT_NOCOREDUMP
-+ if (flags & MNT_NOCOREDUMP) res = catopt(res, "nocoredump");
-+#endif
-+#ifdef MNT_IGNORE
-+ if (flags & MNT_IGNORE) res = catopt(res, "hidden");
-+#endif
-+#ifdef MNT_SYMPERM
-+ if (flags & MNT_SYMPERM) res = catopt(res, "symperm");
-+#endif
-+#ifdef MNT_NODEVMTIME
-+ if (flags & MNT_NODEVMTIME) res = catopt(res, "nodevmtime");
-+#endif
-+#ifdef MNT_SOFTDEP
-+ if (flags & MNT_SOFTDEP) res = catopt(res, "softdep");
-+#endif
-+
-+ return res;
-+}
-+
-+static struct mntent *
-+statfs_to_mntent (struct statfs *mntbuf)
-+{
-+ static char opts_buf[40], *tmp;
-+
-+ _mntent.mnt_fsname = mntbuf->f_mntfromname;
-+ _mntent.mnt_dir = mntbuf->f_mntonname;
-+ _mntent.mnt_type = mntbuf->f_fstypename;
-+ tmp = flags2opts (mntbuf->f_flags);
-+ if (tmp) {
-+ opts_buf[sizeof(opts_buf)-1] = '\0';
-+ strncpy (opts_buf, tmp, sizeof(opts_buf)-1);
-+ free (tmp);
-+ } else {
-+ *opts_buf = '\0';
-+ }
-+ _mntent.mnt_opts = opts_buf;
-+ _mntent.mnt_freq = _mntent.mnt_passno = 0;
-+ return (&_mntent);
-+}
-+
-+struct mntent *
-+getmntent (FILE *fp)
-+{
-+ struct statfs *mntbuf;
-+
-+ if (pos == -1 || mntsize == -1)
-+ mntsize = getmntinfo (&mntbuf, MNT_NOWAIT);
-+
-+ ++pos;
-+ if (pos == mntsize) {
-+ pos = mntsize = -1;
-+ return (NULL);
-+ }
-+
-+ return (statfs_to_mntent (&mntbuf[pos]));
-+}
-+
-+#endif /* HAVE_MNTENT_H */
diff --git a/sysutils/fam/patches/patch-at b/sysutils/fam/patches/patch-at
deleted file mode 100644
index c57d78bdd67..00000000000
--- a/sysutils/fam/patches/patch-at
+++ /dev/null
@@ -1,35 +0,0 @@
-$NetBSD: patch-at,v 1.2 2002/08/25 19:23:22 jlam Exp $
-
---- Makefile.am.orig Tue Dec 18 11:03:36 2001
-+++ Makefile.am
-@@ -7,30 +7,3 @@
- rpm: dist
- @cd build && $(MAKE) $(AM_MAKEFLAGS) rpm
-
--# We proceed even if these commands fail because this might be an install
--# into $DESTDIR by a non-root user.
--install-exec-hook:
-- -@if test "no$(LDCONFIG)" != "no"; then \
--## echo "Adding $(libdir) to ld.so.conf..."; \
-- $(EDITCONF) ld.so.conf add $(DESTDIR)$(libdir) $(DESTDIR)$(libdir); \
-- exec $(LDCONFIG); \
-- fi
--## @echo "Adding fam to rpc..."
-- -@$(EDITCONF) rpc add 391002 "sgi_fam 391002"
--## @echo "Adding fam to inetd.conf..."
-- -@$(EDITCONF) inetd.conf add '\b(fam|FAM)\b' \
-- "# fam, the File Alteration Monitor, http://oss.sgi.com/projects/fam/" \
-- "sgi_fam/1-2 stream rpc/tcp wait root $(DESTDIR)$(bindir)/fam fam"
-- @echo "Restarting inetd..."
-- -@killall -HUP inetd
--
--# We don't remove $(libdir) from ld.so.conf here because we don't have
--# a way to tell whether we're the ones who added it, and other things
--# probably use it as well.
--uninstall-local:
--## @echo "Removing fam from rpc..."
-- -@$(EDITCONF) rpc remove 391002
--## @echo "Removing fam from inetd.conf..."
-- -@$(EDITCONF) inetd.conf remove '\b(fam|FAM)\b'
-- @echo "Restarting inetd..."
-- -@killall -HUP inetd
diff --git a/sysutils/fam/patches/patch-au b/sysutils/fam/patches/patch-au
deleted file mode 100644
index fefc088e4f8..00000000000
--- a/sysutils/fam/patches/patch-au
+++ /dev/null
@@ -1,29 +0,0 @@
-$NetBSD: patch-au,v 1.3 2002/12/17 19:43:43 jmmv Exp $
-
---- fam/Makefile.in.orig Tue Jul 16 08:56:45 2002
-+++ fam/Makefile.in
-@@ -28,7 +28,7 @@ bindir = @bindir@
- sbindir = @sbindir@
- libexecdir = @libexecdir@
- datadir = @datadir@
--sysconfdir = @sysconfdir@
-+sysconfdir = @datadir@/examples/@PACKAGE@
- sharedstatedir = @sharedstatedir@
- localstatedir = @localstatedir@
- libdir = @libdir@
-@@ -173,6 +173,7 @@ fam_SOURCES = \
- main.c++ \
- timeval.c++ \
- timeval.h \
-+ mntent_compat.c++ \
- @IMON_FUNCS@.c++
-
-
-@@ -201,6 +202,7 @@ NFSFileSystem.$(OBJEXT) NetConnection.$(
- RPC_TCP_Connector.$(OBJEXT) Scanner.$(OBJEXT) Scheduler.$(OBJEXT) \
- ServerConnection.$(OBJEXT) ServerHost.$(OBJEXT) ServerHostRef.$(OBJEXT) \
- TCP_Client.$(OBJEXT) main.$(OBJEXT) timeval.$(OBJEXT) \
-+mntent_compat.$(OBJEXT) \
- @IMON_FUNCS@.$(OBJEXT)
- fam_DEPENDENCIES = $(top_srcdir)/support/libsupport.a
- fam_LDFLAGS =
diff --git a/sysutils/fam/patches/patch-av b/sysutils/fam/patches/patch-av
deleted file mode 100644
index 0e35593d322..00000000000
--- a/sysutils/fam/patches/patch-av
+++ /dev/null
@@ -1,30 +0,0 @@
-$NetBSD: patch-av,v 1.2 2002/08/25 19:23:23 jlam Exp $
-
---- Makefile.in.orig Sun May 12 19:27:47 2002
-+++ Makefile.in
-@@ -388,25 +388,8 @@
- # We proceed even if these commands fail because this might be an install
- # into $DESTDIR by a non-root user.
- install-exec-hook:
-- -@if test "no$(LDCONFIG)" != "no"; then \
-- $(EDITCONF) ld.so.conf add $(DESTDIR)$(libdir) $(DESTDIR)$(libdir); \
-- exec $(LDCONFIG); \
-- fi
-- -@$(EDITCONF) rpc add 391002 "sgi_fam 391002"
-- -@$(EDITCONF) inetd.conf add '\b(fam|FAM)\b' \
-- "# fam, the File Alteration Monitor, http://oss.sgi.com/projects/fam/" \
-- "sgi_fam/1-2 stream rpc/tcp wait root $(DESTDIR)$(bindir)/fam fam"
-- @echo "Restarting inetd..."
-- -@killall -HUP inetd
-
--# We don't remove $(libdir) from ld.so.conf here because we don't have
--# a way to tell whether we're the ones who added it, and other things
--# probably use it as well.
- uninstall-local:
-- -@$(EDITCONF) rpc remove 391002
-- -@$(EDITCONF) inetd.conf remove '\b(fam|FAM)\b'
-- @echo "Restarting inetd..."
-- -@killall -HUP inetd
-
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/sysutils/fam/patches/patch-aw b/sysutils/fam/patches/patch-aw
deleted file mode 100644
index 1e1749c0617..00000000000
--- a/sysutils/fam/patches/patch-aw
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-aw,v 1.2 2002/08/25 19:23:23 jlam Exp $
-
---- man/Makefile.in.orig Sun May 12 20:01:26 2002
-+++ man/Makefile.in
-@@ -124,7 +124,7 @@
- for i in $$list; do \
- if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
- else file=$$i; fi; \
-- ext=`echo $$i | sed -e 's/^.*\\.//'`; \
-+ ext=1 ; \
- inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
- inst=`echo $$inst | sed '$(transform)'`.$$ext; \
- echo " $(INSTALL_DATA) $$file $(DESTDIR)$(man1dir)/$$inst"; \
-@@ -157,7 +157,7 @@
- for i in $$list; do \
- if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
- else file=$$i; fi; \
-- ext=`echo $$i | sed -e 's/^.*\\.//'`; \
-+ ext=3 ; \
- inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
- inst=`echo $$inst | sed '$(transform)'`.$$ext; \
- echo " $(INSTALL_DATA) $$file $(DESTDIR)$(man3dir)/$$inst"; \
diff --git a/sysutils/fam/patches/patch-ax b/sysutils/fam/patches/patch-ax
deleted file mode 100644
index 78a54f1794c..00000000000
--- a/sysutils/fam/patches/patch-ax
+++ /dev/null
@@ -1,179 +0,0 @@
-$NetBSD: patch-ax,v 1.2 2002/12/17 19:43:43 jmmv Exp $
-
---- configure.orig Tue Dec 17 00:22:04 2002
-+++ configure
-@@ -5561,6 +5510,43 @@ fi
-
-
-
-+ac_safe=`echo "mntent.h" | sed 'y%./+-%__p_%'`
-+echo $ac_n "checking for mntent.h""... $ac_c" 1>&6
-+echo "configure:5516: checking for mntent.h" >&5
-+if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-+ echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+ cat > conftest.$ac_ext <<EOF
-+#line 5521 "configure"
-+#include "confdefs.h"
-+#include <mntent.h>
-+EOF
-+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-+{ (eval echo configure:5526: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-+if test -z "$ac_err"; then
-+ rm -rf conftest*
-+ eval "ac_cv_header_$ac_safe=yes"
-+else
-+ echo "$ac_err" >&5
-+ echo "configure: failed program was:" >&5
-+ cat conftest.$ac_ext >&5
-+ rm -rf conftest*
-+ eval "ac_cv_header_$ac_safe=no"
-+fi
-+rm -f conftest*
-+fi
-+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
-+ echo "$ac_t""yes" 1>&6
-+ cat >> confdefs.h <<\EOF
-+#define HAVE_MNTENT_H 1
-+EOF
-+
-+else
-+ echo "$ac_t""no" 1>&6
-+fi
-+
-+
- if test `uname` = 'IRIX' || test `uname` = 'IRIX64'; then
- have_imon=yes
- cat >> confdefs.h <<\EOF
-@@ -6117,129 +6106,8 @@ fi
-
-
-
-- echo $ac_n "checking mntent.h for MNTTYPE_NFS""... $ac_c" 1>&6
--echo "configure:6122: checking mntent.h for MNTTYPE_NFS" >&5
-- cat > conftest.$ac_ext <<EOF
--#line 6124 "configure"
--#include "confdefs.h"
--#include <mntent.h>
--int main() {
--const char *foo = MNTTYPE_NFS;
--; return 0; }
--EOF
--if { (eval echo configure:6131: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-- rm -rf conftest*
-- fam_have_decl_in_mntent=yes
--else
-- echo "configure: failed program was:" >&5
-- cat conftest.$ac_ext >&5
-- rm -rf conftest*
-- fam_have_decl_in_mntent=no
--fi
--rm -f conftest*
-- echo "$ac_t""$fam_have_decl_in_mntent" 1>&6
-- if test "$fam_have_decl_in_mntent" = "yes"; then
-- :
-- else
-- { echo "configure: error: Didn't find MNTTYPE_NFS in mntent.h" 1>&2; exit 1; }
-- fi
--
--
-- echo $ac_n "checking mntent.h for MNTTYPE_NFS2""... $ac_c" 1>&6
--echo "configure:6150: checking mntent.h for MNTTYPE_NFS2" >&5
-- cat > conftest.$ac_ext <<EOF
--#line 6152 "configure"
--#include "confdefs.h"
--#include <mntent.h>
--int main() {
--const char *foo = MNTTYPE_NFS2;
--; return 0; }
--EOF
--if { (eval echo configure:6159: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-- rm -rf conftest*
-- fam_have_decl_in_mntent=yes
--else
-- echo "configure: failed program was:" >&5
-- cat conftest.$ac_ext >&5
-- rm -rf conftest*
-- fam_have_decl_in_mntent=no
--fi
--rm -f conftest*
-- echo "$ac_t""$fam_have_decl_in_mntent" 1>&6
-- if test "$fam_have_decl_in_mntent" = "yes"; then
-- cat >> confdefs.h <<\EOF
--#define HAVE_MNTTYPE_NFS2 1
--EOF
--
-- else
-- :
-- fi
--
--
-- echo $ac_n "checking mntent.h for MNTTYPE_NFS3""... $ac_c" 1>&6
--echo "configure:6181: checking mntent.h for MNTTYPE_NFS3" >&5
-- cat > conftest.$ac_ext <<EOF
--#line 6183 "configure"
--#include "confdefs.h"
--#include <mntent.h>
--int main() {
--const char *foo = MNTTYPE_NFS3;
--; return 0; }
--EOF
--if { (eval echo configure:6190: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-- rm -rf conftest*
-- fam_have_decl_in_mntent=yes
--else
-- echo "configure: failed program was:" >&5
-- cat conftest.$ac_ext >&5
-- rm -rf conftest*
-- fam_have_decl_in_mntent=no
--fi
--rm -f conftest*
-- echo "$ac_t""$fam_have_decl_in_mntent" 1>&6
-- if test "$fam_have_decl_in_mntent" = "yes"; then
-- cat >> confdefs.h <<\EOF
--#define HAVE_MNTTYPE_NFS3 1
--EOF
--
-- else
-- :
-- fi
--
--
-- echo $ac_n "checking mntent.h for MNTTYPE_CACHEFS""... $ac_c" 1>&6
--echo "configure:6212: checking mntent.h for MNTTYPE_CACHEFS" >&5
-- cat > conftest.$ac_ext <<EOF
--#line 6214 "configure"
--#include "confdefs.h"
--#include <mntent.h>
--int main() {
--const char *foo = MNTTYPE_CACHEFS;
--; return 0; }
--EOF
--if { (eval echo configure:6221: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-- rm -rf conftest*
-- fam_have_decl_in_mntent=yes
--else
-- echo "configure: failed program was:" >&5
-- cat conftest.$ac_ext >&5
-- rm -rf conftest*
-- fam_have_decl_in_mntent=no
--fi
--rm -f conftest*
-- echo "$ac_t""$fam_have_decl_in_mntent" 1>&6
-- if test "$fam_have_decl_in_mntent" = "yes"; then
-- cat >> confdefs.h <<\EOF
--#define HAVE_MNTTYPE_CACHEFS 1
--EOF
--
-- else
-- :
-- fi
--
--
- echo $ac_n "checking netinet/in.h for bindresvport()""... $ac_c" 1>&6
--echo "configure:6243: checking netinet/in.h for bindresvport()" >&5
-+echo "configure:6111: checking netinet/in.h for bindresvport()" >&5
- if eval "test \"`echo '$''{'fam_cv_bindresvport_in_in_h'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
diff --git a/sysutils/fdgw/DESCR b/sysutils/fdgw/DESCR
deleted file mode 100644
index a93c1443f2f..00000000000
--- a/sysutils/fdgw/DESCR
+++ /dev/null
@@ -1,5 +0,0 @@
-"fdgw" provides a one floppy-version of NetBSD.
-
-It can run on old machine without HDD :-). You can use it as small
-router, natbox and ADSL router. It is a minimal operating system. For
-example, you can use an old pc (e.g. IBM PC110) as a pretty ADSL router.
diff --git a/sysutils/fdgw/Makefile b/sysutils/fdgw/Makefile
deleted file mode 100644
index 09e8a3bb413..00000000000
--- a/sysutils/fdgw/Makefile
+++ /dev/null
@@ -1,62 +0,0 @@
-# $NetBSD: Makefile,v 1.7 2002/12/07 02:39:06 schmonz Exp $
-#
-
-DISTNAME= fdgw-20020130
-CATEGORIES= sysutils net
-MASTER_SITES= ftp://ftp.fml.org/pub/fdgw/source/
-
-MAINTAINER= fukachan@fml.org
-HOMEPAGE= http://www.fml.org/software/fdgw/
-COMMENT= toolkit to build a one-floppy NetBSD system
-
-_IMG_SRC_DIR = ${WRKSRC}/image.${MACHINE_ARCH}
-_IMG_DST_DIR = ${PREFIX}/fdgw/${MACHINE_ARCH}
-
-ONLY_FOR_PLATFORM= NetBSD-1.5.*-i386
-
-ALL_TARGET= dist-build
-MAKE_ENV+= BSDSRCDIR="${BSDSRCDIR}"
-
-pre-fetch:
- @ ${ECHO} "";
- @ ${ECHO} "********************************************************";
- @ ${ECHO} "Please note: The install stage of fdgw requires a kernel"
- @ ${ECHO} " with 'pseudo-device vnd 4' enabled.";
- @ ${ECHO} "********************************************************";
- @ ${ECHO} "";
-
-pre-install:
- (cd ${WRKSRC} && ${MAKE} dist-image)
-
-do-install:
- ${TEST} -d ${_IMG_DST_DIR} || ${MKDIR} ${_IMG_DST_DIR}
- ${INSTALL_DATA} ${_IMG_SRC_DIR}/natbox.img ${_IMG_DST_DIR}/natbox.img
- ${INSTALL_DATA} ${_IMG_SRC_DIR}/adslrouter.img ${_IMG_DST_DIR}/adslrouter.img
-
-post-install:
- @ ${ECHO} "";
- @ ${ECHO} "*****************************************************";
- @ ${ECHO} "";
- @ ${ECHO} "The floppy images are installed into ${_IMG_DST_DIR}."
- @ ${ECHO} ""
- @ ${ECHO} "To write adslrouter.img onto a floppy:"
- @ ${ECHO} " # dd if=adslrouter.img of=/dev/rfd0a bs=18k"
- @ ${ECHO} "";
- @ ${ECHO} "See ${HOMEPAGE} for more details, e.g. customization";
- @ ${ECHO} "";
- @ ${ECHO} "*****************************************************";
- @ ${ECHO} "";
-
-.include "../../mk/bsd.prefs.mk"
-
-.if !exists(${X11BASE}/bin/lndir)
-PKG_FAIL_REASON= "${PKGNAME} requires the 'lndir' command, and hence X11"
-.endif
-
-# we need the NetBSD source tree.
-BSDSRCDIR?= /usr/src
-.if !exists(${BSDSRCDIR})
-PKG_FAIL_REASON+= "${PKGNAME} requires the NetBSD source tree in BSDSRCDIR (${BSDSRCDIR})"
-.endif
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/fdgw/PLIST b/sysutils/fdgw/PLIST
deleted file mode 100644
index cb2145f785d..00000000000
--- a/sysutils/fdgw/PLIST
+++ /dev/null
@@ -1,5 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2001/12/26 11:45:22 wennmach Exp $
-fdgw/i386/natbox.img
-fdgw/i386/adslrouter.img
-@dirrm fdgw/i386
-@dirrm fdgw
diff --git a/sysutils/fdgw/distinfo b/sysutils/fdgw/distinfo
deleted file mode 100644
index a013b85e8fc..00000000000
--- a/sysutils/fdgw/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.5 2002/04/19 10:44:28 wennmach Exp $
-
-SHA1 (fdgw-20020130.tar.gz) = 6582981b86a1471facf0c556aef2c2a310dc21a3
-Size (fdgw-20020130.tar.gz) = 121949 bytes
-SHA1 (patch-ae) = 5f001b38a92766c4c1cc9c92c1079dc0567f50d4
diff --git a/sysutils/fdgw/patches/patch-ae b/sysutils/fdgw/patches/patch-ae
deleted file mode 100644
index 7def1906444..00000000000
--- a/sysutils/fdgw/patches/patch-ae
+++ /dev/null
@@ -1,144 +0,0 @@
-# $NetBSD: patch-ae,v 1.1 2002/04/19 10:44:29 wennmach Exp $
-
-Make clean (where possible) in our linktree.
-
---- src/Makefile.orig Wed Jan 30 16:05:10 2002
-+++ src/Makefile Mon Apr 15 21:27:04 2002
-@@ -29,64 +29,64 @@
- _BSDSRCDIR= ${PWD}/NetBSD
-
- # individual directories to link to
--_DIRS= etc
--_DIRS+= bin/cat
--_DIRS+= bin/cp
--_DIRS+= bin/chmod
--_DIRS+= bin/csh
--_DIRS+= bin/date
--_DIRS+= bin/df
--_DIRS+= bin/echo
--_DIRS+= bin/ed
--_DIRS+= bin/expr
--_DIRS+= bin/hostname
--_DIRS+= bin/kill
--_DIRS+= bin/ln
--_DIRS+= bin/ls
--_DIRS+= bin/mkdir
--_DIRS+= bin/mv
--_DIRS+= bin/ps
--_DIRS+= bin/pwd
--_DIRS+= bin/rm
--_DIRS+= bin/sh
--_DIRS+= bin/sleep
--_DIRS+= bin/stty
--_DIRS+= bin/sync
--_DIRS+= bin/test
-+_DIR1= etc
-+_DIR1+= bin/cat
-+_DIR1+= bin/cp
-+_DIR1+= bin/chmod
-+_DIR1+= bin/csh
-+_DIR1+= bin/date
-+_DIR1+= bin/df
-+_DIR1+= bin/echo
-+_DIR1+= bin/ed
-+_DIR1+= bin/expr
-+_DIR1+= bin/hostname
-+_DIR1+= bin/kill
-+_DIR1+= bin/ln
-+_DIR1+= bin/ls
-+_DIR1+= bin/mkdir
-+_DIR1+= bin/mv
-+_DIR1+= bin/ps
-+_DIR1+= bin/pwd
-+_DIR1+= bin/rm
-+_DIR1+= bin/sh
-+_DIR1+= bin/sleep
-+_DIR1+= bin/stty
-+_DIR1+= bin/sync
-+_DIR1+= bin/test
-+_DIR1+= distrib/utils
-+_DIR1+= distrib/i386/floppies
-+_DIR1+= sbin/ifconfig
-+_DIR1+= sbin/init
-+_DIR1+= sbin/mount
-+_DIR1+= sbin/mount_ffs
-+_DIR1+= sbin/mount_kernfs
-+_DIR1+= sbin/mount_msdos
-+_DIR1+= sbin/umount
-+_DIR1+= sbin/ping
-+_DIR1+= sbin/route
-+_DIR1+= sbin/reboot
-+_DIR1+= sbin/shutdown
-+_DIR1+= usr.bin/basename
-+_DIR1+= usr.bin/id
-+_DIR1+= usr.bin/less
-+_DIR1+= usr.bin/logger
-+_DIR1+= usr.bin/sed
-+_DIR1+= usr.bin/tty
-+_DIR1+= usr.bin/uname
-+_DIR1+= usr.sbin/chown
-+_DIR1+= usr.sbin/chroot
-+_DIR1+= usr.sbin/dhcp
-+_DIR1+= usr.sbin/ipf
-+_DIR1+= usr.sbin/pppd
-+_DIR1+= usr.sbin/syslogd
-+_DIR1+= lib/libpcap
-+_DIR1+= sys/netinet
-+
-+_DIR2= dist/ipf
- .if exists (${BSDSRCDIR}/dist/dhcp/Makefile)
--_DIRS+= dist/dhcp
-+_DIR2+= dist/dhcp
- .endif
--_DIRS+= dist/ipf
--_DIRS+= distrib/utils
--_DIRS+= distrib/i386/floppies
--_DIRS+= sbin/ifconfig
--_DIRS+= sbin/init
--_DIRS+= sbin/mount
--_DIRS+= sbin/mount_ffs
--_DIRS+= sbin/mount_kernfs
--_DIRS+= sbin/mount_msdos
--_DIRS+= sbin/umount
--_DIRS+= sbin/ping
--_DIRS+= sbin/route
--_DIRS+= sbin/reboot
--_DIRS+= sbin/shutdown
--_DIRS+= usr.bin/basename
--_DIRS+= usr.bin/id
--_DIRS+= usr.bin/less
--_DIRS+= usr.bin/logger
--_DIRS+= usr.bin/sed
--_DIRS+= usr.bin/tty
--_DIRS+= usr.bin/uname
--_DIRS+= usr.sbin/chown
--_DIRS+= usr.sbin/chroot
--_DIRS+= usr.sbin/dhcp
--_DIRS+= usr.sbin/ipf
--_DIRS+= usr.sbin/pppd
--_DIRS+= usr.sbin/syslogd
--_DIRS+= lib/libpcap
--_DIRS+= sys/netinet
--_DIRS+= sys/arch/i386/stand
--
-+_DIR2+= sys/arch/i386/stand
-
- _FLOPPY_DIR= ${_BSDSRCDIR}/distrib/${ARCH}/floppies
-
-@@ -182,12 +182,15 @@
-
- _lndir:
- @ test -d ${_BSDSRCDIR} || mkdir -p ${_BSDSRCDIR}
-- for DIR in ${_DIRS} ; do \
-+ for DIR in ${_DIR1} ${_DIR2}; do \
- test -d ${_BSDSRCDIR}/$$DIR || mkdir -p ${_BSDSRCDIR}/$$DIR; \
- lndir ${BSDSRCDIR}/$$DIR ${_BSDSRCDIR}/$$DIR; \
- done
- (cd ${_BSDSRCDIR}/distrib; ln -s -f ${BSDSRCDIR}/distrib/Makefile.inc)
- (cd ${_BSDSRCDIR}; ln -s -f ${BSDSRCDIR}/Makefile.inc)
-+ for DIR in ${_DIR1} ; do \
-+ (cd ${_BSDSRCDIR}/$$DIR; echo cleaning in $$DIR; make cleandir) \
-+ done
- @ touch ${_BSDSRCDIR}/.lndir_done
-
- _init_dir:
diff --git a/sysutils/file/DESCR b/sysutils/file/DESCR
deleted file mode 100644
index 252a0d0d218..00000000000
--- a/sysutils/file/DESCR
+++ /dev/null
@@ -1,9 +0,0 @@
-File tests each argument in an attempt to classify it. There are
-three sets of tests, performed in this order: file system tests,
-magic number tests, and language tests.
-
-This package also includes the magic number recognition libraries.
-
-This version is the standard "file" command for Linux, *BSD, and other
-systems. This is Ian Darwin's file(1) command. It is maintained
-by Christos Zoulas.
diff --git a/sysutils/file/MESSAGE b/sysutils/file/MESSAGE
deleted file mode 100644
index a409c26f24c..00000000000
--- a/sysutils/file/MESSAGE
+++ /dev/null
@@ -1,10 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE,v 1.1.1.1 2003/04/13 10:24:27 cjep Exp $
-
-The magic(5) files used by file(1) and libmagic(3) are located
-at ${PREFIX}/share/file/magic.*.
-
-Custom magic(5) additions can be placed in a ${PKG_SYSCONFDIR}/magic
-file.
-
-===========================================================================
diff --git a/sysutils/file/Makefile b/sysutils/file/Makefile
deleted file mode 100644
index 12d529227ab..00000000000
--- a/sysutils/file/Makefile
+++ /dev/null
@@ -1,18 +0,0 @@
-# $NetBSD: Makefile,v 1.2 2003/06/02 01:16:55 jschauma Exp $
-
-DISTNAME= file-4.02
-CATEGORIES= sysutils
-MASTER_SITES= ftp://ftp.gw.com/mirrors/pub/unix/file/
-MASTER_SITES+= ftp://ftp.astron.com/pub/file/
-
-MAINTAINER= tech-pkg@netbsd.org
-#HOMEPAGE=
-COMMENT= tool for determining file type
-
-GNU_CONFIGURE= YES
-CONFIGURE_ARGS+= --enable-fsect-man5
-CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
-
-MESSAGE_SUBST+= PKG_SYSCONFDIR=${PKG_SYSCONFDIR}
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/file/PLIST b/sysutils/file/PLIST
deleted file mode 100644
index 924efcf8fd2..00000000000
--- a/sysutils/file/PLIST
+++ /dev/null
@@ -1,16 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2003/04/13 10:24:27 cjep Exp $
-bin/file
-include/magic.h
-lib/libmagic.a
-lib/libmagic.la
-lib/libmagic.so
-lib/libmagic.so.1
-lib/libmagic.so.1.0
-man/man1/file.1
-man/man3/libmagic.3
-man/man5/magic.5
-share/file/magic
-share/file/magic.mgc
-share/file/magic.mime
-share/file/magic.mime.mgc
-@dirrm share/file
diff --git a/sysutils/file/distinfo b/sysutils/file/distinfo
deleted file mode 100644
index a3378984895..00000000000
--- a/sysutils/file/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.1.1.1 2003/04/13 10:24:27 cjep Exp $
-
-SHA1 (file-4.02.tar.gz) = d224f8d48231271915ba94c3176a266161d69c65
-Size (file-4.02.tar.gz) = 333501 bytes
-SHA1 (patch-aa) = 01ef09e5a7cd6c967cb8fe5972ecc15fd4f0dd3c
diff --git a/sysutils/file/patches/patch-aa b/sysutils/file/patches/patch-aa
deleted file mode 100644
index 84d787a24c0..00000000000
--- a/sysutils/file/patches/patch-aa
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2003/04/13 10:24:27 cjep Exp $
-
---- src/Makefile.in.orig Fri Apr 11 19:37:59 2003
-+++ src/Makefile.in Fri Apr 11 19:41:12 2003
-@@ -122,13 +122,13 @@
- sharedstatedir = @sharedstatedir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--MAGIC = $(pkgdatadir)/magic
-+MAGIC = @sysconfdir@/magic
- lib_LTLIBRARIES = libmagic.la
- include_HEADERS = magic.h
-
- bin_PROGRAMS = file
-
--AM_CPPFLAGS = -DMAGIC='"$(MAGIC)"'
-+AM_CPPFLAGS = -DMAGIC='"$(MAGIC):$(pkgdatadir)/magic"'
-
- libmagic_la_SOURCES = magic.c apprentice.c softmagic.c ascmagic.c \
- compress.c is_tar.c readelf.c print.c fsmagic.c \
diff --git a/sysutils/findutils/DESCR b/sysutils/findutils/DESCR
deleted file mode 100644
index a0f982dcd99..00000000000
--- a/sysutils/findutils/DESCR
+++ /dev/null
@@ -1 +0,0 @@
-The GNU find, xargs and locate utilities.
diff --git a/sysutils/findutils/Makefile b/sysutils/findutils/Makefile
deleted file mode 100644
index 53495789d0a..00000000000
--- a/sysutils/findutils/Makefile
+++ /dev/null
@@ -1,27 +0,0 @@
-# $NetBSD: Makefile,v 1.8 2003/07/13 13:53:14 wiz Exp $
-
-DISTNAME= findutils-4.1
-PKGREVISION= 3
-CATEGORIES= sysutils
-MASTER_SITES= ${MASTER_SITE_GNU:=findutils/}
-
-MAINTAINER= bouyer@netbsd.org
-HOMEPAGE= http://www.gnu.org/software/findutils/findutils.html
-COMMENT= The GNU find, xargs and locate utilities
-
-USE_BUILDLINK2= YES
-GNU_CONFIGURE= YES
-
-INFO_FILES= find.info
-
-.include "../../mk/bsd.prefs.mk"
-
-.if defined(GNU_PROGRAM_PREFIX)
-CONFIGURE_ARGS= --program-prefix=${GNU_PROGRAM_PREFIX}
-.endif
-PLIST_SUBST+= GNU_PROGRAM_PREFIX=${GNU_PROGRAM_PREFIX}
-BUILD_DEFS+= GNU_PROGRAM_PREFIX
-
-.include "../../devel/gettext-lib/buildlink2.mk"
-.include "../../mk/texinfo.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/findutils/PLIST b/sysutils/findutils/PLIST
deleted file mode 100644
index 6d5c69fcdd0..00000000000
--- a/sysutils/findutils/PLIST
+++ /dev/null
@@ -1,23 +0,0 @@
-@comment $NetBSD: PLIST,v 1.4 2002/12/25 17:56:46 wiz Exp $
-bin/${GNU_PROGRAM_PREFIX}find
-bin/${GNU_PROGRAM_PREFIX}xargs
-bin/${GNU_PROGRAM_PREFIX}locate
-bin/${GNU_PROGRAM_PREFIX}updatedb
-libexec/${GNU_PROGRAM_PREFIX}frcode
-libexec/${GNU_PROGRAM_PREFIX}code
-libexec/${GNU_PROGRAM_PREFIX}bigram
-@unexec ${INSTALL_INFO} --delete %D/info/find.info %D/info/dir
-info/find.info
-info/find.info-1
-info/find.info-2
-@exec ${INSTALL_INFO} %D/info/find.info %D/info/dir
-man/cat1/${GNU_PROGRAM_PREFIX}find.0
-man/cat1/${GNU_PROGRAM_PREFIX}xargs.0
-man/cat1/${GNU_PROGRAM_PREFIX}locate.0
-man/cat1/${GNU_PROGRAM_PREFIX}updatedb.0
-man/cat5/${GNU_PROGRAM_PREFIX}locatedb.0
-man/man1/${GNU_PROGRAM_PREFIX}find.1
-man/man1/${GNU_PROGRAM_PREFIX}xargs.1
-man/man1/${GNU_PROGRAM_PREFIX}locate.1
-man/man1/${GNU_PROGRAM_PREFIX}updatedb.1
-man/man5/${GNU_PROGRAM_PREFIX}locatedb.5
diff --git a/sysutils/findutils/distinfo b/sysutils/findutils/distinfo
deleted file mode 100644
index 40dfb986ff8..00000000000
--- a/sysutils/findutils/distinfo
+++ /dev/null
@@ -1,8 +0,0 @@
-$NetBSD: distinfo,v 1.4 2002/10/22 11:35:40 wiz Exp $
-
-SHA1 (findutils-4.1.tar.gz) = b91cd03ca4c9659b3e5d40e841c64bfd2e7f25d8
-Size (findutils-4.1.tar.gz) = 294494 bytes
-SHA1 (patch-aa) = 5449d631e14c202ad626fc2b96c64a7cd878ee81
-SHA1 (patch-ab) = 13664baa3e9348413416c920776be659d5dc59c3
-SHA1 (patch-ac) = 2443dab53a9bc738cdb16e46b5aa7893ee7c13aa
-SHA1 (patch-ad) = 4f28e677b099e60b0097b0f7358dc4c51f07e1aa
diff --git a/sysutils/findutils/patches/patch-aa b/sysutils/findutils/patches/patch-aa
deleted file mode 100644
index bb320ef9055..00000000000
--- a/sysutils/findutils/patches/patch-aa
+++ /dev/null
@@ -1,62 +0,0 @@
-$NetBSD: patch-aa,v 1.3 2002/10/22 11:35:40 wiz Exp $
-
---- locate/Makefile.in.orig Sat Nov 5 15:44:08 1994
-+++ locate/Makefile.in
-@@ -29,7 +29,7 @@ libexecdir = $(exec_prefix)/libexec
- datadir = $(prefix)/share
- sysconfdir = $(prefix)/etc
- sharedstatedir = $(prefix)/com
--localstatedir = $(prefix)/var
-+localstatedir = /var/run
- libdir = $(exec_prefix)/lib
- infodir = $(prefix)/info
- mandir = $(prefix)/man
-@@ -38,6 +38,7 @@ oldincludedir = /usr/include
-
- INSTALL = @INSTALL@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-+INSTALL_SCRIPT = @INSTALL_SCRIPT@
- INSTALL_DATA = @INSTALL_DATA@
- transform = @program_transform_name@
-
-@@ -68,7 +69,7 @@ DIST_CONF = Makefile.am Makefile.in
- DIST_FILES = $(DIST_CONF) $(SOURCES) $(TEXINFOS) $(INFOS) $(MANS) $(DIST_OTHER)
-
- # The default database to build and search.
--LOCATE_DB = $(localstatedir)/locatedb
-+LOCATE_DB = /var/db/locate.database
-
- PROGRAMS = locate
- LIBPROGRAMS = frcode code bigram
-@@ -96,9 +97,12 @@ install:: install-programs
-
- install-programs: $(PROGRAMS) $(SCRIPTS)
- $(top_srcdir)/mkinstalldirs $(bindir)
-- for p in $(PROGRAMS) $(SCRIPTS); do \
-+ for p in $(PROGRAMS); do \
- $(INSTALL_PROGRAM) $$p $(bindir)/`echo $$p|sed '$(transform)'`; \
- done
-+ for p in $(SCRIPTS); do \
-+ $(INSTALL_SCRIPT) $$p $(bindir)/`echo $$p|sed '$(transform)'`; \
-+ done
-
- uninstall:: uninstall-programs
-
-@@ -140,14 +144,15 @@ install-man:
- for man in $(MANS); do \
- sect=`echo $$man|sed 's%.*\.\([0-9][a-z]*\)$$%\1%'`; \
- inst=`basename $$man $$sect|sed '$(transform)'`$$sect; \
-+ inst0=`basename $$man $$sect|sed '$(transform)'`0; \
- mdir=$(mandir)/man$$sect; \
- $(top_srcdir)/mkinstalldirs $$mdir; \
- echo installing $$man as $$mdir/$$inst; \
- $(INSTALL_DATA) $(srcdir)/$$man $$mdir/$$inst; \
- cdir=$(mandir)/cat$$sect; \
- if test -d $$cdir; then \
-- echo formatting $$man as $$cdir/$$inst; \
-- $(NROFF) -man $(srcdir)/$$man > $$cdir/$$inst; \
-+ echo formatting $$man as $$cdir/$$inst0; \
-+ $(NROFF) -man $(srcdir)/$$man > $$cdir/$$inst0; \
- fi; \
- done
-
diff --git a/sysutils/findutils/patches/patch-ab b/sysutils/findutils/patches/patch-ab
deleted file mode 100644
index cafae650214..00000000000
--- a/sysutils/findutils/patches/patch-ab
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 1999/12/10 17:32:59 bouyer Exp $
-
---- configure.old Fri Dec 10 07:32:53 1999
-+++ configure Fri Dec 10 07:32:57 1999
-@@ -633,6 +633,7 @@
- # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
- # It thinks the first close brace ends the variable substitution.
- test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
-+test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
-
- test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
-
-@@ -2601,6 +2602,7 @@
- s%@CC@%$CC%g
- s%@CPP@%$CPP%g
- s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g
-+s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g
- s%@INSTALL_DATA@%$INSTALL_DATA%g
- s%@RANLIB@%$RANLIB%g
- s%@SET_MAKE@%$SET_MAKE%g
diff --git a/sysutils/findutils/patches/patch-ac b/sysutils/findutils/patches/patch-ac
deleted file mode 100644
index 28aece041a7..00000000000
--- a/sysutils/findutils/patches/patch-ac
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2002/10/22 11:35:40 wiz Exp $
-
---- find/Makefile.in.orig Sat Nov 5 15:43:52 1994
-+++ find/Makefile.in
-@@ -98,14 +98,15 @@ install-man:
- for man in $(MANS); do \
- sect=`echo $$man|sed 's%.*\.\([0-9][a-z]*\)$$%\1%'`; \
- inst=`basename $$man $$sect|sed '$(transform)'`$$sect; \
-+ inst0=`basename $$man $$sect|sed '$(transform)'`0; \
- mdir=$(mandir)/man$$sect; \
- $(top_srcdir)/mkinstalldirs $$mdir; \
- echo installing $$man as $$mdir/$$inst; \
- $(INSTALL_DATA) $(srcdir)/$$man $$mdir/$$inst; \
- cdir=$(mandir)/cat$$sect; \
- if test -d $$cdir; then \
-- echo formatting $$man as $$cdir/$$inst; \
-- $(NROFF) -man $(srcdir)/$$man > $$cdir/$$inst; \
-+ echo formatting $$man as $$cdir/$$inst0; \
-+ $(NROFF) -man $(srcdir)/$$man > $$cdir/$$inst0; \
- fi; \
- done
-
diff --git a/sysutils/findutils/patches/patch-ad b/sysutils/findutils/patches/patch-ad
deleted file mode 100644
index ec26455e350..00000000000
--- a/sysutils/findutils/patches/patch-ad
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2002/10/22 11:35:40 wiz Exp $
-
---- xargs/Makefile.in.orig Sat Nov 5 15:44:18 1994
-+++ xargs/Makefile.in
-@@ -97,14 +97,15 @@ install-man:
- for man in $(MANS); do \
- sect=`echo $$man|sed 's%.*\.\([0-9][a-z]*\)$$%\1%'`; \
- inst=`basename $$man $$sect|sed '$(transform)'`$$sect; \
-+ inst0=`basename $$man $$sect|sed '$(transform)'`0; \
- mdir=$(mandir)/man$$sect; \
- $(top_srcdir)/mkinstalldirs $$mdir; \
- echo installing $$man as $$mdir/$$inst; \
- $(INSTALL_DATA) $(srcdir)/$$man $$mdir/$$inst; \
- cdir=$(mandir)/cat$$sect; \
- if test -d $$cdir; then \
-- echo formatting $$man as $$cdir/$$inst; \
-- $(NROFF) -man $(srcdir)/$$man > $$cdir/$$inst; \
-+ echo formatting $$man as $$cdir/$$inst0; \
-+ $(NROFF) -man $(srcdir)/$$man > $$cdir/$$inst0; \
- fi; \
- done
-
diff --git a/sysutils/fix4SA110rev2/DESCR b/sysutils/fix4SA110rev2/DESCR
deleted file mode 100644
index 7f575c27ad1..00000000000
--- a/sysutils/fix4SA110rev2/DESCR
+++ /dev/null
@@ -1,10 +0,0 @@
-fix4SA110rev2 modifies arm32 binaries in an attempt to work around
-StrongARM rev2 problems
-
-It attempts to identify the instructions that will cause problems
-and moves them to a safe location. The "safe" location is final
-page of the text (code) segment of the executable, which normally
-has some spare bytes before the start of the data segment. Having
-moved the instruction, it then puts a branch to the new location
-where the old instruction used to be so that things will continue
-to work.
diff --git a/sysutils/fix4SA110rev2/Makefile b/sysutils/fix4SA110rev2/Makefile
deleted file mode 100644
index da09dfcf34e..00000000000
--- a/sysutils/fix4SA110rev2/Makefile
+++ /dev/null
@@ -1,24 +0,0 @@
-# $NetBSD: Makefile,v 1.5 2003/06/11 20:50:59 abs Exp $
-#
-
-DISTNAME= fix4SA110rev2-1.0
-WRKSRC= ${WRKDIR}
-CATEGORIES= sysutils
-MASTER_SITES= ftp://ftp.netbsd.org/pub/NetBSD/arch/arm32/misc/
-DISTFILES= fix4SA110rev2.c fix4SA110rev2.README
-
-MAINTAINER= abs@netbsd.org
-HOMEPAGE= ftp://ftp.netbsd.org/pub/NetBSD/arch/arm32/misc/fix4SA110rev2.README
-COMMENT= Modify arm32 binaries to work around SA rev2 problems
-
-ONLY_FOR_PLATFORM= NetBSD-*-arm NetBSD-*-arm32
-EXTRACT_CMD= ${CP} ${DOWNLOADED_DISTFILE} ${WRKSRC}
-
-do-build:
- ${CC} ${CFLAGS} -o ${WRKSRC}/fix4SA110rev2 ${WRKSRC}/fix4SA110rev2.c
-
-do-install:
- ${INSTALL_PROGRAM} ${WRKSRC}/fix4SA110rev2 ${PREFIX}/bin
- ${INSTALL_DATA} ${WRKSRC}/fix4SA110rev2.README ${PREFIX}/share/doc
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/fix4SA110rev2/PLIST b/sysutils/fix4SA110rev2/PLIST
deleted file mode 100644
index 22e4d7101cd..00000000000
--- a/sysutils/fix4SA110rev2/PLIST
+++ /dev/null
@@ -1,3 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 22:53:08 zuntum Exp $
-bin/fix4SA110rev2
-share/doc/fix4SA110rev2.README
diff --git a/sysutils/fix4SA110rev2/distinfo b/sysutils/fix4SA110rev2/distinfo
deleted file mode 100644
index 7fd92b79ac0..00000000000
--- a/sysutils/fix4SA110rev2/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.2 2001/04/19 11:29:02 agc Exp $
-
-SHA1 (fix4SA110rev2.c) = c7043743e482087322b4dce346649af5b221ae36
-Size (fix4SA110rev2.c) = 8170 bytes
-SHA1 (fix4SA110rev2.README) = 7ffd9c6dc9c311c4cc47d7544fb2e89961108f3a
-Size (fix4SA110rev2.README) = 2724 bytes
diff --git a/sysutils/fsviewer/DESCR b/sysutils/fsviewer/DESCR
deleted file mode 100644
index 1f67fcddcaa..00000000000
--- a/sysutils/fsviewer/DESCR
+++ /dev/null
@@ -1,3 +0,0 @@
-FSViewer is a NeXT FileViewer lookalike for Window Maker. Viewing is currently
-supported via browser mode and list mode. It has been written in C using the
-WINGs library.
diff --git a/sysutils/fsviewer/Makefile b/sysutils/fsviewer/Makefile
deleted file mode 100644
index 41f89daf8be..00000000000
--- a/sysutils/fsviewer/Makefile
+++ /dev/null
@@ -1,32 +0,0 @@
-# $NetBSD: Makefile,v 1.10 2003/07/13 13:53:14 wiz Exp $
-#
-
-DISTNAME= FSViewer.app-0.2.3
-PKGNAME= FSViewer-0.2.3
-PKGREVISION= 2
-CATEGORIES= sysutils x11 windowmaker
-MASTER_SITES= http://www.csn.ul.ie/~clernong/download/
-DISTFILES= ${DISTNAME}${EXTRACT_SUFX} icons.tar.gz
-
-MAINTAINER= johnam@mail.kemper.org
-HOMEPAGE= http://www.csn.ul.ie/~clernong/projects/fsviewer.html
-COMMENT= NextStep-like Filemanager for WindowMaker
-
-DIST_SUBDIR= fsviewer
-EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
-
-# needed for the new location of WINGs include files -- can be removed
-# when the application gets updated for windowmaker>=0.64.0
-CFLAGS+= -I${BUILDLINK_PREFIX.windowmaker}/include/WINGs
-
-USE_GMAKE= yes
-GNU_CONFIGURE= yes
-USE_X11= yes
-USE_BUILDLINK2= yes
-
-post-install:
- cd ${PREFIX}/GNUstep/Apps/FSViewer.app && \
- ${PAX} -O -zrf ${_DISTDIR}${DISTSUBDIR}/icons.tar.gz *.xpm *.tif
-
-.include "../../wm/windowmaker/buildlink2.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/fsviewer/PLIST b/sysutils/fsviewer/PLIST
deleted file mode 100644
index e0eb98cc0a8..00000000000
--- a/sysutils/fsviewer/PLIST
+++ /dev/null
@@ -1,163 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 22:53:09 zuntum Exp $
-GNUstep/Apps/FSViewer.app/FSViewer
-GNUstep/Apps/FSViewer.app/MagicFiles
-GNUstep/Apps/FSViewer.app/tiff/FSViewer.tif
-GNUstep/Apps/FSViewer.app/tiff/exec-link.tif
-GNUstep/Apps/FSViewer.app/tiff/file-core.tif
-GNUstep/Apps/FSViewer.app/tiff/file-dot-a.tif
-GNUstep/Apps/FSViewer.app/tiff/file-dot-aiff.tif
-GNUstep/Apps/FSViewer.app/tiff/file-dot-au.tif
-GNUstep/Apps/FSViewer.app/tiff/file-dot-avi.tif
-GNUstep/Apps/FSViewer.app/tiff/file-dot-bz2.tif
-GNUstep/Apps/FSViewer.app/tiff/file-dot-c.tif
-GNUstep/Apps/FSViewer.app/tiff/file-dot-cc.tif
-GNUstep/Apps/FSViewer.app/tiff/file-dot-class.tif
-GNUstep/Apps/FSViewer.app/tiff/file-dot-conf.tif
-GNUstep/Apps/FSViewer.app/tiff/file-dot-cpp.tif
-GNUstep/Apps/FSViewer.app/tiff/file-dot-dat.tif
-GNUstep/Apps/FSViewer.app/tiff/file-dot-deb.tif
-GNUstep/Apps/FSViewer.app/tiff/file-dot-eps.tif
-GNUstep/Apps/FSViewer.app/tiff/file-dot-f90.tif
-GNUstep/Apps/FSViewer.app/tiff/file-dot-fig.tif
-GNUstep/Apps/FSViewer.app/tiff/file-dot-for.tif
-GNUstep/Apps/FSViewer.app/tiff/file-dot-gif.tif
-GNUstep/Apps/FSViewer.app/tiff/file-dot-gz.tif
-GNUstep/Apps/FSViewer.app/tiff/file-dot-h.tif
-GNUstep/Apps/FSViewer.app/tiff/file-dot-html.tif
-GNUstep/Apps/FSViewer.app/tiff/file-dot-jar.tif
-GNUstep/Apps/FSViewer.app/tiff/file-dot-java.tif
-GNUstep/Apps/FSViewer.app/tiff/file-dot-jpg.tif
-GNUstep/Apps/FSViewer.app/tiff/file-dot-m.tif
-GNUstep/Apps/FSViewer.app/tiff/file-dot-mov.tif
-GNUstep/Apps/FSViewer.app/tiff/file-dot-mp3.tif
-GNUstep/Apps/FSViewer.app/tiff/file-dot-mpg.tif
-GNUstep/Apps/FSViewer.app/tiff/file-dot-o.tif
-GNUstep/Apps/FSViewer.app/tiff/file-dot-pdf.tif
-GNUstep/Apps/FSViewer.app/tiff/file-dot-pedro.tif
-GNUstep/Apps/FSViewer.app/tiff/file-dot-pl.tif
-GNUstep/Apps/FSViewer.app/tiff/file-dot-png.tif
-GNUstep/Apps/FSViewer.app/tiff/file-dot-ps.tif
-GNUstep/Apps/FSViewer.app/tiff/file-dot-py.tif
-GNUstep/Apps/FSViewer.app/tiff/file-dot-rc.tif
-GNUstep/Apps/FSViewer.app/tiff/file-dot-rpm.tif
-GNUstep/Apps/FSViewer.app/tiff/file-dot-sh.tif
-GNUstep/Apps/FSViewer.app/tiff/file-dot-shar.tif
-GNUstep/Apps/FSViewer.app/tiff/file-dot-so.tif
-GNUstep/Apps/FSViewer.app/tiff/file-dot-tar.tif
-GNUstep/Apps/FSViewer.app/tiff/file-dot-tcl.tif
-GNUstep/Apps/FSViewer.app/tiff/file-dot-tex.tif
-GNUstep/Apps/FSViewer.app/tiff/file-dot-texi.tif
-GNUstep/Apps/FSViewer.app/tiff/file-dot-tga.tif
-GNUstep/Apps/FSViewer.app/tiff/file-dot-tif.tif
-GNUstep/Apps/FSViewer.app/tiff/file-dot-txt.tif
-GNUstep/Apps/FSViewer.app/tiff/file-dot-wav.tif
-GNUstep/Apps/FSViewer.app/tiff/file-dot-xbm.tif
-GNUstep/Apps/FSViewer.app/tiff/file-dot-xcf.tif
-GNUstep/Apps/FSViewer.app/tiff/file-dot-xpm.tif
-GNUstep/Apps/FSViewer.app/tiff/file-dot-zip.tif
-GNUstep/Apps/FSViewer.app/tiff/file-executable.tif
-GNUstep/Apps/FSViewer.app/tiff/file-generic-gnustep.tif
-GNUstep/Apps/FSViewer.app/tiff/file-generic-text.tif
-GNUstep/Apps/FSViewer.app/tiff/file-link.tif
-GNUstep/Apps/FSViewer.app/tiff/file-makefile.tif
-GNUstep/Apps/FSViewer.app/tiff/file-plain.tif
-GNUstep/Apps/FSViewer.app/tiff/file-readme.tif
-GNUstep/Apps/FSViewer.app/tiff/folder-link.tif
-GNUstep/Apps/FSViewer.app/tiff/folder.tif
-GNUstep/Apps/FSViewer.app/tiff/fullfolder.tif
-GNUstep/Apps/FSViewer.app/tiff/generic-coding.tif
-GNUstep/Apps/FSViewer.app/tiff/generic-conf.tif
-GNUstep/Apps/FSViewer.app/tiff/generic-config.tif
-GNUstep/Apps/FSViewer.app/tiff/generic-library.tif
-GNUstep/Apps/FSViewer.app/tiff/generic-sound.tif
-GNUstep/Apps/FSViewer.app/tiff/generic-text.tif
-GNUstep/Apps/FSViewer.app/tiff/home.tif
-GNUstep/Apps/FSViewer.app/tiff/mycomputer.tif
-GNUstep/Apps/FSViewer.app/tiff/neighbour.tif
-GNUstep/Apps/FSViewer.app/xpm/FSViewer.xpm
-GNUstep/Apps/FSViewer.app/xpm/FSViewer2.xpm
-GNUstep/Apps/FSViewer.app/xpm/Folder.xpm
-GNUstep/Apps/FSViewer.app/xpm/arrow.xpm
-GNUstep/Apps/FSViewer.app/xpm/clk.xpm
-GNUstep/Apps/FSViewer.app/xpm/date.xpm
-GNUstep/Apps/FSViewer.app/xpm/exec-link.xpm
-GNUstep/Apps/FSViewer.app/xpm/file-core.xpm
-GNUstep/Apps/FSViewer.app/xpm/file-dot-a.xpm
-GNUstep/Apps/FSViewer.app/xpm/file-dot-aiff.xpm
-GNUstep/Apps/FSViewer.app/xpm/file-dot-au.xpm
-GNUstep/Apps/FSViewer.app/xpm/file-dot-avi.xpm
-GNUstep/Apps/FSViewer.app/xpm/file-dot-bz2.xpm
-GNUstep/Apps/FSViewer.app/xpm/file-dot-c.xpm
-GNUstep/Apps/FSViewer.app/xpm/file-dot-cc.xpm
-GNUstep/Apps/FSViewer.app/xpm/file-dot-class.xpm
-GNUstep/Apps/FSViewer.app/xpm/file-dot-conf.xpm
-GNUstep/Apps/FSViewer.app/xpm/file-dot-cpp.xpm
-GNUstep/Apps/FSViewer.app/xpm/file-dot-dat.xpm
-GNUstep/Apps/FSViewer.app/xpm/file-dot-deb.xpm
-GNUstep/Apps/FSViewer.app/xpm/file-dot-eps.xpm
-GNUstep/Apps/FSViewer.app/xpm/file-dot-f90.xpm
-GNUstep/Apps/FSViewer.app/xpm/file-dot-fig.xpm
-GNUstep/Apps/FSViewer.app/xpm/file-dot-for.xpm
-GNUstep/Apps/FSViewer.app/xpm/file-dot-gif.xpm
-GNUstep/Apps/FSViewer.app/xpm/file-dot-gz.xpm
-GNUstep/Apps/FSViewer.app/xpm/file-dot-h.xpm
-GNUstep/Apps/FSViewer.app/xpm/file-dot-html.xpm
-GNUstep/Apps/FSViewer.app/xpm/file-dot-jar.xpm
-GNUstep/Apps/FSViewer.app/xpm/file-dot-java.xpm
-GNUstep/Apps/FSViewer.app/xpm/file-dot-jpg.xpm
-GNUstep/Apps/FSViewer.app/xpm/file-dot-m.xpm
-GNUstep/Apps/FSViewer.app/xpm/file-dot-mov.xpm
-GNUstep/Apps/FSViewer.app/xpm/file-dot-mp3.xpm
-GNUstep/Apps/FSViewer.app/xpm/file-dot-mpg.xpm
-GNUstep/Apps/FSViewer.app/xpm/file-dot-o.xpm
-GNUstep/Apps/FSViewer.app/xpm/file-dot-pdf.xpm
-GNUstep/Apps/FSViewer.app/xpm/file-dot-pedro.xpm
-GNUstep/Apps/FSViewer.app/xpm/file-dot-pl.xpm
-GNUstep/Apps/FSViewer.app/xpm/file-dot-png.xpm
-GNUstep/Apps/FSViewer.app/xpm/file-dot-ps.xpm
-GNUstep/Apps/FSViewer.app/xpm/file-dot-py.xpm
-GNUstep/Apps/FSViewer.app/xpm/file-dot-rc.xpm
-GNUstep/Apps/FSViewer.app/xpm/file-dot-rpm.xpm
-GNUstep/Apps/FSViewer.app/xpm/file-dot-sh.xpm
-GNUstep/Apps/FSViewer.app/xpm/file-dot-shar.xpm
-GNUstep/Apps/FSViewer.app/xpm/file-dot-so.xpm
-GNUstep/Apps/FSViewer.app/xpm/file-dot-tar.xpm
-GNUstep/Apps/FSViewer.app/xpm/file-dot-tcl.xpm
-GNUstep/Apps/FSViewer.app/xpm/file-dot-tex.xpm
-GNUstep/Apps/FSViewer.app/xpm/file-dot-texi.xpm
-GNUstep/Apps/FSViewer.app/xpm/file-dot-tga.xpm
-GNUstep/Apps/FSViewer.app/xpm/file-dot-txt.xpm
-GNUstep/Apps/FSViewer.app/xpm/file-dot-wav.xpm
-GNUstep/Apps/FSViewer.app/xpm/file-dot-xbm.xpm
-GNUstep/Apps/FSViewer.app/xpm/file-dot-xcf.xpm
-GNUstep/Apps/FSViewer.app/xpm/file-dot-xpm.xpm
-GNUstep/Apps/FSViewer.app/xpm/file-dot-zip.xpm
-GNUstep/Apps/FSViewer.app/xpm/file-executable.xpm
-GNUstep/Apps/FSViewer.app/xpm/file-generic-gnustep.xpm
-GNUstep/Apps/FSViewer.app/xpm/file-link.xpm
-GNUstep/Apps/FSViewer.app/xpm/file-makefile.xpm
-GNUstep/Apps/FSViewer.app/xpm/file-plain.xpm
-GNUstep/Apps/FSViewer.app/xpm/file-readme.xpm
-GNUstep/Apps/FSViewer.app/xpm/file_plain.xpm
-GNUstep/Apps/FSViewer.app/xpm/folder-link.xpm
-GNUstep/Apps/FSViewer.app/xpm/folder.xpm
-GNUstep/Apps/FSViewer.app/xpm/full-folder.xpm
-GNUstep/Apps/FSViewer.app/xpm/generic-coding.xpm
-GNUstep/Apps/FSViewer.app/xpm/generic-conf.xpm
-GNUstep/Apps/FSViewer.app/xpm/generic-library.xpm
-GNUstep/Apps/FSViewer.app/xpm/generic-sound.xpm
-GNUstep/Apps/FSViewer.app/xpm/generic-text.xpm
-GNUstep/Apps/FSViewer.app/xpm/home.xpm
-GNUstep/Apps/FSViewer.app/xpm/led.xpm
-GNUstep/Apps/FSViewer.app/xpm/month.xpm
-GNUstep/Apps/FSViewer.app/xpm/mycomputer.xpm
-GNUstep/Apps/FSViewer.app/xpm/neighbour.xpm
-GNUstep/Apps/FSViewer.app/xpm/penguin.xpm
-GNUstep/Apps/FSViewer.app/xpm/weekday.xpm
-GNUstep/Apps/FSViewer.app/xpm/wmanalog.xpm
-GNUstep/Apps/FSViewer.app/xpm/wmdigital.xpm
-GNUstep/Apps/FSViewer.app/xpm/wmtime.xpm
-GNUstep/Apps/FSViewer.app/xpm/year.xpm
-@dirrm GNUstep/Apps/FSViewer.app/xpm
-@dirrm GNUstep/Apps/FSViewer.app/tiff
-@dirrm GNUstep/Apps/FSViewer.app
diff --git a/sysutils/fsviewer/distinfo b/sysutils/fsviewer/distinfo
deleted file mode 100644
index 50872cd01a5..00000000000
--- a/sysutils/fsviewer/distinfo
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: distinfo,v 1.4 2001/10/05 14:16:04 wiz Exp $
-
-SHA1 (fsviewer/FSViewer.app-0.2.3.tar.gz) = 2322d2443a7505748d5b452d366d6881c7a81110
-Size (fsviewer/FSViewer.app-0.2.3.tar.gz) = 203476 bytes
-SHA1 (fsviewer/icons.tar.gz) = 3553149133abebf526ba38795a07fa4d48fc6827
-Size (fsviewer/icons.tar.gz) = 475679 bytes
-SHA1 (patch-aa) = 32f1bc29dc57922b716a360c208be22a4c7aba54
-SHA1 (patch-ab) = 766277775f2b7301b27fafc7259b35a30e3de4cf
-SHA1 (patch-ac) = 7ac9166c7dad050ef7f9aeb9ca54154a4f034aaf
-SHA1 (patch-ad) = d81cc263f985db77e4fcae5d55cfa5bb2eedc4d5
-SHA1 (patch-ae) = 7e35dd9a28622634770785d4fbfe766644c290d0
-SHA1 (patch-af) = 4a6f12abe840ac04927d3e22f1523cd2dff2ac0d
-SHA1 (patch-ag) = 3123af4181b684b553e490b66e981247dbb5c3b5
-SHA1 (patch-ah) = 9a84bd4f64a938126cbc5f250ef75885f68b56dc
-SHA1 (patch-ai) = 6696208d293f86d71a2b4fd6f0af642e13be3250
diff --git a/sysutils/fsviewer/patches/patch-aa b/sysutils/fsviewer/patches/patch-aa
deleted file mode 100644
index 4733e685d84..00000000000
--- a/sysutils/fsviewer/patches/patch-aa
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2001/03/14 10:38:11 wiz Exp $
-
---- src/DnD.c.orig Sat Oct 9 20:45:23 1999
-+++ src/DnD.c
-@@ -21,8 +21,11 @@
- #include <X11/cursorfont.h>
- #include <stdio.h>
- #include <stdlib.h>
-+#ifndef __NetBSD__
- #include <values.h>
--
-+#else
-+#define MAXINT 32
-+#endif
- #include "DnD.h"
-
- /* #define DEBUG */
diff --git a/sysutils/fsviewer/patches/patch-ab b/sysutils/fsviewer/patches/patch-ab
deleted file mode 100644
index 5fe0ad2fd42..00000000000
--- a/sysutils/fsviewer/patches/patch-ab
+++ /dev/null
@@ -1,30 +0,0 @@
-$NetBSD: patch-ab,v 1.2 2001/07/22 17:42:08 wiz Exp $
-
---- src/FSFileView.c.orig Sat Oct 9 20:45:21 1999
-+++ src/FSFileView.c
-@@ -397,10 +397,10 @@
- if ((fView->primary))
- {
- memset((void *) &attributes, 0, sizeof(GNUstepWMAttributes));
-- attributes.window_style = (NSTitledWindowMask |
-- NSMiniaturizableWindowMask |
-- NSResizableWindowMask);
-- attributes.window_level = NSNormalWindowLevel;
-+ attributes.window_style = (WMTitledWindowMask |
-+ WMMiniaturizableWindowMask |
-+ WMResizableWindowMask);
-+ attributes.window_level = WMNormalWindowLevel;
- attributes.extra_flags = GSFullKeyboardEventsFlag;
- attributes.flags = (GSWindowStyleAttr | GSWindowLevelAttr |
- GSExtraFlagsAttr);
-@@ -444,8 +444,8 @@
- WMViewSizeDidChangeNotification,
- WMWidgetView(fView->fileBrowserF));
-
-- WMSetWindowMiniwindowImage(fView->fileView,
-- WMGetApplicationIconImage(fView->scr));
-+ WMSetWindowMiniwindowPixmap(fView->fileView,
-+ WMGetApplicationIconPixmap(fView->scr));
-
- array = WMGetUDObjectForKey(defaultsDB, "SHELF");
- if(array && PLIsArray(array))
diff --git a/sysutils/fsviewer/patches/patch-ac b/sysutils/fsviewer/patches/patch-ac
deleted file mode 100644
index 4be9a76eb5a..00000000000
--- a/sysutils/fsviewer/patches/patch-ac
+++ /dev/null
@@ -1,32 +0,0 @@
-$NetBSD: patch-ac,v 1.2 2001/07/22 17:42:09 wiz Exp $
-
---- src/FSFinder.c.orig Sat Oct 9 20:45:24 1999
-+++ src/FSFinder.c
-@@ -138,11 +138,11 @@
- }
-
- memset((void *) &attributes, 0, sizeof(GNUstepWMAttributes));
-- attributes.window_style = (NSTitledWindowMask |
-- NSMiniaturizableWindowMask |
-- NSClosableWindowMask |
-- NSResizableWindowMask);
-- attributes.window_level = NSNormalWindowLevel;
-+ attributes.window_style = (WMTitledWindowMask |
-+ WMMiniaturizableWindowMask |
-+ WMClosableWindowMask |
-+ WMResizableWindowMask);
-+ attributes.window_level = WMNormalWindowLevel;
- attributes.extra_flags = GSFullKeyboardEventsFlag;
- attributes.flags = (GSWindowStyleAttr | GSWindowLevelAttr |
- GSExtraFlagsAttr);
-@@ -172,8 +172,8 @@
- WMTextDidEndEditingNotification,
- finder->searchField);
-
-- WMSetWindowMiniwindowImage(finder->win,
-- WMGetApplicationIconImage(finder->scr));
-+ WMSetWindowMiniwindowPixmap(finder->win,
-+ WMGetApplicationIconPixmap(finder->scr));
-
- return finder;
- }
diff --git a/sysutils/fsviewer/patches/patch-ad b/sysutils/fsviewer/patches/patch-ad
deleted file mode 100644
index 1385a5de7f4..00000000000
--- a/sysutils/fsviewer/patches/patch-ad
+++ /dev/null
@@ -1,50 +0,0 @@
-$NetBSD: patch-ad,v 1.2 2001/07/22 17:42:09 wiz Exp $
-
---- src/FSViewer.c.orig Sat Oct 9 20:45:22 1999
-+++ src/FSViewer.c
-@@ -127,8 +127,8 @@
- }
-
- memset((void *) &attributes, 0, sizeof(GNUstepWMAttributes));
-- attributes.window_style = (NSTitledWindowMask | NSClosableWindowMask);
-- attributes.window_level = NSFloatingWindowLevel;
-+ attributes.window_style = (WMTitledWindowMask | WMClosableWindowMask);
-+ attributes.window_level = WMFloatingWindowLevel;
- attributes.extra_flags = GSFullKeyboardEventsFlag;
- attributes.flags =
- (GSWindowStyleAttr | GSWindowLevelAttr | GSExtraFlagsAttr);
-@@ -153,10 +153,10 @@
- }
-
- memset((void *) &attributes, 0, sizeof(GNUstepWMAttributes));
-- attributes.window_style = (NSTitledWindowMask |
-- NSClosableWindowMask |
-- NSMiniaturizableWindowMask);
-- attributes.window_level = NSNormalWindowLevel;
-+ attributes.window_style = (WMTitledWindowMask |
-+ WMClosableWindowMask |
-+ WMMiniaturizableWindowMask);
-+ attributes.window_level = WMNormalWindowLevel;
- attributes.extra_flags = GSFullKeyboardEventsFlag;
- attributes.flags =
- (GSWindowStyleAttr | GSWindowLevelAttr | GSExtraFlagsAttr);
-@@ -182,8 +182,8 @@
- // This is horrible: there must be a better way?
- XStoreName(fsViewer->dpy, window, " ");
- memset((void *) &attributes, 0, sizeof(GNUstepWMAttributes));
-- attributes.window_style = (NSTitledWindowMask);
-- attributes.window_level = NSFloatingWindowLevel;
-+ attributes.window_style = (WMTitledWindowMask);
-+ attributes.window_level = WMFloatingWindowLevel;
- attributes.extra_flags = GSFullKeyboardEventsFlag;
- attributes.flags =
- (GSWindowStyleAttr | GSWindowLevelAttr | GSExtraFlagsAttr);
-@@ -417,7 +417,7 @@
- if ((fsViewer->wmpixmap = WMCreatePixmapFromRImage(fsViewer->scr,
- fsViewer->image, 0)))
- {
-- WMSetApplicationIconImage(fsViewer->scr, fsViewer->wmpixmap);
-+ WMSetApplicationIconPixmap(fsViewer->scr, fsViewer->wmpixmap);
- }
- }
-
diff --git a/sysutils/fsviewer/patches/patch-ae b/sysutils/fsviewer/patches/patch-ae
deleted file mode 100644
index 83b6b8e26b6..00000000000
--- a/sysutils/fsviewer/patches/patch-ae
+++ /dev/null
@@ -1,37 +0,0 @@
-$NetBSD: patch-ae,v 1.1 2001/07/22 17:42:09 wiz Exp $
-
---- src/FSPanel.c.orig Sat Oct 9 20:45:22 1999
-+++ src/FSPanel.c
-@@ -103,7 +103,7 @@
- WMSetWindowTitle(info->win, "Info");
- WMSetWindowCloseAction(info->win, FSCloseInfoPanel, (void *) info);
-
-- if ((appicon = WMGetApplicationIconImage(info->scr)))
-+ if ((appicon = WMGetApplicationIconPixmap(info->scr)))
- {
- WMSize appIconSize;
-
-@@ -624,13 +624,7 @@
- FSSetFSViewerConfirmWindow(app, WMWidgetXID(confirm->win));
- WMMapWidget(confirm->win);
-
-- while (!(confirm->done))
-- {
-- XEvent event;
--
-- WMNextEvent(dpy, &event);
-- WMHandleEvent(&event);
-- }
-+ WMRunModalLoop(scr, W_VIEW(confirm->win));
- result = confirm->result;
-
- WMDestroyAlertPanel(confirm);
-@@ -1257,7 +1251,7 @@
-
- normalFont = WMSystemFontOfSize(alertPanel->scr, 10);
-
-- appIcon = WMGetApplicationIconImage(alertPanel->scr);
-+ appIcon = WMGetApplicationIconPixmap(alertPanel->scr);
- pixmapSize = WMGetPixmapSize(appIcon);
- if (appIcon)
- {
diff --git a/sysutils/fsviewer/patches/patch-af b/sysutils/fsviewer/patches/patch-af
deleted file mode 100644
index afa3b0c0e24..00000000000
--- a/sysutils/fsviewer/patches/patch-af
+++ /dev/null
@@ -1,30 +0,0 @@
-$NetBSD: patch-af,v 1.1 2001/10/05 14:16:04 wiz Exp $
-
---- defs/chdef.c.orig Sat Oct 9 20:45:21 1999
-+++ defs/chdef.c
-@@ -13,6 +13,8 @@
- #include <WINGs.h>
- #include <WUtil.h>
-
-+#include <WINGs/proplist-compat.h>
-+
- #include "../src/config.h"
-
- static proplist_t FSGetDBObjectForKey(proplist_t dict, char *key);
-@@ -371,8 +373,14 @@
- }
-
- SetIntegerForKey(0, "DisplayMCListPixmap");
--
-- PLSave(filesDB, YES);
-+
-+ {
-+ char *home = NULL;
-+ home = wdefaultspathfordomain("FSViewer");
-+ PLSave(filesDB, home, YES);
-+ if (home)
-+ free(home);
-+ }
- result = 0;
- }
- else
diff --git a/sysutils/fsviewer/patches/patch-ag b/sysutils/fsviewer/patches/patch-ag
deleted file mode 100644
index 6f24505a808..00000000000
--- a/sysutils/fsviewer/patches/patch-ag
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ag,v 1.1 2001/10/05 14:16:04 wiz Exp $
-
---- src/timestampWidget.h.orig Sat Oct 9 20:45:22 1999
-+++ src/timestampWidget.h
-@@ -43,6 +43,10 @@
-
- /* Function Prototypes - timestampWidget.c ***********************************/
-
-+#ifndef BOOL
-+#define BOOL int
-+#endif
-+
- extern W_Class InitTimeStamp(WMScreen*);
- extern TimeStamp *CreateTimeStamp(WMWidget*);
- extern void SetTimeStampBlank(TimeStamp*, BOOL);
diff --git a/sysutils/fsviewer/patches/patch-ah b/sysutils/fsviewer/patches/patch-ah
deleted file mode 100644
index 98bc55e788f..00000000000
--- a/sysutils/fsviewer/patches/patch-ah
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ah,v 1.1 2001/10/05 14:16:04 wiz Exp $
-
---- src/FSViewer.h.orig Sat Oct 9 20:59:19 1999
-+++ src/FSViewer.h
-@@ -9,7 +9,7 @@
- #include <X11/Xlib.h>
- #include <WMaker.h>
-
--#include <proplist.h>
-+#include <WINGs/proplist-compat.h>
- #include <wraster.h>
-
- #include <WINGs.h>
diff --git a/sysutils/fsviewer/patches/patch-ai b/sysutils/fsviewer/patches/patch-ai
deleted file mode 100644
index e33b5bff07b..00000000000
--- a/sysutils/fsviewer/patches/patch-ai
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ai,v 1.1 2001/10/05 14:16:04 wiz Exp $
-
---- src/extnInspector.c.orig Sat Oct 9 20:45:22 1999
-+++ src/extnInspector.c
-@@ -226,7 +226,7 @@
- }
-
- if(numRows > 0)
-- PLSave(filesDB, YES);
-+ PLSave(filesDB, extn, YES);
-
- if(extn)
- free(extn);
diff --git a/sysutils/gcdmaster/DESCR b/sysutils/gcdmaster/DESCR
deleted file mode 100644
index 60cb7425bd9..00000000000
--- a/sysutils/gcdmaster/DESCR
+++ /dev/null
@@ -1,12 +0,0 @@
-Focus
- Gnome CD Master is a GUI frontend for creating audio CDs and burning
- them using cdrdao.
-Features
- Easy to use graphical interface
- Multiple project support
- Playing of Audio CD images
- Easy dump of CDs to disk
- CD to CD copy
- Composition of new Audio CDs from wav files
- Graphical insertion of Track Marks (to divide live recordings)
- Easy CD-TEXT modification
diff --git a/sysutils/gcdmaster/Makefile b/sysutils/gcdmaster/Makefile
deleted file mode 100644
index 6bf98473b84..00000000000
--- a/sysutils/gcdmaster/Makefile
+++ /dev/null
@@ -1,40 +0,0 @@
-# $NetBSD: Makefile,v 1.12 2003/07/13 13:53:14 wiz Exp $
-#
-
-DISTNAME= cdrdao-1.1.7.src
-PKGNAME= gcdmaster-1.1.7
-PKGREVISION= 2
-WRKSRC= ${WRKDIR}/cdrdao-1.1.7
-CATEGORIES= sysutils
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=cdrdao/}
-
-MAINTAINER= david@maxwell.net
-HOMEPAGE= http://cdrdao.sourceforge.net/gcdmaster/index.html
-COMMENT= GUI for cdrdao with some editing capability
-
-DEPENDS+= cdrdao-1.1.7:../../sysutils/cdrdao
-
-USE_X11BASE= YES
-GNU_CONFIGURE= YES
-USE_BUILDLINK2= YES
-USE_GMAKE= YES
-CONFIGURE_ARGS+= --with-pcctsbin=${LOCALBASE}/bin
-CONFIGURE_ARGS+= --with-pcctsinc=${LOCALBASE}/include/pccts
-CONFIGURE_ARGS+= --without-posix-threads
-LDFLAGS+= -L../paranoia
-
-#override ARCH to avoid picking up a bad ${ARCH} during the build
-MAKE_ENV+= ARCH=""
-
-post-configure:
- cd ${WRKSRC}/scsilib/RULES ; \
- ${TEST} -f netbsd-cc.rul || ${MV} i386-netbsd-cc.rul netbsd-cc.rul; \
- ${TEST} -f netbsd-gcc.rul || ${MV} i386-netbsd-gcc.rul netbsd-gcc.rul; \
- ${LN} -sf netbsd-gcc.rul ${MACHINE}-netbsd-gcc.rul; \
- ${LN} -sf netbsd-cc.rul ${MACHINE}-netbsd-cc.rul;
-
-.include "../../devel/libglade/buildlink2.mk"
-.include "../../devel/pccts/buildlink2.mk"
-.include "../../x11/gnome--/buildlink2.mk"
-.include "../../x11/gtk--/buildlink2.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/gcdmaster/PLIST b/sysutils/gcdmaster/PLIST
deleted file mode 100644
index 1c0ef6c5c63..00000000000
--- a/sysutils/gcdmaster/PLIST
+++ /dev/null
@@ -1,24 +0,0 @@
-@comment $NetBSD: PLIST,v 1.3 2002/10/29 16:50:14 drochner Exp $
-bin/gcdmaster
-man/man1/xcdrdao.1
-share/pixmaps/gcdmaster/gcdmaster.png
-share/pixmaps/gcdmaster/pixmap_audiocd.png
-share/pixmaps/gcdmaster/pixmap_copycd.png
-share/pixmaps/gcdmaster/pixmap_cursor-tool.xpm
-share/pixmaps/gcdmaster/pixmap_datacd.png
-share/pixmaps/gcdmaster/pixmap_dumpcd.png
-share/pixmaps/gcdmaster/pixmap_help.png
-share/pixmaps/gcdmaster/pixmap_mixedcd.png
-share/pixmaps/gcdmaster/pixmap_open.png
-share/pixmaps/gcdmaster/pixmap_play-pause.xpm
-share/pixmaps/gcdmaster/pixmap_play-start.xpm
-share/pixmaps/gcdmaster/pixmap_play-stop.xpm
-share/pixmaps/gcdmaster/pixmap_zoom-fit.xpm
-share/pixmaps/gcdmaster/pixmap_zoom-in.xpm
-share/pixmaps/gcdmaster/pixmap_zoom-out.xpm
-share/pixmaps/gcdmaster/pixmap_zoom-selection.xpm
-share/pixmaps/gcdmaster/pixmap_zoom-tool.xpm
-share/gnome/apps/Applications/gcdmaster.desktop
-@dirrm share/pixmaps/gcdmaster
-@unexec ${RMDIR} %D/share/gnome/apps/Applications 2> /dev/null || ${TRUE}
-@unexec ${RMDIR} %D/share/gnome/apps 2> /dev/null || ${TRUE}
diff --git a/sysutils/gcdmaster/distinfo b/sysutils/gcdmaster/distinfo
deleted file mode 100644
index c655efc21a4..00000000000
--- a/sysutils/gcdmaster/distinfo
+++ /dev/null
@@ -1,10 +0,0 @@
-$NetBSD: distinfo,v 1.2 2002/10/29 16:50:14 drochner Exp $
-
-SHA1 (cdrdao-1.1.7.src.tar.gz) = d688f8b117de367841958f1ca977100fc4e8484b
-Size (cdrdao-1.1.7.src.tar.gz) = 1433366 bytes
-SHA1 (patch-ab) = 071fedfbc598400d9d41e050aa01c5902e97caaa
-SHA1 (patch-ac) = 7392aad2b18b670023396b47715b292d8046b495
-SHA1 (patch-ad) = 914ee4ce9a22a9b47748c206f96666552bc9bc1e
-SHA1 (patch-ae) = 20c1ae7a24751a01454573ee029ca2c7ad484903
-SHA1 (patch-af) = 51df1d3323a238280bb218a124db583a5c70345f
-SHA1 (patch-ag) = 1f98efd2c8ea46bc4ec148fb7170e192d94b7780
diff --git a/sysutils/gcdmaster/patches/patch-ab b/sysutils/gcdmaster/patches/patch-ab
deleted file mode 100644
index 485c964d209..00000000000
--- a/sysutils/gcdmaster/patches/patch-ab
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 2001/05/19 13:02:23 drochner Exp $
-
-have a default scsi device which is likely to be correct (at least
-on single CD systems).
-
---- dao/main.cc.orig Tue Oct 26 12:13:46 1999
-+++ dao/main.cc Fri Jul 7 12:20:08 2000
-@@ -157,5 +157,9 @@
- #else
-
--static const char *SCSI_DEVICE = "0,0,0";
-+#if defined (__i386__)
-+static const char *SCSI_DEVICE = "/dev/rcd0d";
-+#else
-+static const char *SCSI_DEVICE = "/dev/rcd0c";
-+#endif /* __i386__ */
- static int FIFO_BUFFERS = 32;
-
diff --git a/sysutils/gcdmaster/patches/patch-ac b/sysutils/gcdmaster/patches/patch-ac
deleted file mode 100644
index 3ae84979e99..00000000000
--- a/sysutils/gcdmaster/patches/patch-ac
+++ /dev/null
@@ -1,49 +0,0 @@
-$NetBSD: patch-ac,v 1.2 2002/10/29 16:50:14 drochner Exp $
-
---- ./scsilib/include/btorder.h.orig Sun Nov 25 16:35:10 2001
-+++ ./scsilib/include/btorder.h Tue Oct 29 09:33:02 2002
-@@ -63,35 +63,21 @@
- #endif
-
-
--/*
-- * Convert byte-order definitions from xconfig.h into our values
-- * and verify them.
-- */
--#if defined(HAVE_C_BIGENDIAN) && \
-- !defined(WORDS_BIGENDIAN)
--#define WORDS_LITTLEENDIAN
--#define _LITTLE_ENDIAN
--#endif
--
--#if defined(HAVE_C_BIGENDIAN) && \
-- defined(WORDS_BIGENDIAN)
--#define _BIG_ENDIAN
--#endif
--
--#if defined(_LITTLE_ENDIAN) && defined(_BIG_ENDIAN)
--/*
-- * #error will not work for all compilers (e.g. sunos4)
-- * The following line will abort compilation on all compilers
-- * if none of the above is defines. And that's what we want.
-- */
--error Only one of _LITTLE_ENDIAN or _BIG_ENDIAN may be defined
--#endif
-
-
- #if defined(_BIT_FIELDS_LTOH) || defined(_BIT_FIELDS_HTOL)
- /*
- * Bitorder is already known.
- */
-+
-+#elif defined(__NetBSD__)
-+#include <machine/endian.h>
-+#if BYTE_ORDER == LITTLE_ENDIAN
-+#define _BIT_FIELDS_LTOH
-+#else
-+#define _BIT_FIELDS_HTOL
-+#endif /* BYTE_ORDER == LITTLE_ENDIAN */
-+
- #else
- /*
- * Bitorder not yet known.
diff --git a/sysutils/gcdmaster/patches/patch-ad b/sysutils/gcdmaster/patches/patch-ad
deleted file mode 100644
index 8d9152ccfc1..00000000000
--- a/sysutils/gcdmaster/patches/patch-ad
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ad,v 1.2 2002/10/29 16:50:15 drochner Exp $
-
---- Makefile.in.orig Sun Oct 6 20:53:55 2002
-+++ Makefile.in Tue Oct 29 14:09:07 2002
-@@ -41,8 +41,8 @@
- #
- #
- #
--SUBDIRS = @pccts_target@ @scsilib_dir@ trackdb paranoia dao utils @xdao@
--SUBDIRSINST = trackdb dao utils @xdao@
-+SUBDIRS = @scsilib_dir@ trackdb paranoia dao @xdao@
-+SUBDIRSINST = @xdao@
-
- all:
- for d in $(SUBDIRS) ; do \
diff --git a/sysutils/gcdmaster/patches/patch-ae b/sysutils/gcdmaster/patches/patch-ae
deleted file mode 100644
index 1802f51df1d..00000000000
--- a/sysutils/gcdmaster/patches/patch-ae
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ae,v 1.2 2002/10/29 16:50:15 drochner Exp $
-
---- xdao/Makefile.in.orig Sun Sep 15 18:34:48 2002
-+++ xdao/Makefile.in Tue Oct 29 13:00:56 2002
-@@ -58,7 +58,7 @@
- DeviceList.cc RecordTocSource.cc RecordCDSource.cc \
- RecordHDTarget.cc AudioCDView.cc TocEditView.cc GenericChild.cc \
- GenericView.cc CdTextDialog.cc \
-- @sound_if_src@
-+ SoundIF-linux.cc
-
- OBJ = $(SRC:%.cc=%.o)
-
diff --git a/sysutils/gcdmaster/patches/patch-af b/sysutils/gcdmaster/patches/patch-af
deleted file mode 100644
index 475fb17d7a8..00000000000
--- a/sysutils/gcdmaster/patches/patch-af
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-af,v 1.1.1.1 2001/05/19 13:02:23 drochner Exp $
-
---- xdao/SoundIF-linux.cc.orig Sat May 19 00:12:28 2001
-+++ xdao/SoundIF-linux.cc Sat May 19 00:16:47 2001
-@@ -34,7 +34,7 @@
- *
- */
-
--#include <linux/soundcard.h>
-+#include <soundcard.h>
-
- #include <stdio.h>
- #include <assert.h>
-@@ -167,8 +167,8 @@
- if (dspFd_ >= 0)
- return 0; // already open
-
-- if ((dspFd_ = open("/dev/dsp", O_WRONLY | O_NONBLOCK)) < 0) {
-- message(-1, "Cannot open \"/dev/dsp\": %s", strerror(errno));
-+ if ((dspFd_ = open("/dev/sound", O_WRONLY | O_NONBLOCK)) < 0) {
-+ message(-1, "Cannot open \"/dev/sound\": %s", strerror(errno));
- return 1;
- }
-
diff --git a/sysutils/gcdmaster/patches/patch-ag b/sysutils/gcdmaster/patches/patch-ag
deleted file mode 100644
index 50d0a8f30ea..00000000000
--- a/sysutils/gcdmaster/patches/patch-ag
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ag,v 1.1.1.1 2001/05/19 13:02:23 drochner Exp $
-
---- dao/Makefile.in.orig Sat May 19 14:32:30 2001
-+++ dao/Makefile.in Sat May 19 14:34:00 2001
-@@ -16,7 +16,7 @@
- # Installation directories for binaries and manual pages
- #
- bindir = @bindir@
--datadir = @datadir@
-+datadir = ${LOCALBASE}/share
- mandir = @mandir@
- man1dir = $(mandir)/man1
- #
diff --git a/sysutils/gcombust/DESCR b/sysutils/gcombust/DESCR
deleted file mode 100644
index 2cde56f2c5a..00000000000
--- a/sysutils/gcombust/DESCR
+++ /dev/null
@@ -1,12 +0,0 @@
-Features:
- Burning on the fly, without making an image
- Tooltips to keep you from reading man pages
- Make creation of iso-images easy
- (support for making your own directory hierarchy on the image
- without the need for copying files/making symlinks)
- Maximize disk by hinting which directories/files to use
- (binpacking/knapsack)
- Audio CD creation
- Bootable CD support
- Save/Load path selections (for always taking a backup of the same
- collection of files, etc)
diff --git a/sysutils/gcombust/Makefile b/sysutils/gcombust/Makefile
deleted file mode 100644
index 183649444df..00000000000
--- a/sysutils/gcombust/Makefile
+++ /dev/null
@@ -1,24 +0,0 @@
-# $NetBSD: Makefile,v 1.35 2003/07/13 13:53:15 wiz Exp $
-#
-
-DISTNAME= gcombust-0.1.54
-PKGREVISION= 2
-CATEGORIES= x11 sysutils
-MASTER_SITES= ${HOMEPAGE}
-
-MAINTAINER= rh@netbsd.org
-HOMEPAGE= http://www.abo.fi/~jmunsin/gcombust/
-COMMENT= Graphical frontend for CD mastering (mkisofs, cdrecord, ...)
-
-DEPENDS+= cdrecord>=1.10:../../sysutils/cdrecord
-DEPENDS+= cdlabelgen-[0-9]*:../../graphics/cdlabelgen
-DEPENDS+= gnome1-dirs>=1.0:../../misc/gnome1-dirs
-DEPENDS+= gv-[0-9]*:../../print/gv
-
-USE_BUILDLINK2= YES
-USE_PKGLOCALEDIR= YES
-GNU_CONFIGURE= YES
-
-.include "../../devel/gettext-lib/buildlink2.mk"
-.include "../../x11/gtk/buildlink2.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/gcombust/PLIST b/sysutils/gcombust/PLIST
deleted file mode 100644
index dba1d12b1e2..00000000000
--- a/sysutils/gcombust/PLIST
+++ /dev/null
@@ -1,20 +0,0 @@
-@comment $NetBSD: PLIST,v 1.3 2003/01/15 07:48:06 rh Exp $
-bin/gcombust
-share/gnome/apps/Applications/gcombust.desktop
-${PKGLOCALEDIR}/locale/da/LC_MESSAGES/gcombust.mo
-${PKGLOCALEDIR}/locale/de/LC_MESSAGES/gcombust.mo
-${PKGLOCALEDIR}/locale/es/LC_MESSAGES/gcombust.mo
-${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/gcombust.mo
-${PKGLOCALEDIR}/locale/gl/LC_MESSAGES/gcombust.mo
-${PKGLOCALEDIR}/locale/hr/LC_MESSAGES/gcombust.mo
-${PKGLOCALEDIR}/locale/hu/LC_MESSAGES/gcombust.mo
-${PKGLOCALEDIR}/locale/it/LC_MESSAGES/gcombust.mo
-${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/gcombust.mo
-${PKGLOCALEDIR}/locale/ko/LC_MESSAGES/gcombust.mo
-${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/gcombust.mo
-${PKGLOCALEDIR}/locale/no/LC_MESSAGES/gcombust.mo
-${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/gcombust.mo
-${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/gcombust.mo
-${PKGLOCALEDIR}/locale/sk/LC_MESSAGES/gcombust.mo
-${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/gcombust.mo
-share/pixmaps/gcombust.xpm
diff --git a/sysutils/gcombust/distinfo b/sysutils/gcombust/distinfo
deleted file mode 100644
index 63c4036036f..00000000000
--- a/sysutils/gcombust/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.6 2003/02/15 08:34:20 salo Exp $
-
-SHA1 (gcombust-0.1.54.tar.gz) = 768dbc5e8d88eb2d106e1c19b1012f94a89816d3
-Size (gcombust-0.1.54.tar.gz) = 786628 bytes
-SHA1 (patch-ab) = 437e15e09601345b75afac2f9d6b3e755e4c936d
diff --git a/sysutils/gcombust/patches/patch-ab b/sysutils/gcombust/patches/patch-ab
deleted file mode 100644
index fb7e5d0126e..00000000000
--- a/sysutils/gcombust/patches/patch-ab
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2001/06/11 17:45:55 bouyer Exp $
-
---- src/command.c.orig Wed Jun 6 15:05:16 2001
-+++ src/command.c Wed Jun 6 15:05:38 2001
-@@ -99,6 +99,7 @@
- add_option_to_cmd(cdr_cmd, s);
- free(s);
- } else {
-+#if 0
- /* room for xx,xx,xx\0 */
- char device[9];
- if (-1 == g_snprintf(device, 9, "%i,%i,%i",
-@@ -111,6 +112,7 @@
- s = string_append(s, device);
- add_option_to_cmd(cdr_cmd, s);
- free(s);
-+#endif /* 0 */
- }
-
- if (0 != strlen(gtk_entry_get_text(GTK_ENTRY(cdr_info->driver)))) {
diff --git a/sysutils/genpasswd/DESCR b/sysutils/genpasswd/DESCR
deleted file mode 100644
index 24ba15275ec..00000000000
--- a/sysutils/genpasswd/DESCR
+++ /dev/null
@@ -1,3 +0,0 @@
-Genpasswd generates passwords that are pronouncible in Finnish.
-This is a useful tool for generating initial passwords for new
-accounts (it can output the encrypted password as well).
diff --git a/sysutils/genpasswd/Makefile b/sysutils/genpasswd/Makefile
deleted file mode 100644
index 8e837865be9..00000000000
--- a/sysutils/genpasswd/Makefile
+++ /dev/null
@@ -1,15 +0,0 @@
-# $NetBSD: Makefile,v 1.3 2003/03/28 21:14:35 wiz Exp $
-#
-
-DISTNAME= genpasswd-1.5
-CATEGORIES= sysutils
-MASTER_SITES= ftp://ftp.gw.com/pub/people/kim/
-
-MAINTAINER= kim@tac.nyc.ny.us
-COMMENT= Random password generator
-
-NO_CONFIGURE= yes
-
-INSTALL_TARGET= install install.man DEST=${PREFIX}
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/genpasswd/PLIST b/sysutils/genpasswd/PLIST
deleted file mode 100644
index 4e98aacca52..00000000000
--- a/sysutils/genpasswd/PLIST
+++ /dev/null
@@ -1,3 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 22:53:12 zuntum Exp $
-bin/genpasswd
-man/man1/genpasswd.1
diff --git a/sysutils/genpasswd/distinfo b/sysutils/genpasswd/distinfo
deleted file mode 100644
index 73e01b37bc6..00000000000
--- a/sysutils/genpasswd/distinfo
+++ /dev/null
@@ -1,4 +0,0 @@
-$NetBSD: distinfo,v 1.2 2001/04/19 11:29:02 agc Exp $
-
-SHA1 (genpasswd-1.5.tar.gz) = 0bac3278085b91d80ea35c5d0520333d9226f41a
-Size (genpasswd-1.5.tar.gz) = 2724 bytes
diff --git a/sysutils/gentoo/DESCR b/sysutils/gentoo/DESCR
deleted file mode 100644
index b06642261c2..00000000000
--- a/sysutils/gentoo/DESCR
+++ /dev/null
@@ -1,6 +0,0 @@
-gentoo is a modern, powerful, flexible, and utterly configurable file
-manager for UNIX systems, written using the GTK+ toolkit. It aims to
-be 100% graphically configurable; there's no need to edit config files
-by hand and then restart the application. gentoo is somewhat
-inspired in its look & feel by the classic Amiga program
-DirectoryOpus.
diff --git a/sysutils/gentoo/Makefile b/sysutils/gentoo/Makefile
deleted file mode 100644
index 55dc9807c73..00000000000
--- a/sysutils/gentoo/Makefile
+++ /dev/null
@@ -1,30 +0,0 @@
-# $NetBSD: Makefile,v 1.10 2003/07/13 13:53:15 wiz Exp $
-#
-
-DISTNAME= gentoo-0.11.34
-PKGREVISION= 2
-CATEGORIES= sysutils
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gentoo/}
-
-MAINTAINER= dunse@goa.nu
-HOMEPAGE= http://www.obsession.se/gentoo/
-COMMENT= Two-pane filemanager using GTK+, 100% GUI configurable
-
-BUILD_USES_MSGFMT= YES
-
-GNU_CONFIGURE= YES
-USE_BUILDLINK2= YES
-USE_PKGINSTALL= YES
-USE_PKGLOCALEDIR= YES
-USE_X11= YES
-
-CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
-
-EGDIR= ${PREFIX}/share/examples/gentoo
-CONF_FILES= ${EGDIR}/gentoorc ${PKG_SYSCONFDIR}/gentoorc
-CONF_FILES+= ${EGDIR}/gentoogtkrc ${PKG_SYSCONFDIR}/gentoogtkrc
-
-.include "../../devel/gettext-lib/buildlink2.mk"
-.include "../../x11/gtk/buildlink2.mk"
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/gentoo/PLIST b/sysutils/gentoo/PLIST
deleted file mode 100644
index b44ad685bb9..00000000000
--- a/sysutils/gentoo/PLIST
+++ /dev/null
@@ -1,133 +0,0 @@
-@comment $NetBSD: PLIST,v 1.5 2002/12/07 10:12:42 jmmv Exp $
-bin/gentoo
-share/examples/gentoo/gentoogtkrc
-share/examples/gentoo/gentoorc
-share/gentoo/icons/AbiWord.xpm
-share/gentoo/icons/Amiga.xpm
-share/gentoo/icons/Animation.xpm
-share/gentoo/icons/Apple.xpm
-share/gentoo/icons/BSD.xpm
-share/gentoo/icons/Bad.xpm
-share/gentoo/icons/Battery.xpm
-share/gentoo/icons/CDROM.xpm
-share/gentoo/icons/Card.xpm
-share/gentoo/icons/Database.xpm
-share/gentoo/icons/Directory.xpm
-share/gentoo/icons/Directory2.xpm
-share/gentoo/icons/Document.xpm
-share/gentoo/icons/EggTimer.xpm
-share/gentoo/icons/ExcelCalcXLS.xpm
-share/gentoo/icons/Executable.xpm
-share/gentoo/icons/FIFO.xpm
-share/gentoo/icons/Floppy.xpm
-share/gentoo/icons/Font.xpm
-share/gentoo/icons/GNUstep.xpm
-share/gentoo/icons/Ghost.xpm
-share/gentoo/icons/GnomeCalc.xpm
-share/gentoo/icons/GnomeWord.xpm
-share/gentoo/icons/Harddrive.xpm
-share/gentoo/icons/Image.xpm
-share/gentoo/icons/Internet.xpm
-share/gentoo/icons/KDECalc.xpm
-share/gentoo/icons/KDEWord.xpm
-share/gentoo/icons/Kernel.xpm
-share/gentoo/icons/Keymap.xpm
-share/gentoo/icons/Lego.xpm
-share/gentoo/icons/License.xpm
-share/gentoo/icons/Linux.xpm
-share/gentoo/icons/MSWordDoc.xpm
-share/gentoo/icons/Makefile.xpm
-share/gentoo/icons/Maya.xpm
-share/gentoo/icons/Mixer.xpm
-share/gentoo/icons/Mouse.xpm
-share/gentoo/icons/Mouse2.xpm
-share/gentoo/icons/NetAmiga.xpm
-share/gentoo/icons/NetApple.xpm
-share/gentoo/icons/NetHD.xpm
-share/gentoo/icons/NetSGI.xpm
-share/gentoo/icons/NetSun.xpm
-share/gentoo/icons/NetWindows.xpm
-share/gentoo/icons/Package.xpm
-share/gentoo/icons/Package2.xpm
-share/gentoo/icons/Port.xpm
-share/gentoo/icons/Port2.xpm
-share/gentoo/icons/PowerButton.xpm
-share/gentoo/icons/Printer.xpm
-share/gentoo/icons/Readme.xpm
-share/gentoo/icons/SCSI.xpm
-share/gentoo/icons/SoundCard.xpm
-share/gentoo/icons/Source.xpm
-share/gentoo/icons/Speaker.xpm
-share/gentoo/icons/Speaker2.xpm
-share/gentoo/icons/Spreadsheet.xpm
-share/gentoo/icons/Tape.xpm
-share/gentoo/icons/VRML.xpm
-share/gentoo/icons/Windows.xpm
-share/gentoo/icons/aiff.xpm
-share/gentoo/icons/au.xpm
-share/gentoo/icons/avi.xpm
-share/gentoo/icons/bmp.xpm
-share/gentoo/icons/bmp2.xpm
-share/gentoo/icons/c.xpm
-share/gentoo/icons/class.xpm
-share/gentoo/icons/conf.xpm
-share/gentoo/icons/core.xpm
-share/gentoo/icons/cpp.xpm
-share/gentoo/icons/deb.xpm
-share/gentoo/icons/eps.xpm
-share/gentoo/icons/exe.xpm
-share/gentoo/icons/gentoo.png
-share/gentoo/icons/gif.xpm
-share/gentoo/icons/gif2.xpm
-share/gentoo/icons/h.xpm
-share/gentoo/icons/html.xpm
-share/gentoo/icons/html2.xpm
-share/gentoo/icons/iff.xpm
-share/gentoo/icons/iff2.xpm
-share/gentoo/icons/java.xpm
-share/gentoo/icons/jpeg.xpm
-share/gentoo/icons/jpeg2.xpm
-share/gentoo/icons/log.xpm
-share/gentoo/icons/m.xpm
-share/gentoo/icons/man.xpm
-share/gentoo/icons/midi.xpm
-share/gentoo/icons/mod.xpm
-share/gentoo/icons/mov.xpm
-share/gentoo/icons/mov2.xpm
-share/gentoo/icons/mp3.xpm
-share/gentoo/icons/mpeg.xpm
-share/gentoo/icons/o.xpm
-share/gentoo/icons/pcx.xpm
-share/gentoo/icons/pcx2.xpm
-share/gentoo/icons/pdb.xpm
-share/gentoo/icons/pdf.xpm
-share/gentoo/icons/pl.xpm
-share/gentoo/icons/png.xpm
-share/gentoo/icons/png2.xpm
-share/gentoo/icons/prc.xpm
-share/gentoo/icons/ps.xpm
-share/gentoo/icons/r.xpm
-share/gentoo/icons/ra.xpm
-share/gentoo/icons/rom.xpm
-share/gentoo/icons/rpm.xpm
-share/gentoo/icons/sh.xpm
-share/gentoo/icons/sid.xpm
-share/gentoo/icons/so.xpm
-share/gentoo/icons/targa.xpm
-share/gentoo/icons/targa2.xpm
-share/gentoo/icons/tex.xpm
-share/gentoo/icons/tiff.xpm
-share/gentoo/icons/tiff2.xpm
-share/gentoo/icons/txt.xpm
-share/gentoo/icons/wav.xpm
-share/gentoo/icons/xbm.xpm
-share/gentoo/icons/xbm2.xpm
-share/gentoo/icons/xcf.xpm
-share/gentoo/icons/xpm.xpm
-share/gentoo/icons/xpm2.xpm
-${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/gentoo.mo
-${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/gentoo.mo
-${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/gentoo.mo
-@dirrm share/gentoo/icons
-@dirrm share/gentoo
-@dirrm share/examples/gentoo
diff --git a/sysutils/gentoo/distinfo b/sysutils/gentoo/distinfo
deleted file mode 100644
index 1bbe004ee1f..00000000000
--- a/sysutils/gentoo/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.7 2002/12/07 10:12:42 jmmv Exp $
-
-SHA1 (gentoo-0.11.34.tar.gz) = 552046a36a64c4d03f9687432fb5280b462966e6
-Size (gentoo-0.11.34.tar.gz) = 1021899 bytes
-SHA1 (patch-aa) = 49bf9ba554a7fa443c6176fc44a11bcae046cc9d
-SHA1 (patch-ae) = daa7cbed8d66af155f2624a0066b2f578e9a93c6
diff --git a/sysutils/gentoo/patches/patch-aa b/sysutils/gentoo/patches/patch-aa
deleted file mode 100644
index c5b37d728cb..00000000000
--- a/sysutils/gentoo/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.3 2002/12/07 10:12:43 jmmv Exp $
-
---- Makefile.in.orig Sun Sep 1 20:04:19 2002
-+++ Makefile.in
-@@ -29,7 +29,7 @@ bindir = @bindir@
- sbindir = @sbindir@
- libexecdir = @libexecdir@
- datadir = @datadir@
--sysconfdir = @sysconfdir@
-+sysconfdir = $(datadir)/examples/@PACKAGE@
- sharedstatedir = @sharedstatedir@
- localstatedir = @localstatedir@
- libdir = @libdir@
diff --git a/sysutils/gentoo/patches/patch-ae b/sysutils/gentoo/patches/patch-ae
deleted file mode 100644
index 4a04cbd5bc9..00000000000
--- a/sysutils/gentoo/patches/patch-ae
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ae,v 1.3 2002/09/02 16:56:58 wiz Exp $
-
---- src/types.c.orig Sun Aug 25 12:46:47 2002
-+++ src/types.c
-@@ -352,7 +352,7 @@ void typ_identify_end(MainInfo *min, con
-
- if(file_list == NULL)
- return;
-- if((temp_name = tmpnam(NULL)) == NULL)
-+ if((temp_name = mkdtemp(NULL)) == NULL)
- return;
- if(pipe(fd) != 0)
- return;
diff --git a/sysutils/gkrellm/DESCR b/sysutils/gkrellm/DESCR
deleted file mode 100644
index da90c4a04d6..00000000000
--- a/sysutils/gkrellm/DESCR
+++ /dev/null
@@ -1,24 +0,0 @@
-With a single process, GKrellM manages multiple stacked monitors and supports
-applying themes to match the monitors appearance to your window manager,
-Gtk, or any other theme.
-
- * SMP CPU, Disk, Proc, and active net interface monitors with LEDs.
- * Internet monitor that displays current and charts historical port hits
-
- * Memory and swap space usage meters and a system uptime monitor.
- * File system meters show capacity/free space and can mount/umount.
- * A mailbox monitor which can launch mail reader, remote mail fetch.
- * Clock/calendar and hostname display.
- * APM laptop battery monitor.
- * CPU/motherboard temperature display if lm_sensors modules installed.
-
- * Multiple monitors managed by a single process to reduce system load.
- * A timer button that can execute PPP or ISDN logon/logoff scripts.
- * Charts are autoscaling with configurable grid line resolution, or
- can be set to a fixed scale mode.
- * Separate colors for "in" and "out" data. The in color is used for
- CPU user time, disk read, forks, and net receive data. The out color
- is used for CPU sys time, disk write, load, and net transmit data.
- * Commands can be configured to run when monitor labels are clicked.
- * GKrellM is plugin capable so special interest monitors can be created.
- * A different theme can be created with the GIMP.
diff --git a/sysutils/gkrellm/Makefile b/sysutils/gkrellm/Makefile
deleted file mode 100644
index 727827ca432..00000000000
--- a/sysutils/gkrellm/Makefile
+++ /dev/null
@@ -1,36 +0,0 @@
-# $NetBSD: Makefile,v 1.25 2003/07/13 13:53:15 wiz Exp $
-#
-
-DISTNAME= gkrellm-1.2.13
-PKGREVISION= 2
-CATEGORIES= sysutils
-MASTER_SITES= http://web.wt.net/~billw/gkrellm/
-EXTRACT_SUFX= .tar.bz2
-
-MAINTAINER= anthony.mallet@ficus.yi.org
-HOMEPAGE= http://gkrellm.net/
-COMMENT= GTK based system monitor
-
-BUILD_USES_MSGFMT= YES
-
-OSVERSION_SPECIFIC= YES
-USE_BUILDLINK2= YES
-USE_X11= YES
-USE_GMAKE= YES
-USE_PKGLOCALEDIR= YES
-
-ALL_TARGET= netbsd
-INSTALL_TARGET= install_netbsd
-
-MAKE_ENV+= PTHREAD_INC="-I${LOCALBASE}/include"
-MAKE_ENV+= EXPORT_SYMBOLS_LDFLAGS="${EXPORT_SYMBOLS_LDFLAGS}"
-
-post-install:
- ${INSTALL_DATA_DIR} ${PREFIX}/share/gkrellm
- ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/gkrellm
- ${INSTALL_DATA_DIR} ${PREFIX}/lib/gkrellm
- ${INSTALL_DATA_DIR} ${PREFIX}/lib/gkrellm/plugins
- ${INSTALL_DATA_DIR} ${PREFIX}/share/gkrellm/themes
-
-.include "../../graphics/imlib/buildlink2.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/gkrellm/PLIST b/sysutils/gkrellm/PLIST
deleted file mode 100644
index f6902fcba63..00000000000
--- a/sysutils/gkrellm/PLIST
+++ /dev/null
@@ -1,20 +0,0 @@
-@comment $NetBSD: PLIST,v 1.5 2003/02/15 09:33:03 salo Exp $
-bin/gkrellm
-include/gkrellm/gkrellm.h
-include/gkrellm/gkrellm_public_proto.h
-man/man1/gkrellm.1
-@exec ${MKDIR} %D/share/gkrellm/themes
-@exec ${MKDIR} %D/lib/gkrellm/plugins
-share/gkrellm/README
-${PKGLOCALEDIR}/locale/de/LC_MESSAGES/gkrellm.mo
-${PKGLOCALEDIR}/locale/es/LC_MESSAGES/gkrellm.mo
-${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/gkrellm.mo
-${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/gkrellm.mo
-${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/gkrellm.mo
-${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/gkrellm.mo
-${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/gkrellm.mo
-@dirrm include/gkrellm
-@dirrm lib/gkrellm/plugins
-@dirrm lib/gkrellm
-@dirrm share/gkrellm/themes
-@dirrm share/gkrellm
diff --git a/sysutils/gkrellm/buildlink2.mk b/sysutils/gkrellm/buildlink2.mk
deleted file mode 100644
index 93ddc2344eb..00000000000
--- a/sysutils/gkrellm/buildlink2.mk
+++ /dev/null
@@ -1,22 +0,0 @@
-# $NetBSD: buildlink2.mk,v 1.3 2003/07/13 13:53:15 wiz Exp $
-#
-
-.if !defined(GKRELLM_BUILDLINK2_MK)
-GKRELLM_BUILDLINK2_MK= # defined
-
-BUILDLINK_PACKAGES+= gkrellm
-BUILDLINK_DEPENDS.gkrellm?= gkrellm>=1.2.13nb2
-BUILDLINK_PKGSRCDIR.gkrellm?= ../../sysutils/gkrellm
-
-EVAL_PREFIX+= BUILDLINK_PREFIX.gkrellm=gkrellm
-BUILDLINK_PREFIX.gkrellm_DEFAULT= ${LOCALBASE}
-BUILDLINK_FILES.gkrellm+= include/gkrellm/gkrellm.h
-BUILDLINK_FILES.gkrellm+= include/gkrellm/gkrellm_public_proto.h
-
-.include "../../graphics/imlib/buildlink2.mk"
-
-BUILDLINK_TARGETS+= gkrellm-buildlink
-
-gkrellm-buildlink: _BUILDLINK_USE
-
-.endif # GKRELLM_BUILDLINK2_MK
diff --git a/sysutils/gkrellm/distinfo b/sysutils/gkrellm/distinfo
deleted file mode 100644
index 23811534f09..00000000000
--- a/sysutils/gkrellm/distinfo
+++ /dev/null
@@ -1,7 +0,0 @@
-$NetBSD: distinfo,v 1.15 2003/02/15 09:33:03 salo Exp $
-
-SHA1 (gkrellm-1.2.13.tar.bz2) = ab0282e663b69ecf0d622ad7c02db0c72b793bd3
-Size (gkrellm-1.2.13.tar.bz2) = 438917 bytes
-SHA1 (patch-aa) = c2656b0d5372ef1e26479ccedcbd05f4e6dbb5e3
-SHA1 (patch-ab) = a2f1d4b4a253323b6623200c1fca4e0cee0d46f2
-SHA1 (patch-ac) = 0bdbe9b788e62e4732ec87a1d6d8dbcacde7da82
diff --git a/sysutils/gkrellm/patches/patch-aa b/sysutils/gkrellm/patches/patch-aa
deleted file mode 100644
index 31d4d80c56a..00000000000
--- a/sysutils/gkrellm/patches/patch-aa
+++ /dev/null
@@ -1,80 +0,0 @@
-$NetBSD: patch-aa,v 1.9 2003/02/15 09:33:03 salo Exp $
-
---- Makefile.top_enable_nls.orig Wed Dec 5 08:41:15 2001
-+++ Makefile.top_enable_nls
-@@ -31,8 +31,11 @@
- # Default
- #--------
- GTK_CONFIG = gtk-config
-+IMLIB_CONFIG = imlib-config
- EXTRAOBJS = md5c.o
- BINMODE = 755
-+BINGRP = wheel
-+PREFIX ?= /usr/local
-
- # FreeBSD 2.X
- #------------
-@@ -53,12 +56,17 @@
-
- # NetBSD or OpenBSD
- #------------------
--#GTK_CONFIG= gtk-config
--#GTOP_LIBS=
--#PTHREAD_INC=-I/usr/local/include
--#SYS_LIBS=-lkvm
--#EXTRAOBJS =
--#BINMODE=2755
-+GTK_CONFIG ?= gtk-config
-+IMLIB_CONFIG ?= imlib-config
-+GTOP_INCLUDE =
-+GTOP_LIBS =
-+PTHREAD_INC ?= -I/usr/pkg/include
-+EXTRAOBJS =
-+LINK_FLAGS = $(EXPORT_SYMBOLS_LDFLAGS)
-+LOCALEDIR = ${PREFIX}/share/locale
-+MANDIR = ${PREFIX}/man/man1
-+BINMODE = 2755
-+BINGRP = kmem
-
- # Solaris 2.x
- #------------
-@@ -75,21 +83,23 @@
- # used if you "make gnome-gtop" or "make gtop".
- #-----------------------------------
- GTOP_PREFIX = /usr
--GTOP_INCLUDE = -I$(GTOP_PREFIX)/include
--GTOP_LIBS = -L$(GTOP_PREFIX)/lib -lgtop -lgtop_common -lgtop_sysdeps -lXau
-+GTOP_INCLUDE ?= -I$(GTOP_PREFIX)/include
-+GTOP_LIBS ?= -L$(GTOP_PREFIX)/lib -lgtop -lgtop_common -lgtop_sysdeps -lXau
-
-
--INSTALLDIR=/usr/local/bin
--MANDIR=/usr/local/share/man/man1
-+PREFIX ?= /usr/local
-+INSTALLDIR ?= ${PREFIX}/bin
-+MANDIR ?= ${PREFIX}/share/man/man1
- MANMODE = 644
- MANDIRMODE = 755
--INCLUDEDIR=/usr/local/include
-+INCLUDEDIR ?= ${PREFIX}/include
- INCLUDEMODE = 644
- INCLUDEDIRMODE = 755
-
- LOCALEDIR ?= /usr/share/locale
-
- export GTK_CONFIG GTOP_INCLUDE GTOP_LIBS SYS_LIBS EXTRAOBJS BINMODE
-+export BINGRP IMLIB_CONFIG LINK_FLAGS PREFIX
- export INSTALLDIR INCLUDEDIR INCLUDEMODE INCLUDEDIRMODE LOCALEDIR
- export MANDIR MANDIRMODE MANMODE
-
-@@ -132,9 +142,7 @@
-
- netbsd:
- (cd po && ${MAKE} all)
-- (cd src && ${MAKE} GTK_CONFIG=gtk-config GTOP_LIBS= GTOP_INCLUDE= \
-- PTHREAD_INC=-I/usr/local/include EXTRAOBJS= \
-- SYS_LIBS="-lkvm" gkrellm )
-+ (cd src && ${MAKE} SYS_LIBS="-lkvm" gkrellm )
-
- openbsd:
- (cd po && ${MAKE} all)
diff --git a/sysutils/gkrellm/patches/patch-ab b/sysutils/gkrellm/patches/patch-ab
deleted file mode 100644
index bc14e7334b0..00000000000
--- a/sysutils/gkrellm/patches/patch-ab
+++ /dev/null
@@ -1,87 +0,0 @@
-$NetBSD: patch-ab,v 1.8 2003/02/15 09:33:03 salo Exp $
-
---- src/Makefile.src.orig Mon Jul 1 04:13:04 2002
-+++ src/Makefile.src Sat Feb 15 10:06:54 2003
-@@ -1,30 +1,36 @@
- GTK_CONFIG ?= gtk-config
-+IMLIB_CONFIG ?= imlib-config
-+PREFIX ?= /usr/local
- EXTRAOBJS ?= md5c.o
- BINMODE ?= 755
--INSTALLDIR ?= /usr/local/bin
--INCLUDEDIR ?= /usr/local/include
-+BINGRP ?= wheel
-+INSTALLDIR ?= ${PREFIX}/bin
-+INCLUDEDIR ?= ${PREFIX}/include
- INCLUDEMODE ?= 644
- INCLUDEDIRMODE ?= 755
--MANDIR ?= /usr/local/share/man/man1
-+MANDIR ?= ${PREFIX}/man/man1
- MANMODE ?= 644
- MANDIRMODE ?= 755
- INSTALL ?= install
--LINK_FLAGS ?= -Wl,-E
-+LINK_FLAGS ?= $(EXPORT_SYMBOLS_LDFLAGS)
- CC ?= gcc
- STRIP ?= -s
-
- GKRELLM_INCLUDES = gkrellm.h gkrellm_public_proto.h
-
- GTK_INCLUDE = `$(GTK_CONFIG) --cflags gthread`
--IMLIB_INCLUDE = `imlib-config --cflags-gdk`
-+IMLIB_INCLUDE = `$(IMLIB_CONFIG) --cflags-gdk`
-
- GTK_LIB = `$(GTK_CONFIG) --libs gthread`
--IMLIB_LIB = `imlib-config --libs-gdk`
-+IMLIB_LIB = `$(IMLIB_CONFIG) --libs-gdk`
-
--FLAGS = -O2 -I.. $(GTK_INCLUDE) $(IMLIB_INCLUDE) $(GTOP_INCLUDE)
-+FLAGS = -I.. $(GTK_INCLUDE) $(IMLIB_INCLUDE) $(GTOP_INCLUDE)
- FLAGS+= $(PTHREAD_INC)
-+FLAGS+= -DSYSTEM_PLUGINS_DIR=\"${PREFIX}/lib/gkrellm/plugins\"
-+FLAGS+= -DSYSTEM_THEMES_DIR=\"${PREFIX}/share/gkrellm/themes\"
-+
-+LIBS = $(GTK_LIB) $(IMLIB_LIB) $(GTOP_LIBS) $(SYS_LIBS) $(LINK_FLAGS)
-
--LIBS = $(GTK_LIB) $(IMLIB_LIB) $(GTOP_LIBS) $(SYS_LIBS)
-
- ifeq ($(debug),1)
- FLAGS += -g
-@@ -38,7 +44,9 @@
- FLAGS += -DHAVE_GETADDRINFO
- endif
-
--CC += -Wall $(FLAGS)
-+CC ?= gcc
-+CFLAGS ?= -O2
-+CC += -Wall $(FLAGS) $(CFLAGS)
-
- OBJS = main.o alerts.o apm.o base64.o clock.o cpu.o disk.o fs.o hostname.o \
- inet.o mail.o meminfo.o net.o proc.o sensors.o uptime.o \
-@@ -68,15 +76,14 @@
- gkrellm
-
- netbsd:
-- $(MAKE) PTHREAD_INC=-I/usr/local/include \
-- GTK_CONFIG=gtk-config GTOP_LIBS= EXTRAOBJS= SYS_LIBS="-lkvm" gkrellm
-+ $(MAKE) GTOP_LIBS= EXTRAOBJS= SYS_LIBS="-lkvm" gkrellm
-
- solaris:
- $(MAKE) CFLAGS="-Wno-implicit-int" \
- SYS_LIBS="-lkstat -lkvm -ldevinfo" gkrellm
-
- install:
-- $(INSTALL) -c $(STRIP) -m $(BINMODE) gkrellm $(INSTALLDIR)/gkrellm
-+ $(INSTALL) -c $(STRIP) -m $(BINMODE) -g $(BINGRP) gkrellm $(INSTALLDIR)/gkrellm
- $(INSTALL) -d -m $(INCLUDEDIRMODE) $(INCLUDEDIR)/gkrellm
- $(INSTALL) -c -m $(INCLUDEMODE) $(GKRELLM_INCLUDES) $(INCLUDEDIR)/gkrellm
- $(INSTALL) -d -m $(MANDIRMODE) $(MANDIR)
-@@ -87,8 +94,6 @@
-
- install_netbsd:
- $(MAKE) install
-- chgrp kmem $(INSTALLDIR)/gkrellm
-- chmod g+s $(INSTALLDIR)/gkrellm
-
- install_openbsd:
- $(MAKE) install
diff --git a/sysutils/gkrellm/patches/patch-ac b/sysutils/gkrellm/patches/patch-ac
deleted file mode 100644
index be0e2740b04..00000000000
--- a/sysutils/gkrellm/patches/patch-ac
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD: patch-ac,v 1.3 2002/11/07 15:07:46 fredb Exp $
-
---- src/disk.c.orig Tue Jan 1 15:08:07 2002
-+++ src/disk.c
-@@ -446,10 +446,24 @@
- * d.xfer value (number of transfers) but there a scaling problem:
- * d.xfer is usually much more smaller thant d.dk_bytes... */
-
-+ /* Separate read/write stats were implemented in NetBSD 1.6K. */
-+
- disk = (DiskMon *) list->data;
-- disk->rblk = d.dk_bytes / 512; /* block size hardcoded :
-- * d.dk_byteshift is always 0 ?? */
-+#if __NetBSD_Version__ >= 106110000
-+ /* d.dk_byteshift is not set in, or used, by the kernel as of
-+ * NetBSD 1.6K, but maybe one day... In the meantime, NetBSD
-+ * only supports a blocksize of 512 == 2^^9, so assume that. */
-+ if (d.dk_byteshift == 0) {
-+ disk->rblk = d.dk_rbytes >> 9;
-+ disk->wblk = d.dk_wbytes >> 9;
-+ } else {
-+ disk->rblk = d.dk_rbytes / d.dk_byteshift;
-+ disk->wblk = d.dk_wbytes / d.dk_byteshift;
-+ }
-+#else
-+ disk->rblk = d.dk_bytes >> 9;
- disk->wblk = 0;
-+#endif
-
- composite_disk->rblk += disk->rblk;
- composite_disk->wblk += disk->wblk; /* useless, isn't it ? :-D */
diff --git a/sysutils/gkx86info/DESCR b/sysutils/gkx86info/DESCR
deleted file mode 100644
index 5260f88496b..00000000000
--- a/sysutils/gkx86info/DESCR
+++ /dev/null
@@ -1,6 +0,0 @@
-This is a plugin for gkrellm that simply prints the current clock
-speed for users that own speed stepping processors. It works on
-normal non-stepping processors also, but there isn't really any point
-in measuring the clock if it is the same every time you measure it, is
-there? Included code from x86info to calculate an estimate clock
-speed.
diff --git a/sysutils/gkx86info/Makefile b/sysutils/gkx86info/Makefile
deleted file mode 100644
index b0e87151335..00000000000
--- a/sysutils/gkx86info/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# $NetBSD: Makefile,v 1.6 2003/07/13 13:53:16 wiz Exp $
-#
-
-DISTNAME= gkx86info0.0.2
-PKGNAME= gkx86info-0.0.2
-PKGREVISION= 2
-CATEGORIES= sysutils
-MASTER_SITES= http://asdfnews.org/yargon/
-
-MAINTAINER= ptiJo@noos.fr
-HOMEPAGE= http://asdfnews.org/yargon/
-COMMENT= gkrellm plugin that prints the current clock speed
-
-USE_BUILDLINK2= YES
-ONLY_FOR_PLATFORM= *-*-i386
-
-pre-build:
- ${TOUCH} ${WRKSRC}/Makefile
-
-.include "../../sysutils/gkrellm/buildlink2.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/gkx86info/PLIST b/sysutils/gkx86info/PLIST
deleted file mode 100644
index 2c3eb523b37..00000000000
--- a/sysutils/gkx86info/PLIST
+++ /dev/null
@@ -1,3 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2002/07/10 13:46:58 agc Exp $
-lib/gkrellm/plugins/gkx86info.so
-@dirrm lib/gkrellm/plugins
diff --git a/sysutils/gkx86info/distinfo b/sysutils/gkx86info/distinfo
deleted file mode 100644
index b9334e59d36..00000000000
--- a/sysutils/gkx86info/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.2 2002/08/12 00:31:56 dmcmahill Exp $
-
-SHA1 (gkx86info0.0.2.tar.gz) = c8f0855641177c6d2f53a1a98c1ae88469df12eb
-Size (gkx86info0.0.2.tar.gz) = 9429 bytes
-SHA1 (patch-aa) = 2d0253662c5fcbbfb9e81cd04c304866284e229b
-SHA1 (patch-ab) = 1980acc7ab1ad6e617536117622d88a30b9dcde7
diff --git a/sysutils/gkx86info/patches/patch-aa b/sysutils/gkx86info/patches/patch-aa
deleted file mode 100644
index 0178783fd8e..00000000000
--- a/sysutils/gkx86info/patches/patch-aa
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2002/07/10 13:46:58 agc Exp $
-
---- MHz.c.orig Sat Oct 6 10:41:28 2001
-+++ MHz.c
-@@ -14,6 +14,7 @@
- #include <sys/time.h>
- #include <string.h>
- #include <unistd.h>
-+#include <stdlib.h>
-
- __inline__ unsigned long long int rdtsc()
- {
diff --git a/sysutils/gkx86info/patches/patch-ab b/sysutils/gkx86info/patches/patch-ab
deleted file mode 100644
index 3a94e85d427..00000000000
--- a/sysutils/gkx86info/patches/patch-ab
+++ /dev/null
@@ -1,28 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 2002/07/10 13:46:58 agc Exp $
-
---- Makefile.orig Tue Jun 11 18:10:11 2002
-+++ Makefile
-@@ -0,0 +1,23 @@
-+GTK_CFLAGS= `gtk-config --cflags`
-+IMLIB_CFLAGS= `imlib-config --cflags-gdk`
-+INCLUDE+= -I$(LOCALBASE)/include
-+CFLAGS+= -fPIC -Wall -W -g -O2 -shared $(GTK_CFLAGS) $(IMLIB_CFLAGS) $(INCLUDE)
-+CC= gcc
-+
-+all: gkx86info.so
-+
-+gkx86info.so: MHz.o gkx86info.o
-+ $(CC) $(CFLAGS) -o gkx86info.so MHz.o gkx86info.o
-+
-+MHz.o:
-+ $(CC) $(CFLAGS) -o MHz.o -c MHz.c
-+
-+gkx86info.o:
-+ $(CC) $(CFLAGS) -c gkx86info.c
-+
-+install:
-+ $(INSTALL) -d $(LOCALBASE)/lib/gkrellm/plugins
-+ $(INSTALL) -c -m 0755 -o root -g wheel gkx86info.so $(LOCALBASE)/lib/gkrellm/plugins/gkx86info.so
-+
-+clean:
-+ $(RM) -f *~ *.o *.so
diff --git a/sysutils/gmc/DESCR b/sysutils/gmc/DESCR
deleted file mode 100644
index 36b362d75a4..00000000000
--- a/sysutils/gmc/DESCR
+++ /dev/null
@@ -1,6 +0,0 @@
-Midnight Commander is a visual shell much like a file manager, only with way
-more features. It is text mode, but also includes mouse support if you are
-running GPM. Its coolest feature is the ability to ftp, view tar, zip
-files, and poke into RPMs for specific files.
-
-This package has the GNOME interface to the Midnight Commander.
diff --git a/sysutils/gmc/Makefile b/sysutils/gmc/Makefile
deleted file mode 100644
index a9329efc0b3..00000000000
--- a/sysutils/gmc/Makefile
+++ /dev/null
@@ -1,19 +0,0 @@
-# $NetBSD: Makefile,v 1.32 2003/07/13 13:53:16 wiz Exp $
-
-PKGNAME= g${DISTNAME}
-PKGREVISION= 5
-CATEGORIES+= gnome
-
-COMMENT= GNOME version of Midnight Commander, a free Norton Commander Clone
-
-USE_X11BASE= # defined
-CONFIGURE_ARGS+= --with-tm-x-support
-CONFIGURE_ARGS+= --with-gnome
-BUILD_USES_MSGFMT= yes
-DEPENDS+= gnome1-dirs>=1.2:../../misc/gnome1-dirs
-
-post-install:
- ${RMDIR} ${PREFIX}/share/gnome/help/gmc/C/figs
-
-.include "../../x11/gnome-core/buildlink2.mk"
-.include "../../sysutils/mc/Makefile.common"
diff --git a/sysutils/gmc/PLIST b/sysutils/gmc/PLIST
deleted file mode 100644
index 16cd83f0c19..00000000000
--- a/sysutils/gmc/PLIST
+++ /dev/null
@@ -1,220 +0,0 @@
-@comment $NetBSD: PLIST,v 1.4 2003/05/30 16:20:05 jmmv Exp $
-bin/gmc
-bin/gmc-client
-bin/mc
-bin/mcedit
-bin/mcmfmt
-bin/mcserv
-bin/plain-gmc
-etc/CORBA/servers/gmc.gnorba
-etc/mc.global
-lib/mc/FAQ
-lib/mc/bin/mc.csh
-lib/mc/bin/mc.sh
-lib/mc/bin/mcfn_install
-lib/mc/desktop-scripts/README.desktop
-lib/mc/desktop-scripts/startup.links
-lib/mc/edit.indent.rc
-lib/mc/extfs/README
-lib/mc/extfs/a
-lib/mc/extfs/deb
-lib/mc/extfs/extfs.ini
-lib/mc/extfs/ftplist
-lib/mc/extfs/hp48
-lib/mc/extfs/lslR
-lib/mc/extfs/mailfs
-lib/mc/extfs/patchfs
-lib/mc/extfs/rpm
-lib/mc/extfs/rpms
-lib/mc/extfs/sfs.ini
-lib/mc/extfs/trpm
-lib/mc/extfs/uar
-lib/mc/extfs/uarj
-lib/mc/extfs/ucpio
-lib/mc/extfs/uha
-lib/mc/extfs/ulha
-lib/mc/extfs/unarj.diff
-lib/mc/extfs/urar
-lib/mc/extfs/uzip
-lib/mc/extfs/uzoo
-lib/mc/layout
-lib/mc/mc-gnome.ext
-lib/mc/mc.csh
-lib/mc/mc.ext
-lib/mc/mc.hint
-lib/mc/mc.hint.cs
-lib/mc/mc.hint.es
-lib/mc/mc.hint.ru
-lib/mc/mc.hlp
-lib/mc/mc.lib
-lib/mc/mc.menu
-lib/mc/mc.sh
-lib/mc/syntax/ada95.syntax
-lib/mc/syntax/c.syntax
-lib/mc/syntax/changelog.syntax
-lib/mc/syntax/diff.syntax
-lib/mc/syntax/fortran.syntax
-lib/mc/syntax/html.syntax
-lib/mc/syntax/java.syntax
-lib/mc/syntax/latex.syntax
-lib/mc/syntax/lsm.syntax
-lib/mc/syntax/mail.syntax
-lib/mc/syntax/makefile.syntax
-lib/mc/syntax/ml.syntax
-lib/mc/syntax/nroff.syntax
-lib/mc/syntax/pascal.syntax
-lib/mc/syntax/perl.syntax
-lib/mc/syntax/python.syntax
-lib/mc/syntax/sh.syntax
-lib/mc/syntax/smalltalk.syntax
-lib/mc/syntax/swig.syntax
-lib/mc/syntax/texinfo.syntax
-lib/mc/syntax/unknown.syntax
-lib/mc/term/README.xterm
-lib/mc/term/ansi.ti
-lib/mc/term/linux.ti
-lib/mc/term/vt100.ti
-lib/mc/term/xterm.ad
-lib/mc/term/xterm.tcap
-lib/mc/term/xterm.ti
-man/man1/mc.1
-man/man1/mcedit.1
-man/man8/mcserv.8
-share/gnome/help/gmc/C/topic.dat
-share/idl/FileManager.idl
-share/idl/Makefile.in
-${PKGLOCALEDIR}/locale/ca/LC_MESSAGES/mc.mo
-${PKGLOCALEDIR}/locale/cs/LC_MESSAGES/mc.mo
-${PKGLOCALEDIR}/locale/da/LC_MESSAGES/mc.mo
-${PKGLOCALEDIR}/locale/de/LC_MESSAGES/mc.mo
-${PKGLOCALEDIR}/locale/el/LC_MESSAGES/mc.mo
-${PKGLOCALEDIR}/locale/es/LC_MESSAGES/mc.mo
-${PKGLOCALEDIR}/locale/es_ES/LC_MESSAGES/mc.mo
-${PKGLOCALEDIR}/locale/fi/LC_MESSAGES/mc.mo
-${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/mc.mo
-${PKGLOCALEDIR}/locale/hu/LC_MESSAGES/mc.mo
-${PKGLOCALEDIR}/locale/it/LC_MESSAGES/mc.mo
-${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/mc.mo
-${PKGLOCALEDIR}/locale/ko/LC_MESSAGES/mc.mo
-${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/mc.mo
-${PKGLOCALEDIR}/locale/no/LC_MESSAGES/mc.mo
-${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/mc.mo
-${PKGLOCALEDIR}/locale/pt_BR/LC_MESSAGES/mc.mo
-${PKGLOCALEDIR}/locale/ro/LC_MESSAGES/mc.mo
-${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/mc.mo
-${PKGLOCALEDIR}/locale/sk/LC_MESSAGES/mc.mo
-${PKGLOCALEDIR}/locale/sl/LC_MESSAGES/mc.mo
-${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/mc.mo
-${PKGLOCALEDIR}/locale/tr/LC_MESSAGES/mc.mo
-${PKGLOCALEDIR}/locale/uk/LC_MESSAGES/mc.mo
-${PKGLOCALEDIR}/locale/wa/LC_MESSAGES/mc.mo
-${PKGLOCALEDIR}/locale/zh_CN.GB2312/LC_MESSAGES/mc.mo
-${PKGLOCALEDIR}/locale/zh_TW.Big5/LC_MESSAGES/mc.mo
-share/mime-info/mc.keys
-share/pixmaps/mc/directory.xpm
-share/pixmaps/mc/gnome-application-encapsulated_postscript.png
-share/pixmaps/mc/gnome-application-pdf.png
-share/pixmaps/mc/gnome-application-pgp.png
-share/pixmaps/mc/gnome-application-postscript.png
-share/pixmaps/mc/gnome-application-x-c-header.png
-share/pixmaps/mc/gnome-application-x-c-source.png
-share/pixmaps/mc/gnome-application-x-cc-source.png
-share/pixmaps/mc/gnome-application-x-e-theme.png
-share/pixmaps/mc/gnome-application-x-generic-spreadsheet.png
-share/pixmaps/mc/gnome-application-x-gnome-app-info.png
-share/pixmaps/mc/gnome-application-x-java-source.png
-share/pixmaps/mc/gnome-application-x-kde-app-info.png
-share/pixmaps/mc/gnome-application-x-php.png
-share/pixmaps/mc/gnome-application-x-reject.png
-share/pixmaps/mc/gnome-application-x-scheme-source.png
-share/pixmaps/mc/gnome-application-x-sql.png
-share/pixmaps/mc/gnome-audio-basic.png
-share/pixmaps/mc/gnome-audio-midi.png
-share/pixmaps/mc/gnome-audio-ulaw.png
-share/pixmaps/mc/gnome-audio-x-aiff.png
-share/pixmaps/mc/gnome-audio-x-mod.png
-share/pixmaps/mc/gnome-audio-x-mp3.png
-share/pixmaps/mc/gnome-audio-x-pn-realaudio.png
-share/pixmaps/mc/gnome-audio-x-s3m.png
-share/pixmaps/mc/gnome-audio-x-stm.png
-share/pixmaps/mc/gnome-audio-x-voc.png
-share/pixmaps/mc/gnome-audio-x-wav.png
-share/pixmaps/mc/gnome-audio-x-xi.png
-share/pixmaps/mc/gnome-audio-x-xm.png
-share/pixmaps/mc/gnome-audio.png
-share/pixmaps/mc/gnome-compressed.png
-share/pixmaps/mc/gnome-core.png
-share/pixmaps/mc/gnome-font-afm.png
-share/pixmaps/mc/gnome-font-ttf.png
-share/pixmaps/mc/gnome-font-x-pcf.png
-share/pixmaps/mc/gnome-http-url.png
-share/pixmaps/mc/gnome-image-bmp.png
-share/pixmaps/mc/gnome-image-generic.png
-share/pixmaps/mc/gnome-image-gif.png
-share/pixmaps/mc/gnome-image-ief.png
-share/pixmaps/mc/gnome-image-jpeg.png
-share/pixmaps/mc/gnome-image-pbm.png
-share/pixmaps/mc/gnome-image-pgm.png
-share/pixmaps/mc/gnome-image-png.png
-share/pixmaps/mc/gnome-image-pnm.png
-share/pixmaps/mc/gnome-image-ppm.png
-share/pixmaps/mc/gnome-image-psd.png
-share/pixmaps/mc/gnome-image-ras.png
-share/pixmaps/mc/gnome-image-rgb.png
-share/pixmaps/mc/gnome-image-tga.png
-share/pixmaps/mc/gnome-image-tiff.png
-share/pixmaps/mc/gnome-image-x-xfig.png
-share/pixmaps/mc/gnome-image-xbm.png
-share/pixmaps/mc/gnome-image-xcf.png
-share/pixmaps/mc/gnome-image-xpm.png
-share/pixmaps/mc/gnome-image-xwd.png
-share/pixmaps/mc/gnome-library.png
-share/pixmaps/mc/gnome-manpage.png
-share/pixmaps/mc/gnome-objectfile.png
-share/pixmaps/mc/gnome-pack-deb.png
-share/pixmaps/mc/gnome-pack-rpm.png
-share/pixmaps/mc/gnome-pack-slp.png
-share/pixmaps/mc/gnome-package.png
-share/pixmaps/mc/gnome-tex.png
-share/pixmaps/mc/gnome-text-html.png
-share/pixmaps/mc/gnome-text-x-authors.png
-share/pixmaps/mc/gnome-text-x-copying.png
-share/pixmaps/mc/gnome-text-x-credits.png
-share/pixmaps/mc/gnome-text-x-install.png
-share/pixmaps/mc/gnome-text-x-makefile.png
-share/pixmaps/mc/gnome-text-x-readme.png
-share/pixmaps/mc/gnome-textfile.png
-share/pixmaps/mc/gnome-trashcan.png
-share/pixmaps/mc/gnome-video-mpeg.png
-share/pixmaps/mc/gnome-video-quicktime.png
-share/pixmaps/mc/gnome-video-x-msvideo.png
-share/pixmaps/mc/i-blockdev.png
-share/pixmaps/mc/i-cdrom.png
-share/pixmaps/mc/i-chardev.png
-share/pixmaps/mc/i-core.png
-share/pixmaps/mc/i-dirclosed.png
-share/pixmaps/mc/i-directory.png
-share/pixmaps/mc/i-executable.png
-share/pixmaps/mc/i-fifo.png
-share/pixmaps/mc/i-floppy.png
-share/pixmaps/mc/i-nfs.png
-share/pixmaps/mc/i-printer.png
-share/pixmaps/mc/i-regular.png
-share/pixmaps/mc/i-sock.png
-share/pixmaps/mc/i-stalled.png
-share/pixmaps/mc/i-symlink.png
-share/pixmaps/mc/i-zipdisk.png
-share/pixmaps/mc/i-zipdisk2.png
-share/pixmaps/mc/makefile.xpm
-share/pixmaps/mc/sound.xpm
-share/pixmaps/mc/trash.xpm
-@dirrm share/pixmaps/mc
-@comment in gnome-dirs: @dirrm share/mime-info
-@dirrm share/gnome/help/gmc/C
-@dirrm share/gnome/help/gmc
-@dirrm lib/mc/term
-@dirrm lib/mc/syntax
-@dirrm lib/mc/extfs
-@dirrm lib/mc/desktop-scripts
-@dirrm lib/mc/bin
-@dirrm lib/mc
diff --git a/sysutils/gnome-vfs/DESCR b/sysutils/gnome-vfs/DESCR
deleted file mode 100644
index 71e6426e85b..00000000000
--- a/sysutils/gnome-vfs/DESCR
+++ /dev/null
@@ -1,7 +0,0 @@
-This is the GNOME Virtual File System.
-
-This is still a development version, the APIs are still undergoing
-incompatible changes.
-
-GNOME VFS is currently used as one of the foundations of the Nautilus
-file manager.
diff --git a/sysutils/gnome-vfs/Makefile b/sysutils/gnome-vfs/Makefile
deleted file mode 100644
index a5c00bf97a1..00000000000
--- a/sysutils/gnome-vfs/Makefile
+++ /dev/null
@@ -1,31 +0,0 @@
-# $NetBSD: Makefile,v 1.31 2003/07/13 13:53:16 wiz Exp $
-
-DISTNAME= gnome-vfs-1.0.5
-PKGREVISION= 3
-CATEGORIES= sysutils gnome
-MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gnome-vfs/1.0/}
-
-MAINTAINER= rh@netbsd.org
-HOMEPAGE= http://www.gnome.org/
-COMMENT= GNOME Virtual File System
-
-BUILD_USES_MSGFMT= YES
-BUILDLINK_DEPENDS.gnome-mime-data= gnome-mime-data>=2.0.1
-
-USE_BUILDLINK2= YES
-USE_PKGLOCALEDIR= YES
-USE_X11BASE= YES
-USE_GMAKE= YES
-GNU_CONFIGURE= YES
-
-USE_LIBTOOL= YES
-LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
-
-CONFIGURE_ARGS+= --enable-gtk-doc=no
-
-.include "../../archivers/bzip2/buildlink2.mk"
-.include "../../converters/libiconv/buildlink2.mk"
-.include "../../databases/gnome-mime-data/buildlink2.mk"
-.include "../../devel/gettext-lib/buildlink2.mk"
-.include "../../devel/GConf/buildlink2.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/gnome-vfs/PLIST b/sysutils/gnome-vfs/PLIST
deleted file mode 100644
index 981de05d823..00000000000
--- a/sysutils/gnome-vfs/PLIST
+++ /dev/null
@@ -1,152 +0,0 @@
-@comment $NetBSD: PLIST,v 1.11 2003/03/25 11:22:36 wiz Exp $
-bin/gnome-vfs-config
-etc/vfs/modules/default-modules.conf
-include/gnome-vfs-1.0/libgnomevfs/gnome-vfs-application-registry.h
-include/gnome-vfs-1.0/libgnomevfs/gnome-vfs-async-ops.h
-include/gnome-vfs-1.0/libgnomevfs/gnome-vfs-backend.h
-include/gnome-vfs-1.0/libgnomevfs/gnome-vfs-cancellable-ops.h
-include/gnome-vfs-1.0/libgnomevfs/gnome-vfs-cancellation.h
-include/gnome-vfs-1.0/libgnomevfs/gnome-vfs-configuration.h
-include/gnome-vfs-1.0/libgnomevfs/gnome-vfs-context.h
-include/gnome-vfs-1.0/libgnomevfs/gnome-vfs-directory-filter.h
-include/gnome-vfs-1.0/libgnomevfs/gnome-vfs-directory.h
-include/gnome-vfs-1.0/libgnomevfs/gnome-vfs-file-info.h
-include/gnome-vfs-1.0/libgnomevfs/gnome-vfs-file-size.h
-include/gnome-vfs-1.0/libgnomevfs/gnome-vfs-find-directory.h
-include/gnome-vfs-1.0/libgnomevfs/gnome-vfs-handle.h
-include/gnome-vfs-1.0/libgnomevfs/gnome-vfs-inet-connection.h
-include/gnome-vfs-1.0/libgnomevfs/gnome-vfs-init.h
-include/gnome-vfs-1.0/libgnomevfs/gnome-vfs-iobuf.h
-include/gnome-vfs-1.0/libgnomevfs/gnome-vfs-messages.h
-include/gnome-vfs-1.0/libgnomevfs/gnome-vfs-method.h
-include/gnome-vfs-1.0/libgnomevfs/gnome-vfs-mime-handlers.h
-include/gnome-vfs-1.0/libgnomevfs/gnome-vfs-mime-info.h
-include/gnome-vfs-1.0/libgnomevfs/gnome-vfs-mime-magic.h
-include/gnome-vfs-1.0/libgnomevfs/gnome-vfs-mime-monitor.h
-include/gnome-vfs-1.0/libgnomevfs/gnome-vfs-mime-sniff-buffer.h
-include/gnome-vfs-1.0/libgnomevfs/gnome-vfs-mime.h
-include/gnome-vfs-1.0/libgnomevfs/gnome-vfs-module-callback-module-api.h
-include/gnome-vfs-1.0/libgnomevfs/gnome-vfs-module-callback.h
-include/gnome-vfs-1.0/libgnomevfs/gnome-vfs-module-shared.h
-include/gnome-vfs-1.0/libgnomevfs/gnome-vfs-module.h
-include/gnome-vfs-1.0/libgnomevfs/gnome-vfs-ops.h
-include/gnome-vfs-1.0/libgnomevfs/gnome-vfs-parse-ls.h
-include/gnome-vfs-1.0/libgnomevfs/gnome-vfs-private-utils.h
-include/gnome-vfs-1.0/libgnomevfs/gnome-vfs-private.h
-include/gnome-vfs-1.0/libgnomevfs/gnome-vfs-regexp-filter.h
-include/gnome-vfs-1.0/libgnomevfs/gnome-vfs-result.h
-include/gnome-vfs-1.0/libgnomevfs/gnome-vfs-seekable.h
-include/gnome-vfs-1.0/libgnomevfs/gnome-vfs-shellpattern-filter.h
-include/gnome-vfs-1.0/libgnomevfs/gnome-vfs-socket-buffer.h
-include/gnome-vfs-1.0/libgnomevfs/gnome-vfs-socket.h
-include/gnome-vfs-1.0/libgnomevfs/gnome-vfs-ssl-private.h
-include/gnome-vfs-1.0/libgnomevfs/gnome-vfs-ssl.h
-include/gnome-vfs-1.0/libgnomevfs/gnome-vfs-standard-callbacks.h
-include/gnome-vfs-1.0/libgnomevfs/gnome-vfs-transform.h
-include/gnome-vfs-1.0/libgnomevfs/gnome-vfs-types.h
-include/gnome-vfs-1.0/libgnomevfs/gnome-vfs-uri.h
-include/gnome-vfs-1.0/libgnomevfs/gnome-vfs-utils.h
-include/gnome-vfs-1.0/libgnomevfs/gnome-vfs-xfer.h
-include/gnome-vfs-1.0/libgnomevfs/gnome-vfs.h
-lib/gnome-vfs-1.0/include/gnome-vfs-file-size.h
-lib/libgnomevfs-pthread.a
-lib/libgnomevfs-pthread.la
-lib/libgnomevfs-pthread.so
-lib/libgnomevfs.a
-lib/libgnomevfs.la
-lib/libgnomevfs.so
-lib/libgnomevfs.so.0
-lib/libgnomevfs.so.0.0
-lib/vfs/extfs/README
-lib/vfs/extfs/a
-lib/vfs/extfs/ar
-lib/vfs/extfs/arj
-lib/vfs/extfs/cpio
-lib/vfs/extfs/deb
-lib/vfs/extfs/hp48
-lib/vfs/extfs/lha
-lib/vfs/extfs/mailfs
-lib/vfs/extfs/patchfs
-lib/vfs/extfs/rar
-lib/vfs/extfs/rpm
-lib/vfs/extfs/rpms
-lib/vfs/extfs/tar
-lib/vfs/extfs/trpm
-lib/vfs/extfs/zip
-lib/vfs/extfs/zoo
-lib/vfs/modules/libbzip2.a
-lib/vfs/modules/libbzip2.la
-lib/vfs/modules/libbzip2.so
-lib/vfs/modules/libdesktop.a
-lib/vfs/modules/libdesktop.la
-lib/vfs/modules/libdesktop.so
-lib/vfs/modules/libextfs.a
-lib/vfs/modules/libextfs.la
-lib/vfs/modules/libextfs.so
-lib/vfs/modules/libfile.a
-lib/vfs/modules/libfile.la
-lib/vfs/modules/libfile.so
-lib/vfs/modules/libftp.a
-lib/vfs/modules/libftp.la
-lib/vfs/modules/libftp.so
-lib/vfs/modules/libgzip.a
-lib/vfs/modules/libgzip.la
-lib/vfs/modules/libgzip.so
-lib/vfs/modules/libhttp.a
-lib/vfs/modules/libhttp.la
-lib/vfs/modules/libhttp.so
-lib/vfs/modules/libnntp.a
-lib/vfs/modules/libnntp.la
-lib/vfs/modules/libnntp.so
-lib/vfs/modules/libvfs-pipe.a
-lib/vfs/modules/libvfs-pipe.la
-lib/vfs/modules/libvfs-pipe.so
-lib/vfs/modules/libvfs-test.a
-lib/vfs/modules/libvfs-test.la
-lib/vfs/modules/libvfs-test.so
-lib/vfs/modules/libvfs-translate.a
-lib/vfs/modules/libvfs-translate.la
-lib/vfs/modules/libvfs-translate.so
-lib/vfsConf.sh
-${PKGLOCALEDIR}/locale/az/LC_MESSAGES/gnome-vfs.mo
-${PKGLOCALEDIR}/locale/ca/LC_MESSAGES/gnome-vfs.mo
-${PKGLOCALEDIR}/locale/da/LC_MESSAGES/gnome-vfs.mo
-${PKGLOCALEDIR}/locale/de/LC_MESSAGES/gnome-vfs.mo
-${PKGLOCALEDIR}/locale/el/LC_MESSAGES/gnome-vfs.mo
-${PKGLOCALEDIR}/locale/es/LC_MESSAGES/gnome-vfs.mo
-${PKGLOCALEDIR}/locale/eu/LC_MESSAGES/gnome-vfs.mo
-${PKGLOCALEDIR}/locale/fi/LC_MESSAGES/gnome-vfs.mo
-${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/gnome-vfs.mo
-${PKGLOCALEDIR}/locale/ga/LC_MESSAGES/gnome-vfs.mo
-${PKGLOCALEDIR}/locale/gl/LC_MESSAGES/gnome-vfs.mo
-${PKGLOCALEDIR}/locale/hu/LC_MESSAGES/gnome-vfs.mo
-${PKGLOCALEDIR}/locale/it/LC_MESSAGES/gnome-vfs.mo
-${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/gnome-vfs.mo
-${PKGLOCALEDIR}/locale/ko/LC_MESSAGES/gnome-vfs.mo
-${PKGLOCALEDIR}/locale/lt/LC_MESSAGES/gnome-vfs.mo
-${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/gnome-vfs.mo
-${PKGLOCALEDIR}/locale/nn/LC_MESSAGES/gnome-vfs.mo
-${PKGLOCALEDIR}/locale/no/LC_MESSAGES/gnome-vfs.mo
-${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/gnome-vfs.mo
-${PKGLOCALEDIR}/locale/pt/LC_MESSAGES/gnome-vfs.mo
-${PKGLOCALEDIR}/locale/pt_BR/LC_MESSAGES/gnome-vfs.mo
-${PKGLOCALEDIR}/locale/ro/LC_MESSAGES/gnome-vfs.mo
-${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/gnome-vfs.mo
-${PKGLOCALEDIR}/locale/sk/LC_MESSAGES/gnome-vfs.mo
-${PKGLOCALEDIR}/locale/sl/LC_MESSAGES/gnome-vfs.mo
-${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/gnome-vfs.mo
-${PKGLOCALEDIR}/locale/tr/LC_MESSAGES/gnome-vfs.mo
-${PKGLOCALEDIR}/locale/uk/LC_MESSAGES/gnome-vfs.mo
-${PKGLOCALEDIR}/locale/wa/LC_MESSAGES/gnome-vfs.mo
-${PKGLOCALEDIR}/locale/zh_TW/LC_MESSAGES/gnome-vfs.mo
-@exec ${MKDIR} %D/share/gtk-doc/html/gnome-vfs
-@dirrm share/gtk-doc/html/gnome-vfs
-@dirrm lib/vfs/modules
-@dirrm lib/vfs/extfs
-@unexec ${RMDIR} %D/lib/vfs 2>/dev/null || ${TRUE}
-@dirrm lib/gnome-vfs-1.0/include
-@dirrm lib/gnome-vfs-1.0
-@dirrm include/gnome-vfs-1.0/libgnomevfs
-@dirrm include/gnome-vfs-1.0
-@dirrm etc/vfs/modules
-@dirrm etc/vfs
diff --git a/sysutils/gnome-vfs/buildlink2.mk b/sysutils/gnome-vfs/buildlink2.mk
deleted file mode 100644
index 57806f1b2f7..00000000000
--- a/sysutils/gnome-vfs/buildlink2.mk
+++ /dev/null
@@ -1,25 +0,0 @@
-# $NetBSD: buildlink2.mk,v 1.6 2003/07/13 13:53:16 wiz Exp $
-
-.if !defined(GNOME_VFS_BUILDLINK2_MK)
-GNOME_VFS_BUILDLINK2_MK= # defined
-
-BUILDLINK_PACKAGES+= gnome-vfs
-BUILDLINK_DEPENDS.gnome-vfs?= gnome-vfs>=1.0.5nb3
-BUILDLINK_PKGSRCDIR.gnome-vfs?= ../../sysutils/gnome-vfs
-
-EVAL_PREFIX+= BUILDLINK_PREFIX.gnome-vfs=gnome-vfs
-BUILDLINK_PREFIX.gnome-vfs_DEFAULT= ${X11PREFIX}
-BUILDLINK_FILES.gnome-vfs= include/gnome-vfs-1.0/*/*
-BUILDLINK_FILES.gnome-vfs+= lib/gnome-vfs-1.0/include/*
-BUILDLINK_FILES.gnome-vfs+= lib/libgnomevfs-pthread.*
-BUILDLINK_FILES.gnome-vfs+= lib/libgnomevfs.*
-
-.include "../../converters/libiconv/buildlink2.mk"
-.include "../../devel/GConf/buildlink2.mk"
-.include "../../devel/gettext-lib/buildlink2.mk"
-
-BUILDLINK_TARGETS+= gnome-vfs-buildlink
-
-gnome-vfs-buildlink: _BUILDLINK_USE
-
-.endif # GNOME_VFS_BUILDLINK2_MK
diff --git a/sysutils/gnome-vfs/distinfo b/sysutils/gnome-vfs/distinfo
deleted file mode 100644
index e1d75191f2f..00000000000
--- a/sysutils/gnome-vfs/distinfo
+++ /dev/null
@@ -1,9 +0,0 @@
-$NetBSD: distinfo,v 1.12 2003/04/17 23:09:52 nathanw Exp $
-
-SHA1 (gnome-vfs-1.0.5.tar.gz) = 41156323969d44e3f14ce481b81bfdb5d1deba49
-Size (gnome-vfs-1.0.5.tar.gz) = 1048954 bytes
-SHA1 (patch-ab) = 6d038601f881185f8a4c55a604f7baccb8693ffe
-SHA1 (patch-ac) = 4da6d9b46d059710dcd8248dd9d23cb79e5253e1
-SHA1 (patch-ae) = a0906ba19a6953aca3b173f03fb1b2d9bf742a09
-SHA1 (patch-af) = c76c64801b643828f6cb8751131447335d39c28e
-SHA1 (patch-ag) = a9560b6a284abaafd6793a899da15c7fcdf4dd95
diff --git a/sysutils/gnome-vfs/patches/patch-ab b/sysutils/gnome-vfs/patches/patch-ab
deleted file mode 100644
index 476c9af14e6..00000000000
--- a/sysutils/gnome-vfs/patches/patch-ab
+++ /dev/null
@@ -1,28 +0,0 @@
-$NetBSD: patch-ab,v 1.3 2001/04/07 19:00:21 rh Exp $
-
---- libgnomevfs-pthread/gnome-vfs-job.h.orig Thu Apr 5 17:03:26 2001
-+++ libgnomevfs-pthread/gnome-vfs-job.h
-@@ -28,7 +28,11 @@
-
- #include "gnome-vfs.h"
- #include "gnome-vfs-private.h"
-+#ifdef HAVE_SEMAPHORE_H
- #include <semaphore.h>
-+#else
-+#include <pthread.h>
-+#endif
-
- typedef struct GnomeVFSJob GnomeVFSJob;
-
-@@ -327,7 +331,11 @@
- gboolean failed;
-
- /* Global lock for accessing data. */
-+#ifdef HAVE_SEMAPHORE_H
- sem_t access_lock;
-+#else
-+ pthread_mutex_t access_lock;
-+#endif
-
- /* This condition is signalled when the master thread gets a
- notification and wants to acknowledge it. */
diff --git a/sysutils/gnome-vfs/patches/patch-ac b/sysutils/gnome-vfs/patches/patch-ac
deleted file mode 100644
index 5bee6d30607..00000000000
--- a/sysutils/gnome-vfs/patches/patch-ac
+++ /dev/null
@@ -1,44 +0,0 @@
-$NetBSD: patch-ac,v 1.1.1.1 2000/11/25 13:57:10 rh Exp $
-
---- modules/file-method.c.orig Thu Nov 16 07:57:37 2000
-+++ modules/file-method.c
-@@ -37,6 +37,7 @@
- #include <malloc.h>
- #include <sys/stat.h>
- #include <sys/types.h>
-+#include <sys/param.h>
- #include <unistd.h>
- #include <stdio.h>
- #include <utime.h>
-@@ -723,9 +724,15 @@
- filter_needs = GNOME_VFS_DIRECTORY_FILTER_NEEDS_NOTHING;
- }
-
-+#if (defined(BSD) && BSD >= 199306)
-+ if ((result = readdir (handle->dir)) != NULL) {
-+ *handle->current_entry = *result;
-+ }
-+#else
- if (readdir_r (handle->dir, handle->current_entry, &result) != 0) {
- return gnome_vfs_result_from_errno ();
- }
-+#endif
-
- if (result == NULL) {
- return GNOME_VFS_ERROR_EOF;
-@@ -1054,9 +1061,15 @@
-
- item_buffer = g_malloc (sizeof (struct dirent) + GET_PATH_MAX() + 1);
- for (;;) {
-+#if (defined(BSD) && BSD >= 199306)
-+ if ((item = readdir (directory)) != NULL) {
-+ *item_buffer = *item;
-+ }
-+#else
- if (readdir_r (directory, item_buffer, &item) != 0 || item == NULL) {
- break;
- }
-+#endif
-
- if (gnome_vfs_context_check_cancellation (context))
- break;
diff --git a/sysutils/gnome-vfs/patches/patch-ae b/sysutils/gnome-vfs/patches/patch-ae
deleted file mode 100644
index 7559aca8569..00000000000
--- a/sysutils/gnome-vfs/patches/patch-ae
+++ /dev/null
@@ -1,74 +0,0 @@
-$NetBSD: patch-ae,v 1.1 2001/04/06 22:03:09 rh Exp $
-
---- libgnomevfs-pthread/gnome-vfs-job.c.orig Thu Apr 5 17:46:13 2001
-+++ libgnomevfs-pthread/gnome-vfs-job.c
-@@ -166,13 +166,21 @@
- * access lock at all in the case of synch operations like xfer.
- * Unlocking here is perfectly OK, even though it's a hack.
- */
-+#ifdef HAVE_SEMAPHORE_H
- sem_post (&job->access_lock);
-+#else
-+ pthread_mutex_unlock (&job->access_lock);
-+#endif
-
- JOB_DEBUG (("Wait notify condition %u", GPOINTER_TO_UINT (notify_result->job_handle)));
- /* Wait for the notify condition. */
- g_cond_wait (job->notify_ack_condition, job->notify_ack_lock);
-
-+#ifdef HAVE_SEMAPHORE_H
- sem_wait (&job->access_lock);
-+#else
-+ pthread_mutex_lock (&job->access_lock);
-+#endif
-
- JOB_DEBUG (("Unlock notify ack lock %u", GPOINTER_TO_UINT (notify_result->job_handle)));
- /* Acknowledgment got: unlock the mutex. */
-@@ -564,7 +572,11 @@
- GnomeVFSOp *op;
-
- JOB_DEBUG (("locking access lock %u, op %d", GPOINTER_TO_UINT (job->job_handle), type));
-+#ifdef HAVE_SEMAPHORE_H
- sem_wait (&job->access_lock);
-+#else
-+ pthread_mutex_lock (&job->access_lock);
-+#endif
-
- op = g_new (GnomeVFSOp, 1);
- op->type = type;
-@@ -588,7 +600,11 @@
-
- new_job = g_new0 (GnomeVFSJob, 1);
-
-+#ifdef HAVE_SEMAPHORE_H
- sem_init (&new_job->access_lock, 0, 1);
-+#else
-+ pthread_mutex_init (&new_job->access_lock, NULL);
-+#endif
- new_job->notify_ack_condition = g_cond_new ();
- new_job->notify_ack_lock = g_mutex_new ();
-
-@@ -610,7 +626,11 @@
-
- gnome_vfs_op_destroy (job->op);
-
-+#ifdef HAVE_SEMAPHORE_H
- sem_destroy (&job->access_lock);
-+#else
-+ pthread_mutex_destroy (&job->access_lock);
-+#endif
-
- g_cond_free (job->notify_ack_condition);
- g_mutex_free (job->notify_ack_lock);
-@@ -705,7 +725,11 @@
- JOB_DEBUG (("new job %u, op %d, unlocking access lock",
- GPOINTER_TO_UINT (job->job_handle), job->op->type));
-
-+#ifdef HAVE_SEMAPHORE_H
- sem_post (&job->access_lock);
-+#else
-+ pthread_mutex_unlock (&job->access_lock);
-+#endif
- }
-
- #define DEFAULT_BUFFER_SIZE 16384
diff --git a/sysutils/gnome-vfs/patches/patch-af b/sysutils/gnome-vfs/patches/patch-af
deleted file mode 100644
index e76cd2ff8ce..00000000000
--- a/sysutils/gnome-vfs/patches/patch-af
+++ /dev/null
@@ -1,27 +0,0 @@
-$NetBSD: patch-af,v 1.1 2001/04/06 22:03:09 rh Exp $
-
---- libgnomevfs-pthread/gnome-vfs-job-slave.c.orig Thu Apr 5 17:55:16 2001
-+++ libgnomevfs-pthread/gnome-vfs-job-slave.c
-@@ -60,14 +60,22 @@
- }
-
- JOB_DEBUG (("locking access_lock %u", GPOINTER_TO_UINT (job->job_handle)));
-+#ifdef HAVE_SEMAPHORE_H
- sem_wait (&job->access_lock);
-+#else
-+ pthread_mutex_lock (&job->access_lock);
-+#endif
- gnome_vfs_async_job_map_unlock ();
-
- gnome_vfs_job_execute (job);
- complete = gnome_vfs_job_complete (job);
-
- JOB_DEBUG (("Unlocking access lock %u", GPOINTER_TO_UINT (job->job_handle)));
-+#ifdef HAVE_SEMAPHORE_H
- sem_post (&job->access_lock);
-+#else
-+ pthread_mutex_unlock (&job->access_lock);
-+#endif
-
- if (complete) {
- JOB_DEBUG (("job %u done, removing from map and destroying",
diff --git a/sysutils/gnome-vfs/patches/patch-ag b/sysutils/gnome-vfs/patches/patch-ag
deleted file mode 100644
index cc0a90fb723..00000000000
--- a/sysutils/gnome-vfs/patches/patch-ag
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ag,v 1.8 2003/04/17 23:09:53 nathanw Exp $
-
---- libgnomevfs/gnome-vfs-init.c.orig 2003-04-17 18:42:59.000000000 -0400
-+++ libgnomevfs/gnome-vfs-init.c 2003-04-17 18:46:06.000000000 -0400
-@@ -46,6 +46,9 @@
- gboolean retval;
- char *bogus_argv[2] = { "dummy", NULL };
-
-+ if (!g_thread_supported ())
-+ g_thread_init (NULL);
-+
- G_LOCK (vfs_already_initialized);
-
- if (!vfs_already_initialized) {
diff --git a/sysutils/gnome-vfs2/DESCR b/sysutils/gnome-vfs2/DESCR
deleted file mode 100644
index f76a7c7b3f5..00000000000
--- a/sysutils/gnome-vfs2/DESCR
+++ /dev/null
@@ -1,5 +0,0 @@
-This is the GNOME Virtual File System, version 2.
-
-GNOME VFS provides an abstraction layer of the file system; applications
-use this layer to access many different protocols and simulate that they
-are part of the local file system.
diff --git a/sysutils/gnome-vfs2/Makefile b/sysutils/gnome-vfs2/Makefile
deleted file mode 100644
index 3f8168d543a..00000000000
--- a/sysutils/gnome-vfs2/Makefile
+++ /dev/null
@@ -1,66 +0,0 @@
-# $NetBSD: Makefile,v 1.14 2003/07/13 13:53:16 wiz Exp $
-#
-
-DISTNAME= gnome-vfs-2.2.4
-PKGNAME= ${DISTNAME:S/vfs/vfs2/}
-PKGREVISION= 3
-CATEGORIES= sysutils gnome
-MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gnome-vfs/2.2/}
-EXTRACT_SUFX= .tar.bz2
-
-MAINTAINER= jmmv@netbsd.org
-HOMEPAGE= http://www.gnome.org/
-COMMENT= GNOME Virtual File System (v2)
-
-BUILD_USES_MSGFMT= YES
-
-GNU_CONFIGURE= YES
-USE_BUILDLINK2= YES
-USE_PKGLOCALEDIR= YES
-USE_GMAKE= YES
-USE_LIBTOOL= YES
-USE_PKGINSTALL= YES
-
-LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
-PKGCONFIG_OVERRIDE= ${WRKSRC}/gnome-vfs-2.0.pc.in
-PKGCONFIG_OVERRIDE+= ${WRKSRC}/gnome-vfs-module-2.0.pc.in
-
-CONFIGURE_ARGS= --enable-gtk-doc=no
-CONFIGURE_ARGS+= --enable-platform-gnome-2
-CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFBASE}
-CONFIGURE_ARGS+= --with-html-dir=${PREFIX}/share/doc/html
-
-PKG_SYSCONFSUBDIR= gnome-vfs-2.0
-OWN_DIRS= ${PKG_SYSCONFDIR}/modules ${PKG_SYSCONFDIR}/vfolders
-
-EGDIR= ${PREFIX}/share/examples/gnome-vfs-2.0
-EGFILES= modules/default-modules.conf
-EGFILES+= vfolders/applications-all-users.vfolder-info
-EGFILES+= vfolders/favorites.vfolder-info
-EGFILES+= vfolders/network.vfolder-info
-EGFILES+= vfolders/preferences-all-users.vfolder-info
-EGFILES+= vfolders/server-settings.vfolder-info
-EGFILES+= vfolders/start-here.vfolder-info
-EGFILES+= vfolders/system-settings.vfolder-info
-.for f in ${EGFILES}
-CONF_FILES+= ${EGDIR}/$f ${PKG_SYSCONFDIR}/$f
-.endfor
-.undef f
-
-GCONF2_SCHEMAS= system_http_proxy.schemas
-
-.include "../../archivers/bzip2/buildlink2.mk"
-.include "../../audio/cdparanoia/buildlink2.mk"
-.include "../../databases/gnome-mime-data/buildlink2.mk"
-.include "../../devel/gettext-lib/buildlink2.mk"
-.include "../../devel/GConf2/schemas.mk"
-.include "../../devel/glib2/buildlink2.mk"
-.include "../../devel/libbonobo/buildlink2.mk"
-.include "../../devel/bonobo-activation/buildlink2.mk"
-.include "../../devel/popt/buildlink2.mk"
-.include "../../devel/zlib/buildlink2.mk"
-.include "../../net/ORBit2/buildlink2.mk"
-.include "../../textproc/libxml2/buildlink2.mk"
-.include "../../security/openssl/buildlink2.mk"
-.include "../../sysutils/fam/buildlink2.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/gnome-vfs2/PLIST b/sysutils/gnome-vfs2/PLIST
deleted file mode 100644
index 47ae7dd1131..00000000000
--- a/sysutils/gnome-vfs2/PLIST
+++ /dev/null
@@ -1,278 +0,0 @@
-@comment $NetBSD: PLIST,v 1.5 2003/04/27 02:03:01 rh Exp $
-include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-application-registry.h
-include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-async-ops.h
-include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-cancellation.h
-include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-context.h
-include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-directory.h
-include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-file-info.h
-include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-file-size.h
-include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-find-directory.h
-include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-handle.h
-include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-init.h
-include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-job-limit.h
-include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-mime-handlers.h
-include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-mime-monitor.h
-include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-mime-utils.h
-include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-module-callback.h
-include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-monitor.h
-include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-ops.h
-include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-result.h
-include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-standard-callbacks.h
-include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-types.h
-include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-uri.h
-include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-utils.h
-include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-xfer.h
-include/gnome-vfs-2.0/libgnomevfs/gnome-vfs.h
-include/gnome-vfs-module-2.0/libgnomevfs/gnome-vfs-cancellable-ops.h
-include/gnome-vfs-module-2.0/libgnomevfs/gnome-vfs-inet-connection.h
-include/gnome-vfs-module-2.0/libgnomevfs/gnome-vfs-method.h
-include/gnome-vfs-module-2.0/libgnomevfs/gnome-vfs-mime-info.h
-include/gnome-vfs-module-2.0/libgnomevfs/gnome-vfs-mime.h
-include/gnome-vfs-module-2.0/libgnomevfs/gnome-vfs-module-callback-module-api.h
-include/gnome-vfs-module-2.0/libgnomevfs/gnome-vfs-module-shared.h
-include/gnome-vfs-module-2.0/libgnomevfs/gnome-vfs-module.h
-include/gnome-vfs-module-2.0/libgnomevfs/gnome-vfs-parse-ls.h
-include/gnome-vfs-module-2.0/libgnomevfs/gnome-vfs-socket-buffer.h
-include/gnome-vfs-module-2.0/libgnomevfs/gnome-vfs-socket.h
-include/gnome-vfs-module-2.0/libgnomevfs/gnome-vfs-ssl.h
-include/gnome-vfs-module-2.0/libgnomevfs/gnome-vfs-transform.h
-lib/bonobo/monikers/libmoniker_gnome_vfs_std.a
-lib/bonobo/monikers/libmoniker_gnome_vfs_std.la
-lib/bonobo/monikers/libmoniker_gnome_vfs_std.so
-lib/bonobo/servers/GNOME_VFS_Moniker_std.server
-lib/gnome-vfs-2.0/include/gnome-vfs-file-size.h
-lib/gnome-vfs-2.0/modules/libbzip2.a
-lib/gnome-vfs-2.0/modules/libbzip2.la
-lib/gnome-vfs-2.0/modules/libbzip2.so
-lib/gnome-vfs-2.0/modules/libextfs.a
-lib/gnome-vfs-2.0/modules/libextfs.la
-lib/gnome-vfs-2.0/modules/libextfs.so
-lib/gnome-vfs-2.0/modules/libfile.a
-lib/gnome-vfs-2.0/modules/libfile.la
-lib/gnome-vfs-2.0/modules/libfile.so
-lib/gnome-vfs-2.0/modules/libftp.a
-lib/gnome-vfs-2.0/modules/libftp.la
-lib/gnome-vfs-2.0/modules/libftp.so
-lib/gnome-vfs-2.0/modules/libgzip.a
-lib/gnome-vfs-2.0/modules/libgzip.la
-lib/gnome-vfs-2.0/modules/libgzip.so
-lib/gnome-vfs-2.0/modules/libhttp.a
-lib/gnome-vfs-2.0/modules/libhttp.la
-lib/gnome-vfs-2.0/modules/libhttp.so
-lib/gnome-vfs-2.0/modules/libnntp.a
-lib/gnome-vfs-2.0/modules/libnntp.la
-lib/gnome-vfs-2.0/modules/libnntp.so
-lib/gnome-vfs-2.0/modules/libssh.a
-lib/gnome-vfs-2.0/modules/libssh.la
-lib/gnome-vfs-2.0/modules/libssh.so
-lib/gnome-vfs-2.0/modules/libtar.a
-lib/gnome-vfs-2.0/modules/libtar.la
-lib/gnome-vfs-2.0/modules/libtar.so
-lib/gnome-vfs-2.0/modules/libvfolder-desktop.a
-lib/gnome-vfs-2.0/modules/libvfolder-desktop.la
-lib/gnome-vfs-2.0/modules/libvfolder-desktop.so
-lib/gnome-vfs-2.0/modules/libvfs-pipe.a
-lib/gnome-vfs-2.0/modules/libvfs-pipe.la
-lib/gnome-vfs-2.0/modules/libvfs-pipe.so
-lib/gnome-vfs-2.0/modules/libvfs-test.a
-lib/gnome-vfs-2.0/modules/libvfs-test.la
-lib/gnome-vfs-2.0/modules/libvfs-test.so
-lib/gnome-vfs-2.0/modules/libvfs-translate.a
-lib/gnome-vfs-2.0/modules/libvfs-translate.la
-lib/gnome-vfs-2.0/modules/libvfs-translate.so
-lib/libgnomevfs-2.a
-lib/libgnomevfs-2.la
-lib/libgnomevfs-2.so
-lib/libgnomevfs-2.so.0
-lib/libgnomevfs-2.so.0.0
-lib/pkgconfig/gnome-vfs-2.0.pc
-lib/pkgconfig/gnome-vfs-module-2.0.pc
-lib/vfs/2.0/extfs/README
-lib/vfs/2.0/extfs/a
-lib/vfs/2.0/extfs/ar
-lib/vfs/2.0/extfs/arj
-lib/vfs/2.0/extfs/cpio
-lib/vfs/2.0/extfs/deb
-lib/vfs/2.0/extfs/hp48
-lib/vfs/2.0/extfs/lha
-lib/vfs/2.0/extfs/mailfs
-lib/vfs/2.0/extfs/patchfs
-lib/vfs/2.0/extfs/rar
-lib/vfs/2.0/extfs/rpm
-lib/vfs/2.0/extfs/rpms
-lib/vfs/2.0/extfs/tar
-lib/vfs/2.0/extfs/trpm
-lib/vfs/2.0/extfs/zip
-lib/vfs/2.0/extfs/zoo
-share/doc/html/gnome-vfs-2.0/about.html
-share/doc/html/gnome-vfs-2.0/advanced-operations.html
-share/doc/html/gnome-vfs-2.0/c9456.html
-share/doc/html/gnome-vfs-2.0/c9466.html
-share/doc/html/gnome-vfs-2.0/ch08.html
-share/doc/html/gnome-vfs-2.0/data-types.html
-share/doc/html/gnome-vfs-2.0/directory-operations.html
-share/doc/html/gnome-vfs-2.0/everything-else.html
-share/doc/html/gnome-vfs-2.0/file-operations.html
-share/doc/html/gnome-vfs-2.0/gnome-vfs-application-registry.html
-share/doc/html/gnome-vfs-2.0/gnome-vfs-asynchronous-operations.html
-share/doc/html/gnome-vfs-2.0/gnome-vfs-cancellation.html
-share/doc/html/gnome-vfs-2.0/gnome-vfs-configuration.html
-share/doc/html/gnome-vfs-2.0/gnome-vfs-context.html
-share/doc/html/gnome-vfs-2.0/gnome-vfs-directory-operations.html
-share/doc/html/gnome-vfs-2.0/gnome-vfs-directory.html
-share/doc/html/gnome-vfs-2.0/gnome-vfs-file-info.html
-share/doc/html/gnome-vfs-2.0/gnome-vfs-file-operations.html
-share/doc/html/gnome-vfs-2.0/gnome-vfs-file-size.html
-share/doc/html/gnome-vfs-2.0/gnome-vfs-finding-special-directories.html
-share/doc/html/gnome-vfs-2.0/gnome-vfs-first-steps.html
-share/doc/html/gnome-vfs-2.0/gnome-vfs-gnome-vfs-application-registry.html
-share/doc/html/gnome-vfs-2.0/gnome-vfs-gnome-vfs-async-ops.html
-share/doc/html/gnome-vfs-2.0/gnome-vfs-gnome-vfs-cancellation.html
-share/doc/html/gnome-vfs-2.0/gnome-vfs-gnome-vfs-context.html
-share/doc/html/gnome-vfs-2.0/gnome-vfs-gnome-vfs-directory-basic-ops.html
-share/doc/html/gnome-vfs-2.0/gnome-vfs-gnome-vfs-directory-find-ops.html
-share/doc/html/gnome-vfs-2.0/gnome-vfs-gnome-vfs-directory-list-ops.html
-share/doc/html/gnome-vfs-2.0/gnome-vfs-gnome-vfs-directory.html
-share/doc/html/gnome-vfs-2.0/gnome-vfs-gnome-vfs-file-advanced-ops.html
-share/doc/html/gnome-vfs-2.0/gnome-vfs-gnome-vfs-file-basic-ops.html
-share/doc/html/gnome-vfs-2.0/gnome-vfs-gnome-vfs-file-info-ops.html
-share/doc/html/gnome-vfs-2.0/gnome-vfs-gnome-vfs-file-info.html
-share/doc/html/gnome-vfs-2.0/gnome-vfs-gnome-vfs-file-rw-ops.html
-share/doc/html/gnome-vfs-2.0/gnome-vfs-gnome-vfs-file-size.html
-share/doc/html/gnome-vfs-2.0/gnome-vfs-gnome-vfs-file-trunc-ops.html
-share/doc/html/gnome-vfs-2.0/gnome-vfs-gnome-vfs-find-directory.html
-share/doc/html/gnome-vfs-2.0/gnome-vfs-gnome-vfs-inet-connection.html
-share/doc/html/gnome-vfs-2.0/gnome-vfs-gnome-vfs-init.html
-share/doc/html/gnome-vfs-2.0/gnome-vfs-gnome-vfs-method.html
-share/doc/html/gnome-vfs-2.0/gnome-vfs-gnome-vfs-mime-database.html
-share/doc/html/gnome-vfs-2.0/gnome-vfs-gnome-vfs-mime-monitor.html
-share/doc/html/gnome-vfs-2.0/gnome-vfs-gnome-vfs-mime.html
-share/doc/html/gnome-vfs-2.0/gnome-vfs-gnome-vfs-module-callback-module-api.html
-share/doc/html/gnome-vfs-2.0/gnome-vfs-gnome-vfs-module-callback.html
-share/doc/html/gnome-vfs-2.0/gnome-vfs-gnome-vfs-module-shared.html
-share/doc/html/gnome-vfs-2.0/gnome-vfs-gnome-vfs-module.html
-share/doc/html/gnome-vfs-2.0/gnome-vfs-gnome-vfs-monitor.html
-share/doc/html/gnome-vfs-2.0/gnome-vfs-gnome-vfs-ops.html
-share/doc/html/gnome-vfs-2.0/gnome-vfs-gnome-vfs-parse-ls.html
-share/doc/html/gnome-vfs-2.0/gnome-vfs-gnome-vfs-result.html
-share/doc/html/gnome-vfs-2.0/gnome-vfs-gnome-vfs-socket-buffer.html
-share/doc/html/gnome-vfs-2.0/gnome-vfs-gnome-vfs-socket.html
-share/doc/html/gnome-vfs-2.0/gnome-vfs-gnome-vfs-ssl.html
-share/doc/html/gnome-vfs-2.0/gnome-vfs-gnome-vfs-standard-callbacks.html
-share/doc/html/gnome-vfs-2.0/gnome-vfs-gnome-vfs-transform.html
-share/doc/html/gnome-vfs-2.0/gnome-vfs-gnome-vfs-uri.html
-share/doc/html/gnome-vfs-2.0/gnome-vfs-gnome-vfs-utils.html
-share/doc/html/gnome-vfs-2.0/gnome-vfs-gnome-vfs-xfer.html
-share/doc/html/gnome-vfs-2.0/gnome-vfs-gnomevfsmetadata.html
-share/doc/html/gnome-vfs-2.0/gnome-vfs-gnomevfsmimemonitor.html
-share/doc/html/gnome-vfs-2.0/gnome-vfs-inet-connection.html
-share/doc/html/gnome-vfs-2.0/gnome-vfs-initialization.html
-share/doc/html/gnome-vfs-2.0/gnome-vfs-iobuf.html
-share/doc/html/gnome-vfs-2.0/gnome-vfs-method.html
-share/doc/html/gnome-vfs-2.0/gnome-vfs-mime-handlers.html
-share/doc/html/gnome-vfs-2.0/gnome-vfs-mime-info.html
-share/doc/html/gnome-vfs-2.0/gnome-vfs-mime-magic.html
-share/doc/html/gnome-vfs-2.0/gnome-vfs-mime-monitor.html
-share/doc/html/gnome-vfs-2.0/gnome-vfs-mime-sniff-buffer.html
-share/doc/html/gnome-vfs-2.0/gnome-vfs-mime.html
-share/doc/html/gnome-vfs-2.0/gnome-vfs-module-callback-module-api.html
-share/doc/html/gnome-vfs-2.0/gnome-vfs-module-callbacks.html
-share/doc/html/gnome-vfs-2.0/gnome-vfs-module-shared.html
-share/doc/html/gnome-vfs-2.0/gnome-vfs-module.html
-share/doc/html/gnome-vfs-2.0/gnome-vfs-ops.html
-share/doc/html/gnome-vfs-2.0/gnome-vfs-parse-ls.html
-share/doc/html/gnome-vfs-2.0/gnome-vfs-process.html
-share/doc/html/gnome-vfs-2.0/gnome-vfs-result.html
-share/doc/html/gnome-vfs-2.0/gnome-vfs-ssl.html
-share/doc/html/gnome-vfs-2.0/gnome-vfs-standard-callbacks.html
-share/doc/html/gnome-vfs-2.0/gnome-vfs-types.html
-share/doc/html/gnome-vfs-2.0/gnome-vfs-uri.html
-share/doc/html/gnome-vfs-2.0/gnome-vfs-utils.html
-share/doc/html/gnome-vfs-2.0/gnome-vfs-writing-modules.html
-share/doc/html/gnome-vfs-2.0/gnome-vfs-xfer.html
-share/doc/html/gnome-vfs-2.0/index.html
-share/doc/html/gnome-vfs-2.0/index.sgml
-share/doc/html/gnome-vfs-2.0/mime-registry.html
-share/doc/html/gnome-vfs-2.0/modules.html
-share/doc/html/gnome-vfs-2.0/writing-modules.html
-share/doc/html/gnome-vfs-2.0/x27.html
-share/examples/gnome-vfs-2.0/modules/default-modules.conf
-share/examples/gnome-vfs-2.0/vfolders/applications-all-users.vfolder-info
-share/examples/gnome-vfs-2.0/vfolders/favorites.vfolder-info
-share/examples/gnome-vfs-2.0/vfolders/network.vfolder-info
-share/examples/gnome-vfs-2.0/vfolders/preferences-all-users.vfolder-info
-share/examples/gnome-vfs-2.0/vfolders/server-settings.vfolder-info
-share/examples/gnome-vfs-2.0/vfolders/start-here.vfolder-info
-share/examples/gnome-vfs-2.0/vfolders/system-settings.vfolder-info
-share/gconf/schemas/system_http_proxy.schemas
-${PKGLOCALEDIR}/locale/am/LC_MESSAGES/gnome-vfs-2.0.mo
-${PKGLOCALEDIR}/locale/ar/LC_MESSAGES/gnome-vfs-2.0.mo
-${PKGLOCALEDIR}/locale/az/LC_MESSAGES/gnome-vfs-2.0.mo
-${PKGLOCALEDIR}/locale/be/LC_MESSAGES/gnome-vfs-2.0.mo
-${PKGLOCALEDIR}/locale/bg/LC_MESSAGES/gnome-vfs-2.0.mo
-${PKGLOCALEDIR}/locale/bn/LC_MESSAGES/gnome-vfs-2.0.mo
-${PKGLOCALEDIR}/locale/bs/LC_MESSAGES/gnome-vfs-2.0.mo
-${PKGLOCALEDIR}/locale/ca/LC_MESSAGES/gnome-vfs-2.0.mo
-${PKGLOCALEDIR}/locale/cs/LC_MESSAGES/gnome-vfs-2.0.mo
-${PKGLOCALEDIR}/locale/da/LC_MESSAGES/gnome-vfs-2.0.mo
-${PKGLOCALEDIR}/locale/de/LC_MESSAGES/gnome-vfs-2.0.mo
-${PKGLOCALEDIR}/locale/el/LC_MESSAGES/gnome-vfs-2.0.mo
-${PKGLOCALEDIR}/locale/eo/LC_MESSAGES/gnome-vfs-2.0.mo
-${PKGLOCALEDIR}/locale/es/LC_MESSAGES/gnome-vfs-2.0.mo
-${PKGLOCALEDIR}/locale/et/LC_MESSAGES/gnome-vfs-2.0.mo
-${PKGLOCALEDIR}/locale/eu/LC_MESSAGES/gnome-vfs-2.0.mo
-${PKGLOCALEDIR}/locale/fa/LC_MESSAGES/gnome-vfs-2.0.mo
-${PKGLOCALEDIR}/locale/fi/LC_MESSAGES/gnome-vfs-2.0.mo
-${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/gnome-vfs-2.0.mo
-${PKGLOCALEDIR}/locale/ga/LC_MESSAGES/gnome-vfs-2.0.mo
-${PKGLOCALEDIR}/locale/gl/LC_MESSAGES/gnome-vfs-2.0.mo
-${PKGLOCALEDIR}/locale/he/LC_MESSAGES/gnome-vfs-2.0.mo
-${PKGLOCALEDIR}/locale/hi/LC_MESSAGES/gnome-vfs-2.0.mo
-${PKGLOCALEDIR}/locale/hu/LC_MESSAGES/gnome-vfs-2.0.mo
-${PKGLOCALEDIR}/locale/id/LC_MESSAGES/gnome-vfs-2.0.mo
-${PKGLOCALEDIR}/locale/it/LC_MESSAGES/gnome-vfs-2.0.mo
-${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/gnome-vfs-2.0.mo
-${PKGLOCALEDIR}/locale/ko/LC_MESSAGES/gnome-vfs-2.0.mo
-${PKGLOCALEDIR}/locale/lt/LC_MESSAGES/gnome-vfs-2.0.mo
-${PKGLOCALEDIR}/locale/lv/LC_MESSAGES/gnome-vfs-2.0.mo
-${PKGLOCALEDIR}/locale/mk/LC_MESSAGES/gnome-vfs-2.0.mo
-${PKGLOCALEDIR}/locale/ml/LC_MESSAGES/gnome-vfs-2.0.mo
-${PKGLOCALEDIR}/locale/mn/LC_MESSAGES/gnome-vfs-2.0.mo
-${PKGLOCALEDIR}/locale/ms/LC_MESSAGES/gnome-vfs-2.0.mo
-${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/gnome-vfs-2.0.mo
-${PKGLOCALEDIR}/locale/nn/LC_MESSAGES/gnome-vfs-2.0.mo
-${PKGLOCALEDIR}/locale/no/LC_MESSAGES/gnome-vfs-2.0.mo
-${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/gnome-vfs-2.0.mo
-${PKGLOCALEDIR}/locale/pt/LC_MESSAGES/gnome-vfs-2.0.mo
-${PKGLOCALEDIR}/locale/pt_BR/LC_MESSAGES/gnome-vfs-2.0.mo
-${PKGLOCALEDIR}/locale/ro/LC_MESSAGES/gnome-vfs-2.0.mo
-${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/gnome-vfs-2.0.mo
-${PKGLOCALEDIR}/locale/sk/LC_MESSAGES/gnome-vfs-2.0.mo
-${PKGLOCALEDIR}/locale/sl/LC_MESSAGES/gnome-vfs-2.0.mo
-${PKGLOCALEDIR}/locale/sq/LC_MESSAGES/gnome-vfs-2.0.mo
-${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/gnome-vfs-2.0.mo
-${PKGLOCALEDIR}/locale/tr/LC_MESSAGES/gnome-vfs-2.0.mo
-${PKGLOCALEDIR}/locale/uk/LC_MESSAGES/gnome-vfs-2.0.mo
-${PKGLOCALEDIR}/locale/vi/LC_MESSAGES/gnome-vfs-2.0.mo
-${PKGLOCALEDIR}/locale/wa/LC_MESSAGES/gnome-vfs-2.0.mo
-${PKGLOCALEDIR}/locale/yi/LC_MESSAGES/gnome-vfs-2.0.mo
-${PKGLOCALEDIR}/locale/zh_CN/LC_MESSAGES/gnome-vfs-2.0.mo
-${PKGLOCALEDIR}/locale/zh_TW/LC_MESSAGES/gnome-vfs-2.0.mo
-@comment in GConf2: @dirrm share/gconf/schemas
-@comment in GConf2: @dirrm share/gconf
-@dirrm share/examples/gnome-vfs-2.0/vfolders
-@dirrm share/examples/gnome-vfs-2.0/modules
-@dirrm share/examples/gnome-vfs-2.0
-@dirrm share/doc/html/gnome-vfs-2.0
-@dirrm lib/vfs/2.0/extfs
-@dirrm lib/vfs/2.0
-@unexec ${RMDIR} %D/lib/vfs 2>/dev/null || ${TRUE}
-@dirrm lib/gnome-vfs-2.0/modules
-@dirrm lib/gnome-vfs-2.0/include
-@dirrm lib/gnome-vfs-2.0
-@comment in bonobo-activation: @dirrm lib/bonobo/servers
-@comment in bonobo-activation: @dirrm lib/bonobo/monikers
-@dirrm include/gnome-vfs-module-2.0/libgnomevfs
-@dirrm include/gnome-vfs-module-2.0
-@dirrm include/gnome-vfs-2.0/libgnomevfs
-@dirrm include/gnome-vfs-2.0
diff --git a/sysutils/gnome-vfs2/buildlink2.mk b/sysutils/gnome-vfs2/buildlink2.mk
deleted file mode 100644
index 77fc1e75f90..00000000000
--- a/sysutils/gnome-vfs2/buildlink2.mk
+++ /dev/null
@@ -1,37 +0,0 @@
-# $NetBSD: buildlink2.mk,v 1.10 2003/07/13 13:53:17 wiz Exp $
-
-.if !defined(GNOME_VFS2_BUILDLINK2_MK)
-GNOME_VFS2_BUILDLINK2_MK= # defined
-
-BUILDLINK_PACKAGES+= gnome-vfs2
-BUILDLINK_DEPENDS.gnome-vfs2?= gnome-vfs2>=2.2.4nb3
-BUILDLINK_PKGSRCDIR.gnome-vfs2?= ../../sysutils/gnome-vfs2
-
-EVAL_PREFIX+= BUILDLINK_PREFIX.gnome-vfs2=gnome-vfs2
-BUILDLINK_PREFIX.gnome-vfs2_DEFAULT= ${LOCALBASE}
-BUILDLINK_FILES.gnome-vfs2= include/gnome-vfs-2.0/libgnomevfs/*
-BUILDLINK_FILES.gnome-vfs2+= include/gnome-vfs-module-2.0/libgnomevfs/*
-BUILDLINK_FILES.gnome-vfs2+= lib/gnome-vfs-2.0/include/gnome-vfs-file-size.h
-BUILDLINK_FILES.gnome-vfs2+= lib/gnome-vfs-2.0/modules/*
-BUILDLINK_FILES.gnome-vfs2+= lib/libgnomevfs-2.*
-
-.include "../../archivers/bzip2/buildlink2.mk"
-.include "../../audio/cdparanoia/buildlink2.mk"
-.include "../../databases/gnome-mime-data/buildlink2.mk"
-.include "../../devel/gettext-lib/buildlink2.mk"
-.include "../../devel/GConf2/buildlink2.mk"
-.include "../../devel/glib2/buildlink2.mk"
-.include "../../devel/libbonobo/buildlink2.mk"
-.include "../../devel/bonobo-activation/buildlink2.mk"
-.include "../../devel/popt/buildlink2.mk"
-.include "../../devel/zlib/buildlink2.mk"
-.include "../../net/ORBit2/buildlink2.mk"
-.include "../../textproc/libxml2/buildlink2.mk"
-.include "../../security/openssl/buildlink2.mk"
-.include "../../sysutils/fam/buildlink2.mk"
-
-BUILDLINK_TARGETS+= gnome-vfs2-buildlink
-
-gnome-vfs2-buildlink: _BUILDLINK_USE
-
-.endif # GNOME_VFS2_BUILDLINK2_MK
diff --git a/sysutils/gnome-vfs2/distinfo b/sysutils/gnome-vfs2/distinfo
deleted file mode 100644
index c3d4896dfc2..00000000000
--- a/sysutils/gnome-vfs2/distinfo
+++ /dev/null
@@ -1,8 +0,0 @@
-$NetBSD: distinfo,v 1.8 2003/04/27 14:44:33 jmmv Exp $
-
-SHA1 (gnome-vfs-2.2.4.tar.bz2) = 40518be379250cb8b6c611c2d585ea35403b3f53
-Size (gnome-vfs-2.2.4.tar.bz2) = 999711 bytes
-SHA1 (patch-ae) = fbe0fa8e2def2fec2cc55317a35638d8314287d2
-SHA1 (patch-ag) = 48a1a7e7b780bcf25f311abe0c48524c8fe9eaa4
-SHA1 (patch-ai) = 0cbdf095c4c55a770d13d443d904bb567fee3666
-SHA1 (patch-al) = f6e0f6b68e078e7a115871bb8cb4ea72bef7eab4
diff --git a/sysutils/gnome-vfs2/patches/patch-ae b/sysutils/gnome-vfs2/patches/patch-ae
deleted file mode 100644
index 3cb8869b18b..00000000000
--- a/sysutils/gnome-vfs2/patches/patch-ae
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ae,v 1.1 2002/09/11 23:07:51 rh Exp $
-
---- Makefile.in.orig Sat Sep 7 17:52:45 2002
-+++ Makefile.in Sat Sep 7 17:53:24 2002
-@@ -183,7 +183,6 @@
- schemas \
- devel-docs \
- doc \
-- test \
- monikers \
- po
-
diff --git a/sysutils/gnome-vfs2/patches/patch-ag b/sysutils/gnome-vfs2/patches/patch-ag
deleted file mode 100644
index 05b126616bf..00000000000
--- a/sysutils/gnome-vfs2/patches/patch-ag
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ag,v 1.3 2003/02/15 16:29:32 jmmv Exp $
-
---- modules/Makefile.in.orig Mon Jan 20 20:46:17 2003
-+++ modules/Makefile.in
-@@ -232,7 +232,7 @@ modules_LTLIBRARIES = \
- # Not currently supported
- # libnfs.la
-
--modulesconfdir = $(sysconfdir)/gnome-vfs-2.0/modules
-+modulesconfdir = $(datadir)/examples/gnome-vfs-2.0/modules
- @HAVE_CDDA_TRUE@CDDA_CONF = @HAVE_CDDA_TRUE@cdda-module.conf
- @HAVE_SSL_TRUE@SSL_CONF = @HAVE_SSL_TRUE@ssl-modules.conf
- @BUILD_CDEMENU_MODULE_TRUE@CDE_CONF = @BUILD_CDEMENU_MODULE_TRUE@cdemenu-module.conf
diff --git a/sysutils/gnome-vfs2/patches/patch-ai b/sysutils/gnome-vfs2/patches/patch-ai
deleted file mode 100644
index 41bed287703..00000000000
--- a/sysutils/gnome-vfs2/patches/patch-ai
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ai,v 1.3 2003/02/15 16:29:32 jmmv Exp $
-
---- modules/vfolder/Makefile.in.orig Mon Jan 20 20:46:19 2003
-+++ modules/vfolder/Makefile.in
-@@ -231,7 +231,7 @@ libvfolder_desktop_la_LIBADD = $(top_bui
-
- ### Default .vfolder-info files
-
--vfolderdir = $(sysconfdir)/gnome-vfs-2.0/vfolders
-+vfolderdir = $(datadir)/examples/gnome-vfs-2.0/vfolders
- vfolder_DATA = \
- applications-all-users.vfolder-info \
- network.vfolder-info \
diff --git a/sysutils/gnome-vfs2/patches/patch-al b/sysutils/gnome-vfs2/patches/patch-al
deleted file mode 100644
index 751a915e591..00000000000
--- a/sysutils/gnome-vfs2/patches/patch-al
+++ /dev/null
@@ -1,36 +0,0 @@
-$NetBSD: patch-al,v 1.4 2003/04/27 14:44:34 jmmv Exp $
-
---- modules/file-method.c.orig 2003-02-24 13:18:31.000000000 +0100
-+++ modules/file-method.c
-@@ -806,6 +806,7 @@ do_read_directory (GnomeVFSMethod *metho
- result = readdir (handle->dir);
-
- if (result == NULL && errno != 0) {
-+ G_UNLOCK (readdir);
- return gnome_vfs_result_from_errno ();
- }
- if (result != NULL) {
-@@ -1113,9 +1114,23 @@ find_trash_in_one_hierarchy_level (const
-
- item_buffer = g_malloc (sizeof (struct dirent) + GET_PATH_MAX() + 1);
- for (;;) {
-+#ifdef HAVE_READDIR_R
- if (readdir_r (directory, item_buffer, &item) != 0 || item == NULL) {
- break;
- }
-+#else
-+ G_LOCK (readdir);
-+ errno = 0;
-+ item = readdir (directory);
-+ if (item == NULL || errno != 0) {
-+ G_UNLOCK (readdir);
-+ break;
-+ }
-+ if (item != NULL) {
-+ memcpy (item_buffer, item, sizeof (struct dirent));
-+ }
-+ G_UNLOCK (readdir);
-+#endif
-
- if (gnome_vfs_context_check_cancellation (context))
- break;
diff --git a/sysutils/gnometoaster/DESCR b/sysutils/gnometoaster/DESCR
deleted file mode 100644
index 5ff2670a26b..00000000000
--- a/sysutils/gnometoaster/DESCR
+++ /dev/null
@@ -1,5 +0,0 @@
-This is an early alpha archive of the 'Gnome Toaster' package,
-a cdrecord/mkisofs/cdda2wav frontend for creating data,audio
-and mixed mode cd's both from other cds or from self compiled data.
-Although it does not have all of it's planned functionality,it is yet
-quite usable.
diff --git a/sysutils/gnometoaster/Makefile b/sysutils/gnometoaster/Makefile
deleted file mode 100644
index 778e0cc796d..00000000000
--- a/sysutils/gnometoaster/Makefile
+++ /dev/null
@@ -1,27 +0,0 @@
-# $NetBSD: Makefile,v 1.7 2003/07/13 13:53:17 wiz Exp $
-#
-
-DISTNAME= gtoaster1.0Beta5
-PKGNAME= gnometoaster-1.0Beta5
-PKGREVISION= 2
-WRKSRC= ${WRKDIR}/gtoaster
-CATEGORIES= sysutils
-MASTER_SITES= http://gnometoaster.rulez.org/archive/
-EXTRACT_SUFX= .tgz
-
-MAINTAINER= tech-pkg@netbsd.org
-HOMEPAGE= http://gnometoaster.rulez.org/
-COMMENT= cd recording frontend for X/Gtk
-
-USE_BUILDLINK2= YES
-USE_X11= YES
-USE_GMAKE= YES
-
-GNU_CONFIGURE= YES
-CONFIGURE_ARGS+= --with-oss --without-esd
-CONFIGURE_ARGS+= --without-gnome --without-orbit
-
-.include "../../x11/gtk/buildlink2.mk"
-.include "../../mk/ossaudio.buildlink2.mk"
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/gnometoaster/PLIST b/sysutils/gnometoaster/PLIST
deleted file mode 100644
index 90c4287b193..00000000000
--- a/sysutils/gnometoaster/PLIST
+++ /dev/null
@@ -1,9 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2002/03/25 11:24:28 drochner Exp $
-bin/gtoaster
-share/locale/de/LC_MESSAGES/gtoaster.mo
-share/locale/fi/LC_MESSAGES/gtoaster.mo
-share/locale/fr/LC_MESSAGES/gtoaster.mo
-share/locale/hu/LC_MESSAGES/gtoaster.mo
-share/locale/ja/LC_MESSAGES/gtoaster.mo
-share/locale/no/LC_MESSAGES/gtoaster.mo
-share/locale/ro/LC_MESSAGES/gtoaster.mo
diff --git a/sysutils/gnometoaster/distinfo b/sysutils/gnometoaster/distinfo
deleted file mode 100644
index f71d40b98be..00000000000
--- a/sysutils/gnometoaster/distinfo
+++ /dev/null
@@ -1,8 +0,0 @@
-$NetBSD: distinfo,v 1.2 2002/09/23 23:44:07 jlam Exp $
-
-SHA1 (gtoaster1.0Beta5.tgz) = c55bf7e8e532956a8907cd29cbfb98a721c5bb3a
-Size (gtoaster1.0Beta5.tgz) = 781796 bytes
-SHA1 (patch-aa) = fd411be3c18c91347cbc7c596c7cd153a6ea694b
-SHA1 (patch-ab) = 89baa0e8a6d30bc1cbfe5cbb86ddecd905d5f653
-SHA1 (patch-ac) = 21a2b627a656d5e61a3dd06f615c15e3f41a89c3
-SHA1 (patch-ad) = b8b5349fe092cbf9d8a40da272d379e5fae7ef91
diff --git a/sysutils/gnometoaster/patches/patch-aa b/sysutils/gnometoaster/patches/patch-aa
deleted file mode 100644
index b704445f181..00000000000
--- a/sysutils/gnometoaster/patches/patch-aa
+++ /dev/null
@@ -1,144 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2002/03/25 11:24:28 drochner Exp $
-
---- cdromlow.c.orig Sat Mar 23 19:48:00 2002
-+++ cdromlow.c Sat Mar 23 20:10:30 2002
-@@ -9,7 +9,7 @@
- #include <fcntl.h>
- #include <signal.h>
- #include <unistd.h>
--#if !defined( __FreeBSD__) && !defined(__svr4__ )
-+#if !defined( __FreeBSD__) && !defined(__svr4__ ) && !defined(__NetBSD__)
- # include <linux/cdrom.h>
- #else
- # include <sys/cdio.h>
-@@ -37,7 +37,7 @@
-
- /* we provide some macro mappings here. FreeBSD structs are a bit
- * different to those used by Linux so we will use macros to compensate that */
--#ifdef __FreeBSD__
-+#if defined(__FreeBSD__) || defined(__NetBSD__)
-
- /* Needed by FreeBSD */
- # define CDROM_DATA_TRACK 4
-@@ -46,19 +46,35 @@
- # define CD_FRAMESIZE_RAW 2352
- # define CDROM_LBA CD_LBA_FORMAT
- # define CDROMREADTOCHDR CDIOREADTOCHEADER
-+#ifdef __NetBSD__
-+# define CDROMREADTOCENTRY CDIOREADTOCENTRIES
-+#else
- # define CDROMREADTOCENTRY CDIOREADTOCENTRY
-+#endif
-
- # define cdromlow_definecdromheader struct ioc_toc_header
-+#ifdef __NetBSD__
-+# define cdromlow_definecdromhentry struct ioc_read_toc_entry
-+#else
- # define cdromlow_definecdromhentry struct ioc_read_toc_single_entry
-+#endif
-
- /* referencing the TOC header */
- # define cdromlow_tochdr_firstt starting_track
- # define cdromlow_tochdr_lastt ending_track
-
- /* referencing TOC entries */
-+#ifdef __NetBSD__
-+# define cdromlow_tocent_track starting_track
-+#else
- # define cdromlow_tocent_track track
-+#endif
- # define cdromlow_tocent_format address_format
-+#ifdef __NetBSD__
-+# define cdromlow_tocent_addr data->addr
-+#else
- # define cdromlow_tocent_addr entry.addr
-+#endif
- #elif __svr4__
- # define CD_FRAMESIZE 2048
- # define CD_FRAMESIZE_RAW 2352
-@@ -138,6 +154,11 @@
-
- int x;
- int hasdatatrack=-1;
-+#ifdef __NetBSD__
-+ struct cd_toc_entry entrydata;
-+ entry.data = &entrydata;
-+ entry.data_len = sizeof(entrydata);
-+#endif
-
- if (info->filedescriptor!=-1)
- {
-@@ -148,7 +169,11 @@
- entry.cdromlow_tocent_format=CDROM_LBA;
- ioctl(info->filedescriptor,CDROMREADTOCENTRY,&entry);
- #ifndef __FreeBSD__
-+#ifdef __NetBSD__
-+ if (entry.data->control & CDROM_DATA_TRACK)
-+#else
- if (entry.cdte_ctrl&CDROM_DATA_TRACK)
-+#endif
- #else
- if (entry.entry.control & CDROM_DATA_TRACK)
- #endif
-@@ -191,6 +216,11 @@
- cdromlow_tochandle *info=(cdromlow_tochandle*)handle;
- cdromlow_definecdromhentry entry;
- int offset=-1;
-+#ifdef __NetBSD__
-+ struct cd_toc_entry entrydata;
-+ entry.data = &entrydata;
-+ entry.data_len = sizeof(entrydata);
-+#endif
-
- if (info->filedescriptor!=-1)
- {
-@@ -223,6 +253,13 @@
- cdromlow_definecdromhentry tracknext;
- int tracksize;
- int ok=1;
-+#ifdef __NetBSD__
-+ struct cd_toc_entry trackdata, tracknextdata;
-+ track.data = &trackdata;
-+ track.data_len = sizeof(trackdata);
-+ tracknext.data = &tracknextdata;
-+ tracknext.data_len = sizeof(tracknextdata);
-+#endif
-
- tracksize=0;
- if (info->filedescriptor!=-1)
-@@ -278,6 +315,11 @@
- cdromlow_definecdromhentry entry;
- int x,secs;
- int cddbnum=0;
-+#ifdef __NetBSD__
-+ struct cd_toc_entry entrydata;
-+ entry.data = &entrydata;
-+ entry.data_len = sizeof(entrydata);
-+#endif
-
- cddbnum=0;
- if (info->filedescriptor!=-1)
-@@ -317,6 +359,11 @@
- cdromlow_definecdromhentry track;
- int ok=1;
- cdromlow_tracktype result=TRACKTYPE_UNKNOWN;
-+#ifdef __NetBSD__
-+ struct cd_toc_entry trackdata;
-+ track.data = &trackdata;
-+ track.data_len = sizeof(trackdata);
-+#endif
-
- if (info->filedescriptor!=-1)
- {
-@@ -325,7 +372,11 @@
- if (ioctl(info->filedescriptor,CDROMREADTOCENTRY,&track)==-1)
- ok=0;
- #ifndef __FreeBSD__
-+#ifdef __NetBSD__
-+ if (track.data->control & CDROM_DATA_TRACK)
-+#else
- if (track.cdte_ctrl&CDROM_DATA_TRACK)
-+#endif
- #else
- if (track.entry.control & CDROM_DATA_TRACK)
- #endif
diff --git a/sysutils/gnometoaster/patches/patch-ab b/sysutils/gnometoaster/patches/patch-ab
deleted file mode 100644
index 0cfbd813e98..00000000000
--- a/sysutils/gnometoaster/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 2002/03/25 11:24:29 drochner Exp $
-
---- cddb.c.orig Wed Jun 6 00:47:58 2001
-+++ cddb.c Sat Mar 23 20:13:05 2002
-@@ -45,7 +45,7 @@
- #include <stdlib.h>
- #include <sys/socket.h>
- #include <sys/types.h>
--#ifndef __FreeBSD__
-+#if !defined(__FreeBSD__) && !defined(__NetBSD__)
- # include <arpa/inet.h>
- #else
- # include <netinet/in.h>
diff --git a/sysutils/gnometoaster/patches/patch-ac b/sysutils/gnometoaster/patches/patch-ac
deleted file mode 100644
index 1002a06df93..00000000000
--- a/sysutils/gnometoaster/patches/patch-ac
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD: patch-ac,v 1.1.1.1 2002/03/25 11:24:29 drochner Exp $
-
---- audio_oss.c.orig Sat Dec 9 12:12:15 2000
-+++ audio_oss.c Sat Mar 23 21:32:08 2002
-@@ -13,7 +13,11 @@
- #include <fcntl.h>
- #include <unistd.h>
- #ifndef __FreeBSD__
-+#ifdef __NetBSD__
-+#include <soundcard.h>
-+#else
- #include <linux/soundcard.h>
-+#endif
- #else
- #include <machine/soundcard.h>
- #define SNDCTL_DSP_CHANNELS SNDCTL_DSP_STEREO
-@@ -42,12 +46,12 @@
-
- if (driver->descriptor==-1)
- {
-- driver->descriptor=open("/dev/dsp",O_WRONLY);
-+ driver->descriptor=open("/dev/sound",O_WRONLY);
- if (driver->descriptor!=-1)
- {
- int format_mask=0;
-
-- ioctl(driver->descriptor,SNDCTL_DSP_RESET);
-+ ioctl(driver->descriptor,SNDCTL_DSP_RESET, 0);
- ioctl(driver->descriptor,SNDCTL_DSP_SPEED,&speed);
- ioctl(driver->descriptor,SNDCTL_DSP_CHANNELS,&channels);
- ioctl(driver->descriptor,SNDCTL_DSP_GETFMTS,&format_mask);
diff --git a/sysutils/gnometoaster/patches/patch-ad b/sysutils/gnometoaster/patches/patch-ad
deleted file mode 100644
index ee37e70f73d..00000000000
--- a/sysutils/gnometoaster/patches/patch-ad
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ad,v 1.2 2002/09/23 23:44:08 jlam Exp $
-
---- Makefile.in.orig Sat Mar 23 21:07:07 2002
-+++ Makefile.in Sat Mar 23 21:10:34 2002
-@@ -117,7 +117,7 @@
-
- CPPFLAGS = @CPPFLAGS@
- LDFLAGS = @LDFLAGS@
--LIBS = @LIBS@
-+LIBS = @LIBS@ $(LIBOSSAUDIO)
- gtoaster_OBJECTS = main.o destcontrol.o fsedit.o getdir.o source.o \
- filelist.o menubar.o menufunc.o trackedit.o isotrack.o record.o \
- piping.o dirlow.o dndsetup.o selectlist.o colors.o rterm.o tracks.o \
diff --git a/sysutils/gpart/DESCR b/sysutils/gpart/DESCR
deleted file mode 100644
index 9b7e919f409..00000000000
--- a/sysutils/gpart/DESCR
+++ /dev/null
@@ -1,3 +0,0 @@
-Gpart is a small tool which tries to guess what partitions
-are on a PC type harddisk in case the primary partition table
-was damaged.
diff --git a/sysutils/gpart/Makefile b/sysutils/gpart/Makefile
deleted file mode 100644
index 488ce127727..00000000000
--- a/sysutils/gpart/Makefile
+++ /dev/null
@@ -1,16 +0,0 @@
-# $NetBSD: Makefile,v 1.5 2003/06/02 01:16:55 jschauma Exp $
-
-DISTNAME= gpart-0.1g
-CATEGORIES= sysutils
-MASTER_SITES= http://home.pages.de/~michab/gpart/
-
-MAINTAINER= tech-pkg@netbsd.org
-HOMEPAGE= http://home.pages.de/~michab/gpart/
-COMMENT= Tool to show the partitions on a PC type harddisk
-
-USE_GMAKE= yes
-
-# Doesn't work on 1.4.x due to problems with dlopen
-NOT_FOR_PLATFORM= NetBSD-1.4*-*
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/gpart/PLIST b/sysutils/gpart/PLIST
deleted file mode 100644
index 1feb23de361..00000000000
--- a/sysutils/gpart/PLIST
+++ /dev/null
@@ -1,3 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 22:53:16 zuntum Exp $
-bin/gpart
-man/man8/gpart.8
diff --git a/sysutils/gpart/distinfo b/sysutils/gpart/distinfo
deleted file mode 100644
index 2ce6bc2a027..00000000000
--- a/sysutils/gpart/distinfo
+++ /dev/null
@@ -1,9 +0,0 @@
-$NetBSD: distinfo,v 1.2 2001/04/19 11:29:03 agc Exp $
-
-SHA1 (gpart-0.1g.tar.gz) = 6104e23b64bc6f1c0fd160f62196924facab313b
-Size (gpart-0.1g.tar.gz) = 47302 bytes
-SHA1 (patch-aa) = 7f02c5a076714b65ec45296829d06eb764f454ae
-SHA1 (patch-ab) = 3bcd187ebc9ee98bf5bda01a11cadf5be774763c
-SHA1 (patch-ac) = 759b7a9c61d05448fb96ee35619be99d963a70b5
-SHA1 (patch-ad) = 6ac86ebb00de4d9a2f8ec983924282b35a1fbd53
-SHA1 (patch-ae) = e9126b145ec8995645d79cd5d569da6e882b3c89
diff --git a/sysutils/gpart/patches/patch-aa b/sysutils/gpart/patches/patch-aa
deleted file mode 100644
index 66d5fb9e91a..00000000000
--- a/sysutils/gpart/patches/patch-aa
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2000/09/01 16:10:28 veego Exp $
-
---- src/disku.c Sun May 14 14:04:23 2000
-+++ src/disku.c Sun Jul 16 10:58:08 2000
-@@ -25,7 +25,7 @@
- #include <linux/hdreg.h>
- #endif
-
--#if defined(__FreeBSD__)
-+#if defined(__FreeBSD__) || defined(__NetBSD__)
- #include <errno.h>
- #include <sys/disklabel.h>
- #endif
-@@ -52,7 +52,7 @@
-
- #endif
-
--#if defined(__FreeBSD__)
-+#if defined(__FreeBSD__) || defined(__NetBSD__)
- struct disklabel dl;
- if (ioctl(d->d_fd,DIOCGDINFO,&dl) == -1)
- pr(FATAL,EM_IOCTLFAILED,"DIOCGDINFO",strerror(errno));
diff --git a/sysutils/gpart/patches/patch-ab b/sysutils/gpart/patches/patch-ab
deleted file mode 100644
index 7e884fd0faf..00000000000
--- a/sysutils/gpart/patches/patch-ab
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 2000/09/01 16:10:28 veego Exp $
-
---- src/gpart.c Sun May 14 14:08:15 2000
-+++ src/gpart.c Sun Jul 16 11:01:41 2000
-@@ -290,9 +290,10 @@
- { 0x86, "FAT16 volume/stripe set" },
- { 0x93, "Amoeba filesystem" },
- { 0x94, "Amoeba bad block table" },
-- { 0xA5, "FreeBSD/NetBSD/386BSD" },
-+ { 0xA5, "FreeBSD or 386BSD or old NetBSD" },
- { 0xA6, "OpenBSD" },
- { 0xA7, "NEXTSTEP" },
-+ { 0xA9, "NetBSD" },
- { 0xB7, "BSDI BSD/386 filesystem" },
- { 0xB8, "BSDI BSD/386 swap" },
- { 0xC7, "Syrinx" },
diff --git a/sysutils/gpart/patches/patch-ac b/sysutils/gpart/patches/patch-ac
deleted file mode 100644
index fd407cbac8e..00000000000
--- a/sysutils/gpart/patches/patch-ac
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ac,v 1.1.1.1 2000/09/01 16:10:28 veego Exp $
-
---- src/l64seek.c Sun May 14 14:04:23 2000
-+++ src/l64seek.c Sun Jul 16 10:58:50 2000
-@@ -46,7 +46,8 @@
- ret = (off64_t)-1;
- #endif
-
--#if defined(__FreeBSD__) || (defined(__linux__) && defined(__alpha__))
-+#if defined(__FreeBSD__) || defined(__NetBSD__) || \
-+ (defined(__linux__) && defined(__alpha__))
- ret = lseek(fd,offset,whence);
- #endif
-
diff --git a/sysutils/gpart/patches/patch-ad b/sysutils/gpart/patches/patch-ad
deleted file mode 100644
index 8b77761d712..00000000000
--- a/sysutils/gpart/patches/patch-ad
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ad,v 1.1.1.1 2000/09/01 16:10:28 veego Exp $
-
---- src/l64seek.h Sun May 14 14:04:23 2000
-+++ src/l64seek.h Sun Jul 16 10:59:15 2000
-@@ -33,7 +33,7 @@
- #endif
-
-
--#if defined(__FreeBSD__)
-+#if defined(__FreeBSD__) || defined(__NetBSD__)
- typedef off_t off64_t;
- #endif
-
diff --git a/sysutils/gpart/patches/patch-ae b/sysutils/gpart/patches/patch-ae
deleted file mode 100644
index aa3de3aef4b..00000000000
--- a/sysutils/gpart/patches/patch-ae
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ae,v 1.1.1.1 2000/09/01 16:10:28 veego Exp $
-
---- inst.defs Sun May 14 14:04:24 2000
-+++ inst.defs Fri Sep 1 17:29:26 2000
-@@ -1,7 +1,7 @@
- #
- # installation directories for gpart
- #
--prefix=/usr/local
-+prefix=${PREFIX}
- bindir=$(prefix)/bin
- libdir=$(prefix)/lib
- mandir=$(prefix)/man
diff --git a/sysutils/grub/DESCR b/sysutils/grub/DESCR
deleted file mode 100644
index 542694ab189..00000000000
--- a/sysutils/grub/DESCR
+++ /dev/null
@@ -1,17 +0,0 @@
-GRUB is the GRand Unified Bootloader. Briefly, bootloader is the
-first software program that runs when a computer starts. It is
-responsible for loading and transferring control to the operating
-system kernel software (such as NetBSD or Linux). GRUB understands
-ffs, FAT{16,32}, ext2fs, ReiserFS, minixfs, and VSTafs. It can
-directly boot NetBSD, FreeBSD, OpenBSD and Linux without any other
-bootloader, loading a.out and ELF kernels from the disk and passing
-along necessary arguments (in most cases). It can also boot any
-operating system (the above, plus e.g. Windows, OS/2) by chaining
-to that operating system's specific loader. Grub features a runtime
-command line and loads its configuration at boot rather than
-requiring rerunning of a separate utility. Other features are TFTP
-booting, serial console support, large disk support, support for
-both DOS MBR label and BSD disklabel simultaneously, booting from
-hard drive or floppy.
-
-GRUB is available for the i386 architecture only.
diff --git a/sysutils/grub/MESSAGE b/sysutils/grub/MESSAGE
deleted file mode 100644
index 486ebe44d8d..00000000000
--- a/sysutils/grub/MESSAGE
+++ /dev/null
@@ -1,16 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE,v 1.2 2002/04/16 00:24:54 wiz Exp $
-
-Because NetBSD already uses /boot for a different purpose, this
-version of GRUB has been compiled to look in /grub for its files
-(specifically, menu.lst and the loaders). If your root filesystem
-is of a type not supported directly by grub (e.g., lfs), you may
-have difficulties. See the info docs for more details.
-
-GRUB is not actually installed on your disk until you run a command
-such as
- grub-install /dev/wd0d
-or
- grub-install '(hd0)'
-
-===========================================================================
diff --git a/sysutils/grub/Makefile b/sysutils/grub/Makefile
deleted file mode 100644
index 2548ff106fb..00000000000
--- a/sysutils/grub/Makefile
+++ /dev/null
@@ -1,45 +0,0 @@
-# $NetBSD: Makefile,v 1.13 2003/07/13 17:35:04 wiz Exp $
-#
-
-DISTNAME= grub-0.93
-PKGREVISION= 2
-CATEGORIES= sysutils
-MASTER_SITES= ftp://alpha.gnu.org/gnu/grub/
-
-MAINTAINER= tron@netbsd.org
-HOMEPAGE= http://www.gnu.org/software/grub/
-COMMENT= GRand Unified Bootloader -- Boots *BSD, Linux, groks ffs, FAT, ext2
-
-ONLY_FOR_PLATFORM= *-*-i386
-
-GNU_CONFIGURE= YES
-USE_GMAKE= YES
-USE_NEW_TEXINFO= YES
-USE_BUILDLINK2= YES
-
-.include "../../mk/bsd.prefs.mk"
-
-.if defined(GRUB_NETWORK_CARDS)
-BUILD_DEFS+= GRUB_NETWORK_CARDS
-CONFIGURE_ARGS+= --enable-diskless
-PLIST_SUBST+= NETBOOT=
-
-.for GRUB_NETWORK_CARD in ${GRUB_NETWORK_CARDS}
-CONFIGURE_ARGS+= --enable-${GRUB_NETWORK_CARD}
-.endfor
-
-post-install:
- ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/grub
- ${INSTALL_DATA} ${WRKSRC}/netboot/README.netboot \
- ${PREFIX}/share/doc/grub
-.else
-PLIST_SUBST+= NETBOOT="@comment "
-.endif
-
-.if defined(GRUB_SCAN_ARGS)
-CONFIGURE_ARGS+= ${GRUB_SCAN_ARGS}
-.endif
-
-.include "../../devel/binutils/buildlink2.mk"
-.include "../../devel/ncurses/buildlink2.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/grub/PLIST b/sysutils/grub/PLIST
deleted file mode 100644
index dd4574634a1..00000000000
--- a/sysutils/grub/PLIST
+++ /dev/null
@@ -1,32 +0,0 @@
-@comment $NetBSD: PLIST,v 1.6 2003/07/13 17:35:04 wiz Exp $
-bin/mbchk
-info/grub.info
-info/grub.info-1
-info/grub.info-2
-info/grub.info-3
-info/multiboot.info
-man/man1/mbchk.1
-man/man8/grub-install.8
-man/man8/grub-md5-crypt.8
-man/man8/grub-terminfo.8
-man/man8/grub.8
-sbin/grub
-sbin/grub-install
-sbin/grub-md5-crypt
-sbin/grub-terminfo
-${NETBOOT}share/doc/grub/README.netboot
-share/grub/${MACHINE_ARCH}-/e2fs_stage1_5
-share/grub/${MACHINE_ARCH}-/fat_stage1_5
-share/grub/${MACHINE_ARCH}-/ffs_stage1_5
-share/grub/${MACHINE_ARCH}-/jfs_stage1_5
-share/grub/${MACHINE_ARCH}-/minix_stage1_5
-${NETBOOT}share/grub/${MACHINE_ARCH}-/nbgrub
-${NETBOOT}share/grub/${MACHINE_ARCH}-/pxegrub
-share/grub/${MACHINE_ARCH}-/reiserfs_stage1_5
-share/grub/${MACHINE_ARCH}-/stage1
-share/grub/${MACHINE_ARCH}-/stage2
-share/grub/${MACHINE_ARCH}-/vstafs_stage1_5
-share/grub/${MACHINE_ARCH}-/xfs_stage1_5
-@dirrm share/grub/${MACHINE_ARCH}-
-@dirrm share/grub
-${NETBOOT}@dirrm share/doc/grub
diff --git a/sysutils/grub/distinfo b/sysutils/grub/distinfo
deleted file mode 100644
index a366e9701dc..00000000000
--- a/sysutils/grub/distinfo
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: distinfo,v 1.5 2003/07/13 17:35:04 wiz Exp $
-
-SHA1 (grub-0.93.tar.gz) = 51cc79b0088f8e0e3260e33dc5b2ea5055bfc8f8
-Size (grub-0.93.tar.gz) = 891032 bytes
-SHA1 (patch-aa) = f2b6a1c0ec11c1c01f39bf6241291fc0c3879e34
-SHA1 (patch-ab) = 274f05f518de51b708102ec853641e237fd40990
-SHA1 (patch-ac) = 891a04da17ae13ad10227d137448eb5d028759ca
-SHA1 (patch-ad) = 8a39ae6da142493672d11521fd99594a6161a1d0
-SHA1 (patch-ae) = fc41e5b3db06d3e2fa33913946e1eb31a93f435f
-SHA1 (patch-af) = 0955009cd1b09b766b3aab5517b36002c6c08401
-SHA1 (patch-ag) = ecbbcf164039cbc047b247036fa183bb8ae08a6f
-SHA1 (patch-ah) = cecaf3e1510a3fdba2d3412b59c434d5d247b11b
-SHA1 (patch-ai) = 61d81c9b4f1bbec6e9bd1f922f1a88cd7a02a8ba
-SHA1 (patch-aj) = bfbac23a7c250ed615dcfb4a988708c970b617d8
diff --git a/sysutils/grub/patches/patch-aa b/sysutils/grub/patches/patch-aa
deleted file mode 100644
index c4698f6951f..00000000000
--- a/sysutils/grub/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2003/01/24 23:49:55 jmmv Exp $
-
---- grub/main.c.orig Mon Jun 10 18:20:38 2002
-+++ grub/main.c
-@@ -31,7 +31,7 @@ int grub_stage2 (void);
-
- #define WITHOUT_LIBC_STUBS 1
- #include <shared.h>
--#include <term.h>
-+#include "../stage2/term.h"
-
- char *program_name = 0;
- int use_config_file = 1;
diff --git a/sysutils/grub/patches/patch-ab b/sysutils/grub/patches/patch-ab
deleted file mode 100644
index bfc82e72f6c..00000000000
--- a/sysutils/grub/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2003/01/24 23:49:55 jmmv Exp $
-
---- grub/asmstub.c.orig Tue Dec 3 00:20:45 2002
-+++ grub/asmstub.c
-@@ -61,7 +61,7 @@ int grub_stage2 (void);
- #include <shared.h>
- #include <device.h>
- #include <serial.h>
--#include <term.h>
-+#include "../stage2/term.h"
-
- /* Simulated memory sizes. */
- #define EXTENDED_MEMSIZE (3 * 1024 * 1024) /* 3MB */
diff --git a/sysutils/grub/patches/patch-ac b/sysutils/grub/patches/patch-ac
deleted file mode 100644
index 7d1c3a1f368..00000000000
--- a/sysutils/grub/patches/patch-ac
+++ /dev/null
@@ -1,166 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2003/03/14 23:35:25 thorpej Exp $
-
---- netboot/Makefile.am.orig 2003-03-14 15:21:01.000000000 -0800
-+++ netboot/Makefile.am 2003-03-14 15:21:18.000000000 -0800
-@@ -19,7 +19,7 @@
- ni5010.c ns8390.c ns8390.h otulip.c otulip.h rtl8139.c \
- sis900.c sis900.h sk_g16.c sk_g16.h smc9000.c smc9000.h \
- tiara.c tlan.c tulip.c via-rhine.c w89c840.c
--libdrivers_a_CFLAGS = $(STAGE2_CFLAGS) -fno-builtin -nostdinc \
-+libdrivers_a_CFLAGS = $(STAGE2_CFLAGS) -ffreestanding -nostdinc \
- -DFSYS_TFTP=1 $(NET_CFLAGS) $(NET_EXTRAFLAGS)
- # Filled by configure.
- libdrivers_a_LIBADD = @NETBOOT_DRIVERS@
-@@ -60,127 +60,127 @@
- # Is it really necessary to specify dependecies explicitly?
- $(3c509_drivers): 3c509.c 3c509.h
- $(3c509_drivers): %.o: 3c509.c
-- $(COMPILE) $(STAGE2_CFLAGS) -fno-builtin -nostdinc \
-+ $(COMPILE) $(STAGE2_CFLAGS) -ffreestanding -nostdinc \
- $(NET_EXTRAFLAGS) $($(basename $@)_o_CFLAGS) -o $@ -c $<
-
- $(3c595_drivers): 3c595.c 3c595.h
- $(3c595_drivers): %.o: 3c595.c
-- $(COMPILE) $(STAGE2_CFLAGS) -fno-builtin -nostdinc \
-+ $(COMPILE) $(STAGE2_CFLAGS) -ffreestanding -nostdinc \
- $(NET_EXTRAFLAGS) $($(basename $@)_o_CFLAGS) -o $@ -c $<
-
- $(3c90x_drivers): 3c90x.c
- $(3c90x_drivers): %.o: 3c90x.c
-- $(COMPILE) $(STAGE2_CFLAGS) -fno-builtin -nostdinc \
-+ $(COMPILE) $(STAGE2_CFLAGS) -ffreestanding -nostdinc \
- $(NET_EXTRAFLAGS) $($(basename $@)_o_CFLAGS) -o $@ -c $<
-
- $(cs89x0_drivers): cs89x0.c cs89x0.h
- $(cs89x0_drivers): %.o: cs89x0.c
-- $(COMPILE) $(STAGE2_CFLAGS) -fno-builtin -nostdinc \
-+ $(COMPILE) $(STAGE2_CFLAGS) -ffreestanding -nostdinc \
- $(NET_EXTRAFLAGS) $($(basename $@)_o_CFLAGS) -o $@ -c $<
-
- $(davicom_drivers): davicom.c
- $(davicom_drivers): %.o: davicom.c
-- $(COMPILE) $(STAGE2_CFLAGS) -fno-builtin -nostdinc \
-+ $(COMPILE) $(STAGE2_CFLAGS) -ffreestanding -nostdinc \
- $(NET_EXTRAFLAGS) $($(basename $@)_o_CFLAGS) -o $@ -c $<
-
- $(depca_drivers): depca.c
- $(depca_drivers): %.o: depca.c
-- $(COMPILE) $(STAGE2_CFLAGS) -fno-builtin -nostdinc \
-+ $(COMPILE) $(STAGE2_CFLAGS) -ffreestanding -nostdinc \
- $(NET_EXTRAFLAGS) $($(basename $@)_o_CFLAGS) -o $@ -c $<
-
- $(eepro_drivers): eepro.c
- $(eepro_drivers): %.o: eepro.c
-- $(COMPILE) $(STAGE2_CFLAGS) -fno-builtin -nostdinc \
-+ $(COMPILE) $(STAGE2_CFLAGS) -ffreestanding -nostdinc \
- $(NET_EXTRAFLAGS) $($(basename $@)_o_CFLAGS) -o $@ -c $<
-
- $(eepro100_drivers): eepro100.c
- $(eepro100_drivers): %.o: eepro100.c
-- $(COMPILE) $(STAGE2_CFLAGS) -fno-builtin -nostdinc \
-+ $(COMPILE) $(STAGE2_CFLAGS) -ffreestanding -nostdinc \
- $(NET_EXTRAFLAGS) $($(basename $@)_o_CFLAGS) -o $@ -c $<
-
- $(epic100_drivers): epic100.c epic100.h
- $(epic100_drivers): %.o: epic100.c
-- $(COMPILE) $(STAGE2_CFLAGS) -fno-builtin -nostdinc \
-+ $(COMPILE) $(STAGE2_CFLAGS) -ffreestanding -nostdinc \
- $(NET_EXTRAFLAGS) $($(basename $@)_o_CFLAGS) -o $@ -c $<
-
- #$(fa311_drivers): fa311.c
- #$(fa311_drivers): %.o: fa311.c
--# $(COMPILE) $(STAGE2_CFLAGS) -fno-builtin -nostdinc \
-+# $(COMPILE) $(STAGE2_CFLAGS) -ffreestanding -nostdinc \
- # $(NET_EXTRAFLAGS) $($(basename $@)_o_CFLAGS) -o $@ -c $<
-
- $(i82586_drivers): i82586.c
- $(i82586_drivers): %.o: i82586.c
-- $(COMPILE) $(STAGE2_CFLAGS) -fno-builtin -nostdinc \
-+ $(COMPILE) $(STAGE2_CFLAGS) -ffreestanding -nostdinc \
- $(NET_EXTRAFLAGS) $($(basename $@)_o_CFLAGS) -o $@ -c $<
-
- $(lance_drivers): lance.c
- $(lance_drivers): %.o: lance.c
-- $(COMPILE) $(STAGE2_CFLAGS) -fno-builtin -nostdinc \
-+ $(COMPILE) $(STAGE2_CFLAGS) -ffreestanding -nostdinc \
- $(NET_EXTRAFLAGS) $($(basename $@)_o_CFLAGS) -o $@ -c $<
-
- $(natsemi_drivers): natsemi.c
- $(natsemi_drivers): %.o: natsemi.c
-- $(COMPILE) $(STAGE2_CFLAGS) -fno-builtin -nostdinc \
-+ $(COMPILE) $(STAGE2_CFLAGS) -ffreestanding -nostdinc \
- $(NET_EXTRAFLAGS) $($(basename $@)_o_CFLAGS) -o $@ -c $<
-
- $(ni5010_drivers): ni5010.c
- $(ni5010_drivers): %.o: ni5010.c
-- $(COMPILE) $(STAGE2_CFLAGS) -fno-builtin -nostdinc \
-+ $(COMPILE) $(STAGE2_CFLAGS) -ffreestanding -nostdinc \
- $(NET_EXTRAFLAGS) $($(basename $@)_o_CFLAGS) -o $@ -c $<
-
- $(ns8390_drivers): ns8390.c ns8390.h
- $(ns8390_drivers): %.o: ns8390.c
-- $(COMPILE) $(STAGE2_CFLAGS) -fno-builtin -nostdinc \
-+ $(COMPILE) $(STAGE2_CFLAGS) -ffreestanding -nostdinc \
- $(NET_EXTRAFLAGS) $($(basename $@)_o_CFLAGS) -o $@ -c $<
-
- $(otulip_drivers): otulip.c otulip.h
- $(otulip_drivers): %.o: otulip.c
-- $(COMPILE) $(STAGE2_CFLAGS) -fno-builtin -nostdinc \
-+ $(COMPILE) $(STAGE2_CFLAGS) -ffreestanding -nostdinc \
- $(NET_EXTRAFLAGS) $($(basename $@)_o_CFLAGS) -o $@ -c $<
-
- $(rtl8139_drivers): rtl8139.c
- $(rtl8139_drivers): %.o: rtl8139.c
-- $(COMPILE) $(STAGE2_CFLAGS) -fno-builtin -nostdinc \
-+ $(COMPILE) $(STAGE2_CFLAGS) -ffreestanding -nostdinc \
- $(NET_EXTRAFLAGS) $($(basename $@)_o_CFLAGS) -o $@ -c $<
-
- $(sis900_drivers): sis900.c
- $(sis900_drivers): %.o: sis900.c sis900.h
-- $(COMPILE) $(STAGE2_CFLAGS) -fno-builtin -nostdinc \
-+ $(COMPILE) $(STAGE2_CFLAGS) -ffreestanding -nostdinc \
- $(NET_EXTRAFLAGS) $($(basename $@)_o_CFLAGS) -o $@ -c $<
-
- $(sk_g16_drivers): sk_g16.c sk_g16.h
- $(sk_g16_drivers): %.o: sk_g16.c
-- $(COMPILE) $(STAGE2_CFLAGS) -fno-builtin -nostdinc \
-+ $(COMPILE) $(STAGE2_CFLAGS) -ffreestanding -nostdinc \
- $(NET_EXTRAFLAGS) $($(basename $@)_o_CFLAGS) -o $@ -c $<
-
- $(smc9000_drivers): smc9000.c smc9000.h
- $(smc9000_drivers): %.o: smc9000.c
-- $(COMPILE) $(STAGE2_CFLAGS) -fno-builtin -nostdinc \
-+ $(COMPILE) $(STAGE2_CFLAGS) -ffreestanding -nostdinc \
- $(NET_EXTRAFLAGS) $($(basename $@)_o_CFLAGS) -o $@ -c $<
-
- $(tiara_drivers): tiara.c
- $(tiara_drivers): %.o: tiara.c
-- $(COMPILE) $(STAGE2_CFLAGS) -fno-builtin -nostdinc \
-+ $(COMPILE) $(STAGE2_CFLAGS) -ffreestanding -nostdinc \
- $(NET_EXTRAFLAGS) $($(basename $@)_o_CFLAGS) -o $@ -c $<
-
- #$(tlan_drivers): tlan.c
- #$(tlan_drivers): %.o: tlan.c
--# $(COMPILE) $(STAGE2_CFLAGS) -fno-builtin -nostdinc \
-+# $(COMPILE) $(STAGE2_CFLAGS) -ffreestanding -nostdinc \
- # $(NET_EXTRAFLAGS) $($(basename $@)_o_CFLAGS) -o $@ -c $<
-
- $(tulip_drivers): tulip.c
- $(tulip_drivers): %.o: tulip.c
-- $(COMPILE) $(STAGE2_CFLAGS) -fno-builtin -nostdinc \
-+ $(COMPILE) $(STAGE2_CFLAGS) -ffreestanding -nostdinc \
- $(NET_EXTRAFLAGS) $($(basename $@)_o_CFLAGS) -o $@ -c $<
-
- $(via_rhine_drivers): via-rhine.c
- $(via_rhine_drivers): %.o: via-rhine.c
-- $(COMPILE) $(STAGE2_CFLAGS) -fno-builtin -nostdinc \
-+ $(COMPILE) $(STAGE2_CFLAGS) -ffreestanding -nostdinc \
- $(NET_EXTRAFLAGS) $($(basename $@)_o_CFLAGS) -o $@ -c $<
-
- $(w89c840_drivers): w89c840.c
- $(w89c840_drivers): %.o: w89c840.c
-- $(COMPILE) $(STAGE2_CFLAGS) -fno-builtin -nostdinc \
-+ $(COMPILE) $(STAGE2_CFLAGS) -ffreestanding -nostdinc \
- $(NET_EXTRAFLAGS) $($(basename $@)_o_CFLAGS) -o $@ -c $<
-
- # Per-object flags.
diff --git a/sysutils/grub/patches/patch-ad b/sysutils/grub/patches/patch-ad
deleted file mode 100644
index f6f5d82502d..00000000000
--- a/sysutils/grub/patches/patch-ad
+++ /dev/null
@@ -1,166 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2003/03/14 23:35:25 thorpej Exp $
-
---- netboot/Makefile.in.orig 2003-03-14 15:21:22.000000000 -0800
-+++ netboot/Makefile.in 2003-03-14 15:21:31.000000000 -0800
-@@ -107,7 +107,7 @@
- sis900.c sis900.h sk_g16.c sk_g16.h smc9000.c smc9000.h \
- tiara.c tlan.c tulip.c via-rhine.c w89c840.c
-
--libdrivers_a_CFLAGS = $(STAGE2_CFLAGS) -fno-builtin -nostdinc \
-+libdrivers_a_CFLAGS = $(STAGE2_CFLAGS) -ffreestanding -nostdinc \
- -DFSYS_TFTP=1 $(NET_CFLAGS) $(NET_EXTRAFLAGS)
-
- # Filled by configure.
-@@ -852,127 +852,127 @@
- # Is it really necessary to specify dependecies explicitly?
- $(3c509_drivers): 3c509.c 3c509.h
- $(3c509_drivers): %.o: 3c509.c
-- $(COMPILE) $(STAGE2_CFLAGS) -fno-builtin -nostdinc \
-+ $(COMPILE) $(STAGE2_CFLAGS) -ffreestanding -nostdinc \
- $(NET_EXTRAFLAGS) $($(basename $@)_o_CFLAGS) -o $@ -c $<
-
- $(3c595_drivers): 3c595.c 3c595.h
- $(3c595_drivers): %.o: 3c595.c
-- $(COMPILE) $(STAGE2_CFLAGS) -fno-builtin -nostdinc \
-+ $(COMPILE) $(STAGE2_CFLAGS) -ffreestanding -nostdinc \
- $(NET_EXTRAFLAGS) $($(basename $@)_o_CFLAGS) -o $@ -c $<
-
- $(3c90x_drivers): 3c90x.c
- $(3c90x_drivers): %.o: 3c90x.c
-- $(COMPILE) $(STAGE2_CFLAGS) -fno-builtin -nostdinc \
-+ $(COMPILE) $(STAGE2_CFLAGS) -ffreestanding -nostdinc \
- $(NET_EXTRAFLAGS) $($(basename $@)_o_CFLAGS) -o $@ -c $<
-
- $(cs89x0_drivers): cs89x0.c cs89x0.h
- $(cs89x0_drivers): %.o: cs89x0.c
-- $(COMPILE) $(STAGE2_CFLAGS) -fno-builtin -nostdinc \
-+ $(COMPILE) $(STAGE2_CFLAGS) -ffreestanding -nostdinc \
- $(NET_EXTRAFLAGS) $($(basename $@)_o_CFLAGS) -o $@ -c $<
-
- $(davicom_drivers): davicom.c
- $(davicom_drivers): %.o: davicom.c
-- $(COMPILE) $(STAGE2_CFLAGS) -fno-builtin -nostdinc \
-+ $(COMPILE) $(STAGE2_CFLAGS) -ffreestanding -nostdinc \
- $(NET_EXTRAFLAGS) $($(basename $@)_o_CFLAGS) -o $@ -c $<
-
- $(depca_drivers): depca.c
- $(depca_drivers): %.o: depca.c
-- $(COMPILE) $(STAGE2_CFLAGS) -fno-builtin -nostdinc \
-+ $(COMPILE) $(STAGE2_CFLAGS) -ffreestanding -nostdinc \
- $(NET_EXTRAFLAGS) $($(basename $@)_o_CFLAGS) -o $@ -c $<
-
- $(eepro_drivers): eepro.c
- $(eepro_drivers): %.o: eepro.c
-- $(COMPILE) $(STAGE2_CFLAGS) -fno-builtin -nostdinc \
-+ $(COMPILE) $(STAGE2_CFLAGS) -ffreestanding -nostdinc \
- $(NET_EXTRAFLAGS) $($(basename $@)_o_CFLAGS) -o $@ -c $<
-
- $(eepro100_drivers): eepro100.c
- $(eepro100_drivers): %.o: eepro100.c
-- $(COMPILE) $(STAGE2_CFLAGS) -fno-builtin -nostdinc \
-+ $(COMPILE) $(STAGE2_CFLAGS) -ffreestanding -nostdinc \
- $(NET_EXTRAFLAGS) $($(basename $@)_o_CFLAGS) -o $@ -c $<
-
- $(epic100_drivers): epic100.c epic100.h
- $(epic100_drivers): %.o: epic100.c
-- $(COMPILE) $(STAGE2_CFLAGS) -fno-builtin -nostdinc \
-+ $(COMPILE) $(STAGE2_CFLAGS) -ffreestanding -nostdinc \
- $(NET_EXTRAFLAGS) $($(basename $@)_o_CFLAGS) -o $@ -c $<
-
- #$(fa311_drivers): fa311.c
- #$(fa311_drivers): %.o: fa311.c
--# $(COMPILE) $(STAGE2_CFLAGS) -fno-builtin -nostdinc \
-+# $(COMPILE) $(STAGE2_CFLAGS) -ffreestanding -nostdinc \
- # $(NET_EXTRAFLAGS) $($(basename $@)_o_CFLAGS) -o $@ -c $<
-
- $(i82586_drivers): i82586.c
- $(i82586_drivers): %.o: i82586.c
-- $(COMPILE) $(STAGE2_CFLAGS) -fno-builtin -nostdinc \
-+ $(COMPILE) $(STAGE2_CFLAGS) -ffreestanding -nostdinc \
- $(NET_EXTRAFLAGS) $($(basename $@)_o_CFLAGS) -o $@ -c $<
-
- $(lance_drivers): lance.c
- $(lance_drivers): %.o: lance.c
-- $(COMPILE) $(STAGE2_CFLAGS) -fno-builtin -nostdinc \
-+ $(COMPILE) $(STAGE2_CFLAGS) -ffreestanding -nostdinc \
- $(NET_EXTRAFLAGS) $($(basename $@)_o_CFLAGS) -o $@ -c $<
-
- $(natsemi_drivers): natsemi.c
- $(natsemi_drivers): %.o: natsemi.c
-- $(COMPILE) $(STAGE2_CFLAGS) -fno-builtin -nostdinc \
-+ $(COMPILE) $(STAGE2_CFLAGS) -ffreestanding -nostdinc \
- $(NET_EXTRAFLAGS) $($(basename $@)_o_CFLAGS) -o $@ -c $<
-
- $(ni5010_drivers): ni5010.c
- $(ni5010_drivers): %.o: ni5010.c
-- $(COMPILE) $(STAGE2_CFLAGS) -fno-builtin -nostdinc \
-+ $(COMPILE) $(STAGE2_CFLAGS) -ffreestanding -nostdinc \
- $(NET_EXTRAFLAGS) $($(basename $@)_o_CFLAGS) -o $@ -c $<
-
- $(ns8390_drivers): ns8390.c ns8390.h
- $(ns8390_drivers): %.o: ns8390.c
-- $(COMPILE) $(STAGE2_CFLAGS) -fno-builtin -nostdinc \
-+ $(COMPILE) $(STAGE2_CFLAGS) -ffreestanding -nostdinc \
- $(NET_EXTRAFLAGS) $($(basename $@)_o_CFLAGS) -o $@ -c $<
-
- $(otulip_drivers): otulip.c otulip.h
- $(otulip_drivers): %.o: otulip.c
-- $(COMPILE) $(STAGE2_CFLAGS) -fno-builtin -nostdinc \
-+ $(COMPILE) $(STAGE2_CFLAGS) -ffreestanding -nostdinc \
- $(NET_EXTRAFLAGS) $($(basename $@)_o_CFLAGS) -o $@ -c $<
-
- $(rtl8139_drivers): rtl8139.c
- $(rtl8139_drivers): %.o: rtl8139.c
-- $(COMPILE) $(STAGE2_CFLAGS) -fno-builtin -nostdinc \
-+ $(COMPILE) $(STAGE2_CFLAGS) -ffreestanding -nostdinc \
- $(NET_EXTRAFLAGS) $($(basename $@)_o_CFLAGS) -o $@ -c $<
-
- $(sis900_drivers): sis900.c
- $(sis900_drivers): %.o: sis900.c sis900.h
-- $(COMPILE) $(STAGE2_CFLAGS) -fno-builtin -nostdinc \
-+ $(COMPILE) $(STAGE2_CFLAGS) -ffreestanding -nostdinc \
- $(NET_EXTRAFLAGS) $($(basename $@)_o_CFLAGS) -o $@ -c $<
-
- $(sk_g16_drivers): sk_g16.c sk_g16.h
- $(sk_g16_drivers): %.o: sk_g16.c
-- $(COMPILE) $(STAGE2_CFLAGS) -fno-builtin -nostdinc \
-+ $(COMPILE) $(STAGE2_CFLAGS) -ffreestanding -nostdinc \
- $(NET_EXTRAFLAGS) $($(basename $@)_o_CFLAGS) -o $@ -c $<
-
- $(smc9000_drivers): smc9000.c smc9000.h
- $(smc9000_drivers): %.o: smc9000.c
-- $(COMPILE) $(STAGE2_CFLAGS) -fno-builtin -nostdinc \
-+ $(COMPILE) $(STAGE2_CFLAGS) -ffreestanding -nostdinc \
- $(NET_EXTRAFLAGS) $($(basename $@)_o_CFLAGS) -o $@ -c $<
-
- $(tiara_drivers): tiara.c
- $(tiara_drivers): %.o: tiara.c
-- $(COMPILE) $(STAGE2_CFLAGS) -fno-builtin -nostdinc \
-+ $(COMPILE) $(STAGE2_CFLAGS) -ffreestanding -nostdinc \
- $(NET_EXTRAFLAGS) $($(basename $@)_o_CFLAGS) -o $@ -c $<
-
- #$(tlan_drivers): tlan.c
- #$(tlan_drivers): %.o: tlan.c
--# $(COMPILE) $(STAGE2_CFLAGS) -fno-builtin -nostdinc \
-+# $(COMPILE) $(STAGE2_CFLAGS) -ffreestanding -nostdinc \
- # $(NET_EXTRAFLAGS) $($(basename $@)_o_CFLAGS) -o $@ -c $<
-
- $(tulip_drivers): tulip.c
- $(tulip_drivers): %.o: tulip.c
-- $(COMPILE) $(STAGE2_CFLAGS) -fno-builtin -nostdinc \
-+ $(COMPILE) $(STAGE2_CFLAGS) -ffreestanding -nostdinc \
- $(NET_EXTRAFLAGS) $($(basename $@)_o_CFLAGS) -o $@ -c $<
-
- $(via_rhine_drivers): via-rhine.c
- $(via_rhine_drivers): %.o: via-rhine.c
-- $(COMPILE) $(STAGE2_CFLAGS) -fno-builtin -nostdinc \
-+ $(COMPILE) $(STAGE2_CFLAGS) -ffreestanding -nostdinc \
- $(NET_EXTRAFLAGS) $($(basename $@)_o_CFLAGS) -o $@ -c $<
-
- $(w89c840_drivers): w89c840.c
- $(w89c840_drivers): %.o: w89c840.c
-- $(COMPILE) $(STAGE2_CFLAGS) -fno-builtin -nostdinc \
-+ $(COMPILE) $(STAGE2_CFLAGS) -ffreestanding -nostdinc \
- $(NET_EXTRAFLAGS) $($(basename $@)_o_CFLAGS) -o $@ -c $<
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/sysutils/grub/patches/patch-ae b/sysutils/grub/patches/patch-ae
deleted file mode 100644
index f6fcf13fc96..00000000000
--- a/sysutils/grub/patches/patch-ae
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ae,v 1.1 2003/03/14 23:35:26 thorpej Exp $
-
---- stage1/Makefile.am.orig 2003-03-14 15:23:00.000000000 -0800
-+++ stage1/Makefile.am 2003-03-14 15:23:10.000000000 -0800
-@@ -4,7 +4,7 @@
- CLEANFILES = $(nodist_pkgdata_DATA)
-
- # We can't use builtins or standard includes.
--AM_ASFLAGS = $(STAGE1_CFLAGS) -fno-builtin -nostdinc
-+AM_ASFLAGS = $(STAGE1_CFLAGS) -ffreestanding -nostdinc
- LDFLAGS = -nostdlib -Wl,-N,-Ttext,7C00
-
- noinst_PROGRAMS = stage1.exec
diff --git a/sysutils/grub/patches/patch-af b/sysutils/grub/patches/patch-af
deleted file mode 100644
index ce60c9aee81..00000000000
--- a/sysutils/grub/patches/patch-af
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-af,v 1.1 2003/03/14 23:35:26 thorpej Exp $
-
---- stage1/Makefile.in.orig 2003-03-14 15:23:32.000000000 -0800
-+++ stage1/Makefile.in 2003-03-14 15:23:47.000000000 -0800
-@@ -91,7 +91,7 @@
- CLEANFILES = $(nodist_pkgdata_DATA)
-
- # We can't use builtins or standard includes.
--AM_ASFLAGS = $(STAGE1_CFLAGS) -fno-builtin -nostdinc
-+AM_ASFLAGS = $(STAGE1_CFLAGS) -ffreestanding -nostdinc
- LDFLAGS = -nostdlib -Wl,-N,-Ttext,7C00
-
- noinst_PROGRAMS = stage1.exec
diff --git a/sysutils/grub/patches/patch-ag b/sysutils/grub/patches/patch-ag
deleted file mode 100644
index 25e2f46553d..00000000000
--- a/sysutils/grub/patches/patch-ag
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ag,v 1.1 2003/03/14 23:35:26 thorpej Exp $
-
---- stage2/Makefile.am.orig 2003-03-14 15:24:38.000000000 -0800
-+++ stage2/Makefile.am 2003-03-14 15:24:48.000000000 -0800
-@@ -75,7 +75,7 @@
- HERCULES_FLAGS =
- endif
-
--STAGE2_COMPILE = $(STAGE2_CFLAGS) -fno-builtin -nostdinc \
-+STAGE2_COMPILE = $(STAGE2_CFLAGS) -ffreestanding -nostdinc \
- $(NETBOOT_FLAGS) $(SERIAL_FLAGS) $(HERCULES_FLAGS)
-
- STAGE1_5_LINK = -nostdlib -Wl,-N -Wl,-Ttext -Wl,2000
diff --git a/sysutils/grub/patches/patch-ah b/sysutils/grub/patches/patch-ah
deleted file mode 100644
index fb4024563cd..00000000000
--- a/sysutils/grub/patches/patch-ah
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ah,v 1.2 2003/07/13 17:35:05 wiz Exp $
-
---- stage2/Makefile.in.orig Fri Nov 29 21:28:45 2002
-+++ stage2/Makefile.in
-@@ -158,7 +158,7 @@ PXELOADER_LINK = -nostdlib -Wl,-N -Wl,-T
- @HERCULES_SUPPORT_TRUE@HERCULES_FLAGS = -DSUPPORT_HERCULES=1
- @HERCULES_SUPPORT_FALSE@HERCULES_FLAGS =
-
--STAGE2_COMPILE = $(STAGE2_CFLAGS) -fno-builtin -nostdinc \
-+STAGE2_COMPILE = $(STAGE2_CFLAGS) -ffreestanding -nostdinc \
- $(NETBOOT_FLAGS) $(SERIAL_FLAGS) $(HERCULES_FLAGS)
-
-
diff --git a/sysutils/grub/patches/patch-ai b/sysutils/grub/patches/patch-ai
deleted file mode 100644
index e009a07623a..00000000000
--- a/sysutils/grub/patches/patch-ai
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ai,v 1.1 2003/07/13 17:35:05 wiz Exp $
-
---- util/grub-install.in.orig Mon May 20 13:21:50 2002
-+++ util/grub-install.in
-@@ -297,7 +297,7 @@ fi
- # Stage 1.5 does not exist.
-
- # Create the GRUB directory if it is not present.
--test -d "$bootdir" || mkdir "$bootdir" || exit 1
-+test -z "$bootdir" || test -d "$bootdir" || mkdir "$bootdir" || exit 1
- test -d "$grubdir" || mkdir "$grubdir" || exit 1
-
- # If --recheck is specified, remove the device map, if present.
diff --git a/sysutils/grub/patches/patch-aj b/sysutils/grub/patches/patch-aj
deleted file mode 100644
index 4bedc906b15..00000000000
--- a/sysutils/grub/patches/patch-aj
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-aj,v 1.1 2003/07/13 17:35:06 wiz Exp $
-
---- stage2/bios.c.orig Sun Dec 30 08:33:23 2001
-+++ stage2/bios.c
-@@ -20,6 +20,10 @@
-
- #include "shared.h"
-
-+void __enable_execute_stack(void *addr)
-+{
-+}
-+
-
- /* These are defined in asm.S, and never be used elsewhere, so declare the
- prototypes here. */
diff --git a/sysutils/grun/DESCR b/sysutils/grun/DESCR
deleted file mode 100644
index 16c6c242f35..00000000000
--- a/sysutils/grun/DESCR
+++ /dev/null
@@ -1,6 +0,0 @@
-gRun is a GTK based Run dialog that closely resembles
-the Windows Run dialog, similar to xexec. However,
-gRun is much more powerful than xexec, looks a lot
-better, and has the big advantage that you can start
-typing a command without having to mouse-click into
-the text field.
diff --git a/sysutils/grun/Makefile b/sysutils/grun/Makefile
deleted file mode 100644
index 806f1dfd0d8..00000000000
--- a/sysutils/grun/Makefile
+++ /dev/null
@@ -1,24 +0,0 @@
-# $NetBSD: Makefile,v 1.6 2003/07/13 13:53:17 wiz Exp $
-
-DISTNAME= grun-0.9.2
-PKGREVISION= 2
-CATEGORIES= misc
-MASTER_SITES= http://www.geocities.com/ResearchTriangle/Facility/1468/sg/
-
-MAINTAINER= epg@pretzelnet.org
-HOMEPAGE= ${MASTER_SITES}/grun.html
-COMMENT= GTK+ based Run dialog
-
-USE_BUILDLINK2= YES
-USE_X11= YES
-GNU_CONFIGURE= YES
-USE_GMAKE= YES
-PTHREAD_OPTS+= require
-
-post-install:
- ${MV} ${LOCALBASE}/man/man1/grun.1x ${LOCALBASE}/man/man1/grun.1
-
-.include "../../x11/gtk/buildlink2.mk"
-.include "../../mk/pthread.buildlink2.mk"
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/grun/PLIST b/sysutils/grun/PLIST
deleted file mode 100644
index 91179875f67..00000000000
--- a/sysutils/grun/PLIST
+++ /dev/null
@@ -1,6 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2001/11/18 22:41:40 agc Exp $
-bin/grun
-man/man1/grun.1
-share/grun/gassoc
-share/grun/consfile
-@dirrm share/grun
diff --git a/sysutils/grun/distinfo b/sysutils/grun/distinfo
deleted file mode 100644
index f4fa60598b3..00000000000
--- a/sysutils/grun/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.1.1.1 2001/11/18 22:41:40 agc Exp $
-
-SHA1 (grun-0.9.2.tar.gz) = 3b4a06b75aa07aa5d19a4594566773db34ea937d
-Size (grun-0.9.2.tar.gz) = 113745 bytes
-SHA1 (patch-aa) = cd9b0f80c3144403fddd59446918bf59db356131
diff --git a/sysutils/grun/patches/patch-aa b/sysutils/grun/patches/patch-aa
deleted file mode 100644
index 0a52698120f..00000000000
--- a/sysutils/grun/patches/patch-aa
+++ /dev/null
@@ -1,27 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2001/11/18 22:41:41 agc Exp $
-
-Use correct header file for locale information
-
---- grun.c 2001/11/13 14:57:16 1.1
-+++ grun.c 2001/11/13 14:57:44
-@@ -50,6 +50,10 @@
- #define ARG_BASE 1
- #endif
-
-+#ifdef HAVE_LOCALE_H
-+#include <locale.h>
-+#endif
-+
- #include <sys/stat.h>
-
- #define MAX_BUFF 1024
-@@ -894,7 +898,9 @@
-
- gtk_init(&argc, &argv);
- #ifndef WIN32
-+#ifdef HAVE_SETLOCALE
- setlocale (LC_ALL, "");
-+#endif
- bindtextdomain (PACKAGE, LOCALEDIR);
- textdomain (PACKAGE);
- #endif /* WIN32 */
diff --git a/sysutils/gtop/DESCR b/sysutils/gtop/DESCR
deleted file mode 100644
index bec1a24a4ca..00000000000
--- a/sysutils/gtop/DESCR
+++ /dev/null
@@ -1 +0,0 @@
-GNOME system monitor - top like, memory graphs, processes detailed view
diff --git a/sysutils/gtop/Makefile b/sysutils/gtop/Makefile
deleted file mode 100644
index a5f7a680c81..00000000000
--- a/sysutils/gtop/Makefile
+++ /dev/null
@@ -1,28 +0,0 @@
-# $NetBSD: Makefile,v 1.26 2003/07/13 13:53:18 wiz Exp $
-
-DISTNAME= gtop-1.0.13
-PKGREVISION= 4
-CATEGORIES= sysutils gnome
-MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gtop/1.0/}
-
-MAINTAINER= tron@netbsd.org
-HOMEPAGE= http://www.gnome.org/
-COMMENT= GNOME system monitor - top like, memory graphs, process viewer
-
-BUILD_USES_MSGFMT= YES
-
-OSVERSION_SPECIFIC= YES
-USE_BUILDLINK2= YES
-USE_PKGLOCALEDIR= YES
-USE_GMAKE= YES
-USE_X11BASE= YES
-USE_LIBTOOL= YES
-
-GNU_CONFIGURE= YES
-LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig
-CONFIGURE_ENV+= LOCALEDIR=${PKGLOCALEDIR}
-
-.include "../../devel/gettext-lib/buildlink2.mk"
-.include "../../devel/libgtop/buildlink2.mk"
-.include "../../x11/gnome-core/buildlink2.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/gtop/PLIST b/sysutils/gtop/PLIST
deleted file mode 100644
index 3ca4e0fe630..00000000000
--- a/sysutils/gtop/PLIST
+++ /dev/null
@@ -1,46 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 22:53:17 zuntum Exp $
-bin/gtop
-share/gnome/apps/System/gtop.desktop
-share/gtoprc
-share/gnome/help/gtop/C/topic.dat
-share/gnome/help/gtop/C/figs/gtop-fs-1.png
-share/gnome/help/gtop/C/figs/gtop-fs-2.png
-share/gnome/help/gtop/C/figs/gtop-mem.png
-share/gnome/help/gtop/C/figs/gtop-pic-bottom.png
-share/gnome/help/gtop/C/figs/gtop-pic-main.png
-share/gnome/help/gtop/C/figs/gtop-pic-middle.png
-share/gnome/help/gtop/C/figs/gtop-pic-top.png
-share/gnome/help/gtop/C/figs/gtop-prefs.png
-share/gnome/help/gtop/C/figs/gtop-proc.png
-${PKGLOCALEDIR}/locale/az/LC_MESSAGES/gtop.mo
-${PKGLOCALEDIR}/locale/ca/LC_MESSAGES/gtop.mo
-${PKGLOCALEDIR}/locale/cs/LC_MESSAGES/gtop.mo
-${PKGLOCALEDIR}/locale/da/LC_MESSAGES/gtop.mo
-${PKGLOCALEDIR}/locale/de/LC_MESSAGES/gtop.mo
-${PKGLOCALEDIR}/locale/el/LC_MESSAGES/gtop.mo
-${PKGLOCALEDIR}/locale/es/LC_MESSAGES/gtop.mo
-${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/gtop.mo
-${PKGLOCALEDIR}/locale/ga/LC_MESSAGES/gtop.mo
-${PKGLOCALEDIR}/locale/gl/LC_MESSAGES/gtop.mo
-${PKGLOCALEDIR}/locale/hu/LC_MESSAGES/gtop.mo
-${PKGLOCALEDIR}/locale/it/LC_MESSAGES/gtop.mo
-${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/gtop.mo
-${PKGLOCALEDIR}/locale/ko/LC_MESSAGES/gtop.mo
-${PKGLOCALEDIR}/locale/lt/LC_MESSAGES/gtop.mo
-${PKGLOCALEDIR}/locale/no/LC_MESSAGES/gtop.mo
-${PKGLOCALEDIR}/locale/pt/LC_MESSAGES/gtop.mo
-${PKGLOCALEDIR}/locale/pt_BR/LC_MESSAGES/gtop.mo
-${PKGLOCALEDIR}/locale/ro/LC_MESSAGES/gtop.mo
-${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/gtop.mo
-${PKGLOCALEDIR}/locale/sk/LC_MESSAGES/gtop.mo
-${PKGLOCALEDIR}/locale/sl/LC_MESSAGES/gtop.mo
-${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/gtop.mo
-${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/gtop.mo
-${PKGLOCALEDIR}/locale/tr/LC_MESSAGES/gtop.mo
-${PKGLOCALEDIR}/locale/uk/LC_MESSAGES/gtop.mo
-${PKGLOCALEDIR}/locale/zh_CN.GB2312/LC_MESSAGES/gtop.mo
-${PKGLOCALEDIR}/locale/zh_TW.Big5/LC_MESSAGES/gtop.mo
-share/pixmaps/gnome-gtop.png
-@dirrm share/gnome/help/gtop/C/figs
-@dirrm share/gnome/help/gtop/C
-@dirrm share/gnome/help/gtop
diff --git a/sysutils/gtop/distinfo b/sysutils/gtop/distinfo
deleted file mode 100644
index dc1f095c8d0..00000000000
--- a/sysutils/gtop/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.3 2001/04/24 18:33:29 rh Exp $
-
-SHA1 (gtop-1.0.13.tar.gz) = 114b3068c6c66b7cd582c6bfe2d1143957ae5a19
-Size (gtop-1.0.13.tar.gz) = 823015 bytes
-SHA1 (patch-aa) = 5f17676fc7fca9cf8b99dc02fd34142f99ff5fd3
diff --git a/sysutils/gtop/patches/patch-aa b/sysutils/gtop/patches/patch-aa
deleted file mode 100644
index 6544d7d7b2c..00000000000
--- a/sysutils/gtop/patches/patch-aa
+++ /dev/null
@@ -1,29 +0,0 @@
-$NetBSD: patch-aa,v 1.3 2001/04/24 18:33:30 rh Exp $
-
---- configure.orig Tue Apr 24 20:11:44 2001
-+++ configure
-@@ -4953,13 +4953,13 @@
- if { (eval echo configure:4954: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- CATOBJEXT=.gmo
-- DATADIRNAME=share
-+ DATADIRNAME=${LOCALEDIR}
- else
- echo "configure: failed program was:" >&5
- cat conftest.$ac_ext >&5
- rm -rf conftest*
- CATOBJEXT=.mo
-- DATADIRNAME=lib
-+ DATADIRNAME=${LOCALEDIR}
- fi
- rm -f conftest*
- INSTOBJEXT=.mo
-@@ -5188,7 +5188,7 @@
- # We need to process the po/ directory.
- POSUB=po
- else
-- DATADIRNAME=share
-+ DATADIRNAME=${LOCALEDIR}
- nls_cv_header_intl=intl/libintl.h
- nls_cv_header_libgt=intl/libgettext.h
- fi
diff --git a/sysutils/gworkspace/DESCR b/sysutils/gworkspace/DESCR
deleted file mode 100644
index 1f1eb381676..00000000000
--- a/sysutils/gworkspace/DESCR
+++ /dev/null
@@ -1,3 +0,0 @@
- GWorkspace is the official GNUstep workspace manager. It is a clone of
-NeXT's workspace manager. GWorkspace is becoming more and more stable
-every day and it is already ready for daily usage.
diff --git a/sysutils/gworkspace/Makefile b/sysutils/gworkspace/Makefile
deleted file mode 100644
index 868810ea77f..00000000000
--- a/sysutils/gworkspace/Makefile
+++ /dev/null
@@ -1,13 +0,0 @@
-# $NetBSD: Makefile,v 1.4 2003/07/13 13:53:18 wiz Exp $
-#
-
-.include "Makefile.common"
-PKGREVISION= 1
-
-COMMENT= GNUstep Workspace manager
-
-pre-install:
- ${CP} ${FILESDIR}/GNUmakefile ${WRKSRC}/GWLib
-
-.include "../../sysutils/GWLib/buildlink2.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/gworkspace/Makefile.common b/sysutils/gworkspace/Makefile.common
deleted file mode 100644
index 2db15a4981e..00000000000
--- a/sysutils/gworkspace/Makefile.common
+++ /dev/null
@@ -1,22 +0,0 @@
-# $NetBSD: Makefile.common,v 1.5 2003/07/06 08:51:34 rh Exp $
-#
-
-DISTNAME= gworkspace-0.5.3
-WRKSRC= ${WRKDIR}/${DISTNAME:S/gw/GW/}
-CATEGORIES?= sysutils gnustep
-MASTER_SITES= http://www.gnustep.it/enrico/gworkspace/ \
- http://www.imago.ro/gworkspace/
-
-MAINTAINER?= tech-pkg@netbsd.org
-HOMEPAGE?= http://www.gnustep.it/enrico/gworkspace/
-
-USE_BUILDLINK2= YES
-USE_GMAKE= YES
-USE_X11= YES
-MAKEFILE= GNUmakefile
-GNU_CONFIGURE= YES
-GNU_CONFIGURE_PREFIX= ${PREFIX}/share/GNUstep
-
-.include "../../x11/gnustep-back/buildlink2.mk"
-.include "../../mk/pthread.buildlink2.mk"
-.include "../../mk/ghostscript.mk"
diff --git a/sysutils/gworkspace/PLIST b/sysutils/gworkspace/PLIST
deleted file mode 100644
index 0af79789dfe..00000000000
--- a/sysutils/gworkspace/PLIST
+++ /dev/null
@@ -1,1334 +0,0 @@
-@comment $NetBSD: PLIST,v 1.4 2003/07/06 08:51:34 rh Exp $
-share/GNUstep/System/Applications/GWorkspace.app/GWorkspace
-share/GNUstep/System/Applications/GWorkspace.app/Resources/AppViewer.inspector/Resources/Info-gnustep.plist
-share/GNUstep/System/Applications/GWorkspace.app/Resources/AppViewer.inspector/Resources/InspectorInfo.plist
-share/GNUstep/System/Applications/GWorkspace.app/Resources/AppViewer.inspector/${GNUSTEP_HOST_CPU}/${GNUSTEP_HOST_OS}/gnu-gnu-gnu/AppViewer
-share/GNUstep/System/Applications/GWorkspace.app/Resources/AppViewer.inspector/stamp.make
-share/GNUstep/System/Applications/GWorkspace.app/Resources/BrowserViewer.viewer/Resources/CVS/Entries
-share/GNUstep/System/Applications/GWorkspace.app/Resources/BrowserViewer.viewer/Resources/CVS/Repository
-share/GNUstep/System/Applications/GWorkspace.app/Resources/BrowserViewer.viewer/Resources/CVS/Root
-share/GNUstep/System/Applications/GWorkspace.app/Resources/BrowserViewer.viewer/Resources/Dutch.lproj/CVS/Entries
-share/GNUstep/System/Applications/GWorkspace.app/Resources/BrowserViewer.viewer/Resources/Dutch.lproj/CVS/Repository
-share/GNUstep/System/Applications/GWorkspace.app/Resources/BrowserViewer.viewer/Resources/Dutch.lproj/CVS/Root
-share/GNUstep/System/Applications/GWorkspace.app/Resources/BrowserViewer.viewer/Resources/English.lproj/BrowserViewerPref.gorm/CVS/Entries
-share/GNUstep/System/Applications/GWorkspace.app/Resources/BrowserViewer.viewer/Resources/English.lproj/BrowserViewerPref.gorm/CVS/Repository
-share/GNUstep/System/Applications/GWorkspace.app/Resources/BrowserViewer.viewer/Resources/English.lproj/BrowserViewerPref.gorm/CVS/Root
-share/GNUstep/System/Applications/GWorkspace.app/Resources/BrowserViewer.viewer/Resources/English.lproj/BrowserViewerPref.gorm/data.classes
-share/GNUstep/System/Applications/GWorkspace.app/Resources/BrowserViewer.viewer/Resources/English.lproj/BrowserViewerPref.gorm/objects.gorm
-share/GNUstep/System/Applications/GWorkspace.app/Resources/BrowserViewer.viewer/Resources/English.lproj/BrowserViewerPref.nib/CVS/Entries
-share/GNUstep/System/Applications/GWorkspace.app/Resources/BrowserViewer.viewer/Resources/English.lproj/BrowserViewerPref.nib/CVS/Repository
-share/GNUstep/System/Applications/GWorkspace.app/Resources/BrowserViewer.viewer/Resources/English.lproj/BrowserViewerPref.nib/CVS/Root
-share/GNUstep/System/Applications/GWorkspace.app/Resources/BrowserViewer.viewer/Resources/English.lproj/BrowserViewerPref.nib/classes.nib
-share/GNUstep/System/Applications/GWorkspace.app/Resources/BrowserViewer.viewer/Resources/English.lproj/BrowserViewerPref.nib/info.nib
-share/GNUstep/System/Applications/GWorkspace.app/Resources/BrowserViewer.viewer/Resources/English.lproj/BrowserViewerPref.nib/objects.nib
-share/GNUstep/System/Applications/GWorkspace.app/Resources/BrowserViewer.viewer/Resources/English.lproj/CVS/Entries
-share/GNUstep/System/Applications/GWorkspace.app/Resources/BrowserViewer.viewer/Resources/English.lproj/CVS/Repository
-share/GNUstep/System/Applications/GWorkspace.app/Resources/BrowserViewer.viewer/Resources/English.lproj/CVS/Root
-share/GNUstep/System/Applications/GWorkspace.app/Resources/BrowserViewer.viewer/Resources/French.lproj/CVS/Entries
-share/GNUstep/System/Applications/GWorkspace.app/Resources/BrowserViewer.viewer/Resources/French.lproj/CVS/Repository
-share/GNUstep/System/Applications/GWorkspace.app/Resources/BrowserViewer.viewer/Resources/French.lproj/CVS/Root
-share/GNUstep/System/Applications/GWorkspace.app/Resources/BrowserViewer.viewer/Resources/German.lproj/CVS/Entries
-share/GNUstep/System/Applications/GWorkspace.app/Resources/BrowserViewer.viewer/Resources/German.lproj/CVS/Repository
-share/GNUstep/System/Applications/GWorkspace.app/Resources/BrowserViewer.viewer/Resources/German.lproj/CVS/Root
-share/GNUstep/System/Applications/GWorkspace.app/Resources/BrowserViewer.viewer/Resources/Info-gnustep.plist
-share/GNUstep/System/Applications/GWorkspace.app/Resources/BrowserViewer.viewer/Resources/Italian.lproj/CVS/Entries
-share/GNUstep/System/Applications/GWorkspace.app/Resources/BrowserViewer.viewer/Resources/Italian.lproj/CVS/Repository
-share/GNUstep/System/Applications/GWorkspace.app/Resources/BrowserViewer.viewer/Resources/Italian.lproj/CVS/Root
-share/GNUstep/System/Applications/GWorkspace.app/Resources/BrowserViewer.viewer/Resources/Portuguese.lproj/CVS/Entries
-share/GNUstep/System/Applications/GWorkspace.app/Resources/BrowserViewer.viewer/Resources/Portuguese.lproj/CVS/Repository
-share/GNUstep/System/Applications/GWorkspace.app/Resources/BrowserViewer.viewer/Resources/Portuguese.lproj/CVS/Root
-share/GNUstep/System/Applications/GWorkspace.app/Resources/BrowserViewer.viewer/Resources/Resources/English.lproj/BrowserViewerPref.gorm/CVS/Entries
-share/GNUstep/System/Applications/GWorkspace.app/Resources/BrowserViewer.viewer/Resources/Resources/English.lproj/BrowserViewerPref.gorm/CVS/Repository
-share/GNUstep/System/Applications/GWorkspace.app/Resources/BrowserViewer.viewer/Resources/Resources/English.lproj/BrowserViewerPref.gorm/CVS/Root
-share/GNUstep/System/Applications/GWorkspace.app/Resources/BrowserViewer.viewer/Resources/Resources/English.lproj/BrowserViewerPref.gorm/data.classes
-share/GNUstep/System/Applications/GWorkspace.app/Resources/BrowserViewer.viewer/Resources/Resources/English.lproj/BrowserViewerPref.gorm/objects.gorm
-share/GNUstep/System/Applications/GWorkspace.app/Resources/BrowserViewer.viewer/Resources/Romanian.lproj/CVS/Entries
-share/GNUstep/System/Applications/GWorkspace.app/Resources/BrowserViewer.viewer/Resources/Romanian.lproj/CVS/Repository
-share/GNUstep/System/Applications/GWorkspace.app/Resources/BrowserViewer.viewer/Resources/Romanian.lproj/CVS/Root
-share/GNUstep/System/Applications/GWorkspace.app/Resources/BrowserViewer.viewer/Resources/Spanish.lproj/CVS/Entries
-share/GNUstep/System/Applications/GWorkspace.app/Resources/BrowserViewer.viewer/Resources/Spanish.lproj/CVS/Repository
-share/GNUstep/System/Applications/GWorkspace.app/Resources/BrowserViewer.viewer/Resources/Spanish.lproj/CVS/Root
-share/GNUstep/System/Applications/GWorkspace.app/Resources/BrowserViewer.viewer/Resources/miniwindow.tiff
-share/GNUstep/System/Applications/GWorkspace.app/Resources/BrowserViewer.viewer/${GNUSTEP_HOST_CPU}/${GNUSTEP_HOST_OS}/gnu-gnu-gnu/BrowserViewer
-share/GNUstep/System/Applications/GWorkspace.app/Resources/BrowserViewer.viewer/stamp.make
-share/GNUstep/System/Applications/GWorkspace.app/Resources/CVS/Entries
-share/GNUstep/System/Applications/GWorkspace.app/Resources/CVS/Repository
-share/GNUstep/System/Applications/GWorkspace.app/Resources/CVS/Root
-share/GNUstep/System/Applications/GWorkspace.app/Resources/CellHighlight.tiff
-share/GNUstep/System/Applications/GWorkspace.app/Resources/ComputeSize.tiff
-share/GNUstep/System/Applications/GWorkspace.app/Resources/ComputeSize_dimm.tiff
-share/GNUstep/System/Applications/GWorkspace.app/Resources/Date-0.tiff
-share/GNUstep/System/Applications/GWorkspace.app/Resources/Date-1.tiff
-share/GNUstep/System/Applications/GWorkspace.app/Resources/Date-2.tiff
-share/GNUstep/System/Applications/GWorkspace.app/Resources/Date-3.tiff
-share/GNUstep/System/Applications/GWorkspace.app/Resources/Date-4.tiff
-share/GNUstep/System/Applications/GWorkspace.app/Resources/Date-5.tiff
-share/GNUstep/System/Applications/GWorkspace.app/Resources/Date-6.tiff
-share/GNUstep/System/Applications/GWorkspace.app/Resources/Date-7.tiff
-share/GNUstep/System/Applications/GWorkspace.app/Resources/Date-8.tiff
-share/GNUstep/System/Applications/GWorkspace.app/Resources/Date-9.tiff
-share/GNUstep/System/Applications/GWorkspace.app/Resources/Date-Colon.tiff
-share/GNUstep/System/Applications/GWorkspace.app/Resources/Date.tiff
-share/GNUstep/System/Applications/GWorkspace.app/Resources/Dutch.lproj/CVS/Entries
-share/GNUstep/System/Applications/GWorkspace.app/Resources/Dutch.lproj/CVS/Repository
-share/GNUstep/System/Applications/GWorkspace.app/Resources/Dutch.lproj/CVS/Root
-share/GNUstep/System/Applications/GWorkspace.app/Resources/Dutch.lproj/Finder.gorm/CVS/Entries
-share/GNUstep/System/Applications/GWorkspace.app/Resources/Dutch.lproj/Finder.gorm/CVS/Repository
-share/GNUstep/System/Applications/GWorkspace.app/Resources/Dutch.lproj/Finder.gorm/CVS/Root
-share/GNUstep/System/Applications/GWorkspace.app/Resources/Dutch.lproj/Finder.gorm/data.classes
-share/GNUstep/System/Applications/GWorkspace.app/Resources/Dutch.lproj/Finder.gorm/objects.gorm
-share/GNUstep/System/Applications/GWorkspace.app/Resources/Dutch.lproj/Finder.nib/CVS/Entries
-share/GNUstep/System/Applications/GWorkspace.app/Resources/Dutch.lproj/Finder.nib/CVS/Repository
-share/GNUstep/System/Applications/GWorkspace.app/Resources/Dutch.lproj/Finder.nib/CVS/Root
-share/GNUstep/System/Applications/GWorkspace.app/Resources/Dutch.lproj/Finder.nib/classes.nib
-share/GNUstep/System/Applications/GWorkspace.app/Resources/Dutch.lproj/Finder.nib/info.nib
-share/GNUstep/System/Applications/GWorkspace.app/Resources/Dutch.lproj/Finder.nib/objects.nib
-share/GNUstep/System/Applications/GWorkspace.app/Resources/Dutch.lproj/Localizable.strings
-share/GNUstep/System/Applications/GWorkspace.app/Resources/Dutch.lproj/MainMenu-OSX.gsmarkup
-share/GNUstep/System/Applications/GWorkspace.app/Resources/English.lproj/.gwsort
-share/GNUstep/System/Applications/GWorkspace.app/Resources/English.lproj/AttributesPanel.gorm/CVS/Entries
-share/GNUstep/System/Applications/GWorkspace.app/Resources/English.lproj/AttributesPanel.gorm/CVS/Repository
-share/GNUstep/System/Applications/GWorkspace.app/Resources/English.lproj/AttributesPanel.gorm/CVS/Root
-share/GNUstep/System/Applications/GWorkspace.app/Resources/English.lproj/AttributesPanel.gorm/data.classes
-share/GNUstep/System/Applications/GWorkspace.app/Resources/English.lproj/AttributesPanel.gorm/objects.gorm
-share/GNUstep/System/Applications/GWorkspace.app/Resources/English.lproj/AttributesPanel.nib/CVS/Entries
-share/GNUstep/System/Applications/GWorkspace.app/Resources/English.lproj/AttributesPanel.nib/CVS/Repository
-share/GNUstep/System/Applications/GWorkspace.app/Resources/English.lproj/AttributesPanel.nib/CVS/Root
-share/GNUstep/System/Applications/GWorkspace.app/Resources/English.lproj/AttributesPanel.nib/classes.nib
-share/GNUstep/System/Applications/GWorkspace.app/Resources/English.lproj/AttributesPanel.nib/info.nib
-share/GNUstep/System/Applications/GWorkspace.app/Resources/English.lproj/AttributesPanel.nib/objects.nib
-share/GNUstep/System/Applications/GWorkspace.app/Resources/English.lproj/CVS/Entries
-share/GNUstep/System/Applications/GWorkspace.app/Resources/English.lproj/CVS/Repository
-share/GNUstep/System/Applications/GWorkspace.app/Resources/English.lproj/CVS/Root
-share/GNUstep/System/Applications/GWorkspace.app/Resources/English.lproj/ContentsPanel.gorm/CVS/Entries
-share/GNUstep/System/Applications/GWorkspace.app/Resources/English.lproj/ContentsPanel.gorm/CVS/Repository
-share/GNUstep/System/Applications/GWorkspace.app/Resources/English.lproj/ContentsPanel.gorm/CVS/Root
-share/GNUstep/System/Applications/GWorkspace.app/Resources/English.lproj/ContentsPanel.gorm/data.classes
-share/GNUstep/System/Applications/GWorkspace.app/Resources/English.lproj/ContentsPanel.gorm/objects.gorm
-share/GNUstep/System/Applications/GWorkspace.app/Resources/English.lproj/ContentsPanel.nib/CVS/Entries
-share/GNUstep/System/Applications/GWorkspace.app/Resources/English.lproj/ContentsPanel.nib/CVS/Repository
-share/GNUstep/System/Applications/GWorkspace.app/Resources/English.lproj/ContentsPanel.nib/CVS/Root
-share/GNUstep/System/Applications/GWorkspace.app/Resources/English.lproj/ContentsPanel.nib/classes.nib
-share/GNUstep/System/Applications/GWorkspace.app/Resources/English.lproj/ContentsPanel.nib/info.nib
-share/GNUstep/System/Applications/GWorkspace.app/Resources/English.lproj/ContentsPanel.nib/objects.nib
-share/GNUstep/System/Applications/GWorkspace.app/Resources/English.lproj/DefEditorPref.gorm/CVS/Entries
-share/GNUstep/System/Applications/GWorkspace.app/Resources/English.lproj/DefEditorPref.gorm/CVS/Repository
-share/GNUstep/System/Applications/GWorkspace.app/Resources/English.lproj/DefEditorPref.gorm/CVS/Root
-share/GNUstep/System/Applications/GWorkspace.app/Resources/English.lproj/DefEditorPref.gorm/data.classes
-share/GNUstep/System/Applications/GWorkspace.app/Resources/English.lproj/DefEditorPref.gorm/objects.gorm
-share/GNUstep/System/Applications/GWorkspace.app/Resources/English.lproj/DefEditorPref.nib/CVS/Entries
-share/GNUstep/System/Applications/GWorkspace.app/Resources/English.lproj/DefEditorPref.nib/CVS/Repository
-share/GNUstep/System/Applications/GWorkspace.app/Resources/English.lproj/DefEditorPref.nib/CVS/Root
-share/GNUstep/System/Applications/GWorkspace.app/Resources/English.lproj/DefEditorPref.nib/classes.nib
-share/GNUstep/System/Applications/GWorkspace.app/Resources/English.lproj/DefEditorPref.nib/info.nib
-share/GNUstep/System/Applications/GWorkspace.app/Resources/English.lproj/DefEditorPref.nib/objects.nib
-share/GNUstep/System/Applications/GWorkspace.app/Resources/English.lproj/DefSortOrderPref.gorm/CVS/Entries
-share/GNUstep/System/Applications/GWorkspace.app/Resources/English.lproj/DefSortOrderPref.gorm/CVS/Repository
-share/GNUstep/System/Applications/GWorkspace.app/Resources/English.lproj/DefSortOrderPref.gorm/CVS/Root
-share/GNUstep/System/Applications/GWorkspace.app/Resources/English.lproj/DefSortOrderPref.gorm/data.classes
-share/GNUstep/System/Applications/GWorkspace.app/Resources/English.lproj/DefSortOrderPref.gorm/objects.gorm
-share/GNUstep/System/Applications/GWorkspace.app/Resources/English.lproj/DefSortOrderPref.nib/CVS/Entries
-share/GNUstep/System/Applications/GWorkspace.app/Resources/English.lproj/DefSortOrderPref.nib/CVS/Repository
-share/GNUstep/System/Applications/GWorkspace.app/Resources/English.lproj/DefSortOrderPref.nib/CVS/Root
-share/GNUstep/System/Applications/GWorkspace.app/Resources/English.lproj/DefSortOrderPref.nib/classes.nib
-share/GNUstep/System/Applications/GWorkspace.app/Resources/English.lproj/DefSortOrderPref.nib/info.nib
-share/GNUstep/System/Applications/GWorkspace.app/Resources/English.lproj/DefSortOrderPref.nib/objects.nib
-share/GNUstep/System/Applications/GWorkspace.app/Resources/English.lproj/DeskTopPref.gorm/.gwdir
-share/GNUstep/System/Applications/GWorkspace.app/Resources/English.lproj/DeskTopPref.gorm/CVS/Entries
-share/GNUstep/System/Applications/GWorkspace.app/Resources/English.lproj/DeskTopPref.gorm/CVS/Repository
-share/GNUstep/System/Applications/GWorkspace.app/Resources/English.lproj/DeskTopPref.gorm/CVS/Root
-share/GNUstep/System/Applications/GWorkspace.app/Resources/English.lproj/DeskTopPref.gorm/data.classes
-share/GNUstep/System/Applications/GWorkspace.app/Resources/English.lproj/DeskTopPref.gorm/objects.gorm
-share/GNUstep/System/Applications/GWorkspace.app/Resources/English.lproj/DeskTopPref.nib/CVS/Entries
-share/GNUstep/System/Applications/GWorkspace.app/Resources/English.lproj/DeskTopPref.nib/CVS/Repository
-share/GNUstep/System/Applications/GWorkspace.app/Resources/English.lproj/DeskTopPref.nib/CVS/Root
-share/GNUstep/System/Applications/GWorkspace.app/Resources/English.lproj/DeskTopPref.nib/classes.nib
-share/GNUstep/System/Applications/GWorkspace.app/Resources/English.lproj/DeskTopPref.nib/info.nib
-share/GNUstep/System/Applications/GWorkspace.app/Resources/English.lproj/DeskTopPref.nib/objects.nib
-share/GNUstep/System/Applications/GWorkspace.app/Resources/English.lproj/FileOperationWin.gorm/CVS/Entries
-share/GNUstep/System/Applications/GWorkspace.app/Resources/English.lproj/FileOperationWin.gorm/CVS/Repository
-share/GNUstep/System/Applications/GWorkspace.app/Resources/English.lproj/FileOperationWin.gorm/CVS/Root
-share/GNUstep/System/Applications/GWorkspace.app/Resources/English.lproj/FileOperationWin.gorm/data.classes
-share/GNUstep/System/Applications/GWorkspace.app/Resources/English.lproj/FileOperationWin.gorm/objects.gorm
-share/GNUstep/System/Applications/GWorkspace.app/Resources/English.lproj/FileOps.gorm/CVS/Entries
-share/GNUstep/System/Applications/GWorkspace.app/Resources/English.lproj/FileOps.gorm/CVS/Repository
-share/GNUstep/System/Applications/GWorkspace.app/Resources/English.lproj/FileOps.gorm/CVS/Root
-share/GNUstep/System/Applications/GWorkspace.app/Resources/English.lproj/FileOpsPref.gorm/CVS/Entries
-share/GNUstep/System/Applications/GWorkspace.app/Resources/English.lproj/FileOpsPref.gorm/CVS/Repository
-share/GNUstep/System/Applications/GWorkspace.app/Resources/English.lproj/FileOpsPref.gorm/CVS/Root
-share/GNUstep/System/Applications/GWorkspace.app/Resources/English.lproj/FileOpsPref.gorm/data.classes
-share/GNUstep/System/Applications/GWorkspace.app/Resources/English.lproj/FileOpsPref.gorm/objects.gorm
-share/GNUstep/System/Applications/GWorkspace.app/Resources/English.lproj/FileOpsPref.nib/CVS/Entries
-share/GNUstep/System/Applications/GWorkspace.app/Resources/English.lproj/FileOpsPref.nib/CVS/Repository
-share/GNUstep/System/Applications/GWorkspace.app/Resources/English.lproj/FileOpsPref.nib/CVS/Root
-share/GNUstep/System/Applications/GWorkspace.app/Resources/English.lproj/FileOpsPref.nib/classes.nib
-share/GNUstep/System/Applications/GWorkspace.app/Resources/English.lproj/FileOpsPref.nib/info.nib
-share/GNUstep/System/Applications/GWorkspace.app/Resources/English.lproj/FileOpsPref.nib/objects.nib
-share/GNUstep/System/Applications/GWorkspace.app/Resources/English.lproj/Finder.gorm/CVS/Entries
-share/GNUstep/System/Applications/GWorkspace.app/Resources/English.lproj/Finder.gorm/CVS/Repository
-share/GNUstep/System/Applications/GWorkspace.app/Resources/English.lproj/Finder.gorm/CVS/Root
-share/GNUstep/System/Applications/GWorkspace.app/Resources/English.lproj/Finder.gorm/data.classes
-share/GNUstep/System/Applications/GWorkspace.app/Resources/English.lproj/Finder.gorm/objects.gorm
-share/GNUstep/System/Applications/GWorkspace.app/Resources/English.lproj/Finder.nib/CVS/Entries
-share/GNUstep/System/Applications/GWorkspace.app/Resources/English.lproj/Finder.nib/CVS/Repository
-share/GNUstep/System/Applications/GWorkspace.app/Resources/English.lproj/Finder.nib/CVS/Root
-share/GNUstep/System/Applications/GWorkspace.app/Resources/English.lproj/Finder.nib/classes.nib
-share/GNUstep/System/Applications/GWorkspace.app/Resources/English.lproj/Finder.nib/info.nib
-share/GNUstep/System/Applications/GWorkspace.app/Resources/English.lproj/Finder.nib/objects.nib
-share/GNUstep/System/Applications/GWorkspace.app/Resources/English.lproj/HiddenFilesPref.gorm/CVS/Entries
-share/GNUstep/System/Applications/GWorkspace.app/Resources/English.lproj/HiddenFilesPref.gorm/CVS/Repository
-share/GNUstep/System/Applications/GWorkspace.app/Resources/English.lproj/HiddenFilesPref.gorm/CVS/Root
-share/GNUstep/System/Applications/GWorkspace.app/Resources/English.lproj/HiddenFilesPref.gorm/data.classes
-share/GNUstep/System/Applications/GWorkspace.app/Resources/English.lproj/HiddenFilesPref.gorm/objects.gorm
-share/GNUstep/System/Applications/GWorkspace.app/Resources/English.lproj/HiddenFilesPref.nib/CVS/Entries
-share/GNUstep/System/Applications/GWorkspace.app/Resources/English.lproj/HiddenFilesPref.nib/CVS/Repository
-share/GNUstep/System/Applications/GWorkspace.app/Resources/English.lproj/HiddenFilesPref.nib/CVS/Root
-share/GNUstep/System/Applications/GWorkspace.app/Resources/English.lproj/HiddenFilesPref.nib/classes.nib
-share/GNUstep/System/Applications/GWorkspace.app/Resources/English.lproj/HiddenFilesPref.nib/info.nib
-share/GNUstep/System/Applications/GWorkspace.app/Resources/English.lproj/HiddenFilesPref.nib/objects.nib
-share/GNUstep/System/Applications/GWorkspace.app/Resources/English.lproj/IconsPref.gorm/CVS/Entries
-share/GNUstep/System/Applications/GWorkspace.app/Resources/English.lproj/IconsPref.gorm/CVS/Repository
-share/GNUstep/System/Applications/GWorkspace.app/Resources/English.lproj/IconsPref.gorm/CVS/Root
-share/GNUstep/System/Applications/GWorkspace.app/Resources/English.lproj/IconsPref.gorm/data.classes
-share/GNUstep/System/Applications/GWorkspace.app/Resources/English.lproj/IconsPref.gorm/objects.gorm
-share/GNUstep/System/Applications/GWorkspace.app/Resources/English.lproj/IconsPref.nib/CVS/Entries
-share/GNUstep/System/Applications/GWorkspace.app/Resources/English.lproj/IconsPref.nib/CVS/Repository
-share/GNUstep/System/Applications/GWorkspace.app/Resources/English.lproj/IconsPref.nib/CVS/Root
-share/GNUstep/System/Applications/GWorkspace.app/Resources/English.lproj/IconsPref.nib/classes.nib
-share/GNUstep/System/Applications/GWorkspace.app/Resources/English.lproj/IconsPref.nib/info.nib
-share/GNUstep/System/Applications/GWorkspace.app/Resources/English.lproj/IconsPref.nib/objects.nib
-share/GNUstep/System/Applications/GWorkspace.app/Resources/English.lproj/InspectorsWin.gorm/CVS/Entries
-share/GNUstep/System/Applications/GWorkspace.app/Resources/English.lproj/InspectorsWin.gorm/CVS/Repository
-share/GNUstep/System/Applications/GWorkspace.app/Resources/English.lproj/InspectorsWin.gorm/CVS/Root
-share/GNUstep/System/Applications/GWorkspace.app/Resources/English.lproj/InspectorsWin.gorm/data.classes
-share/GNUstep/System/Applications/GWorkspace.app/Resources/English.lproj/InspectorsWin.gorm/objects.gorm
-share/GNUstep/System/Applications/GWorkspace.app/Resources/English.lproj/InspectorsWin.nib/CVS/Entries
-share/GNUstep/System/Applications/GWorkspace.app/Resources/English.lproj/InspectorsWin.nib/CVS/Repository
-share/GNUstep/System/Applications/GWorkspace.app/Resources/English.lproj/InspectorsWin.nib/CVS/Root
-share/GNUstep/System/Applications/GWorkspace.app/Resources/English.lproj/InspectorsWin.nib/classes.nib
-share/GNUstep/System/Applications/GWorkspace.app/Resources/English.lproj/InspectorsWin.nib/info.nib
-share/GNUstep/System/Applications/GWorkspace.app/Resources/English.lproj/InspectorsWin.nib/objects.nib
-share/GNUstep/System/Applications/GWorkspace.app/Resources/English.lproj/Localizable.strings
-share/GNUstep/System/Applications/GWorkspace.app/Resources/English.lproj/MainMenu-OSX.gsmarkup
-share/GNUstep/System/Applications/GWorkspace.app/Resources/English.lproj/OpenWith.gorm/CVS/Entries
-share/GNUstep/System/Applications/GWorkspace.app/Resources/English.lproj/OpenWith.gorm/CVS/Repository
-share/GNUstep/System/Applications/GWorkspace.app/Resources/English.lproj/OpenWith.gorm/CVS/Root
-share/GNUstep/System/Applications/GWorkspace.app/Resources/English.lproj/OpenWith.gorm/data.classes
-share/GNUstep/System/Applications/GWorkspace.app/Resources/English.lproj/OpenWith.gorm/objects.gorm
-share/GNUstep/System/Applications/GWorkspace.app/Resources/English.lproj/PermissionsPanel.gorm/CVS/Entries
-share/GNUstep/System/Applications/GWorkspace.app/Resources/English.lproj/PermissionsPanel.gorm/CVS/Repository
-share/GNUstep/System/Applications/GWorkspace.app/Resources/English.lproj/PermissionsPanel.gorm/CVS/Root
-share/GNUstep/System/Applications/GWorkspace.app/Resources/English.lproj/PermissionsPanel.gorm/data.classes
-share/GNUstep/System/Applications/GWorkspace.app/Resources/English.lproj/PermissionsPanel.gorm/objects.gorm
-share/GNUstep/System/Applications/GWorkspace.app/Resources/English.lproj/PermissionsPanel.nib/CVS/Entries
-share/GNUstep/System/Applications/GWorkspace.app/Resources/English.lproj/PermissionsPanel.nib/CVS/Repository
-share/GNUstep/System/Applications/GWorkspace.app/Resources/English.lproj/PermissionsPanel.nib/CVS/Root
-share/GNUstep/System/Applications/GWorkspace.app/Resources/English.lproj/PermissionsPanel.nib/classes.nib
-share/GNUstep/System/Applications/GWorkspace.app/Resources/English.lproj/PermissionsPanel.nib/info.nib
-share/GNUstep/System/Applications/GWorkspace.app/Resources/English.lproj/PermissionsPanel.nib/objects.nib
-share/GNUstep/System/Applications/GWorkspace.app/Resources/English.lproj/PrefWindow.gorm/CVS/Entries
-share/GNUstep/System/Applications/GWorkspace.app/Resources/English.lproj/PrefWindow.gorm/CVS/Repository
-share/GNUstep/System/Applications/GWorkspace.app/Resources/English.lproj/PrefWindow.gorm/CVS/Root
-share/GNUstep/System/Applications/GWorkspace.app/Resources/English.lproj/PrefWindow.gorm/data.classes
-share/GNUstep/System/Applications/GWorkspace.app/Resources/English.lproj/PrefWindow.gorm/objects.gorm
-share/GNUstep/System/Applications/GWorkspace.app/Resources/English.lproj/PrefWindow.nib/CVS/Entries
-share/GNUstep/System/Applications/GWorkspace.app/Resources/English.lproj/PrefWindow.nib/CVS/Repository
-share/GNUstep/System/Applications/GWorkspace.app/Resources/English.lproj/PrefWindow.nib/CVS/Root
-share/GNUstep/System/Applications/GWorkspace.app/Resources/English.lproj/PrefWindow.nib/classes.nib
-share/GNUstep/System/Applications/GWorkspace.app/Resources/English.lproj/PrefWindow.nib/info.nib
-share/GNUstep/System/Applications/GWorkspace.app/Resources/English.lproj/PrefWindow.nib/objects.nib
-share/GNUstep/System/Applications/GWorkspace.app/Resources/English.lproj/RunExternal.gorm/CVS/Entries
-share/GNUstep/System/Applications/GWorkspace.app/Resources/English.lproj/RunExternal.gorm/CVS/Repository
-share/GNUstep/System/Applications/GWorkspace.app/Resources/English.lproj/RunExternal.gorm/CVS/Root
-share/GNUstep/System/Applications/GWorkspace.app/Resources/English.lproj/RunExternal.gorm/data.classes
-share/GNUstep/System/Applications/GWorkspace.app/Resources/English.lproj/RunExternal.gorm/objects.gorm
-share/GNUstep/System/Applications/GWorkspace.app/Resources/English.lproj/ShelfPref.gorm/CVS/Entries
-share/GNUstep/System/Applications/GWorkspace.app/Resources/English.lproj/ShelfPref.gorm/CVS/Repository
-share/GNUstep/System/Applications/GWorkspace.app/Resources/English.lproj/ShelfPref.gorm/CVS/Root
-share/GNUstep/System/Applications/GWorkspace.app/Resources/English.lproj/ShelfPref.gorm/data.classes
-share/GNUstep/System/Applications/GWorkspace.app/Resources/English.lproj/ShelfPref.gorm/objects.gorm
-share/GNUstep/System/Applications/GWorkspace.app/Resources/English.lproj/ShelfPref.nib/CVS/Entries
-share/GNUstep/System/Applications/GWorkspace.app/Resources/English.lproj/ShelfPref.nib/CVS/Repository
-share/GNUstep/System/Applications/GWorkspace.app/Resources/English.lproj/ShelfPref.nib/CVS/Root
-share/GNUstep/System/Applications/GWorkspace.app/Resources/English.lproj/ShelfPref.nib/classes.nib
-share/GNUstep/System/Applications/GWorkspace.app/Resources/English.lproj/ShelfPref.nib/info.nib
-share/GNUstep/System/Applications/GWorkspace.app/Resources/English.lproj/ShelfPref.nib/objects.nib
-share/GNUstep/System/Applications/GWorkspace.app/Resources/English.lproj/ToolsPanel.gorm/CVS/Entries
-share/GNUstep/System/Applications/GWorkspace.app/Resources/English.lproj/ToolsPanel.gorm/CVS/Repository
-share/GNUstep/System/Applications/GWorkspace.app/Resources/English.lproj/ToolsPanel.gorm/CVS/Root
-share/GNUstep/System/Applications/GWorkspace.app/Resources/English.lproj/ToolsPanel.gorm/data.classes
-share/GNUstep/System/Applications/GWorkspace.app/Resources/English.lproj/ToolsPanel.gorm/objects.gorm
-share/GNUstep/System/Applications/GWorkspace.app/Resources/English.lproj/ToolsPanel.nib/CVS/Entries
-share/GNUstep/System/Applications/GWorkspace.app/Resources/English.lproj/ToolsPanel.nib/CVS/Repository
-share/GNUstep/System/Applications/GWorkspace.app/Resources/English.lproj/ToolsPanel.nib/CVS/Root
-share/GNUstep/System/Applications/GWorkspace.app/Resources/English.lproj/ToolsPanel.nib/classes.nib
-share/GNUstep/System/Applications/GWorkspace.app/Resources/English.lproj/ToolsPanel.nib/info.nib
-share/GNUstep/System/Applications/GWorkspace.app/Resources/English.lproj/ToolsPanel.nib/objects.nib
-share/GNUstep/System/Applications/GWorkspace.app/Resources/English.lproj/XTermPref.gorm/CVS/Entries
-share/GNUstep/System/Applications/GWorkspace.app/Resources/English.lproj/XTermPref.gorm/CVS/Repository
-share/GNUstep/System/Applications/GWorkspace.app/Resources/English.lproj/XTermPref.gorm/CVS/Root
-share/GNUstep/System/Applications/GWorkspace.app/Resources/English.lproj/XTermPref.gorm/data.classes
-share/GNUstep/System/Applications/GWorkspace.app/Resources/English.lproj/XTermPref.gorm/objects.gorm
-share/GNUstep/System/Applications/GWorkspace.app/Resources/English.lproj/XTermPref.nib/CVS/Entries
-share/GNUstep/System/Applications/GWorkspace.app/Resources/English.lproj/XTermPref.nib/CVS/Repository
-share/GNUstep/System/Applications/GWorkspace.app/Resources/English.lproj/XTermPref.nib/CVS/Root
-share/GNUstep/System/Applications/GWorkspace.app/Resources/English.lproj/XTermPref.nib/classes.nib
-share/GNUstep/System/Applications/GWorkspace.app/Resources/English.lproj/XTermPref.nib/info.nib
-share/GNUstep/System/Applications/GWorkspace.app/Resources/English.lproj/XTermPref.nib/objects.nib
-share/GNUstep/System/Applications/GWorkspace.app/Resources/FFArrow.tiff
-share/GNUstep/System/Applications/GWorkspace.app/Resources/FileIcon_Directory.tiff
-share/GNUstep/System/Applications/GWorkspace.app/Resources/FileIcon_Directory_Open.tiff
-share/GNUstep/System/Applications/GWorkspace.app/Resources/FileIcon_Directory_Open_Small.tiff
-share/GNUstep/System/Applications/GWorkspace.app/Resources/FileIcon_Directory_Open_Small_alt.tiff
-share/GNUstep/System/Applications/GWorkspace.app/Resources/FileIcon_Directory_Open_alt.tiff
-share/GNUstep/System/Applications/GWorkspace.app/Resources/FileManager.tiff
-share/GNUstep/System/Applications/GWorkspace.app/Resources/FolderViewer.inspector/Resources/Info-gnustep.plist
-share/GNUstep/System/Applications/GWorkspace.app/Resources/FolderViewer.inspector/Resources/InspectorInfo.plist
-share/GNUstep/System/Applications/GWorkspace.app/Resources/FolderViewer.inspector/${GNUSTEP_HOST_CPU}/${GNUSTEP_HOST_OS}/gnu-gnu-gnu/FolderViewer
-share/GNUstep/System/Applications/GWorkspace.app/Resources/FolderViewer.inspector/stamp.make
-share/GNUstep/System/Applications/GWorkspace.app/Resources/French.lproj/CVS/Entries
-share/GNUstep/System/Applications/GWorkspace.app/Resources/French.lproj/CVS/Repository
-share/GNUstep/System/Applications/GWorkspace.app/Resources/French.lproj/CVS/Root
-share/GNUstep/System/Applications/GWorkspace.app/Resources/French.lproj/Finder.gorm/CVS/Entries
-share/GNUstep/System/Applications/GWorkspace.app/Resources/French.lproj/Finder.gorm/CVS/Repository
-share/GNUstep/System/Applications/GWorkspace.app/Resources/French.lproj/Finder.gorm/CVS/Root
-share/GNUstep/System/Applications/GWorkspace.app/Resources/French.lproj/Finder.gorm/data.classes
-share/GNUstep/System/Applications/GWorkspace.app/Resources/French.lproj/Finder.gorm/objects.gorm
-share/GNUstep/System/Applications/GWorkspace.app/Resources/French.lproj/Finder.nib/CVS/Entries
-share/GNUstep/System/Applications/GWorkspace.app/Resources/French.lproj/Finder.nib/CVS/Repository
-share/GNUstep/System/Applications/GWorkspace.app/Resources/French.lproj/Finder.nib/CVS/Root
-share/GNUstep/System/Applications/GWorkspace.app/Resources/French.lproj/Finder.nib/classes.nib
-share/GNUstep/System/Applications/GWorkspace.app/Resources/French.lproj/Finder.nib/info.nib
-share/GNUstep/System/Applications/GWorkspace.app/Resources/French.lproj/Finder.nib/objects.nib
-share/GNUstep/System/Applications/GWorkspace.app/Resources/French.lproj/Localizable.strings
-share/GNUstep/System/Applications/GWorkspace.app/Resources/French.lproj/MainMenu-OSX.gsmarkup
-share/GNUstep/System/Applications/GWorkspace.app/Resources/GWorkspace.desktop
-share/GNUstep/System/Applications/GWorkspace.app/Resources/German.lproj/CVS/Entries
-share/GNUstep/System/Applications/GWorkspace.app/Resources/German.lproj/CVS/Repository
-share/GNUstep/System/Applications/GWorkspace.app/Resources/German.lproj/CVS/Root
-share/GNUstep/System/Applications/GWorkspace.app/Resources/German.lproj/Finder.gorm/CVS/Entries
-share/GNUstep/System/Applications/GWorkspace.app/Resources/German.lproj/Finder.gorm/CVS/Repository
-share/GNUstep/System/Applications/GWorkspace.app/Resources/German.lproj/Finder.gorm/CVS/Root
-share/GNUstep/System/Applications/GWorkspace.app/Resources/German.lproj/Finder.gorm/data.classes
-share/GNUstep/System/Applications/GWorkspace.app/Resources/German.lproj/Finder.gorm/objects.gorm
-share/GNUstep/System/Applications/GWorkspace.app/Resources/German.lproj/Finder.nib/CVS/Entries
-share/GNUstep/System/Applications/GWorkspace.app/Resources/German.lproj/Finder.nib/CVS/Repository
-share/GNUstep/System/Applications/GWorkspace.app/Resources/German.lproj/Finder.nib/CVS/Root
-share/GNUstep/System/Applications/GWorkspace.app/Resources/German.lproj/Finder.nib/classes.nib
-share/GNUstep/System/Applications/GWorkspace.app/Resources/German.lproj/Finder.nib/info.nib
-share/GNUstep/System/Applications/GWorkspace.app/Resources/German.lproj/Finder.nib/objects.nib
-share/GNUstep/System/Applications/GWorkspace.app/Resources/German.lproj/Localizable.strings
-share/GNUstep/System/Applications/GWorkspace.app/Resources/German.lproj/MainMenu-OSX.gsmarkup
-share/GNUstep/System/Applications/GWorkspace.app/Resources/IconsViewer.viewer/Resources/CVS/Entries
-share/GNUstep/System/Applications/GWorkspace.app/Resources/IconsViewer.viewer/Resources/CVS/Repository
-share/GNUstep/System/Applications/GWorkspace.app/Resources/IconsViewer.viewer/Resources/CVS/Root
-share/GNUstep/System/Applications/GWorkspace.app/Resources/IconsViewer.viewer/Resources/Dutch.lproj/CVS/Entries
-share/GNUstep/System/Applications/GWorkspace.app/Resources/IconsViewer.viewer/Resources/Dutch.lproj/CVS/Repository
-share/GNUstep/System/Applications/GWorkspace.app/Resources/IconsViewer.viewer/Resources/Dutch.lproj/CVS/Root
-share/GNUstep/System/Applications/GWorkspace.app/Resources/IconsViewer.viewer/Resources/English.lproj/CVS/Entries
-share/GNUstep/System/Applications/GWorkspace.app/Resources/IconsViewer.viewer/Resources/English.lproj/CVS/Repository
-share/GNUstep/System/Applications/GWorkspace.app/Resources/IconsViewer.viewer/Resources/English.lproj/CVS/Root
-share/GNUstep/System/Applications/GWorkspace.app/Resources/IconsViewer.viewer/Resources/English.lproj/IconsViewPref.gorm/CVS/Entries
-share/GNUstep/System/Applications/GWorkspace.app/Resources/IconsViewer.viewer/Resources/English.lproj/IconsViewPref.gorm/CVS/Repository
-share/GNUstep/System/Applications/GWorkspace.app/Resources/IconsViewer.viewer/Resources/English.lproj/IconsViewPref.gorm/CVS/Root
-share/GNUstep/System/Applications/GWorkspace.app/Resources/IconsViewer.viewer/Resources/English.lproj/IconsViewerPref.gorm/CVS/Entries
-share/GNUstep/System/Applications/GWorkspace.app/Resources/IconsViewer.viewer/Resources/English.lproj/IconsViewerPref.gorm/CVS/Repository
-share/GNUstep/System/Applications/GWorkspace.app/Resources/IconsViewer.viewer/Resources/English.lproj/IconsViewerPref.gorm/CVS/Root
-share/GNUstep/System/Applications/GWorkspace.app/Resources/IconsViewer.viewer/Resources/English.lproj/IconsViewerPref.gorm/data.classes
-share/GNUstep/System/Applications/GWorkspace.app/Resources/IconsViewer.viewer/Resources/English.lproj/IconsViewerPref.gorm/objects.gorm
-share/GNUstep/System/Applications/GWorkspace.app/Resources/IconsViewer.viewer/Resources/English.lproj/IconsViewerPref.nib/CVS/Entries
-share/GNUstep/System/Applications/GWorkspace.app/Resources/IconsViewer.viewer/Resources/English.lproj/IconsViewerPref.nib/CVS/Repository
-share/GNUstep/System/Applications/GWorkspace.app/Resources/IconsViewer.viewer/Resources/English.lproj/IconsViewerPref.nib/CVS/Root
-share/GNUstep/System/Applications/GWorkspace.app/Resources/IconsViewer.viewer/Resources/English.lproj/IconsViewerPref.nib/classes.nib
-share/GNUstep/System/Applications/GWorkspace.app/Resources/IconsViewer.viewer/Resources/English.lproj/IconsViewerPref.nib/info.nib
-share/GNUstep/System/Applications/GWorkspace.app/Resources/IconsViewer.viewer/Resources/English.lproj/IconsViewerPref.nib/objects.nib
-share/GNUstep/System/Applications/GWorkspace.app/Resources/IconsViewer.viewer/Resources/French.lproj/CVS/Entries
-share/GNUstep/System/Applications/GWorkspace.app/Resources/IconsViewer.viewer/Resources/French.lproj/CVS/Repository
-share/GNUstep/System/Applications/GWorkspace.app/Resources/IconsViewer.viewer/Resources/French.lproj/CVS/Root
-share/GNUstep/System/Applications/GWorkspace.app/Resources/IconsViewer.viewer/Resources/German.lproj/CVS/Entries
-share/GNUstep/System/Applications/GWorkspace.app/Resources/IconsViewer.viewer/Resources/German.lproj/CVS/Repository
-share/GNUstep/System/Applications/GWorkspace.app/Resources/IconsViewer.viewer/Resources/German.lproj/CVS/Root
-share/GNUstep/System/Applications/GWorkspace.app/Resources/IconsViewer.viewer/Resources/Info-gnustep.plist
-share/GNUstep/System/Applications/GWorkspace.app/Resources/IconsViewer.viewer/Resources/Italian.lproj/CVS/Entries
-share/GNUstep/System/Applications/GWorkspace.app/Resources/IconsViewer.viewer/Resources/Italian.lproj/CVS/Repository
-share/GNUstep/System/Applications/GWorkspace.app/Resources/IconsViewer.viewer/Resources/Italian.lproj/CVS/Root
-share/GNUstep/System/Applications/GWorkspace.app/Resources/IconsViewer.viewer/Resources/Portuguese.lproj/CVS/Entries
-share/GNUstep/System/Applications/GWorkspace.app/Resources/IconsViewer.viewer/Resources/Portuguese.lproj/CVS/Repository
-share/GNUstep/System/Applications/GWorkspace.app/Resources/IconsViewer.viewer/Resources/Portuguese.lproj/CVS/Root
-share/GNUstep/System/Applications/GWorkspace.app/Resources/IconsViewer.viewer/Resources/Resources/English.lproj/IconsViewerPref.gorm/CVS/Entries
-share/GNUstep/System/Applications/GWorkspace.app/Resources/IconsViewer.viewer/Resources/Resources/English.lproj/IconsViewerPref.gorm/CVS/Repository
-share/GNUstep/System/Applications/GWorkspace.app/Resources/IconsViewer.viewer/Resources/Resources/English.lproj/IconsViewerPref.gorm/CVS/Root
-share/GNUstep/System/Applications/GWorkspace.app/Resources/IconsViewer.viewer/Resources/Resources/English.lproj/IconsViewerPref.gorm/data.classes
-share/GNUstep/System/Applications/GWorkspace.app/Resources/IconsViewer.viewer/Resources/Resources/English.lproj/IconsViewerPref.gorm/objects.gorm
-share/GNUstep/System/Applications/GWorkspace.app/Resources/IconsViewer.viewer/Resources/Romanian.lproj/CVS/Entries
-share/GNUstep/System/Applications/GWorkspace.app/Resources/IconsViewer.viewer/Resources/Romanian.lproj/CVS/Repository
-share/GNUstep/System/Applications/GWorkspace.app/Resources/IconsViewer.viewer/Resources/Romanian.lproj/CVS/Root
-share/GNUstep/System/Applications/GWorkspace.app/Resources/IconsViewer.viewer/Resources/Spanish.lproj/CVS/Entries
-share/GNUstep/System/Applications/GWorkspace.app/Resources/IconsViewer.viewer/Resources/Spanish.lproj/CVS/Repository
-share/GNUstep/System/Applications/GWorkspace.app/Resources/IconsViewer.viewer/Resources/Spanish.lproj/CVS/Root
-share/GNUstep/System/Applications/GWorkspace.app/Resources/IconsViewer.viewer/Resources/miniwindow.tiff
-share/GNUstep/System/Applications/GWorkspace.app/Resources/IconsViewer.viewer/${GNUSTEP_HOST_CPU}/${GNUSTEP_HOST_OS}/gnu-gnu-gnu/IconsViewer
-share/GNUstep/System/Applications/GWorkspace.app/Resources/IconsViewer.viewer/stamp.make
-share/GNUstep/System/Applications/GWorkspace.app/Resources/ImageViewer.inspector/Resources/Info-gnustep.plist
-share/GNUstep/System/Applications/GWorkspace.app/Resources/ImageViewer.inspector/Resources/InspectorInfo.plist
-share/GNUstep/System/Applications/GWorkspace.app/Resources/ImageViewer.inspector/${GNUSTEP_HOST_CPU}/${GNUSTEP_HOST_OS}/gnu-gnu-gnu/ImageViewer
-share/GNUstep/System/Applications/GWorkspace.app/Resources/ImageViewer.inspector/stamp.make
-share/GNUstep/System/Applications/GWorkspace.app/Resources/Info-gnustep.plist
-share/GNUstep/System/Applications/GWorkspace.app/Resources/InspectorViewer.inspector/Resources/Info-gnustep.plist
-share/GNUstep/System/Applications/GWorkspace.app/Resources/InspectorViewer.inspector/Resources/InspectorInfo.plist
-share/GNUstep/System/Applications/GWorkspace.app/Resources/InspectorViewer.inspector/${GNUSTEP_HOST_CPU}/${GNUSTEP_HOST_OS}/gnu-gnu-gnu/InspectorViewer
-share/GNUstep/System/Applications/GWorkspace.app/Resources/InspectorViewer.inspector/stamp.make
-share/GNUstep/System/Applications/GWorkspace.app/Resources/Italian.lproj/CVS/Entries
-share/GNUstep/System/Applications/GWorkspace.app/Resources/Italian.lproj/CVS/Repository
-share/GNUstep/System/Applications/GWorkspace.app/Resources/Italian.lproj/CVS/Root
-share/GNUstep/System/Applications/GWorkspace.app/Resources/Italian.lproj/Finder.gorm/CVS/Entries
-share/GNUstep/System/Applications/GWorkspace.app/Resources/Italian.lproj/Finder.gorm/CVS/Repository
-share/GNUstep/System/Applications/GWorkspace.app/Resources/Italian.lproj/Finder.gorm/CVS/Root
-share/GNUstep/System/Applications/GWorkspace.app/Resources/Italian.lproj/Finder.gorm/data.classes
-share/GNUstep/System/Applications/GWorkspace.app/Resources/Italian.lproj/Finder.gorm/objects.gorm
-share/GNUstep/System/Applications/GWorkspace.app/Resources/Italian.lproj/Finder.nib/CVS/Entries
-share/GNUstep/System/Applications/GWorkspace.app/Resources/Italian.lproj/Finder.nib/CVS/Repository
-share/GNUstep/System/Applications/GWorkspace.app/Resources/Italian.lproj/Finder.nib/CVS/Root
-share/GNUstep/System/Applications/GWorkspace.app/Resources/Italian.lproj/Finder.nib/classes.nib
-share/GNUstep/System/Applications/GWorkspace.app/Resources/Italian.lproj/Finder.nib/info.nib
-share/GNUstep/System/Applications/GWorkspace.app/Resources/Italian.lproj/Finder.nib/objects.nib
-share/GNUstep/System/Applications/GWorkspace.app/Resources/Italian.lproj/Localizable.strings
-share/GNUstep/System/Applications/GWorkspace.app/Resources/Italian.lproj/MainMenu-OSX.gsmarkup
-share/GNUstep/System/Applications/GWorkspace.app/Resources/Kill.tiff
-share/GNUstep/System/Applications/GWorkspace.app/Resources/LED-0.tiff
-share/GNUstep/System/Applications/GWorkspace.app/Resources/LED-1.tiff
-share/GNUstep/System/Applications/GWorkspace.app/Resources/LED-2.tiff
-share/GNUstep/System/Applications/GWorkspace.app/Resources/LED-3.tiff
-share/GNUstep/System/Applications/GWorkspace.app/Resources/LED-4.tiff
-share/GNUstep/System/Applications/GWorkspace.app/Resources/LED-5.tiff
-share/GNUstep/System/Applications/GWorkspace.app/Resources/LED-6.tiff
-share/GNUstep/System/Applications/GWorkspace.app/Resources/LED-7.tiff
-share/GNUstep/System/Applications/GWorkspace.app/Resources/LED-8.tiff
-share/GNUstep/System/Applications/GWorkspace.app/Resources/LED-9.tiff
-share/GNUstep/System/Applications/GWorkspace.app/Resources/LED-AM.tiff
-share/GNUstep/System/Applications/GWorkspace.app/Resources/LED-Colon.tiff
-share/GNUstep/System/Applications/GWorkspace.app/Resources/LED-PM.tiff
-share/GNUstep/System/Applications/GWorkspace.app/Resources/LED.tiff
-share/GNUstep/System/Applications/GWorkspace.app/Resources/LeftArr.tiff
-share/GNUstep/System/Applications/GWorkspace.app/Resources/Magnify.tiff
-share/GNUstep/System/Applications/GWorkspace.app/Resources/MagnifyGlas.tiff
-share/GNUstep/System/Applications/GWorkspace.app/Resources/Magnify_16.tiff
-share/GNUstep/System/Applications/GWorkspace.app/Resources/Magnify_24.tiff
-share/GNUstep/System/Applications/GWorkspace.app/Resources/Magnify_32.tiff
-share/GNUstep/System/Applications/GWorkspace.app/Resources/Magnify_48.tiff
-share/GNUstep/System/Applications/GWorkspace.app/Resources/Mask.tiff
-share/GNUstep/System/Applications/GWorkspace.app/Resources/Month-1.tiff
-share/GNUstep/System/Applications/GWorkspace.app/Resources/Month-10.tiff
-share/GNUstep/System/Applications/GWorkspace.app/Resources/Month-11.tiff
-share/GNUstep/System/Applications/GWorkspace.app/Resources/Month-12.tiff
-share/GNUstep/System/Applications/GWorkspace.app/Resources/Month-2.tiff
-share/GNUstep/System/Applications/GWorkspace.app/Resources/Month-3.tiff
-share/GNUstep/System/Applications/GWorkspace.app/Resources/Month-4.tiff
-share/GNUstep/System/Applications/GWorkspace.app/Resources/Month-5.tiff
-share/GNUstep/System/Applications/GWorkspace.app/Resources/Month-6.tiff
-share/GNUstep/System/Applications/GWorkspace.app/Resources/Month-7.tiff
-share/GNUstep/System/Applications/GWorkspace.app/Resources/Month-8.tiff
-share/GNUstep/System/Applications/GWorkspace.app/Resources/Month-9.tiff
-share/GNUstep/System/Applications/GWorkspace.app/Resources/Month.tiff
-share/GNUstep/System/Applications/GWorkspace.app/Resources/MultipleSelection.tiff
-share/GNUstep/System/Applications/GWorkspace.app/Resources/PdfViewer.inspector/Resources/CVS/Entries
-share/GNUstep/System/Applications/GWorkspace.app/Resources/PdfViewer.inspector/Resources/CVS/Repository
-share/GNUstep/System/Applications/GWorkspace.app/Resources/PdfViewer.inspector/Resources/CVS/Root
-share/GNUstep/System/Applications/GWorkspace.app/Resources/PdfViewer.inspector/Resources/Info-gnustep.plist
-share/GNUstep/System/Applications/GWorkspace.app/Resources/PdfViewer.inspector/Resources/InspectorInfo.plist
-share/GNUstep/System/Applications/GWorkspace.app/Resources/PdfViewer.inspector/Resources/left.tiff
-share/GNUstep/System/Applications/GWorkspace.app/Resources/PdfViewer.inspector/Resources/page.tiff
-share/GNUstep/System/Applications/GWorkspace.app/Resources/PdfViewer.inspector/Resources/papersizes.plist
-share/GNUstep/System/Applications/GWorkspace.app/Resources/PdfViewer.inspector/Resources/pause.tiff
-share/GNUstep/System/Applications/GWorkspace.app/Resources/PdfViewer.inspector/Resources/play.tiff
-share/GNUstep/System/Applications/GWorkspace.app/Resources/PdfViewer.inspector/Resources/right.tiff
-share/GNUstep/System/Applications/GWorkspace.app/Resources/PdfViewer.inspector/Resources/stop.tiff
-share/GNUstep/System/Applications/GWorkspace.app/Resources/PdfViewer.inspector/${GNUSTEP_HOST_CPU}/${GNUSTEP_HOST_OS}/gnu-gnu-gnu/PdfViewer
-share/GNUstep/System/Applications/GWorkspace.app/Resources/PdfViewer.inspector/stamp.make
-share/GNUstep/System/Applications/GWorkspace.app/Resources/PlistViewer.inspector/Resources/Info-gnustep.plist
-share/GNUstep/System/Applications/GWorkspace.app/Resources/PlistViewer.inspector/Resources/InspectorInfo.plist
-share/GNUstep/System/Applications/GWorkspace.app/Resources/PlistViewer.inspector/${GNUSTEP_HOST_CPU}/${GNUSTEP_HOST_OS}/gnu-gnu-gnu/PlistViewer
-share/GNUstep/System/Applications/GWorkspace.app/Resources/PlistViewer.inspector/stamp.make
-share/GNUstep/System/Applications/GWorkspace.app/Resources/Portuguese.lproj/CVS/Entries
-share/GNUstep/System/Applications/GWorkspace.app/Resources/Portuguese.lproj/CVS/Repository
-share/GNUstep/System/Applications/GWorkspace.app/Resources/Portuguese.lproj/CVS/Root
-share/GNUstep/System/Applications/GWorkspace.app/Resources/Portuguese.lproj/Finder.gorm/CVS/Entries
-share/GNUstep/System/Applications/GWorkspace.app/Resources/Portuguese.lproj/Finder.gorm/CVS/Repository
-share/GNUstep/System/Applications/GWorkspace.app/Resources/Portuguese.lproj/Finder.gorm/CVS/Root
-share/GNUstep/System/Applications/GWorkspace.app/Resources/Portuguese.lproj/Finder.gorm/data.classes
-share/GNUstep/System/Applications/GWorkspace.app/Resources/Portuguese.lproj/Finder.gorm/objects.gorm
-share/GNUstep/System/Applications/GWorkspace.app/Resources/Portuguese.lproj/Finder.nib/CVS/Entries
-share/GNUstep/System/Applications/GWorkspace.app/Resources/Portuguese.lproj/Finder.nib/CVS/Repository
-share/GNUstep/System/Applications/GWorkspace.app/Resources/Portuguese.lproj/Finder.nib/CVS/Root
-share/GNUstep/System/Applications/GWorkspace.app/Resources/Portuguese.lproj/Finder.nib/classes.nib
-share/GNUstep/System/Applications/GWorkspace.app/Resources/Portuguese.lproj/Finder.nib/info.nib
-share/GNUstep/System/Applications/GWorkspace.app/Resources/Portuguese.lproj/Finder.nib/objects.nib
-share/GNUstep/System/Applications/GWorkspace.app/Resources/Portuguese.lproj/Localizable.strings
-share/GNUstep/System/Applications/GWorkspace.app/Resources/Portuguese.lproj/MainMenu-OSX.gsmarkup
-share/GNUstep/System/Applications/GWorkspace.app/Resources/REWArrow.tiff
-share/GNUstep/System/Applications/GWorkspace.app/Resources/Recycler.tiff
-share/GNUstep/System/Applications/GWorkspace.app/Resources/RecyclerFull.tiff
-share/GNUstep/System/Applications/GWorkspace.app/Resources/Resources/Dutch.lproj/Finder.gorm/CVS/Entries
-share/GNUstep/System/Applications/GWorkspace.app/Resources/Resources/Dutch.lproj/Finder.gorm/CVS/Repository
-share/GNUstep/System/Applications/GWorkspace.app/Resources/Resources/Dutch.lproj/Finder.gorm/CVS/Root
-share/GNUstep/System/Applications/GWorkspace.app/Resources/Resources/Dutch.lproj/Finder.gorm/data.classes
-share/GNUstep/System/Applications/GWorkspace.app/Resources/Resources/Dutch.lproj/Finder.gorm/objects.gorm
-share/GNUstep/System/Applications/GWorkspace.app/Resources/Resources/Dutch.lproj/Localizable.strings
-share/GNUstep/System/Applications/GWorkspace.app/Resources/Resources/English.lproj/AttributesPanel.gorm/CVS/Entries
-share/GNUstep/System/Applications/GWorkspace.app/Resources/Resources/English.lproj/AttributesPanel.gorm/CVS/Repository
-share/GNUstep/System/Applications/GWorkspace.app/Resources/Resources/English.lproj/AttributesPanel.gorm/CVS/Root
-share/GNUstep/System/Applications/GWorkspace.app/Resources/Resources/English.lproj/AttributesPanel.gorm/data.classes
-share/GNUstep/System/Applications/GWorkspace.app/Resources/Resources/English.lproj/AttributesPanel.gorm/objects.gorm
-share/GNUstep/System/Applications/GWorkspace.app/Resources/Resources/English.lproj/ContentsPanel.gorm/CVS/Entries
-share/GNUstep/System/Applications/GWorkspace.app/Resources/Resources/English.lproj/ContentsPanel.gorm/CVS/Repository
-share/GNUstep/System/Applications/GWorkspace.app/Resources/Resources/English.lproj/ContentsPanel.gorm/CVS/Root
-share/GNUstep/System/Applications/GWorkspace.app/Resources/Resources/English.lproj/ContentsPanel.gorm/data.classes
-share/GNUstep/System/Applications/GWorkspace.app/Resources/Resources/English.lproj/ContentsPanel.gorm/objects.gorm
-share/GNUstep/System/Applications/GWorkspace.app/Resources/Resources/English.lproj/DefEditorPref.gorm/CVS/Entries
-share/GNUstep/System/Applications/GWorkspace.app/Resources/Resources/English.lproj/DefEditorPref.gorm/CVS/Repository
-share/GNUstep/System/Applications/GWorkspace.app/Resources/Resources/English.lproj/DefEditorPref.gorm/CVS/Root
-share/GNUstep/System/Applications/GWorkspace.app/Resources/Resources/English.lproj/DefEditorPref.gorm/data.classes
-share/GNUstep/System/Applications/GWorkspace.app/Resources/Resources/English.lproj/DefEditorPref.gorm/objects.gorm
-share/GNUstep/System/Applications/GWorkspace.app/Resources/Resources/English.lproj/DefSortOrderPref.gorm/CVS/Entries
-share/GNUstep/System/Applications/GWorkspace.app/Resources/Resources/English.lproj/DefSortOrderPref.gorm/CVS/Repository
-share/GNUstep/System/Applications/GWorkspace.app/Resources/Resources/English.lproj/DefSortOrderPref.gorm/CVS/Root
-share/GNUstep/System/Applications/GWorkspace.app/Resources/Resources/English.lproj/DefSortOrderPref.gorm/data.classes
-share/GNUstep/System/Applications/GWorkspace.app/Resources/Resources/English.lproj/DefSortOrderPref.gorm/objects.gorm
-share/GNUstep/System/Applications/GWorkspace.app/Resources/Resources/English.lproj/DeskTopPref.gorm/.gwdir
-share/GNUstep/System/Applications/GWorkspace.app/Resources/Resources/English.lproj/DeskTopPref.gorm/CVS/Entries
-share/GNUstep/System/Applications/GWorkspace.app/Resources/Resources/English.lproj/DeskTopPref.gorm/CVS/Repository
-share/GNUstep/System/Applications/GWorkspace.app/Resources/Resources/English.lproj/DeskTopPref.gorm/CVS/Root
-share/GNUstep/System/Applications/GWorkspace.app/Resources/Resources/English.lproj/DeskTopPref.gorm/data.classes
-share/GNUstep/System/Applications/GWorkspace.app/Resources/Resources/English.lproj/DeskTopPref.gorm/objects.gorm
-share/GNUstep/System/Applications/GWorkspace.app/Resources/Resources/English.lproj/FileOperationWin.gorm/CVS/Entries
-share/GNUstep/System/Applications/GWorkspace.app/Resources/Resources/English.lproj/FileOperationWin.gorm/CVS/Repository
-share/GNUstep/System/Applications/GWorkspace.app/Resources/Resources/English.lproj/FileOperationWin.gorm/CVS/Root
-share/GNUstep/System/Applications/GWorkspace.app/Resources/Resources/English.lproj/FileOperationWin.gorm/data.classes
-share/GNUstep/System/Applications/GWorkspace.app/Resources/Resources/English.lproj/FileOperationWin.gorm/objects.gorm
-share/GNUstep/System/Applications/GWorkspace.app/Resources/Resources/English.lproj/FileOpsPref.gorm/CVS/Entries
-share/GNUstep/System/Applications/GWorkspace.app/Resources/Resources/English.lproj/FileOpsPref.gorm/CVS/Repository
-share/GNUstep/System/Applications/GWorkspace.app/Resources/Resources/English.lproj/FileOpsPref.gorm/CVS/Root
-share/GNUstep/System/Applications/GWorkspace.app/Resources/Resources/English.lproj/FileOpsPref.gorm/data.classes
-share/GNUstep/System/Applications/GWorkspace.app/Resources/Resources/English.lproj/FileOpsPref.gorm/objects.gorm
-share/GNUstep/System/Applications/GWorkspace.app/Resources/Resources/English.lproj/Finder.gorm/CVS/Entries
-share/GNUstep/System/Applications/GWorkspace.app/Resources/Resources/English.lproj/Finder.gorm/CVS/Repository
-share/GNUstep/System/Applications/GWorkspace.app/Resources/Resources/English.lproj/Finder.gorm/CVS/Root
-share/GNUstep/System/Applications/GWorkspace.app/Resources/Resources/English.lproj/Finder.gorm/data.classes
-share/GNUstep/System/Applications/GWorkspace.app/Resources/Resources/English.lproj/Finder.gorm/objects.gorm
-share/GNUstep/System/Applications/GWorkspace.app/Resources/Resources/English.lproj/HiddenFilesPref.gorm/CVS/Entries
-share/GNUstep/System/Applications/GWorkspace.app/Resources/Resources/English.lproj/HiddenFilesPref.gorm/CVS/Repository
-share/GNUstep/System/Applications/GWorkspace.app/Resources/Resources/English.lproj/HiddenFilesPref.gorm/CVS/Root
-share/GNUstep/System/Applications/GWorkspace.app/Resources/Resources/English.lproj/HiddenFilesPref.gorm/data.classes
-share/GNUstep/System/Applications/GWorkspace.app/Resources/Resources/English.lproj/HiddenFilesPref.gorm/objects.gorm
-share/GNUstep/System/Applications/GWorkspace.app/Resources/Resources/English.lproj/IconsPref.gorm/CVS/Entries
-share/GNUstep/System/Applications/GWorkspace.app/Resources/Resources/English.lproj/IconsPref.gorm/CVS/Repository
-share/GNUstep/System/Applications/GWorkspace.app/Resources/Resources/English.lproj/IconsPref.gorm/CVS/Root
-share/GNUstep/System/Applications/GWorkspace.app/Resources/Resources/English.lproj/IconsPref.gorm/data.classes
-share/GNUstep/System/Applications/GWorkspace.app/Resources/Resources/English.lproj/IconsPref.gorm/objects.gorm
-share/GNUstep/System/Applications/GWorkspace.app/Resources/Resources/English.lproj/InspectorsWin.gorm/CVS/Entries
-share/GNUstep/System/Applications/GWorkspace.app/Resources/Resources/English.lproj/InspectorsWin.gorm/CVS/Repository
-share/GNUstep/System/Applications/GWorkspace.app/Resources/Resources/English.lproj/InspectorsWin.gorm/CVS/Root
-share/GNUstep/System/Applications/GWorkspace.app/Resources/Resources/English.lproj/InspectorsWin.gorm/data.classes
-share/GNUstep/System/Applications/GWorkspace.app/Resources/Resources/English.lproj/InspectorsWin.gorm/objects.gorm
-share/GNUstep/System/Applications/GWorkspace.app/Resources/Resources/English.lproj/Localizable.strings
-share/GNUstep/System/Applications/GWorkspace.app/Resources/Resources/English.lproj/OpenWith.gorm/CVS/Entries
-share/GNUstep/System/Applications/GWorkspace.app/Resources/Resources/English.lproj/OpenWith.gorm/CVS/Repository
-share/GNUstep/System/Applications/GWorkspace.app/Resources/Resources/English.lproj/OpenWith.gorm/CVS/Root
-share/GNUstep/System/Applications/GWorkspace.app/Resources/Resources/English.lproj/OpenWith.gorm/data.classes
-share/GNUstep/System/Applications/GWorkspace.app/Resources/Resources/English.lproj/OpenWith.gorm/objects.gorm
-share/GNUstep/System/Applications/GWorkspace.app/Resources/Resources/English.lproj/PermissionsPanel.gorm/CVS/Entries
-share/GNUstep/System/Applications/GWorkspace.app/Resources/Resources/English.lproj/PermissionsPanel.gorm/CVS/Repository
-share/GNUstep/System/Applications/GWorkspace.app/Resources/Resources/English.lproj/PermissionsPanel.gorm/CVS/Root
-share/GNUstep/System/Applications/GWorkspace.app/Resources/Resources/English.lproj/PermissionsPanel.gorm/data.classes
-share/GNUstep/System/Applications/GWorkspace.app/Resources/Resources/English.lproj/PermissionsPanel.gorm/objects.gorm
-share/GNUstep/System/Applications/GWorkspace.app/Resources/Resources/English.lproj/PrefWindow.gorm/CVS/Entries
-share/GNUstep/System/Applications/GWorkspace.app/Resources/Resources/English.lproj/PrefWindow.gorm/CVS/Repository
-share/GNUstep/System/Applications/GWorkspace.app/Resources/Resources/English.lproj/PrefWindow.gorm/CVS/Root
-share/GNUstep/System/Applications/GWorkspace.app/Resources/Resources/English.lproj/PrefWindow.gorm/data.classes
-share/GNUstep/System/Applications/GWorkspace.app/Resources/Resources/English.lproj/PrefWindow.gorm/objects.gorm
-share/GNUstep/System/Applications/GWorkspace.app/Resources/Resources/English.lproj/RunExternal.gorm/CVS/Entries
-share/GNUstep/System/Applications/GWorkspace.app/Resources/Resources/English.lproj/RunExternal.gorm/CVS/Repository
-share/GNUstep/System/Applications/GWorkspace.app/Resources/Resources/English.lproj/RunExternal.gorm/CVS/Root
-share/GNUstep/System/Applications/GWorkspace.app/Resources/Resources/English.lproj/RunExternal.gorm/data.classes
-share/GNUstep/System/Applications/GWorkspace.app/Resources/Resources/English.lproj/RunExternal.gorm/objects.gorm
-share/GNUstep/System/Applications/GWorkspace.app/Resources/Resources/English.lproj/ShelfPref.gorm/CVS/Entries
-share/GNUstep/System/Applications/GWorkspace.app/Resources/Resources/English.lproj/ShelfPref.gorm/CVS/Repository
-share/GNUstep/System/Applications/GWorkspace.app/Resources/Resources/English.lproj/ShelfPref.gorm/CVS/Root
-share/GNUstep/System/Applications/GWorkspace.app/Resources/Resources/English.lproj/ShelfPref.gorm/data.classes
-share/GNUstep/System/Applications/GWorkspace.app/Resources/Resources/English.lproj/ShelfPref.gorm/objects.gorm
-share/GNUstep/System/Applications/GWorkspace.app/Resources/Resources/English.lproj/ToolsPanel.gorm/CVS/Entries
-share/GNUstep/System/Applications/GWorkspace.app/Resources/Resources/English.lproj/ToolsPanel.gorm/CVS/Repository
-share/GNUstep/System/Applications/GWorkspace.app/Resources/Resources/English.lproj/ToolsPanel.gorm/CVS/Root
-share/GNUstep/System/Applications/GWorkspace.app/Resources/Resources/English.lproj/ToolsPanel.gorm/data.classes
-share/GNUstep/System/Applications/GWorkspace.app/Resources/Resources/English.lproj/ToolsPanel.gorm/objects.gorm
-share/GNUstep/System/Applications/GWorkspace.app/Resources/Resources/English.lproj/XTermPref.gorm/CVS/Entries
-share/GNUstep/System/Applications/GWorkspace.app/Resources/Resources/English.lproj/XTermPref.gorm/CVS/Repository
-share/GNUstep/System/Applications/GWorkspace.app/Resources/Resources/English.lproj/XTermPref.gorm/CVS/Root
-share/GNUstep/System/Applications/GWorkspace.app/Resources/Resources/English.lproj/XTermPref.gorm/data.classes
-share/GNUstep/System/Applications/GWorkspace.app/Resources/Resources/English.lproj/XTermPref.gorm/objects.gorm
-share/GNUstep/System/Applications/GWorkspace.app/Resources/Resources/French.lproj/Finder.gorm/CVS/Entries
-share/GNUstep/System/Applications/GWorkspace.app/Resources/Resources/French.lproj/Finder.gorm/CVS/Repository
-share/GNUstep/System/Applications/GWorkspace.app/Resources/Resources/French.lproj/Finder.gorm/CVS/Root
-share/GNUstep/System/Applications/GWorkspace.app/Resources/Resources/French.lproj/Finder.gorm/data.classes
-share/GNUstep/System/Applications/GWorkspace.app/Resources/Resources/French.lproj/Finder.gorm/objects.gorm
-share/GNUstep/System/Applications/GWorkspace.app/Resources/Resources/French.lproj/Localizable.strings
-share/GNUstep/System/Applications/GWorkspace.app/Resources/Resources/German.lproj/Finder.gorm/CVS/Entries
-share/GNUstep/System/Applications/GWorkspace.app/Resources/Resources/German.lproj/Finder.gorm/CVS/Repository
-share/GNUstep/System/Applications/GWorkspace.app/Resources/Resources/German.lproj/Finder.gorm/CVS/Root
-share/GNUstep/System/Applications/GWorkspace.app/Resources/Resources/German.lproj/Finder.gorm/data.classes
-share/GNUstep/System/Applications/GWorkspace.app/Resources/Resources/German.lproj/Finder.gorm/objects.gorm
-share/GNUstep/System/Applications/GWorkspace.app/Resources/Resources/German.lproj/Localizable.strings
-share/GNUstep/System/Applications/GWorkspace.app/Resources/Resources/Italian.lproj/Finder.gorm/CVS/Entries
-share/GNUstep/System/Applications/GWorkspace.app/Resources/Resources/Italian.lproj/Finder.gorm/CVS/Repository
-share/GNUstep/System/Applications/GWorkspace.app/Resources/Resources/Italian.lproj/Finder.gorm/CVS/Root
-share/GNUstep/System/Applications/GWorkspace.app/Resources/Resources/Italian.lproj/Finder.gorm/data.classes
-share/GNUstep/System/Applications/GWorkspace.app/Resources/Resources/Italian.lproj/Finder.gorm/objects.gorm
-share/GNUstep/System/Applications/GWorkspace.app/Resources/Resources/Italian.lproj/Localizable.strings
-share/GNUstep/System/Applications/GWorkspace.app/Resources/Resources/Portuguese.lproj/Finder.gorm/CVS/Entries
-share/GNUstep/System/Applications/GWorkspace.app/Resources/Resources/Portuguese.lproj/Finder.gorm/CVS/Repository
-share/GNUstep/System/Applications/GWorkspace.app/Resources/Resources/Portuguese.lproj/Finder.gorm/CVS/Root
-share/GNUstep/System/Applications/GWorkspace.app/Resources/Resources/Portuguese.lproj/Finder.gorm/data.classes
-share/GNUstep/System/Applications/GWorkspace.app/Resources/Resources/Portuguese.lproj/Finder.gorm/objects.gorm
-share/GNUstep/System/Applications/GWorkspace.app/Resources/Resources/Portuguese.lproj/Localizable.strings
-share/GNUstep/System/Applications/GWorkspace.app/Resources/Resources/Romanian.lproj/Finder.gorm/CVS/Entries
-share/GNUstep/System/Applications/GWorkspace.app/Resources/Resources/Romanian.lproj/Finder.gorm/CVS/Repository
-share/GNUstep/System/Applications/GWorkspace.app/Resources/Resources/Romanian.lproj/Finder.gorm/CVS/Root
-share/GNUstep/System/Applications/GWorkspace.app/Resources/Resources/Romanian.lproj/Finder.gorm/data.classes
-share/GNUstep/System/Applications/GWorkspace.app/Resources/Resources/Romanian.lproj/Finder.gorm/objects.gorm
-share/GNUstep/System/Applications/GWorkspace.app/Resources/Resources/Romanian.lproj/Localizable.strings
-share/GNUstep/System/Applications/GWorkspace.app/Resources/Resources/Spanish.lproj/Finder.gorm/CVS/Entries
-share/GNUstep/System/Applications/GWorkspace.app/Resources/Resources/Spanish.lproj/Finder.gorm/CVS/Repository
-share/GNUstep/System/Applications/GWorkspace.app/Resources/Resources/Spanish.lproj/Finder.gorm/CVS/Root
-share/GNUstep/System/Applications/GWorkspace.app/Resources/Resources/Spanish.lproj/Finder.gorm/data.classes
-share/GNUstep/System/Applications/GWorkspace.app/Resources/Resources/Spanish.lproj/Finder.gorm/objects.gorm
-share/GNUstep/System/Applications/GWorkspace.app/Resources/Resources/Spanish.lproj/Localizable.strings
-share/GNUstep/System/Applications/GWorkspace.app/Resources/RightArr.tiff
-share/GNUstep/System/Applications/GWorkspace.app/Resources/Romanian.lproj/CVS/Entries
-share/GNUstep/System/Applications/GWorkspace.app/Resources/Romanian.lproj/CVS/Repository
-share/GNUstep/System/Applications/GWorkspace.app/Resources/Romanian.lproj/CVS/Root
-share/GNUstep/System/Applications/GWorkspace.app/Resources/Romanian.lproj/Finder.gorm/CVS/Entries
-share/GNUstep/System/Applications/GWorkspace.app/Resources/Romanian.lproj/Finder.gorm/CVS/Repository
-share/GNUstep/System/Applications/GWorkspace.app/Resources/Romanian.lproj/Finder.gorm/CVS/Root
-share/GNUstep/System/Applications/GWorkspace.app/Resources/Romanian.lproj/Finder.gorm/data.classes
-share/GNUstep/System/Applications/GWorkspace.app/Resources/Romanian.lproj/Finder.gorm/objects.gorm
-share/GNUstep/System/Applications/GWorkspace.app/Resources/Romanian.lproj/Finder.nib/CVS/Entries
-share/GNUstep/System/Applications/GWorkspace.app/Resources/Romanian.lproj/Finder.nib/CVS/Repository
-share/GNUstep/System/Applications/GWorkspace.app/Resources/Romanian.lproj/Finder.nib/CVS/Root
-share/GNUstep/System/Applications/GWorkspace.app/Resources/Romanian.lproj/Finder.nib/classes.nib
-share/GNUstep/System/Applications/GWorkspace.app/Resources/Romanian.lproj/Finder.nib/info.nib
-share/GNUstep/System/Applications/GWorkspace.app/Resources/Romanian.lproj/Finder.nib/objects.nib
-share/GNUstep/System/Applications/GWorkspace.app/Resources/Romanian.lproj/Localizable.strings
-share/GNUstep/System/Applications/GWorkspace.app/Resources/Romanian.lproj/MainMenu-OSX.gsmarkup
-share/GNUstep/System/Applications/GWorkspace.app/Resources/RtfViewer.inspector/Resources/Info-gnustep.plist
-share/GNUstep/System/Applications/GWorkspace.app/Resources/RtfViewer.inspector/Resources/InspectorInfo.plist
-share/GNUstep/System/Applications/GWorkspace.app/Resources/RtfViewer.inspector/${GNUSTEP_HOST_CPU}/${GNUSTEP_HOST_OS}/gnu-gnu-gnu/RtfViewer
-share/GNUstep/System/Applications/GWorkspace.app/Resources/RtfViewer.inspector/stamp.make
-share/GNUstep/System/Applications/GWorkspace.app/Resources/SlideMask.tiff
-share/GNUstep/System/Applications/GWorkspace.app/Resources/SmallCellHighlight.tiff
-share/GNUstep/System/Applications/GWorkspace.app/Resources/SmallCellHighlightSmall.tiff
-share/GNUstep/System/Applications/GWorkspace.app/Resources/SmallIconsViewer.viewer/Resources/CVS/Entries
-share/GNUstep/System/Applications/GWorkspace.app/Resources/SmallIconsViewer.viewer/Resources/CVS/Repository
-share/GNUstep/System/Applications/GWorkspace.app/Resources/SmallIconsViewer.viewer/Resources/CVS/Root
-share/GNUstep/System/Applications/GWorkspace.app/Resources/SmallIconsViewer.viewer/Resources/Info-gnustep.plist
-share/GNUstep/System/Applications/GWorkspace.app/Resources/SmallIconsViewer.viewer/Resources/miniwindow.tiff
-share/GNUstep/System/Applications/GWorkspace.app/Resources/SmallIconsViewer.viewer/${GNUSTEP_HOST_CPU}/${GNUSTEP_HOST_OS}/gnu-gnu-gnu/SmallIconsViewer
-share/GNUstep/System/Applications/GWorkspace.app/Resources/SmallIconsViewer.viewer/stamp.make
-share/GNUstep/System/Applications/GWorkspace.app/Resources/SoundViewer.inspector/Resources/CVS/Entries
-share/GNUstep/System/Applications/GWorkspace.app/Resources/SoundViewer.inspector/Resources/CVS/Repository
-share/GNUstep/System/Applications/GWorkspace.app/Resources/SoundViewer.inspector/Resources/CVS/Root
-share/GNUstep/System/Applications/GWorkspace.app/Resources/SoundViewer.inspector/Resources/Info-gnustep.plist
-share/GNUstep/System/Applications/GWorkspace.app/Resources/SoundViewer.inspector/Resources/InspectorInfo.plist
-share/GNUstep/System/Applications/GWorkspace.app/Resources/SoundViewer.inspector/Resources/pause.tiff
-share/GNUstep/System/Applications/GWorkspace.app/Resources/SoundViewer.inspector/Resources/play.tiff
-share/GNUstep/System/Applications/GWorkspace.app/Resources/SoundViewer.inspector/Resources/stop.tiff
-share/GNUstep/System/Applications/GWorkspace.app/Resources/SoundViewer.inspector/${GNUSTEP_HOST_CPU}/${GNUSTEP_HOST_OS}/gnu-gnu-gnu/SoundViewer
-share/GNUstep/System/Applications/GWorkspace.app/Resources/SoundViewer.inspector/stamp.make
-share/GNUstep/System/Applications/GWorkspace.app/Resources/Spanish.lproj/CVS/Entries
-share/GNUstep/System/Applications/GWorkspace.app/Resources/Spanish.lproj/CVS/Repository
-share/GNUstep/System/Applications/GWorkspace.app/Resources/Spanish.lproj/CVS/Root
-share/GNUstep/System/Applications/GWorkspace.app/Resources/Spanish.lproj/Finder.gorm/CVS/Entries
-share/GNUstep/System/Applications/GWorkspace.app/Resources/Spanish.lproj/Finder.gorm/CVS/Repository
-share/GNUstep/System/Applications/GWorkspace.app/Resources/Spanish.lproj/Finder.gorm/CVS/Root
-share/GNUstep/System/Applications/GWorkspace.app/Resources/Spanish.lproj/Finder.gorm/data.classes
-share/GNUstep/System/Applications/GWorkspace.app/Resources/Spanish.lproj/Finder.gorm/objects.gorm
-share/GNUstep/System/Applications/GWorkspace.app/Resources/Spanish.lproj/Finder.nib/CVS/Entries
-share/GNUstep/System/Applications/GWorkspace.app/Resources/Spanish.lproj/Finder.nib/CVS/Repository
-share/GNUstep/System/Applications/GWorkspace.app/Resources/Spanish.lproj/Finder.nib/CVS/Root
-share/GNUstep/System/Applications/GWorkspace.app/Resources/Spanish.lproj/Finder.nib/classes.nib
-share/GNUstep/System/Applications/GWorkspace.app/Resources/Spanish.lproj/Finder.nib/info.nib
-share/GNUstep/System/Applications/GWorkspace.app/Resources/Spanish.lproj/Finder.nib/objects.nib
-share/GNUstep/System/Applications/GWorkspace.app/Resources/Spanish.lproj/Localizable.strings
-share/GNUstep/System/Applications/GWorkspace.app/Resources/Spanish.lproj/MainMenu-OSX.gsmarkup
-share/GNUstep/System/Applications/GWorkspace.app/Resources/StringsViewer.inspector/Resources/Info-gnustep.plist
-share/GNUstep/System/Applications/GWorkspace.app/Resources/StringsViewer.inspector/Resources/InspectorInfo.plist
-share/GNUstep/System/Applications/GWorkspace.app/Resources/StringsViewer.inspector/${GNUSTEP_HOST_CPU}/${GNUSTEP_HOST_OS}/gnu-gnu-gnu/StringsViewer
-share/GNUstep/System/Applications/GWorkspace.app/Resources/StringsViewer.inspector/stamp.make
-share/GNUstep/System/Applications/GWorkspace.app/Resources/TileHighlight.tiff
-share/GNUstep/System/Applications/GWorkspace.app/Resources/Weekday-0.tiff
-share/GNUstep/System/Applications/GWorkspace.app/Resources/Weekday-1.tiff
-share/GNUstep/System/Applications/GWorkspace.app/Resources/Weekday-2.tiff
-share/GNUstep/System/Applications/GWorkspace.app/Resources/Weekday-3.tiff
-share/GNUstep/System/Applications/GWorkspace.app/Resources/Weekday-4.tiff
-share/GNUstep/System/Applications/GWorkspace.app/Resources/Weekday-5.tiff
-share/GNUstep/System/Applications/GWorkspace.app/Resources/Weekday-6.tiff
-share/GNUstep/System/Applications/GWorkspace.app/Resources/Weekday.tiff
-share/GNUstep/System/Applications/GWorkspace.app/Resources/littleArrowDown.tiff
-share/GNUstep/System/Applications/GWorkspace.app/Resources/littleArrowRight.tiff
-share/GNUstep/System/Applications/GWorkspace.app/Resources/page.tiff
-share/GNUstep/System/Applications/GWorkspace.app/Resources/pause.tiff
-share/GNUstep/System/Applications/GWorkspace.app/Resources/play.tiff
-share/GNUstep/System/Applications/GWorkspace.app/Resources/stop.tiff
-share/GNUstep/System/Applications/GWorkspace.app/Resources/stop_16.tiff
-share/GNUstep/System/Applications/GWorkspace.app/Resources/stop_24.tiff
-share/GNUstep/System/Applications/GWorkspace.app/Resources/stop_32.tiff
-share/GNUstep/System/Applications/GWorkspace.app/Resources/stop_48.tiff
-share/GNUstep/System/Applications/GWorkspace.app/Resources/switchMultiple.tiff
-share/GNUstep/System/Applications/GWorkspace.app/Resources/switchOff.tiff
-share/GNUstep/System/Applications/GWorkspace.app/Resources/switchOn.tiff
-share/GNUstep/System/Applications/GWorkspace.app/${GNUSTEP_HOST_CPU}/${GNUSTEP_HOST_OS}/gnu-gnu-gnu/GWorkspace
-share/GNUstep/System/Applications/GWorkspace.app/${GNUSTEP_HOST_CPU}/${GNUSTEP_HOST_OS}/gnu-gnu-gnu/library_paths.openapp
-share/GNUstep/System/Applications/GWorkspace.app/stamp.make
-share/GNUstep/System/Library/Bundles/AppViewer.inspector/Resources/Info-gnustep.plist
-share/GNUstep/System/Library/Bundles/AppViewer.inspector/Resources/InspectorInfo.plist
-share/GNUstep/System/Library/Bundles/AppViewer.inspector/${GNUSTEP_HOST_CPU}/${GNUSTEP_HOST_OS}/gnu-gnu-gnu/AppViewer
-share/GNUstep/System/Library/Bundles/AppViewer.inspector/stamp.make
-share/GNUstep/System/Library/Bundles/BrowserViewer.viewer/Resources/CVS/Entries
-share/GNUstep/System/Library/Bundles/BrowserViewer.viewer/Resources/CVS/Repository
-share/GNUstep/System/Library/Bundles/BrowserViewer.viewer/Resources/CVS/Root
-share/GNUstep/System/Library/Bundles/BrowserViewer.viewer/Resources/Dutch.lproj/CVS/Entries
-share/GNUstep/System/Library/Bundles/BrowserViewer.viewer/Resources/Dutch.lproj/CVS/Repository
-share/GNUstep/System/Library/Bundles/BrowserViewer.viewer/Resources/Dutch.lproj/CVS/Root
-share/GNUstep/System/Library/Bundles/BrowserViewer.viewer/Resources/English.lproj/BrowserViewerPref.gorm/CVS/Entries
-share/GNUstep/System/Library/Bundles/BrowserViewer.viewer/Resources/English.lproj/BrowserViewerPref.gorm/CVS/Repository
-share/GNUstep/System/Library/Bundles/BrowserViewer.viewer/Resources/English.lproj/BrowserViewerPref.gorm/CVS/Root
-share/GNUstep/System/Library/Bundles/BrowserViewer.viewer/Resources/English.lproj/BrowserViewerPref.gorm/data.classes
-share/GNUstep/System/Library/Bundles/BrowserViewer.viewer/Resources/English.lproj/BrowserViewerPref.gorm/objects.gorm
-share/GNUstep/System/Library/Bundles/BrowserViewer.viewer/Resources/English.lproj/BrowserViewerPref.nib/CVS/Entries
-share/GNUstep/System/Library/Bundles/BrowserViewer.viewer/Resources/English.lproj/BrowserViewerPref.nib/CVS/Repository
-share/GNUstep/System/Library/Bundles/BrowserViewer.viewer/Resources/English.lproj/BrowserViewerPref.nib/CVS/Root
-share/GNUstep/System/Library/Bundles/BrowserViewer.viewer/Resources/English.lproj/BrowserViewerPref.nib/classes.nib
-share/GNUstep/System/Library/Bundles/BrowserViewer.viewer/Resources/English.lproj/BrowserViewerPref.nib/info.nib
-share/GNUstep/System/Library/Bundles/BrowserViewer.viewer/Resources/English.lproj/BrowserViewerPref.nib/objects.nib
-share/GNUstep/System/Library/Bundles/BrowserViewer.viewer/Resources/English.lproj/CVS/Entries
-share/GNUstep/System/Library/Bundles/BrowserViewer.viewer/Resources/English.lproj/CVS/Repository
-share/GNUstep/System/Library/Bundles/BrowserViewer.viewer/Resources/English.lproj/CVS/Root
-share/GNUstep/System/Library/Bundles/BrowserViewer.viewer/Resources/French.lproj/CVS/Entries
-share/GNUstep/System/Library/Bundles/BrowserViewer.viewer/Resources/French.lproj/CVS/Repository
-share/GNUstep/System/Library/Bundles/BrowserViewer.viewer/Resources/French.lproj/CVS/Root
-share/GNUstep/System/Library/Bundles/BrowserViewer.viewer/Resources/German.lproj/CVS/Entries
-share/GNUstep/System/Library/Bundles/BrowserViewer.viewer/Resources/German.lproj/CVS/Repository
-share/GNUstep/System/Library/Bundles/BrowserViewer.viewer/Resources/German.lproj/CVS/Root
-share/GNUstep/System/Library/Bundles/BrowserViewer.viewer/Resources/Info-gnustep.plist
-share/GNUstep/System/Library/Bundles/BrowserViewer.viewer/Resources/Italian.lproj/CVS/Entries
-share/GNUstep/System/Library/Bundles/BrowserViewer.viewer/Resources/Italian.lproj/CVS/Repository
-share/GNUstep/System/Library/Bundles/BrowserViewer.viewer/Resources/Italian.lproj/CVS/Root
-share/GNUstep/System/Library/Bundles/BrowserViewer.viewer/Resources/Portuguese.lproj/CVS/Entries
-share/GNUstep/System/Library/Bundles/BrowserViewer.viewer/Resources/Portuguese.lproj/CVS/Repository
-share/GNUstep/System/Library/Bundles/BrowserViewer.viewer/Resources/Portuguese.lproj/CVS/Root
-share/GNUstep/System/Library/Bundles/BrowserViewer.viewer/Resources/Resources/English.lproj/BrowserViewerPref.gorm/CVS/Entries
-share/GNUstep/System/Library/Bundles/BrowserViewer.viewer/Resources/Resources/English.lproj/BrowserViewerPref.gorm/CVS/Repository
-share/GNUstep/System/Library/Bundles/BrowserViewer.viewer/Resources/Resources/English.lproj/BrowserViewerPref.gorm/CVS/Root
-share/GNUstep/System/Library/Bundles/BrowserViewer.viewer/Resources/Resources/English.lproj/BrowserViewerPref.gorm/data.classes
-share/GNUstep/System/Library/Bundles/BrowserViewer.viewer/Resources/Resources/English.lproj/BrowserViewerPref.gorm/objects.gorm
-share/GNUstep/System/Library/Bundles/BrowserViewer.viewer/Resources/Romanian.lproj/CVS/Entries
-share/GNUstep/System/Library/Bundles/BrowserViewer.viewer/Resources/Romanian.lproj/CVS/Repository
-share/GNUstep/System/Library/Bundles/BrowserViewer.viewer/Resources/Romanian.lproj/CVS/Root
-share/GNUstep/System/Library/Bundles/BrowserViewer.viewer/Resources/Spanish.lproj/CVS/Entries
-share/GNUstep/System/Library/Bundles/BrowserViewer.viewer/Resources/Spanish.lproj/CVS/Repository
-share/GNUstep/System/Library/Bundles/BrowserViewer.viewer/Resources/Spanish.lproj/CVS/Root
-share/GNUstep/System/Library/Bundles/BrowserViewer.viewer/Resources/miniwindow.tiff
-share/GNUstep/System/Library/Bundles/BrowserViewer.viewer/${GNUSTEP_HOST_CPU}/${GNUSTEP_HOST_OS}/gnu-gnu-gnu/BrowserViewer
-share/GNUstep/System/Library/Bundles/BrowserViewer.viewer/stamp.make
-share/GNUstep/System/Library/Bundles/FolderViewer.inspector/Resources/Info-gnustep.plist
-share/GNUstep/System/Library/Bundles/FolderViewer.inspector/Resources/InspectorInfo.plist
-share/GNUstep/System/Library/Bundles/FolderViewer.inspector/${GNUSTEP_HOST_CPU}/${GNUSTEP_HOST_OS}/gnu-gnu-gnu/FolderViewer
-share/GNUstep/System/Library/Bundles/FolderViewer.inspector/stamp.make
-share/GNUstep/System/Library/Bundles/IconsViewer.viewer/Resources/CVS/Entries
-share/GNUstep/System/Library/Bundles/IconsViewer.viewer/Resources/CVS/Repository
-share/GNUstep/System/Library/Bundles/IconsViewer.viewer/Resources/CVS/Root
-share/GNUstep/System/Library/Bundles/IconsViewer.viewer/Resources/Dutch.lproj/CVS/Entries
-share/GNUstep/System/Library/Bundles/IconsViewer.viewer/Resources/Dutch.lproj/CVS/Repository
-share/GNUstep/System/Library/Bundles/IconsViewer.viewer/Resources/Dutch.lproj/CVS/Root
-share/GNUstep/System/Library/Bundles/IconsViewer.viewer/Resources/English.lproj/CVS/Entries
-share/GNUstep/System/Library/Bundles/IconsViewer.viewer/Resources/English.lproj/CVS/Repository
-share/GNUstep/System/Library/Bundles/IconsViewer.viewer/Resources/English.lproj/CVS/Root
-share/GNUstep/System/Library/Bundles/IconsViewer.viewer/Resources/English.lproj/IconsViewPref.gorm/CVS/Entries
-share/GNUstep/System/Library/Bundles/IconsViewer.viewer/Resources/English.lproj/IconsViewPref.gorm/CVS/Repository
-share/GNUstep/System/Library/Bundles/IconsViewer.viewer/Resources/English.lproj/IconsViewPref.gorm/CVS/Root
-share/GNUstep/System/Library/Bundles/IconsViewer.viewer/Resources/English.lproj/IconsViewerPref.gorm/CVS/Entries
-share/GNUstep/System/Library/Bundles/IconsViewer.viewer/Resources/English.lproj/IconsViewerPref.gorm/CVS/Repository
-share/GNUstep/System/Library/Bundles/IconsViewer.viewer/Resources/English.lproj/IconsViewerPref.gorm/CVS/Root
-share/GNUstep/System/Library/Bundles/IconsViewer.viewer/Resources/English.lproj/IconsViewerPref.gorm/data.classes
-share/GNUstep/System/Library/Bundles/IconsViewer.viewer/Resources/English.lproj/IconsViewerPref.gorm/objects.gorm
-share/GNUstep/System/Library/Bundles/IconsViewer.viewer/Resources/English.lproj/IconsViewerPref.nib/CVS/Entries
-share/GNUstep/System/Library/Bundles/IconsViewer.viewer/Resources/English.lproj/IconsViewerPref.nib/CVS/Repository
-share/GNUstep/System/Library/Bundles/IconsViewer.viewer/Resources/English.lproj/IconsViewerPref.nib/CVS/Root
-share/GNUstep/System/Library/Bundles/IconsViewer.viewer/Resources/English.lproj/IconsViewerPref.nib/classes.nib
-share/GNUstep/System/Library/Bundles/IconsViewer.viewer/Resources/English.lproj/IconsViewerPref.nib/info.nib
-share/GNUstep/System/Library/Bundles/IconsViewer.viewer/Resources/English.lproj/IconsViewerPref.nib/objects.nib
-share/GNUstep/System/Library/Bundles/IconsViewer.viewer/Resources/French.lproj/CVS/Entries
-share/GNUstep/System/Library/Bundles/IconsViewer.viewer/Resources/French.lproj/CVS/Repository
-share/GNUstep/System/Library/Bundles/IconsViewer.viewer/Resources/French.lproj/CVS/Root
-share/GNUstep/System/Library/Bundles/IconsViewer.viewer/Resources/German.lproj/CVS/Entries
-share/GNUstep/System/Library/Bundles/IconsViewer.viewer/Resources/German.lproj/CVS/Repository
-share/GNUstep/System/Library/Bundles/IconsViewer.viewer/Resources/German.lproj/CVS/Root
-share/GNUstep/System/Library/Bundles/IconsViewer.viewer/Resources/Info-gnustep.plist
-share/GNUstep/System/Library/Bundles/IconsViewer.viewer/Resources/Italian.lproj/CVS/Entries
-share/GNUstep/System/Library/Bundles/IconsViewer.viewer/Resources/Italian.lproj/CVS/Repository
-share/GNUstep/System/Library/Bundles/IconsViewer.viewer/Resources/Italian.lproj/CVS/Root
-share/GNUstep/System/Library/Bundles/IconsViewer.viewer/Resources/Portuguese.lproj/CVS/Entries
-share/GNUstep/System/Library/Bundles/IconsViewer.viewer/Resources/Portuguese.lproj/CVS/Repository
-share/GNUstep/System/Library/Bundles/IconsViewer.viewer/Resources/Portuguese.lproj/CVS/Root
-share/GNUstep/System/Library/Bundles/IconsViewer.viewer/Resources/Resources/English.lproj/IconsViewerPref.gorm/CVS/Entries
-share/GNUstep/System/Library/Bundles/IconsViewer.viewer/Resources/Resources/English.lproj/IconsViewerPref.gorm/CVS/Repository
-share/GNUstep/System/Library/Bundles/IconsViewer.viewer/Resources/Resources/English.lproj/IconsViewerPref.gorm/CVS/Root
-share/GNUstep/System/Library/Bundles/IconsViewer.viewer/Resources/Resources/English.lproj/IconsViewerPref.gorm/data.classes
-share/GNUstep/System/Library/Bundles/IconsViewer.viewer/Resources/Resources/English.lproj/IconsViewerPref.gorm/objects.gorm
-share/GNUstep/System/Library/Bundles/IconsViewer.viewer/Resources/Romanian.lproj/CVS/Entries
-share/GNUstep/System/Library/Bundles/IconsViewer.viewer/Resources/Romanian.lproj/CVS/Repository
-share/GNUstep/System/Library/Bundles/IconsViewer.viewer/Resources/Romanian.lproj/CVS/Root
-share/GNUstep/System/Library/Bundles/IconsViewer.viewer/Resources/Spanish.lproj/CVS/Entries
-share/GNUstep/System/Library/Bundles/IconsViewer.viewer/Resources/Spanish.lproj/CVS/Repository
-share/GNUstep/System/Library/Bundles/IconsViewer.viewer/Resources/Spanish.lproj/CVS/Root
-share/GNUstep/System/Library/Bundles/IconsViewer.viewer/Resources/miniwindow.tiff
-share/GNUstep/System/Library/Bundles/IconsViewer.viewer/${GNUSTEP_HOST_CPU}/${GNUSTEP_HOST_OS}/gnu-gnu-gnu/IconsViewer
-share/GNUstep/System/Library/Bundles/IconsViewer.viewer/stamp.make
-share/GNUstep/System/Library/Bundles/ImageThumbnailer.thumb/Resources/Info-gnustep.plist
-share/GNUstep/System/Library/Bundles/ImageThumbnailer.thumb/${GNUSTEP_HOST_CPU}/${GNUSTEP_HOST_OS}/gnu-gnu-gnu/ImageThumbnailer
-share/GNUstep/System/Library/Bundles/ImageThumbnailer.thumb/stamp.make
-share/GNUstep/System/Library/Bundles/ImageViewer.inspector/Resources/Info-gnustep.plist
-share/GNUstep/System/Library/Bundles/ImageViewer.inspector/Resources/InspectorInfo.plist
-share/GNUstep/System/Library/Bundles/ImageViewer.inspector/${GNUSTEP_HOST_CPU}/${GNUSTEP_HOST_OS}/gnu-gnu-gnu/ImageViewer
-share/GNUstep/System/Library/Bundles/ImageViewer.inspector/stamp.make
-share/GNUstep/System/Library/Bundles/InspectorViewer.inspector/Resources/Info-gnustep.plist
-share/GNUstep/System/Library/Bundles/InspectorViewer.inspector/Resources/InspectorInfo.plist
-share/GNUstep/System/Library/Bundles/InspectorViewer.inspector/${GNUSTEP_HOST_CPU}/${GNUSTEP_HOST_OS}/gnu-gnu-gnu/InspectorViewer
-share/GNUstep/System/Library/Bundles/InspectorViewer.inspector/stamp.make
-share/GNUstep/System/Library/Bundles/PdfViewer.inspector/Resources/CVS/Entries
-share/GNUstep/System/Library/Bundles/PdfViewer.inspector/Resources/CVS/Repository
-share/GNUstep/System/Library/Bundles/PdfViewer.inspector/Resources/CVS/Root
-share/GNUstep/System/Library/Bundles/PdfViewer.inspector/Resources/Info-gnustep.plist
-share/GNUstep/System/Library/Bundles/PdfViewer.inspector/Resources/InspectorInfo.plist
-share/GNUstep/System/Library/Bundles/PdfViewer.inspector/Resources/left.tiff
-share/GNUstep/System/Library/Bundles/PdfViewer.inspector/Resources/page.tiff
-share/GNUstep/System/Library/Bundles/PdfViewer.inspector/Resources/papersizes.plist
-share/GNUstep/System/Library/Bundles/PdfViewer.inspector/Resources/pause.tiff
-share/GNUstep/System/Library/Bundles/PdfViewer.inspector/Resources/play.tiff
-share/GNUstep/System/Library/Bundles/PdfViewer.inspector/Resources/right.tiff
-share/GNUstep/System/Library/Bundles/PdfViewer.inspector/Resources/stop.tiff
-share/GNUstep/System/Library/Bundles/PdfViewer.inspector/${GNUSTEP_HOST_CPU}/${GNUSTEP_HOST_OS}/gnu-gnu-gnu/PdfViewer
-share/GNUstep/System/Library/Bundles/PdfViewer.inspector/stamp.make
-share/GNUstep/System/Library/Bundles/PlistViewer.inspector/Resources/Info-gnustep.plist
-share/GNUstep/System/Library/Bundles/PlistViewer.inspector/Resources/InspectorInfo.plist
-share/GNUstep/System/Library/Bundles/PlistViewer.inspector/${GNUSTEP_HOST_CPU}/${GNUSTEP_HOST_OS}/gnu-gnu-gnu/PlistViewer
-share/GNUstep/System/Library/Bundles/PlistViewer.inspector/stamp.make
-share/GNUstep/System/Library/Bundles/RtfViewer.inspector/Resources/Info-gnustep.plist
-share/GNUstep/System/Library/Bundles/RtfViewer.inspector/Resources/InspectorInfo.plist
-share/GNUstep/System/Library/Bundles/RtfViewer.inspector/${GNUSTEP_HOST_CPU}/${GNUSTEP_HOST_OS}/gnu-gnu-gnu/RtfViewer
-share/GNUstep/System/Library/Bundles/RtfViewer.inspector/stamp.make
-share/GNUstep/System/Library/Bundles/SmallIconsViewer.viewer/Resources/CVS/Entries
-share/GNUstep/System/Library/Bundles/SmallIconsViewer.viewer/Resources/CVS/Repository
-share/GNUstep/System/Library/Bundles/SmallIconsViewer.viewer/Resources/CVS/Root
-share/GNUstep/System/Library/Bundles/SmallIconsViewer.viewer/Resources/Info-gnustep.plist
-share/GNUstep/System/Library/Bundles/SmallIconsViewer.viewer/Resources/miniwindow.tiff
-share/GNUstep/System/Library/Bundles/SmallIconsViewer.viewer/${GNUSTEP_HOST_CPU}/${GNUSTEP_HOST_OS}/gnu-gnu-gnu/SmallIconsViewer
-share/GNUstep/System/Library/Bundles/SmallIconsViewer.viewer/stamp.make
-share/GNUstep/System/Library/Bundles/SoundViewer.inspector/Resources/CVS/Entries
-share/GNUstep/System/Library/Bundles/SoundViewer.inspector/Resources/CVS/Repository
-share/GNUstep/System/Library/Bundles/SoundViewer.inspector/Resources/CVS/Root
-share/GNUstep/System/Library/Bundles/SoundViewer.inspector/Resources/Info-gnustep.plist
-share/GNUstep/System/Library/Bundles/SoundViewer.inspector/Resources/InspectorInfo.plist
-share/GNUstep/System/Library/Bundles/SoundViewer.inspector/Resources/pause.tiff
-share/GNUstep/System/Library/Bundles/SoundViewer.inspector/Resources/play.tiff
-share/GNUstep/System/Library/Bundles/SoundViewer.inspector/Resources/stop.tiff
-share/GNUstep/System/Library/Bundles/SoundViewer.inspector/${GNUSTEP_HOST_CPU}/${GNUSTEP_HOST_OS}/gnu-gnu-gnu/SoundViewer
-share/GNUstep/System/Library/Bundles/SoundViewer.inspector/stamp.make
-share/GNUstep/System/Library/Bundles/StringsViewer.inspector/Resources/Info-gnustep.plist
-share/GNUstep/System/Library/Bundles/StringsViewer.inspector/Resources/InspectorInfo.plist
-share/GNUstep/System/Library/Bundles/StringsViewer.inspector/${GNUSTEP_HOST_CPU}/${GNUSTEP_HOST_OS}/gnu-gnu-gnu/StringsViewer
-share/GNUstep/System/Library/Bundles/StringsViewer.inspector/stamp.make
-share/GNUstep/System/Library/Services/thumbnailer.service/Resources/ImageThumbnailer.thumb/Resources/Info-gnustep.plist
-share/GNUstep/System/Library/Services/thumbnailer.service/Resources/ImageThumbnailer.thumb/${GNUSTEP_HOST_CPU}/${GNUSTEP_HOST_OS}/gnu-gnu-gnu/ImageThumbnailer
-share/GNUstep/System/Library/Services/thumbnailer.service/Resources/ImageThumbnailer.thumb/stamp.make
-share/GNUstep/System/Library/Services/thumbnailer.service/Resources/Info-gnustep.plist
-share/GNUstep/System/Library/Services/thumbnailer.service/${GNUSTEP_HOST_CPU}/${GNUSTEP_HOST_OS}/gnu-gnu-gnu/thumbnailer
-share/GNUstep/System/Tools/${GNUSTEP_HOST_CPU}/${GNUSTEP_HOST_OS}/gnu-gnu-gnu/findfile
-share/GNUstep/System/Tools/${GNUSTEP_HOST_CPU}/${GNUSTEP_HOST_OS}/gnu-gnu-gnu/wopen
-@dirrm share/GNUstep/System/Library/Services/thumbnailer.service/${GNUSTEP_HOST_CPU}/${GNUSTEP_HOST_OS}/gnu-gnu-gnu
-@dirrm share/GNUstep/System/Library/Services/thumbnailer.service/${GNUSTEP_HOST_CPU}/${GNUSTEP_HOST_OS}
-@dirrm share/GNUstep/System/Library/Services/thumbnailer.service/${GNUSTEP_HOST_CPU}
-@dirrm share/GNUstep/System/Library/Services/thumbnailer.service/Resources/ImageThumbnailer.thumb/${GNUSTEP_HOST_CPU}/${GNUSTEP_HOST_OS}/gnu-gnu-gnu
-@dirrm share/GNUstep/System/Library/Services/thumbnailer.service/Resources/ImageThumbnailer.thumb/${GNUSTEP_HOST_CPU}/${GNUSTEP_HOST_OS}
-@dirrm share/GNUstep/System/Library/Services/thumbnailer.service/Resources/ImageThumbnailer.thumb/${GNUSTEP_HOST_CPU}
-@dirrm share/GNUstep/System/Library/Services/thumbnailer.service/Resources/ImageThumbnailer.thumb/Resources
-@dirrm share/GNUstep/System/Library/Services/thumbnailer.service/Resources/ImageThumbnailer.thumb
-@dirrm share/GNUstep/System/Library/Services/thumbnailer.service/Resources
-@dirrm share/GNUstep/System/Library/Services/thumbnailer.service
-@dirrm share/GNUstep/System/Library/Bundles/StringsViewer.inspector/${GNUSTEP_HOST_CPU}/${GNUSTEP_HOST_OS}/gnu-gnu-gnu
-@dirrm share/GNUstep/System/Library/Bundles/StringsViewer.inspector/${GNUSTEP_HOST_CPU}/${GNUSTEP_HOST_OS}
-@dirrm share/GNUstep/System/Library/Bundles/StringsViewer.inspector/${GNUSTEP_HOST_CPU}
-@dirrm share/GNUstep/System/Library/Bundles/StringsViewer.inspector/Resources
-@dirrm share/GNUstep/System/Library/Bundles/StringsViewer.inspector
-@dirrm share/GNUstep/System/Library/Bundles/SoundViewer.inspector/${GNUSTEP_HOST_CPU}/${GNUSTEP_HOST_OS}/gnu-gnu-gnu
-@dirrm share/GNUstep/System/Library/Bundles/SoundViewer.inspector/${GNUSTEP_HOST_CPU}/${GNUSTEP_HOST_OS}
-@dirrm share/GNUstep/System/Library/Bundles/SoundViewer.inspector/${GNUSTEP_HOST_CPU}
-@dirrm share/GNUstep/System/Library/Bundles/SoundViewer.inspector/Resources/CVS
-@dirrm share/GNUstep/System/Library/Bundles/SoundViewer.inspector/Resources
-@dirrm share/GNUstep/System/Library/Bundles/SoundViewer.inspector
-@dirrm share/GNUstep/System/Library/Bundles/SmallIconsViewer.viewer/${GNUSTEP_HOST_CPU}/${GNUSTEP_HOST_OS}/gnu-gnu-gnu
-@dirrm share/GNUstep/System/Library/Bundles/SmallIconsViewer.viewer/${GNUSTEP_HOST_CPU}/${GNUSTEP_HOST_OS}
-@dirrm share/GNUstep/System/Library/Bundles/SmallIconsViewer.viewer/${GNUSTEP_HOST_CPU}
-@dirrm share/GNUstep/System/Library/Bundles/SmallIconsViewer.viewer/Resources/CVS
-@dirrm share/GNUstep/System/Library/Bundles/SmallIconsViewer.viewer/Resources
-@dirrm share/GNUstep/System/Library/Bundles/SmallIconsViewer.viewer
-@dirrm share/GNUstep/System/Library/Bundles/RtfViewer.inspector/${GNUSTEP_HOST_CPU}/${GNUSTEP_HOST_OS}/gnu-gnu-gnu
-@dirrm share/GNUstep/System/Library/Bundles/RtfViewer.inspector/${GNUSTEP_HOST_CPU}/${GNUSTEP_HOST_OS}
-@dirrm share/GNUstep/System/Library/Bundles/RtfViewer.inspector/${GNUSTEP_HOST_CPU}
-@dirrm share/GNUstep/System/Library/Bundles/RtfViewer.inspector/Resources
-@dirrm share/GNUstep/System/Library/Bundles/RtfViewer.inspector
-@dirrm share/GNUstep/System/Library/Bundles/PlistViewer.inspector/${GNUSTEP_HOST_CPU}/${GNUSTEP_HOST_OS}/gnu-gnu-gnu
-@dirrm share/GNUstep/System/Library/Bundles/PlistViewer.inspector/${GNUSTEP_HOST_CPU}/${GNUSTEP_HOST_OS}
-@dirrm share/GNUstep/System/Library/Bundles/PlistViewer.inspector/${GNUSTEP_HOST_CPU}
-@dirrm share/GNUstep/System/Library/Bundles/PlistViewer.inspector/Resources
-@dirrm share/GNUstep/System/Library/Bundles/PlistViewer.inspector
-@dirrm share/GNUstep/System/Library/Bundles/PdfViewer.inspector/${GNUSTEP_HOST_CPU}/${GNUSTEP_HOST_OS}/gnu-gnu-gnu
-@dirrm share/GNUstep/System/Library/Bundles/PdfViewer.inspector/${GNUSTEP_HOST_CPU}/${GNUSTEP_HOST_OS}
-@dirrm share/GNUstep/System/Library/Bundles/PdfViewer.inspector/${GNUSTEP_HOST_CPU}
-@dirrm share/GNUstep/System/Library/Bundles/PdfViewer.inspector/Resources/CVS
-@dirrm share/GNUstep/System/Library/Bundles/PdfViewer.inspector/Resources
-@dirrm share/GNUstep/System/Library/Bundles/PdfViewer.inspector
-@dirrm share/GNUstep/System/Library/Bundles/InspectorViewer.inspector/${GNUSTEP_HOST_CPU}/${GNUSTEP_HOST_OS}/gnu-gnu-gnu
-@dirrm share/GNUstep/System/Library/Bundles/InspectorViewer.inspector/${GNUSTEP_HOST_CPU}/${GNUSTEP_HOST_OS}
-@dirrm share/GNUstep/System/Library/Bundles/InspectorViewer.inspector/${GNUSTEP_HOST_CPU}
-@dirrm share/GNUstep/System/Library/Bundles/InspectorViewer.inspector/Resources
-@dirrm share/GNUstep/System/Library/Bundles/InspectorViewer.inspector
-@dirrm share/GNUstep/System/Library/Bundles/ImageViewer.inspector/${GNUSTEP_HOST_CPU}/${GNUSTEP_HOST_OS}/gnu-gnu-gnu
-@dirrm share/GNUstep/System/Library/Bundles/ImageViewer.inspector/${GNUSTEP_HOST_CPU}/${GNUSTEP_HOST_OS}
-@dirrm share/GNUstep/System/Library/Bundles/ImageViewer.inspector/${GNUSTEP_HOST_CPU}
-@dirrm share/GNUstep/System/Library/Bundles/ImageViewer.inspector/Resources
-@dirrm share/GNUstep/System/Library/Bundles/ImageViewer.inspector
-@dirrm share/GNUstep/System/Library/Bundles/ImageThumbnailer.thumb/${GNUSTEP_HOST_CPU}/${GNUSTEP_HOST_OS}/gnu-gnu-gnu
-@dirrm share/GNUstep/System/Library/Bundles/ImageThumbnailer.thumb/${GNUSTEP_HOST_CPU}/${GNUSTEP_HOST_OS}
-@dirrm share/GNUstep/System/Library/Bundles/ImageThumbnailer.thumb/${GNUSTEP_HOST_CPU}
-@dirrm share/GNUstep/System/Library/Bundles/ImageThumbnailer.thumb/Resources
-@dirrm share/GNUstep/System/Library/Bundles/ImageThumbnailer.thumb
-@dirrm share/GNUstep/System/Library/Bundles/IconsViewer.viewer/${GNUSTEP_HOST_CPU}/${GNUSTEP_HOST_OS}/gnu-gnu-gnu
-@dirrm share/GNUstep/System/Library/Bundles/IconsViewer.viewer/${GNUSTEP_HOST_CPU}/${GNUSTEP_HOST_OS}
-@dirrm share/GNUstep/System/Library/Bundles/IconsViewer.viewer/${GNUSTEP_HOST_CPU}
-@dirrm share/GNUstep/System/Library/Bundles/IconsViewer.viewer/Resources/Spanish.lproj/CVS
-@dirrm share/GNUstep/System/Library/Bundles/IconsViewer.viewer/Resources/Spanish.lproj
-@dirrm share/GNUstep/System/Library/Bundles/IconsViewer.viewer/Resources/Romanian.lproj/CVS
-@dirrm share/GNUstep/System/Library/Bundles/IconsViewer.viewer/Resources/Romanian.lproj
-@exec ${MKDIR} %D/share/GNUstep/System/Library/Bundles/IconsViewer.viewer/Resources/Resources/Spanish.lproj
-@dirrm share/GNUstep/System/Library/Bundles/IconsViewer.viewer/Resources/Resources/Spanish.lproj
-@exec ${MKDIR} %D/share/GNUstep/System/Library/Bundles/IconsViewer.viewer/Resources/Resources/Romanian.lproj
-@dirrm share/GNUstep/System/Library/Bundles/IconsViewer.viewer/Resources/Resources/Romanian.lproj
-@exec ${MKDIR} %D/share/GNUstep/System/Library/Bundles/IconsViewer.viewer/Resources/Resources/Portuguese.lproj
-@dirrm share/GNUstep/System/Library/Bundles/IconsViewer.viewer/Resources/Resources/Portuguese.lproj
-@exec ${MKDIR} %D/share/GNUstep/System/Library/Bundles/IconsViewer.viewer/Resources/Resources/Italian.lproj
-@dirrm share/GNUstep/System/Library/Bundles/IconsViewer.viewer/Resources/Resources/Italian.lproj
-@exec ${MKDIR} %D/share/GNUstep/System/Library/Bundles/IconsViewer.viewer/Resources/Resources/German.lproj
-@dirrm share/GNUstep/System/Library/Bundles/IconsViewer.viewer/Resources/Resources/German.lproj
-@exec ${MKDIR} %D/share/GNUstep/System/Library/Bundles/IconsViewer.viewer/Resources/Resources/French.lproj
-@dirrm share/GNUstep/System/Library/Bundles/IconsViewer.viewer/Resources/Resources/French.lproj
-@dirrm share/GNUstep/System/Library/Bundles/IconsViewer.viewer/Resources/Resources/English.lproj/IconsViewerPref.gorm/CVS
-@dirrm share/GNUstep/System/Library/Bundles/IconsViewer.viewer/Resources/Resources/English.lproj/IconsViewerPref.gorm
-@dirrm share/GNUstep/System/Library/Bundles/IconsViewer.viewer/Resources/Resources/English.lproj
-@exec ${MKDIR} %D/share/GNUstep/System/Library/Bundles/IconsViewer.viewer/Resources/Resources/Dutch.lproj
-@dirrm share/GNUstep/System/Library/Bundles/IconsViewer.viewer/Resources/Resources/Dutch.lproj
-@dirrm share/GNUstep/System/Library/Bundles/IconsViewer.viewer/Resources/Resources
-@dirrm share/GNUstep/System/Library/Bundles/IconsViewer.viewer/Resources/Portuguese.lproj/CVS
-@dirrm share/GNUstep/System/Library/Bundles/IconsViewer.viewer/Resources/Portuguese.lproj
-@dirrm share/GNUstep/System/Library/Bundles/IconsViewer.viewer/Resources/Italian.lproj/CVS
-@dirrm share/GNUstep/System/Library/Bundles/IconsViewer.viewer/Resources/Italian.lproj
-@dirrm share/GNUstep/System/Library/Bundles/IconsViewer.viewer/Resources/German.lproj/CVS
-@dirrm share/GNUstep/System/Library/Bundles/IconsViewer.viewer/Resources/German.lproj
-@dirrm share/GNUstep/System/Library/Bundles/IconsViewer.viewer/Resources/French.lproj/CVS
-@dirrm share/GNUstep/System/Library/Bundles/IconsViewer.viewer/Resources/French.lproj
-@dirrm share/GNUstep/System/Library/Bundles/IconsViewer.viewer/Resources/English.lproj/IconsViewerPref.nib/CVS
-@dirrm share/GNUstep/System/Library/Bundles/IconsViewer.viewer/Resources/English.lproj/IconsViewerPref.nib
-@dirrm share/GNUstep/System/Library/Bundles/IconsViewer.viewer/Resources/English.lproj/IconsViewerPref.gorm/CVS
-@dirrm share/GNUstep/System/Library/Bundles/IconsViewer.viewer/Resources/English.lproj/IconsViewerPref.gorm
-@dirrm share/GNUstep/System/Library/Bundles/IconsViewer.viewer/Resources/English.lproj/IconsViewPref.gorm/CVS
-@dirrm share/GNUstep/System/Library/Bundles/IconsViewer.viewer/Resources/English.lproj/IconsViewPref.gorm
-@dirrm share/GNUstep/System/Library/Bundles/IconsViewer.viewer/Resources/English.lproj/CVS
-@dirrm share/GNUstep/System/Library/Bundles/IconsViewer.viewer/Resources/English.lproj
-@dirrm share/GNUstep/System/Library/Bundles/IconsViewer.viewer/Resources/Dutch.lproj/CVS
-@dirrm share/GNUstep/System/Library/Bundles/IconsViewer.viewer/Resources/Dutch.lproj
-@dirrm share/GNUstep/System/Library/Bundles/IconsViewer.viewer/Resources/CVS
-@dirrm share/GNUstep/System/Library/Bundles/IconsViewer.viewer/Resources
-@dirrm share/GNUstep/System/Library/Bundles/IconsViewer.viewer
-@dirrm share/GNUstep/System/Library/Bundles/FolderViewer.inspector/${GNUSTEP_HOST_CPU}/${GNUSTEP_HOST_OS}/gnu-gnu-gnu
-@dirrm share/GNUstep/System/Library/Bundles/FolderViewer.inspector/${GNUSTEP_HOST_CPU}/${GNUSTEP_HOST_OS}
-@dirrm share/GNUstep/System/Library/Bundles/FolderViewer.inspector/${GNUSTEP_HOST_CPU}
-@dirrm share/GNUstep/System/Library/Bundles/FolderViewer.inspector/Resources
-@dirrm share/GNUstep/System/Library/Bundles/FolderViewer.inspector
-@dirrm share/GNUstep/System/Library/Bundles/BrowserViewer.viewer/${GNUSTEP_HOST_CPU}/${GNUSTEP_HOST_OS}/gnu-gnu-gnu
-@dirrm share/GNUstep/System/Library/Bundles/BrowserViewer.viewer/${GNUSTEP_HOST_CPU}/${GNUSTEP_HOST_OS}
-@dirrm share/GNUstep/System/Library/Bundles/BrowserViewer.viewer/${GNUSTEP_HOST_CPU}
-@dirrm share/GNUstep/System/Library/Bundles/BrowserViewer.viewer/Resources/Spanish.lproj/CVS
-@dirrm share/GNUstep/System/Library/Bundles/BrowserViewer.viewer/Resources/Spanish.lproj
-@dirrm share/GNUstep/System/Library/Bundles/BrowserViewer.viewer/Resources/Romanian.lproj/CVS
-@dirrm share/GNUstep/System/Library/Bundles/BrowserViewer.viewer/Resources/Romanian.lproj
-@exec ${MKDIR} %D/share/GNUstep/System/Library/Bundles/BrowserViewer.viewer/Resources/Resources/Spanish.lproj
-@dirrm share/GNUstep/System/Library/Bundles/BrowserViewer.viewer/Resources/Resources/Spanish.lproj
-@exec ${MKDIR} %D/share/GNUstep/System/Library/Bundles/BrowserViewer.viewer/Resources/Resources/Romanian.lproj
-@dirrm share/GNUstep/System/Library/Bundles/BrowserViewer.viewer/Resources/Resources/Romanian.lproj
-@exec ${MKDIR} %D/share/GNUstep/System/Library/Bundles/BrowserViewer.viewer/Resources/Resources/Portuguese.lproj
-@dirrm share/GNUstep/System/Library/Bundles/BrowserViewer.viewer/Resources/Resources/Portuguese.lproj
-@exec ${MKDIR} %D/share/GNUstep/System/Library/Bundles/BrowserViewer.viewer/Resources/Resources/Italian.lproj
-@dirrm share/GNUstep/System/Library/Bundles/BrowserViewer.viewer/Resources/Resources/Italian.lproj
-@exec ${MKDIR} %D/share/GNUstep/System/Library/Bundles/BrowserViewer.viewer/Resources/Resources/German.lproj
-@dirrm share/GNUstep/System/Library/Bundles/BrowserViewer.viewer/Resources/Resources/German.lproj
-@exec ${MKDIR} %D/share/GNUstep/System/Library/Bundles/BrowserViewer.viewer/Resources/Resources/French.lproj
-@dirrm share/GNUstep/System/Library/Bundles/BrowserViewer.viewer/Resources/Resources/French.lproj
-@dirrm share/GNUstep/System/Library/Bundles/BrowserViewer.viewer/Resources/Resources/English.lproj/BrowserViewerPref.gorm/CVS
-@dirrm share/GNUstep/System/Library/Bundles/BrowserViewer.viewer/Resources/Resources/English.lproj/BrowserViewerPref.gorm
-@dirrm share/GNUstep/System/Library/Bundles/BrowserViewer.viewer/Resources/Resources/English.lproj
-@exec ${MKDIR} %D/share/GNUstep/System/Library/Bundles/BrowserViewer.viewer/Resources/Resources/Dutch.lproj
-@dirrm share/GNUstep/System/Library/Bundles/BrowserViewer.viewer/Resources/Resources/Dutch.lproj
-@dirrm share/GNUstep/System/Library/Bundles/BrowserViewer.viewer/Resources/Resources
-@dirrm share/GNUstep/System/Library/Bundles/BrowserViewer.viewer/Resources/Portuguese.lproj/CVS
-@dirrm share/GNUstep/System/Library/Bundles/BrowserViewer.viewer/Resources/Portuguese.lproj
-@dirrm share/GNUstep/System/Library/Bundles/BrowserViewer.viewer/Resources/Italian.lproj/CVS
-@dirrm share/GNUstep/System/Library/Bundles/BrowserViewer.viewer/Resources/Italian.lproj
-@dirrm share/GNUstep/System/Library/Bundles/BrowserViewer.viewer/Resources/German.lproj/CVS
-@dirrm share/GNUstep/System/Library/Bundles/BrowserViewer.viewer/Resources/German.lproj
-@dirrm share/GNUstep/System/Library/Bundles/BrowserViewer.viewer/Resources/French.lproj/CVS
-@dirrm share/GNUstep/System/Library/Bundles/BrowserViewer.viewer/Resources/French.lproj
-@dirrm share/GNUstep/System/Library/Bundles/BrowserViewer.viewer/Resources/English.lproj/CVS
-@dirrm share/GNUstep/System/Library/Bundles/BrowserViewer.viewer/Resources/English.lproj/BrowserViewerPref.nib/CVS
-@dirrm share/GNUstep/System/Library/Bundles/BrowserViewer.viewer/Resources/English.lproj/BrowserViewerPref.nib
-@dirrm share/GNUstep/System/Library/Bundles/BrowserViewer.viewer/Resources/English.lproj/BrowserViewerPref.gorm/CVS
-@dirrm share/GNUstep/System/Library/Bundles/BrowserViewer.viewer/Resources/English.lproj/BrowserViewerPref.gorm
-@dirrm share/GNUstep/System/Library/Bundles/BrowserViewer.viewer/Resources/English.lproj
-@dirrm share/GNUstep/System/Library/Bundles/BrowserViewer.viewer/Resources/Dutch.lproj/CVS
-@dirrm share/GNUstep/System/Library/Bundles/BrowserViewer.viewer/Resources/Dutch.lproj
-@dirrm share/GNUstep/System/Library/Bundles/BrowserViewer.viewer/Resources/CVS
-@dirrm share/GNUstep/System/Library/Bundles/BrowserViewer.viewer/Resources
-@dirrm share/GNUstep/System/Library/Bundles/BrowserViewer.viewer
-@dirrm share/GNUstep/System/Library/Bundles/AppViewer.inspector/${GNUSTEP_HOST_CPU}/${GNUSTEP_HOST_OS}/gnu-gnu-gnu
-@dirrm share/GNUstep/System/Library/Bundles/AppViewer.inspector/${GNUSTEP_HOST_CPU}/${GNUSTEP_HOST_OS}
-@dirrm share/GNUstep/System/Library/Bundles/AppViewer.inspector/${GNUSTEP_HOST_CPU}
-@dirrm share/GNUstep/System/Library/Bundles/AppViewer.inspector/Resources
-@dirrm share/GNUstep/System/Library/Bundles/AppViewer.inspector
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/${GNUSTEP_HOST_CPU}/${GNUSTEP_HOST_OS}/gnu-gnu-gnu
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/${GNUSTEP_HOST_CPU}/${GNUSTEP_HOST_OS}
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/${GNUSTEP_HOST_CPU}
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/StringsViewer.inspector/${GNUSTEP_HOST_CPU}/${GNUSTEP_HOST_OS}/gnu-gnu-gnu
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/StringsViewer.inspector/${GNUSTEP_HOST_CPU}/${GNUSTEP_HOST_OS}
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/StringsViewer.inspector/${GNUSTEP_HOST_CPU}
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/StringsViewer.inspector/Resources
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/StringsViewer.inspector
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/Spanish.lproj/Finder.nib/CVS
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/Spanish.lproj/Finder.nib
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/Spanish.lproj/Finder.gorm/CVS
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/Spanish.lproj/Finder.gorm
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/Spanish.lproj/CVS
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/Spanish.lproj
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/SoundViewer.inspector/${GNUSTEP_HOST_CPU}/${GNUSTEP_HOST_OS}/gnu-gnu-gnu
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/SoundViewer.inspector/${GNUSTEP_HOST_CPU}/${GNUSTEP_HOST_OS}
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/SoundViewer.inspector/${GNUSTEP_HOST_CPU}
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/SoundViewer.inspector/Resources/CVS
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/SoundViewer.inspector/Resources
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/SoundViewer.inspector
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/SmallIconsViewer.viewer/${GNUSTEP_HOST_CPU}/${GNUSTEP_HOST_OS}/gnu-gnu-gnu
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/SmallIconsViewer.viewer/${GNUSTEP_HOST_CPU}/${GNUSTEP_HOST_OS}
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/SmallIconsViewer.viewer/${GNUSTEP_HOST_CPU}
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/SmallIconsViewer.viewer/Resources/CVS
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/SmallIconsViewer.viewer/Resources
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/SmallIconsViewer.viewer
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/RtfViewer.inspector/${GNUSTEP_HOST_CPU}/${GNUSTEP_HOST_OS}/gnu-gnu-gnu
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/RtfViewer.inspector/${GNUSTEP_HOST_CPU}/${GNUSTEP_HOST_OS}
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/RtfViewer.inspector/${GNUSTEP_HOST_CPU}
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/RtfViewer.inspector/Resources
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/RtfViewer.inspector
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/Romanian.lproj/Finder.nib/CVS
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/Romanian.lproj/Finder.nib
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/Romanian.lproj/Finder.gorm/CVS
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/Romanian.lproj/Finder.gorm
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/Romanian.lproj/CVS
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/Romanian.lproj
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/Resources/Spanish.lproj/Finder.gorm/CVS
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/Resources/Spanish.lproj/Finder.gorm
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/Resources/Spanish.lproj
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/Resources/Romanian.lproj/Finder.gorm/CVS
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/Resources/Romanian.lproj/Finder.gorm
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/Resources/Romanian.lproj
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/Resources/Portuguese.lproj/Finder.gorm/CVS
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/Resources/Portuguese.lproj/Finder.gorm
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/Resources/Portuguese.lproj
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/Resources/Italian.lproj/Finder.gorm/CVS
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/Resources/Italian.lproj/Finder.gorm
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/Resources/Italian.lproj
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/Resources/German.lproj/Finder.gorm/CVS
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/Resources/German.lproj/Finder.gorm
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/Resources/German.lproj
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/Resources/French.lproj/Finder.gorm/CVS
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/Resources/French.lproj/Finder.gorm
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/Resources/French.lproj
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/Resources/English.lproj/XTermPref.gorm/CVS
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/Resources/English.lproj/XTermPref.gorm
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/Resources/English.lproj/ToolsPanel.gorm/CVS
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/Resources/English.lproj/ToolsPanel.gorm
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/Resources/English.lproj/ShelfPref.gorm/CVS
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/Resources/English.lproj/ShelfPref.gorm
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/Resources/English.lproj/RunExternal.gorm/CVS
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/Resources/English.lproj/RunExternal.gorm
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/Resources/English.lproj/PrefWindow.gorm/CVS
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/Resources/English.lproj/PrefWindow.gorm
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/Resources/English.lproj/PermissionsPanel.gorm/CVS
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/Resources/English.lproj/PermissionsPanel.gorm
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/Resources/English.lproj/OpenWith.gorm/CVS
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/Resources/English.lproj/OpenWith.gorm
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/Resources/English.lproj/InspectorsWin.gorm/CVS
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/Resources/English.lproj/InspectorsWin.gorm
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/Resources/English.lproj/IconsPref.gorm/CVS
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/Resources/English.lproj/IconsPref.gorm
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/Resources/English.lproj/HiddenFilesPref.gorm/CVS
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/Resources/English.lproj/HiddenFilesPref.gorm
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/Resources/English.lproj/Finder.gorm/CVS
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/Resources/English.lproj/Finder.gorm
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/Resources/English.lproj/FileOpsPref.gorm/CVS
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/Resources/English.lproj/FileOpsPref.gorm
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/Resources/English.lproj/FileOperationWin.gorm/CVS
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/Resources/English.lproj/FileOperationWin.gorm
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/Resources/English.lproj/DeskTopPref.gorm/CVS
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/Resources/English.lproj/DeskTopPref.gorm
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/Resources/English.lproj/DefSortOrderPref.gorm/CVS
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/Resources/English.lproj/DefSortOrderPref.gorm
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/Resources/English.lproj/DefEditorPref.gorm/CVS
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/Resources/English.lproj/DefEditorPref.gorm
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/Resources/English.lproj/ContentsPanel.gorm/CVS
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/Resources/English.lproj/ContentsPanel.gorm
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/Resources/English.lproj/AttributesPanel.gorm/CVS
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/Resources/English.lproj/AttributesPanel.gorm
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/Resources/English.lproj
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/Resources/Dutch.lproj/Finder.gorm/CVS
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/Resources/Dutch.lproj/Finder.gorm
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/Resources/Dutch.lproj
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/Resources
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/Portuguese.lproj/Finder.nib/CVS
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/Portuguese.lproj/Finder.nib
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/Portuguese.lproj/Finder.gorm/CVS
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/Portuguese.lproj/Finder.gorm
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/Portuguese.lproj/CVS
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/Portuguese.lproj
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/PlistViewer.inspector/${GNUSTEP_HOST_CPU}/${GNUSTEP_HOST_OS}/gnu-gnu-gnu
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/PlistViewer.inspector/${GNUSTEP_HOST_CPU}/${GNUSTEP_HOST_OS}
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/PlistViewer.inspector/${GNUSTEP_HOST_CPU}
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/PlistViewer.inspector/Resources
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/PlistViewer.inspector
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/PdfViewer.inspector/${GNUSTEP_HOST_CPU}/${GNUSTEP_HOST_OS}/gnu-gnu-gnu
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/PdfViewer.inspector/${GNUSTEP_HOST_CPU}/${GNUSTEP_HOST_OS}
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/PdfViewer.inspector/${GNUSTEP_HOST_CPU}
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/PdfViewer.inspector/Resources/CVS
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/PdfViewer.inspector/Resources
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/PdfViewer.inspector
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/Italian.lproj/Finder.nib/CVS
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/Italian.lproj/Finder.nib
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/Italian.lproj/Finder.gorm/CVS
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/Italian.lproj/Finder.gorm
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/Italian.lproj/CVS
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/Italian.lproj
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/InspectorViewer.inspector/${GNUSTEP_HOST_CPU}/${GNUSTEP_HOST_OS}/gnu-gnu-gnu
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/InspectorViewer.inspector/${GNUSTEP_HOST_CPU}/${GNUSTEP_HOST_OS}
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/InspectorViewer.inspector/${GNUSTEP_HOST_CPU}
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/InspectorViewer.inspector/Resources
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/InspectorViewer.inspector
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/ImageViewer.inspector/${GNUSTEP_HOST_CPU}/${GNUSTEP_HOST_OS}/gnu-gnu-gnu
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/ImageViewer.inspector/${GNUSTEP_HOST_CPU}/${GNUSTEP_HOST_OS}
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/ImageViewer.inspector/${GNUSTEP_HOST_CPU}
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/ImageViewer.inspector/Resources
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/ImageViewer.inspector
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/IconsViewer.viewer/${GNUSTEP_HOST_CPU}/${GNUSTEP_HOST_OS}/gnu-gnu-gnu
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/IconsViewer.viewer/${GNUSTEP_HOST_CPU}/${GNUSTEP_HOST_OS}
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/IconsViewer.viewer/${GNUSTEP_HOST_CPU}
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/IconsViewer.viewer/Resources/Spanish.lproj/CVS
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/IconsViewer.viewer/Resources/Spanish.lproj
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/IconsViewer.viewer/Resources/Romanian.lproj/CVS
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/IconsViewer.viewer/Resources/Romanian.lproj
-@exec ${MKDIR} %D/share/GNUstep/System/Applications/GWorkspace.app/Resources/IconsViewer.viewer/Resources/Resources/Spanish.lproj
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/IconsViewer.viewer/Resources/Resources/Spanish.lproj
-@exec ${MKDIR} %D/share/GNUstep/System/Applications/GWorkspace.app/Resources/IconsViewer.viewer/Resources/Resources/Romanian.lproj
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/IconsViewer.viewer/Resources/Resources/Romanian.lproj
-@exec ${MKDIR} %D/share/GNUstep/System/Applications/GWorkspace.app/Resources/IconsViewer.viewer/Resources/Resources/Portuguese.lproj
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/IconsViewer.viewer/Resources/Resources/Portuguese.lproj
-@exec ${MKDIR} %D/share/GNUstep/System/Applications/GWorkspace.app/Resources/IconsViewer.viewer/Resources/Resources/Italian.lproj
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/IconsViewer.viewer/Resources/Resources/Italian.lproj
-@exec ${MKDIR} %D/share/GNUstep/System/Applications/GWorkspace.app/Resources/IconsViewer.viewer/Resources/Resources/German.lproj
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/IconsViewer.viewer/Resources/Resources/German.lproj
-@exec ${MKDIR} %D/share/GNUstep/System/Applications/GWorkspace.app/Resources/IconsViewer.viewer/Resources/Resources/French.lproj
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/IconsViewer.viewer/Resources/Resources/French.lproj
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/IconsViewer.viewer/Resources/Resources/English.lproj/IconsViewerPref.gorm/CVS
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/IconsViewer.viewer/Resources/Resources/English.lproj/IconsViewerPref.gorm
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/IconsViewer.viewer/Resources/Resources/English.lproj
-@exec ${MKDIR} %D/share/GNUstep/System/Applications/GWorkspace.app/Resources/IconsViewer.viewer/Resources/Resources/Dutch.lproj
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/IconsViewer.viewer/Resources/Resources/Dutch.lproj
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/IconsViewer.viewer/Resources/Resources
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/IconsViewer.viewer/Resources/Portuguese.lproj/CVS
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/IconsViewer.viewer/Resources/Portuguese.lproj
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/IconsViewer.viewer/Resources/Italian.lproj/CVS
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/IconsViewer.viewer/Resources/Italian.lproj
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/IconsViewer.viewer/Resources/German.lproj/CVS
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/IconsViewer.viewer/Resources/German.lproj
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/IconsViewer.viewer/Resources/French.lproj/CVS
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/IconsViewer.viewer/Resources/French.lproj
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/IconsViewer.viewer/Resources/English.lproj/IconsViewerPref.nib/CVS
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/IconsViewer.viewer/Resources/English.lproj/IconsViewerPref.nib
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/IconsViewer.viewer/Resources/English.lproj/IconsViewerPref.gorm/CVS
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/IconsViewer.viewer/Resources/English.lproj/IconsViewerPref.gorm
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/IconsViewer.viewer/Resources/English.lproj/IconsViewPref.gorm/CVS
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/IconsViewer.viewer/Resources/English.lproj/IconsViewPref.gorm
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/IconsViewer.viewer/Resources/English.lproj/CVS
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/IconsViewer.viewer/Resources/English.lproj
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/IconsViewer.viewer/Resources/Dutch.lproj/CVS
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/IconsViewer.viewer/Resources/Dutch.lproj
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/IconsViewer.viewer/Resources/CVS
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/IconsViewer.viewer/Resources
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/IconsViewer.viewer
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/German.lproj/Finder.nib/CVS
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/German.lproj/Finder.nib
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/German.lproj/Finder.gorm/CVS
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/German.lproj/Finder.gorm
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/German.lproj/CVS
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/German.lproj
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/French.lproj/Finder.nib/CVS
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/French.lproj/Finder.nib
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/French.lproj/Finder.gorm/CVS
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/French.lproj/Finder.gorm
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/French.lproj/CVS
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/French.lproj
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/FolderViewer.inspector/${GNUSTEP_HOST_CPU}/${GNUSTEP_HOST_OS}/gnu-gnu-gnu
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/FolderViewer.inspector/${GNUSTEP_HOST_CPU}/${GNUSTEP_HOST_OS}
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/FolderViewer.inspector/${GNUSTEP_HOST_CPU}
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/FolderViewer.inspector/Resources
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/FolderViewer.inspector
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/English.lproj/XTermPref.nib/CVS
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/English.lproj/XTermPref.nib
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/English.lproj/XTermPref.gorm/CVS
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/English.lproj/XTermPref.gorm
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/English.lproj/ToolsPanel.nib/CVS
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/English.lproj/ToolsPanel.nib
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/English.lproj/ToolsPanel.gorm/CVS
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/English.lproj/ToolsPanel.gorm
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/English.lproj/ShelfPref.nib/CVS
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/English.lproj/ShelfPref.nib
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/English.lproj/ShelfPref.gorm/CVS
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/English.lproj/ShelfPref.gorm
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/English.lproj/RunExternal.gorm/CVS
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/English.lproj/RunExternal.gorm
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/English.lproj/PrefWindow.nib/CVS
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/English.lproj/PrefWindow.nib
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/English.lproj/PrefWindow.gorm/CVS
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/English.lproj/PrefWindow.gorm
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/English.lproj/PermissionsPanel.nib/CVS
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/English.lproj/PermissionsPanel.nib
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/English.lproj/PermissionsPanel.gorm/CVS
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/English.lproj/PermissionsPanel.gorm
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/English.lproj/OpenWith.gorm/CVS
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/English.lproj/OpenWith.gorm
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/English.lproj/InspectorsWin.nib/CVS
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/English.lproj/InspectorsWin.nib
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/English.lproj/InspectorsWin.gorm/CVS
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/English.lproj/InspectorsWin.gorm
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/English.lproj/IconsPref.nib/CVS
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/English.lproj/IconsPref.nib
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/English.lproj/IconsPref.gorm/CVS
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/English.lproj/IconsPref.gorm
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/English.lproj/HiddenFilesPref.nib/CVS
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/English.lproj/HiddenFilesPref.nib
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/English.lproj/HiddenFilesPref.gorm/CVS
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/English.lproj/HiddenFilesPref.gorm
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/English.lproj/Finder.nib/CVS
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/English.lproj/Finder.nib
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/English.lproj/Finder.gorm/CVS
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/English.lproj/Finder.gorm
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/English.lproj/FileOpsPref.nib/CVS
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/English.lproj/FileOpsPref.nib
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/English.lproj/FileOpsPref.gorm/CVS
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/English.lproj/FileOpsPref.gorm
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/English.lproj/FileOps.gorm/CVS
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/English.lproj/FileOps.gorm
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/English.lproj/FileOperationWin.gorm/CVS
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/English.lproj/FileOperationWin.gorm
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/English.lproj/DeskTopPref.nib/CVS
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/English.lproj/DeskTopPref.nib
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/English.lproj/DeskTopPref.gorm/CVS
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/English.lproj/DeskTopPref.gorm
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/English.lproj/DefSortOrderPref.nib/CVS
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/English.lproj/DefSortOrderPref.nib
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/English.lproj/DefSortOrderPref.gorm/CVS
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/English.lproj/DefSortOrderPref.gorm
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/English.lproj/DefEditorPref.nib/CVS
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/English.lproj/DefEditorPref.nib
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/English.lproj/DefEditorPref.gorm/CVS
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/English.lproj/DefEditorPref.gorm
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/English.lproj/ContentsPanel.nib/CVS
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/English.lproj/ContentsPanel.nib
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/English.lproj/ContentsPanel.gorm/CVS
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/English.lproj/ContentsPanel.gorm
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/English.lproj/CVS
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/English.lproj/AttributesPanel.nib/CVS
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/English.lproj/AttributesPanel.nib
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/English.lproj/AttributesPanel.gorm/CVS
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/English.lproj/AttributesPanel.gorm
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/English.lproj
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/Dutch.lproj/Finder.nib/CVS
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/Dutch.lproj/Finder.nib
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/Dutch.lproj/Finder.gorm/CVS
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/Dutch.lproj/Finder.gorm
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/Dutch.lproj/CVS
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/Dutch.lproj
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/CVS
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/BrowserViewer.viewer/${GNUSTEP_HOST_CPU}/${GNUSTEP_HOST_OS}/gnu-gnu-gnu
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/BrowserViewer.viewer/${GNUSTEP_HOST_CPU}/${GNUSTEP_HOST_OS}
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/BrowserViewer.viewer/${GNUSTEP_HOST_CPU}
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/BrowserViewer.viewer/Resources/Spanish.lproj/CVS
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/BrowserViewer.viewer/Resources/Spanish.lproj
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/BrowserViewer.viewer/Resources/Romanian.lproj/CVS
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/BrowserViewer.viewer/Resources/Romanian.lproj
-@exec ${MKDIR} %D/share/GNUstep/System/Applications/GWorkspace.app/Resources/BrowserViewer.viewer/Resources/Resources/Spanish.lproj
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/BrowserViewer.viewer/Resources/Resources/Spanish.lproj
-@exec ${MKDIR} %D/share/GNUstep/System/Applications/GWorkspace.app/Resources/BrowserViewer.viewer/Resources/Resources/Romanian.lproj
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/BrowserViewer.viewer/Resources/Resources/Romanian.lproj
-@exec ${MKDIR} %D/share/GNUstep/System/Applications/GWorkspace.app/Resources/BrowserViewer.viewer/Resources/Resources/Portuguese.lproj
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/BrowserViewer.viewer/Resources/Resources/Portuguese.lproj
-@exec ${MKDIR} %D/share/GNUstep/System/Applications/GWorkspace.app/Resources/BrowserViewer.viewer/Resources/Resources/Italian.lproj
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/BrowserViewer.viewer/Resources/Resources/Italian.lproj
-@exec ${MKDIR} %D/share/GNUstep/System/Applications/GWorkspace.app/Resources/BrowserViewer.viewer/Resources/Resources/German.lproj
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/BrowserViewer.viewer/Resources/Resources/German.lproj
-@exec ${MKDIR} %D/share/GNUstep/System/Applications/GWorkspace.app/Resources/BrowserViewer.viewer/Resources/Resources/French.lproj
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/BrowserViewer.viewer/Resources/Resources/French.lproj
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/BrowserViewer.viewer/Resources/Resources/English.lproj/BrowserViewerPref.gorm/CVS
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/BrowserViewer.viewer/Resources/Resources/English.lproj/BrowserViewerPref.gorm
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/BrowserViewer.viewer/Resources/Resources/English.lproj
-@exec ${MKDIR} %D/share/GNUstep/System/Applications/GWorkspace.app/Resources/BrowserViewer.viewer/Resources/Resources/Dutch.lproj
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/BrowserViewer.viewer/Resources/Resources/Dutch.lproj
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/BrowserViewer.viewer/Resources/Resources
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/BrowserViewer.viewer/Resources/Portuguese.lproj/CVS
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/BrowserViewer.viewer/Resources/Portuguese.lproj
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/BrowserViewer.viewer/Resources/Italian.lproj/CVS
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/BrowserViewer.viewer/Resources/Italian.lproj
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/BrowserViewer.viewer/Resources/German.lproj/CVS
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/BrowserViewer.viewer/Resources/German.lproj
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/BrowserViewer.viewer/Resources/French.lproj/CVS
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/BrowserViewer.viewer/Resources/French.lproj
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/BrowserViewer.viewer/Resources/English.lproj/CVS
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/BrowserViewer.viewer/Resources/English.lproj/BrowserViewerPref.nib/CVS
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/BrowserViewer.viewer/Resources/English.lproj/BrowserViewerPref.nib
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/BrowserViewer.viewer/Resources/English.lproj/BrowserViewerPref.gorm/CVS
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/BrowserViewer.viewer/Resources/English.lproj/BrowserViewerPref.gorm
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/BrowserViewer.viewer/Resources/English.lproj
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/BrowserViewer.viewer/Resources/Dutch.lproj/CVS
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/BrowserViewer.viewer/Resources/Dutch.lproj
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/BrowserViewer.viewer/Resources/CVS
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/BrowserViewer.viewer/Resources
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/BrowserViewer.viewer
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/AppViewer.inspector/${GNUSTEP_HOST_CPU}/${GNUSTEP_HOST_OS}/gnu-gnu-gnu
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/AppViewer.inspector/${GNUSTEP_HOST_CPU}/${GNUSTEP_HOST_OS}
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/AppViewer.inspector/${GNUSTEP_HOST_CPU}
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/AppViewer.inspector/Resources
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources/AppViewer.inspector
-@dirrm share/GNUstep/System/Applications/GWorkspace.app/Resources
-@dirrm share/GNUstep/System/Applications/GWorkspace.app
diff --git a/sysutils/gworkspace/distinfo b/sysutils/gworkspace/distinfo
deleted file mode 100644
index efdd40eb2ac..00000000000
--- a/sysutils/gworkspace/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.2 2003/07/06 08:51:34 rh Exp $
-
-SHA1 (gworkspace-0.5.3.tar.gz) = 93d38f8ec63e6f391415ee8a97dc056457680c1e
-Size (gworkspace-0.5.3.tar.gz) = 1104593 bytes
-SHA1 (patch-aa) = 0fb9a1d949b4bbadc5d9492a03885f6da6a40aa6
-SHA1 (patch-ab) = c6e81a172c3fc769606cfad2110b0a6d0fc44bee
diff --git a/sysutils/gworkspace/files/GNUmakefile b/sysutils/gworkspace/files/GNUmakefile
deleted file mode 100644
index 2c15fcbcf78..00000000000
--- a/sysutils/gworkspace/files/GNUmakefile
+++ /dev/null
@@ -1,9 +0,0 @@
-#
-# $NetBSD: GNUmakefile,v 1.1.1.1 2002/09/28 02:19:53 rh Exp $
-#
-# Empty Makefile
-
-all:
-
-install:
-
diff --git a/sysutils/gworkspace/patches/patch-aa b/sysutils/gworkspace/patches/patch-aa
deleted file mode 100644
index 0941012871f..00000000000
--- a/sysutils/gworkspace/patches/patch-aa
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2003/07/06 08:51:34 rh Exp $
-
---- Utilities/thumbnailer/main.m.orig 2003-06-30 23:40:26.000000000 +1000
-+++ Utilities/thumbnailer/main.m
-@@ -677,18 +677,26 @@ int main(int argc, char** argv, char **e
- exit(0);
- }
-
-+#if GS_WITH_GC
- CREATE_AUTORELEASE_POOL (pool);
-+#endif
- thumbnailer = [Thumbnailer new];
-+#if GS_WITH_GC
- RELEASE (pool);
-+#endif
-
- if (thumbnailer != nil) {
-+#if GS_WITH_GC
- CREATE_AUTORELEASE_POOL (pool);
-+#endif
-
- [NSApplication sharedApplication];
- NSRegisterServicesProvider(thumbnailer, @"Thumbnailer");
- [[NSRunLoop currentRunLoop] run];
-
-+#if GS_WITH_GC
- RELEASE (pool);
-+#endif
- }
-
- exit(0);
diff --git a/sysutils/gworkspace/patches/patch-ab b/sysutils/gworkspace/patches/patch-ab
deleted file mode 100644
index a660e961e6f..00000000000
--- a/sysutils/gworkspace/patches/patch-ab
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2003/07/06 08:51:35 rh Exp $
-
---- GWorkspace/GWorkspace.m.orig 2003-07-01 19:38:26.000000000 +1000
-+++ GWorkspace/GWorkspace.m
-@@ -92,6 +92,7 @@ static GWorkspace *gworkspace = nil;
- BOOL confirm = !([defaults boolForKey: confirmString]);
- NSRect scr = [[NSScreen mainScreen] visibleFrame];
- NSRect wrect = NSZeroRect;
-+ NSRect wr;
- FileOperation *op;
- int i;
-
-@@ -105,7 +106,7 @@ static GWorkspace *gworkspace = nil;
-
- for (i = 0; i < [operations count]; i++) {
- op = [operations objectAtIndex: i];
-- NSRect wr = [op winRect];
-+ wr = [op winRect];
-
- if (NSEqualRects(wr, NSZeroRect) == NO) {
- wrect = NSMakeRect(wr.origin.x + WSHIFT,
diff --git a/sysutils/hfsutils/DESCR b/sysutils/hfsutils/DESCR
deleted file mode 100644
index 4f0cb3726e2..00000000000
--- a/sysutils/hfsutils/DESCR
+++ /dev/null
@@ -1,9 +0,0 @@
-These tools allow you to access Macintosh disks without mounting them.
-You can copy from or to BSD files, list directories, or run various
-other file / directory modification commands. The command naming is
-similar to that used by the mtools command (which is similar to MS-DOS
-command names), except that the names begin with an 'h'.
-
-This package installs only the traditional "Command Line Tools" from
-Robert Leslie's HFS Utilities. The advanced Tcl shell and Tk GUI are
-packaged independently, as the sysutils/xhfs package.
diff --git a/sysutils/hfsutils/Makefile b/sysutils/hfsutils/Makefile
deleted file mode 100644
index 0ab46ee9363..00000000000
--- a/sysutils/hfsutils/Makefile
+++ /dev/null
@@ -1,20 +0,0 @@
-# $NetBSD: Makefile,v 1.4 2001/06/11 06:34:50 jlam Exp $
-#
-
-DISTNAME= hfsutils-3.2.6
-CATEGORIES= sysutils
-MASTER_SITES= ftp://ftp.mars.org/pub/hfs/
-
-MAINTAINER= wrstuden@netbsd.org
-HOMEPAGE= http://www.mars.org/home/rob/proj/hfs/
-COMMENT= Command Line Interface HFS (not HFS+) disk access tools
-
-DEPENDS= libhfs-3.2.6:../../devel/libhfs
-
-GNU_CONFIGURE= yes
-CPPFLAGS+= -I${LOCALBASE}/include/libhfs
-
-ALL_TARGET= all_cli
-INSTALL_TARGET= install_cli
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/hfsutils/PLIST b/sysutils/hfsutils/PLIST
deleted file mode 100644
index 95e24fc9866..00000000000
--- a/sysutils/hfsutils/PLIST
+++ /dev/null
@@ -1,30 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 22:53:17 zuntum Exp $
-bin/hattrib
-bin/hcd
-bin/hcopy
-bin/hdel
-bin/hdir
-bin/hformat
-bin/hls
-bin/hmkdir
-bin/hmount
-bin/hpwd
-bin/hrename
-bin/hrmdir
-bin/humount
-bin/hvol
-man/man1/hfsutils.1
-man/man1/hattrib.1
-man/man1/hcd.1
-man/man1/hcopy.1
-man/man1/hdel.1
-man/man1/hdir.1
-man/man1/hformat.1
-man/man1/hls.1
-man/man1/hmkdir.1
-man/man1/hmount.1
-man/man1/hpwd.1
-man/man1/hrename.1
-man/man1/hrmdir.1
-man/man1/humount.1
-man/man1/hvol.1
diff --git a/sysutils/hfsutils/distinfo b/sysutils/hfsutils/distinfo
deleted file mode 100644
index 308f6fefc0d..00000000000
--- a/sysutils/hfsutils/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.2 2001/04/19 11:29:04 agc Exp $
-
-SHA1 (hfsutils-3.2.6.tar.gz) = 6d71dfb2c93c0d8082972d39f3f75ae53a438d5d
-Size (hfsutils-3.2.6.tar.gz) = 207697 bytes
-SHA1 (patch-aa) = bcd686f431220aafb994b4870974ae3157287b46
diff --git a/sysutils/hfsutils/patches/patch-aa b/sysutils/hfsutils/patches/patch-aa
deleted file mode 100644
index b04877228ec..00000000000
--- a/sysutils/hfsutils/patches/patch-aa
+++ /dev/null
@@ -1,38 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 1999/10/17 04:42:17 fredb Exp $
-
---- Makefile.in.orig Mon Aug 31 13:40:14 1998
-+++ Makefile.in Fri Oct 15 18:51:56 1999
-@@ -42,7 +42,7 @@
- HARDLINK = ln -f
-
- CC = @CC@
--INCLUDES = @CPPFLAGS@ -Ilibhfs @TCL_INCLUDES@ @TK_INCLUDES@
-+INCLUDES = @CPPFLAGS@ @TCL_INCLUDES@ @TK_INCLUDES@
- DEFINES = @DEFS@
- LIBOBJS = @LIBOBJS@
- LIBS = @LIBS@
-@@ -51,7 +51,7 @@
- TKLIBS = @TK_LIB_SPEC@ @TCL_LIB_SPEC@ @TK_LIBS@
-
- COPTS = @CFLAGS@
--LDOPTS = @LDFLAGS@ -Llibhfs
-+LDOPTS = @LDFLAGS@
-
- ### END OF USER CUSTOMIZATION #################################################
-
-@@ -67,11 +67,11 @@
- TCLTARGETS = hfssh hfs
- TKTARGETS = xhfs
-
--LIBHFS = libhfs/libhfs.a
--INCHFS = libhfs/hfs.h
-+LIBHFS =
-+INCHFS =
-
--LIBRSRC = librsrc/librsrc.a
--INCRSRC = librsrc/rsrc.h
-+LIBRSRC =
-+INCRSRC =
-
- HFSUTIL = hfsutil
- HFSCK = hfsck/hfsck
diff --git a/sysutils/i2ocfg/DESCR b/sysutils/i2ocfg/DESCR
deleted file mode 100644
index 0df9d522cdb..00000000000
--- a/sysutils/i2ocfg/DESCR
+++ /dev/null
@@ -1,3 +0,0 @@
-i2ocfg is an I2O configuraion dialog gateway for NetBSD. This means that it
-lets you access the built-in HTML configuration utility found on some I2O
-adapters, provided that you've got a web server and a browser.
diff --git a/sysutils/i2ocfg/MESSAGE b/sysutils/i2ocfg/MESSAGE
deleted file mode 100644
index 445f9d37f1a..00000000000
--- a/sysutils/i2ocfg/MESSAGE
+++ /dev/null
@@ -1,16 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE,v 1.1 2001/10/31 22:53:18 zuntum Exp $
-
-To use this package:
-
-1. Create a group named `i2ocfg'.
-2. chgrp i2ocfg /dev/iop?
-3. chmod g=rw /dev/iop?
-4. chgrp i2ocfg ${PREFIX}/libexec/cgi-bin/i2ocfg
-5. chmod g+s ${PREFIX}/libexec/cgi-bin/i2ocfg
-6. Ensure that a HTTP server is installed. If it's running, stop it.
-7. Ensure that the HTTP server will execute SGID CGI programs.
-8. Put HTTP access control in place. SSL would be a good idea.
-9. Start the HTTP server.
-
-===========================================================================
diff --git a/sysutils/i2ocfg/Makefile b/sysutils/i2ocfg/Makefile
deleted file mode 100644
index 5819e1bdce9..00000000000
--- a/sysutils/i2ocfg/Makefile
+++ /dev/null
@@ -1,15 +0,0 @@
-# $NetBSD: Makefile,v 1.4 2003/03/23 22:33:24 ad Exp $
-
-DISTNAME= i2ocfg-1.0
-CATEGORIES= sysutils
-MASTER_SITES= http://www.interlude.eu.org/~ad/software/download/i2ocfg/
-
-MAINTAINER= ad@netbsd.org
-HOMEPAGE= http://www.interlude.eu.org/~ad/software/i2ocfg/
-COMMENT= I2O configuration dialog gateway
-
-ONLY_FOR_PLATFORM= NetBSD-1.5[J-Z]-* NetBSD-1.[6-9]*-*
-
-MANCOMPRESSED_IF_MANZ= YES
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/i2ocfg/PLIST b/sysutils/i2ocfg/PLIST
deleted file mode 100644
index 8ec747a813f..00000000000
--- a/sysutils/i2ocfg/PLIST
+++ /dev/null
@@ -1,4 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 22:53:18 zuntum Exp $
-libexec/cgi-bin/i2ocfg
-man/cat8/i2ocfg.0
-man/man8/i2ocfg.8
diff --git a/sysutils/i2ocfg/distinfo b/sysutils/i2ocfg/distinfo
deleted file mode 100644
index a8c921028b4..00000000000
--- a/sysutils/i2ocfg/distinfo
+++ /dev/null
@@ -1,4 +0,0 @@
-$NetBSD: distinfo,v 1.2 2001/04/19 11:29:04 agc Exp $
-
-SHA1 (i2ocfg-1.0.tar.gz) = 2254f4af9a1b11edbf13e0e393ec3d18172b032a
-Size (i2ocfg-1.0.tar.gz) = 6423 bytes
diff --git a/sysutils/isapnptools/DESCR b/sysutils/isapnptools/DESCR
deleted file mode 100644
index b60718f7ddb..00000000000
--- a/sysutils/isapnptools/DESCR
+++ /dev/null
@@ -1,3 +0,0 @@
-The isapnp tools consist of two programs - one allows the dumping of
-resource data and generation of a skeleton configuration file, the
-other configures ISA PnP hardware using a configuration file.
diff --git a/sysutils/isapnptools/Makefile b/sysutils/isapnptools/Makefile
deleted file mode 100644
index d7c679d247f..00000000000
--- a/sysutils/isapnptools/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# $NetBSD: Makefile,v 1.3 2003/06/02 01:16:55 jschauma Exp $
-#
-
-DISTNAME= isapnptools-1.26
-CATEGORIES= sysutils
-MASTER_SITES= ${MASTER_SITE_SUNSITE:=system/hardware/} \
- ftp://tsx-11.mit.edu/pub/linux/sources/sbin/ \
- ftp://ftp.demon.co.uk/pub/unix/linux/utils/
-EXTRACT_SUFX= .tgz
-
-MAINTAINER= tech-pkg@netbsd.org
-HOMEPAGE= http://www.roestock.demon.co.uk
-COMMENT= manually query and configure isapnp devices
-
-ONLY_FOR_PLATFORM= NetBSD-*-i386
-
-USE_GMAKE= YES
-GNU_CONFIGURE= YES
-CONFIGURE_ARGS= --disable-realtime --disable-pci
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/isapnptools/PLIST b/sysutils/isapnptools/PLIST
deleted file mode 100644
index 11392f23ffc..00000000000
--- a/sysutils/isapnptools/PLIST
+++ /dev/null
@@ -1,19 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2002/07/23 12:07:45 agc Exp $
-include/isapnp/callbacks.h
-include/isapnp/errcodes.h
-include/isapnp/errenum.h
-include/isapnp/iopl.h
-include/isapnp/mysnprtf.h
-include/isapnp/pnp-access.h
-include/isapnp/pnp.h
-include/isapnp/realtime.h
-include/isapnp/release.h
-include/isapnp/res-access.h
-include/isapnp/resource.h
-lib/libisapnp.a
-sbin/isapnp
-sbin/pnpdump
-man/man5/isapnp.conf.5
-man/man8/isapnp.8
-man/man8/pnpdump.8
-@dirrm include/isapnp
diff --git a/sysutils/isapnptools/distinfo b/sysutils/isapnptools/distinfo
deleted file mode 100644
index 334f98e59f7..00000000000
--- a/sysutils/isapnptools/distinfo
+++ /dev/null
@@ -1,9 +0,0 @@
-$NetBSD: distinfo,v 1.1.1.1 2002/07/23 12:07:45 agc Exp $
-
-SHA1 (isapnptools-1.26.tgz) = 0b12b06ed60abe8d836fa8d4c1e20bd4b033d76c
-Size (isapnptools-1.26.tgz) = 231098 bytes
-SHA1 (patch-aa) = 150793665a3bb775a02a84a63ad69b244556ac28
-SHA1 (patch-ab) = e584c500e6262e37d67184a55e8f05cd5d55db14
-SHA1 (patch-ac) = 0696f3b6d091f5ae356973ed0277ca5700d6d22e
-SHA1 (patch-ad) = 6f431cfd99581742ded732dc5ec43d1722bc9a2c
-SHA1 (patch-ae) = baf6cf651f42f9359bc64ca377f249469b2463d5
diff --git a/sysutils/isapnptools/patches/patch-aa b/sysutils/isapnptools/patches/patch-aa
deleted file mode 100644
index e2faa87d885..00000000000
--- a/sysutils/isapnptools/patches/patch-aa
+++ /dev/null
@@ -1,35 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2002/07/23 12:07:45 agc Exp $
---- src/iopl.c Tue May 8 15:14:21 2001
-+++ src/iopl.c Mon Jul 22 07:46:37 2002
-@@ -61,10 +61,17 @@
- */
- ret = iopl(3);
- #else
-+#if defined(__NetBSD__) && defined(HAVE_LIBI386)
-+ /*
-+ * Have to get unrestricted access to io ports, as WRITE_DATA port > 0x3ff
-+ */
-+ ret = i386_iopl(3);
-+#else
- #ifdef HAVE_IOPERM
- /* ALPHA only has ioperm, apparently, so cover all with one permission */
- ret = ioperm(MIN_READ_ADDR, WRITEDATA_ADDR - MIN_READ_ADDR + 1, 1);
- #endif /* HAVE_IOPERM */
-+#endif /* !(__NetBSD__ && HAVE_LIBI386) */
- #endif /* !HAVE_IOPL */
-
- if (ret < 0) {
-@@ -85,9 +92,13 @@
- #ifdef HAVE_IOPL
- ret = iopl(0);
- #else
-+#if defined(__NetBSD__) && defined(HAVE_LIBI386)
-+ ret = i386_iopl(0);
-+#else
- #ifdef HAVE_IOPERM
- ret = ioperm(MIN_READ_ADDR, WRITEDATA_ADDR - MIN_READ_ADDR + 1, 0);
- #endif /* HAVE_IOPERM */
-+#endif /* !(__NetBSD__ && HAVE_LIBI386) */
- #endif /* !HAVE_IOPL */
-
- if (ret < 0) {
diff --git a/sysutils/isapnptools/patches/patch-ab b/sysutils/isapnptools/patches/patch-ab
deleted file mode 100644
index 4e2cc1368c5..00000000000
--- a/sysutils/isapnptools/patches/patch-ab
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 2002/07/23 12:07:45 agc Exp $
---- include/isapnp/iopl.h Tue May 8 15:14:21 2001
-+++ include/isapnp/iopl.h Mon Jul 22 07:40:38 2002
-@@ -45,6 +45,12 @@
- #endif
-
- /****************************************************************************/
-+#if defined(__NetBSD__) && defined(HAVE_LIBI386)
-+#include <sys/types.h>
-+#include <machine/bus.h>
-+#include <machine/sysarch.h>
-+#include <machine/pio.h>
-+#else
- #ifdef __DJGPP__
- #if !defined __TURBOC__ && !defined __BORLANDC__
- #include <inlines/pc.h>
-@@ -65,6 +71,7 @@
- #include <sys/hw.h>
- #endif /* _OS2_ */
- #endif
-+#endif /* !(__NetBSD__ && HAVE_LIBI386) */
-
- /****************************************************************************/
-
diff --git a/sysutils/isapnptools/patches/patch-ac b/sysutils/isapnptools/patches/patch-ac
deleted file mode 100644
index 1589330426f..00000000000
--- a/sysutils/isapnptools/patches/patch-ac
+++ /dev/null
@@ -1,27 +0,0 @@
-$NetBSD: patch-ac,v 1.1.1.1 2002/07/23 12:07:45 agc Exp $
---- include/isapnp/pnp.h Thu Apr 12 11:51:19 2001
-+++ include/isapnp/pnp.h Mon Jul 22 07:51:51 2002
-@@ -33,13 +33,23 @@
- #else /* !_OS2_ && !__DJGPP__ */
- #ifdef DEBUG
- static int x;
-+#if defined(__NetBSD__) && defined(HAVE_LIBI386)
-+#define ADDRESS(x) (outb(ADDRESS_ADDR, x), printf("\nAddress: %04x", x))
-+#define WRITE_DATA(x) (outb(WRITEDATA_ADDR, x), printf(" WR(%02x)", x & 0xff))
-+#else
- #define ADDRESS(x) (outb(x, ADDRESS_ADDR), printf("\nAddress: %04x", x))
- #define WRITE_DATA(x) (outb(x, WRITEDATA_ADDR), printf(" WR(%02x)", x & 0xff))
-+#endif
- #define READ_DATA (x = inb(read_port), printf(" RD(%02x)", x & 0xff), x)
- #define READ_IOPORT(p) (x = inb(p), printf(" [%04x](%02x)", p, x & 0xff), x)
- #else /* !DEBUG */
-+#if defined(__NetBSD__) && defined(HAVE_LIBI386)
-+#define ADDRESS(x) outb(ADDRESS_ADDR, x)
-+#define WRITE_DATA(x) outb(WRITEDATA_ADDR, x)
-+#else
- #define ADDRESS(x) outb(x, ADDRESS_ADDR)
- #define WRITE_DATA(x) outb(x, WRITEDATA_ADDR)
-+#endif
- #define READ_DATA inb(read_port)
- #define READ_IOPORT(p) inb(p)
- #endif /* !DEBUG */
diff --git a/sysutils/isapnptools/patches/patch-ad b/sysutils/isapnptools/patches/patch-ad
deleted file mode 100644
index 2b65159e2ef..00000000000
--- a/sysutils/isapnptools/patches/patch-ad
+++ /dev/null
@@ -1,380 +0,0 @@
-$NetBSD: patch-ad,v 1.1.1.1 2002/07/23 12:07:45 agc Exp $
---- configure Tue May 8 15:52:59 2001
-+++ configure Mon Jul 22 07:48:37 2002
-@@ -1555,14 +1555,61 @@
- fi
-
-
-+echo $ac_n "checking for i386_iopl in -li386""... $ac_c" 1>&6
-+echo "configure:1560: checking for i386_iopl in -li386" >&5
-+ac_lib_var=`echo i386'_'i386_iopl | sed 'y%./+-%__p_%'`
-+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-+ echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+ ac_save_LIBS="$LIBS"
-+LIBS="-li386 $LIBS"
-+cat > conftest.$ac_ext <<EOF
-+#line 1568 "configure"
-+#include "confdefs.h"
-+/* Override any gcc2 internal prototype to avoid an error. */
-+/* We use char because int might match the return type of a gcc2
-+ builtin and then its argument prototype would still apply. */
-+char i386_iopl();
-+
-+int main() {
-+i386_iopl()
-+; return 0; }
-+EOF
-+if { (eval echo configure:1579: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+ rm -rf conftest*
-+ eval "ac_cv_lib_$ac_lib_var=yes"
-+else
-+ echo "configure: failed program was:" >&5
-+ cat conftest.$ac_ext >&5
-+ rm -rf conftest*
-+ eval "ac_cv_lib_$ac_lib_var=no"
-+fi
-+rm -f conftest*
-+LIBS="$ac_save_LIBS"
-+
-+fi
-+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-+ echo "$ac_t""yes" 1>&6
-+ ac_tr_lib=HAVE_LIB`echo i386 | sed -e 's/[^a-zA-Z0-9_]/_/g' \
-+ -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
-+ cat >> confdefs.h <<EOF
-+#define $ac_tr_lib 1
-+EOF
-+
-+ LIBS="-li386 $LIBS"
-+
-+else
-+ echo "$ac_t""no" 1>&6
-+fi
-+
-
- echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
--echo "configure:1561: checking for ANSI C header files" >&5
-+echo "configure:1608: checking for ANSI C header files" >&5
- if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- cat > conftest.$ac_ext <<EOF
--#line 1566 "configure"
-+#line 1613 "configure"
- #include "confdefs.h"
- #include <stdlib.h>
- #include <stdarg.h>
-@@ -1570,7 +1617,7 @@
- #include <float.h>
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:1574: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:1621: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
- ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
- if test -z "$ac_err"; then
- rm -rf conftest*
-@@ -1587,7 +1634,7 @@
- if test $ac_cv_header_stdc = yes; then
- # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
- cat > conftest.$ac_ext <<EOF
--#line 1591 "configure"
-+#line 1638 "configure"
- #include "confdefs.h"
- #include <string.h>
- EOF
-@@ -1605,7 +1652,7 @@
- if test $ac_cv_header_stdc = yes; then
- # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
- cat > conftest.$ac_ext <<EOF
--#line 1609 "configure"
-+#line 1656 "configure"
- #include "confdefs.h"
- #include <stdlib.h>
- EOF
-@@ -1626,7 +1673,7 @@
- :
- else
- cat > conftest.$ac_ext <<EOF
--#line 1630 "configure"
-+#line 1677 "configure"
- #include "confdefs.h"
- #include <ctype.h>
- #define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
-@@ -1637,7 +1684,7 @@
- exit (0); }
-
- EOF
--if { (eval echo configure:1641: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:1688: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
- then
- :
- else
-@@ -1664,17 +1711,17 @@
- do
- ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
- echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
--echo "configure:1668: checking for $ac_hdr" >&5
-+echo "configure:1715: checking for $ac_hdr" >&5
- if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- cat > conftest.$ac_ext <<EOF
--#line 1673 "configure"
-+#line 1720 "configure"
- #include "confdefs.h"
- #include <$ac_hdr>
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:1678: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:1725: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
- ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
- if test -z "$ac_err"; then
- rm -rf conftest*
-@@ -1702,12 +1749,12 @@
-
-
- echo $ac_n "checking for working const""... $ac_c" 1>&6
--echo "configure:1706: checking for working const" >&5
-+echo "configure:1753: checking for working const" >&5
- if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- cat > conftest.$ac_ext <<EOF
--#line 1711 "configure"
-+#line 1758 "configure"
- #include "confdefs.h"
-
- int main() {
-@@ -1756,7 +1803,7 @@
-
- ; return 0; }
- EOF
--if { (eval echo configure:1760: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:1807: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
- rm -rf conftest*
- ac_cv_c_const=yes
- else
-@@ -1777,21 +1824,21 @@
- fi
-
- echo $ac_n "checking for inline""... $ac_c" 1>&6
--echo "configure:1781: checking for inline" >&5
-+echo "configure:1828: checking for inline" >&5
- if eval "test \"`echo '$''{'ac_cv_c_inline'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- ac_cv_c_inline=no
- for ac_kw in inline __inline__ __inline; do
- cat > conftest.$ac_ext <<EOF
--#line 1788 "configure"
-+#line 1835 "configure"
- #include "confdefs.h"
-
- int main() {
- } $ac_kw foo() {
- ; return 0; }
- EOF
--if { (eval echo configure:1795: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:1842: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
- rm -rf conftest*
- ac_cv_c_inline=$ac_kw; break
- else
-@@ -1817,12 +1864,12 @@
- esac
-
- echo $ac_n "checking for pid_t""... $ac_c" 1>&6
--echo "configure:1821: checking for pid_t" >&5
-+echo "configure:1868: checking for pid_t" >&5
- if eval "test \"`echo '$''{'ac_cv_type_pid_t'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- cat > conftest.$ac_ext <<EOF
--#line 1826 "configure"
-+#line 1873 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- #if STDC_HEADERS
-@@ -1850,12 +1897,12 @@
- fi
-
- echo $ac_n "checking for size_t""... $ac_c" 1>&6
--echo "configure:1854: checking for size_t" >&5
-+echo "configure:1901: checking for size_t" >&5
- if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- cat > conftest.$ac_ext <<EOF
--#line 1859 "configure"
-+#line 1906 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- #if STDC_HEADERS
-@@ -1884,12 +1931,12 @@
-
-
- echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6
--echo "configure:1888: checking return type of signal handlers" >&5
-+echo "configure:1935: checking return type of signal handlers" >&5
- if eval "test \"`echo '$''{'ac_cv_type_signal'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- cat > conftest.$ac_ext <<EOF
--#line 1893 "configure"
-+#line 1940 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- #include <signal.h>
-@@ -1906,7 +1953,7 @@
- int i;
- ; return 0; }
- EOF
--if { (eval echo configure:1910: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:1957: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
- rm -rf conftest*
- ac_cv_type_signal=void
- else
-@@ -1925,12 +1972,12 @@
-
-
- echo $ac_n "checking for vprintf""... $ac_c" 1>&6
--echo "configure:1929: checking for vprintf" >&5
-+echo "configure:1976: checking for vprintf" >&5
- if eval "test \"`echo '$''{'ac_cv_func_vprintf'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- cat > conftest.$ac_ext <<EOF
--#line 1934 "configure"
-+#line 1981 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char vprintf(); below. */
-@@ -1953,7 +2000,7 @@
-
- ; return 0; }
- EOF
--if { (eval echo configure:1957: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:2004: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_func_vprintf=yes"
- else
-@@ -1977,12 +2024,12 @@
-
- if test "$ac_cv_func_vprintf" != yes; then
- echo $ac_n "checking for _doprnt""... $ac_c" 1>&6
--echo "configure:1981: checking for _doprnt" >&5
-+echo "configure:2028: checking for _doprnt" >&5
- if eval "test \"`echo '$''{'ac_cv_func__doprnt'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- cat > conftest.$ac_ext <<EOF
--#line 1986 "configure"
-+#line 2033 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char _doprnt(); below. */
-@@ -2005,7 +2052,7 @@
-
- ; return 0; }
- EOF
--if { (eval echo configure:2009: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:2056: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_func__doprnt=yes"
- else
-@@ -2033,12 +2080,12 @@
- for ac_func in strncmp
- do
- echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
--echo "configure:2037: checking for $ac_func" >&5
-+echo "configure:2084: checking for $ac_func" >&5
- if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- cat > conftest.$ac_ext <<EOF
--#line 2042 "configure"
-+#line 2089 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char $ac_func(); below. */
-@@ -2061,7 +2108,7 @@
-
- ; return 0; }
- EOF
--if { (eval echo configure:2065: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:2112: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_func_$ac_func=yes"
- else
-@@ -2088,12 +2135,12 @@
- for ac_func in strdup strerror strtol strtoul nanosleep sched_setscheduler snprintf strncasecmp getdelim memcmp
- do
- echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
--echo "configure:2092: checking for $ac_func" >&5
-+echo "configure:2139: checking for $ac_func" >&5
- if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- cat > conftest.$ac_ext <<EOF
--#line 2097 "configure"
-+#line 2144 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char $ac_func(); below. */
-@@ -2116,7 +2163,7 @@
-
- ; return 0; }
- EOF
--if { (eval echo configure:2120: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:2167: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_func_$ac_func=yes"
- else
-@@ -2143,12 +2190,12 @@
- for ac_func in iopl ioperm usleep delay _sleep2
- do
- echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
--echo "configure:2147: checking for $ac_func" >&5
-+echo "configure:2194: checking for $ac_func" >&5
- if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- cat > conftest.$ac_ext <<EOF
--#line 2152 "configure"
-+#line 2199 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char $ac_func(); below. */
-@@ -2171,7 +2218,7 @@
-
- ; return 0; }
- EOF
--if { (eval echo configure:2175: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:2222: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_func_$ac_func=yes"
- else
-@@ -2199,12 +2246,12 @@
- for ac_func in getopt_long
- do
- echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
--echo "configure:2203: checking for $ac_func" >&5
-+echo "configure:2250: checking for $ac_func" >&5
- if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
- else
- cat > conftest.$ac_ext <<EOF
--#line 2208 "configure"
-+#line 2255 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char $ac_func(); below. */
-@@ -2227,7 +2274,7 @@
-
- ; return 0; }
- EOF
--if { (eval echo configure:2231: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:2278: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_func_$ac_func=yes"
- else
diff --git a/sysutils/isapnptools/patches/patch-ae b/sysutils/isapnptools/patches/patch-ae
deleted file mode 100644
index cc4ae131e79..00000000000
--- a/sysutils/isapnptools/patches/patch-ae
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ae,v 1.1.1.1 2002/07/23 12:07:45 agc Exp $
---- include/config.h.in Fri Apr 27 13:51:05 2001
-+++ include/config.h.in Mon Jul 22 07:48:39 2002
-@@ -142,6 +142,9 @@
- /* Define if you have the <unistd.h> header file. */
- #undef HAVE_UNISTD_H
-
-+/* Define if you have the i386 library (-li386). */
-+#undef HAVE_LIBI386
-+
- /* Name of package */
- #undef PACKAGE
-
diff --git a/sysutils/kapm/DESCR b/sysutils/kapm/DESCR
deleted file mode 100644
index 4e30f10dfad..00000000000
--- a/sysutils/kapm/DESCR
+++ /dev/null
@@ -1,12 +0,0 @@
-KAPM is a docking KDE utility that allows you to monitor your laptop's
-battery status and perform other APM (advanced power management)
-tasks.
-
- o Panel Docking KAPM displays a small bar on your panel depicting the
- status of your battery
-
- o Status Notification KAPM can optionally tell you when your battery
- is done charging or running low
-
- o Power Managment KAPM can suspend, standby, or power off your
- computer
diff --git a/sysutils/kapm/Makefile b/sysutils/kapm/Makefile
deleted file mode 100644
index 1ed060e0bd3..00000000000
--- a/sysutils/kapm/Makefile
+++ /dev/null
@@ -1,29 +0,0 @@
-# $NetBSD: Makefile,v 1.18 2003/07/13 17:52:50 wiz Exp $
-#
-
-DISTNAME= kapm-0.3.1
-PKGREVISION= 2
-CATEGORIES= sysutils x11 kde
-MASTER_SITES= ftp://bodnar42.dhs.org/pub/kapm/
-
-MAINTAINER= hubertf@netbsd.org
-HOMEPAGE= http://bodnar42.dhs.org/kapm/
-COMMENT= Monitor a laptop's battery status and perform other APM tasks
-
-.if !exists(/usr/include/machine/apmvar.h)
-PKG_SKIP_REASON= "APM is not available for ${MACHINE_PLATFORM}"
-.endif
-
-DEPENDS+= kdebase-1.1.2nb3:../../x11/kdebase
-
-USE_X11BASE= YES # to get things near KDE
-GNU_CONFIGURE= YES
-USE_LIBTOOL= yes
-LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
-
-EVAL_PREFIX+= QT1DIR=qt1
-CONFIGURE_ENV+= QTDIR=${QT1DIR}/qt1
-CONFIGURE_ENV+= MOC=${QT1DIR}/qt1/bin/moc
-CONFIGURE_ARGS+=--with-qt-dir=${QT1DIR}/qt1
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/kapm/PLIST b/sysutils/kapm/PLIST
deleted file mode 100644
index 0872417e07b..00000000000
--- a/sysutils/kapm/PLIST
+++ /dev/null
@@ -1,21 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 22:53:19 zuntum Exp $
-bin/kapm
-share/doc/kde/HTML/en/kapm/index-1.html
-share/doc/kde/HTML/en/kapm/index-2.html
-share/doc/kde/HTML/en/kapm/index-3.html
-share/doc/kde/HTML/en/kapm/index-4.html
-share/doc/kde/HTML/en/kapm/index.html
-share/doc/kde/HTML/en/kapm/index-5.html
-share/doc/kde/HTML/en/kapm/logotp3.gif
-share/doc/kde/HTML/en/kapm/index-6.html
-share/kde/applnk/System/kapm.kdelnk
-share/kde/icons/kapm.xpm
-share/kde/icons/mini/kapm.xpm
-share/kde/icons/kapm_critical.xpm
-share/kde/icons/kapm_high.xpm
-share/kde/icons/kapm_low.xpm
-share/kde/icons/kapm_unknown.xpm
-share/kde/icons/kapm_charging.gif
-share/kde/locale/de/LC_MESSAGES/kapm.mo
-share/kde/locale/ja/LC_MESSAGES/kapm.mo
-@dirrm share/doc/kde/HTML/en/kapm
diff --git a/sysutils/kapm/distinfo b/sysutils/kapm/distinfo
deleted file mode 100644
index 8d6a556fa0c..00000000000
--- a/sysutils/kapm/distinfo
+++ /dev/null
@@ -1,8 +0,0 @@
-$NetBSD: distinfo,v 1.4 2002/07/18 12:48:51 agc Exp $
-
-SHA1 (kapm-0.3.1.tar.gz) = c667582a076ce0185d3f909a243e4ec7ee69ba93
-Size (kapm-0.3.1.tar.gz) = 191413 bytes
-SHA1 (patch-aa) = 1b77d78f74ff21d180313b803741669927b8b1fd
-SHA1 (patch-ab) = b78aed68c97fa0c34025b06ae3ab1c5b2f03c0ba
-SHA1 (patch-ac) = fe38363be3b1bef59145f9c3a51acb47c86f47a7
-SHA1 (patch-ad) = cdfd6ada3729e0cbe621dc41e1b2c275aac6d0bf
diff --git a/sysutils/kapm/patches/patch-aa b/sysutils/kapm/patches/patch-aa
deleted file mode 100644
index 86bdb47272b..00000000000
--- a/sysutils/kapm/patches/patch-aa
+++ /dev/null
@@ -1,124 +0,0 @@
-$NetBSD: patch-aa,v 1.3 2002/07/18 12:48:51 agc Exp $
-
---- kapm/apm.cpp.orig Wed Oct 20 06:19:57 1999
-+++ kapm/apm.cpp
-@@ -10,6 +10,14 @@
- 6) Its packaged as an object
- */
-
-+#ifdef __NetBSD__
-+# include <assert.h>
-+# include <fcntl.h>
-+# include <sys/ioctl.h>
-+# include <machine/apmvar.h>
-+# include <string.h>
-+# include <unistd.h>
-+#endif /* __NetBSD__ */
- #include <stdio.h>
- #include <stdlib.h>
- #include "apm.h"
-@@ -29,6 +37,7 @@
-
- int apm::check() {
- #ifndef DEBUG
-+#if defined(Linux)
- FILE *str;
-
- if (!(str = fopen( APM_PROC, "r" )))
-@@ -43,6 +52,15 @@
-
- if (!(i.apm_flags & APM_32_BIT_SUPPORT))
- return 3;
-+#elif defined(__NetBSD__)
-+ int fd;
-+
-+ fd = open(APM_PROC, O_RDONLY);
-+ if (fd == -1)
-+ return 1;
-+
-+ return 0;
-+#endif /* Linux/__NetBSD__ */
- #else
- // Do initial kernel support emulation setup
-
-@@ -62,6 +80,7 @@
- void apm::read()
- {
- #ifndef DEBUG
-+#ifdef Linux
- FILE *str;
- char buffer[64];
-
-@@ -71,21 +90,61 @@
-
- sscanf( buffer, "%s %d.%d %x %x %x %x %d%% %d %s\n",
- (char *)i.driver_version,
-- &i.apm_version_major,
-- &i.apm_version_minor,
-- &i.apm_flags,
-- &i.ac_line_status,
-- (unsigned int*)(&i.battery_status),
-- &i.battery_flags,
-- (int*)(&i.battery_percentage),
-- &i.battery_time,
-- buffer ); // Scribble on our own buffer so save memories
-- i.using_minutes = (buffer[0] == *"m");
-+ &i.apm_version_major, /* HF: unused */
-+ &i.apm_version_minor, /* HF: unused */
-+ &i.apm_flags, /* HF: ? */
-+ &i.ac_line_status, /* HF: ac_state */
-+ (unsigned int*)(&i.battery_status), /* HF: battery_state */
-+ &i.battery_flags, /* HF: ? */
-+ (int*)(&i.battery_percentage), /* HF: battery_life */
-+ &i.battery_time, /* HF: minutes_left? */
-+ buffer ); // Scribble on our own buffer so save memories
-+ i.using_minutes = (buffer[0] == *"m"); /* HF: 1 */
-
- // Emulate a percentage if none is given
- if ((i.battery_percentage == -1) && (i.battery_status != -1))
- i.battery_percentage = (3 - i.battery_status) * 25;
--
-+
-+#elif defined(__NetBSD__)
-+
-+ int fd, rc;
-+ struct apm_power_info apm_pi;
-+
-+ fd = open(APM_PROC, O_RDONLY);
-+ assert(fd != -1);
-+ memset(&apm_pi, 0, sizeof(apm_pi));
-+ rc = ioctl(fd, APM_IOC_GETPOWER, &apm_pi);
-+ assert(rc != -1);
-+ close(fd);
-+
-+ (void) memset(i.driver_version, 0, sizeof(i.driver_version));
-+ (void) strcpy(i.driver_version, "NetBSD");
-+
-+ i.apm_version_major = 1;
-+ i.apm_version_minor = 1; /* May be 0 with APM_V10_ONLY
-+ - how to find out ? */
-+ i.apm_flags = 0; /* what's that? */
-+ i.ac_line_status = apm_pi.ac_state; /* one of APM_AC_OFF, APM_AC_ON,
-+ APM_AC_BACKUP, or
-+ APM_AC_UNKNOWN */
-+ i.battery_status = apm_pi.battery_state; /* one of APM_BATT_HIGH,
-+ APM_BATT_LOW,
-+ APM_BATT_CRITICAL,
-+ APM_BATT_CHARGING, or
-+ APM_BATT_UNKNOWN */
-+ i.battery_flags = 0; /* what's that? */
-+ i.battery_percentage = apm_pi.battery_life; /* percentage estimated
-+ remaining normal
-+ battery life (or 0 if
-+ the BIOS cannot provide
-+ an estimate) */
-+ i.battery_time = apm_pi.minutes_left; /* estimated remaining lifetime
-+ (or 0 if the BIOS cannot
-+ provide an estimate) */
-+ i.using_minutes = 1;
-+
-+#endif /* Linux, __NetBSD__ */
-+
- #else
- static char percent = 0;
-
diff --git a/sysutils/kapm/patches/patch-ab b/sysutils/kapm/patches/patch-ab
deleted file mode 100644
index 0bb3334a43a..00000000000
--- a/sysutils/kapm/patches/patch-ab
+++ /dev/null
@@ -1,30 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 1999/11/02 21:54:47 hubertf Exp $
-
---- kapm/apm.h.orig Tue Nov 2 06:27:22 1999
-+++ kapm/apm.h Tue Nov 2 06:31:39 1999
-@@ -1,6 +1,7 @@
- /* apm.h -- Header file for sample APM interface routines
- * Created: Mon Jan 8 11:40:50 1996 by r.faith@ieee.org
- * Revised: Mon Aug 2 23:57:43 1999 by bodnar42@bodnar42.dhs.org
-+ * NetBSD: Tue Nov 2 06:30:40 1999 by hubertf@netbsd.org
- * Copyright 1996 Rickard E. Faith (r.faith@ieee.org)
- *
- * This library is free software; you can redistribute it and/or modify it
-@@ -22,10 +23,14 @@
- #ifndef APM_H
- #define APM_H
-
--#define APM_PROC "/proc/apm"
--#define APM_DEVICE "/dev/apm_bios"
-+#if defined(Linux)
-+# define APM_PROC "/proc/apm"
-+# define APM_DEVICE "/dev/apm_bios"
-
--#define APM_32_BIT_SUPPORT 0x0002
-+# define APM_32_BIT_SUPPORT 0x0002
-+#elif defined(__NetBSD__)
-+# define APM_PROC "/dev/apm"
-+#endif /* Linux/__NetBSD__ */
-
- typedef struct apm_info {
- char driver_version[10];
diff --git a/sysutils/kapm/patches/patch-ac b/sysutils/kapm/patches/patch-ac
deleted file mode 100644
index 04ea9425c5e..00000000000
--- a/sysutils/kapm/patches/patch-ac
+++ /dev/null
@@ -1,29 +0,0 @@
-$NetBSD: patch-ac,v 1.2 1999/11/11 01:16:59 hubertf Exp $
-
---- kapm/kapm.cpp.orig Tue Nov 2 06:26:59 1999
-+++ kapm/kapm.cpp Tue Nov 2 06:27:36 1999
-@@ -85,15 +85,23 @@
- }
-
- void Kapm::slotSuspend() {
-+#ifdef __NetBSD__
-+ suApp("/usr/sbin/apm -z", i18n("suspend"));
-+#else /* !__NetBSD__ */
- suApp("apm -s", i18n("suspend"));
-+#endif /* __NetBSD__ */
- }
-
- void Kapm::slotStandby() {
-- suApp("apm -S", i18n("standby"));
-+ suApp("/usr/sbin/apm -S", i18n("standby")); /* -S is for NetBSD and Linux */
- }
-
- void Kapm::slotPowerOff() {
-+#ifdef __NetBSD__
-+ suApp("/sbin/halt -p", i18n("power off"), true);
-+#else /* !__NetBSD__ */
- suApp("poweroff", i18n("power off"), true);
-+#endif /* __NetBSD__ */
- }
-
- void Kapm::slotAPMStatus() {
diff --git a/sysutils/kapm/patches/patch-ad b/sysutils/kapm/patches/patch-ad
deleted file mode 100644
index a2ec71d5753..00000000000
--- a/sysutils/kapm/patches/patch-ad
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-ad,v 1.1 1999/11/11 02:04:19 hubertf Exp $
-
---- kapm/sudlg.cpp.orig Thu Nov 11 02:28:45 1999
-+++ kapm/sudlg.cpp Thu Nov 11 02:29:57 1999
-@@ -78,8 +78,15 @@
-
- password = "\"" + password + "\"";
-
-+#if defined(__linux__)
- proc << "echo " << password.data() << " | ";
- proc << "su" << "-c" << "true";
-+#elif defined(__NetBSD__)
-+ proc << "echo " << password.data() << " | ";
-+ proc << "su" << "root" << "-c" << "true";
-+#else
-+#error man su
-+#endif
-
- proc.start(KProcess::Block);
-
diff --git a/sysutils/kdf/DESCR b/sysutils/kdf/DESCR
deleted file mode 100644
index 00a7dddf7d1..00000000000
--- a/sysutils/kdf/DESCR
+++ /dev/null
@@ -1,9 +0,0 @@
-KDiskFree shows your harddisk-(floppy...)usage graphically and
-lets you simply mount/umount devices by clicking on its name.
-You can even configure a special mount/umount command for each device.
-Also a filemanager is opened if you click on the mountpoint.
-It is linked into the KControlCenter in the category "information"
-but also under the start-menu hierarchy [System].
-You also may start it simply by typing kdf.
-KwikDisk docks into the KPanel and gives you quick access to
-mount/umount your devices.
diff --git a/sysutils/kdf/Makefile b/sysutils/kdf/Makefile
deleted file mode 100644
index b78efc218c1..00000000000
--- a/sysutils/kdf/Makefile
+++ /dev/null
@@ -1,34 +0,0 @@
-# $NetBSD: Makefile,v 1.18 2003/07/13 13:53:18 wiz Exp $
-#
-
-DISTNAME= kdf-0.5.1
-PKGREVISION= 2
-CATEGORIES= sysutils kde
-MASTER_SITES= ftp://ftp.us.kde.org/pub/kde/stable/1.1.2/apps/utils/
-EXTRACT_SUFX= .tgz
-
-MAINTAINER= hubertf@netbsd.org
-HOMEPAGE= http://www.edu.uni-klu.ac.at/~mkropfbe
-COMMENT= Shows disk usage graphically and lets you mount/umount devices
-
-BUILD_USES_MSGFMT= yes
-
-USE_BUILDLINK2= YES
-USE_LIBTOOL= YES
-USE_X11BASE= YES
-GNU_CONFIGURE= YES
-LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig
-
-CONFIGURE_ARGS+=--datadir=${BUILDLINK_PREFIX.kdebase}/share/kde \
- --with-qt-dir=${QTDIR} \
- --enable-path-check
-CONFIGURE_ENV= KDEDIR=${BUILDLINK_PREFIX.kdebase} \
- CXXFLAGS="${CFLAGS}" \
- all_libraries="${KDE_LDFLAGS}"
-
-FIX_RPATH+= KDE_LDFLAGS
-KDE_LDFLAGS= -L${LOCALBASE}/lib -Wl,${RPATH_FLAG}${LOCALBASE}/lib -L${X11BASE}/lib -Wl,${RPATH_FLAG}${X11BASE}/lib
-
-.include "../../devel/gettext-lib/buildlink2.mk"
-.include "../../x11/kdebase/buildlink2.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/kdf/PLIST b/sysutils/kdf/PLIST
deleted file mode 100644
index 4829f0e6107..00000000000
--- a/sysutils/kdf/PLIST
+++ /dev/null
@@ -1,26 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 22:53:20 zuntum Exp $
-bin/kcmdf
-bin/kdf
-bin/kwikdisk
-share/kde/locale/de/LC_MESSAGES/kdf.mo
-share/kde/locale/fi/LC_MESSAGES/kdf.mo
-share/kde/locale/fr/LC_MESSAGES/kdf.mo
-share/kde/applnk/System/kdf.kdelnk
-share/kde/applnk/Settings/Information/kcmdf.kdelnk
-share/kde/applnk/System/kwikdisk.kdelnk
-share/kde/doc/HTML/de/kcontrol/kdf/index.html
-share/kde/doc/HTML/de/kdf/index.html
-share/kde/doc/HTML/en/kcontrol/kdf/index.html
-share/kde/doc/HTML/en/kdf/index.html
-@dirrm share/kde/doc/HTML/de/kcontrol/kdf
-@dirrm share/kde/doc/HTML/de/kdf
-@dirrm share/kde/doc/HTML/en/kcontrol/kdf
-@dirrm share/kde/doc/HTML/en/kdf
-share/kde/icons/kdf.xpm
-share/kde/icons/kcmdf.xpm
-share/kde/icons/kwikdisk.xpm
-share/kde/icons/mini/kdf.xpm
-share/kde/icons/mini/kcmdf.xpm
-share/kde/icons/mini/kwikdisk.xpm
-share/kde/icons/mini/nfs_mount.xpm
-share/kde/icons/mini/nfs_unmount.xpm
diff --git a/sysutils/kdf/distinfo b/sysutils/kdf/distinfo
deleted file mode 100644
index d21776854b1..00000000000
--- a/sysutils/kdf/distinfo
+++ /dev/null
@@ -1,9 +0,0 @@
-$NetBSD: distinfo,v 1.4 2002/10/23 11:54:03 wiz Exp $
-
-SHA1 (kdf-0.5.1.tgz) = 66f8fa8fde7ec9984e1c89d041df8a543ad06a74
-Size (kdf-0.5.1.tgz) = 193989 bytes
-SHA1 (patch-aa) = 0e1945b2fc33780ab6c156a23e5dcc7202ab171b
-SHA1 (patch-ab) = 8f7fa93665371eda1448317cd12db2e68c49034e
-SHA1 (patch-ac) = 297143df78c6939b6ed1f752b44d49e0415d64af
-SHA1 (patch-ad) = bc98f04ee70b716209805a4c4af62157dc6a9e6b
-SHA1 (patch-ae) = 8a97c64ee1916149b80c390877c1379e3997d62f
diff --git a/sysutils/kdf/patches/patch-aa b/sysutils/kdf/patches/patch-aa
deleted file mode 100644
index 9055cdddd02..00000000000
--- a/sysutils/kdf/patches/patch-aa
+++ /dev/null
@@ -1,81 +0,0 @@
-$NetBSD: patch-aa,v 1.4 2002/10/23 11:54:03 wiz Exp $
-
---- configure.orig Sun Apr 18 12:19:40 1999
-+++ configure
-@@ -505,9 +505,9 @@ srcdir=`echo "${srcdir}" | sed 's%\([^/]
- # Prefer explicitly selected file to automatically selected ones.
- if test -z "$CONFIG_SITE"; then
- if test "x$prefix" != xNONE; then
-- CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
-+ CONFIG_SITE="$prefix/share/kde/config.site $prefix/etc/config.site"
- else
-- CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
-+ CONFIG_SITE="$ac_default_prefix/share/kde/config.site $ac_default_prefix/etc/config.site"
- fi
- fi
- for ac_site_file in $CONFIG_SITE; do
-@@ -2182,7 +2182,7 @@ for ac_kw in inline __inline__ __inline;
- #include "confdefs.h"
-
- int main() {
--} $ac_kw foo() {
-+} $ac_kw int foo() {
- ; return 0; }
- EOF
- if { (eval echo configure:2189: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-@@ -4065,17 +4065,17 @@ echo "configure:4064: checking for KDE p
-
-
- if test "$ac_use_path_checking" = "default"; then
-- kde_htmldir="\$(prefix)/share/doc/HTML"
-- kde_appsdir="\$(prefix)/share/applnk"
-- kde_icondir="\$(prefix)/share/icons"
-- kde_minidir="\$(prefix)/share/icons/mini"
-- kde_datadir="\$(prefix)/share/apps"
-- kde_locale="\$(prefix)/share/locale"
-+ kde_htmldir="\$(prefix)/share/kde/doc/HTML"
-+ kde_appsdir="\$(prefix)/share/kde/applnk"
-+ kde_icondir="\$(prefix)/share/kde/icons"
-+ kde_minidir="\$(prefix)/share/kde/icons/mini"
-+ kde_datadir="\$(prefix)/share/kde/apps"
-+ kde_locale="\$(prefix)/share/kde/locale"
- kde_cgidir="\$(exec_prefix)/cgi-bin"
-- kde_confdir="\$(prefix)/share/config"
-- kde_mimedir="\$(prefix)/share/mimelnk"
-- kde_toolbardir="\$(prefix)/share/toolbar"
-- kde_wallpaperdir="\$(prefix)/share/wallpapers"
-+ kde_confdir="\$(prefix)/share/kde/config"
-+ kde_mimedir="\$(prefix)/share/kde/mimelnk"
-+ kde_toolbardir="\$(prefix)/share/kde/toolbar"
-+ kde_wallpaperdir="\$(prefix)/share/kde/wallpapers"
- kde_bindir="\$(exec_prefix)/bin"
- kde_partsdir="\$(exec_prefix)/parts"
- echo "$ac_t""defaults" 1>&6
-@@ -4240,17 +4240,17 @@ echo "configure:4239: checking for KDE p
-
-
- if test "default" = "default"; then
-- kde_htmldir="\$(prefix)/share/doc/HTML"
-- kde_appsdir="\$(prefix)/share/applnk"
-- kde_icondir="\$(prefix)/share/icons"
-- kde_minidir="\$(prefix)/share/icons/mini"
-- kde_datadir="\$(prefix)/share/apps"
-- kde_locale="\$(prefix)/share/locale"
-+ kde_htmldir="\$(prefix)/share/kde/doc/HTML"
-+ kde_appsdir="\$(prefix)/share/kde/applnk"
-+ kde_icondir="\$(prefix)/share/kde/icons"
-+ kde_minidir="\$(prefix)/share/kde/icons/mini"
-+ kde_datadir="\$(prefix)/share/kde/apps"
-+ kde_locale="\$(prefix)/share/kde/locale"
- kde_cgidir="\$(exec_prefix)/cgi-bin"
-- kde_confdir="\$(prefix)/share/config"
-- kde_mimedir="\$(prefix)/share/mimelnk"
-- kde_toolbardir="\$(prefix)/share/toolbar"
-- kde_wallpaperdir="\$(prefix)/share/wallpapers"
-+ kde_confdir="\$(prefix)/share/kde/config"
-+ kde_mimedir="\$(prefix)/share/kde/mimelnk"
-+ kde_toolbardir="\$(prefix)/share/kde/toolbar"
-+ kde_wallpaperdir="\$(prefix)/share/kde/wallpapers"
- kde_bindir="\$(exec_prefix)/bin"
- kde_partsdir="\$(exec_prefix)/parts"
- echo "$ac_t""defaults" 1>&6
diff --git a/sysutils/kdf/patches/patch-ab b/sysutils/kdf/patches/patch-ab
deleted file mode 100644
index eca8317479d..00000000000
--- a/sysutils/kdf/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 1999/07/03 23:27:47 hubertf Exp $
-
---- po/Makefile.in.orig Sun Jul 4 01:02:17 1999
-+++ po/Makefile.in Sun Jul 4 01:02:25 1999
-@@ -119,7 +119,7 @@
- x_includes = @x_includes@
- x_libraries = @x_libraries@
-
--GMOFILES = de.gmo fi.gmo po.gmo fr.gmo
-+GMOFILES = de.gmo fi.gmo fr.gmo
-
- POFILES = $(GMOFILES:.gmo=.po)
- TARGET = kdf
diff --git a/sysutils/kdf/patches/patch-ac b/sysutils/kdf/patches/patch-ac
deleted file mode 100644
index b6a3e1d0bd2..00000000000
--- a/sysutils/kdf/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2002/08/20 18:48:34 skrll Exp $
-
---- kdf/disks.h.orig Tue Aug 20 20:44:18 2002
-+++ kdf/disks.h
-@@ -80,7 +80,7 @@ public:
- float percentFull() const;
-
- signals:
-- void sysCallError(DiskEntry *disk, int errno);
-+ void sysCallError(DiskEntry *disk, int syscall_errno);
- void deviceNameChanged();
- void mountPointChanged();
- void mountOptionsChanged();
diff --git a/sysutils/kdf/patches/patch-ad b/sysutils/kdf/patches/patch-ad
deleted file mode 100644
index 28ee5c9beea..00000000000
--- a/sysutils/kdf/patches/patch-ad
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2002/08/20 18:48:35 skrll Exp $
-
---- kdf/kwikdisk.cpp.orig Sun Mar 21 14:59:50 1999
-+++ kdf/kwikdisk.cpp
-@@ -221,9 +221,9 @@ void DockWidget::mousePressEvent(QMouseE
- updateDF();
- };
-
--void DockWidget::sysCallError(DiskEntry *disk, int errno)
-+void DockWidget::sysCallError(DiskEntry *disk, int syscall_errno)
- {
-- if (errno!=0)
-+ if (syscall_errno!=0)
- KMsgBox::message(this,klocale->translate("KwikDisk"),
- disk->lastSysError(),KMsgBox::STOP);
- };
diff --git a/sysutils/kdf/patches/patch-ae b/sysutils/kdf/patches/patch-ae
deleted file mode 100644
index 489251100f9..00000000000
--- a/sysutils/kdf/patches/patch-ae
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ae,v 1.1 2002/08/20 18:48:35 skrll Exp $
-
---- kdf/kwikdisk.h.orig Sun Mar 21 14:51:24 1999
-+++ kdf/kwikdisk.h
-@@ -99,7 +99,7 @@ private slots:
- void updateDF();
- void updateDFDone();
- void setUpdateFreq(int freq);
-- void sysCallError(DiskEntry *disk, int errno);
-+ void sysCallError(DiskEntry *disk, int syscall_errno);
-
- protected:
- void mousePressEvent(QMouseEvent *);
diff --git a/sysutils/kdirstat/DESCR b/sysutils/kdirstat/DESCR
deleted file mode 100644
index 061f58b0b5a..00000000000
--- a/sysutils/kdirstat/DESCR
+++ /dev/null
@@ -1,3 +0,0 @@
-KDirStat is a graphical disk usage utility, very much like the Unix "du"
-command. In addition to that, it comes with some cleanup facilities to reclaim
-disk space.
diff --git a/sysutils/kdirstat/Makefile b/sysutils/kdirstat/Makefile
deleted file mode 100644
index c620691d4ad..00000000000
--- a/sysutils/kdirstat/Makefile
+++ /dev/null
@@ -1,19 +0,0 @@
-# $NetBSD: Makefile,v 1.2 2003/07/13 13:53:18 wiz Exp $
-
-DISTNAME= kdirstat-2.3.7
-PKGREVISION= 1
-CATEGORIES= sysutils kde
-MASTER_SITES= http://kdirstat.sourceforge.net/download/
-EXTRACT_SUFX= .tar.bz2
-
-MAINTAINER= markd@netbsd.org
-HOMEPAGE= http://kdirstat.sourceforge.net
-COMMENT= A graphical disk usage utility
-
-USE_BUILDLINK2= yes
-USE_GMAKE= yes
-GNU_CONFIGURE= yes
-
-.include "../../x11/kde3/buildlink2.mk"
-.include "../../x11/kdelibs3/buildlink2.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/kdirstat/PLIST b/sysutils/kdirstat/PLIST
deleted file mode 100644
index 698f7e3144a..00000000000
--- a/sysutils/kdirstat/PLIST
+++ /dev/null
@@ -1,34 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2003/06/05 12:44:47 markd Exp $
-bin/kdirstat
-share/doc/kde/HTML/en/kdirstat/common
-share/doc/kde/HTML/en/kdirstat/feedback-mail.png
-share/doc/kde/HTML/en/kdirstat/index.cache.bz2
-share/doc/kde/HTML/en/kdirstat/index.docbook
-share/doc/kde/HTML/en/kdirstat/kdirstat-config-cleanups.png
-share/doc/kde/HTML/en/kdirstat/kdirstat-config-tree-colors.png
-share/doc/kde/HTML/en/kdirstat/kdirstat-main.png
-share/kde/applnk/Utilities/kdirstat.desktop
-share/kde/apps/kdirstat/icons/hicolor/16x16/actions/symlink.png
-share/kde/apps/kdirstat/icons/hicolor/32x32/actions/symlink.png
-share/kde/apps/kdirstat/icons/hicolor/48x48/actions/symlink.png
-share/kde/apps/kdirstat/icons/locolor/16x16/actions/symlink.png
-share/kde/apps/kdirstat/kdirstatui.rc
-share/kde/icons/hicolor/16x16/apps/kdirstat.png
-share/kde/icons/hicolor/32x32/apps/kdirstat.png
-share/kde/icons/locolor/16x16/apps/kdirstat.png
-share/kde/icons/locolor/32x32/apps/kdirstat.png
-share/kde/locale/fr/LC_MESSAGES/kdirstat.mo
-share/kde/locale/ja/LC_MESSAGES/kdirstat.mo
-@dirrm share/kde/apps/kdirstat/icons/locolor/16x16/actions
-@dirrm share/kde/apps/kdirstat/icons/locolor/16x16
-@dirrm share/kde/apps/kdirstat/icons/locolor
-@dirrm share/kde/apps/kdirstat/icons/hicolor/48x48/actions
-@dirrm share/kde/apps/kdirstat/icons/hicolor/48x48
-@dirrm share/kde/apps/kdirstat/icons/hicolor/32x32/actions
-@dirrm share/kde/apps/kdirstat/icons/hicolor/32x32
-@dirrm share/kde/apps/kdirstat/icons/hicolor/16x16/actions
-@dirrm share/kde/apps/kdirstat/icons/hicolor/16x16
-@dirrm share/kde/apps/kdirstat/icons/hicolor
-@dirrm share/kde/apps/kdirstat/icons
-@dirrm share/kde/apps/kdirstat
-@dirrm share/doc/kde/HTML/en/kdirstat
diff --git a/sysutils/kdirstat/distinfo b/sysutils/kdirstat/distinfo
deleted file mode 100644
index f17f1f42831..00000000000
--- a/sysutils/kdirstat/distinfo
+++ /dev/null
@@ -1,4 +0,0 @@
-$NetBSD: distinfo,v 1.1.1.1 2003/06/05 12:44:46 markd Exp $
-
-SHA1 (kdirstat-2.3.7.tar.bz2) = ae4441d097bf19e52c7fa8dd2bc3f0f5cd8aae9e
-Size (kdirstat-2.3.7.tar.bz2) = 633379 bytes
diff --git a/sysutils/klavg/DESCR b/sysutils/klavg/DESCR
deleted file mode 100644
index e9f19450f9f..00000000000
--- a/sysutils/klavg/DESCR
+++ /dev/null
@@ -1,10 +0,0 @@
-This is a small KDE applet showing the load average graph on the
-panel. You can customize colors and the refresh rate. It also allows one
-to execute a command on receiving a mouse click.
-
-After starting, it puts itself in the docking area on the panel. If
-session support is enabled, it will restart itself the next time the user9
-logs in.
-
-Pressing the right mouse button shows the menu. Pressing the left mouse
-button executes the configured command.
diff --git a/sysutils/klavg/Makefile b/sysutils/klavg/Makefile
deleted file mode 100644
index 73ff2f9f57f..00000000000
--- a/sysutils/klavg/Makefile
+++ /dev/null
@@ -1,18 +0,0 @@
-# $NetBSD: Makefile,v 1.8 2003/07/13 17:58:33 wiz Exp $
-#
-
-DISTNAME= klavg-1.1
-PKGREVISION= 2
-WRKSRC= ${WRKDIR}/klavg
-CATEGORIES= kde sysutils
-MASTER_SITES= ftp://ftp.crocodile.org/pub/
-
-MAINTAINER= hubertf@netbsd.org
-HOMEPAGE= http://www.crocodile.org/software.html
-COMMENT= Xload for the KDE panel
-
-DEPENDS+= kdebase-1.1.2nb3:../../x11/kdebase
-
-USE_X11BASE= yes
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/klavg/PLIST b/sysutils/klavg/PLIST
deleted file mode 100644
index bfe05239f72..00000000000
--- a/sysutils/klavg/PLIST
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 22:53:21 zuntum Exp $
-bin/klavg
diff --git a/sysutils/klavg/distinfo b/sysutils/klavg/distinfo
deleted file mode 100644
index a02c1e237a3..00000000000
--- a/sysutils/klavg/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.2 2001/04/19 11:29:04 agc Exp $
-
-SHA1 (klavg-1.1.tar.gz) = 9eb8eb8296aee655aa7a007676aae2d4611806c4
-Size (klavg-1.1.tar.gz) = 15225 bytes
-SHA1 (patch-aa) = 7a027f64e30892199cce3203eaae6f0bf0b596ef
-SHA1 (patch-ab) = 5a023d20eb73ba9f0eb8181423e70bdcf36bc706
diff --git a/sysutils/klavg/patches/patch-aa b/sysutils/klavg/patches/patch-aa
deleted file mode 100644
index 005ffe6b4f2..00000000000
--- a/sysutils/klavg/patches/patch-aa
+++ /dev/null
@@ -1,35 +0,0 @@
-$NetBSD: patch-aa,v 1.3 2000/05/12 12:41:43 kleink Exp $
-
---- Makefile.orig Wed Apr 12 20:06:49 2000
-+++ Makefile Wed Apr 12 20:05:44 2000
-@@ -3,15 +3,18 @@
- KLAVGVER=1.1
-
-+QTDIR= ${X11BASE}/qt1
-+KDEDIR= ${X11BASE}
-+
- #------------
-
--INCDIR = -I$(QTDIR)/include -I$(KDEDIR)/include -I/usr/include/qt
--CFLAGS = -DKLAVGVERSION=\"$(KLAVGVER)\" -O2 -fno-strength-reduce -Wall -W -I/usr/X11R6/include
-+INCDIR = -I$(QTDIR)/include -I$(KDEDIR)/include
-+CFLAGS = -DKLAVGVERSION=\"$(KLAVGVER)\" -O2 -fno-strength-reduce -Wall -W -I${X11BASE}/include
- LIBCFLAGS =
--LFLAGS = -L/usr/X11R6/lib -L$(QTDIR)/lib -L$(KDEDIR)/lib \
-+LFLAGS = -L${X11BASE}/lib -Wl,-R${X11BASE}/lib -L$(QTDIR)/lib -Wl,-R$(QTDIR)/lib -L$(KDEDIR)/lib -Wl,-R$(KDEDIR)/lib \
- -lqt -lkdecore -lkdeui -lkfile -lkfm -lXext -lX11
-
- CC = gcc
--#MOC = $(QTDIR)/bin/moc
--MOC = moc
-+MOC = $(QTDIR)/bin/moc
-+#MOC = moc
- SHELL = /bin/sh
-
-@@ -62,5 +65,3 @@
-
- install: $(TARGET)
-- cp klavg /usr/bin
-- chown root:root /usr/bin/klavg
-- chmod a=rx,go-w /usr/bin/klavg
-+ ${BSD_INSTALL_PROGRAM} klavg ${PREFIX}/bin/klavg
diff --git a/sysutils/klavg/patches/patch-ab b/sysutils/klavg/patches/patch-ab
deleted file mode 100644
index 7b42cde162d..00000000000
--- a/sysutils/klavg/patches/patch-ab
+++ /dev/null
@@ -1,59 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 1999/11/06 15:57:41 hubertf Exp $
-
---- klavg.cc.orig Mon Jun 28 08:44:35 1999
-+++ klavg.cc Fri Nov 5 14:38:09 1999
-@@ -33,7 +33,9 @@
-
- #include "klavg.h"
-
-+#ifdef __linux__
- #define LAVG_FILE "/proc/loadavg"
-+#endif
-
- KLavg::KLavg()
- {
-@@ -70,13 +72,13 @@
- KConfig *kconfig = kapp->getConfig();
-
- kconfig->setGroup("General");
-- cfg.refresh_rate = kconfig->readNumEntry("RefreshRate",1 );
-- cfg.cmd = kconfig->readEntry("Command" ,"ktop");
-+ cfg.refresh_rate = kconfig->readNumEntry("RefreshRate",5 );
-+ cfg.cmd = kconfig->readEntry("Command" ,"xterm -e top");
-
- kconfig->setGroup("Colours");
-- cfg.bg_colour = kconfig->readColorEntry ("Background",&black );
-- cfg.fg_colour = kconfig->readColorEntry ("Foreground",&yellow);
-- cfg.grid_colour = kconfig->readColorEntry ("Grid" ,&red );
-+ cfg.bg_colour = kconfig->readColorEntry ("Background",&gray );
-+ cfg.fg_colour = kconfig->readColorEntry ("Foreground",&black);
-+ cfg.grid_colour = kconfig->readColorEntry ("Grid" ,&cyan );
- }
-
- void KLavg::saveCfg()
-@@ -167,6 +169,14 @@
-
- float KLavg::getLAVG()
- {
-+#if defined(__NetBSD__)
-+
-+ double res;
-+ getloadavg(&res, 1); // Mmm, abstract OS interfaces :-)
-+ return (float)res;
-+
-+#elif defined(__linux__)
-+
- FILE *f=fopen(LAVG_FILE,"r");
- if(!f)
- return 0.0;
-@@ -177,6 +187,10 @@
-
- //fprintf(stderr,"LAVG=%f\n",res);
- return res;
-+
-+#else
-+#error Sorry, no load gathering available.
-+#endif
- }
-
- int main(int ac, char **av)
diff --git a/sysutils/koncd/DESCR b/sysutils/koncd/DESCR
deleted file mode 100644
index 435ce4e034d..00000000000
--- a/sysutils/koncd/DESCR
+++ /dev/null
@@ -1,15 +0,0 @@
-KOnCD is a frontend to the fabulous cdrecord and mkisofs programs, with a easy
-to use Graphical-User-Interface and it's running under Linux / KDE.
-
-KOnCD features:
-
- - Easy setup and intuitive KDE user interface
- - GUI based on the KDE and QT librarys
- - Runs on most Linux-Operation-Systems based on KDE
- - Supports most SCSI-CD Writers available and most ATAPI CD-Writers with
- ATAPI-SCSI emulation !
- - CD Tools: blanking a (corrupt) cd-rw, fixating a corrupt disk
- - Copies most data/mixed-mode/audio-CDs on-the-fly !
- - Creates multisession and bootable CDs
- - Creates audio CDs from .wav files
- - Disk-at-Once and Burn-Proof support !
diff --git a/sysutils/koncd/Makefile b/sysutils/koncd/Makefile
deleted file mode 100644
index d5922142d8c..00000000000
--- a/sysutils/koncd/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# $NetBSD: Makefile,v 1.9 2003/07/13 13:53:19 wiz Exp $
-
-DISTNAME= koncd-0.7.1
-PKGREVISION= 3
-CATEGORIES= sysutils
-MASTER_SITES= ${HOMEPAGE}download/
-
-MAINTAINER= wulf@netbsd.org
-HOMEPAGE= http://www.koncd.de/
-COMMENT= Frontend to the fabulous cdrecord and mkisofs programs
-
-BUILD_DEPENDS+= qt2-designer-kde>=2.3.1nb2:../../x11/qt2-designer-kde
-DEPENDS+= cdrecord>=1.9:../../sysutils/cdrecord
-
-USE_BUILDLINK2= YES
-GNU_CONFIGURE= YES
-
-.include "../../x11/kde2/buildlink2.mk"
-.include "../../x11/kdebase2/buildlink2.mk"
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/koncd/PLIST b/sysutils/koncd/PLIST
deleted file mode 100644
index 6694d73c531..00000000000
--- a/sysutils/koncd/PLIST
+++ /dev/null
@@ -1,43 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2001/11/13 21:26:58 jlam Exp $
-bin/koncd
-share/doc/kde/HTML/en/koncd/images/audiocd.jpg
-share/doc/kde/HTML/en/koncd/images/copycd.jpg
-share/doc/kde/HTML/en/koncd/images/imagetype.jpg
-share/doc/kde/HTML/en/koncd/images/koncd_logo.jpg
-share/doc/kde/HTML/en/koncd/images/mastercd.jpg
-share/doc/kde/HTML/en/koncd/images/setup.jpg
-share/doc/kde/HTML/en/koncd/images/tools.jpg
-share/doc/kde/HTML/en/koncd/audio_cd.htm
-share/doc/kde/HTML/en/koncd/copy_cd.htm
-share/doc/kde/HTML/en/koncd/index.html
-share/doc/kde/HTML/en/koncd/master_cd.htm
-share/doc/kde/HTML/en/koncd/setup.htm
-share/doc/kde/HTML/en/koncd/tips.htm
-share/doc/kde/HTML/en/koncd/tools.htm
-share/doc/kde/HTML/de/koncd/images/audiocd_de.jpg
-share/doc/kde/HTML/de/koncd/images/copycd_de.jpg
-share/doc/kde/HTML/de/koncd/images/imagetype_de.jpg
-share/doc/kde/HTML/de/koncd/images/koncd_logo_de.jpg
-share/doc/kde/HTML/de/koncd/images/mastercd_de.jpg
-share/doc/kde/HTML/de/koncd/images/setup_de.jpg
-share/doc/kde/HTML/de/koncd/images/tools_de.jpg
-share/doc/kde/HTML/de/koncd/audio_cd.htm
-share/doc/kde/HTML/de/koncd/einstellungen.htm
-share/doc/kde/HTML/de/koncd/erzeuge_cd.htm
-share/doc/kde/HTML/de/koncd/index.html
-share/doc/kde/HTML/de/koncd/kopiere_cd.htm
-share/doc/kde/HTML/de/koncd/tipps.htm
-share/doc/kde/HTML/de/koncd/werkzeuge.htm
-share/kde/applnk/Multimedia/koncd.desktop
-share/kde/icons/locolor/32x32/apps/koncd.png
-share/kde/icons/locolor/16x16/apps/koncd.png
-share/kde/icons/hicolor/32x32/apps/koncd.png
-share/kde/icons/hicolor/16x16/apps/koncd.png
-share/kde/locale/de/LC_MESSAGES/koncd.mo
-@unexec ${RMDIR} %D/share/kde/locale/de/LC_MESSAGES 2>/dev/null || ${TRUE}
-@unexec ${RMDIR} %D/share/kde/locale/de 2>/dev/null || ${TRUE}
-@dirrm share/doc/kde/HTML/en/koncd/images
-@dirrm share/doc/kde/HTML/en/koncd
-@dirrm share/doc/kde/HTML/de/koncd/images
-@dirrm share/doc/kde/HTML/de/koncd
-@unexec ${RMDIR} %D/share/doc/kde/HTML/de 2>/dev/null || ${TRUE}
diff --git a/sysutils/koncd/distinfo b/sysutils/koncd/distinfo
deleted file mode 100644
index c35348cd766..00000000000
--- a/sysutils/koncd/distinfo
+++ /dev/null
@@ -1,9 +0,0 @@
-$NetBSD: distinfo,v 1.5 2001/11/13 21:26:58 jlam Exp $
-
-SHA1 (koncd-0.7.1.tar.gz) = db387b3cd83c3a50d96175ef2a5b5ed98eec05b2
-Size (koncd-0.7.1.tar.gz) = 1286825 bytes
-SHA1 (patch-aa) = 8e726fdf59fd22ab628791d2650b2749ababa910
-SHA1 (patch-ab) = d63c278ee45f49f64fcb4edb9bc133ce54cde5ec
-SHA1 (patch-ac) = a216dfc85f7e274263544f76c0e98f323dad0153
-SHA1 (patch-ad) = 9145a6bd0800431eb98ed025740d62c12ffd5611
-SHA1 (patch-ae) = f163837afe101c8115168eb106f653769b9fc7ec
diff --git a/sysutils/koncd/patches/patch-aa b/sysutils/koncd/patches/patch-aa
deleted file mode 100644
index cbac95a5f6e..00000000000
--- a/sysutils/koncd/patches/patch-aa
+++ /dev/null
@@ -1,115 +0,0 @@
-$NetBSD: patch-aa,v 1.3 2001/06/13 12:41:09 bouyer Exp $
-
---- koncd/cddata.cpp.orig Wed Jun 13 12:04:10 2001
-+++ koncd/cddata.cpp Wed Jun 13 13:32:12 2001
-@@ -13,10 +13,39 @@
- #include <unistd.h>
- #include "cddata.h"
-
-+#include "config.h"
-+
-+#ifdef HAVE_GETRAWPARTITION
-+# include <util.h>
-+#endif
-+
- static int CurBus;
- struct DEVICES *CurDev;
-
- CDdata::CDdata( QObject * , const char * ) {
-+#ifdef __NetBSD__
-+ int i;
-+ char prog2[128];
-+ int raw;
-+
-+ Devices = NULL;
-+ strncpy( prog, "scsictl", sizeof( prog ) - 1);
-+ connect( &proc, SIGNAL(receivedStdout (KProcess *, char *, int) ),
-+ this, SLOT(slotOutput (KProcess *, char *, int) ));
-+#ifdef HAVE_GETRAWPARTITION
-+ raw = getrawpartition();
-+#else
-+ raw = 'c' - 'a';
-+#endif
-+ for (i = 0; i < 8; i++) {
-+ proc.clearArguments();
-+ snprintf(prog2, sizeof( prog2 ) - 1, "/dev/rcd%d%c",i,
-+ 'a' + raw);
-+ proc << prog << prog2 << "identify";
-+ proc.start( KProcess::Block, KProcess::AllOutput );
-+ }
-+#else
-+
- Devices = NULL;
- strncpy( prog, "cdrecord", sizeof( prog ) - 1);
- proc << prog << "-scanbus";
-@@ -25,6 +54,7 @@
- connect( &proc, SIGNAL(receivedStdout (KProcess *, char *, int) ),
- this, SLOT(slotOutput (KProcess *, char *, int) ));
- proc.start( KProcess::Block, KProcess::AllOutput );
-+#endif /* __NetBSD__ */
- sprintf( dummystr,"dev=unknown" );
-
- struct DEVICES *d;
-@@ -100,14 +130,53 @@
- char *c, *b, buf[1024];
- struct DEVICES *dev;
- unsigned i;
-+#ifdef __NetBSD__
-+ int raw;
-+
-+#ifdef HAVE_GETRAWPARTITION
-+ raw = getrawpartition();
-+#else
-+ raw = 'c' - 'a';
-+#endif
-+#endif /* __NetBSD__ */
-
- if( !n ) {
- return;
- }
- bzero( buf, sizeof( buf ) );
-- strncpy( buf, s, n > (int) sizeof( buf ) ? sizeof(buf) - 1 : n );
-+ strncpy( buf, s, n >= (int) sizeof( buf ) ? sizeof(buf) - 1 : n );
- output += buf;
-
-+#ifdef __NetBSD__
-+ if (strncmp(buf, "/dev/rcd", 8) != 0)
-+ return;
-+ if( (b = strstr( buf, "<" )) && (c = strstr( buf, ">" ))) {
-+ dev = (struct DEVICES *) calloc( sizeof( struct DEVICES ), 1 );
-+ dev -> next = Devices;
-+ Devices = dev;
-+ dev -> bus = 0;
-+ dev -> dev = buf[8] - 0x30;
-+ sprintf( dev -> devstr, "dev=/dev/rcd%d%c",
-+ (dev -> dev < 32) ? dev -> dev:0, 'a' + raw);
-+ if( *b ) b++; // point to next character
-+ for( i = 0; *b && *b != ',' && i < sizeof(dev->vendor)-1;
-+ b++, i++ )
-+ dev -> vendor[i] = *b;
-+ while(*b != ',' && *b != 0) // points to next ","
-+ b++;
-+ if (*b == ',') b++; // next char
-+ for( i = 0; *b && *b != ',' && i < sizeof(dev->name)-1;
-+ b++, i++ )
-+ dev -> name[i] = *b;
-+ while(*b != ',' && *b != 0) // points to next ","
-+ b++;
-+ if (*b == ',') b++; // next char
-+ for( i = 0; *b && *b != '>' && i < sizeof(dev->version)-1;
-+ b++, i++ )
-+ dev -> version[i] = *b;
-+ dev -> desc[0] = 0;
-+ }
-+#else
- c = strtok( buf, "\n" );
- while( c ) {
- if( (b = strstr( c, "scsibus" )) ) {
-@@ -139,6 +208,7 @@
- }
- c = strtok( NULL, "\n" );
- }
-+#endif /* __NetBSD__ */
- }
-
- void CDdata::slotOutput1(KProcess *, char *s, int n) {
diff --git a/sysutils/koncd/patches/patch-ab b/sysutils/koncd/patches/patch-ab
deleted file mode 100644
index a990de497aa..00000000000
--- a/sysutils/koncd/patches/patch-ab
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2001/06/13 12:41:09 bouyer Exp $
-
---- configure.in.in.orig Sat Mar 31 14:57:18 2001
-+++ configure.in.in
-@@ -2,3 +2,10 @@
-
- AM_INIT_AUTOMAKE(koncd,0.7.1)
-
-+AC_CHECK_HEADER(util.h,
-+ AC_CHECK_LIB(util, getrawpartition, [
-+ AC_DEFINE(HAVE_GETRAWPARTITION, 1, [Define if getrawpartition exists])
-+ LIBUTIL="-lutil"]
-+ )
-+)
-+AC_SUBST(LIBUTIL)
diff --git a/sysutils/koncd/patches/patch-ac b/sysutils/koncd/patches/patch-ac
deleted file mode 100644
index af59ecb98a2..00000000000
--- a/sysutils/koncd/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2001/06/13 12:41:09 bouyer Exp $
-
---- koncd/Makefile.am.orig Tue Jun 12 19:29:02 2001
-+++ koncd/Makefile.am
-@@ -45,7 +45,7 @@
- METASOURCES = AUTO
-
- # the library search path.
--koncd_LDFLAGS = $(all_libraries) $(KDE_RPATH)
-+koncd_LDFLAGS = $(all_libraries) $(KDE_RPATH) @LIBUTIL@
-
- # Uncomment the following two lines if you add a ui.rc file for your application to make use of
- # KDE´s XML GUI builing
diff --git a/sysutils/koncd/patches/patch-ad b/sysutils/koncd/patches/patch-ad
deleted file mode 100644
index 2d32a1d4e65..00000000000
--- a/sysutils/koncd/patches/patch-ad
+++ /dev/null
@@ -1,99 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2001/11/13 21:26:58 jlam Exp $
-
---- configure.orig Sat Mar 31 08:57:25 2001
-+++ configure
-@@ -6954,6 +6954,86 @@
- #MIN_CONFIG
-
-
-+ac_safe=`echo "util.h" | sed 'y%./+-%__p_%'`
-+echo $ac_n "checking for util.h""... $ac_c" 1>&6
-+echo "configure:6960: checking for util.h" >&5
-+if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-+ echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+ cat > conftest.$ac_ext <<EOF
-+#line 6965 "configure"
-+#include "confdefs.h"
-+#include <util.h>
-+EOF
-+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-+{ (eval echo configure:6970: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-+if test -z "$ac_err"; then
-+ rm -rf conftest*
-+ eval "ac_cv_header_$ac_safe=yes"
-+else
-+ echo "$ac_err" >&5
-+ echo "configure: failed program was:" >&5
-+ cat conftest.$ac_ext >&5
-+ rm -rf conftest*
-+ eval "ac_cv_header_$ac_safe=no"
-+fi
-+rm -f conftest*
-+fi
-+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
-+ echo "$ac_t""yes" 1>&6
-+ echo $ac_n "checking for getrawpartition in -lutil""... $ac_c" 1>&6
-+echo "configure:6987: checking for getrawpartition in -lutil" >&5
-+ac_lib_var=`echo util'_'getrawpartition | sed 'y%./+-%__p_%'`
-+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-+ echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+ ac_save_LIBS="$LIBS"
-+LIBS="-lutil $LIBS"
-+cat > conftest.$ac_ext <<EOF
-+#line 6995 "configure"
-+#include "confdefs.h"
-+/* Override any gcc2 internal prototype to avoid an error. */
-+/* We use char because int might match the return type of a gcc2
-+ builtin and then its argument prototype would still apply. */
-+char getrawpartition();
-+
-+int main() {
-+getrawpartition()
-+; return 0; }
-+EOF
-+if { (eval echo configure:7006: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+ rm -rf conftest*
-+ eval "ac_cv_lib_$ac_lib_var=yes"
-+else
-+ echo "configure: failed program was:" >&5
-+ cat conftest.$ac_ext >&5
-+ rm -rf conftest*
-+ eval "ac_cv_lib_$ac_lib_var=no"
-+fi
-+rm -f conftest*
-+LIBS="$ac_save_LIBS"
-+
-+fi
-+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-+ echo "$ac_t""yes" 1>&6
-+
-+ cat >> confdefs.h <<\EOF
-+#define HAVE_GETRAWPARTITION 1
-+EOF
-+
-+ LIBUTIL="-lutil"
-+
-+else
-+ echo "$ac_t""no" 1>&6
-+fi
-+
-+
-+else
-+ echo "$ac_t""no" 1>&6
-+fi
-+
-+
-
-
- DO_NOT_COMPILE="$DO_NOT_COMPILE CVS debian bsd-port admin"
-@@ -7259,6 +7339,7 @@
- s%@LIB_KPARTS@%$LIB_KPARTS%g
- s%@LIB_KWRITE@%$LIB_KWRITE%g
- s%@LIB_KFM@%$LIB_KFM%g
-+s%@LIBUTIL@%$LIBUTIL%g
- s%@TOPSUBDIRS@%$TOPSUBDIRS%g
-
- CEOF
diff --git a/sysutils/koncd/patches/patch-ae b/sysutils/koncd/patches/patch-ae
deleted file mode 100644
index b7f3964ed29..00000000000
--- a/sysutils/koncd/patches/patch-ae
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ae,v 1.1 2001/11/13 21:26:58 jlam Exp $
-
---- koncd/Makefile.in.orig Sun Apr 1 12:09:58 2001
-+++ koncd/Makefile.in
-@@ -229,7 +229,7 @@
- #>- METASOURCES = AUTO
-
- # the library search path.
--koncd_LDFLAGS = $(all_libraries) $(KDE_RPATH)
-+koncd_LDFLAGS = $(all_libraries) $(KDE_RPATH) @LIBUTIL@
- mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
- CONFIG_HEADER = ../config.h
- CONFIG_CLEAN_FILES =
diff --git a/sysutils/lambd/DESCR b/sysutils/lambd/DESCR
deleted file mode 100644
index 8e6561482bd..00000000000
--- a/sysutils/lambd/DESCR
+++ /dev/null
@@ -1 +0,0 @@
-shutdown switch monitoring daemon for Wildlab LAMB
diff --git a/sysutils/lambd/Makefile b/sysutils/lambd/Makefile
deleted file mode 100644
index 05655e48438..00000000000
--- a/sysutils/lambd/Makefile
+++ /dev/null
@@ -1,23 +0,0 @@
-# $NetBSD: Makefile,v 1.4 2001/07/19 20:23:43 itojun Exp $
-
-DISTNAME= lambd-20010719
-CATEGORIES= sysutils
-MASTER_SITES= # none
-DISTFILES= # none
-
-MAINTAINER= itojun@netbsd.org
-COMMENT= shutdown switch monitoring daemon for Wildlab LAMB
-
-EXTRACT_ONLY= # none
-NO_CHECKSUM= yes
-
-ONLY_FOR_PLATFORM= NetBSD-*-i386
-
-MAKE_ENV+= BINDIR=${PREFIX}/sbin MANDIR=${PREFIX}/man
-
-do-extract:
- ${MKDIR} ${WRKSRC}
- ${CP} ${FILESDIR}/*.[ch8] ${WRKSRC}
- ${CP} ${FILESDIR}/Makefile ${WRKSRC}
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/lambd/PLIST b/sysutils/lambd/PLIST
deleted file mode 100644
index 68976cd317e..00000000000
--- a/sysutils/lambd/PLIST
+++ /dev/null
@@ -1,4 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 22:53:23 zuntum Exp $
-sbin/lambd
-man/man8/lambd.8
-man/cat8/lambd.0
diff --git a/sysutils/lambd/files/Makefile b/sysutils/lambd/files/Makefile
deleted file mode 100644
index 30c1f2e3525..00000000000
--- a/sysutils/lambd/files/Makefile
+++ /dev/null
@@ -1,14 +0,0 @@
-# $NetBSD: Makefile,v 1.2 2001/07/18 06:47:37 itojun Exp $
-
-PROG= lambd
-SRCS= lambd.c lambio.c
-MAN= lambd.8
-
-WARNS?= 2
-BINDIR?= /sbin
-LDSTATIC= -static
-
-LDADD+= -li386
-DPADD+= /usr/lib/libi386.a
-
-.include <bsd.prog.mk>
diff --git a/sysutils/lambd/files/lambd.8 b/sysutils/lambd/files/lambd.8
deleted file mode 100644
index a5d8176ba9d..00000000000
--- a/sysutils/lambd/files/lambd.8
+++ /dev/null
@@ -1,79 +0,0 @@
-.\" $NetBSD: lambd.8,v 1.5 2001/12/03 19:03:24 wiz Exp $
-.\"
-.\" Copyright (C) 2001 WIDE Project. All rights reserved.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\" notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\" notice, this list of conditions and the following disclaimer in the
-.\" documentation and/or other materials provided with the distribution.
-.\" 3. Neither the name of the project nor the names of its contributors
-.\" may be used to endorse or promote products derived from this software
-.\" without specific prior written permission.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE PROJECT AND CONTRIBUTORS ``AS IS'' AND
-.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-.\" ARE DISCLAIMED. IN NO EVENT SHALL THE PROJECT OR CONTRIBUTORS BE LIABLE
-.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-.\" SUCH DAMAGE.
-.\"
-.Dd July 14, 2001
-.Dt LAMBD 8
-.Os
-.Sh NAME
-.Nm lambd
-.Nd shutdown switch monitoring daemon for Wildlab LAMB
-.Sh SYNOPSIS
-.Nm
-.Op Fl Ldfn
-.Op Fl M Ar str
-.Op Ar usec
-.Sh DESCRIPTION
-.Nm
-monitors shutdown switch on Wildlab LAMB, and issues
-.Dq Li shutdown -h now
-if pressed.
-It also blinks LED every 1 second, or the interval specified by
-.Ar usec .
-Normally
-.Nm
-becomes a daemon on invocation.
-.Pp
-The following options are available:
-.Bl -tag -width indent
-.It Fl L
-Instead of heartbeat, LED will present the current load average.
-A single blink means 0.5 in load average.
-therefore, if you see 4 blinks, the current load average would be 2.
-.Ar usec
-argument decides the interval between LED blinks.
-.It Fl M Ar str
-Show an alphanumeric string,
-.Ar str ,
-in morse code on LED.
-.Ar usec
-argument decides the speed of the morse code.
-.It Fl d
-The flag lets
-.Nm
-generate more messages, and forbids it from shutting down the machine
-even if the shutdown button is pressed.
-.It Fl f
-.Nm
-will run in foreground mode
-.Pq do not become daemon .
-.It Fl n
-Avoid any hardware I/O accesses from
-.Nm Ns .
-.El
-.Sh SEE ALSO
-.Pa http://www.wildlab.com/
diff --git a/sysutils/lambd/files/lambd.c b/sysutils/lambd/files/lambd.c
deleted file mode 100644
index 6ebd756469b..00000000000
--- a/sysutils/lambd/files/lambd.c
+++ /dev/null
@@ -1,324 +0,0 @@
-/* $NetBSD: lambd.c,v 1.4 2001/07/19 20:29:08 itojun Exp $ */
-
-/*
- * Copyright (C) 2001 WIDE Project. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the project nor the names of its contributors
- * may be used to endorse or promote products derived from this software
- * without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE PROJECT AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE PROJECT OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/types.h>
-#include <machine/sysarch.h>
-#include <machine/pio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <stdio.h>
-#include <err.h>
-#include <ctype.h>
-
-#include "lambio.h"
-
-#define BASEPORT (0x378)
-
-int main __P((int, char **));
-void usage __P((void));
-void mainloop __P((void));
-void lsleep __P((unsigned long));
-int monitor __P((void));
-void led __P((int));
-
-int cycle __P((void));
-int loadavg __P((void));
-int morse __P((void));
-
-int foreground = 0;
-int debug = 0;
-#ifdef __i386__
-int nohw = 0;
-#else
-const int nohw = 1;
-#endif
-unsigned long delay = 1 * 1000000;
-const char *morsestr = "LAMB";
-
-int (*func) __P((void)) = cycle;
-
-int
-main(argc, argv)
- int argc;
- char **argv;
-{
- int ch;
- char *p, *ep;
-
- while ((ch = getopt(argc, argv, "LM:dfn")) != -1) {
- switch (ch) {
- case 'L':
- func = loadavg;
- break;
- case 'M':
- func = morse;
- morsestr = optarg;
- break;
- case 'd':
- debug++;
- break;
- case 'f':
- foreground++;
- break;
- case 'n':
- nohw++;
- break;
- default:
- usage();
- exit(1);
- }
- }
-
- if (!islamb()) {
- if (debug)
- fprintf(stderr, "it is not lamb\n");
- nohw++;
- } else
- if (debug)
- fprintf(stderr, "it is indeed lamb\n");
-
- argc -= optind;
- argv += optind;
-
- switch (argc) {
- case 0:
- break;
- case 1:
- p = *argv;
- ep = NULL;
- delay = strtoul(*argv, &ep, 10);
- if (ep && !*ep)
- break;
- /* FALLTHROUGH */
- default:
- usage();
- exit(1);
- }
-
- if (!nohw) {
- if (lamb_open() < 0) {
- err(1, "lamb_open");
- /* NOTREACHED */
- }
- }
-
- if (!foreground)
- daemon(0, 0);
-
- if (debug)
- fprintf(stderr, "delay=%lu\n", delay);
- mainloop();
- /* NOTREACHED */
-
- exit(0); /* silent gcc */
-}
-
-void
-usage()
-{
- fprintf(stderr, "usage: lambd [-LMdfn] [usec]\n");
-}
-
-void
-mainloop()
-{
- led(0);
- while (1) {
- if ((*func)())
- break;
- }
-
- led(0);
- if (debug) {
- fprintf(stderr, "shutdown -h now\n");
- exit(0);
- } else {
- execl("/sbin/shutdown", "shutdown", "-h", "now", NULL);
- /* NOTREACHED */
- }
-}
-
-void
-lsleep(usec)
- unsigned long usec;
-{
-
- sleep(usec / 1000000);
- usleep(usec % 1000000);
-}
-
-int
-monitor()
-{
- int i;
-
- if (nohw)
- return 0;
-
- for (i = 0; i < 10; i++)
- if (!lamb_reboot())
- return 0;
- return 1;
-}
-
-void
-led(on)
- int on;
-{
-
- if (debug)
- fprintf(stderr, "led=%d\n", on);
- if (nohw)
- return;
-
- lamb_led(on);
-}
-
-/*
- * define a interesting functions below!
- */
-
-int
-cycle()
-{
- if (monitor())
- return 1;
- led(1);
- lsleep(delay / 2);
-
- if (monitor())
- return 1;
- led(0);
- lsleep(delay / 2);
- return 0;
-}
-
-int
-loadavg()
-{
- double v;
- int i;
- unsigned long t = delay / 10;
-
- getloadavg(&v, 1);
- if (debug)
- fprintf(stderr, "loadavg=%g\n", v);
- for (i = 0; i < v * 2; i++) {
- if (monitor())
- return 1;
- led(1);
- lsleep(t);
- led(0);
- lsleep(t);
- }
- lsleep(t * 5);
- return 0;
-}
-
-static const char *const digit[] = {
- "-----",
- ".----",
- "..---",
- "...--",
- "....-",
- ".....",
- "-....",
- "--...",
- "---..",
- "----.",
-};
-static const char *const alph[] = {
- ".-",
- "-...",
- "-.-.",
- "-..",
- ".",
- "..-.",
- "--.",
- "....",
- "..",
- ".---",
- "-.-",
- ".-..",
- "--",
- "-.",
- "---",
- ".--.",
- "--.-",
- ".-.",
- "...",
- "-",
- "..-",
- "...-",
- ".--",
- "-..-",
- "-.--",
- "--..",
-};
-
-int
-morse()
-{
- const char *p, *q;
- int mark, blank;
- unsigned long t = delay / 10;
-
- for (p = morsestr; *p; p++) {
- if (monitor())
- return 1;
-
- if (isdigit(*p))
- q = digit[*p - '0'];
- else if (isalpha(*p) && isupper(*p))
- q = alph[*p - 'A'];
- else if (isalpha(*p) && islower(*p))
- q = alph[*p - 'a'];
-
- if (debug)
- printf("%c <%s>\n", *p, q);
- for (/*nothing*/; *q; q++) {
- switch (*q) {
- case '-':
- mark = 3; blank = 1; break;
- case '.':
- mark = 1; blank = 1; break;
- default:
- mark = 0; blank = 3; break;
- }
- led(1);
- lsleep(mark * t);
- led(0);
- lsleep(blank * t);
- }
- lsleep(1 * t);
- }
- lsleep(10 * t);
- return 0;
-}
diff --git a/sysutils/lambd/files/lambio.c b/sysutils/lambd/files/lambio.c
deleted file mode 100644
index 6edbb7d22ef..00000000000
--- a/sysutils/lambd/files/lambio.c
+++ /dev/null
@@ -1,112 +0,0 @@
-/* $NetBSD: lambio.c,v 1.1 2001/07/18 06:47:37 itojun Exp $ */
-
-/*
- * Copyright (C) 2001 WIDE Project. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the project nor the names of its contributors
- * may be used to endorse or promote products derived from this software
- * without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE PROJECT AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE PROJECT OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <net/if.h>
-#include <net/if_dl.h>
-#include <net/if_ether.h>
-#include <ifaddrs.h>
-
-#include <machine/sysarch.h>
-#include <machine/pio.h>
-
-#include "lambio.h"
-
-#define BASEPORT (0x378)
-
-int
-lamb_open()
-{
- unsigned long ioperm[1024 / sizeof(unsigned long) / 8];
- int off, bit;
- int i;
-
- if (i386_get_ioperm(ioperm) < 0)
- return -1;
- for (i = 0; i < 3; i++) {
- off = (BASEPORT + i);
- bit = off % (sizeof(ioperm[0]) * 8);
- off /= (sizeof(ioperm[0]) * 8);
- ioperm[off] &= ~(1 << bit);
- }
- if (i386_set_ioperm(ioperm) < 0)
- return -1;
-
- return 0;
-}
-
-/* returns 1 if shutdown button is pressed */
-int
-lamb_reboot()
-{
-
- if ((inb(BASEPORT + 1) & 0x20) == 0)
- return 1;
- else
- return 0;
-}
-
-void
-lamb_led(on)
- int on;
-{
-
- outb(BASEPORT + 2, on ? 8 : 0);
-}
-
-/*
- * check MAC address against IEEE-registered Wildlab MAC address
- */
-int
-islamb()
-{
- struct ifaddrs *ifa, *ifap;
- struct sockaddr_dl *sdl;
- const u_int8_t wildlab[] = { 0x00, 0x30, 0xf5 };
-
- if (getifaddrs(&ifap) < 0)
- return 0;
- for (ifa = ifap; ifa; ifa = ifa->ifa_next) {
- if (ifa->ifa_addr->sa_family != AF_LINK)
- continue;
- sdl = (struct sockaddr_dl *)ifa->ifa_addr;
- if (sdl->sdl_alen != sizeof(struct ether_addr))
- continue;
- if (memcmp(LLADDR(sdl), wildlab, sizeof(wildlab)) != 0)
- continue;
-
- freeifaddrs(ifap);
- return 1;
- }
-
- freeifaddrs(ifap);
- return 0;
-}
diff --git a/sysutils/lambd/files/lambio.h b/sysutils/lambd/files/lambio.h
deleted file mode 100644
index 6d6645eea4d..00000000000
--- a/sysutils/lambd/files/lambio.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/* $NetBSD: lambio.h,v 1.1 2001/07/18 06:47:37 itojun Exp $ */
-
-/*
- * Copyright (C) 2001 WIDE Project. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the project nor the names of its contributors
- * may be used to endorse or promote products derived from this software
- * without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE PROJECT AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE PROJECT OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-int lamb_open __P((void));
-int lamb_reboot __P((void));
-void lamb_led __P((int));
-extern int islamb __P((void));
diff --git a/sysutils/lavaps/DESCR b/sysutils/lavaps/DESCR
deleted file mode 100644
index aaee39e003e..00000000000
--- a/sysutils/lavaps/DESCR
+++ /dev/null
@@ -1,6 +0,0 @@
-Lavaps is an interactive process-tracking program like ``top'', but
-with a much different attitude. Rather than presenting lots of
-specific info in digital form, it tries to present certain important
-information in a graphical analog form. The idea is that you can run
-it in the background and get a rough idea of what's happening to your
-system without devoting much concentration to the task.
diff --git a/sysutils/lavaps/Makefile b/sysutils/lavaps/Makefile
deleted file mode 100644
index 43f21ab5387..00000000000
--- a/sysutils/lavaps/Makefile
+++ /dev/null
@@ -1,24 +0,0 @@
-# $NetBSD: Makefile,v 1.14 2003/06/18 09:22:25 agc Exp $
-#
-
-DISTNAME= lavaps-1.20
-PKGNAME= lavaps-1.20
-WRKSRC= ${WRKDIR}/${PKGNAME_NOREV}
-CATEGORIES= sysutils x11
-MASTER_SITES= http://www.isi.edu/~johnh/SOFTWARE/LAVAPS/
-
-MAINTAINER= hubertf@netbsd.org
-HOMEPAGE= http://www.isi.edu/~johnh/SOFTWARE/LAVAPS/
-COMMENT= Lava lamp of currently running processes
-
-DEPENDS+= tk>=8.3.2:../../x11/tk
-USE_PERL5= build
-
-USE_X11= # defined
-GNU_CONFIGURE= # defined
-CONFIGURE_ARGS= --with-additional-includes='-I${LOCALBASE}/include' \
- --with-additional-libs='-L${LOCALBASE}/lib' \
- --with-tcl-ver=8.3.2 --with-tk-ver=8.3.2 \
- --with-tcltk-lib-suffix-type=nodot
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/lavaps/PLIST b/sysutils/lavaps/PLIST
deleted file mode 100644
index c3725b06c6e..00000000000
--- a/sysutils/lavaps/PLIST
+++ /dev/null
@@ -1,3 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 22:53:24 zuntum Exp $
-bin/lavaps
-man/man1/lavaps.1
diff --git a/sysutils/lavaps/distinfo b/sysutils/lavaps/distinfo
deleted file mode 100644
index f7ebed609dc..00000000000
--- a/sysutils/lavaps/distinfo
+++ /dev/null
@@ -1,4 +0,0 @@
-$NetBSD: distinfo,v 1.3 2001/10/31 02:03:29 hubertf Exp $
-
-SHA1 (lavaps-1.20.tar.gz) = 36411710a29bcb751f23ae35a2782a5286ec0f2e
-Size (lavaps-1.20.tar.gz) = 160724 bytes
diff --git a/sysutils/libirman/DESCR b/sysutils/libirman/DESCR
deleted file mode 100644
index 07e548a99c0..00000000000
--- a/sysutils/libirman/DESCR
+++ /dev/null
@@ -1,8 +0,0 @@
-Libirman is a programming library for Irman control of Unix software.
-
-Infrared man (Irman) is a small device that allows you to control
-your PC with the remote from your TV, VCR, CD or Stereo. Irman
-can be used in many ways, for example to control a software program
-while you are in another room. Imagine controlling Winamp with a
-normal remote to choose exactly the song you want. Or watching
-DVD from your couch while still being able to pause or fast forward.
diff --git a/sysutils/libirman/Makefile b/sysutils/libirman/Makefile
deleted file mode 100644
index 785715358a3..00000000000
--- a/sysutils/libirman/Makefile
+++ /dev/null
@@ -1,39 +0,0 @@
-# $NetBSD: Makefile,v 1.8 2003/01/28 22:04:18 jlam Exp $
-#
-
-DISTNAME= libirman-0.4.1b
-PKGNAME= ${DISTNAME:S/b$/.2/}
-PKGREVISION= 5
-CATEGORIES= sysutils
-MASTER_SITES= http://www.evation.com/libirman/
-
-MAINTAINER= abs@netbsd.org
-HOMEPAGE= http://www.evation.com/libirman/libirman.html
-COMMENT= Programming library for Irman - infrared control
-
-USE_PKGINSTALL= YES
-GNU_CONFIGURE= YES
-CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
-
-EGDIR= ${PREFIX}/share/examples
-CONF_FILES= ${EGDIR}/irman.conf ${PKG_SYSCONFDIR}/irman.conf
-
-post-build:
- ${SED} -e "s:/usr/local/etc:${PKG_SYSCONFDIR}:g" \
- -e "s:/usr/local:${PREFIX}:g" \
- -e 's/test_func/irman_func/g' \
- -e 's/test_io/irman_func/g' \
- -e 's/test_name/irman_func/g' \
- ${WRKSRC}/README > ${WRKSRC}/libirman.README
- ${SED} -e 's:port /dev/ttyS1:port ${DEFAULT_SERIAL_DEVICE}:' \
- ${WRKSRC}/irman.conf > ${WRKSRC}/irman.conf.patched
- ${MV} ${WRKSRC}/irman.conf.patched ${WRKSRC}/irman.conf
-
-post-install:
- ${INSTALL_PROGRAM} ${WRKSRC}/test_func ${PREFIX}/bin/irman_func
- ${INSTALL_PROGRAM} ${WRKSRC}/test_io ${PREFIX}/bin/irman_io
- ${INSTALL_PROGRAM} ${WRKSRC}/test_name ${PREFIX}/bin/irman_name
- ${INSTALL_DATA} ${WRKSRC}/libirman.README \
- ${PREFIX}/share/doc/libirman.README
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/libirman/PLIST b/sysutils/libirman/PLIST
deleted file mode 100644
index c77971dbdf2..00000000000
--- a/sysutils/libirman/PLIST
+++ /dev/null
@@ -1,9 +0,0 @@
-@comment $NetBSD: PLIST,v 1.3 2002/06/14 20:38:40 abs Exp $
-bin/irman_func
-bin/irman_io
-bin/irman_name
-bin/workmanir
-lib/libirman.a
-sbin/lirmand
-share/doc/libirman.README
-share/examples/irman.conf
diff --git a/sysutils/libirman/distinfo b/sysutils/libirman/distinfo
deleted file mode 100644
index b76f547e75b..00000000000
--- a/sysutils/libirman/distinfo
+++ /dev/null
@@ -1,9 +0,0 @@
-$NetBSD: distinfo,v 1.5 2002/07/02 13:02:37 wiz Exp $
-
-SHA1 (libirman-0.4.1b.tar.gz) = 739e7cbb4c7e0af59fd244e3d2ed73b97905849a
-Size (libirman-0.4.1b.tar.gz) = 52874 bytes
-SHA1 (patch-aa) = e060a7e54fc817634cd7e92d7e5e17f147003363
-SHA1 (patch-ab) = b16e235fbfe581ee1a2d4406be8911faa2d047fc
-SHA1 (patch-ac) = 94bf4bbbadc36ff47ded256c37eb86b36a2ad1d9
-SHA1 (patch-ad) = 4a4cef60aa053a2781bc48d9c268cc10ae9654cf
-SHA1 (patch-ae) = a5ec71dd27d0d9033ab6464a28146c7fe6ca8d0e
diff --git a/sysutils/libirman/patches/patch-aa b/sysutils/libirman/patches/patch-aa
deleted file mode 100644
index 2b24628bca4..00000000000
--- a/sysutils/libirman/patches/patch-aa
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-aa,v 1.3 2002/06/26 21:03:00 abs Exp $
-
---- Makefile.in.orig Thu Feb 18 11:14:57 1999
-+++ Makefile.in
-@@ -27,6 +27,7 @@
- bindir = @bindir@
- sbindir = @sbindir@
- libdir = @libdir@
-+datadir = @datadir@
- sysconfdir = @sysconfdir@
-
- PROGS=test_io test_func test_name workmanir lirmand
-@@ -125,7 +126,7 @@
- $(INSTALL) -m 755 workmanir $(bindir)/workmanir
- $(INSTALL) -m 755 lirmand $(sbindir)/lirmand
- $(INSTALL) -m 755 libirman.a $(libdir)/libirman.a
-- $(INSTALL) -m 644 irman.conf $(sysconfdir)/irman.conf
-+ $(INSTALL) -m 644 irman.conf $(datadir)/examples/irman.conf
- @echo notice: the test programs are only installed in the current directory \(`pwd`\)
-
- uninstall: rmdev
diff --git a/sysutils/libirman/patches/patch-ab b/sysutils/libirman/patches/patch-ab
deleted file mode 100644
index 867b99d1851..00000000000
--- a/sysutils/libirman/patches/patch-ab
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ab,v 1.3 2002/06/26 22:51:48 abs Exp $
-
---- ircmd.c.orig Wed Jun 26 21:55:30 2002
-+++ ircmd.c
-@@ -140,10 +140,10 @@
- strcpy(rcname, home);
- rcname[hl] = '/';
- strcpy(rcname + hl+1, IR_USER_IRMANRC);
-- rcname[hl+rl+2] = '\0';
-
- rc = fopen(rcname, "r");
- if (!rc) { /* system, eg /etc/irmanrc.conf */
-+ freefile = 0;
- rcname = IR_SYSTEM_IRMANRC;
- rc = fopen(rcname, "r");
- }
diff --git a/sysutils/libirman/patches/patch-ac b/sysutils/libirman/patches/patch-ac
deleted file mode 100644
index 07bebdd1db8..00000000000
--- a/sysutils/libirman/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.2 2002/06/26 21:03:01 abs Exp $
-
---- test_func.c.orig Thu Feb 18 11:15:03 1999
-+++ test_func.c
-@@ -17,6 +17,8 @@
- unsigned char *code;
- char *text;
-
-+ setlinebuf(stdout);
-+
- if (argc < 2) {
- fprintf(stderr, "usage: test_func device\n");
- fprintf(stderr, " where device is the serial port at which the infra red receiver resides\n");
diff --git a/sysutils/libirman/patches/patch-ad b/sysutils/libirman/patches/patch-ad
deleted file mode 100644
index 96b32d48d63..00000000000
--- a/sysutils/libirman/patches/patch-ad
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ad,v 1.2 2002/06/26 21:03:01 abs Exp $
-
---- test_io.c.orig Thu Feb 18 11:15:03 1999
-+++ test_io.c
-@@ -17,6 +17,8 @@
- int datum;
- int i;
-
-+ setlinebuf(stdout);
-+
- if (argc < 2) {
- fprintf(stderr, "usage: test_io device\n");
- fprintf(stderr, " where device is the serial port at which the infra red receiver resides\n");
diff --git a/sysutils/libirman/patches/patch-ae b/sysutils/libirman/patches/patch-ae
deleted file mode 100644
index 4d33524681b..00000000000
--- a/sysutils/libirman/patches/patch-ae
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ae,v 1.1 2002/06/26 21:03:01 abs Exp $
-
---- test_name.c.orig Thu Feb 18 11:15:03 1999
-+++ test_name.c
-@@ -18,6 +18,8 @@
- char *name;
- char *filename;
-
-+ setlinebuf(stdout);
-+
- if (ir_init_commands(NULL, 1) < 0) {
- fprintf(stderr, "error initialising commands: %s\n", strerror(errno));
- exit(1);
diff --git a/sysutils/logrot/DESCR b/sysutils/logrot/DESCR
deleted file mode 100644
index c864ad79cf1..00000000000
--- a/sysutils/logrot/DESCR
+++ /dev/null
@@ -1,6 +0,0 @@
-logrot rotates log files in a safe (almost atomic) manner.
-The name of the rotated file and its destination directory
-are configurable. Signals may be sent to processes determined
-from a pid file, or arbitrary commands may be executed upon
-rotation. Optional pre-processing, compression, and post-
-processing is supported.
diff --git a/sysutils/logrot/Makefile b/sysutils/logrot/Makefile
deleted file mode 100644
index 425ae67a4ed..00000000000
--- a/sysutils/logrot/Makefile
+++ /dev/null
@@ -1,13 +0,0 @@
-# $NetBSD: Makefile,v 1.6 2001/07/08 05:41:13 lukem Exp $
-#
-
-DISTNAME= logrot-1.6
-CATEGORIES= sysutils
-MASTER_SITES= ftp://ftp.cs.rmit.edu.au/pub/utils/
-
-MAINTAINER= lukem@netbsd.org
-COMMENT= Rotate log files in a safe and configurable manner
-
-GNU_CONFIGURE= YES
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/logrot/PLIST b/sysutils/logrot/PLIST
deleted file mode 100644
index 3d3aa34f94b..00000000000
--- a/sysutils/logrot/PLIST
+++ /dev/null
@@ -1,3 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 22:53:25 zuntum Exp $
-bin/logrot
-man/man1/logrot.1
diff --git a/sysutils/logrot/distinfo b/sysutils/logrot/distinfo
deleted file mode 100644
index 43adbd0f91a..00000000000
--- a/sysutils/logrot/distinfo
+++ /dev/null
@@ -1,4 +0,0 @@
-$NetBSD: distinfo,v 1.3 2001/07/08 05:41:13 lukem Exp $
-
-SHA1 (logrot-1.6.tar.gz) = 657b5bdd26b05fbd57465cc3e297150e10e88b6a
-Size (logrot-1.6.tar.gz) = 35234 bytes
diff --git a/sysutils/lsof/DESCR b/sysutils/lsof/DESCR
deleted file mode 100644
index a81b7178b45..00000000000
--- a/sysutils/lsof/DESCR
+++ /dev/null
@@ -1,5 +0,0 @@
-Lsof (LiSt Open Files) lists information about files that are open by the
-running processes. An open file may be a regular file, a directory, a block
-special file, a character special file, an executing text reference, a
-library, a stream or a network file (Internet socket, NFS file or Unix domain
-socket).
diff --git a/sysutils/lsof/Makefile b/sysutils/lsof/Makefile
deleted file mode 100644
index 3035d4aeefc..00000000000
--- a/sysutils/lsof/Makefile
+++ /dev/null
@@ -1,64 +0,0 @@
-# $NetBSD: Makefile,v 1.64 2003/06/19 07:31:13 tron Exp $
-#
-
-DISTNAME= lsof_4.68
-PKGNAME= ${DISTNAME:S/_/-/}
-WRKSRC= ${WRKDIR}/${DISTNAME}/${SRCBALL_NAME}
-CATEGORIES= sysutils
-MASTER_SITES= ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/ \
- ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/NEW/ \
- ftp://ftp.cert.dfn.de/pub/tools/admin/lsof/ \
- ftp://ftp.auscert.org.au/pub/mirrors/vic.cc.purdue.edu/lsof/ \
- ftp://ftp.sunet.se/pub/unix/admin/lsof/
-
-MAINTAINER= atatat@netbsd.org
-HOMEPAGE= http://www-rcd.cc.purdue.edu/~abe/
-COMMENT= Lists information about open files
-
-HAS_CONFIGURE= yes
-CONFIGURE_SCRIPT= ./Configure
-CONFIGURE_ARGS= -n ${LOWER_OPSYS}
-CONFIGURE_ENV+= LSOF_CC="${CC} ${CFLAGS}"
-MAKE_FLAGS+= LSOF_BLDCMT="NetBSD pkgsrc rocks!"
-CPPFLAGS+= -DLSOF_MORE_SECURE=${LSOF_MORE_SECURE} \
- -DLSOF_LESS_SECURE_SOCKETS=${LSOF_LESS_SECURE_SOCKETS}
-OSVERSION_SPECIFIC= yes
-
-TMPWRK= ${WRKDIR}/${DISTNAME}
-SRCBALL_NAME= ${DISTNAME}_src
-
-.include "../../mk/bsd.prefs.mk"
-
-.if ${OPSYS} == "NetBSD"
-REAL_GROUP= -g kmem
-.elif ${OPSYS} == "SunOS"
-MAKE_ENV+= CPPFLAGS=
-.endif
-
-LSOF_MORE_SECURE?= 0
-
-post-extract:
- @(cd ${TMPWRK} ; \
- EXPMD5=`${GREP} MD5 README.${DISTNAME} | ${SED} 's/^[ ]*//'` ; \
- CALCMD5=`${DIGEST} MD5 ${SRCBALL_NAME}.tar` ; \
- if [ "$${EXPMD5}"X != "$${CALCMD5}"X ]; then \
- ${ECHO} "Expected and calculated MD5 signatures don't agree." ; \
- ${ECHO} "($$EXPMD5 != $$CALCMD5)" ; \
- ${FALSE} ; \
- fi ; \
- if [ "X${EXTRACT_USING_PAX}" = "X" ]; then \
- ${GTAR} -xf ${SRCBALL_NAME}.tar; \
- else \
- ${PAX} -O -r < ${SRCBALL_NAME}.tar; \
- fi)
- @( cd ${WRKSRC} ; ${ECHO} "y" | ./Inventory || exit 1 )
-
-do-install:
- ${INSTALL} ${COPY} ${_STRIPFLAG_INSTALL} -o ${BINOWN} -g ${BINGRP} -m 2755 ${REAL_GROUP} \
- ${WRKSRC}/lsof ${PREFIX}/sbin
- ${INSTALL_MAN} ${WRKSRC}/lsof.man ${PREFIX}/man/man1/lsof.1
- @${INSTALL_DATA_DIR} ${PREFIX}/share/lsof
- ${INSTALL_SCRIPT} ${WRKSRC}/scripts/* ${PREFIX}/share/lsof
- @${CHMOD} 0444 ${PREFIX}/share/lsof/00*
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/lsof/PLIST b/sysutils/lsof/PLIST
deleted file mode 100644
index c008e253cd3..00000000000
--- a/sysutils/lsof/PLIST
+++ /dev/null
@@ -1,18 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 22:53:26 zuntum Exp $
-sbin/lsof
-man/man1/lsof.1.gz
-share/lsof/00MANIFEST
-share/lsof/00README
-share/lsof/big_brother.perl5
-share/lsof/count_pf.perl
-share/lsof/count_pf.perl5
-share/lsof/identd.perl5
-share/lsof/idrlogin.perl
-share/lsof/idrlogin.perl5
-share/lsof/list_NULf.perl5
-share/lsof/list_fields.awk
-share/lsof/list_fields.perl
-share/lsof/shared.perl5
-share/lsof/watch_a_file.perl
-share/lsof/xusers.awk
-@dirrm share/lsof
diff --git a/sysutils/lsof/distinfo b/sysutils/lsof/distinfo
deleted file mode 100644
index 11950c29bd6..00000000000
--- a/sysutils/lsof/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.29 2003/06/19 03:09:37 atatat Exp $
-
-SHA1 (lsof_4.68.tar.gz) = 71df82816e84b4218c473a7102ff31c002192803
-Size (lsof_4.68.tar.gz) = 963862 bytes
-SHA1 (patch-aa) = 36790019394b4088c226222d4aefaec50430bcf3
diff --git a/sysutils/lsof/patches/patch-aa b/sysutils/lsof/patches/patch-aa
deleted file mode 100644
index 51174f1defc..00000000000
--- a/sysutils/lsof/patches/patch-aa
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD: patch-aa,v 1.20 2002/12/22 20:04:31 atatat Exp $
-
-If LSOF_MORE_SECURE is non-zero, compile lsof with security, and
-only let unprivileged (non-root) users view their own open files.
-Set LSOF_LESS_SECURE_SOCKETS to non-zero in order to allow non-root
-users to see open sockets, even when LSOF_MORE_SECURE is set.
-
---- dialects/n+obsd/machine.h.orig Tue Dec 3 13:23:54 2002
-+++ dialects/n+obsd/machine.h
-@@ -371,7 +371,9 @@
- * (the one that its user logged on with) of the lsof process.
- */
-
--/* #define HASSECURITY 1 */
-+#if LSOF_MORE_SECURE
-+#define HASSECURITY 1
-+#endif
-
-
- /*
-@@ -380,7 +382,9 @@
- * listing is selected by the "-i" option.
- */
-
--/* #define HASNOSOCKSECURITY 1 */
-+#if LSOF_LESS_SECURE_SOCKETS
-+#define HASNOSOCKSECURITY 1
-+#endif
-
-
- /*
diff --git a/sysutils/mbmon/DESCR b/sysutils/mbmon/DESCR
deleted file mode 100644
index 6efefdcd9a7..00000000000
--- a/sysutils/mbmon/DESCR
+++ /dev/null
@@ -1 +0,0 @@
-Text-based program for monitoring motherboard environmental information.
diff --git a/sysutils/mbmon/Makefile b/sysutils/mbmon/Makefile
deleted file mode 100644
index 2dd3de7af17..00000000000
--- a/sysutils/mbmon/Makefile
+++ /dev/null
@@ -1,17 +0,0 @@
-# $NetBSD: Makefile,v 1.2 2003/06/02 01:16:54 jschauma Exp $
-#
-
-.include "../../sysutils/mbmon/Makefile.common"
-
-PKGNAME= mbmon-201
-
-MAINTAINER= tech-pkg@netbsd.org
-#HOMEPAGE=
-COMMENT= motherboard monitoring utility
-
-ALL_TARGET= mbmon
-
-do-install:
- ${INSTALL_PROGRAM} ${WRKSRC}/mbmon ${PREFIX}/bin
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/mbmon/Makefile.common b/sysutils/mbmon/Makefile.common
deleted file mode 100644
index e687e8c11c4..00000000000
--- a/sysutils/mbmon/Makefile.common
+++ /dev/null
@@ -1,20 +0,0 @@
-# $NetBSD: Makefile.common,v 1.4 2003/06/23 14:23:15 jschauma Exp $
-#
-
-DISTNAME= xmbmon201
-CATEGORIES= sysutils
-MASTER_SITES= http://www.nt.phys.kyushu-u.ac.jp/shimizu/download/
-PATCH_SITES+= http://www.nt.phys.kyushu-u.ac.jp/shimizu/download/
-PATCHFILES+= xmbmon201.netbsd.patch.gz xmbmon201pl1.diff
-PATCH_DIST_STRIP= -p1
-
-MAINTAINER= tech-pkg@netbsd.org
-#HOMEPAGE=
-
-MAKEFILE= Makefile.NetBSD
-GNU_CONFIGURE= yes
-
-DISTINFO_FILE?= ${.CURDIR}/../../sysutils/mbmon/distinfo
-PATCHDIR= ${.CURDIR}/../../sysutils/mbmon/patches
-
-ONLY_FOR_PLATFORM= NetBSD-*-i386
diff --git a/sysutils/mbmon/PLIST b/sysutils/mbmon/PLIST
deleted file mode 100644
index 557fe16868d..00000000000
--- a/sysutils/mbmon/PLIST
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2003/05/28 07:22:54 agc Exp $
-bin/mbmon
diff --git a/sysutils/mbmon/distinfo b/sysutils/mbmon/distinfo
deleted file mode 100644
index 0e7239592a5..00000000000
--- a/sysutils/mbmon/distinfo
+++ /dev/null
@@ -1,9 +0,0 @@
-$NetBSD: distinfo,v 1.2 2003/05/28 09:22:58 agc Exp $
-
-SHA1 (xmbmon201.tar.gz) = 96a8a4724ce8d26215956f943c76eba234de3741
-Size (xmbmon201.tar.gz) = 95967 bytes
-SHA1 (xmbmon201.netbsd.patch.gz) = f040e5c388ca513b7d2c07b7561ced034dd2a809
-Size (xmbmon201.netbsd.patch.gz) = 2520 bytes
-SHA1 (xmbmon201pl1.diff) = 1f554bc778dc962b9db43f3972441e8781f8ecb9
-Size (xmbmon201pl1.diff) = 993 bytes
-SHA1 (patch-aa) = 961134dea1c915d9436fff1cef48bbb2e40b5897
diff --git a/sysutils/mbmon/patches/patch-aa b/sysutils/mbmon/patches/patch-aa
deleted file mode 100644
index 86b0a439707..00000000000
--- a/sysutils/mbmon/patches/patch-aa
+++ /dev/null
@@ -1,32 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2003/05/31 17:52:13 cjep Exp $
---- Makefile.NetBSD 2003/05/28 09:15:46 1.1
-+++ Makefile.NetBSD 2003/05/28 09:17:27
-@@ -14,14 +14,14 @@
-
- DEFS=-DHAVE_CONFIG_H -Wall -DNETBSD
-
--LIBDIR=/usr/X11R6/lib
-+LIBDIR=${X11BASE}/lib
- INCDIR=.
--XINCDIR=/usr/X11R6/include
-+XINCDIR=${X11BASE}/include
- XLIB=-lXaw -lXmu
- EXTENSIONLIB=-lXext
- INCLUDES=-I$(INCDIR)
- XINCLUDES=-I$(XINCDIR)
--LIBS=-L$(LIBDIR) -lXaw $(XLIB) -lXt $(EXTENSIONLIB) -lX11 -lm
-+LIBS=-Wl,-R${LIBDIR} -L$(LIBDIR) -lXaw $(XLIB) -lXt $(EXTENSIONLIB) -lX11 -lm
- NETBSDLIBS=-li386
-
- #CC=/compat/linux/usr/bin/gcc
-@@ -37,8 +37,8 @@
- INSTALL=install
-
- INST_DIR=/usr/local/bin
--INST_XDIR=/usr/X11R6/bin
--INST_XRDIR=/usr/X11R6/lib/X11/app-defaults
-+INST_XDIR=${X11BASE}/bin
-+INST_XRDIR=${X11BASE}/lib/X11/app-defaults
-
- .c.o:
- $(CC) -c $(CFLAGS) $*.c
diff --git a/sysutils/mc/DESCR b/sysutils/mc/DESCR
deleted file mode 100644
index 68a677db993..00000000000
--- a/sysutils/mc/DESCR
+++ /dev/null
@@ -1,4 +0,0 @@
-Midnight Commander is a visual shell much like a file manager, only with way
-more features. It is text mode, but also includes mouse support if you are
-running GPM. Its coolest feature is the ability to ftp, view tar, zip
-files, and poke into RPMs for specific files.
diff --git a/sysutils/mc/Makefile b/sysutils/mc/Makefile
deleted file mode 100644
index 462e1ff15cc..00000000000
--- a/sysutils/mc/Makefile
+++ /dev/null
@@ -1,18 +0,0 @@
-# $NetBSD: Makefile,v 1.44 2003/07/13 13:53:19 wiz Exp $
-# FreeBSD Id: Makefile,v 1.16 1997/11/30 19:37:48 vanilla Exp
-#
-
-PKGREVISION= 4
-COMMENT= Midnight Commander, a free Norton Commander Clone
-
-CONFIGURE_ARGS+= --without-x
-CONFIGURE_ARGS+= --without-tm-x-support
-CONFIGURE_ARGS+= --without-gnome
-
-# Remove unwanted directories in a non-GNOME installation.
-#
-post-install:
- cd ${PREFIX}; ${RMDIR} -p share/idl 2>/dev/null || ${TRUE}
- cd ${PREFIX}; ${RMDIR} -p share/pixmaps/mc 2>/dev/null || ${TRUE}
-
-.include "../../sysutils/mc/Makefile.common"
diff --git a/sysutils/mc/Makefile.common b/sysutils/mc/Makefile.common
deleted file mode 100644
index 3d45efecf7e..00000000000
--- a/sysutils/mc/Makefile.common
+++ /dev/null
@@ -1,48 +0,0 @@
-# $NetBSD: Makefile.common,v 1.19 2003/05/22 17:02:53 salo Exp $
-
-DISTNAME= mc-4.5.51
-CATEGORIES+= sysutils
-MASTER_SITES+= ${MASTER_SITE_GNOME:=stable/sources/mc/}
-
-MAINTAINER= jlam@netbsd.org
-HOMEPAGE= http://www.gnome.org/mc/
-
-BUILD_USES_MSGFMT= yes
-
-CONFLICTS+= mc-[0-9]* gmc-[0-9]*
-
-DISTINFO_FILE= ${.CURDIR}/../../sysutils/mc/distinfo
-PATCHDIR= ${.CURDIR}/../../sysutils/mc/patches
-
-USE_BUILDLINK2= yes
-USE_PKGLOCALEDIR= yes
-USE_GMAKE= yes
-
-GNU_CONFIGURE= # defined
-CONFIGURE_ARGS+= --without-included-gettext
-CONFIGURE_ARGS+= --with-netrc --with-included-slang
-CONFIGURE_ARGS+= --with-samba
-CONFIGURE_ARGS+= --without-tk
-
-# Don't pick up readline if it's installed in the build environment.
-#
-CONFIGURE_ENV+= ac_cv_header_history_h=no
-CONFIGURE_ENV+= ac_cv_header_readline_h=no
-CONFIGURE_ENV+= ac_cv_header_readline_history_h=no
-CONFIGURE_ENV+= ac_cv_header_readline_readline_h=no
-
-CONFIGURE_ENV+= LOCALBASE="${LOCALBASE}"
-CONFIGURE_ENV+= PKGLOCALEDIR="${PKGLOCALEDIR}"
-
-LIBS+= -lm -ltermcap # -lslang
-CPPFLAGS+= -Dunix
-
-.include "../../mk/bsd.prefs.mk"
-
-.if ${OPSYS} == "SunOS"
-CFLAGS+= -DSunOS
-.endif
-
-.include "../../devel/gettext-lib/buildlink2.mk"
-.include "../../devel/glib/buildlink2.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/mc/PLIST b/sysutils/mc/PLIST
deleted file mode 100644
index 78c90f8a849..00000000000
--- a/sysutils/mc/PLIST
+++ /dev/null
@@ -1,110 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 22:53:27 zuntum Exp $
-bin/mc
-bin/mcedit
-bin/mcmfmt
-bin/mcserv
-etc/mc.global
-lib/mc/FAQ
-lib/mc/bin/mc.csh
-lib/mc/bin/mc.sh
-lib/mc/bin/mcfn_install
-lib/mc/desktop-scripts/README.desktop
-lib/mc/desktop-scripts/startup.links
-lib/mc/edit.indent.rc
-lib/mc/extfs/README
-lib/mc/extfs/a
-lib/mc/extfs/deb
-lib/mc/extfs/extfs.ini
-lib/mc/extfs/ftplist
-lib/mc/extfs/hp48
-lib/mc/extfs/lslR
-lib/mc/extfs/mailfs
-lib/mc/extfs/patchfs
-lib/mc/extfs/rpm
-lib/mc/extfs/rpms
-lib/mc/extfs/sfs.ini
-lib/mc/extfs/trpm
-lib/mc/extfs/uar
-lib/mc/extfs/uarj
-lib/mc/extfs/ucpio
-lib/mc/extfs/uha
-lib/mc/extfs/ulha
-lib/mc/extfs/unarj.diff
-lib/mc/extfs/urar
-lib/mc/extfs/uzip
-lib/mc/extfs/uzoo
-lib/mc/mc-gnome.ext
-lib/mc/mc.csh
-lib/mc/mc.ext
-lib/mc/mc.hint
-lib/mc/mc.hint.cs
-lib/mc/mc.hint.es
-lib/mc/mc.hint.ru
-lib/mc/mc.hlp
-lib/mc/mc.lib
-lib/mc/mc.menu
-lib/mc/mc.sh
-lib/mc/syntax/ada95.syntax
-lib/mc/syntax/c.syntax
-lib/mc/syntax/changelog.syntax
-lib/mc/syntax/diff.syntax
-lib/mc/syntax/fortran.syntax
-lib/mc/syntax/html.syntax
-lib/mc/syntax/java.syntax
-lib/mc/syntax/latex.syntax
-lib/mc/syntax/lsm.syntax
-lib/mc/syntax/mail.syntax
-lib/mc/syntax/makefile.syntax
-lib/mc/syntax/ml.syntax
-lib/mc/syntax/nroff.syntax
-lib/mc/syntax/pascal.syntax
-lib/mc/syntax/perl.syntax
-lib/mc/syntax/python.syntax
-lib/mc/syntax/sh.syntax
-lib/mc/syntax/smalltalk.syntax
-lib/mc/syntax/swig.syntax
-lib/mc/syntax/texinfo.syntax
-lib/mc/syntax/unknown.syntax
-lib/mc/term/README.xterm
-lib/mc/term/ansi.ti
-lib/mc/term/linux.ti
-lib/mc/term/vt100.ti
-lib/mc/term/xterm.ad
-lib/mc/term/xterm.tcap
-lib/mc/term/xterm.ti
-man/man1/mc.1
-man/man1/mcedit.1
-man/man8/mcserv.8
-${PKGLOCALEDIR}/locale/ca/LC_MESSAGES/mc.mo
-${PKGLOCALEDIR}/locale/cs/LC_MESSAGES/mc.mo
-${PKGLOCALEDIR}/locale/da/LC_MESSAGES/mc.mo
-${PKGLOCALEDIR}/locale/de/LC_MESSAGES/mc.mo
-${PKGLOCALEDIR}/locale/el/LC_MESSAGES/mc.mo
-${PKGLOCALEDIR}/locale/es/LC_MESSAGES/mc.mo
-${PKGLOCALEDIR}/locale/es_ES/LC_MESSAGES/mc.mo
-${PKGLOCALEDIR}/locale/fi/LC_MESSAGES/mc.mo
-${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/mc.mo
-${PKGLOCALEDIR}/locale/hu/LC_MESSAGES/mc.mo
-${PKGLOCALEDIR}/locale/it/LC_MESSAGES/mc.mo
-${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/mc.mo
-${PKGLOCALEDIR}/locale/ko/LC_MESSAGES/mc.mo
-${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/mc.mo
-${PKGLOCALEDIR}/locale/no/LC_MESSAGES/mc.mo
-${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/mc.mo
-${PKGLOCALEDIR}/locale/pt_BR/LC_MESSAGES/mc.mo
-${PKGLOCALEDIR}/locale/ro/LC_MESSAGES/mc.mo
-${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/mc.mo
-${PKGLOCALEDIR}/locale/sk/LC_MESSAGES/mc.mo
-${PKGLOCALEDIR}/locale/sl/LC_MESSAGES/mc.mo
-${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/mc.mo
-${PKGLOCALEDIR}/locale/tr/LC_MESSAGES/mc.mo
-${PKGLOCALEDIR}/locale/uk/LC_MESSAGES/mc.mo
-${PKGLOCALEDIR}/locale/wa/LC_MESSAGES/mc.mo
-${PKGLOCALEDIR}/locale/zh_CN.GB2312/LC_MESSAGES/mc.mo
-${PKGLOCALEDIR}/locale/zh_TW.Big5/LC_MESSAGES/mc.mo
-@dirrm lib/mc/term
-@dirrm lib/mc/syntax
-@dirrm lib/mc/extfs
-@dirrm lib/mc/desktop-scripts
-@dirrm lib/mc/bin
-@dirrm lib/mc
diff --git a/sysutils/mc/distinfo b/sysutils/mc/distinfo
deleted file mode 100644
index 1c0c5c4fe30..00000000000
--- a/sysutils/mc/distinfo
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: distinfo,v 1.7 2003/05/22 17:02:53 salo Exp $
-
-SHA1 (mc-4.5.51.tar.gz) = 24d5d90695266587a2e8190196b32c8f3a4b2406
-Size (mc-4.5.51.tar.gz) = 4330056 bytes
-SHA1 (patch-aa) = 2d9a4dd69706c923ffb46aab044833f974bd8d11
-SHA1 (patch-ab) = 6da1ccfdcd9b0623bf5619a99c59e67cd70b51b6
-SHA1 (patch-ac) = 36ee4017c74f04efff92e2a79cdb40cd5a4de6ed
-SHA1 (patch-ad) = 9867fe55febd06055ab4bc5415260708fb5d7472
-SHA1 (patch-ae) = c3ad5c2f2ad99782f343f7197a3ebcfb07366dee
-SHA1 (patch-af) = be7b6906f5cd23e28311519b42a1d8c630e98f2e
-SHA1 (patch-ag) = 60e697e475647038181d12186a0424c4a6165c59
-SHA1 (patch-ah) = a5ef804a13870ae5d100a7f6fb45281303da82c3
-SHA1 (patch-ai) = 7bac376900226618f1bb5849cb5ac277bdd4e4f9
-SHA1 (patch-aj) = b9ab663bf8f2d1b048338b85449846869362f125
diff --git a/sysutils/mc/patches/patch-aa b/sysutils/mc/patches/patch-aa
deleted file mode 100644
index fe1a94b59af..00000000000
--- a/sysutils/mc/patches/patch-aa
+++ /dev/null
@@ -1,49 +0,0 @@
-$NetBSD: patch-aa,v 1.11 2002/10/08 17:27:20 wiz Exp $
-
---- configure.orig Mon Jul 3 10:31:57 2000
-+++ configure
-@@ -3543,6 +3543,11 @@
-
-
-
-+# Set DATADIRNAME to "${PKGLOCALEDIR}"
-+DATADIRNAME="${PKGLOCALEDIR}"
-+INTLDEPS=
-+INTLLIBS="-lintl"
-+
- cc_uses_g=yes
- if test x$GCC = xyes; then
- if test x$ac_cv_prog_gcc_g = xyes; then
-@@ -9409,11 +9414,15 @@
-
-
- # Check whether --with-gnome or --without-gnome was given.
-+gnomecodedirs=
-+gnomeunixdirs=
- if test "${with_gnome+set}" = set; then
- withval="$with_gnome"
- if test x$withval = xyes; then
- want_gnome=yes
-
-+ gnomecodedirs='gnome idl'
-+ gnomeunixdirs='doc-gnome'
- mx=mx
- gmcdep=gmcdep
- libgtkedit="libgtkedit.a"
-@@ -11891,6 +11900,7 @@
- s/@@/%@/; s/@@/@%/; s/@g\$/%g/' > conftest.subs <<\\CEOF
- $ac_vpsub
- $extrasub
-+s%@LOCALBASE@%$LOCALBASE%g
- s%@SHELL@%$SHELL%g
- s%@CFLAGS@%$CFLAGS%g
- s%@CPPFLAGS@%$CPPFLAGS%g
-@@ -12019,6 +12029,8 @@
- s%@GNOME_DOCKLETS_LIBS@%$GNOME_DOCKLETS_LIBS%g
- s%@GNOME_CAPPLET_LIBS@%$GNOME_CAPPLET_LIBS%g
- s%@gnomeicondir@%$gnomeicondir%g
-+s%@gnomecodedirs@%$gnomecodedirs%g
-+s%@gnomeunixdirs@%$gnomeunixdirs%g
- s%@mx@%$mx%g
- s%@gmcdep@%$gmcdep%g
- s%@libgtkedit@%$libgtkedit%g
diff --git a/sysutils/mc/patches/patch-ab b/sysutils/mc/patches/patch-ab
deleted file mode 100644
index 7cf94ceb285..00000000000
--- a/sysutils/mc/patches/patch-ab
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD: patch-ab,v 1.10 2000/10/19 23:31:18 jlam Exp $
-
---- vfs/Make-mc.in.orig Mon Jul 3 10:31:58 2000
-+++ vfs/Make-mc.in
-@@ -16,6 +16,7 @@
- INSTALL = @INSTALL@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@ -m 755
- INSTALL_DATA = @INSTALL_DATA@
-+INSTALL_SCRIPT = @INSTALL_SCRIPT@
- AR = @AR@
-
- #
-@@ -342,11 +343,11 @@
- $(DESTDIR)$(extfsdir)/$$I; \
- done
- for I in $(EXTFS_CONST) ; do \
-- $(INSTALL_PROGRAM) $(srcdir)/extfs/$$I \
-+ $(INSTALL_SCRIPT) $(srcdir)/extfs/$$I \
- $(DESTDIR)$(extfsdir)/$$I; \
- done
- for I in $(EXTFS_OUT) ; do \
-- $(INSTALL_PROGRAM) $(builddir)/vfs/extfs/$$I \
-+ $(INSTALL_SCRIPT) $(builddir)/vfs/extfs/$$I \
- $(DESTDIR)$(extfsdir)/$$I; \
- done
-
diff --git a/sysutils/mc/patches/patch-ac b/sysutils/mc/patches/patch-ac
deleted file mode 100644
index 4012d167e12..00000000000
--- a/sysutils/mc/patches/patch-ac
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-ac,v 1.7 1999/10/23 11:54:35 tron Exp $
-
---- lib/Makefile.in.orig Wed Sep 29 22:39:38 1999
-+++ lib/Makefile.in Sat Oct 23 13:29:19 1999
-@@ -7,6 +7,7 @@
- INSTALL = @INSTALL@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_DATA = @INSTALL_DATA@
-+INSTALL_SCRIPT = @INSTALL_SCRIPT@
-
- #
- # Distribution variables
-@@ -62,7 +63,7 @@
- for I in $(LIBFILES_OUT); \
- do $(INSTALL_DATA) $(builddir)/lib/$$I $(DESTDIR)$(mclibdir)/$$I; done
- for I in $(SUPPBIN_OUT); \
-- do $(INSTALL_PROGRAM) -m 755 $(builddir)/lib/$$I $(DESTDIR)$(suppbindir)//$$I; done
-+ do $(INSTALL_SCRIPT) -m 755 $(builddir)/lib/$$I $(DESTDIR)$(suppbindir)//$$I; done
- for I in $(TIFILES); \
- do $(INSTALL_DATA) $(srcdir)/$$I $(DESTDIR)$(tidir)/$$I; done
- $(MKINSTALLDIRS) $(DESTDIR)$(confdir)
diff --git a/sysutils/mc/patches/patch-ad b/sysutils/mc/patches/patch-ad
deleted file mode 100644
index 41d74c44976..00000000000
--- a/sysutils/mc/patches/patch-ad
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-ad,v 1.7 2002/10/23 08:49:07 bouyer Exp $
-
---- vfs/smbfs.c.orig Mon Jul 3 16:31:59 2000
-+++ vfs/smbfs.c Tue Oct 22 22:29:12 2002
-@@ -29,7 +29,9 @@
- confilcts with definitions in other includes */
- #undef HAVE_LIBREADLINE
- #define NO_CONFIG_H
-+#ifndef SunOS
- #define BOOL_DEFINED
-+#endif
- #include "samba/include/includes.h"
-
- #include <string.h>
-@@ -375,7 +377,8 @@
- static int
- smbfs_init(vfs *me)
- {
-- char *servicesf = "/etc/smb.conf";
-+ /* This must match what net/samba uses. */
-+ char *servicesf = "/etc/samba/smb.conf";
-
- /* DEBUGLEVEL = 4; */
-
diff --git a/sysutils/mc/patches/patch-ae b/sysutils/mc/patches/patch-ae
deleted file mode 100644
index 0ca76233330..00000000000
--- a/sysutils/mc/patches/patch-ae
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD: patch-ae,v 1.7 2002/07/24 05:06:00 hubertf Exp $
-
---- vfs/extfs/ulha.in.orig Wed Jul 24 06:52:24 2002
-+++ vfs/extfs/ulha.in
-@@ -34,11 +34,16 @@
- # Define your awk
- AWK=@AWK@
-
--if ls -de . >& /dev/null;
-+if ls -de . >/dev/null 2>&1 ;
- then
- LS_COMMAND="ls -le"
- else
-- LS_COMMAND="ls -l --full-time"
-+ if ls -dT . >/dev/null 2>&1; # BSD::ls -T == Linux::ls -e
-+ then
-+ LS_COMMAND="ls -lT"
-+ else
-+ LS_COMMAND="ls -l --full-time"
-+ fi
- fi
-
- # Define which archiver you are using with appropriate options
diff --git a/sysutils/mc/patches/patch-af b/sysutils/mc/patches/patch-af
deleted file mode 100644
index d046fdabccb..00000000000
--- a/sysutils/mc/patches/patch-af
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD: patch-af,v 1.11 2000/10/19 23:31:18 jlam Exp $
-
---- Makefile.in.orig Mon Jul 3 10:31:57 2000
-+++ Makefile.in
-@@ -5,14 +5,15 @@
- @MCFGR@@MCF@
-
- foreigndirs=pc
--codedirs=vfs lib doc slang gtkedit edit src gnome new_icons icons idl syntax
--unixdirs=intl $(codedirs) doc-gnome @POSUB@
-+codedirs=vfs lib doc slang gtkedit edit src new_icons icons syntax @gnomecodedirs@
-+unixdirs=intl $(codedirs) @gnomeunixdirs@ @POSUB@
- alldirs=$(unixdirs) $(foreigndirs)
- subdirs=$(alldirs)
-
- INSTALL = @INSTALL@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_DATA = @INSTALL_DATA@
-+INSTALL_SCRIPT = @INSTALL_SCRIPT@
-
- DISTMAIN = configure configure.in NEWS README INSTALL INSTALL.FAST \
- Makefile.in FAQ COPYING create_vcs install-sh \
-@@ -45,7 +46,7 @@
- install: installdirs
- @for I in $(unixdirs); do cd $$I; $(MAKE) DESTDIR=$(DESTDIR) $@ || exit 1; cd ..; done
- $(INSTALL_DATA) $(srcdir)/FAQ $(DESTDIR)$(mclibdir)/FAQ
-- $(INSTALL_PROGRAM) mcfn_install $(DESTDIR)$(suppbindir)/mcfn_install
-+ $(INSTALL_SCRIPT) mcfn_install $(DESTDIR)$(suppbindir)/mcfn_install
- chmod +x $(DESTDIR)$(suppbindir)/mcfn_install
- @echo "Please verify that the configuration values are correctly"
- @echo "set in the mc.ext file in $(mclibdir)"
diff --git a/sysutils/mc/patches/patch-ag b/sysutils/mc/patches/patch-ag
deleted file mode 100644
index 2e5e08aa010..00000000000
--- a/sysutils/mc/patches/patch-ag
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ag,v 1.9 2002/07/24 04:30:16 hubertf Exp $
-
---- vfs/extfs/uzip.in.orig Mon Jul 3 10:32:00 2000
-+++ vfs/extfs/uzip.in
-@@ -7,7 +7,7 @@
- #
- #
-
--DZIP=/usr/bin
-+DZIP=@LOCALBASE@/bin
- XZIP="$DZIP/zip -g"
- XDZIP="$DZIP/zip -d"
- XUNZIP="$DZIP/unzip"
diff --git a/sysutils/mc/patches/patch-ah b/sysutils/mc/patches/patch-ah
deleted file mode 100644
index 171599a2da6..00000000000
--- a/sysutils/mc/patches/patch-ah
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ah,v 1.4 2002/07/24 04:30:16 hubertf Exp $
-
---- vfs/extfs/urar.in.orig Mon Jul 3 10:32:00 2000
-+++ vfs/extfs/urar.in
-@@ -5,7 +5,7 @@
- # Updated by christian.gennerat@alcatel.fr 1999
- # beta version 2.0
- #
--DRAR=/usr/bin
-+DRAR=@LOCALBASE@/bin
- RAR=$DRAR/rar
- UNRAR=$DRAR/unrar # Prefer unrar (freeware)
- #
diff --git a/sysutils/mc/patches/patch-ai b/sysutils/mc/patches/patch-ai
deleted file mode 100644
index 67bb2f4ea42..00000000000
--- a/sysutils/mc/patches/patch-ai
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ai,v 1.1 2002/10/08 17:27:20 wiz Exp $
-
---- vfs/samba/Makefile.in.orig Tue Oct 8 19:13:16 2002
-+++ vfs/samba/Makefile.in
-@@ -518,8 +518,6 @@ $(srcdir)/include/config.h.in: $(srcdir)
- @:
-
- $(srcdir)/include/stamp-h.in: @MAINT@ $(srcdir)/acconfig.h $(srcdir)/configure.in
-- cd $(srcdir) && $(AUTOHEADER)
-- @date -u > $@
-
- # automatic dependency tracking rules
- .deps/.dummy:
diff --git a/sysutils/mc/patches/patch-aj b/sysutils/mc/patches/patch-aj
deleted file mode 100644
index 5dd58741277..00000000000
--- a/sysutils/mc/patches/patch-aj
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-aj,v 1.1 2003/05/22 17:02:54 salo Exp $
-
---- slang/slang-mc.h.orig 2000-07-03 16:32:03.000000000 +0200
-+++ slang/slang-mc.h 2003-05-22 18:43:06.000000000 +0200
-@@ -25,6 +25,11 @@
- # endif
- #endif /* __watcomc__ */
-
-+#ifdef __NetBSD__
-+#undef unix
-+#define unix 1
-+#endif
-+
- #ifdef unix
- # ifndef __unix__
- # define __unix__ 1
diff --git a/sysutils/medusa/DESCR b/sysutils/medusa/DESCR
deleted file mode 100644
index 1682008df7e..00000000000
--- a/sysutils/medusa/DESCR
+++ /dev/null
@@ -1,13 +0,0 @@
- Medusa is software that allows you to quickly search your system for
-particular types of files, using an index.
-
-CAVEATS
--------
-
- Medusa is still in its early stages. It is not yet feature complete,
-and there are known bugs, some of which can take up lots of
-unnecessary resources on your machine.
-
- Please do not use this code on an afs system or over nfs volumes;
-the file permissions are not compatible with medusa. Running
-medusa on these systems is completely insecure.
diff --git a/sysutils/medusa/MESSAGE b/sysutils/medusa/MESSAGE
deleted file mode 100644
index 0e7940dc117..00000000000
--- a/sysutils/medusa/MESSAGE
+++ /dev/null
@@ -1,8 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE,v 1.3 2002/09/24 12:30:37 wiz Exp $
-
- Medusa has now been installed on your system. To configure this
- package, you need to create "medusa.conf", "file-index-stoplist", and
- "mount-type-stoplist" files in ${PREFIX}/etc by copying and editing
- the corresponding ".sample" files.
-===========================================================================
diff --git a/sysutils/medusa/Makefile b/sysutils/medusa/Makefile
deleted file mode 100644
index 2cca982740f..00000000000
--- a/sysutils/medusa/Makefile
+++ /dev/null
@@ -1,24 +0,0 @@
-# $NetBSD: Makefile,v 1.10 2003/07/13 13:53:19 wiz Exp $
-#
-
-DISTNAME= medusa-0.5.1
-PKGREVISION= 3
-CATEGORIES= sysutils gnome
-MASTER_SITES= ${MASTER_SITE_GNOME:=sources/medusa/0.5/} \
- http://download.eazel.com/source/
-
-MAINTAINER= rh@netbsd.org
-HOMEPAGE= http://www.eazel.com/
-COMMENT= file system indexing engine
-
-DEPENDS+= psmisc-[0-9]*:../../sysutils/psmisc
-
-USE_BUILDLINK2= YES
-USE_X11= YES
-GNU_CONFIGURE= YES
-
-USE_LIBTOOL= YES
-LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig
-
-.include "../../sysutils/gnome-vfs/buildlink2.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/medusa/PLIST b/sysutils/medusa/PLIST
deleted file mode 100644
index dc0a2df91bd..00000000000
--- a/sysutils/medusa/PLIST
+++ /dev/null
@@ -1,58 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 22:53:27 zuntum Exp $
-bin/medusa-config
-bin/medusa-idled
-bin/medusa-indexd
-bin/medusa-searchd
-bin/msearch
-etc/cron.daily/medusa.cron
-etc/medusa/file-index-stoplist.sample
-etc/medusa/medusa.conf.sample
-etc/medusa/mount-type-stoplist.sample
-etc/medusa/medusa-idled.csh
-etc/medusa/medusa-idled.sh
-etc/rc.d/medusa
-etc/vfs/modules/search-methods.conf
-include/libmedusa/medusa-file-info-utilities.h
-include/libmedusa/medusa-idled-client.h
-include/libmedusa/medusa-index-progress.h
-include/libmedusa/medusa-index-service-private.h
-include/libmedusa/medusa-index-service.h
-include/libmedusa/medusa-indexed-search.h
-include/libmedusa/medusa-lock-file-paths.h
-include/libmedusa/medusa-lock.h
-include/libmedusa/medusa-log.h
-include/libmedusa/medusa-search-service-private.h
-include/libmedusa/medusa-search-service.h
-include/libmedusa/medusa-service-private.h
-include/libmedusa/medusa-stdio-extensions.h
-include/libmedusa/medusa-string.h
-include/libmedusa/medusa-system-state.h
-include/libmedusa/medusa-unindexed-search.h
-include/libmedusa/medusa-unsearched-locations.h
-include/libmedusa/medusa-utils.h
-lib/libmedusa-index.a
-lib/libmedusa-index.la
-lib/libmedusa-index.so
-lib/libmedusa-index.so.0
-lib/libmedusa-index.so.0.0
-lib/libmedusa.a
-lib/libmedusa.la
-lib/libmedusa.so
-lib/libmedusa.so.0
-lib/libmedusa.so.0.0
-lib/vfs/modules/libvfs-search.a
-lib/vfs/modules/libvfs-search.la
-lib/vfs/modules/libvfs-search.so
-man/man1/medusa-config.1
-man/man1/medusa-idled.1
-man/man1/msearch.1
-man/man5/medusa-file-index-stoplist.5
-man/man5/medusa.conf.5
-man/man7/medusa-search-uri.7
-man/man8/medusa-searchd.8
-sbin/medusa-test-indexing-status
-var/medusa/.dummy
-@dirrm include/libmedusa
-@dirrm var/medusa
-@dirrm etc/medusa
-@dirrm etc/cron.daily
diff --git a/sysutils/medusa/buildlink2.mk b/sysutils/medusa/buildlink2.mk
deleted file mode 100644
index 78e466deb0d..00000000000
--- a/sysutils/medusa/buildlink2.mk
+++ /dev/null
@@ -1,28 +0,0 @@
-# $NetBSD: buildlink2.mk,v 1.3 2003/07/13 13:53:20 wiz Exp $
-#
-# This Makefile fragment is included by packages that use medusa.
-#
-# This file was created automatically using createbuildlink 2.4.
-#
-
-.if !defined(MEDUSA_BUILDLINK2_MK)
-MEDUSA_BUILDLINK2_MK= # defined
-
-BUILDLINK_PACKAGES+= medusa
-BUILDLINK_DEPENDS.medusa?= medusa>=0.5.1nb3
-BUILDLINK_PKGSRCDIR.medusa?= ../../sysutils/medusa
-
-EVAL_PREFIX+= BUILDLINK_PREFIX.medusa=medusa
-BUILDLINK_PREFIX.medusa_DEFAULT= ${LOCALBASE}
-BUILDLINK_FILES.medusa+= include/libmedusa/*
-BUILDLINK_FILES.medusa+= lib/libmedusa-index.*
-BUILDLINK_FILES.medusa+= lib/libmedusa.*
-BUILDLINK_FILES.medusa+= lib/vfs/modules/libvfs-search.* # XXX ???
-
-.include "../../sysutils/gnome-vfs/buildlink2.mk"
-
-BUILDLINK_TARGETS+= medusa-buildlink
-
-medusa-buildlink: _BUILDLINK_USE
-
-.endif # MEDUSA_BUILDLINK2_MK
diff --git a/sysutils/medusa/distinfo b/sysutils/medusa/distinfo
deleted file mode 100644
index 6a523b70dd6..00000000000
--- a/sysutils/medusa/distinfo
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: distinfo,v 1.3 2002/09/23 23:38:30 jlam Exp $
-
-SHA1 (medusa-0.5.1.tar.gz) = 8e3a1ae286c9502bceda3f3fa5f2b3559440d8d0
-Size (medusa-0.5.1.tar.gz) = 384482 bytes
-SHA1 (patch-aa) = 76a682d2b7e71488131037fed209a9d2144a97c9
-SHA1 (patch-ab) = f19d58f14f957dff3de7de9015910d4933c1b896
-SHA1 (patch-ad) = 885715122bbe31cb582e4cc75db02296e4282b4f
-SHA1 (patch-ae) = 0e93570781b68d42f9ced0b705e447c965fd611c
-SHA1 (patch-af) = c4a9458e8583a6f8acd286d1fefb8abb3fbf31ed
-SHA1 (patch-ag) = 9c4ffb05d2108dbacfbf34704c6a81fc06fc6d37
-SHA1 (patch-ah) = aabf5bbb2d0ea1872b76517b94ae65130147ff0c
-SHA1 (patch-ai) = 9c63685f52e62cebd027e7dfdbbb6526b0cd7b6b
-SHA1 (patch-aj) = 38cd6ebdcddf8fd956f6664df20236ec66797ae4
-SHA1 (patch-ak) = 643b9fdaac6cb189754e416a2fe7fe96593c812b
-SHA1 (patch-al) = 0ea2fd1a17c9ef00c4d32dc3fcd6c8044a388e49
-SHA1 (patch-am) = efa7e6cd18dec31a098834ae2a2f0bfd1ef07d77
diff --git a/sysutils/medusa/patches/patch-aa b/sysutils/medusa/patches/patch-aa
deleted file mode 100644
index 8c5e402f0ea..00000000000
--- a/sysutils/medusa/patches/patch-aa
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2001/05/14 17:13:21 rh Exp $
-
---- libmedusa/medusa-index-progress.c.orig Sun Apr 8 08:38:01 2001
-+++ libmedusa/medusa-index-progress.c
-@@ -54,7 +54,12 @@
- #ifdef HAVE_STATVFS
- # include <sys/statvfs.h>
- #elif HAVE_STATFS
--# include <sys/statfs.h>
-+# ifdef HAVE_STATVFS_H
-+# include <sys/statfs.h>
-+# else
-+# include <sys/param.h>
-+# include <sys/mount.h>
-+# endif
- #else
- # warning "Medusa will not be able to record your indexing progress because you don't have either statfs or statvfs."
- #endif
diff --git a/sysutils/medusa/patches/patch-ab b/sysutils/medusa/patches/patch-ab
deleted file mode 100644
index 836c14659db..00000000000
--- a/sysutils/medusa/patches/patch-ab
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 2001/05/14 17:13:21 rh Exp $
-
---- medusa-idled/medusa-idled-client.c.orig Sun Apr 8 08:43:28 2001
-+++ medusa-idled/medusa-idled-client.c
-@@ -31,9 +31,9 @@
-
- #include <glib.h>
- #include <string.h>
-+#include <sys/types.h>
- #include <sys/socket.h>
- #include <sys/time.h>
--#include <sys/types.h>
- #include <sys/un.h>
- #include <unistd.h>
- #include <libmedusa/medusa-service-private.h>
diff --git a/sysutils/medusa/patches/patch-ad b/sysutils/medusa/patches/patch-ad
deleted file mode 100644
index 3d74eb22bd5..00000000000
--- a/sysutils/medusa/patches/patch-ad
+++ /dev/null
@@ -1,32 +0,0 @@
-$NetBSD: patch-ad,v 1.1.1.1 2001/05/14 17:13:21 rh Exp $
-
---- indexer/medusa-file-index-daemon.c.orig Fri Apr 27 02:55:43 2001
-+++ indexer/medusa-file-index-daemon.c
-@@ -33,19 +33,26 @@
- #include <libgnomevfs/gnome-vfs-types.h>
- #include <libgnomevfs/gnome-vfs-uri.h>
- #include <libgnomevfs/gnome-vfs-utils.h>
--#include <popt.h>
-+#include <popt-gnome.h>
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
- #include <sys/resource.h>
- #include <sys/time.h>
- #include <sys/types.h>
-+#ifdef HAVE_SYS_VFS_H
- #include <sys/vfs.h>
-+#endif
-
- #ifdef HAVE_STATVFS
- #include <sys/statvfs.h>
- #elif defined(HAVE_STATFS)
-+#ifdef HAVE_STATFS_H
- #include <sys/statfs.h>
-+#else
-+#include <sys/param.h>
-+#include <sys/mount.h>
-+#endif /* HAVE_STATFS_H */
- #endif /* HAVE_STATVFS */
-
- #include <time.h>
diff --git a/sysutils/medusa/patches/patch-ae b/sysutils/medusa/patches/patch-ae
deleted file mode 100644
index 281371e25b7..00000000000
--- a/sysutils/medusa/patches/patch-ae
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ae,v 1.1.1.1 2001/05/14 17:13:21 rh Exp $
-
---- search-service/medusa-file-search-daemon.c.orig Sun Apr 8 08:54:53 2001
-+++ search-service/medusa-file-search-daemon.c
-@@ -271,7 +271,7 @@
- /* Ignore the termination status of child processes explicitly,
- so that they don't become zombies (see Stevens, "Advanced Programming
- in the Unix Environment", page 280) */
-- signal (SIGCLD, SIG_IGN);
-+ signal (SIGCHLD, SIG_IGN);
-
- /* Finish setting up all of the socket internals */
-
diff --git a/sysutils/medusa/patches/patch-af b/sysutils/medusa/patches/patch-af
deleted file mode 100644
index 1d531000e5f..00000000000
--- a/sysutils/medusa/patches/patch-af
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-af,v 1.2 2002/09/23 23:38:31 jlam Exp $
-
---- gnome-vfs-module/Makefile.in.orig Tue Mar 13 02:40:38 2001
-+++ gnome-vfs-module/Makefile.in
-@@ -137,7 +137,7 @@
- INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/libmedusa $(GNOME_CFLAGS) $(VFS_CFLAGS) $(NULL)
-
-
--libvfs_search_la_LIBADD = -L$(top_builddir)/libmedusa/.libs -lmedusa $(VFS_LIBS) $(GLIB_LIBS) $(NULL)
-+libvfs_search_la_LIBADD = $(top_builddir)/libmedusa/libmedusa.la $(VFS_LIBS) $(GLIB_LIBS) $(NULL)
-
-
- libvfs_search_la_LDFLAGS = -export_dynamic -avoid-version
diff --git a/sysutils/medusa/patches/patch-ag b/sysutils/medusa/patches/patch-ag
deleted file mode 100644
index b1e2faa4ea6..00000000000
--- a/sysutils/medusa/patches/patch-ag
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ag,v 1.1.1.1 2001/05/14 17:13:21 rh Exp $
-
---- libmedusa/medusa-lock-file-paths.h.orig Sun Apr 8 09:19:16 2001
-+++ libmedusa/medusa-lock-file-paths.h
-@@ -27,7 +27,7 @@
- #ifndef MEDUSA_LOCK_FILE_PATHS_H
- #define MEDUSA_LOCK_FILE_PATHS_H
-
--#define MEDUSA_FILE_INDEX_READ_LOCK_FILE "/var/lock/medusa-db-read"
--#define MEDUSA_FILE_INDEX_WRITE_LOCK_FILE "/var/lock/medusa-db-write"
-+#define MEDUSA_FILE_INDEX_READ_LOCK_FILE "/var/run/medusa-db-read.lock"
-+#define MEDUSA_FILE_INDEX_WRITE_LOCK_FILE "/var/run/medusa-db-write.lock"
-
- #endif /* MEDUSA_LOCK_FILE_PATHS_H */
diff --git a/sysutils/medusa/patches/patch-ah b/sysutils/medusa/patches/patch-ah
deleted file mode 100644
index 0ba8df5d21b..00000000000
--- a/sysutils/medusa/patches/patch-ah
+++ /dev/null
@@ -1,10 +0,0 @@
-$NetBSD: patch-ah,v 1.1.1.1 2001/05/14 17:13:21 rh Exp $
-
---- index-configuration/file-index-stoplist.orig Wed May 9 18:06:46 2001
-+++ index-configuration/file-index-stoplist
-@@ -2,4 +2,5 @@
- # Adding directories to this list will prevent the directory and all of its
- # contents from being indexed
- file:///proc
-+file:///kern
- file:///dev
diff --git a/sysutils/medusa/patches/patch-ai b/sysutils/medusa/patches/patch-ai
deleted file mode 100644
index 8fc43fa470d..00000000000
--- a/sysutils/medusa/patches/patch-ai
+++ /dev/null
@@ -1,71 +0,0 @@
-$NetBSD: patch-ai,v 1.1.1.1 2001/05/14 17:13:21 rh Exp $
-
---- index-configuration/Makefile.in.orig Fri May 4 08:08:32 2001
-+++ index-configuration/Makefile.in
-@@ -146,12 +146,12 @@
- medusacronconf_DATA = medusa.cron $(NULL)
-
-
--medusaidledconfdir = $(sysconfdir)/profile.d
-+medusaidledconfdir = $(sysconfdir)/medusa
-
- medusaidledconf_DATA = medusa-idled.sh medusa-idled.csh $(NULL)
-
-
--medusainitdir = $(prefix)/tmp
-+medusainitdir = $(prefix)/etc/rc.d
-
- medusainit_DATA = medusa-init $(NULL)
-
-@@ -316,10 +316,10 @@
- @list='$(file_index_DATA)'; for p in $$list; do \
- if test -f $(srcdir)/$$p; then \
- echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(file_indexdir)/$$p"; \
-- $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(file_indexdir)/$$p; \
-+ $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(file_indexdir)/$$p.sample; \
- else if test -f $$p; then \
- echo " $(INSTALL_DATA) $$p $(DESTDIR)$(file_indexdir)/$$p"; \
-- $(INSTALL_DATA) $$p $(DESTDIR)$(file_indexdir)/$$p; \
-+ $(INSTALL_DATA) $$p $(DESTDIR)$(file_indexdir)/$$p.sample; \
- fi; fi; \
- done
-
-@@ -335,10 +335,10 @@
- @list='$(medusa_conf_DATA)'; for p in $$list; do \
- if test -f $(srcdir)/$$p; then \
- echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(medusa_confdir)/$$p"; \
-- $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(medusa_confdir)/$$p; \
-+ $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(medusa_confdir)/$$p.sample; \
- else if test -f $$p; then \
- echo " $(INSTALL_DATA) $$p $(DESTDIR)$(medusa_confdir)/$$p"; \
-- $(INSTALL_DATA) $$p $(DESTDIR)$(medusa_confdir)/$$p; \
-+ $(INSTALL_DATA) $$p $(DESTDIR)$(medusa_confdir)/$$p.sample; \
- fi; fi; \
- done
-
-@@ -373,10 +373,10 @@
- @list='$(medusaidledconf_DATA)'; for p in $$list; do \
- if test -f $(srcdir)/$$p; then \
- echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(medusaidledconfdir)/$$p"; \
-- $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(medusaidledconfdir)/$$p; \
-+ ${BSD_INSTALL_SCRIPT} $(srcdir)/$$p $(DESTDIR)$(medusaidledconfdir)/$$p; \
- else if test -f $$p; then \
- echo " $(INSTALL_DATA) $$p $(DESTDIR)$(medusaidledconfdir)/$$p"; \
-- $(INSTALL_DATA) $$p $(DESTDIR)$(medusaidledconfdir)/$$p; \
-+ ${BSD_INSTALL_SCRIPT} $$p $(DESTDIR)$(medusaidledconfdir)/$$p; \
- fi; fi; \
- done
-
-@@ -392,10 +392,10 @@
- @list='$(medusainit_DATA)'; for p in $$list; do \
- if test -f $(srcdir)/$$p; then \
- echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(medusainitdir)/$$p"; \
-- $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(medusainitdir)/$$p; \
-+ ${BSD_INSTALL_SCRIPT} $(srcdir)/$$p $(DESTDIR)$(medusainitdir)/medusa; \
- else if test -f $$p; then \
- echo " $(INSTALL_DATA) $$p $(DESTDIR)$(medusainitdir)/$$p"; \
-- $(INSTALL_DATA) $$p $(DESTDIR)$(medusainitdir)/$$p; \
-+ ${BSD_INSTALL_SCRIPT} $$p $(DESTDIR)$(medusainitdir)/medusa; \
- fi; fi; \
- done
-
diff --git a/sysutils/medusa/patches/patch-aj b/sysutils/medusa/patches/patch-aj
deleted file mode 100644
index 16dd678f022..00000000000
--- a/sysutils/medusa/patches/patch-aj
+++ /dev/null
@@ -1,10 +0,0 @@
-$NetBSD: patch-aj,v 1.1.1.1 2001/05/14 17:13:21 rh Exp $
-
---- index-configuration/medusa-idled.csh.in.orig Fri Jan 19 00:53:25 2001
-+++ index-configuration/medusa-idled.csh.in
-@@ -6,4 +6,4 @@
- # it's easier just to call the sh version than to figure out what's been
- # set and what hasn't.
-
--/bin/sh /etc/profile.d/medusa-idled.sh
-+/bin/sh @prefix@/etc/medusa/medusa-idled.sh
diff --git a/sysutils/medusa/patches/patch-ak b/sysutils/medusa/patches/patch-ak
deleted file mode 100644
index e6b64de0ad4..00000000000
--- a/sysutils/medusa/patches/patch-ak
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ak,v 1.1 2002/03/29 19:44:55 fredb Exp $
-
---- indexer/Makefile.in.orig Fri Mar 29 11:10:41 2002
-+++ indexer/Makefile.in
-@@ -133,7 +133,7 @@
- DEFS = $(NULL)
-
-
--INCLUDES = -I$(top_srcdir) -I$(top_builddir) $(GLIB_CFLAGS) $(XML_CFLAGS) $(VFS_CFLAGS) $(NULL)
-+INCLUDES = -I$(top_srcdir) -I$(top_builddir) $(GLIB_CFLAGS) $(GNOME_CFLAGS) $(XML_CFLAGS) $(VFS_CFLAGS) $(NULL)
-
-
- medusa_indexd_LDADD = $(top_builddir)/libmedusa/libmedusa.la $(top_builddir)/libmedusa-internal/libmedusa-index.la $(VFS_LIBS) $(GLIB_LIBS) $(GNOME_LIBS) $(OAF_LIBS) $(XML_LIBS) $(NULL)
diff --git a/sysutils/medusa/patches/patch-al b/sysutils/medusa/patches/patch-al
deleted file mode 100644
index 83444862762..00000000000
--- a/sysutils/medusa/patches/patch-al
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-al,v 1.1 2002/03/29 19:44:55 fredb Exp $
-
---- search-service/Makefile.in.orig Fri Mar 29 11:10:41 2002
-+++ search-service/Makefile.in
-@@ -133,7 +133,7 @@
- noinst_HEADERS = medusa-authenticate.h medusa-file-search-parse-transmission.h $(NULL)
-
-
--INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/libmedusa-internal -I$(top_srcdir)/libmedusa $(GLIB_CFLAGS) $(VFS_CFLAGS) $(NULL)
-+INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/libmedusa-internal -I$(top_srcdir)/libmedusa $(GLIB_CFLAGS) $(GNOME_CFLAGS) $(VFS_CFLAGS) $(NULL)
-
-
- medusa_searchd_LDADD = $(top_builddir)/libmedusa/libmedusa.la $(top_builddir)/libmedusa-internal/libmedusa-index.la $(VFS_LIBS) $(GLIB_LIBS) $(GNOME_LIBS) $(OAF_LIBS) $(XML_LIBS) $(NULL)
diff --git a/sysutils/medusa/patches/patch-am b/sysutils/medusa/patches/patch-am
deleted file mode 100644
index f5b4c52a1c2..00000000000
--- a/sysutils/medusa/patches/patch-am
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-am,v 1.1 2002/03/29 19:44:55 fredb Exp $
-
---- tests/Makefile.in.orig Fri Mar 29 11:10:41 2002
-+++ tests/Makefile.in
-@@ -127,7 +127,7 @@
-
- noinst_PROGRAMS = test-text-index test-index-service test-queue test-file-indexer test-versioned-file test-search-method test-system-state
-
--INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/libmedusa-internal -I$(top_srcdir)/libmedusa $(VFS_CFLAGS) $(GLIB_CFLAGS) $(GTK_CFLAGS) $(NULL)
-+INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/libmedusa-internal -I$(top_srcdir)/libmedusa $(VFS_CFLAGS) $(GLIB_CFLAGS) $(GNOME_CFLAGS) $(GTK_CFLAGS) $(NULL)
-
-
- test_text_index_SOURCES = medusa-text-index-test.c
diff --git a/sysutils/memconf/DESCR b/sysutils/memconf/DESCR
deleted file mode 100644
index 99213ec27ca..00000000000
--- a/sysutils/memconf/DESCR
+++ /dev/null
@@ -1,6 +0,0 @@
-memconf reports the size of each SIMM/DIMM memory module installed in
-a system. It also reports the system type and any empty memory
-sockets.
-
-In verbose mode, it also reports: banner name, model, and CPU/system
-frequencies address range and bank numbers for each module
diff --git a/sysutils/memconf/Makefile b/sysutils/memconf/Makefile
deleted file mode 100644
index 67ba414923c..00000000000
--- a/sysutils/memconf/Makefile
+++ /dev/null
@@ -1,22 +0,0 @@
-# $NetBSD: Makefile,v 1.5 2003/03/29 12:42:28 jmmv Exp $
-#
-
-DISTNAME= memconf
-PKGNAME= memconf-1.23.2
-WRKSRC= ${WRKDIR}
-CATEGORIES= sysutils
-MASTER_SITES= ftp://ftp.netbsd.org/pub/NetBSD/packages/distfiles/
-EXTRACT_SUFX= .gz
-
-MAINTAINER= agc@netbsd.org
-HOMEPAGE= http://netnow.micron.net/~tschmidt/memconf.html
-COMMENT= physical memory information utility
-
-ONLY_FOR_PLATFORM= SunOS-*-* # only for Solaris
-
-NO_BUILD= yes
-
-do-install:
- ${INSTALL_SCRIPT} ${WRKSRC}/memconf ${LOCALBASE}/sbin/memconf
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/memconf/PLIST b/sysutils/memconf/PLIST
deleted file mode 100644
index d368c56dd0f..00000000000
--- a/sysutils/memconf/PLIST
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 22:53:28 zuntum Exp $
-sbin/memconf
diff --git a/sysutils/memconf/distinfo b/sysutils/memconf/distinfo
deleted file mode 100644
index c36195040d5..00000000000
--- a/sysutils/memconf/distinfo
+++ /dev/null
@@ -1,4 +0,0 @@
-$NetBSD: distinfo,v 1.2 2001/05/08 16:15:56 agc Exp $
-
-SHA1 (memconf.gz) = 1432bb5f021b535cab2a07a4aaf2b252d85c00c9
-Size (memconf.gz) = 16729 bytes
diff --git a/sysutils/memtest86/DESCR b/sysutils/memtest86/DESCR
deleted file mode 100644
index 10447372f18..00000000000
--- a/sysutils/memtest86/DESCR
+++ /dev/null
@@ -1,3 +0,0 @@
-Memtest86 is a thorough, stand alone memory test for i386 architecture
-systems. BIOS-based memory tests are only a quick check and often miss
-failures that are detected by Memtest86.
diff --git a/sysutils/memtest86/MESSAGE b/sysutils/memtest86/MESSAGE
deleted file mode 100644
index 6c221b3f9f5..00000000000
--- a/sysutils/memtest86/MESSAGE
+++ /dev/null
@@ -1,13 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE,v 1.1.1.1 2002/03/07 14:44:36 wiz Exp $
-
-Memtest86 is a standalone program, it does not run within an operating
-system. It has been designed to boot from a PC floppy disk. To install
-Memtest86 on a floppy, insert a disk then type:
- dd if=${PREFIX}/mdec/memtest.bin of=/dev/fd0a
-
-Please read the documentation at:
- ${PREFIX}/share/doc/memtest/README
- http://www.memtest86.com
-
-===========================================================================
diff --git a/sysutils/memtest86/Makefile b/sysutils/memtest86/Makefile
deleted file mode 100644
index dde353d77c0..00000000000
--- a/sysutils/memtest86/Makefile
+++ /dev/null
@@ -1,27 +0,0 @@
-# $NetBSD: Makefile,v 1.6 2002/12/24 18:55:41 wiz Exp $
-#
-
-DISTNAME= memtest86-2.9
-CATEGORIES= sysutils
-MASTER_SITES= http://www.memtest86.com/
-
-MAINTAINER= collver1@attbi.com
-HOMEPAGE= http://www.memtest86.com/
-COMMENT= thorough, stand alone memory test for x86 arch
-
-ONLY_FOR_PLATFORM= NetBSD-*-i386
-
-USE_BUILDLINK2= yes
-USE_GMAKE= yes
-
-post-patch:
- ${CP} ${FILESDIR}/linkage.h ${WRKSRC}
-
-do-install:
- ${INSTALL_DATA_DIR} ${PREFIX}/mdec
- ${CP} ${WRKSRC}/memtest.bin ${PREFIX}/mdec
- ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/memtest
- ${CP} ${WRKSRC}/README ${PREFIX}/share/doc/memtest
-
-.include "../../devel/binutils/buildlink2.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/memtest86/PLIST b/sysutils/memtest86/PLIST
deleted file mode 100644
index 9de6b627e8c..00000000000
--- a/sysutils/memtest86/PLIST
+++ /dev/null
@@ -1,5 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2002/03/07 14:44:36 wiz Exp $
-mdec/memtest.bin
-share/doc/memtest/README
-@dirrm mdec
-@dirrm share/doc/memtest
diff --git a/sysutils/memtest86/distinfo b/sysutils/memtest86/distinfo
deleted file mode 100644
index 147399dde2b..00000000000
--- a/sysutils/memtest86/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.2 2002/03/07 15:05:23 wiz Exp $
-
-SHA1 (memtest86-2.9.tar.gz) = fdddc9549e429cbef55e0d88f0e0807f98359b9b
-Size (memtest86-2.9.tar.gz) = 94658 bytes
-SHA1 (patch-aa) = 871b7ea0ed70c8a1754f03bf6458c44e88bae353
-SHA1 (patch-ab) = 297a1b9bdf2c7c1fa38fb69f7f185b3c8f800754
diff --git a/sysutils/memtest86/files/linkage.h b/sysutils/memtest86/files/linkage.h
deleted file mode 100644
index 190202f0589..00000000000
--- a/sysutils/memtest86/files/linkage.h
+++ /dev/null
@@ -1,54 +0,0 @@
-#ifndef _LINUX_LINKAGE_H
-#define _LINUX_LINKAGE_H
-
-#ifdef __cplusplus
-#define CPP_ASMLINKAGE extern "C"
-#else
-#define CPP_ASMLINKAGE
-#endif
-
-#if defined __i386__ && (__GNUC__ > 2 || __GNUC_MINOR__ > 7)
-#define asmlinkage CPP_ASMLINKAGE __attribute__((regparm(0)))
-#else
-#define asmlinkage CPP_ASMLINKAGE
-#endif
-
-#define SYMBOL_NAME_STR(X) #X
-#define SYMBOL_NAME(X) X
-#ifdef __STDC__
-#define SYMBOL_NAME_LABEL(X) X##:
-#else
-#define SYMBOL_NAME_LABEL(X) X/**/:
-#endif
-
-#ifdef __arm__
-#define __ALIGN .align 0
-#define __ALIGN_STR ".align 0"
-#else
-#ifdef __mc68000__
-#define __ALIGN .align 4
-#define __ALIGN_STR ".align 4"
-#else
-#if !defined(__i486__) && !defined(__i586__)
-#define __ALIGN .align 4,0x90
-#define __ALIGN_STR ".align 4,0x90"
-#else /* __i486__/__i586__ */
-#define __ALIGN .align 16,0x90
-#define __ALIGN_STR ".align 16,0x90"
-#endif /* __i486__/__i586__ */
-#endif /* __mc68000__ */
-#endif /* __arm__ */
-
-#ifdef __ASSEMBLY__
-
-#define ALIGN __ALIGN
-#define ALIGN_STR __ALIGN_STR
-
-#define ENTRY(name) \
- .globl SYMBOL_NAME(name); \
- ALIGN; \
- SYMBOL_NAME_LABEL(name)
-
-#endif
-
-#endif
diff --git a/sysutils/memtest86/patches/patch-aa b/sysutils/memtest86/patches/patch-aa
deleted file mode 100644
index 60e3542841c..00000000000
--- a/sysutils/memtest86/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2002/03/07 14:44:36 wiz Exp $
-
---- Makefile.orig Wed Oct 24 16:57:16 2001
-+++ Makefile
-@@ -6,7 +6,7 @@
- #
- # Path for the floppy disk device
- #
--FDISK=/dev/fd0
-+FDISK=/dev/fd0a
-
- CC=gcc
- #
diff --git a/sysutils/memtest86/patches/patch-ab b/sysutils/memtest86/patches/patch-ab
deleted file mode 100644
index 5dabab20320..00000000000
--- a/sysutils/memtest86/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 2002/03/07 14:44:36 wiz Exp $
-
---- head.S.orig Sun Apr 8 22:37:53 2001
-+++ head.S Sun Apr 8 22:56:59 2001
-@@ -15,7 +15,7 @@
- .global idt_descr
- .global trap_regs
-
--#include <linux/linkage.h>
-+#include "linkage.h"
- #include "defs.h"
- #include "config.h"
-
diff --git a/sysutils/mgm/DESCR b/sysutils/mgm/DESCR
deleted file mode 100644
index 8ab8970dfa4..00000000000
--- a/sysutils/mgm/DESCR
+++ /dev/null
@@ -1,4 +0,0 @@
-MGM, the Moaning Goat Meter, is the ultimate sixty-ton cast iron
-lawn ornament for the desktops of today's hacker set: A gorgeous,
-highly configurable load and status meter written entirely in Perl.
-Serious pink-flamingo territory. For evil geniuses only.
diff --git a/sysutils/mgm/Makefile b/sysutils/mgm/Makefile
deleted file mode 100644
index dedd0c0e557..00000000000
--- a/sysutils/mgm/Makefile
+++ /dev/null
@@ -1,48 +0,0 @@
-# $NetBSD: Makefile,v 1.3 2003/03/29 12:42:29 jmmv Exp $
-
-DISTNAME= mgm-1.1
-WRKSRC= ${WRKDIR}/${DISTNAME:C/-.*$//}
-CATEGORIES= sysutils
-MASTER_SITES= http://www.xiph.org/mgm/
-EXTRACT_SUFX= .tgz
-
-MAINTAINER= lukem@netbsd.org
-HOMEPAGE= http://www.xiph.org/mgm/
-COMMENT= Moaning Goat Meter
-
-DEPENDS+= p5-Tk-[0-9]*:../../x11/p5-Tk
-
-NO_BUILD= # defined
-USE_PERL5= YES
-PERL_SCRIPTS= mgm
-
-MGM_PERL_DIR= ${PREFIX}/lib/${DISTNAME:C/-.*$//}
-MGM_DOC_DIR= ${PREFIX}/share/doc/html/${DISTNAME:C/-.*$//}
-
-post-patch:
- ${SED} -e 's|@@MGM_PERL_DIR@@|${MGM_PERL_DIR}|' \
- ${FILESDIR}/mgm.sh > ${WRKDIR}/mgm.sh
- cd ${WRKSRC}; \
- for FILE in ${PERL_SCRIPTS}; do \
- ${CP} $$FILE $${FILE}.orig; \
- ${SED} -e 's#/usr/bin/perl#${PERL5}#g' \
- <$${FILE}.orig >$$FILE; \
- done
-
-do-install:
- ${INSTALL_DATA_DIR} ${MGM_PERL_DIR} ${MGM_PERL_DIR}/modules
- ${INSTALL_SCRIPT} ${WRKSRC}/mgm ${MGM_PERL_DIR}
- cd ${WRKSRC}; \
- for DIR in lib modules/*; do \
- ${INSTALL_DATA_DIR} ${MGM_PERL_DIR}/$$DIR; \
- for FILE in $$DIR/*; do \
- ${INSTALL_DATA} $$FILE ${MGM_PERL_DIR}/$$DIR; \
- done; \
- done
- ${INSTALL_DATA_DIR} ${MGM_DOC_DIR}
- for FILE in ${WRKSRC}/doc/*; do \
- ${INSTALL_DATA} $$FILE ${MGM_DOC_DIR}; \
- done
- ${INSTALL_SCRIPT} ${WRKDIR}/mgm.sh ${PREFIX}/bin/mgm
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/mgm/PLIST b/sysutils/mgm/PLIST
deleted file mode 100644
index 355f829b1d1..00000000000
--- a/sysutils/mgm/PLIST
+++ /dev/null
@@ -1,119 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 22:53:31 zuntum Exp $
-bin/mgm
-lib/mgm/lib/fishframe.xpm
-lib/mgm/lib/helvetica.xpm
-lib/mgm/lib/helvetica2.xpm
-lib/mgm/lib/mgm-small.xpm
-lib/mgm/lib/mgm-vertical.xpm
-lib/mgm/lib/widget
-lib/mgm/lib/xpm
-lib/mgm/mgm
-lib/mgm/modules/linux/00helper
-lib/mgm/modules/linux/battery
-lib/mgm/modules/linux/biff
-lib/mgm/modules/linux/clock
-lib/mgm/modules/linux/context
-lib/mgm/modules/linux/cpustat
-lib/mgm/modules/linux/diskstat
-lib/mgm/modules/linux/diskuse
-lib/mgm/modules/linux/forks
-lib/mgm/modules/linux/hostlogo
-lib/mgm/modules/linux/loadav
-lib/mgm/modules/linux/memuse
-lib/mgm/modules/linux/netstat
-lib/mgm/modules/linux/pagestat
-lib/mgm/modules/linux/phoon
-lib/mgm/modules/linux/spacer
-lib/mgm/modules/linux/swapstat
-lib/mgm/modules/netbsd/biff
-lib/mgm/modules/netbsd/clock
-lib/mgm/modules/netbsd/diskuse
-lib/mgm/modules/netbsd/hostlogo
-lib/mgm/modules/netbsd/phoon
-lib/mgm/modules/netbsd/spacer
-lib/mgm/modules/share/biff
-lib/mgm/modules/share/clock
-lib/mgm/modules/share/diskuse
-lib/mgm/modules/share/hostlogo
-lib/mgm/modules/share/phoon
-lib/mgm/modules/share/spacer
-lib/mgm/modules/solaris/biff
-lib/mgm/modules/solaris/clock
-lib/mgm/modules/solaris/diskuse
-lib/mgm/modules/solaris/hostlogo
-lib/mgm/modules/solaris/phoon
-lib/mgm/modules/solaris/spacer
-share/doc/html/mgm/battery.gif
-share/doc/html/mgm/docs.html
-share/doc/html/mgm/down.html
-share/doc/html/mgm/faq.html
-share/doc/html/mgm/index.html
-share/doc/html/mgm/m-battery.html
-share/doc/html/mgm/m-biff.html
-share/doc/html/mgm/m-clock.html
-share/doc/html/mgm/m-context.html
-share/doc/html/mgm/m-cpustat.html
-share/doc/html/mgm/m-diskstat.html
-share/doc/html/mgm/m-diskuse.html
-share/doc/html/mgm/m-forks.html
-share/doc/html/mgm/m-hostlogo.html
-share/doc/html/mgm/m-loadav.html
-share/doc/html/mgm/m-memuse.html
-share/doc/html/mgm/m-netstat.html
-share/doc/html/mgm/m-pagestat.html
-share/doc/html/mgm/m-phoon.html
-share/doc/html/mgm/m-spacer.html
-share/doc/html/mgm/m-swapstat.html
-share/doc/html/mgm/mail.html
-share/doc/html/mgm/mgm-small.gif
-share/doc/html/mgm/mgm.gif
-share/doc/html/mgm/ps.gif
-share/doc/html/mgm/r-active.html
-share/doc/html/mgm/r-background.html
-share/doc/html/mgm/r-bars.html
-share/doc/html/mgm/r-blank.html
-share/doc/html/mgm/r-borderwidth.html
-share/doc/html/mgm/r-dimbackground.html
-share/doc/html/mgm/r-dimforeground.html
-share/doc/html/mgm/r-dimrelief.html
-share/doc/html/mgm/r-font.html
-share/doc/html/mgm/r-foreground.html
-share/doc/html/mgm/r-geometry.html
-share/doc/html/mgm/r-label.html
-share/doc/html/mgm/r-labelsize.html
-share/doc/html/mgm/r-lendemand.html
-share/doc/html/mgm/r-litbackground.html
-share/doc/html/mgm/r-litforeground.html
-share/doc/html/mgm/r-litrelief.html
-share/doc/html/mgm/r-minx.html
-share/doc/html/mgm/r-miny.html
-share/doc/html/mgm/r-order.html
-share/doc/html/mgm/r-ratio.html
-share/doc/html/mgm/r-reconfig.html
-share/doc/html/mgm/r-relief.html
-share/doc/html/mgm/r-scale.html
-share/doc/html/mgm/r-scalecolor.html
-share/doc/html/mgm/r-scalejustify.html
-share/doc/html/mgm/r-scalelenadj.html
-share/doc/html/mgm/r-scalerefresh.html
-share/doc/html/mgm/r-scalereturn.html
-share/doc/html/mgm/r-scalescroll.html
-share/doc/html/mgm/r-scalethresh.html
-share/doc/html/mgm/r-scalewidadj.html
-share/doc/html/mgm/r-stack.html
-share/doc/html/mgm/r-textpad.html
-share/doc/html/mgm/r-widdemand.html
-share/doc/html/mgm/r-widgetpad.html
-share/doc/html/mgm/screenshot1.gif
-share/doc/html/mgm/screenshot2.gif
-share/doc/html/mgm/trouble.html
-share/doc/html/mgm/villa.gif
-share/doc/html/mgm/white-xifish.gif
-@dirrm share/doc/html/mgm
-@dirrm lib/mgm/modules/solaris
-@dirrm lib/mgm/modules/share
-@dirrm lib/mgm/modules/netbsd
-@dirrm lib/mgm/modules/linux
-@dirrm lib/mgm/modules
-@dirrm lib/mgm/lib
-@dirrm lib/mgm
diff --git a/sysutils/mgm/distinfo b/sysutils/mgm/distinfo
deleted file mode 100644
index 22dfdc6aa92..00000000000
--- a/sysutils/mgm/distinfo
+++ /dev/null
@@ -1,4 +0,0 @@
-$NetBSD: distinfo,v 1.1.1.1 2001/10/08 06:09:34 lukem Exp $
-
-SHA1 (mgm-1.1.tgz) = eb5b4a7da3cf43c18b9dab528da8551d6bb3c363
-Size (mgm-1.1.tgz) = 171065 bytes
diff --git a/sysutils/mgm/files/mgm.sh b/sysutils/mgm/files/mgm.sh
deleted file mode 100755
index 48fd7cf49b0..00000000000
--- a/sysutils/mgm/files/mgm.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-exec @@MGM_PERL_DIR@@/mgm $*
diff --git a/sysutils/mksunbootcd/DESCR b/sysutils/mksunbootcd/DESCR
deleted file mode 100644
index 6a4cf9c2866..00000000000
--- a/sysutils/mksunbootcd/DESCR
+++ /dev/null
@@ -1,13 +0,0 @@
-The mksunbootcd program combines filesystem partitions for Sun Microsys-
-tems, Inc. computers into an image suitable for writing to a compact
-disc, that will allow the disc to be booted on the sun3, sun3x, sun4,
-sun4c, sun4m and sun4u platforms. This hardware is supported by the
-NetBSD sparc, sparc64 and sun3 ports. The architecture arguments above
-must be the bootable filesystem images for the named architecture.
-filesystem is typically an iso9660 filesystem, see mount_cd9660(8) for
-details, but can be any type as long as the first 512 bytes of the image
-are not used. This image is modified, and the additional partitions
-added after this partition, in order. If any architecture image is miss-
-ing, that partition is not used. If a disc with sun4 and sun4m support
-only was to be created, a dummy image would need to be in place for
-sun4c.
diff --git a/sysutils/mksunbootcd/Makefile b/sysutils/mksunbootcd/Makefile
deleted file mode 100644
index 82b38a3b1d5..00000000000
--- a/sysutils/mksunbootcd/Makefile
+++ /dev/null
@@ -1,17 +0,0 @@
-# $NetBSD: Makefile,v 1.3 2001/02/17 17:42:16 wiz Exp $
-#
-
-DISTNAME= mksunbootcd-19990513
-CATEGORIES= sysutils
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-
-MAINTAINER= dmcmahill@netbsd.org
-HOMEPAGE= http://www.netbsd.org
-COMMENT= combines filesystems for Sun computers to make bootable CD-ROM images
-
-do-install:
- ${INSTALL_PROGRAM} ${WRKSRC}/mksunbootcd ${PREFIX}/sbin
- ${INSTALL_MAN} ${WRKSRC}/mksunbootcd.1 ${PREFIX}/man/man8/mksunbootcd.8
- ${INSTALL_MAN} ${WRKSRC}/mksunbootcd.cat1 ${PREFIX}/man/cat8/mksunbootcd.0
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/mksunbootcd/PLIST b/sysutils/mksunbootcd/PLIST
deleted file mode 100644
index 582f94b9e0b..00000000000
--- a/sysutils/mksunbootcd/PLIST
+++ /dev/null
@@ -1,4 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 22:53:33 zuntum Exp $
-sbin/mksunbootcd
-man/man8/mksunbootcd.8
-man/cat8/mksunbootcd.0
diff --git a/sysutils/mksunbootcd/distinfo b/sysutils/mksunbootcd/distinfo
deleted file mode 100644
index 205b8b29bd7..00000000000
--- a/sysutils/mksunbootcd/distinfo
+++ /dev/null
@@ -1,4 +0,0 @@
-$NetBSD: distinfo,v 1.2 2001/04/19 11:29:05 agc Exp $
-
-SHA1 (mksunbootcd-19990513.tar.gz) = 98d7b99a9ef91097a9956107e282f6ad38c53d2c
-Size (mksunbootcd-19990513.tar.gz) = 4722 bytes
diff --git a/sysutils/mktemp/DESCR b/sysutils/mktemp/DESCR
deleted file mode 100644
index d7514fe574f..00000000000
--- a/sysutils/mktemp/DESCR
+++ /dev/null
@@ -1,2 +0,0 @@
-Mktemp is a simple utility designed to make temporary file handling in shell
-scripts be safe and simple.
diff --git a/sysutils/mktemp/Makefile b/sysutils/mktemp/Makefile
deleted file mode 100644
index ee88264fe68..00000000000
--- a/sysutils/mktemp/Makefile
+++ /dev/null
@@ -1,17 +0,0 @@
-# $NetBSD: Makefile,v 1.3 2003/06/02 01:16:54 jschauma Exp $
-#
-
-DISTNAME= mktemp-1.5
-CATEGORIES= sysutils security
-MASTER_SITES= ftp://ftp.mktemp.org/pub/mktemp/ \
- ftp://ftp.cs.colorado.edu/pub/mktemp/ \
- ftp://ftp.usa.openbsd.org/pub/mktemp/ \
- ftp://ftp.wiretapped.net/pub/security/host-security/mktemp/
-
-MAINTAINER= tech-pkg@netbsd.org
-HOMEPAGE= http://www.mktemp.org/
-COMMENT= Small program for safe temporary file and directory creation
-
-GNU_CONFIGURE= YES
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/mktemp/PLIST b/sysutils/mktemp/PLIST
deleted file mode 100644
index 32b55af11e9..00000000000
--- a/sysutils/mktemp/PLIST
+++ /dev/null
@@ -1,3 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2002/12/13 09:32:08 salo Exp $
-bin/mktemp
-man/man1/mktemp.1
diff --git a/sysutils/mktemp/distinfo b/sysutils/mktemp/distinfo
deleted file mode 100644
index 1cdbcb10027..00000000000
--- a/sysutils/mktemp/distinfo
+++ /dev/null
@@ -1,4 +0,0 @@
-$NetBSD: distinfo,v 1.2 2003/04/25 20:41:52 salo Exp $
-
-SHA1 (mktemp-1.5.tar.gz) = aa001fd61d13bbf128dc58ca4dc6d83311435bae
-Size (mktemp-1.5.tar.gz) = 70529 bytes
diff --git a/sysutils/mtools/DESCR b/sysutils/mtools/DESCR
deleted file mode 100644
index 5cd82b60d2c..00000000000
--- a/sysutils/mtools/DESCR
+++ /dev/null
@@ -1,4 +0,0 @@
-These tools allow you to access MS-DOS or other FAT disks without mounting
-them. You can copy from or to BSD files, list directories, or run various
-other MS-DOS-style file / disk access tool imitates, (in general with an 'm'
-prepended to their name).
diff --git a/sysutils/mtools/Makefile b/sysutils/mtools/Makefile
deleted file mode 100644
index 5649718d001..00000000000
--- a/sysutils/mtools/Makefile
+++ /dev/null
@@ -1,34 +0,0 @@
-# $NetBSD: Makefile,v 1.27 2003/05/22 16:16:03 salo Exp $
-#
-
-DISTNAME= mtools-3.9.7
-PKGREVISION= 2
-CATEGORIES= sysutils
-MASTER_SITES= ftp://ftp.tux.org/pub/tux/knaff/mtools/
-
-MAINTAINER= is@netbsd.org
-HOMEPAGE= http://www.tux.org/pub/knaff/mtools/
-COMMENT= FAT (MS-DOS, Atari) disk access tools
-
-NOT_FOR_PLATFORM = *-*-alpha *-*-sparc64 # LP64 problem
-
-GNU_CONFIGURE= YES
-USE_GMAKE= YES
-INFO_FILES= mtools.info
-
-TEXINFO_OVERRIDE= YES
-
-.include "../../mk/bsd.prefs.mk"
-
-.if defined(MTOOLS_ENABLE_FLOPPYD) && !empty(MTOOLS_ENABLE_FLOPPYD:M[Yy][Ee][Ss])
-USE_X11= YES
-CPPFLAGS= -I${X11BASE}/include
-CONFIGURE_ARGS= --enable-floppyd
-PLIST_SUBST= NOFLOPPYD=
-.else
-CONFIGURE_ARGS= --disable-floppyd
-PLIST_SUBST= NOFLOPPYD="@comment "
-.endif
-
-.include "../../mk/texinfo.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/mtools/PLIST b/sysutils/mtools/PLIST
deleted file mode 100644
index e8bb6a8b07f..00000000000
--- a/sysutils/mtools/PLIST
+++ /dev/null
@@ -1,63 +0,0 @@
-@comment $NetBSD: PLIST,v 1.3 2003/05/22 16:16:03 salo Exp $
-${NOFLOPPYD}bin/floppyd
-${NOFLOPPYD}bin/floppyd_installtest
-bin/lz
-bin/mattrib
-bin/mbadblocks
-bin/mcat
-bin/mcd
-bin/mcheck
-bin/mcomp
-bin/mcopy
-bin/mdel
-bin/mdeltree
-bin/mdir
-bin/mdu
-bin/mformat
-bin/minfo
-bin/mkmanifest
-bin/mlabel
-bin/mmd
-bin/mmount
-bin/mmove
-bin/mpartition
-bin/mrd
-bin/mread
-bin/mren
-bin/mshowfat
-bin/mtools
-bin/mtoolstest
-bin/mtype
-bin/mxtar
-bin/mzip
-bin/tgz
-bin/uz
-@unexec ${INSTALL_INFO} --delete --info-dir=%D/info %D/info/mtools.info
-info/mtools.info
-@exec ${INSTALL_INFO} --info-dir=%D/info %D/info/mtools.info
-${NOFLOPPYD}man/man1/floppyd.1
-man/man1/mattrib.1
-man/man1/mbadblocks.1
-man/man1/mcat.1
-man/man1/mcd.1
-man/man1/mcopy.1
-man/man1/mdel.1
-man/man1/mdeltree.1
-man/man1/mdir.1
-man/man1/mdu.1
-man/man1/mformat.1
-man/man1/mkmanifest.1
-man/man1/mlabel.1
-man/man1/mmd.1
-man/man1/mmount.1
-man/man1/mmove.1
-man/man1/mpartition.1
-man/man1/mrd.1
-man/man1/mread.1
-man/man1/mren.1
-man/man1/mshowfat.1
-man/man1/mtools.1
-man/man1/mtoolstest.1
-man/man1/mtype.1
-man/man1/mzip.1
-man/man5/mtools.5
diff --git a/sysutils/mtools/distinfo b/sysutils/mtools/distinfo
deleted file mode 100644
index 2917493a2af..00000000000
--- a/sysutils/mtools/distinfo
+++ /dev/null
@@ -1,9 +0,0 @@
-$NetBSD: distinfo,v 1.3 2003/05/22 16:16:04 salo Exp $
-
-SHA1 (mtools-3.9.7.tar.gz) = b54f8a7041854edb5c17b116b3d77e4d088aedfb
-Size (mtools-3.9.7.tar.gz) = 282769 bytes
-SHA1 (patch-aa) = 9effa09b809b1dc0dce231ea261785d52b51bf0d
-SHA1 (patch-ab) = 7549dceacff03ad9116bb45fd30e60088cf8fa93
-SHA1 (patch-ac) = 3b807b102f832095cb0e7734393655f99a205897
-SHA1 (patch-ad) = 4165cf8850f4e2d8e5d610133f2d776b7f2ccb90
-SHA1 (patch-af) = 0e2e1037be4da5f7c876cb5c9f54950e4726f6d0
diff --git a/sysutils/mtools/patches/patch-aa b/sysutils/mtools/patches/patch-aa
deleted file mode 100644
index 31da38ba690..00000000000
--- a/sysutils/mtools/patches/patch-aa
+++ /dev/null
@@ -1,30 +0,0 @@
-$NetBSD: patch-aa,v 1.6 2003/05/22 16:16:04 salo Exp $
-
---- Makefile.in.orig 2000-05-14 20:14:59.000000000 +0200
-+++ Makefile.in 2003-05-22 18:00:53.000000000 +0200
-@@ -49,6 +49,7 @@
-
- INSTALL = @INSTALL@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-+INSTALL_SCRIPT = ${BSD_INSTALL_SCRIPT}
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_INFO = @INSTALL_INFO@
-
-@@ -56,7 +57,7 @@
- .SUFFIXES: .o .c
- .SUFFIXES: .o .c
-
--MAN1 = floppyd.1 mattrib.1 mbadblocks.1 mcat.1 mcd.1 mcopy.1 mdel.1 mdeltree.1 mdir.1 \
-+MAN1 = @MANFLOPPYD@ mattrib.1 mbadblocks.1 mcat.1 mcd.1 mcopy.1 mdel.1 mdeltree.1 mdir.1 \
- mdu.1 mformat.1 mkmanifest.1 mlabel.1 mmd.1 mmount.1 mmove.1 mpartition.1 \
- mrd.1 mread.1 mren.1 mshowfat.1 mtoolstest.1 mtools.1 mtype.1 mzip.1
- MAN1EXT = 1
-@@ -256,7 +257,7 @@
- install-scripts: $(bindir)/mtools
- @$(top_srcdir)/mkinstalldirs $(bindir)
- @for j in $(SCRIPTS) ; do \
-- $(INSTALL_PROGRAM) $(srcdir)/scripts/$$j $(bindir)/$$j ; \
-+ $(INSTALL_SCRIPT) $(srcdir)/scripts/$$j $(bindir)/$$j ; \
- echo $(bindir)/$$j ; \
- done
- rm -f $(bindir)/lz
diff --git a/sysutils/mtools/patches/patch-ab b/sysutils/mtools/patches/patch-ab
deleted file mode 100644
index 865b31fc88e..00000000000
--- a/sysutils/mtools/patches/patch-ab
+++ /dev/null
@@ -1,55 +0,0 @@
-$NetBSD: patch-ab,v 1.5 2003/05/22 16:16:04 salo Exp $
-
---- configure.orig 2000-05-28 12:22:06.000000000 +0200
-+++ configure 2003-05-22 17:57:40.000000000 +0200
-@@ -2626,7 +2626,7 @@
- fi
-
-
--if [ $host_vendor = linux ] ; then
-+if [ "$host_vendor" = linux ] ; then
- LDFLAGS="$LDFLAGS -z"
- fi
-
-@@ -2908,7 +2908,7 @@
-
- # It would also be nice to do this for all -L options, not just this one.
- if test -n "$x_libraries"; then
-- X_LIBS="$X_LIBS -L$x_libraries"
-+ X_LIBS="$X_LIBS -Wl,${RPATH_FLAG}$x_libraries -L$x_libraries"
- # For Solaris; some versions of Sun CC require a space after -R and
- # others require no space. Words are not sufficient . . . .
- case "`(uname -sr) 2>/dev/null`" in
-@@ -3443,7 +3443,7 @@
-
- # Check for libraries that X11R6 Xt/Xaw programs need.
- ac_save_LDFLAGS="$LDFLAGS"
-- test -n "$x_libraries" && LDFLAGS="$LDFLAGS -L$x_libraries"
-+ test -n "$x_libraries" && LDFLAGS="$LDFLAGS -Wl,${RPATH_FLAG}$x_libraries -L$x_libraries"
- # SM needs ICE to (dynamically) link under SunOS 4.x (so we have to
- # check for ICE first), but we must link in the order -lSM -lICE or
- # we get undefined symbols. So assume we have SM if we have ICE.
-@@ -3644,6 +3644,7 @@
- fi
- FLOPPYD="floppyd floppyd_installtest"
- BINFLOPPYD="\$(bindir)/floppyd \$(bindir)/floppyd_installtest"
-+ MANFLOPPYD="floppyd.1"
- cat >> confdefs.h <<\EOF
- #define USE_FLOPPYD 1
- EOF
-@@ -3651,6 +3652,7 @@
- else
- FLOPPYD=
- BINFLOPPYD=
-+ MANFLOPPYD=
- fi
-
-
-@@ -3823,6 +3825,7 @@
- s%@X_EXTRA_LIBS@%$X_EXTRA_LIBS%g
- s%@FLOPPYD@%$FLOPPYD%g
- s%@BINFLOPPYD@%$BINFLOPPYD%g
-+s%@MANFLOPPYD@%$MANFLOPPYD%g
- s%@extraincludedir@%$extraincludedir%g
- s%@extralibdir@%$extralibdir%g
- s%@MACHDEPLIBS@%$MACHDEPLIBS%g
diff --git a/sysutils/mtools/patches/patch-ac b/sysutils/mtools/patches/patch-ac
deleted file mode 100644
index 4ee53ac9948..00000000000
--- a/sysutils/mtools/patches/patch-ac
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-ac,v 1.6 2001/02/28 10:26:02 wiz Exp $
---- floppyd.c.orig Sun May 28 13:20:30 2000
-+++ floppyd.c Wed Feb 14 13:42:45 2001
-@@ -574,7 +574,7 @@
- }
- else
- {
-- uid = 65535;
-+ uid = getuserid("nobody");
- }
-
- #ifdef DEBUG
-@@ -600,7 +600,7 @@
- }
- else
- {
-- gid = 65535;
-+ gid = getgroupid(uid);
- }
-
- #ifdef DEBUG
diff --git a/sysutils/mtools/patches/patch-ad b/sysutils/mtools/patches/patch-ad
deleted file mode 100644
index bd205d67b07..00000000000
--- a/sysutils/mtools/patches/patch-ad
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ad,v 1.3 2003/05/22 16:16:04 salo Exp $
-
---- devices.c.orig 2000-05-28 12:20:54.000000000 +0200
-+++ devices.c 2003-05-22 17:35:16.000000000 +0200
-@@ -798,7 +798,7 @@
- #endif /* __FreeBSD__ */
-
- /*** /jes -- for ALR 486 DX4/100 ***/
--#if defined(OS_netbsd)
-+#if defined(OS_netbsd) || defined(OS_netbsdelf)
- #define predefined_devices
- struct device devices[] = {
- {"/dev/rfd0a", 'A', FHD312},
diff --git a/sysutils/mtools/patches/patch-af b/sysutils/mtools/patches/patch-af
deleted file mode 100644
index 563ca9ecf05..00000000000
--- a/sysutils/mtools/patches/patch-af
+++ /dev/null
@@ -1,40 +0,0 @@
-$NetBSD: patch-af,v 1.1 2000/12/07 14:11:37 is Exp $
-
---- init.c.orig Fri Mar 19 09:57:59 1999
-+++ init.c
-@@ -27,15 +27,30 @@
- */
- static int read_boot(Stream_t *Stream, struct bootsector * boot, int size)
- {
-+ int rc;
-+ char *buf;
-+
-+ buf = (char *)boot;
-+
- /* read the first sector, or part of it */
- if(!size)
- size = BOOTSIZE;
-- if(size > 1024)
-- size = 1024;
-
-- if (force_read(Stream, (char *) boot, 0, size) != size)
-- return -1;
-- return 0;
-+ if (size > sizeof(struct bootsector)) {
-+ buf = malloc(size);
-+ if (!buf)
-+ return(-1);
-+ }
-+
-+ rc = 0;
-+ if (force_read(Stream, buf, 0, size) != size)
-+ rc = -1;
-+
-+ if (buf != (char *)boot) {
-+ memcpy(boot, buf, sizeof(struct bootsector));
-+ free(buf);
-+ }
-+ return rc;
- }
-
- static int fs_flush(Stream_t *Stream)
diff --git a/sysutils/mtoolsfm/DESCR b/sysutils/mtoolsfm/DESCR
deleted file mode 100644
index 6d83350a3c7..00000000000
--- a/sysutils/mtoolsfm/DESCR
+++ /dev/null
@@ -1,19 +0,0 @@
-MToolsFM is a GTK based file-manager which gives people easy access to
-MS-DOS (Windows) floppies. It uses the mtools collection of utilities
-as a backend. Although originally designed for floppies, any disk
-mtools works with can be accessed: Jaz, Zip, Syquest, IDE, or even
-disk images.
-
-Why MToolsFM? (Modified from the MToolsFM web-page):
-
- The disadvantage with mtools is that nowadays there are not many
- people who know about DOS-commands. And who would ask a UNIX newbie
- to learn DOS ;-) ? This is why you need MToolsFM: It gives you a
- simple, easy to use file-manager interface for accessing your
- floppies. It has the advantages of mtools, but you do not have to
- learn the DOS-commands.
-
- It is particularly helpful if you administer a NetBSD-box used by
- people who are more familiar with MS Windows. These people can now
- access floppies without the long explanation and you'll have more
- time. ;-)
diff --git a/sysutils/mtoolsfm/Makefile b/sysutils/mtoolsfm/Makefile
deleted file mode 100644
index 60372d4abd5..00000000000
--- a/sysutils/mtoolsfm/Makefile
+++ /dev/null
@@ -1,30 +0,0 @@
-# $NetBSD: Makefile,v 1.6 2003/07/13 13:53:20 wiz Exp $
-#
-
-DISTNAME= MToolsFM-1.9-3
-PKGNAME= mtoolsfm-1.9.3
-PKGREVISION= 3
-CATEGORIES= sysutils
-MASTER_SITES= http://www.core-coutainville.org/MToolsFM/archive/SOURCES/
-
-MAINTAINER= ben@wongs.net
-HOMEPAGE= http://www.core-coutainville.org/MToolsFM/
-COMMENT= Easy MS-DOS disk access without learning MS-DOS commands
-
-DEPENDS+= mtools>=3.9.7:../../sysutils/mtools
-
-USE_BUILDLINK2= yes
-USE_PKGINSTALL= yes
-GNU_CONFIGURE= yes
-CONFIGURE_ARGS+= --with-conffile=${PKG_SYSCONFDIR}/mtoolsfm.conf
-
-post-extract:
- cd ${WRKSRC} && ${MV} MToolsFM.1 MToolsFM.1.in
-
-pre-configure:
- cd ${WRKSRC} && ${SED} \
- -e 's|@PKG_SYSCONFDIR@|${PKG_SYSCONFDIR}|g' \
- < MToolsFM.1.in > MToolsFM.1
-
-.include "../../x11/gtk/buildlink2.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/mtoolsfm/PLIST b/sysutils/mtoolsfm/PLIST
deleted file mode 100644
index 5f63cd26d1b..00000000000
--- a/sysutils/mtoolsfm/PLIST
+++ /dev/null
@@ -1,5 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2002/06/09 22:47:51 agc Exp $
-bin/MToolsFM
-man/man1/MToolsFM.1
-share/locale/de/LC_MESSAGES/MToolsFM.mo
-share/locale/fr/LC_MESSAGES/MToolsFM.mo
diff --git a/sysutils/mtoolsfm/distinfo b/sysutils/mtoolsfm/distinfo
deleted file mode 100644
index 012f6f363e6..00000000000
--- a/sysutils/mtoolsfm/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.2 2003/07/02 17:42:11 jmmv Exp $
-
-SHA1 (MToolsFM-1.9-3.tar.gz) = f2d5428cf277b9dc71d9b96661543c155be7d30f
-Size (MToolsFM-1.9-3.tar.gz) = 177388 bytes
-SHA1 (patch-aa) = fb08f6b930a48a4b289ddb78e0961488b0228efe
diff --git a/sysutils/mtoolsfm/patches/patch-aa b/sysutils/mtoolsfm/patches/patch-aa
deleted file mode 100644
index 04a6fc87625..00000000000
--- a/sysutils/mtoolsfm/patches/patch-aa
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2003/07/02 17:42:12 jmmv Exp $
-
---- MToolsFM.1.in.orig Sat Aug 11 18:26:43 2001
-+++ MToolsFM.1.in
-@@ -20,7 +20,7 @@
- .TP
- .B \-\-nosysconf
- Do not attempt to read system-wide configuration in
--.IR /etc/mtoolsfm.conf .
-+.IR @PKG_SYSCONFDIR@/mtoolsfm.conf .
- .TP
- .B \-\-nouserconf
- Do not read user config file in
-@@ -55,7 +55,7 @@
- ~/.mtoolsfm
- User-based initialization file
- .TP
--/etc/mtoolsfm.conf
-+@PKG_SYSCONFDIR@/mtoolsfm.conf
- System-wide initialization file
- .SH DIAGNOSTICS
- Diagnostics appear in a little textfield at the bottom of the main window.
diff --git a/sysutils/nautilus/DESCR b/sysutils/nautilus/DESCR
deleted file mode 100644
index 4a98fac125a..00000000000
--- a/sysutils/nautilus/DESCR
+++ /dev/null
@@ -1,3 +0,0 @@
- Nautilus is the official file manager for the GNOME desktop. It is
-designed to be primarly a file manager, but there is support for web and
-file viewing too.
diff --git a/sysutils/nautilus/Makefile b/sysutils/nautilus/Makefile
deleted file mode 100644
index f078398bb19..00000000000
--- a/sysutils/nautilus/Makefile
+++ /dev/null
@@ -1,68 +0,0 @@
-# $NetBSD: Makefile,v 1.6 2003/07/13 13:53:20 wiz Exp $
-#
-
-DISTNAME= nautilus-2.2.3.1
-PKGREVISION= 5
-CATEGORIES= sysutils gnome
-MASTER_SITES= ${MASTER_SITE_GNOME:=sources/nautilus/2.2/}
-EXTRACT_SUFX= .tar.bz2
-
-MAINTAINER= rh@netbsd.org
-HOMEPAGE= http://www.gnome.org/projects/nautilus/
-COMMENT= Nautilus file manager for GNOME2
-
-USE_PKGLOCALEDIR= yes
-USE_BUILDLINK2= yes
-USE_X11= yes
-USE_GMAKE= yes
-USE_LIBTOOL= yes
-USE_PKGINSTALL= yes
-GNU_CONFIGURE= yes
-LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
-PKGCONFIG_OVERRIDE= ${WRKSRC}/libnautilus/libnautilus.pc.in
-
-CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
-CONFIGURE_ENV+= GCONF_SCHEMA_FILE_DIR="${PREFIX}/share/gconf/schemas/"
-MAKE_ENV+= GCONF_SCHEMA_FILE_DIR="${PREFIX}/share/gconf/schemas/"
-
-GCONF2_SCHEMAS= apps_nautilus_preferences.schemas
-
-OWN_DIRS= ${PKG_SYSCONFDIR}/X11/serverconfig
-OWN_DIRS+= ${PKG_SYSCONFDIR}/X11/starthere
-OWN_DIRS+= ${PKG_SYSCONFDIR}/X11/sysconfig
-EGDIR= ${PREFIX}/share/examples/nautilus
-CONF_FILES=
-.for conffile in X11/serverconfig/.directory \
- X11/starthere/.directory \
- X11/starthere/applications.desktop \
- X11/starthere/preferences.desktop \
- X11/starthere/serverconfig.desktop \
- X11/starthere/sysconfig.desktop \
- X11/sysconfig/.directory
-CONF_FILES+= ${EGDIR}/${conffile} ${PKG_SYSCONFDIR}/${conffile}
-.endfor
-.undef conffile
-
-pre-build:
- for d in libnautilus libnautilus-adapter libnautilus-private src ; \
- do \
- cd ${WRKSRC}/$$d && \
- for x in *.idl ; do \
- ${PREFIX}/bin/orbit-idl-2 \
- -I${LOCALBASE}/share/idl/bonobo-2.0 \
- -I${LOCALBASE}/share/idl/bonobo-activation-2.0 \
- -I.. \
- -D__nautilus_view_component_COMPILATION $$x ; \
- ${TOUCH} `${ECHO} $$x | ${SED} s/\.idl/_idl_stamp/\
- | ${SED} s/-/_/g` ; \
- done ; \
- done
-
-.include "../../devel/GConf2/schemas.mk"
-.include "../../devel/eel2/buildlink2.mk"
-.include "../../graphics/imlib2/buildlink2.mk"
-.include "../../graphics/librsvg2/buildlink2.mk"
-.include "../../sysutils/fam/buildlink2.mk"
-.include "../../textproc/intltool/buildlink2.mk"
-.include "../../x11/gnome-desktop/buildlink2.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/nautilus/PLIST b/sysutils/nautilus/PLIST
deleted file mode 100644
index 71b0581d342..00000000000
--- a/sysutils/nautilus/PLIST
+++ /dev/null
@@ -1,358 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2003/04/27 16:05:03 jmmv Exp $
-bin/nautilus
-bin/nautilus-file-management-properties
-bin/nautilus-server-connect
-include/libnautilus/libnautilus.h
-include/libnautilus/nautilus-bonobo-ui.h
-include/libnautilus/nautilus-clipboard.h
-include/libnautilus/nautilus-distributed-undo.h
-include/libnautilus/nautilus-idle-queue.h
-include/libnautilus/nautilus-scroll-positionable.h
-include/libnautilus/nautilus-undo-private.h
-include/libnautilus/nautilus-undo.h
-include/libnautilus/nautilus-view-component.h
-include/libnautilus/nautilus-view-standard-main.h
-include/libnautilus/nautilus-view.h
-lib/bonobo/libnautilus-emblem-view.a
-lib/bonobo/libnautilus-emblem-view.la
-lib/bonobo/libnautilus-emblem-view.so
-lib/bonobo/libnautilus-history-view.a
-lib/bonobo/libnautilus-history-view.la
-lib/bonobo/libnautilus-history-view.so
-lib/bonobo/libnautilus-image-properties-view.a
-lib/bonobo/libnautilus-image-properties-view.la
-lib/bonobo/libnautilus-image-properties-view.so
-lib/bonobo/libnautilus-notes-view.a
-lib/bonobo/libnautilus-notes-view.la
-lib/bonobo/libnautilus-notes-view.so
-lib/bonobo/libnautilus-tree-view.a
-lib/bonobo/libnautilus-tree-view.la
-lib/bonobo/libnautilus-tree-view.so
-lib/bonobo/servers/Nautilus_ComponentAdapterFactory_std.server
-lib/bonobo/servers/Nautilus_Control_throbber.server
-lib/bonobo/servers/Nautilus_View_emblem.server
-lib/bonobo/servers/Nautilus_View_history.server
-lib/bonobo/servers/Nautilus_View_image_properties.server
-lib/bonobo/servers/Nautilus_View_notes.server
-lib/bonobo/servers/Nautilus_View_text.server
-lib/bonobo/servers/Nautilus_View_tree.server
-lib/bonobo/servers/Nautilus_shell.server
-lib/libnautilus-adapter.a
-lib/libnautilus-adapter.la
-lib/libnautilus-adapter.so
-lib/libnautilus-adapter.so.2
-lib/libnautilus-adapter.so.2.0
-lib/libnautilus-private.a
-lib/libnautilus-private.la
-lib/libnautilus-private.so
-lib/libnautilus-private.so.2
-lib/libnautilus-private.so.2.0
-lib/libnautilus.a
-lib/libnautilus.la
-lib/libnautilus.so
-lib/libnautilus.so.2
-lib/libnautilus.so.2.0
-lib/pkgconfig/libnautilus.pc
-libexec/nautilus-adapter
-libexec/nautilus-text-view
-libexec/nautilus-throbber
-share/applications/nautilus.desktop
-share/applications/network-scheme.desktop
-share/control-center-2.0/capplets/nautilus-file-management-properties.desktop
-share/examples/nautilus/X11/serverconfig/.directory
-share/examples/nautilus/X11/starthere/.directory
-share/examples/nautilus/X11/starthere/applications.desktop
-share/examples/nautilus/X11/starthere/preferences.desktop
-share/examples/nautilus/X11/starthere/serverconfig.desktop
-share/examples/nautilus/X11/starthere/sysconfig.desktop
-share/examples/nautilus/X11/sysconfig/.directory
-share/gconf/schemas/apps_nautilus_preferences.schemas
-share/gnome-2.0/ui/nautilus-clipboard-ui.xml
-share/gnome-2.0/ui/nautilus-desktop-icon-view-ui.xml
-share/gnome-2.0/ui/nautilus-directory-view-ui.xml
-share/gnome-2.0/ui/nautilus-icon-view-ui.xml
-share/gnome-2.0/ui/nautilus-search-list-view-ui.xml
-share/gnome-2.0/ui/nautilus-shell-ui.xml
-share/gnome-2.0/ui/nautilus-text-view-ui.xml
-share/gnome/network/nautilus-server-connect.desktop
-share/idl/nautilus-distributed-undo.idl
-share/idl/nautilus-view-component.idl
-${PKGLOCALEDIR}/locale/am/LC_MESSAGES/nautilus.mo
-${PKGLOCALEDIR}/locale/ar/LC_MESSAGES/nautilus.mo
-${PKGLOCALEDIR}/locale/az/LC_MESSAGES/nautilus.mo
-${PKGLOCALEDIR}/locale/be/LC_MESSAGES/nautilus.mo
-${PKGLOCALEDIR}/locale/bg/LC_MESSAGES/nautilus.mo
-${PKGLOCALEDIR}/locale/ca/LC_MESSAGES/nautilus.mo
-${PKGLOCALEDIR}/locale/cs/LC_MESSAGES/nautilus.mo
-${PKGLOCALEDIR}/locale/da/LC_MESSAGES/nautilus.mo
-${PKGLOCALEDIR}/locale/de/LC_MESSAGES/nautilus.mo
-${PKGLOCALEDIR}/locale/el/LC_MESSAGES/nautilus.mo
-${PKGLOCALEDIR}/locale/en_GB/LC_MESSAGES/nautilus.mo
-${PKGLOCALEDIR}/locale/es/LC_MESSAGES/nautilus.mo
-${PKGLOCALEDIR}/locale/et/LC_MESSAGES/nautilus.mo
-${PKGLOCALEDIR}/locale/eu/LC_MESSAGES/nautilus.mo
-${PKGLOCALEDIR}/locale/fa/LC_MESSAGES/nautilus.mo
-${PKGLOCALEDIR}/locale/fi/LC_MESSAGES/nautilus.mo
-${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/nautilus.mo
-${PKGLOCALEDIR}/locale/ga/LC_MESSAGES/nautilus.mo
-${PKGLOCALEDIR}/locale/gl/LC_MESSAGES/nautilus.mo
-${PKGLOCALEDIR}/locale/he/LC_MESSAGES/nautilus.mo
-${PKGLOCALEDIR}/locale/hi/LC_MESSAGES/nautilus.mo
-${PKGLOCALEDIR}/locale/hu/LC_MESSAGES/nautilus.mo
-${PKGLOCALEDIR}/locale/it/LC_MESSAGES/nautilus.mo
-${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/nautilus.mo
-${PKGLOCALEDIR}/locale/ko/LC_MESSAGES/nautilus.mo
-${PKGLOCALEDIR}/locale/lt/LC_MESSAGES/nautilus.mo
-${PKGLOCALEDIR}/locale/lv/LC_MESSAGES/nautilus.mo
-${PKGLOCALEDIR}/locale/mk/LC_MESSAGES/nautilus.mo
-${PKGLOCALEDIR}/locale/ml/LC_MESSAGES/nautilus.mo
-${PKGLOCALEDIR}/locale/mn/LC_MESSAGES/nautilus.mo
-${PKGLOCALEDIR}/locale/ms/LC_MESSAGES/nautilus.mo
-${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/nautilus.mo
-${PKGLOCALEDIR}/locale/nn/LC_MESSAGES/nautilus.mo
-${PKGLOCALEDIR}/locale/no/LC_MESSAGES/nautilus.mo
-${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/nautilus.mo
-${PKGLOCALEDIR}/locale/pt/LC_MESSAGES/nautilus.mo
-${PKGLOCALEDIR}/locale/pt_BR/LC_MESSAGES/nautilus.mo
-${PKGLOCALEDIR}/locale/ro/LC_MESSAGES/nautilus.mo
-${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/nautilus.mo
-${PKGLOCALEDIR}/locale/sk/LC_MESSAGES/nautilus.mo
-${PKGLOCALEDIR}/locale/sl/LC_MESSAGES/nautilus.mo
-${PKGLOCALEDIR}/locale/sq/LC_MESSAGES/nautilus.mo
-${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/nautilus.mo
-${PKGLOCALEDIR}/locale/ta/LC_MESSAGES/nautilus.mo
-${PKGLOCALEDIR}/locale/th/LC_MESSAGES/nautilus.mo
-${PKGLOCALEDIR}/locale/tr/LC_MESSAGES/nautilus.mo
-${PKGLOCALEDIR}/locale/uk/LC_MESSAGES/nautilus.mo
-${PKGLOCALEDIR}/locale/vi/LC_MESSAGES/nautilus.mo
-${PKGLOCALEDIR}/locale/wa/LC_MESSAGES/nautilus.mo
-${PKGLOCALEDIR}/locale/yi/LC_MESSAGES/nautilus.mo
-${PKGLOCALEDIR}/locale/zh_CN/LC_MESSAGES/nautilus.mo
-${PKGLOCALEDIR}/locale/zh_TW/LC_MESSAGES/nautilus.mo
-share/nautilus/browser.xml
-share/nautilus/filesystem-attributes.xml
-share/nautilus/glade/nautilus-bookmarks-window.glade
-share/nautilus/glade/nautilus-file-management-properties.glade
-share/nautilus/glade/nautilus-server-connect.glade
-share/nautilus/nautilus-extras.placeholder
-share/nautilus/nautilus-suggested.placeholder
-share/nautilus/patterns/.striated.png
-share/nautilus/patterns/blue_gray_rough.png
-share/nautilus/patterns/blue_ridge.png
-share/nautilus/patterns/blue_type.png
-share/nautilus/patterns/brushed_metal.png
-share/nautilus/patterns/burlap.jpg
-share/nautilus/patterns/camouflage.png
-share/nautilus/patterns/chalk.jpg
-share/nautilus/patterns/cork.png
-share/nautilus/patterns/countertop.png
-share/nautilus/patterns/dark-gnome.jpg
-share/nautilus/patterns/dots.png
-share/nautilus/patterns/fibers.png
-share/nautilus/patterns/fleur_de_lis.png
-share/nautilus/patterns/floral.png
-share/nautilus/patterns/fossil.png
-share/nautilus/patterns/gnome.jpg
-share/nautilus/patterns/green_weave.png
-share/nautilus/patterns/ice.png
-share/nautilus/patterns/manila_paper.png
-share/nautilus/patterns/moss_ridge.png
-share/nautilus/patterns/numbers.png
-share/nautilus/patterns/ocean_stripes.png
-share/nautilus/patterns/purple_marble.png
-share/nautilus/patterns/reset.png
-share/nautilus/patterns/ridged_paper.png
-share/nautilus/patterns/rough_paper.png
-share/nautilus/patterns/sky_ridge.png
-share/nautilus/patterns/snow_ridge.png
-share/nautilus/patterns/stucco.jpg
-share/nautilus/patterns/terracotta.png
-share/nautilus/patterns/wavy_white.png
-share/nautilus/services/text/google.xml
-share/nautilus/services/text/webster.xml
-share/nautilus/starthere-link.desktop
-share/nautilus/starthere.desktop
-share/nautilus/static_bookmarks.xml
-share/pixmaps/nautilus/CD_drive.png
-share/pixmaps/nautilus/HD_drive.png
-share/pixmaps/nautilus/Search.png
-share/pixmaps/nautilus/audio.png
-share/pixmaps/nautilus/backgrounds.png
-share/pixmaps/nautilus/chit_frame.png
-share/pixmaps/nautilus/colors.png
-share/pixmaps/nautilus/cpu.png
-share/pixmaps/nautilus/crux_eggplant/Search.png
-share/pixmaps/nautilus/crux_eggplant/crux_eggplant.xml
-share/pixmaps/nautilus/crux_eggplant/decrement-i.png
-share/pixmaps/nautilus/crux_eggplant/decrement.png
-share/pixmaps/nautilus/crux_eggplant/increment-i.png
-share/pixmaps/nautilus/crux_eggplant/increment.png
-share/pixmaps/nautilus/crux_eggplant/number_strip.png
-share/pixmaps/nautilus/crux_eggplant/theme_preview.png
-share/pixmaps/nautilus/crux_eggplant/throbber/001.png
-share/pixmaps/nautilus/crux_eggplant/throbber/002.png
-share/pixmaps/nautilus/crux_eggplant/throbber/003.png
-share/pixmaps/nautilus/crux_eggplant/throbber/004.png
-share/pixmaps/nautilus/crux_eggplant/throbber/005.png
-share/pixmaps/nautilus/crux_eggplant/throbber/006.png
-share/pixmaps/nautilus/crux_eggplant/throbber/007.png
-share/pixmaps/nautilus/crux_eggplant/throbber/008.png
-share/pixmaps/nautilus/crux_eggplant/throbber/009.png
-share/pixmaps/nautilus/crux_eggplant/throbber/010.png
-share/pixmaps/nautilus/crux_eggplant/throbber/011.png
-share/pixmaps/nautilus/crux_eggplant/throbber/012.png
-share/pixmaps/nautilus/crux_eggplant/throbber/013.png
-share/pixmaps/nautilus/crux_eggplant/throbber/014.png
-share/pixmaps/nautilus/crux_eggplant/throbber/015.png
-share/pixmaps/nautilus/crux_eggplant/throbber/016.png
-share/pixmaps/nautilus/crux_eggplant/throbber/017.png
-share/pixmaps/nautilus/crux_eggplant/throbber/018.png
-share/pixmaps/nautilus/crux_eggplant/throbber/019.png
-share/pixmaps/nautilus/crux_eggplant/throbber/020.png
-share/pixmaps/nautilus/crux_eggplant/throbber/021.png
-share/pixmaps/nautilus/crux_eggplant/throbber/022.png
-share/pixmaps/nautilus/crux_eggplant/throbber/023.png
-share/pixmaps/nautilus/crux_eggplant/throbber/024.png
-share/pixmaps/nautilus/crux_eggplant/throbber/025.png
-share/pixmaps/nautilus/crux_eggplant/throbber/026.png
-share/pixmaps/nautilus/crux_eggplant/throbber/027.png
-share/pixmaps/nautilus/crux_eggplant/throbber/028.png
-share/pixmaps/nautilus/crux_eggplant/throbber/029.png
-share/pixmaps/nautilus/crux_eggplant/throbber/030.png
-share/pixmaps/nautilus/crux_eggplant/throbber/rest.png
-share/pixmaps/nautilus/crux_eggplant/zoom_body.png
-share/pixmaps/nautilus/crux_teal/Search.png
-share/pixmaps/nautilus/crux_teal/crux_teal.xml
-share/pixmaps/nautilus/crux_teal/decrement-i.png
-share/pixmaps/nautilus/crux_teal/decrement.png
-share/pixmaps/nautilus/crux_teal/increment-i.png
-share/pixmaps/nautilus/crux_teal/increment.png
-share/pixmaps/nautilus/crux_teal/number_strip.png
-share/pixmaps/nautilus/crux_teal/theme_preview.png
-share/pixmaps/nautilus/crux_teal/throbber/001.png
-share/pixmaps/nautilus/crux_teal/throbber/002.png
-share/pixmaps/nautilus/crux_teal/throbber/003.png
-share/pixmaps/nautilus/crux_teal/throbber/004.png
-share/pixmaps/nautilus/crux_teal/throbber/005.png
-share/pixmaps/nautilus/crux_teal/throbber/006.png
-share/pixmaps/nautilus/crux_teal/throbber/007.png
-share/pixmaps/nautilus/crux_teal/throbber/008.png
-share/pixmaps/nautilus/crux_teal/throbber/009.png
-share/pixmaps/nautilus/crux_teal/throbber/010.png
-share/pixmaps/nautilus/crux_teal/throbber/011.png
-share/pixmaps/nautilus/crux_teal/throbber/012.png
-share/pixmaps/nautilus/crux_teal/throbber/013.png
-share/pixmaps/nautilus/crux_teal/throbber/014.png
-share/pixmaps/nautilus/crux_teal/throbber/015.png
-share/pixmaps/nautilus/crux_teal/throbber/016.png
-share/pixmaps/nautilus/crux_teal/throbber/017.png
-share/pixmaps/nautilus/crux_teal/throbber/018.png
-share/pixmaps/nautilus/crux_teal/throbber/019.png
-share/pixmaps/nautilus/crux_teal/throbber/020.png
-share/pixmaps/nautilus/crux_teal/throbber/021.png
-share/pixmaps/nautilus/crux_teal/throbber/022.png
-share/pixmaps/nautilus/crux_teal/throbber/023.png
-share/pixmaps/nautilus/crux_teal/throbber/024.png
-share/pixmaps/nautilus/crux_teal/throbber/025.png
-share/pixmaps/nautilus/crux_teal/throbber/026.png
-share/pixmaps/nautilus/crux_teal/throbber/027.png
-share/pixmaps/nautilus/crux_teal/throbber/028.png
-share/pixmaps/nautilus/crux_teal/throbber/029.png
-share/pixmaps/nautilus/crux_teal/throbber/030.png
-share/pixmaps/nautilus/crux_teal/throbber/rest.png
-share/pixmaps/nautilus/crux_teal/zoom_body.png
-share/pixmaps/nautilus/decrement.png
-share/pixmaps/nautilus/default/Search.png
-share/pixmaps/nautilus/default/decrement.png
-share/pixmaps/nautilus/default/default.xml
-share/pixmaps/nautilus/default/increment.png
-share/pixmaps/nautilus/default/number_strip.png
-share/pixmaps/nautilus/default/side_bar_image.png
-share/pixmaps/nautilus/default/theme_preview.png
-share/pixmaps/nautilus/default/zoom_body.png
-share/pixmaps/nautilus/emblems.png
-share/pixmaps/nautilus/erase.png
-share/pixmaps/nautilus/gnome/Services.png
-share/pixmaps/nautilus/gnome/gnome.xml
-share/pixmaps/nautilus/gnome/theme_preview.png
-share/pixmaps/nautilus/gnome/throbber/001.png
-share/pixmaps/nautilus/gnome/throbber/002.png
-share/pixmaps/nautilus/gnome/throbber/003.png
-share/pixmaps/nautilus/gnome/throbber/004.png
-share/pixmaps/nautilus/gnome/throbber/005.png
-share/pixmaps/nautilus/gnome/throbber/006.png
-share/pixmaps/nautilus/gnome/throbber/rest.png
-share/pixmaps/nautilus/increment.png
-share/pixmaps/nautilus/knob.png
-share/pixmaps/nautilus/memory_chip.gif
-share/pixmaps/nautilus/nautilus-desktop.png
-share/pixmaps/nautilus/nautilus-launch-icon.png
-share/pixmaps/nautilus/nautilus-mini-logo.png
-share/pixmaps/nautilus/nautilus-server-connect.png
-share/pixmaps/nautilus/note-indicator.png
-share/pixmaps/nautilus/number_strip.png
-share/pixmaps/nautilus/side_bar_image.png
-share/pixmaps/nautilus/sierra/green_weave.png
-share/pixmaps/nautilus/sierra/number_strip.png
-share/pixmaps/nautilus/sierra/sierra.xml
-share/pixmaps/nautilus/sierra/theme_preview.png
-share/pixmaps/nautilus/tahoe/bluewall.png
-share/pixmaps/nautilus/tahoe/number_strip.png
-share/pixmaps/nautilus/tahoe/tahoe.xml
-share/pixmaps/nautilus/tahoe/theme_preview.png
-share/pixmaps/nautilus/text-selection-frame.png
-share/pixmaps/nautilus/throbber/001.png
-share/pixmaps/nautilus/throbber/002.png
-share/pixmaps/nautilus/throbber/003.png
-share/pixmaps/nautilus/throbber/004.png
-share/pixmaps/nautilus/throbber/005.png
-share/pixmaps/nautilus/throbber/006.png
-share/pixmaps/nautilus/throbber/007.png
-share/pixmaps/nautilus/throbber/008.png
-share/pixmaps/nautilus/throbber/009.png
-share/pixmaps/nautilus/throbber/010.png
-share/pixmaps/nautilus/throbber/011.png
-share/pixmaps/nautilus/throbber/012.png
-share/pixmaps/nautilus/throbber/013.png
-share/pixmaps/nautilus/throbber/014.png
-share/pixmaps/nautilus/throbber/015.png
-share/pixmaps/nautilus/throbber/016.png
-share/pixmaps/nautilus/throbber/017.png
-share/pixmaps/nautilus/throbber/018.png
-share/pixmaps/nautilus/throbber/019.png
-share/pixmaps/nautilus/throbber/020.png
-share/pixmaps/nautilus/throbber/021.png
-share/pixmaps/nautilus/throbber/022.png
-share/pixmaps/nautilus/throbber/023.png
-share/pixmaps/nautilus/throbber/024.png
-share/pixmaps/nautilus/throbber/025.png
-share/pixmaps/nautilus/throbber/026.png
-share/pixmaps/nautilus/throbber/027.png
-share/pixmaps/nautilus/throbber/028.png
-share/pixmaps/nautilus/throbber/029.png
-share/pixmaps/nautilus/throbber/030.png
-share/pixmaps/nautilus/throbber/rest.png
-share/pixmaps/nautilus/thumbnail_frame.png
-share/pixmaps/nautilus/zoom_body.png
-@dirrm share/pixmaps/nautilus/throbber
-@dirrm share/pixmaps/nautilus/tahoe
-@dirrm share/pixmaps/nautilus/sierra
-@dirrm share/pixmaps/nautilus/gnome/throbber
-@dirrm share/pixmaps/nautilus/gnome
-@dirrm share/pixmaps/nautilus/default
-@dirrm share/pixmaps/nautilus/crux_teal/throbber
-@dirrm share/pixmaps/nautilus/crux_teal
-@dirrm share/pixmaps/nautilus/crux_eggplant/throbber
-@dirrm share/pixmaps/nautilus/crux_eggplant
-@dirrm share/pixmaps/nautilus
-@dirrm share/nautilus/services/text
-@dirrm share/nautilus/services
-@dirrm share/nautilus/patterns
-@dirrm share/nautilus/glade
-@dirrm share/nautilus
-@dirrm share/examples/nautilus/X11/sysconfig
-@dirrm share/examples/nautilus/X11/starthere
-@dirrm share/examples/nautilus/X11/serverconfig
-@dirrm share/examples/nautilus/X11
-@dirrm share/examples/nautilus
-@dirrm include/libnautilus
diff --git a/sysutils/nautilus/buildlink2.mk b/sysutils/nautilus/buildlink2.mk
deleted file mode 100644
index 19599d13f17..00000000000
--- a/sysutils/nautilus/buildlink2.mk
+++ /dev/null
@@ -1,48 +0,0 @@
-# $NetBSD: buildlink2.mk,v 1.2 2003/07/13 13:53:20 wiz Exp $
-#
-# This Makefile fragment is included by packages that use nautilus.
-#
-# This file was created automatically using createbuildlink 2.6.
-#
-
-.if !defined(NAUTILUS_BUILDLINK2_MK)
-NAUTILUS_BUILDLINK2_MK= # defined
-
-BUILDLINK_PACKAGES+= nautilus
-BUILDLINK_DEPENDS.nautilus?= nautilus>=2.2.3.1nb5
-BUILDLINK_PKGSRCDIR.nautilus?= ../../sysutils/nautilus
-
-EVAL_PREFIX+= BUILDLINK_PREFIX.nautilus=nautilus
-BUILDLINK_PREFIX.nautilus_DEFAULT= ${LOCALBASE}
-BUILDLINK_FILES.nautilus+= include/libnautilus/*
-BUILDLINK_FILES.nautilus+= lib/bonobo/libnautilus-emblem-view.*
-BUILDLINK_FILES.nautilus+= lib/bonobo/libnautilus-history-view.*
-BUILDLINK_FILES.nautilus+= lib/bonobo/libnautilus-image-properties-view.*
-BUILDLINK_FILES.nautilus+= lib/bonobo/libnautilus-notes-view.*
-BUILDLINK_FILES.nautilus+= lib/bonobo/libnautilus-tree-view.*
-BUILDLINK_FILES.nautilus+= lib/bonobo/servers/Nautilus_ComponentAdapterFactory_std.server
-BUILDLINK_FILES.nautilus+= lib/bonobo/servers/Nautilus_Control_throbber.server
-BUILDLINK_FILES.nautilus+= lib/bonobo/servers/Nautilus_View_emblem.server
-BUILDLINK_FILES.nautilus+= lib/bonobo/servers/Nautilus_View_history.server
-BUILDLINK_FILES.nautilus+= lib/bonobo/servers/Nautilus_View_image_properties.server
-BUILDLINK_FILES.nautilus+= lib/bonobo/servers/Nautilus_View_notes.server
-BUILDLINK_FILES.nautilus+= lib/bonobo/servers/Nautilus_View_text.server
-BUILDLINK_FILES.nautilus+= lib/bonobo/servers/Nautilus_View_tree.server
-BUILDLINK_FILES.nautilus+= lib/bonobo/servers/Nautilus_shell.server
-BUILDLINK_FILES.nautilus+= lib/libnautilus-adapter.*
-BUILDLINK_FILES.nautilus+= lib/libnautilus-private.*
-BUILDLINK_FILES.nautilus+= lib/libnautilus.*
-BUILDLINK_FILES.nautilus+= lib/pkgconfig/libnautilus.pc
-
-.include "../../devel/eel2/buildlink2.mk"
-.include "../../graphics/imlib2/buildlink2.mk"
-.include "../../graphics/librsvg2/buildlink2.mk"
-.include "../../sysutils/fam/buildlink2.mk"
-.include "../../textproc/intltool/buildlink2.mk"
-.include "../../x11/gnome-desktop/buildlink2.mk"
-
-BUILDLINK_TARGETS+= nautilus-buildlink
-
-nautilus-buildlink: _BUILDLINK_USE
-
-.endif # NAUTILUS_BUILDLINK2_MK
diff --git a/sysutils/nautilus/distinfo b/sysutils/nautilus/distinfo
deleted file mode 100644
index 187df0fe41f..00000000000
--- a/sysutils/nautilus/distinfo
+++ /dev/null
@@ -1,10 +0,0 @@
-$NetBSD: distinfo,v 1.3 2003/05/04 01:10:57 rh Exp $
-
-SHA1 (nautilus-2.2.3.1.tar.bz2) = 1e2055d4a6b9e35c2bc08a017a77601f7fc5074e
-Size (nautilus-2.2.3.1.tar.bz2) = 4558276 bytes
-SHA1 (patch-aa) = 334a3c4b4fe5b93c817f04c2de1f130ad7b17592
-SHA1 (patch-ab) = 38390bb0d8b705f561f8e2d30a323b78a982a777
-SHA1 (patch-ac) = ee6b0d6df93fa3aa44ab86754322067f586dd0e2
-SHA1 (patch-ad) = b994f9e62aef5794ef7caf3f4da1335dac681e28
-SHA1 (patch-ae) = a67d8b7ba3a1b9a71958736ef4946be301e67124
-SHA1 (patch-af) = dbdfb1e7e2103a3174fddaccad64868781052057
diff --git a/sysutils/nautilus/patches/patch-aa b/sysutils/nautilus/patches/patch-aa
deleted file mode 100644
index 52ec8e1d9ae..00000000000
--- a/sysutils/nautilus/patches/patch-aa
+++ /dev/null
@@ -1,33 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2003/04/27 02:06:56 rh Exp $
-
---- libnautilus-private/filesystem-attributes.xml.orig Mon Jul 8 22:06:25 2002
-+++ libnautilus-private/filesystem-attributes.xml
-@@ -3,10 +3,12 @@
- <filesystem name="affs" _default_volume_name="AFFS Volume"/>
- <filesystem name="afs" _default_volume_name="AFS Network Volume"/>
- <filesystem name="auto" _default_volume_name="Auto-detected Volume"/>
-+ <filesystem name="cd9660" _default_volume_name="CDROM Volume"/>
- <filesystem name="cdda" _default_volume_name="CD Digital Audio"/>
- <filesystem name="cdrom" _default_volume_name="CD-ROM Drive"/>
- <filesystem name="devfs" _default_volume_name="Hardware Device Volume"/>
- <filesystem name="ext2" _default_volume_name="Ext2 Linux Volume" trash="yes"/>
-+ <filesystem name="ext2fs" _default_volume_name="Ext2 Linux Volume" trash="yes"/>
- <filesystem name="ext3" _default_volume_name="Ext3 Linux Volume" trash="yes"/>
- <filesystem name="fat" _default_volume_name="MSDOS Volume" trash="yes"/>
- <filesystem name="hfs" _default_volume_name="MacOS Volume" trash="yes"/>
-@@ -15,10 +17,15 @@
- <filesystem name="hsfs" _default_volume_name="Hsfs CDROM Volume"/>
- <filesystem name="jfs" _default_volume_name="JFS Volume" trash="yes"/>
- <filesystem name="hpfs" _default_volume_name="Windows NT Volume"/>
-+ <filesystem name="linprocfs" _default_volume_name="System Volume"/>
-+ <filesystem name="mfs" _default_volume_name="Memory Volume" trash="yes"/>
- <filesystem name="minix" _default_volume_name="Minix Volume"/>
- <filesystem name="msdos" _default_volume_name="MSDOS Volume"/>
- <filesystem name="nfs" _default_volume_name="NFS Network Volume" trash="yes"/>
-+ <filesystem name="ntfs" _default_volume_name="Windows NT Volume"/>
-+ <filesystem name="nwfs" _default_volume_name="Netware Volume"/>
- <filesystem name="proc" _default_volume_name="System Volume"/>
-+ <filesystem name="procfs" _default_volume_name="System Volume"/>
- <filesystem name="reiserfs" _default_volume_name="ReiserFS Linux Volume" trash="yes"/>
- <filesystem name="smbfs" _default_volume_name="Windows Shared Volume" trash="yes"/>
- <filesystem name="supermount" _default_volume_name="SuperMount Volume" />
diff --git a/sysutils/nautilus/patches/patch-ab b/sysutils/nautilus/patches/patch-ab
deleted file mode 100644
index f262ba7361b..00000000000
--- a/sysutils/nautilus/patches/patch-ab
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 2003/04/27 02:06:56 rh Exp $
-
---- libnautilus-private/nautilus-medusa-support.c.orig 2001-10-29 06:21:46.000000000 +1000
-+++ libnautilus-private/nautilus-medusa-support.c
-@@ -83,7 +83,11 @@ nautilus_medusa_check_cron_is_enabled (v
- */
- status = NAUTILUS_CRON_STATUS_OFF;
-
-+#ifdef __NetBSD__
-+ stat_file_name = g_strdup_printf ("/proc/%d/status", process_number);
-+#else
- stat_file_name = g_strdup_printf ("/proc/%d/stat", process_number);
-+#endif
- stat_file = fopen (stat_file_name, "r");
- g_free (stat_file_name);
-
diff --git a/sysutils/nautilus/patches/patch-ac b/sysutils/nautilus/patches/patch-ac
deleted file mode 100644
index 07e5bc914a1..00000000000
--- a/sysutils/nautilus/patches/patch-ac
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ac,v 1.1.1.1 2003/04/27 02:06:56 rh Exp $
-
---- libnautilus-private/nautilus-thumbnails.c.orig 2003-03-26 00:47:25.000000000 +1000
-+++ libnautilus-private/nautilus-thumbnails.c
-@@ -155,7 +155,9 @@ thumbnail_thread_starter_cb (gpointer da
- pthread_attr_init (&thread_attributes);
- pthread_attr_setdetachstate (&thread_attributes,
- PTHREAD_CREATE_DETACHED);
-+#ifdef _POSIX_THREAD_ATTR_STACKSIZE
- pthread_attr_setstacksize (&thread_attributes, 128*1024);
-+#endif
- #ifdef DEBUG_THUMBNAILS
- g_message ("(Main Thread) Creating thumbnails thread\n");
- #endif
diff --git a/sysutils/nautilus/patches/patch-ad b/sysutils/nautilus/patches/patch-ad
deleted file mode 100644
index 33c59596eff..00000000000
--- a/sysutils/nautilus/patches/patch-ad
+++ /dev/null
@@ -1,282 +0,0 @@
-$NetBSD: patch-ad,v 1.1.1.1 2003/04/27 02:06:56 rh Exp $
-
---- libnautilus-private/nautilus-volume-monitor.c.orig 2003-03-01 01:15:00.000000000 +1000
-+++ libnautilus-private/nautilus-volume-monitor.c
-@@ -59,6 +59,17 @@
- #include <sys/types.h>
- #include <unistd.h>
-
-+#include <sys/param.h>
-+#if (defined(BSD) && BSD >= 199306)
-+#include <sys/ucred.h>
-+#include <sys/mount.h>
-+
-+#define HAVE_SETFSENT
-+#define HAVE_FSTAB_H
-+#define BSD_MNT
-+#define setmntent(f,m) setfsent()
-+#endif
-+
- #ifdef HAVE_SYS_VFSTAB_H
- #include <sys/vfstab.h>
- #else
-@@ -103,7 +114,7 @@
- #define MNTOPT_RO "ro"
- #endif
-
--#ifndef HAVE_SETMNTENT
-+#if !defined(HAVE_SETMNTENT) && !defined(HAVE_SETFSENT)
- #define setmntent(f,m) fopen(f,m)
- #endif
-
-@@ -492,6 +503,9 @@ nautilus_volume_monitor_get_volume_for_p
- static gboolean
- has_removable_mntent_options (MountTableEntry *ent)
- {
-+#if (defined(BSD) && BSD >= 199306)
-+ struct fstab *fsent;
-+#endif
- #ifdef HAVE_HASMNTOPT
- /* Use "owner" or "user" or "users" as our way of determining a removable volume */
- if (hasmntopt (ent, "user") != NULL
-@@ -501,6 +515,12 @@ has_removable_mntent_options (MountTable
- return TRUE;
- }
- #endif
-+#if (defined(BSD) && BSD >= 199306)
-+ fsent = getfsspec(ent->f_mntfromname);
-+ if (fsent != NULL && strstr (fsent->fs_mntops, "noauto")) {
-+ return TRUE;
-+ }
-+#endif
-
- #ifdef SOLARIS_MNT
- if (eel_str_has_prefix (ent->mnt_special, "/vol/")) {
-@@ -522,10 +542,15 @@ has_removable_mntent_options (MountTable
- static GList *
- get_removable_volumes (NautilusVolumeMonitor *monitor)
- {
-+#ifndef HAVE_SETFSENT
- FILE *file;
-- GList *volumes;
-- MountTableEntry *ent;
-- NautilusVolume *volume;
-+#else
-+ int file;
-+ struct fstab *fsent;
-+#endif
-+ GList *volumes = NULL;
-+ MountTableEntry *ent = NULL;
-+ NautilusVolume *volume = NULL;
- char * fs_opt;
- #ifdef HAVE_SYS_MNTTAB_H
- MountTableEntry ent_storage;
-@@ -533,26 +558,27 @@ get_removable_volumes (NautilusVolumeMon
- #ifdef HAVE_GETMNTINFO
- int count, index;
- #endif
-- ent = NULL;
-- volume = NULL;
-- volumes = NULL;
-
- #ifdef HAVE_GETMNTINFO
- count = getmntinfo (&ent, MNT_WAIT);
- /* getmentinfo returns a pointer to static data. Do not free. */
- for (index = 0; index < count; index++) {
-- if (has_removable_mntent_options (&ent[index])) {
-+ if (has_removable_mntent_options (ent + index)) {
- volume = create_volume (ent[index].f_mntfromname,
- ent[index].f_mntonname);
- volume->is_removable = TRUE;
- volumes = finish_creating_volume_and_prepend
-- (monitor, volume, ent[index].f_fstypename, volumes);
-+ (monitor, volume, ent[index].f_fstypename, volumes);
- }
- }
- #endif
-
- file = setmntent (MOUNT_TABLE_PATH, "r");
-+#ifndef HAVE_SETFSENT
- if (file == NULL) {
-+#else
-+ if (file == 0) {
-+#endif
- return NULL;
- }
-
-@@ -587,9 +613,21 @@ get_removable_volumes (NautilusVolumeMon
- (monitor, volume, ent->mnt_type, volumes);
- }
- }
-+#elif defined (HAVE_SETFSENT)
-+ while ((fsent = getfsent ()) != NULL) {
-+ if (strstr (fsent->fs_mntops, "noauto") != NULL) {
-+ volume = create_volume (fsent->fs_spec, fsent->fs_file);
-+ volumes = finish_creating_volume_and_prepend
-+ (monitor, volume, fsent->fs_vfstype, volumes);
-+ }
-+ }
- #endif
--
-+
-+#ifndef HAVE_SETFSENT
- fclose (file);
-+#else
-+ endfsent();
-+#endif
-
- #ifdef HAVE_CDDA
- volume = create_volume (CD_AUDIO_PATH, CD_AUDIO_PATH);
-@@ -619,7 +657,7 @@ entry_is_supermounted_volume (const Moun
- return result;
- }
-
--#ifndef SOLARIS_MNT
-+#if !defined(SOLARIS_MNT) && !defined(BSD_MNT)
-
- static gboolean
- volume_is_removable (const NautilusVolume *volume)
-@@ -963,23 +1001,34 @@ build_volume_list_delta (GList *list_one
-
-
-
--#ifdef SOLARIS_MNT
-+#if defined(SOLARIS_MNT) || defined(BSD_MNT)
-
- static GList *
- get_mount_list (NautilusVolumeMonitor *monitor)
- {
-- FILE *fh;
- GList *volumes;
-+#ifndef HAVE_SETFSENT
- MountTableEntry ent;
-+ FILE *fh;
-+#else
-+ MountTableEntry *ent;
-+ int fh, index;
-+#endif
- NautilusVolume *volume;
-
- volumes = NULL;
-
-+#ifndef HAVE_SETFSENT
- fh = setmntent (MOUNT_TABLE_PATH, "r");
- if (fh == NULL) {
-+#else
-+ fh = getmntinfo (&ent, MNT_WAIT);
-+ if (fh == 0) {
-+#endif
- return NULL;
- }
-
-+#ifndef HAVE_SETFSENT
- while (! getmntent(fh, &ent)) {
- volume = create_volume (ent.mnt_special, ent.mnt_mountp);
- volume->is_removable = has_removable_mntent_options (&ent);
-@@ -988,6 +1037,16 @@ get_mount_list (NautilusVolumeMonitor *m
- }
-
- fclose (fh);
-+#else
-+ /* getmentinfo returns a pointer to static data. Do not free. */
-+ for (index = 0; index < fh; index++) {
-+ volume = create_volume (ent[index].f_mntfromname,
-+ ent[index].f_mntonname);
-+ volume->is_removable = has_removable_mntent_options (ent + index);
-+ volumes = finish_creating_volume_and_prepend
-+ (monitor, volume, ent[index].f_fstypename, volumes);
-+ }
-+#endif
-
- return volumes;
- }
-@@ -1214,9 +1273,59 @@ mount_volumes_check_status (NautilusVolu
- static int
- get_cdrom_type (const char *vol_dev_path, int* fd)
- {
--#ifndef SOLARIS_MNT
-+#if !defined(SOLARIS_MNT) && !defined(BSD_MNT)
- *fd = open (vol_dev_path, O_RDONLY|O_NONBLOCK);
- return ioctl (*fd, CDROM_DISC_STATUS, CDSL_CURRENT);
-+#elif defined(BSD_MNT)
-+#ifdef CDIOREADTOCENTRYS
-+ struct cd_toc_entry cdentry;
-+ struct ioc_read_toc_entry entry;
-+#else
-+ struct ioc_read_toc_single_entry entry;
-+#endif
-+ struct ioc_toc_header header;
-+ int type;
-+
-+ *fd = open (vol_dev_path, O_RDONLY|O_NONBLOCK);
-+ if (*fd < 0) {
-+ return CDS_DATA_1;
-+ }
-+
-+ if ( ioctl(*fd, CDIOREADTOCHEADER, &header) == 0) {
-+ return CDS_DATA_1;
-+ }
-+
-+ type = CDS_DATA_1;
-+
-+#ifdef CDIOREADTOCENTRYS
-+ for (entry.starting_track = header.starting_track;
-+ entry.starting_track <= header.ending_track;
-+ entry.starting_track++) {
-+ entry.address_format = CD_LBA_FORMAT;
-+ entry.data_len = sizeof cdentry;
-+ entry.data = &cdentry;
-+ if (ioctl (*fd, CDIOREADTOCENTRYS, &entry) == 0) {
-+ if (cdentry.control & CDROM_DATA_TRACK) {
-+ type = CDS_AUDIO;
-+ break;
-+ }
-+ }
-+ }
-+#else
-+ for (entry.track = header.starting_track;
-+ entry.track <= header.ending_track;
-+ entry.track++) {
-+ entry.address_format = CD_LBA_FORMAT;
-+ if (ioctl (*fd, CDIOREADTOCENTRY, &entry) == 0) {
-+ if (entry.entry.control & CDROM_DATA_TRACK) {
-+ type = CDS_AUDIO;
-+ break;
-+ }
-+ }
-+ }
-+#endif /* defined CDIOREADTOCENTRYS */
-+
-+ return type;
- #else
- GString *new_dev_path;
- struct cdrom_tocentry entry;
-@@ -1768,7 +1877,7 @@ load_additional_mount_list_info (GList *
- for (node = volume_list; node != NULL; node = node->next) {
- volume = node->data;
-
--#ifndef SOLARIS_MNT
-+#if !defined(SOLARIS_MNT) && !defined(BSD_MNT)
- /* These are set up by get_current_mount_list for Solaris. */
- volume->is_removable = volume_is_removable (volume);
- #endif
-@@ -1797,7 +1906,7 @@ finish_creating_volume (NautilusVolumeMo
- ok = mount_volume_auto_add (volume);
- } else if (strcmp (file_system_type_name, "cdda") == 0) {
- ok = mount_volume_cdda_add (volume);
-- } else if (strcmp (file_system_type_name, "iso9660") == 0) {
-+ } else if (strcmp (file_system_type_name, "cd9660") == 0) {
- ok = mount_volume_iso9660_add (volume);
- } else if (strcmp (file_system_type_name, "nfs") == 0) {
- ok = mount_volume_nfs_add (volume);
-@@ -1835,8 +1944,8 @@ finish_creating_volume (NautilusVolumeMo
- } else if (eel_str_has_prefix (volume->device_path, "/dev/cdrom")) {
- volume->device_type = NAUTILUS_DEVICE_CDROM_DRIVE;
- volume->is_removable = TRUE;
-- } else if (eel_str_has_prefix (volume->mount_path, "/mnt/")) {
-- name = volume->mount_path + strlen ("/mnt/");
-+ } else if (eel_str_has_prefix (volume->mount_path, "/")) {
-+ name = volume->mount_path + strlen ("/");
-
- if (eel_str_has_prefix (name, "cdrom")
- || eel_str_has_prefix (name, "burn")) {
diff --git a/sysutils/nautilus/patches/patch-ae b/sysutils/nautilus/patches/patch-ae
deleted file mode 100644
index d7592e6904b..00000000000
--- a/sysutils/nautilus/patches/patch-ae
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ae,v 1.1 2003/04/27 16:05:04 jmmv Exp $
-
---- data/Makefile.in.orig 2003-04-01 06:21:33.000000000 +0200
-+++ data/Makefile.in
-@@ -25,7 +25,7 @@ bindir = @bindir@
- sbindir = @sbindir@
- libexecdir = @libexecdir@
- datadir = @datadir@
--sysconfdir = @sysconfdir@
-+sysconfdir = @datadir@/examples/@PACKAGE@
- sharedstatedir = @sharedstatedir@
- localstatedir = @localstatedir@
- libdir = @libdir@
diff --git a/sysutils/nautilus/patches/patch-af b/sysutils/nautilus/patches/patch-af
deleted file mode 100644
index 531e8b5de63..00000000000
--- a/sysutils/nautilus/patches/patch-af
+++ /dev/null
@@ -1,40 +0,0 @@
-$NetBSD: patch-af,v 1.1 2003/05/04 01:10:58 rh Exp $
-
---- src/nautilus-main.c.orig Sat Mar 15 01:34:55 2003
-+++ src/nautilus-main.c
-@@ -56,6 +56,24 @@
- #include <stdlib.h>
- #include <unistd.h>
-
-+#ifdef __NetBSD__
-+#include <pthread.h>
-+
-+/*
-+ * Pth is non-preemptive, so we yield the processor periodically
-+ */
-+
-+#ifdef _PTH_PTHREAD_H_
-+static gint
-+pth_nbschedule (gpointer data)
-+{
-+ sched_yield();
-+
-+ return TRUE;
-+}
-+#endif /* _PTH_PTHREAD_H_ */
-+#endif /* __NetBSD__ */
-+
- /* Keeps track of everyone who wants the main event loop kept active */
- static GSList *event_loop_registrants;
-
-@@ -259,6 +277,10 @@ main (int argc, char *argv[])
- } else {
- /* Run the nautilus application. */
- application = nautilus_application_new ();
-+
-+#ifdef _PTH_PTHREAD_H_
-+ gtk_timeout_add (200, pth_nbschedule, NULL);
-+#endif
- nautilus_application_startup
- (application,
- kill_shell, restart_shell, no_default_window, no_desktop,
diff --git a/sysutils/osname/DESCR b/sysutils/osname/DESCR
deleted file mode 100644
index 7565a3d5d94..00000000000
--- a/sysutils/osname/DESCR
+++ /dev/null
@@ -1,3 +0,0 @@
-Osname prints the canonical name of the current operating system:
-lowercase, no special characters (e.g. hyphens). This is useful
-for scripts. Solaris is differentiated from SunOS.
diff --git a/sysutils/osname/Makefile b/sysutils/osname/Makefile
deleted file mode 100644
index 27c9a882809..00000000000
--- a/sysutils/osname/Makefile
+++ /dev/null
@@ -1,15 +0,0 @@
-# $NetBSD: Makefile,v 1.2 2001/02/17 17:42:16 wiz Exp $
-#
-
-DISTNAME= osname-1.1
-CATEGORIES= sysutils
-MASTER_SITES= ftp://ftp.gw.com/pub/people/kim/
-
-MAINTAINER= kim@tac.nyc.ny.us
-COMMENT= print canonical name of operating system
-
-NO_CONFIGURE= yes
-ALL_TARGET= all PREFIX=${PREFIX}
-INSTALL_TARGET= install PREFIX=${PREFIX}
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/osname/PLIST b/sysutils/osname/PLIST
deleted file mode 100644
index dc3b869b08d..00000000000
--- a/sysutils/osname/PLIST
+++ /dev/null
@@ -1,3 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 22:53:35 zuntum Exp $
-bin/osname
-man/man1/osname.1
diff --git a/sysutils/osname/distinfo b/sysutils/osname/distinfo
deleted file mode 100644
index 3ba50a72505..00000000000
--- a/sysutils/osname/distinfo
+++ /dev/null
@@ -1,4 +0,0 @@
-$NetBSD: distinfo,v 1.2 2001/04/19 11:29:06 agc Exp $
-
-SHA1 (osname-1.1.tar.gz) = 4faefdd1b57412805342314b540d909a3289a8ba
-Size (osname-1.1.tar.gz) = 1531 bytes
diff --git a/sysutils/p5-Unix-Syslog/DESCR b/sysutils/p5-Unix-Syslog/DESCR
deleted file mode 100644
index c2bbbb58b0b..00000000000
--- a/sysutils/p5-Unix-Syslog/DESCR
+++ /dev/null
@@ -1,5 +0,0 @@
-The Unix::Syslog module provides an interface to the system logger
-syslogd(8) via Perl's XSUBs. The implementation attempts to resemble
-the native libc-functions of your system, so that anyone being
-familiar with syslog.h should be able to use this module right
-away.
diff --git a/sysutils/p5-Unix-Syslog/Makefile b/sysutils/p5-Unix-Syslog/Makefile
deleted file mode 100644
index ef4ed5f8361..00000000000
--- a/sysutils/p5-Unix-Syslog/Makefile
+++ /dev/null
@@ -1,16 +0,0 @@
-# $NetBSD: Makefile,v 1.9 2003/06/02 01:16:54 jschauma Exp $
-
-DISTNAME= Unix-Syslog-0.99
-PKGNAME= p5-${DISTNAME}
-SVR4_PKGNAME= p5sl
-CATEGORIES= sysutils perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=Unix/}
-
-MAINTAINER= tech-pkg@netbsd.org
-COMMENT= perl5 module interface to the UNIX system logger
-
-USE_BUILDLINK2= YES
-PERL5_PACKLIST= ${PERL5_SITEARCH}/auto/Unix/Syslog/.packlist
-
-.include "../../lang/perl5/module.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/p5-Unix-Syslog/PLIST b/sysutils/p5-Unix-Syslog/PLIST
deleted file mode 100644
index 4959c59b5fc..00000000000
--- a/sysutils/p5-Unix-Syslog/PLIST
+++ /dev/null
@@ -1 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 22:53:36 zuntum Exp $
diff --git a/sysutils/p5-Unix-Syslog/distinfo b/sysutils/p5-Unix-Syslog/distinfo
deleted file mode 100644
index aafad516e46..00000000000
--- a/sysutils/p5-Unix-Syslog/distinfo
+++ /dev/null
@@ -1,4 +0,0 @@
-$NetBSD: distinfo,v 1.4 2002/08/19 09:58:10 shell Exp $
-
-SHA1 (Unix-Syslog-0.99.tar.gz) = e82cdc6338b6a05c864bfb2bd1e86c54837f3a46
-Size (Unix-Syslog-0.99.tar.gz) = 12499 bytes
diff --git a/sysutils/pciutils/DESCR b/sysutils/pciutils/DESCR
deleted file mode 100644
index c3ddf89312b..00000000000
--- a/sysutils/pciutils/DESCR
+++ /dev/null
@@ -1,6 +0,0 @@
-pciutils is a set of utilities used to access the PCI
-bus. lspci(8) lists devices and information about their
-resources, and setpci(8) enables the user to control the
-PCI bus by writing to config registers. Additionnally,
-liblspci.a, the library upon which those utilities are
-built is provided.
diff --git a/sysutils/pciutils/Makefile b/sysutils/pciutils/Makefile
deleted file mode 100644
index a66a9d23652..00000000000
--- a/sysutils/pciutils/Makefile
+++ /dev/null
@@ -1,15 +0,0 @@
-# $NetBSD: Makefile,v 1.1.1.1 2003/02/26 00:12:42 kristerw Exp $
-
-DISTNAME= pciutils-2.1.11
-CATEGORIES= sysutils
-MASTER_SITES= ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci/ \
- ftp://ftp.kernel.org/pub/software/utils/pciutils/ \
- ftp://metalab.unc.edu/pub/Linux/hardware/
-
-MAINTAINER= cube@cubidou.net
-HOMEPAGE= http://atrey.karlin.mff.cuni.cz/~mj/pciutils.shtml
-COMMENT= PCI bus manipulation utility similar to NetBSD pcictl(8)
-
-USE_GMAKE= YES
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/pciutils/PLIST b/sysutils/pciutils/PLIST
deleted file mode 100644
index 5dd0898bfd4..00000000000
--- a/sysutils/pciutils/PLIST
+++ /dev/null
@@ -1,15 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2003/02/26 00:12:43 kristerw Exp $
-include/pciutils/config.h
-include/pciutils/header.h
-include/pciutils/pci.h
-lib/libpciutils.a
-man/man8/lspci.8
-man/man8/setpci.8
-man/man8/update-pciids.8
-sbin/lspci
-sbin/setpci
-sbin/update-pciids
-share/pciutils/README
-share/pciutils/pci.ids
-@dirrm share/pciutils
-@dirrm include/pciutils
diff --git a/sysutils/pciutils/buildlink2.mk b/sysutils/pciutils/buildlink2.mk
deleted file mode 100644
index 4a74169b3c5..00000000000
--- a/sysutils/pciutils/buildlink2.mk
+++ /dev/null
@@ -1,19 +0,0 @@
-# $NetBSD: buildlink2.mk,v 1.2 2003/04/06 12:44:22 hubertf Exp $
-
-.if !defined(PCIUTILS_BUILDLINK2_MK)
-PCIUTILS_BUILDLINK2_MK= # defined
-
-BUILDLINK_PACKAGES+= pciutils
-BUILDLINK_DEPENDS.pciutils?= pciutils>=2.1.11
-BUILDLINK_PKGSRCDIR.pciutils?= ../../sysutils/pciutils
-
-EVAL_PREFIX+= BUILDLINK_PREFIX.pciutils=pciutils
-BUILDLINK_PREFIX.pciutils_DEFAULT= ${LOCALBASE}
-BUILDLINK_FILES.pciutils= include/pciutils/*
-BUILDLINK_FILES.pciutils+= lib/libpciutils.a
-
-BUILDLINK_TARGETS+= pciutils-buildlink
-
-pciutils-buildlink: _BUILDLINK_USE
-
-.endif # PCIUTILS_BUILDLINK2_MK
diff --git a/sysutils/pciutils/distinfo b/sysutils/pciutils/distinfo
deleted file mode 100644
index 0c4819b38b7..00000000000
--- a/sysutils/pciutils/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.1.1.1 2003/02/26 00:12:43 kristerw Exp $
-
-SHA1 (pciutils-2.1.11.tar.gz) = bb1e107a745a40e208f676cffc0826ca8b928688
-Size (pciutils-2.1.11.tar.gz) = 120948 bytes
-SHA1 (patch-aa) = 7d3cf856dc5493cc83c2310b57175d593753cea4
diff --git a/sysutils/pciutils/patches/patch-aa b/sysutils/pciutils/patches/patch-aa
deleted file mode 100644
index be8f615f1c8..00000000000
--- a/sysutils/pciutils/patches/patch-aa
+++ /dev/null
@@ -1,40 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2003/02/26 00:12:43 kristerw Exp $
-
---- Makefile.orig 2003-01-04 13:53:01.000000000 +0100
-+++ Makefile
-@@ -10,13 +10,15 @@ VERSION=2.1.11
- #SUFFIX=-pre2
- DATE=2003-01-04
-
--PREFIX=/usr/local
-+#PREFIX=/usr/local
- SBINDIR=$(PREFIX)/sbin
--SHAREDIR=$(PREFIX)/share
--MANDIR=$(shell if [ -d $(PREFIX)/share/man ] ; then echo $(PREFIX)/share/man ; else echo $(PREFIX)/man ; fi)
-+SHAREDIR=$(PREFIX)/share/pciutils
-+MANDIR=$(PREFIX)/man
- INSTALL=install
--DIRINSTALL=install -d
-+DIRINSTALL=$(INSTALL) -d
- PCILIB=libpci.a
-+LIBDIR=$(PREFIX)/lib
-+INCLUDEDIR=$(PREFIX)/include/pciutils
-
- ifeq ($(shell uname),NetBSD)
- PCILIB=libpciutils.a
-@@ -58,11 +60,14 @@ clean:
-
- install: all
- # -c is ignored on Linux, but required on FreeBSD
-- $(DIRINSTALL) -m 755 $(SBINDIR) $(SHAREDIR) $(MANDIR)/man8
-+ $(DIRINSTALL) -m 755 $(SBINDIR) $(SHAREDIR) $(MANDIR)/man8 $(LIBDIR) $(INCLUDEDIR)
- $(INSTALL) -c -m 755 -s lspci setpci $(SBINDIR)
- $(INSTALL) -c -m 755 update-pciids $(SBINDIR)
- $(INSTALL) -c -m 644 pci.ids $(SHAREDIR)
-+ $(INSTALL) -c -m 644 README $(SHAREDIR)
- $(INSTALL) -c -m 644 lspci.8 setpci.8 update-pciids.8 $(MANDIR)/man8
-+ $(INSTALL) -c -m 444 lib/$(PCILIB) $(LIBDIR)
-+ $(INSTALL) -c -m 644 lib/pci.h lib/header.h lib/config.h $(INCLUDEDIR)
-
- uninstall: all
- rm -f $(SBINDIR)/lspci $(SBINDIR)/setpci $(SBINDIR)/update-pciids
diff --git a/sysutils/pcvt-utils/DESCR b/sysutils/pcvt-utils/DESCR
deleted file mode 100644
index fecae574728..00000000000
--- a/sysutils/pcvt-utils/DESCR
+++ /dev/null
@@ -1,6 +0,0 @@
-This package contains the useful components that can still be used
-on NetBSD after pcvt was replaced with wscons:
-
- * playvt: A vt-movie player, includes several demo files.
- * fed, fontedit: two font editors that can also be used on
- the fonts in /usr/share/wscons/fonts.
diff --git a/sysutils/pcvt-utils/Makefile b/sysutils/pcvt-utils/Makefile
deleted file mode 100644
index 19f73e02e83..00000000000
--- a/sysutils/pcvt-utils/Makefile
+++ /dev/null
@@ -1,27 +0,0 @@
-# $NetBSD: Makefile,v 1.3 2003/03/29 12:42:29 jmmv Exp $
-#
-
-DISTNAME= netbsd-pcvt-20000611
-PKGNAME= pcvt-utils-20000611
-WRKSRC= ${WRKDIR}/pcvt/Util
-CATEGORIES= sysutils
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-
-MAINTAINER= hubertf@netbsd.org
-HOMEPAGE= http://cvsweb.netbsd.org/bsdweb.cgi/syssrc/sys/arch/i386/isa/pcvt/
-COMMENT= Useful leftovers from pcvt: playvt and two font editors
-
-ONLY_FOR_PLATFORM= NetBSD-*-*
-
-do-install:
- ${INSTALL_PROGRAM} \
- ${WRKSRC}/demo/playvt \
- ${WRKSRC}/fed/fed \
- ${WRKSRC}/fontedit/fontedit \
- ${PREFIX}/bin
- ${INSTALL_DATA_DIR} ${PREFIX}/share/playvt
- ${INSTALL_DATA} \
- ${WRKSRC}/demo/*.vt \
- ${PREFIX}/share/playvt
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/pcvt-utils/PLIST b/sysutils/pcvt-utils/PLIST
deleted file mode 100644
index 7255b322e8f..00000000000
--- a/sysutils/pcvt-utils/PLIST
+++ /dev/null
@@ -1,11 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 22:53:37 zuntum Exp $
-bin/playvt
-bin/fed
-bin/fontedit
-share/playvt/chardemo.vt
-share/playvt/colors.vt
-share/playvt/cowscene.vt
-share/playvt/outerlimit.vt
-share/playvt/sgr.vt
-share/playvt/twzone.vt
-share/playvt/xmas.vt
diff --git a/sysutils/pcvt-utils/distinfo b/sysutils/pcvt-utils/distinfo
deleted file mode 100644
index 7f7e5442c82..00000000000
--- a/sysutils/pcvt-utils/distinfo
+++ /dev/null
@@ -1,11 +0,0 @@
-$NetBSD: distinfo,v 1.3 2002/05/11 20:25:05 wiz Exp $
-
-SHA1 (netbsd-pcvt-20000611.tar.gz) = ea51ded62dc82635f1eda3cd198b29cf6f4941ea
-Size (netbsd-pcvt-20000611.tar.gz) = 315263 bytes
-SHA1 (patch-aa) = 47dec68f79792803f9b4480c8fde812c97b49c46
-SHA1 (patch-ab) = cc05a87826f9573611bb0e70092b9f4b825584a8
-SHA1 (patch-ac) = 634aaf8fe965ade5c972c852fbb1710bf1028b2e
-SHA1 (patch-ad) = c6158765ff8ecc26dd9c297089c90b03c98172cb
-SHA1 (patch-ae) = d81e7ee5f59bf5d4e23d8f19868e190e2a8b2a53
-SHA1 (patch-af) = d07766a5d93ae97905ff0e9083246c1ad874219a
-SHA1 (patch-ag) = fe39a7224c9ea78d97750a90e110d805d353c0ad
diff --git a/sysutils/pcvt-utils/patches/patch-aa b/sysutils/pcvt-utils/patches/patch-aa
deleted file mode 100644
index b907d463116..00000000000
--- a/sysutils/pcvt-utils/patches/patch-aa
+++ /dev/null
@@ -1,28 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2000/12/04 13:38:25 hubertf Exp $
-
---- Makefile.orig Mon Dec 4 13:31:23 2000
-+++ Makefile
-@@ -2,13 +2,18 @@
-
--#SUBDIR=keycap
- #SUBDIR+=cursor
-+SUBDIR+=demo
-+SUBDIR+=fed
- SUBDIR+=fontedit
--SUBDIR+=fonts
-+#SUBDIR+=fonts
-+#SUBDIR+=ispcvt
-+#SUBDIR+=kbdio
- #SUBDIR+=kcon
-+#SUBDIR+=keycap
- #SUBDIR+=loadfont
-+#SUBDIR+=mcon
- #SUBDIR+=scon
-+#SUBDIR+=set2061
- #SUBDIR+=userkeys
--SUBDIR+=vttest
--#SUBDIR+=ispcvt
--#SUBDIR+=mcon
-+#SUBDIR+=vgaio
-+#SUBDIR+=vttest
-
diff --git a/sysutils/pcvt-utils/patches/patch-ab b/sysutils/pcvt-utils/patches/patch-ab
deleted file mode 100644
index fb88d9b72d4..00000000000
--- a/sysutils/pcvt-utils/patches/patch-ab
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 2000/12/04 13:38:25 hubertf Exp $
-
---- kbdio/kbdio.y.orig Mon Dec 4 13:57:07 2000
-+++ kbdio/kbdio.y
-@@ -40,7 +40,13 @@
- #include <math.h>
- #include <sys/fcntl.h>
- #include <machine/cpufunc.h>
-+#include <unistd.h>
-+#if WSCONS
-+#include <sys/ioctl.h>
-+#include <dev/wscons/wsdisplay_usl_io.h>
-+#else
- #include <machine/pcvt_ioctl.h>
-+#endif
-
- #ifdef __NetBSD__
- #include <machine/pio.h>
diff --git a/sysutils/pcvt-utils/patches/patch-ac b/sysutils/pcvt-utils/patches/patch-ac
deleted file mode 100644
index 9f810e68c9a..00000000000
--- a/sysutils/pcvt-utils/patches/patch-ac
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ac,v 1.1.1.1 2000/12/04 13:38:25 hubertf Exp $
-
---- fed/Makefile.orig Mon Dec 4 13:49:07 2000
-+++ fed/Makefile
-@@ -1,6 +1,6 @@
- PROG= fed
- SRCS= fed.c select.c edit.c misc.c
--LDADD= -lncurses
-+LDADD= -lcurses
- BINDIR= /usr/local/bin
-
- MKMAN= no
diff --git a/sysutils/pcvt-utils/patches/patch-ad b/sysutils/pcvt-utils/patches/patch-ad
deleted file mode 100644
index 1c6f71e3256..00000000000
--- a/sysutils/pcvt-utils/patches/patch-ad
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD: patch-ad,v 1.2 2002/05/11 20:25:05 wiz Exp $
-
---- fed/fed.h.orig Sat Oct 7 22:44:48 1995
-+++ fed/fed.h
-@@ -32,7 +32,11 @@
- * fed.h, 3.00, last edit-date: [Sun Jan 2 20:10:31 1994]
- */
-
-+#ifdef __NetBSD__
-+#include <curses.h>
-+#else
- #include <ncurses.h>
-+#endif
- #include <stdlib.h>
- #include <string.h>
- #include <unistd.h>
-@@ -109,7 +113,7 @@
- void setchr ( char type );
- void setrow ( char type );
- void setcol ( char type );
--void main ( int argc, char *argv[] );
-+int main ( int argc, char *argv[] );
- void readfont ( char *filename );
- void dis_cmd ( char *strg );
- void clr_cmd ( void );
diff --git a/sysutils/pcvt-utils/patches/patch-ae b/sysutils/pcvt-utils/patches/patch-ae
deleted file mode 100644
index bc73b5653b3..00000000000
--- a/sysutils/pcvt-utils/patches/patch-ae
+++ /dev/null
@@ -1,53 +0,0 @@
-$NetBSD: patch-ae,v 1.1.1.1 2000/12/04 13:38:25 hubertf Exp $
-
---- fed/select.c.orig Mon Dec 4 13:46:59 2000
-+++ fed/select.c
-@@ -46,7 +46,8 @@
-
- #include "fed.h"
-
--int sc, sr, scurchar;
-+/* "sr" is defined in <curses.h> for some terminal capability?!? */
-+int sc, fed_sr, scurchar;
-
- int edit();
-
-@@ -153,12 +154,12 @@
- case 'g':
- case 'G':
- dis_cmd(" Exchange: select Destination, then press RETURN or any other Key to ABORT");
-- sr = r;
-+ fed_sr = r;
- sc = c;
- scurchar = curchar;
- if((curchar = sel_dest()) == -1)
- { /* failsafe */
-- r = sr;
-+ r = fed_sr;
- c = sc;
- curchar = scurchar;
- }
-@@ -174,12 +175,12 @@
- case 'm':
- case 'M':
- dis_cmd(" Move: select Destination, then press RETURN or any other Key to ABORT");
-- sr = r;
-+ fed_sr = r;
- sc = c;
- scurchar = curchar;
- if((curchar = sel_dest()) == -1)
- { /* failsafe */
-- r = sr;
-+ r = fed_sr;
- c = sc;
- curchar = scurchar;
- }
-@@ -320,7 +321,7 @@
- mvwprintw(set_win,(r+1),((c*2)+1),"%c%c",h,l);
- wmove(set_win,(r+1),((c*2)+1));
-
-- if((r==sr) && (c==sc))
-+ if((r==fed_sr) && (c==sc))
- {
- wattron(set_win,A_REVERSE);
- mvwprintw(set_win,(r+1),((c*2)+1),"%c%c",h,l);
diff --git a/sysutils/pcvt-utils/patches/patch-af b/sysutils/pcvt-utils/patches/patch-af
deleted file mode 100644
index 62f4488a128..00000000000
--- a/sysutils/pcvt-utils/patches/patch-af
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-af,v 1.1 2000/12/28 02:32:16 wiz Exp $
-
---- demo/playvt.c.orig Sat Nov 1 07:49:36 1997
-+++ demo/playvt.c
-@@ -42,6 +42,7 @@
- *---------------------------------------------------------------------------*/
-
- #include <stdio.h>
-+#include <string.h>
- #include <unistd.h>
-
- main(argc,argv)
diff --git a/sysutils/pcvt-utils/patches/patch-ag b/sysutils/pcvt-utils/patches/patch-ag
deleted file mode 100644
index 9d07d0c6e3e..00000000000
--- a/sysutils/pcvt-utils/patches/patch-ag
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ag,v 1.1 2002/05/11 20:25:05 wiz Exp $
-
---- fed/fed.c.orig Sat Oct 7 22:44:47 1995
-+++ fed/fed.c
-@@ -48,7 +48,7 @@
-
- #include "fed.h"
-
--void main(int argc, char *argv[])
-+int main(int argc, char *argv[])
- {
- int i;
- int row, col;
diff --git a/sysutils/pflogsumm/DESCR b/sysutils/pflogsumm/DESCR
deleted file mode 100644
index 2ea1602d227..00000000000
--- a/sysutils/pflogsumm/DESCR
+++ /dev/null
@@ -1,3 +0,0 @@
-A script to provide an overview of postfix activity, with
-just enough detail to give the administrator a "heads up"
-for potential trouble spots.
diff --git a/sysutils/pflogsumm/Makefile b/sysutils/pflogsumm/Makefile
deleted file mode 100644
index ec69d393f2b..00000000000
--- a/sysutils/pflogsumm/Makefile
+++ /dev/null
@@ -1,29 +0,0 @@
-# $NetBSD: Makefile,v 1.4 2003/03/29 12:42:29 jmmv Exp $
-#
-
-DISTNAME= pflogsumm-1.0.4
-WRKSRC= ${WRKDIR}
-CATEGORIES= sysutils
-MASTER_SITES= ftp://jimsun.linxnet.com/pub/postfix_contrib/
-EXTRACT_SUFX= .pl
-EXTRACT_ONLY= # empty
-
-MAINTAINER= kim@tac.nyc.ny.us
-HOMEPAGE= http://jimsun.linxnet.com/postfix_contrib.html
-COMMENT= Produce summaries from Postfix syslog data
-
-DEPENDS+= p5-Date-Calc-[0-9]*:../../devel/p5-Date-Calc
-
-.include "../../mk/bsd.prefs.mk"
-
-NO_CONFIGURE= # defined
-USE_PERL5= # defined
-
-do-build:
- ${SED} 's;/usr/bin/perl;${PERL5};' ${DISTDIR}/${DISTFILES} \
- > ${WRKDIR}/pflogsumm
-
-do-install:
- ${INSTALL_SCRIPT} ${WRKDIR}/pflogsumm ${PREFIX}/sbin
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/pflogsumm/PLIST b/sysutils/pflogsumm/PLIST
deleted file mode 100644
index 344ebdc7950..00000000000
--- a/sysutils/pflogsumm/PLIST
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2002/07/10 12:42:37 kim Exp $
-sbin/pflogsumm
diff --git a/sysutils/pflogsumm/distinfo b/sysutils/pflogsumm/distinfo
deleted file mode 100644
index a637233461f..00000000000
--- a/sysutils/pflogsumm/distinfo
+++ /dev/null
@@ -1,4 +0,0 @@
-$NetBSD: distinfo,v 1.1.1.1 2002/07/10 12:42:37 kim Exp $
-
-SHA1 (pflogsumm-1.0.4.pl) = 1edda8870357c799e3698707a932ee67046a1d0a
-Size (pflogsumm-1.0.4.pl) = 43311 bytes
diff --git a/sysutils/psmisc/DESCR b/sysutils/psmisc/DESCR
deleted file mode 100644
index d7557267940..00000000000
--- a/sysutils/psmisc/DESCR
+++ /dev/null
@@ -1,9 +0,0 @@
-This package contains three little utilities that use the proc FS:
-
- killall kills processes by name, e.g. killall -HUP named
- pidof like killall, buts lists PIDs instead of killing processes
- pstree shows the currently running processes as a tree
-
-The Linux version includes "fuser" for listing processes' open files,
-but NetBSD's procfs doesn't have the facilities for this (use the lsof
-package instead).
diff --git a/sysutils/psmisc/MESSAGE b/sysutils/psmisc/MESSAGE
deleted file mode 100644
index f3c0fbe41fd..00000000000
--- a/sysutils/psmisc/MESSAGE
+++ /dev/null
@@ -1,9 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE,v 1.1 2001/10/31 22:53:38 zuntum Exp $
-
-To use ${PKGNAME}, the following things must exist on the system:
-
- (1) a kernel configured with the PROCFS option, and
- (2) a procfs filesystem mounted on /proc.
-
-===========================================================================
diff --git a/sysutils/psmisc/Makefile b/sysutils/psmisc/Makefile
deleted file mode 100644
index 02ff61a2981..00000000000
--- a/sysutils/psmisc/Makefile
+++ /dev/null
@@ -1,24 +0,0 @@
-# $NetBSD: Makefile,v 1.14 2002/09/27 16:24:41 agc Exp $
-
-DISTNAME= psmisc-20.1
-CATEGORIES= sysutils
-PKGREVISION= 1
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=psmisc/}
-
-MAINTAINER= jlam@netbsd.org
-HOMEPAGE= http://psmisc.sourceforge.net/
-COMMENT= miscellaneous procfs tools: killall, pidof, and pstree
-
-CONFLICTS+= pstree<=2.16
-
-USE_BUILDLINK2= # defined
-GNU_CONFIGURE= # defined
-LIBS+= ${LIBGETOPT}
-
-# "make install" doesn't install the link from killall -> pidof.
-post-install:
- ${RM} -f ${PREFIX}/bin/pidof
- ${LN} -f ${PREFIX}/bin/killall ${PREFIX}/bin/pidof
-
-.include "../../devel/libgetopt/buildlink2.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/psmisc/PLIST b/sysutils/psmisc/PLIST
deleted file mode 100644
index d6172642b69..00000000000
--- a/sysutils/psmisc/PLIST
+++ /dev/null
@@ -1,7 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 22:53:38 zuntum Exp $
-bin/killall
-bin/pidof
-bin/pstree
-man/man1/killall.1
-man/man1/pidof.1
-man/man1/pstree.1
diff --git a/sysutils/psmisc/distinfo b/sysutils/psmisc/distinfo
deleted file mode 100644
index 11ecf226eb3..00000000000
--- a/sysutils/psmisc/distinfo
+++ /dev/null
@@ -1,11 +0,0 @@
-$NetBSD: distinfo,v 1.3 2001/04/24 16:59:34 jlam Exp $
-
-SHA1 (psmisc-20.1.tar.gz) = e969a2f539b181c372b0f82bbbd430c4d57d5d6b
-Size (psmisc-20.1.tar.gz) = 57767 bytes
-SHA1 (patch-aa) = 97b586e06444b9aa2a6ba95c10eaabc93f89c833
-SHA1 (patch-ab) = 4aadacec85e2234c010aad2db5fa9fe469562f4f
-SHA1 (patch-ac) = 9f9a7c7c5155345a1045aee70a2dd65a25ec7219
-SHA1 (patch-ad) = 73ae9467e783957ce7ff638d8637e7398f75c5fe
-SHA1 (patch-ae) = 484305118582c575f8c4827783aa3d5f57b25b5d
-SHA1 (patch-af) = 3c5ba3cf27a422943f984b8414ac29da0b8934da
-SHA1 (patch-ag) = a03a4a0c0dbf065e2b2785cee8f23579a11ae13f
diff --git a/sysutils/psmisc/patches/patch-aa b/sysutils/psmisc/patches/patch-aa
deleted file mode 100644
index 5f92deabcf1..00000000000
--- a/sysutils/psmisc/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.6 2001/04/24 16:59:35 jlam Exp $
-
---- doc/Makefile.in.orig Sat Mar 31 05:40:07 2001
-+++ doc/Makefile.in
-@@ -64,7 +64,7 @@
- TERMCAP_LIB = @TERMCAP_LIB@
- VERSION = @VERSION@
-
--man_MANS = fuser.1 killall.1 pidof.1 pstree.1
-+man_MANS = killall.1 pidof.1 pstree.1
-
- EXTRA_DIST = $(man_MANS)
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
diff --git a/sysutils/psmisc/patches/patch-ab b/sysutils/psmisc/patches/patch-ab
deleted file mode 100644
index beee06dddd3..00000000000
--- a/sysutils/psmisc/patches/patch-ab
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ab,v 1.3 2001/04/24 16:59:35 jlam Exp $
-
---- src/Makefile.in.orig Sat Mar 31 05:40:12 2001
-+++ src/Makefile.in
-@@ -64,9 +64,9 @@
- TERMCAP_LIB = @TERMCAP_LIB@
- VERSION = @VERSION@
-
--CFLAGS = -Wall
-+#CFLAGS = -Wall
-
--bin_PROGRAMS = fuser killall pstree
-+bin_PROGRAMS = killall pstree
-
- fuser_SOURCES = fuser.c comm.h signals.c signals.h signames.h loop.h
-
diff --git a/sysutils/psmisc/patches/patch-ac b/sysutils/psmisc/patches/patch-ac
deleted file mode 100644
index 8442dd23ce7..00000000000
--- a/sysutils/psmisc/patches/patch-ac
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ac,v 1.5 2001/04/24 16:59:35 jlam Exp $
-
---- src/comm.h.orig Wed Dec 13 18:43:10 2000
-+++ src/comm.h
-@@ -6,6 +6,10 @@
- #ifndef COMM_H
- #define COMM_H
-
-+#include <sys/param.h>
-+#ifdef MAXCOMLEN
-+#define COMM_LEN MAXCOMLEN
-+#else
- #if 0 /* broken in 1.3.xx */
- #include <linux/sched.h>
- #define COMM_LEN sizeof(dummy.comm)
-@@ -14,5 +18,6 @@
- #define COMM_LEN 16 /* synchronize with size of comm in struct task_struct in
- /usr/include/linux/sched.h */
- #endif
-+#endif /* MAXCOMLEN */
-
- #endif
diff --git a/sysutils/psmisc/patches/patch-ad b/sysutils/psmisc/patches/patch-ad
deleted file mode 100644
index 2e68a586851..00000000000
--- a/sysutils/psmisc/patches/patch-ad
+++ /dev/null
@@ -1,71 +0,0 @@
-$NetBSD: patch-ad,v 1.6 2001/04/24 16:59:35 jlam Exp $
-
---- src/killall.c.orig Sat Mar 31 05:26:47 2001
-+++ src/killall.c
-@@ -18,10 +18,10 @@
- #include <getopt.h>
-
- #include "comm.h"
-+#include "procfs.h"
- #include "signals.h"
-
-
--#define PROC_BASE "/proc"
- #define MAX_NAMES (sizeof(unsigned long)*8)
-
-
-@@ -138,11 +138,15 @@
- }
- for (i = 0; i < pids; i++)
- {
-- sprintf (path, PROC_BASE "/%d/stat", pid_table[i]);
-+ sprintf (path, "%s/%d/%s", PROC_BASE, pid_table[i], STATUS_FILE);
- if (!(file = fopen (path, "r")))
- continue;
- empty = 0;
-+#ifdef BSD_44_PROCFS
-+ okay = fscanf (file, "%s", comm) == 1;
-+#else
- okay = fscanf (file, "%*d (%[^)]", comm) == 1;
-+#endif
- (void) fclose (file);
- if (!okay)
- continue;
-@@ -151,7 +155,10 @@
- length = strlen (comm);
- if (length == COMM_LEN - 1)
- {
-- sprintf (path, PROC_BASE "/%d/cmdline", pid_table[i]);
-+#if defined(BSD_44_PROCFS) && !defined(BSD_PROCFS_CMDLINE)
-+ okay = 0;
-+#else
-+ sprintf (path, "%s/%d/%s", PROC_BASE, pid_table[i], CMDLINE_FILE);
- if (!(file = fopen (path, "r")))
- continue;
- while (1) {
-@@ -180,6 +187,7 @@
- }
- }
- (void) fclose(file);
-+#endif
- if (exact && !okay)
- {
- if (verbose)
-@@ -206,7 +214,7 @@
- }
- else
- {
-- sprintf (path, PROC_BASE "/%d/exe", pid_table[i]);
-+ sprintf (path, "%s/%d/%s", PROC_BASE, pid_table[i], EXE_FILE);
- if (stat (path, &st) < 0)
- continue;
- if (sts[j].st_dev != st.st_dev || sts[j].st_ino != st.st_ino)
-@@ -369,7 +377,7 @@
- sig_num = SIGTERM;
-
- opterr = 0;
-- while ( (optc = getopt_long_only(argc,argv,"egilqs:vwV",options,NULL)) != EOF) {
-+ while ( (optc = getopt_long(argc,argv,"egilqs:vwV",options,NULL)) != EOF) {
- switch (optc) {
- case 'e':
- exact = 1;
diff --git a/sysutils/psmisc/patches/patch-ae b/sysutils/psmisc/patches/patch-ae
deleted file mode 100644
index 56ee499f3ba..00000000000
--- a/sysutils/psmisc/patches/patch-ae
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD: patch-ae,v 1.3 2001/04/24 16:59:35 jlam Exp $
-
---- src/procfs.h.orig Tue Apr 24 12:31:50 2001
-+++ src/procfs.h
-@@ -0,0 +1,20 @@
-+#include <sys/param.h>
-+
-+#if (defined(BSD) && BSD >= 199306)
-+#define BSD_44_PROCFS
-+#if (defined(__NetBSD_Version__) && __NetBSD_Version__ >= 104180000)
-+#define BSD_PROCFS_CMDLINE
-+#endif
-+#endif
-+
-+#ifdef BSD_44_PROCFS
-+#define PROC_BASE "/proc"
-+#define CMDLINE_FILE "cmdline"
-+#define EXE_FILE "file"
-+#define STATUS_FILE "status"
-+#else
-+#define PROC_BASE "/proc"
-+#define CMDLINE_FILE "cmdline"
-+#define EXE_FILE "exe"
-+#define STATUS_FILE "stat"
-+#endif
diff --git a/sysutils/psmisc/patches/patch-af b/sysutils/psmisc/patches/patch-af
deleted file mode 100644
index 66f3d4504ce..00000000000
--- a/sysutils/psmisc/patches/patch-af
+++ /dev/null
@@ -1,92 +0,0 @@
-$NetBSD: patch-af,v 1.4 2001/04/24 16:59:35 jlam Exp $
-
---- src/pstree.c.orig Mon Dec 18 00:59:23 2000
-+++ src/pstree.c
-@@ -22,12 +22,12 @@
- #include <sys/ioctl.h>
-
- #include "comm.h"
-+#include "procfs.h"
-
-
- #ifndef MAX_DEPTH
- #define MAX_DEPTH 100
- #endif
--#define PROC_BASE "/proc"
-
- /* UTF-8 defines by Johan Myreen */
- #define UTF_V "\342\224\202\277" /* Vertical line drawing char */
-@@ -303,6 +303,7 @@
- const struct passwd *pw;
- int lvl, i, add, offset, len, swapped, info, count, comm_len, first;
- const char *tmp, *here;
-+ char tbuf[1024], *pbuf;
- char comm_tmp[5];
-
- if (!current)
-@@ -327,7 +328,8 @@
- add = out_int (rep) + 2;
- out_string ("*[");
- }
-- if (current->highlight && (tmp = tgetstr ("md", NULL)))
-+ pbuf = tbuf;
-+ if (current->highlight && (tmp = tgetstr ("md", &pbuf)))
- tputs (tmp, 1, putchar);
- if ((swapped = print_args) && current->argc < 0)
- out_char ('(');
-@@ -366,7 +368,8 @@
- }
- if (info || swapped)
- out_char (')');
-- if (current->highlight && (tmp = tgetstr ("me", NULL)))
-+ pbuf = tbuf;
-+ if (current->highlight && (tmp = tgetstr ("me", &pbuf)))
- tputs (tmp, 1, putchar);
- if (print_args)
- {
-@@ -504,7 +507,7 @@
- while ((de = readdir (dir)) != NULL)
- if ((pid = atoi (de->d_name)) != 0)
- {
-- sprintf (path, "%s/%d/stat", PROC_BASE, pid);
-+ sprintf (path, "%s/%d/%s", PROC_BASE, pid, STATUS_FILE);
- if ((file = fopen (path, "r")) != NULL)
- {
- empty = 0;
-@@ -513,6 +516,10 @@
- perror (path);
- exit (1);
- }
-+#ifdef BSD_44_PROCFS
-+ if (fscanf(file, "%s %*d %d", comm, &ppid) == 2)
-+ { { {
-+#else
- fread(readbuf, BUFSIZ, 1, file) ;
- if (ferror(file) == 0)
- {
-@@ -532,11 +539,12 @@
- (file, "%d (%s) %c %d", &dummy, comm, (char *) &dummy,
- &ppid) == 4)
- */
-+#endif
- if (!print_args)
- add_proc (comm, pid, ppid, st.st_uid, NULL, 0);
- else
- {
-- sprintf (path, "%s/%d/cmdline", PROC_BASE, pid);
-+ sprintf (path, "%s/%d/%s", PROC_BASE, pid, CMDLINE_FILE);
- if ((fd = open (path, O_RDONLY)) < 0)
- {
- perror (path);
-@@ -641,7 +649,11 @@
- switch (c)
- {
- case 'a':
-+#if defined(BSD_44_PROCFS) && !defined(BSD_PROCFS_CMDLINE)
-+ print_args = 0;
-+#else
- print_args = 1;
-+#endif
- break;
- case 'c':
- compact = 0;
diff --git a/sysutils/psmisc/patches/patch-ag b/sysutils/psmisc/patches/patch-ag
deleted file mode 100644
index 3b2cb102afa..00000000000
--- a/sysutils/psmisc/patches/patch-ag
+++ /dev/null
@@ -1,82 +0,0 @@
-$NetBSD: patch-ag,v 1.1 2001/04/24 16:59:35 jlam Exp $
-
---- src/signals.c.orig Wed Dec 13 18:43:15 2000
-+++ src/signals.c
-@@ -7,9 +7,17 @@
- #include <stdio.h>
- #include <string.h>
- #include <ctype.h>
-+#include <sys/param.h>
- #include "signals.h"
-
-+#if (defined(BSD) && BSD >= 199306)
-+#define HAVE_SYS_SIGNAME
-+#endif
-
-+
-+#ifdef HAVE_SYS_SIGNAME
-+#include <signal.h>
-+#else
- typedef struct
- {
- int number;
-@@ -22,11 +30,26 @@
- #include "signames.h"
- {0, NULL}
- };
-+#endif
-
-
- void
- list_signals (void)
- {
-+#ifdef HAVE_SYS_SIGNAME
-+ int i, col;
-+
-+ col = 0;
-+ for (i = 1; i < NSIG; i++) {
-+ if (col+strlen(sys_signame[i])+1 > 80) {
-+ putchar('\n');
-+ col = 0;
-+ }
-+ printf("%s%s",col ? " " : "",sys_signame[i]);
-+ col += strlen(sys_signame[i])+1;
-+ }
-+ putchar('\n');
-+#else
- SIGNAME *walk;
- int col;
-
-@@ -42,12 +65,26 @@
- col += strlen (walk->name) + 1;
- }
- putchar ('\n');
-+#endif
- }
-
-
- int
- get_signal (char *name, const char *cmd)
- {
-+#ifdef HAVE_SYS_SIGNAME
-+ int i;
-+ if (isdigit(*name))
-+ return atoi(name);
-+ for (i = 1; i < NSIG; i++) {
-+ if (!strcmp(sys_signame[i],name))
-+ break;
-+ }
-+ if (i < NSIG)
-+ return i;
-+ fprintf(stderr,"%s: unknown signal; %s -l lists signals.\n",name,cmd);
-+ exit(1);
-+#else
- SIGNAME *walk;
-
- if (isdigit (*name))
-@@ -59,4 +96,5 @@
- return walk->number;
- fprintf (stderr, "%s: unknown signal; %s -l lists signals.\n", name, cmd);
- exit (1);
-+#endif
- }
diff --git a/sysutils/pstree/DESCR b/sysutils/pstree/DESCR
deleted file mode 100644
index b8ef5d6a027..00000000000
--- a/sysutils/pstree/DESCR
+++ /dev/null
@@ -1,3 +0,0 @@
-This is pstree. It is a small program that shows the ps
-listing as a tree (as the name implies...). It has several options
-to make selection criteria and to change the output style.
diff --git a/sysutils/pstree/Makefile b/sysutils/pstree/Makefile
deleted file mode 100644
index 4b4056ccaa6..00000000000
--- a/sysutils/pstree/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# $NetBSD: Makefile,v 1.13 2003/06/02 01:16:54 jschauma Exp $
-#
-
-DISTNAME= pstree-2.19
-WRKSRC= ${WRKDIR}
-CATEGORIES= sysutils
-# PKGREVISION= 1
-MASTER_SITES= http://fresh.t-systems-sfr.com/unix/src/misc/
-
-MAINTAINER= tech-pkg@netbsd.org
-COMMENT= Display processes in a tree
-
-do-build:
- cd ${WRKSRC}; ${CC} ${CFLAGS} -o pstree pstree.c
-
-do-install:
- ${INSTALL_PROGRAM} ${WRKSRC}/pstree ${PREFIX}/bin/proctree
- ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/proctree
- ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/proctree
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/pstree/PLIST b/sysutils/pstree/PLIST
deleted file mode 100644
index fbb082b0abf..00000000000
--- a/sysutils/pstree/PLIST
+++ /dev/null
@@ -1,4 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2002/09/27 12:08:06 agc Exp $
-bin/proctree
-share/doc/proctree/README
-@dirrm share/doc/proctree
diff --git a/sysutils/pstree/distinfo b/sysutils/pstree/distinfo
deleted file mode 100644
index 9229cf8de4a..00000000000
--- a/sysutils/pstree/distinfo
+++ /dev/null
@@ -1,4 +0,0 @@
-$NetBSD: distinfo,v 1.5 2003/05/30 08:45:36 mjl Exp $
-
-SHA1 (pstree-2.19.tar.gz) = b6a7d5d7d33cbab64eae01a7ad84f920f833ea8b
-Size (pstree-2.19.tar.gz) = 8120 bytes
diff --git a/sysutils/pv/DESCR b/sysutils/pv/DESCR
deleted file mode 100644
index 115cc30659c..00000000000
--- a/sysutils/pv/DESCR
+++ /dev/null
@@ -1,5 +0,0 @@
-pv (Pipe Viewer) is a terminal-based tool for monitoring the progress of
-data through a pipeline. It can be inserted into any normal pipeline between
-two processes to give a visual indication of how quickly data is passing
-through, how long it has taken, how near to completion it is, and an
-estimate of how long it will be until completion.
diff --git a/sysutils/pv/Makefile b/sysutils/pv/Makefile
deleted file mode 100644
index 9c14c4c08e4..00000000000
--- a/sysutils/pv/Makefile
+++ /dev/null
@@ -1,30 +0,0 @@
-# $NetBSD: Makefile,v 1.4 2003/07/13 13:53:20 wiz Exp $
-#
-
-DISTNAME= pv-0.4.5
-PKGREVISION= 1
-CATEGORIES= sysutils
-MASTER_SITES= http://www.ivarch.com/programs/sources/
-MASTER_SITES+= ${MASTER_SITE_SOURCEFORGE:=pipeviewer/}
-
-MAINTAINER= socrtp@soclab.eu.org
-HOMEPAGE= http://www.ivarch.com/programs/pv.shtml
-COMMENT= Monitor the progress of data through a pipeline
-
-BUILD_USES_MSGFMT= yes
-GNU_CONFIGURE= yes
-USE_GMAKE= yes
-USE_BUILDLINK2= yes
-USE_PKGLOCALEDIR= yes
-
-INFO_FILES= pv.info
-
-post-install:
- ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/pv
-.for i in ../README index.html manual.html quickref.txt lsm NEWS TODO COPYING
- ${INSTALL_DATA} ${WRKSRC}/doc/${i} ${PREFIX}/share/doc/pv
-.endfor
-
-.include "../../devel/gettext-lib/buildlink2.mk"
-.include "../../mk/texinfo.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/pv/PLIST b/sysutils/pv/PLIST
deleted file mode 100644
index a8c5354077e..00000000000
--- a/sysutils/pv/PLIST
+++ /dev/null
@@ -1,24 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2003/01/22 21:35:49 kristerw Exp $
-bin/pv
-@unexec ${INSTALL_INFO} --delete %D/info/pv.info %D/info/dir
-info/pv.info
-@exec ${INSTALL_INFO} %D/info/pv.info %D/info/dir
-man/man1/pv.1
-share/doc/pv/COPYING
-share/doc/pv/NEWS
-share/doc/pv/README
-share/doc/pv/TODO
-share/doc/pv/index.html
-share/doc/pv/lsm
-share/doc/pv/manual.html
-share/doc/pv/quickref.txt
-${PKGLOCALEDIR}/locale/cz/LC_MESSAGES/pv.mo
-${PKGLOCALEDIR}/locale/de/LC_MESSAGES/pv.mo
-${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/pv.mo
-${PKGLOCALEDIR}/locale/no/LC_MESSAGES/pv.mo
-${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/pv.mo
-${PKGLOCALEDIR}/locale/pt/LC_MESSAGES/pv.mo
-${PKGLOCALEDIR}/locale/sk/LC_MESSAGES/pv.mo
-${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/pv.mo
-@dirrm ${PKGLOCALEDIR}/locale/cz/LC_MESSAGES
-@dirrm share/doc/pv
diff --git a/sysutils/pv/distinfo b/sysutils/pv/distinfo
deleted file mode 100644
index 78c204c3c09..00000000000
--- a/sysutils/pv/distinfo
+++ /dev/null
@@ -1,7 +0,0 @@
-$NetBSD: distinfo,v 1.2 2003/01/22 21:35:49 kristerw Exp $
-
-SHA1 (pv-0.4.5.tar.gz) = 67731b80f8a08c9105fcad4cddc105042d4ec860
-Size (pv-0.4.5.tar.gz) = 105632 bytes
-SHA1 (patch-aa) = 9a822d58ef94261306d023ac964e843fd16028f0
-SHA1 (patch-ab) = 4191c14b5ea4e33ea9aa2af19e0e9b4e62a2508e
-SHA1 (patch-ac) = b6b08a88a11bd8f35d05ea995dafe672d19f1932
diff --git a/sysutils/pv/patches/patch-aa b/sysutils/pv/patches/patch-aa
deleted file mode 100644
index 001339cc943..00000000000
--- a/sysutils/pv/patches/patch-aa
+++ /dev/null
@@ -1,9 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2002/12/04 11:56:35 agc Exp $
-
---- autoconf/make/link.mk.orig Tue Dec 3 11:31:11 2002
-+++ autoconf/make/link.mk
-@@ -10,3 +10,3 @@ intlobjs = @INTLOBJS@
- $(package): src/main.o $(intldeps) $(intlobjs) $(objgetopt)
-- $(CC) $(FINALFLAGS) -o $@ src/main.o $(intldeps) $(intlobjs) $(objgetopt)
-+ $(CC) $(LIBS) $(FINALFLAGS) -o $@ src/main.o $(intldeps) $(intlobjs) $(objgetopt)
-
diff --git a/sysutils/pv/patches/patch-ab b/sysutils/pv/patches/patch-ab
deleted file mode 100644
index 76946faeb3c..00000000000
--- a/sysutils/pv/patches/patch-ab
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 2002/12/04 11:56:35 agc Exp $
-
---- autoconf/make/unreal.mk.orig Tue Nov 26 13:04:51 2002
-+++ autoconf/make/unreal.mk
-@@ -65,7 +65,7 @@ cvsclean: distclean
- echo -n > $(srcdir)/autoconf/make/filelist.mk~
- echo -n > $(srcdir)/autoconf/make/modules.mk~
-
--doc: doc/$(package).info doc/manual.html doc/quickref.txt
-+doc: doc/$(package).info doc/quickref.txt
-
- index:
- (cd $(srcdir); sh autoconf/scripts/index.sh $(srcdir)) > index.html
-@@ -117,8 +117,6 @@ install: all doc
- "$(RPM_BUILD_ROOT)/$(mandir)/man1/$(package).1"
- $(INSTALL) -m 644 doc/$(package).info \
- "$(RPM_BUILD_ROOT)/$(infodir)/$(package).info"
-- $(DO_GZIP) "$(RPM_BUILD_ROOT)/$(mandir)/man1/$(package).1" || :
-- $(DO_GZIP) "$(RPM_BUILD_ROOT)/$(infodir)/$(package).info" || :
- catalogs='$(CATALOGS)'; \
- for cat in $$catalogs; do \
- name=`echo $$cat | sed 's,^.*/,,g'`; \
-@@ -136,8 +134,6 @@ install: all doc
- uninstall:
- $(UNINSTALL) "$(RPM_BUILD_ROOT)/$(mandir)/man1/$(package).1"
- $(UNINSTALL) "$(RPM_BUILD_ROOT)/$(infodir)/$(package).info"
-- $(UNINSTALL) "$(RPM_BUILD_ROOT)/$(mandir)/man1/$(package).1.gz"
-- $(UNINSTALL) "$(RPM_BUILD_ROOT)/$(infodir)/$(package).info.gz"
- catalogs='$(CATALOGS)'; \
- for cat in $$catalogs; do \
- name=`echo $$cat | sed 's,^.*/,,g'`; \
diff --git a/sysutils/pv/patches/patch-ac b/sysutils/pv/patches/patch-ac
deleted file mode 100644
index 1703c71d760..00000000000
--- a/sysutils/pv/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.1.1.1 2002/12/04 11:56:35 agc Exp $
-
---- doc/index.html.orig Tue Dec 3 13:30:11 2002
-+++ doc/index.html
-@@ -7,7 +7,7 @@
-
- <P>
- <UL>
--<LI><A HREF="../README">README</A>
-+<LI><A HREF="README">README</A>
- <LI><A HREF="INSTALL">Installation instructions</A>
- <LI><A HREF="manual.html">Manual</A>
- <LI><A HREF="quickref.txt">Man page</A> (text format)
diff --git a/sysutils/pwgen/DESCR b/sysutils/pwgen/DESCR
deleted file mode 100644
index 26d478f85ed..00000000000
--- a/sysutils/pwgen/DESCR
+++ /dev/null
@@ -1,2 +0,0 @@
-pwgen generates passwords which can be easily memorized by humans,
-while being as secure as possible.
diff --git a/sysutils/pwgen/Makefile b/sysutils/pwgen/Makefile
deleted file mode 100644
index f5117d98635..00000000000
--- a/sysutils/pwgen/Makefile
+++ /dev/null
@@ -1,13 +0,0 @@
-# $NetBSD: Makefile,v 1.1.1.1 2002/12/05 22:46:31 jdolecek Exp $
-
-DISTNAME= pwgen-2.02
-CATEGORIES= sysutils
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=pwgen/}
-
-MAINTAINER= jdolecek@NetBSD.org
-HOMEPAGE= http://sourceforge.net/projects/pwgen/
-COMMENT= generate pronounceable passwords
-
-GNU_CONFIGURE= yes
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/pwgen/PLIST b/sysutils/pwgen/PLIST
deleted file mode 100644
index e77cd3ed6b9..00000000000
--- a/sysutils/pwgen/PLIST
+++ /dev/null
@@ -1,3 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2002/12/05 22:46:31 jdolecek Exp $
-bin/pwgen
-man/man1/pwgen.1
diff --git a/sysutils/pwgen/distinfo b/sysutils/pwgen/distinfo
deleted file mode 100644
index 1bde39505d1..00000000000
--- a/sysutils/pwgen/distinfo
+++ /dev/null
@@ -1,4 +0,0 @@
-$NetBSD: distinfo,v 1.1.1.1 2002/12/05 22:46:31 jdolecek Exp $
-
-SHA1 (pwgen-2.02.tar.gz) = eeed81a1efe7a13143c30e6589e9a9ab6343610d
-Size (pwgen-2.02.tar.gz) = 20723 bytes
diff --git a/sysutils/qlogtools/DESCR b/sysutils/qlogtools/DESCR
deleted file mode 100644
index c1f976b66b6..00000000000
--- a/sysutils/qlogtools/DESCR
+++ /dev/null
@@ -1,2 +0,0 @@
-This package is a set of tools that are useful in analyzing or producing
-logs from qmail and other packages.
diff --git a/sysutils/qlogtools/Makefile b/sysutils/qlogtools/Makefile
deleted file mode 100644
index 81a1677201a..00000000000
--- a/sysutils/qlogtools/Makefile
+++ /dev/null
@@ -1,19 +0,0 @@
-# $NetBSD: Makefile,v 1.1.1.1 2001/08/13 14:53:02 zuntum Exp $
-#
-
-DISTNAME= qlogtools-3.1
-CATEGORIES= sysutils
-MASTER_SITES= http://untroubled.org/qlogtools/
-
-MAINTAINER= zuntum@netbsd.org
-HOMEPAGE= http://untroubled.org/qlogtools/
-COMMENT= set of tools useful in analyzing logs from qmail and other pkgs
-
-pre-build:
- ${ECHO} ${PREFIX}/bin > ${WRKSRC}/conf-bin
- ${ECHO} ${PREFIX}/man > ${WRKSRC}/conf-man
-
-do-install:
- cd ${WRKSRC} && ./installer
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/qlogtools/PLIST b/sysutils/qlogtools/PLIST
deleted file mode 100644
index 57a2dfea230..00000000000
--- a/sysutils/qlogtools/PLIST
+++ /dev/null
@@ -1,15 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 22:53:40 zuntum Exp $
-bin/multipipe
-bin/multitail
-bin/qfilelog
-bin/spipe
-bin/tai2tai64n
-bin/tai64n2tai
-bin/teepipe
-man/man1/multipipe.1
-man/man1/multitail.1
-man/man1/qfilelog.1
-man/man1/spipe.1
-man/man1/tai2tai64n.1
-man/man1/tai64n2tai.1
-man/man1/teepipe.1
diff --git a/sysutils/qlogtools/distinfo b/sysutils/qlogtools/distinfo
deleted file mode 100644
index 69a2e0f3a7c..00000000000
--- a/sysutils/qlogtools/distinfo
+++ /dev/null
@@ -1,4 +0,0 @@
-$NetBSD: distinfo,v 1.1.1.1 2001/08/13 14:53:02 zuntum Exp $
-
-SHA1 (qlogtools-3.1.tar.gz) = 6e9e32a4a9ca7f3e29958384227eb2a033f8a1b9
-Size (qlogtools-3.1.tar.gz) = 20868 bytes
diff --git a/sysutils/rconfig/DESCR b/sysutils/rconfig/DESCR
deleted file mode 100644
index f4d5d593f5c..00000000000
--- a/sysutils/rconfig/DESCR
+++ /dev/null
@@ -1,5 +0,0 @@
-Rconfig is intended to manage configuration files across
-heterogenous groups of machines. The configuration for each
-machine is determined by a set of rdist trees based on the
-various tags such as OS, hostname, and architecture.
-Files in 'more specific' rdist trees take priority.
diff --git a/sysutils/rconfig/Makefile b/sysutils/rconfig/Makefile
deleted file mode 100644
index 748b54d3a8a..00000000000
--- a/sysutils/rconfig/Makefile
+++ /dev/null
@@ -1,22 +0,0 @@
-# $NetBSD: Makefile,v 1.11 2003/04/01 15:19:30 abs Exp $
-
-DISTNAME= rconfig-0.17
-CATEGORIES= sysutils
-MASTER_SITES= http://www.mono.org/abs/tools/rconfig/
-
-MAINTAINER= abs@netbsd.org
-HOMEPAGE= http://www.mono.org/abs/tools/rconfig/
-COMMENT= Manage configurations for many machines via rdist trees
-
-DEPENDS+= fping-[0-9]*:../../net/fping
-DEPENDS+= freerdist-[0-9]*:../../net/rdist6
-DEPENDS+= srsh-[0-9]*:../../net/srsh
-
-USE_PERL5= # defined
-
-do-install:
- ${INSTALL_SCRIPT} ${WRKSRC}/rconfig.pl ${PREFIX}/sbin/rconfig
- ${INSTALL_SCRIPT} ${WRKSRC}/probe.sh ${PREFIX}/libexec/rconfig_probe
- ${INSTALL_MAN} ${WRKSRC}/rconfig.8 ${PREFIX}/man/man8/rconfig.8
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/rconfig/PLIST b/sysutils/rconfig/PLIST
deleted file mode 100644
index 3d246c08cc9..00000000000
--- a/sysutils/rconfig/PLIST
+++ /dev/null
@@ -1,4 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2002/04/10 10:19:24 abs Exp $
-libexec/rconfig_probe
-sbin/rconfig
-man/man8/rconfig.8
diff --git a/sysutils/rconfig/distinfo b/sysutils/rconfig/distinfo
deleted file mode 100644
index e203ae2f923..00000000000
--- a/sysutils/rconfig/distinfo
+++ /dev/null
@@ -1,4 +0,0 @@
-$NetBSD: distinfo,v 1.9 2003/04/01 15:19:30 abs Exp $
-
-SHA1 (rconfig-0.17.tar.gz) = 229bf73fc30b7e275f9ae3c126517e9b23384df8
-Size (rconfig-0.17.tar.gz) = 10271 bytes
diff --git a/sysutils/rdiff-backup/DESCR b/sysutils/rdiff-backup/DESCR
deleted file mode 100644
index f723d0d6e97..00000000000
--- a/sysutils/rdiff-backup/DESCR
+++ /dev/null
@@ -1,10 +0,0 @@
-Rdiff-backup backs up one directory to another, possibly over a network.
-The target directory ends up a copy of the source directory, but extra
-reverse diffs are stored in a special subdirectory of that target directory,
-so you can still recover files lost some time ago. The idea is to combine
-the best features of a mirror and an incremental backup. Rdiff-backup also
-preserves subdirectories, hard links, dev files, permissions, uid/gid
-ownership (if it is running as root), and modification times. Finally,
-rdiff-backup can operate in a bandwidth efficient manner over a pipe, like
-rsync. Thus you can use rdiff-backup and ssh to securely back a hard drive
-up to a remote location, and only the differences will be transmitted.
diff --git a/sysutils/rdiff-backup/Makefile b/sysutils/rdiff-backup/Makefile
deleted file mode 100644
index 2c4f4a25f0d..00000000000
--- a/sysutils/rdiff-backup/Makefile
+++ /dev/null
@@ -1,30 +0,0 @@
-# $NetBSD: Makefile,v 1.3 2003/07/13 13:53:21 wiz Exp $
-#
-
-DISTNAME= rdiff-backup-0.10.2
-PKGREVISION= 1
-CATEGORIES= sysutils net
-MASTER_SITES= http://rdiff-backup.stanford.edu/
-
-MAINTAINER= davids@idiom.com
-HOMEPAGE= http://rdiff-backup.stanford.edu/
-COMMENT= remote incremental backup utility
-
-PYTHON_VERSION_REQD= 22
-USE_BUILDLINK2= yes
-
-post-patch:
- @${SED} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
- < ${WRKSRC}/setup.py > ${WRKSRC}/local_setup.py
-
-do-build:
- cd ${WRKSRC}; ${PYTHONBIN} local_setup.py build
-
-do-install:
- cd ${WRKSRC}; ${PYTHONBIN} local_setup.py install \
- --prefix=${PREFIX} --skip-build
-
-.include "../../devel/librsync/buildlink2.mk"
-.include "../../lang/python/application.mk"
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/rdiff-backup/PLIST b/sysutils/rdiff-backup/PLIST
deleted file mode 100644
index 950322f9a55..00000000000
--- a/sysutils/rdiff-backup/PLIST
+++ /dev/null
@@ -1,65 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2002/10/15 15:16:02 agc Exp $
-bin/rdiff-backup
-lib/python2.2/site-packages/rdiff_backup/C.so
-lib/python2.2/site-packages/rdiff_backup/FilenameMapping.py
-lib/python2.2/site-packages/rdiff_backup/FilenameMapping.pyc
-lib/python2.2/site-packages/rdiff_backup/Globals.py
-lib/python2.2/site-packages/rdiff_backup/Globals.pyc
-lib/python2.2/site-packages/rdiff_backup/Hardlink.py
-lib/python2.2/site-packages/rdiff_backup/Hardlink.pyc
-lib/python2.2/site-packages/rdiff_backup/Main.py
-lib/python2.2/site-packages/rdiff_backup/Main.pyc
-lib/python2.2/site-packages/rdiff_backup/MiscStats.py
-lib/python2.2/site-packages/rdiff_backup/MiscStats.pyc
-lib/python2.2/site-packages/rdiff_backup/Rdiff.py
-lib/python2.2/site-packages/rdiff_backup/Rdiff.pyc
-lib/python2.2/site-packages/rdiff_backup/Security.py
-lib/python2.2/site-packages/rdiff_backup/Security.pyc
-lib/python2.2/site-packages/rdiff_backup/SetConnections.py
-lib/python2.2/site-packages/rdiff_backup/SetConnections.pyc
-lib/python2.2/site-packages/rdiff_backup/Time.py
-lib/python2.2/site-packages/rdiff_backup/Time.pyc
-lib/python2.2/site-packages/rdiff_backup/__init__.py
-lib/python2.2/site-packages/rdiff_backup/__init__.pyc
-lib/python2.2/site-packages/rdiff_backup/_librsync.so
-lib/python2.2/site-packages/rdiff_backup/connection.py
-lib/python2.2/site-packages/rdiff_backup/connection.pyc
-lib/python2.2/site-packages/rdiff_backup/destructive_stepping.py
-lib/python2.2/site-packages/rdiff_backup/destructive_stepping.pyc
-lib/python2.2/site-packages/rdiff_backup/highlevel.py
-lib/python2.2/site-packages/rdiff_backup/highlevel.pyc
-lib/python2.2/site-packages/rdiff_backup/increment.py
-lib/python2.2/site-packages/rdiff_backup/increment.pyc
-lib/python2.2/site-packages/rdiff_backup/iterfile.py
-lib/python2.2/site-packages/rdiff_backup/iterfile.pyc
-lib/python2.2/site-packages/rdiff_backup/lazy.py
-lib/python2.2/site-packages/rdiff_backup/lazy.pyc
-lib/python2.2/site-packages/rdiff_backup/librsync.py
-lib/python2.2/site-packages/rdiff_backup/librsync.pyc
-lib/python2.2/site-packages/rdiff_backup/log.py
-lib/python2.2/site-packages/rdiff_backup/log.pyc
-lib/python2.2/site-packages/rdiff_backup/manage.py
-lib/python2.2/site-packages/rdiff_backup/manage.pyc
-lib/python2.2/site-packages/rdiff_backup/restore.py
-lib/python2.2/site-packages/rdiff_backup/restore.pyc
-lib/python2.2/site-packages/rdiff_backup/rlist.py
-lib/python2.2/site-packages/rdiff_backup/rlist.pyc
-lib/python2.2/site-packages/rdiff_backup/robust.py
-lib/python2.2/site-packages/rdiff_backup/robust.pyc
-lib/python2.2/site-packages/rdiff_backup/rorpiter.py
-lib/python2.2/site-packages/rdiff_backup/rorpiter.pyc
-lib/python2.2/site-packages/rdiff_backup/rpath.py
-lib/python2.2/site-packages/rdiff_backup/rpath.pyc
-lib/python2.2/site-packages/rdiff_backup/selection.py
-lib/python2.2/site-packages/rdiff_backup/selection.pyc
-lib/python2.2/site-packages/rdiff_backup/static.py
-lib/python2.2/site-packages/rdiff_backup/static.pyc
-lib/python2.2/site-packages/rdiff_backup/statistics.py
-lib/python2.2/site-packages/rdiff_backup/statistics.pyc
-man/man1/rdiff-backup.1
-share/doc/${PKGNAME}/CHANGELOG
-share/doc/${PKGNAME}/COPYING
-share/doc/${PKGNAME}/FAQ.html
-share/doc/${PKGNAME}/README
-@dirrm share/doc/${PKGNAME}
-@dirrm lib/python2.2/site-packages/rdiff_backup
diff --git a/sysutils/rdiff-backup/distinfo b/sysutils/rdiff-backup/distinfo
deleted file mode 100644
index 3bbc7d325e7..00000000000
--- a/sysutils/rdiff-backup/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.2 2003/03/22 01:03:09 wiz Exp $
-
-SHA1 (rdiff-backup-0.10.2.tar.gz) = 57725aa566648206323b2b597e2d2d29c7336b7c
-Size (rdiff-backup-0.10.2.tar.gz) = 110249 bytes
-SHA1 (patch-aa) = 26027114889f6dcbbca47d40227980b45a3d65ba
-SHA1 (patch-ab) = 123ad5cf21770ce882738b625eee3df457b55bf7
diff --git a/sysutils/rdiff-backup/patches/patch-aa b/sysutils/rdiff-backup/patches/patch-aa
deleted file mode 100644
index 1a08929b47f..00000000000
--- a/sysutils/rdiff-backup/patches/patch-aa
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2002/10/15 15:16:02 agc Exp $
-
---- cmodule.c.orig Thu Oct 3 00:11:33 2002
-+++ cmodule.c
-@@ -129,12 +129,12 @@ static PyObject *c_make_file_dict(self,
- char devtype[2];
- #if defined(HAVE_LONG_LONG) && !defined(MS_WINDOWS)
- LONG_LONG devnums = (LONG_LONG)sbuf.st_rdev;
-- PyObject *major_num = PyLong_FromLongLong(devnums >> 8);
-+ PyObject *major_num = PyLong_FromLongLong(major(devnums));
- #else
- long int devnums = (long)sbuf.st_dev;
- PyObject *major_num = PyInt_FromLong(devnums >> 8);
- #endif
-- int minor_num = (int)(devnums & 0xff);
-+ int minor_num = (int)(minor(devnums));
- if S_ISCHR(mode) strcpy(devtype, "c");
- else strcpy(devtype, "b");
- return_val = Py_BuildValue("{s:s,s:O,s:l,s:l,s:l,s:O,s:O,s:l,s:N}",
diff --git a/sysutils/rdiff-backup/patches/patch-ab b/sysutils/rdiff-backup/patches/patch-ab
deleted file mode 100644
index 60ef158a4ad..00000000000
--- a/sysutils/rdiff-backup/patches/patch-ab
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-ab,v 1.2 2003/03/22 01:03:09 wiz Exp $
-
---- setup.py.orig Mon Jan 27 06:04:22 2003
-+++ setup.py
-@@ -19,9 +19,12 @@ setup(name="rdiff-backup",
- ext_modules = [Extension("rdiff_backup.C", ["cmodule.c"]),
- Extension("rdiff_backup._librsync",
- ["_librsyncmodule.c"],
-+ include_dirs=['%%LOCALBASE%%/include'],
-+ library_dirs=['%%LOCALBASE%%/lib'],
-+ runtime_library_dirs=['%%LOCALBASE%%/lib'],
- libraries=["rsync"])],
- scripts = ['rdiff-backup'],
-- data_files = [('share/man/man1', ['rdiff-backup.1']),
-+ data_files = [('man/man1', ['rdiff-backup.1']),
- ('share/doc/rdiff-backup-%s' % version_string,
- ['CHANGELOG', 'COPYING', 'README', 'FAQ.html'])])
-
diff --git a/sysutils/roller/DESCR b/sysutils/roller/DESCR
deleted file mode 100644
index 3c4d36c8a44..00000000000
--- a/sysutils/roller/DESCR
+++ /dev/null
@@ -1 +0,0 @@
-Roller can process rolled log files and mail the output.
diff --git a/sysutils/roller/Makefile b/sysutils/roller/Makefile
deleted file mode 100644
index cd1273c6ffe..00000000000
--- a/sysutils/roller/Makefile
+++ /dev/null
@@ -1,28 +0,0 @@
-# $NetBSD: Makefile,v 1.19 2003/03/28 21:14:35 wiz Exp $
-#
-
-DISTNAME= roller-1.13
-CATEGORIES= sysutils
-MASTER_SITES= ftp://ftp.gw.com/pub/people/kim/
-
-MAINTAINER= kim@tac.nyc.ny.us
-COMMENT= roll log files
-
-DEPENDS+= cpogm-[0-9]*:../../sysutils/cpogm
-DEPENDS+= logtime-[0-9]*:../../time/logtime
-DEPENDS+= pflogsumm-[0-9]*:../../sysutils/pflogsumm
-
-.include "../../mk/bsd.prefs.mk"
-
-NO_CONFIGURE= # defined
-USE_PERL5= # defined
-
-MAKE_PARAMS+= PREFIX=${PREFIX}
-MAKE_PARAMS+= GAWK=${AWK}
-MAKE_PARAMS+= PERL=${PERL5}
-MAKE_PARAMS+= SH=${SH}
-
-ALL_TARGET= all ${MAKE_PARAMS}
-INSTALL_TARGET= install ${MAKE_PARAMS}
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/roller/PLIST b/sysutils/roller/PLIST
deleted file mode 100644
index 55861150184..00000000000
--- a/sysutils/roller/PLIST
+++ /dev/null
@@ -1,19 +0,0 @@
-@comment $NetBSD: PLIST,v 1.3 2002/07/10 12:45:05 kim Exp $
-sbin/logprune
-sbin/logroll
-sbin/roller
-share/roller/proc-cron
-share/roller/proc-ftp
-share/roller/proc-httpd-access
-share/roller/proc-httpd-errors
-share/roller/proc-ipmon
-share/roller/proc-maillog
-share/roller/proc-messages
-share/roller/proc-news
-share/roller/proc-newstally
-share/roller/proc-radius
-share/roller/proc-sendmail.st
-share/roller/proc-wtmp
-share/roller/proc-xferlog
-share/roller/tallyho
-@dirrm share/roller
diff --git a/sysutils/roller/distinfo b/sysutils/roller/distinfo
deleted file mode 100644
index d2c845080ab..00000000000
--- a/sysutils/roller/distinfo
+++ /dev/null
@@ -1,4 +0,0 @@
-$NetBSD: distinfo,v 1.6 2003/03/15 18:20:59 kim Exp $
-
-SHA1 (roller-1.13.tar.gz) = 5a662448a1025f3cfda485953474721cbec50adf
-Size (roller-1.13.tar.gz) = 29994 bytes
diff --git a/sysutils/rox-archive/DESCR b/sysutils/rox-archive/DESCR
deleted file mode 100644
index 223b4b6a2f2..00000000000
--- a/sysutils/rox-archive/DESCR
+++ /dev/null
@@ -1,2 +0,0 @@
-This is a simple ROX application for creating compressed tar files
-and for extracting various kinds of archive.
diff --git a/sysutils/rox-archive/Makefile b/sysutils/rox-archive/Makefile
deleted file mode 100644
index 36c93dbe341..00000000000
--- a/sysutils/rox-archive/Makefile
+++ /dev/null
@@ -1,38 +0,0 @@
-# $NetBSD: Makefile,v 1.5 2003/05/05 19:05:19 jmmv Exp $
-#
-
-DISTNAME= Archive-0.1.2
-PKGNAME= rox-archive-0.1.2
-PKGREVISION= 1
-WRKSRC= ${WRKDIR}/Archive
-CATEGORIES= sysutils
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=rox/}
-EXTRACT_SUFX= .tgz
-
-MAINTAINER= rxg@netbsd.org
-HOMEPAGE= http://rox.sourceforge.net/
-COMMENT= simple archiver
-
-# no real libraries there
-DEPENDS+= rox-lib>=0.1.4nb1:../../sysutils/rox-lib
-
-DIST_SUBDIR= rox
-
-USE_BUILDLINK2= yes
-USE_PERL5= yes
-
-NO_CONFIGURE= yes
-NO_BUILD= yes
-
-APPDIR= ${PREFIX}/share/rox
-
-post-patch:
- ${CP} ${WRKSRC}/AppRun ${WRKSRC}/AppRun.1
- ${SED} -e s:@APPDIR@:"${APPDIR}":g < ${WRKSRC}/AppRun.1 \
- > ${WRKSRC}/AppRun
- ${RM} ${WRKSRC}/AppRun.1 ${WRKSRC}/AppRun.orig
-
-do-install:
- ${CP} -Rf ${WRKSRC} ${APPDIR}
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/rox-archive/PLIST b/sysutils/rox-archive/PLIST
deleted file mode 100644
index c396e4c305e..00000000000
--- a/sysutils/rox-archive/PLIST
+++ /dev/null
@@ -1,7 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2002/06/15 13:23:08 cjep Exp $
-share/rox/Archive/AppIcon.xpm
-share/rox/Archive/AppRun
-share/rox/Archive/Help/COPYING
-share/rox/Archive/Help/README
-@dirrm share/rox/Archive/Help
-@dirrm share/rox/Archive
diff --git a/sysutils/rox-archive/distinfo b/sysutils/rox-archive/distinfo
deleted file mode 100644
index 774b06ec0c7..00000000000
--- a/sysutils/rox-archive/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.1.1.1 2002/06/15 13:23:08 cjep Exp $
-
-SHA1 (rox/Archive-0.1.2.tgz) = 0c0e3f81faa0f18a7d2af3502757dea5e4bac3a1
-Size (rox/Archive-0.1.2.tgz) = 11602 bytes
-SHA1 (patch-aa) = 2dea1b3f2950cbd8a4c41a3e806f6611cc408a04
diff --git a/sysutils/rox-archive/patches/patch-aa b/sysutils/rox-archive/patches/patch-aa
deleted file mode 100644
index ac194329b50..00000000000
--- a/sysutils/rox-archive/patches/patch-aa
+++ /dev/null
@@ -1,40 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2002/06/15 13:23:08 cjep Exp $
-
---- AppRun.orig Sun Jul 9 18:22:31 2000
-+++ AppRun
-@@ -30,6 +30,8 @@
- "Drop an archive onto me and I'll extract it.";
- }
-
-+$savebox = "@APPDIR@/ROX-Lib/bin/savebox";
-+
- $path = $ARGV[0];
-
- # Convert relative paths to absolute (we may chdir() later).
-@@ -65,7 +67,7 @@
-
- chdir $dir;
- system "tar cf - \"$leaf\" | gzip -c - | " .
-- "savebox -t application/x-compressed-tar \"$leaf.tgz\"";
-+ "$savebox -t application/x-compressed-tar \"$leaf.tgz\"";
- }
-
- sub unarchive {
-@@ -154,7 +156,7 @@
- }
- else {
- die unless $extract_stdout;
-- system "$extract_stdout | savebox -t text/plain \"$found\"";
-+ system "$extract_stdout | $savebox -t text/plain \"$found\"";
- }
- } else {
- die unless $extract;
-@@ -181,7 +183,7 @@
- my $leaf = shift;
- my $dir;
-
-- chop ($dir = `savebox -d \"$leaf\"`);
-+ chop ($dir = `$savebox -d \"$leaf\"`);
-
- return $dir if $dir;
-
diff --git a/sysutils/rox-base/DESCR b/sysutils/rox-base/DESCR
deleted file mode 100644
index 51d1ee50080..00000000000
--- a/sysutils/rox-base/DESCR
+++ /dev/null
@@ -1,7 +0,0 @@
-This package contains resources needed by several other applications,
-including ROX-Filer. It contains:
-
-- Rules for guessing a file's type from its extension.
- (eg, that the file 'something.gif' is of type 'image/gif')
-- Icons to represent the various types.
-- A few default programs to edit the various types.
diff --git a/sysutils/rox-base/MESSAGE b/sysutils/rox-base/MESSAGE
deleted file mode 100644
index c51940a05c7..00000000000
--- a/sysutils/rox-base/MESSAGE
+++ /dev/null
@@ -1,11 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE,v 1.3 2002/09/24 12:30:39 wiz Exp $
-
-You need to set CHOICESPATH variable to let other applications such
-as ROX-Filer can find the resources provided by rox-base. These resources
-need to be in a directory with user read/write access. For example:
-
- cp -R ${PREFIX}/share/rox/Choices ~/.RoxChoices
- setenv CHOICESPATH ~/.RoxChoices
-
-===========================================================================
diff --git a/sysutils/rox-base/Makefile b/sysutils/rox-base/Makefile
deleted file mode 100644
index 932cb54a188..00000000000
--- a/sysutils/rox-base/Makefile
+++ /dev/null
@@ -1,32 +0,0 @@
-# $NetBSD: Makefile,v 1.4 2003/01/28 22:04:18 jlam Exp $
-#
-
-DISTNAME= rox-base-1.0.2
-PKGREVISION= 1
-CATEGORIES= sysutils
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=rox/}
-EXTRACT_SUFX= .tgz
-
-MAINTAINER= rxg@netbsd.org
-HOMEPAGE= http://rox.sourceforge.net/
-COMMENT= Shared ROX resources
-
-DIST_SUBDIR= rox
-
-USE_BUILDLINK2= yes
-USE_PKGINSTALL= yes
-NO_CONFIGURE= yes
-NO_BUILD= yes
-
-OWN_DIRS= ${PREFIX}/libexec/rox
-
-post-extract:
- ${FIND} ${WRKSRC} -name CVS -print | ${XARGS} ${RM} -rf
-
-do-install:
- ${INSTALL_DATA_DIR} ${PREFIX}/share/rox
- ${INSTALL_PROGRAM_DIR} ${PREFIX}/libexec/rox
- ${CP} -Rf ${WRKSRC}/Choices ${PREFIX}/share/rox
- ${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/share/rox
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/rox-base/PLIST b/sysutils/rox-base/PLIST
deleted file mode 100644
index 557cf6cbc16..00000000000
--- a/sysutils/rox-base/PLIST
+++ /dev/null
@@ -1,50 +0,0 @@
-@comment $NetBSD: PLIST,v 1.3 2002/10/05 10:01:01 jlam Exp $
-share/rox/Choices/MIME-icons/application.xpm
-share/rox/Choices/MIME-icons/application_pdf.xpm
-share/rox/Choices/MIME-icons/application_postscript.xpm
-share/rox/Choices/MIME-icons/application_x-bzip-compressed-tar.xpm
-share/rox/Choices/MIME-icons/application_x-bzip.xpm
-share/rox/Choices/MIME-icons/application_x-class-file.xpm
-share/rox/Choices/MIME-icons/application_x-compressed-postscript.xpm
-share/rox/Choices/MIME-icons/application_x-compressed-tar.xpm
-share/rox/Choices/MIME-icons/application_x-deb.xpm
-share/rox/Choices/MIME-icons/application_x-gzip.xpm
-share/rox/Choices/MIME-icons/application_x-jar-file.xpm
-share/rox/Choices/MIME-icons/application_x-rpm.xpm
-share/rox/Choices/MIME-icons/application_x-staroffice.xpm
-share/rox/Choices/MIME-icons/application_x-tar.xpm
-share/rox/Choices/MIME-icons/application_x-tcl.xpm
-share/rox/Choices/MIME-icons/application_zip.xpm
-share/rox/Choices/MIME-icons/audio.xpm
-share/rox/Choices/MIME-icons/audio_x-mod.xpm
-share/rox/Choices/MIME-icons/font.xpm
-share/rox/Choices/MIME-icons/image.xpm
-share/rox/Choices/MIME-icons/image_gif.xpm
-share/rox/Choices/MIME-icons/image_jpeg.xpm
-share/rox/Choices/MIME-icons/image_x-xpixmap.xpm
-share/rox/Choices/MIME-icons/special_block-device.xpm
-share/rox/Choices/MIME-icons/special_char-device.xpm
-share/rox/Choices/MIME-icons/special_directory.xpm
-share/rox/Choices/MIME-icons/special_executable.xpm
-share/rox/Choices/MIME-icons/special_pipe.xpm
-share/rox/Choices/MIME-icons/special_socket.xpm
-share/rox/Choices/MIME-icons/text.xpm
-share/rox/Choices/MIME-icons/text_html.xpm
-share/rox/Choices/MIME-icons/text_plain.xpm
-share/rox/Choices/MIME-icons/text_x-C++.xpm
-share/rox/Choices/MIME-icons/text_x-c.xpm
-share/rox/Choices/MIME-icons/text_x-glade.xpm
-share/rox/Choices/MIME-icons/text_x-java.xpm
-share/rox/Choices/MIME-icons/text_x-lyx.xpm
-share/rox/Choices/MIME-icons/text_x-python.xpm
-share/rox/Choices/MIME-icons/video.xpm
-share/rox/Choices/MIME-icons/video_mpeg.xpm
-share/rox/Choices/MIME-info/Standard
-share/rox/Choices/MIME-info/gnome-vfs.mime
-share/rox/Choices/MIME-types/application_postscript
-share/rox/Choices/MIME-types/text
-@dirrm share/rox/Choices/MIME-types
-@dirrm share/rox/Choices/MIME-info
-@dirrm share/rox/Choices/MIME-icons
-@dirrm share/rox/Choices
-@dirrm share/rox
diff --git a/sysutils/rox-base/distinfo b/sysutils/rox-base/distinfo
deleted file mode 100644
index 13fa07e928e..00000000000
--- a/sysutils/rox-base/distinfo
+++ /dev/null
@@ -1,4 +0,0 @@
-$NetBSD: distinfo,v 1.1.1.1 2002/04/21 11:25:07 rh Exp $
-
-SHA1 (rox/rox-base-1.0.2.tgz) = 92fc6b6c04a7e8ce488b374fa3d80b3ae70ebcdc
-Size (rox/rox-base-1.0.2.tgz) = 266984 bytes
diff --git a/sysutils/rox-edit/DESCR b/sysutils/rox-edit/DESCR
deleted file mode 100644
index 6344b5bf16b..00000000000
--- a/sysutils/rox-edit/DESCR
+++ /dev/null
@@ -1,7 +0,0 @@
-ROX-Edit is an editor for the ROX environment.
-
-To start Edit, either click on its icon in a filer window or drag
-a file onto it.
-
-A window appears with a small tool bar and a text area showing the file.
-You can right-click on the window for a menu.
diff --git a/sysutils/rox-edit/Makefile b/sysutils/rox-edit/Makefile
deleted file mode 100644
index bb2b260aae6..00000000000
--- a/sysutils/rox-edit/Makefile
+++ /dev/null
@@ -1,40 +0,0 @@
-# $NetBSD: Makefile,v 1.7 2003/07/13 13:53:21 wiz Exp $
-#
-
-DISTNAME= Edit-0.1.2
-PKGNAME= rox-edit-0.1.2
-PKGREVISION= 2
-WRKSRC= ${WRKDIR}/Edit
-CATEGORIES= sysutils
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=rox/}
-EXTRACT_SUFX= .tgz
-
-MAINTAINER= rxg@netbsd.org
-HOMEPAGE= http://rox.sourceforge.net/
-COMMENT= simple text editor for ROX
-
-DEPENDS+= rox-lib>=0.1.4:../../sysutils/rox-lib
-
-DIST_SUBDIR= rox
-
-NO_CONFIGURE= yes
-NO_BUILD= yes
-USE_BUILDLINK2= yes
-
-PYTHON_PATCH_SCRIPTS= AppRun
-
-post-patch:
- ${SED} -e s:"/usr/local/lib":"${PREFIX}/share/rox":g \
- < ${WRKSRC}/findrox.py \
- > ${WRKSRC}/findrox.py.1
- ${MV} -f ${WRKSRC}/findrox.py.1 ${WRKSRC}/findrox.py
-
-pre-install:
- ${RM} -f ${WRKSRC}/AppRun.tmp
-
-do-install:
- ${CP} -Rf ${WRKSRC} ${PREFIX}/share/rox
-
-.include "../../lang/python/application.mk"
-.include "../../x11/pygtk/buildlink2.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/rox-edit/PLIST b/sysutils/rox-edit/PLIST
deleted file mode 100644
index 09ecfa8f013..00000000000
--- a/sysutils/rox-edit/PLIST
+++ /dev/null
@@ -1,16 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2002/06/01 20:11:45 cjep Exp $
-share/rox/Edit/AppIcon.xpm
-share/rox/Edit/AppInfo.xml
-share/rox/Edit/AppRun
-share/rox/Edit/EditWindow.py
-share/rox/Edit/Help/COPYING
-share/rox/Edit/Help/README
-share/rox/Edit/Options.xml
-share/rox/Edit/findrox.py
-share/rox/Edit/icons/Close.xpm
-share/rox/Edit/icons/Help.xpm
-share/rox/Edit/icons/Save.xpm
-share/rox/Edit/icons/Up.xpm
-@dirrm share/rox/Edit/icons
-@dirrm share/rox/Edit/Help
-@dirrm share/rox/Edit
diff --git a/sysutils/rox-edit/distinfo b/sysutils/rox-edit/distinfo
deleted file mode 100644
index 0be6c580448..00000000000
--- a/sysutils/rox-edit/distinfo
+++ /dev/null
@@ -1,4 +0,0 @@
-$NetBSD: distinfo,v 1.1.1.1 2002/06/01 20:11:45 cjep Exp $
-
-SHA1 (rox/Edit-0.1.2.tgz) = a2390e23de8dca1fc42b44c88d9608ea60bb6341
-Size (rox/Edit-0.1.2.tgz) = 12382 bytes
diff --git a/sysutils/rox-lib/DESCR b/sysutils/rox-lib/DESCR
deleted file mode 100644
index f9d36bc2a44..00000000000
--- a/sysutils/rox-lib/DESCR
+++ /dev/null
@@ -1,5 +0,0 @@
-There is quite a lot of code which is needed by many ROX applications -- for
-example: save boxes, multiple choice dialogs and tool bars.
-
-Keeping all this code in one place makes these programs smaller. It also
-makes programs which use it more consistent.
diff --git a/sysutils/rox-lib/MESSAGE b/sysutils/rox-lib/MESSAGE
deleted file mode 100644
index 45d9978fbf8..00000000000
--- a/sysutils/rox-lib/MESSAGE
+++ /dev/null
@@ -1,13 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE,v 1.3 2003/05/06 17:42:44 jmmv Exp $
-
-You can set the LIBDIRPATH variable to let other ROX applications
-know where to find ROX-Lib. For example:
-
- setenv LIBDIRPATH ${PREFIX}/share/rox/ROX-Lib
-
-You need to do this before you start the ROX-Filer. However, ROX
-applications installed from the NetBSD packages collection should find
-ROX-Lib correctly by default.
-
-===========================================================================
diff --git a/sysutils/rox-lib/Makefile b/sysutils/rox-lib/Makefile
deleted file mode 100644
index 56fa6f641de..00000000000
--- a/sysutils/rox-lib/Makefile
+++ /dev/null
@@ -1,41 +0,0 @@
-# $NetBSD: Makefile,v 1.7 2003/07/13 13:53:21 wiz Exp $
-#
-
-DISTNAME= ROX-Lib-0.1.4
-PKGNAME= rox-lib-0.1.4
-PKGREVISION= 2
-WRKSRC= ${WRKDIR}/ROX-Lib
-CATEGORIES= sysutils
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=rox/}
-EXTRACT_SUFX= .tgz
-
-MAINTAINER= rxg@netbsd.org
-HOMEPAGE= http://rox.sourceforge.net/
-COMMENT= Shared code for ROX applications
-
-DEPENDS+= rox>=1.2.0nb2:../../sysutils/rox
-
-DIST_SUBDIR= rox
-
-NO_CONFIGURE= yes
-NO_BUILD= yes
-USE_BUILDLINK2= yes
-
-PYTHON_PATCH_SCRIPTS= AppRun bin/savebox
-
-post-patch:
- ${SED} -e s:"/usr/local/lib":"${PREFIX}/share/rox":g \
- < ${WRKSRC}/Help/findrox.py \
- > ${WRKSRC}/Help/findrox.py.1
- ${MV} -f ${WRKSRC}/Help/findrox.py.1 ${WRKSRC}/Help/findrox.py
-
-pre-install:
- ${RM} -f ${WRKSRC}/AppRun.tmp
- ${RM} -f ${WRKSRC}/bin/savebox.tmp
-
-do-install:
- ${CP} -Rf ${WRKSRC} ${PREFIX}/share/rox
-
-.include "../../lang/python/application.mk"
-.include "../../x11/pygtk/buildlink2.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/rox-lib/PLIST b/sysutils/rox-lib/PLIST
deleted file mode 100644
index aea35c504fd..00000000000
--- a/sysutils/rox-lib/PLIST
+++ /dev/null
@@ -1,31 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2002/06/01 19:03:55 cjep Exp $
-share/rox/ROX-Lib/AppIcon.xpm
-share/rox/ROX-Lib/AppInfo.xml
-share/rox/ROX-Lib/AppRun
-share/rox/ROX-Lib/Help/Changes
-share/rox/ROX-Lib/Help/Options
-share/rox/ROX-Lib/Help/README
-share/rox/ROX-Lib/Help/findrox.py
-share/rox/ROX-Lib/Help/python
-share/rox/ROX-Lib/bin/savebox
-share/rox/ROX-Lib/python/rox/.cvsignore
-share/rox/ROX-Lib/python/rox/Menu.py
-share/rox/ROX-Lib/python/rox/MultipleChoice.py
-share/rox/ROX-Lib/python/rox/Options.py
-share/rox/ROX-Lib/python/rox/OptionsBox.py
-share/rox/ROX-Lib/python/rox/SaveArea.py
-share/rox/ROX-Lib/python/rox/SaveBox.py
-share/rox/ROX-Lib/python/rox/Toolbar.py
-share/rox/ROX-Lib/python/rox/XDSLoader.py
-share/rox/ROX-Lib/python/rox/__init__.py
-share/rox/ROX-Lib/python/rox/choices.py
-share/rox/ROX-Lib/python/rox/filer.py
-share/rox/ROX-Lib/python/rox/loader.py
-share/rox/ROX-Lib/python/rox/options.py
-share/rox/ROX-Lib/python/rox/support.py
-share/rox/ROX-Lib/python/rox/xml_loader.py
-@dirrm share/rox/ROX-Lib/python/rox
-@dirrm share/rox/ROX-Lib/python
-@dirrm share/rox/ROX-Lib/bin
-@dirrm share/rox/ROX-Lib/Help
-@dirrm share/rox/ROX-Lib
diff --git a/sysutils/rox-lib/distinfo b/sysutils/rox-lib/distinfo
deleted file mode 100644
index d3213f7e5aa..00000000000
--- a/sysutils/rox-lib/distinfo
+++ /dev/null
@@ -1,4 +0,0 @@
-$NetBSD: distinfo,v 1.1.1.1 2002/06/01 19:03:55 cjep Exp $
-
-SHA1 (rox/ROX-Lib-0.1.4.tgz) = 2c932be74fb16bed94ddf147aa0d1223dc790caa
-Size (rox/ROX-Lib-0.1.4.tgz) = 21962 bytes
diff --git a/sysutils/rox-memo/DESCR b/sysutils/rox-memo/DESCR
deleted file mode 100644
index cda3d9db97f..00000000000
--- a/sysutils/rox-memo/DESCR
+++ /dev/null
@@ -1,3 +0,0 @@
-Memo is a ROX application which you can use to store appointments and 'TODO'
-items. It displays the next few entries in a small window and can also be
-instructed to beep and bring up a window with a message later.
diff --git a/sysutils/rox-memo/Makefile b/sysutils/rox-memo/Makefile
deleted file mode 100644
index bd3230e01c3..00000000000
--- a/sysutils/rox-memo/Makefile
+++ /dev/null
@@ -1,40 +0,0 @@
-# $NetBSD: Makefile,v 1.7 2003/07/13 13:53:21 wiz Exp $
-#
-
-DISTNAME= Memo-1.0.0
-PKGNAME= rox-memo-1.0.0
-PKGREVISION= 2
-WRKSRC= ${WRKDIR}/Memo
-CATEGORIES= sysutils
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=rox/}
-EXTRACT_SUFX= .tgz
-
-MAINTAINER= rxg@netbsd.org
-HOMEPAGE= http://rox.sourceforge.net/
-COMMENT= Reminds you about things
-
-DEPENDS+= rox-lib>=0.1.4:../../sysutils/rox-lib
-
-DIST_SUBDIR= rox
-
-NO_CONFIGURE= yes
-NO_BUILD= yes
-USE_BUILDLINK2= yes
-
-PYTHON_PATCH_SCRIPTS= AppRun
-
-post-patch:
- ${SED} -e s:"/usr/local/lib":"${PREFIX}/share/rox":g \
- < ${WRKSRC}/findrox.py \
- > ${WRKSRC}/findrox.py.1
- ${MV} -f ${WRKSRC}/findrox.py.1 ${WRKSRC}/findrox.py
-
-pre-install:
- ${RM} -f ${WRKSRC}/AppRun.tmp
-
-do-install:
- ${CP} -Rf ${WRKSRC} ${PREFIX}/share/rox
-
-.include "../../lang/python/application.mk"
-.include "../../x11/pygtk/buildlink2.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/rox-memo/PLIST b/sysutils/rox-memo/PLIST
deleted file mode 100644
index 95a15a6d5bf..00000000000
--- a/sysutils/rox-memo/PLIST
+++ /dev/null
@@ -1,19 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2002/06/02 08:46:16 cjep Exp $
-share/rox/Memo/Alarm.py
-share/rox/Memo/AppIcon.xpm
-share/rox/Memo/AppInfo.xml
-share/rox/Memo/AppRun
-share/rox/Memo/Arrow.py
-share/rox/Memo/EditBox.py
-share/rox/Memo/Help/COPYING
-share/rox/Memo/Help/Changes
-share/rox/Memo/Help/README
-share/rox/Memo/Memo.py
-share/rox/Memo/TimeDisplay.py
-share/rox/Memo/choices.py
-share/rox/Memo/findrox.py
-share/rox/Memo/memos.py
-share/rox/Memo/menus.py
-share/rox/Memo/support.py
-@dirrm share/rox/Memo/Help
-@dirrm share/rox/Memo
diff --git a/sysutils/rox-memo/distinfo b/sysutils/rox-memo/distinfo
deleted file mode 100644
index 816e823aeca..00000000000
--- a/sysutils/rox-memo/distinfo
+++ /dev/null
@@ -1,4 +0,0 @@
-$NetBSD: distinfo,v 1.1.1.1 2002/06/02 08:46:16 cjep Exp $
-
-SHA1 (rox/Memo-1.0.0.tgz) = d5faf0e518050d394d8e7d994f131f1e199eacbf
-Size (rox/Memo-1.0.0.tgz) = 18429 bytes
diff --git a/sysutils/rox-session/DESCR b/sysutils/rox-session/DESCR
deleted file mode 100644
index 247bcd4a3a8..00000000000
--- a/sysutils/rox-session/DESCR
+++ /dev/null
@@ -1,6 +0,0 @@
-ROX-Session sets up your desktop when you log in, and starts any
-applications you ask it to. It allows you to set various preferences,
-such as the default font, cursor blinking and mouse behaviour.
-
-It also allows you to choose a window manager and change between window
-managers without logging out.
diff --git a/sysutils/rox-session/Makefile b/sysutils/rox-session/Makefile
deleted file mode 100644
index eb1dc42b092..00000000000
--- a/sysutils/rox-session/Makefile
+++ /dev/null
@@ -1,41 +0,0 @@
-# $NetBSD: Makefile,v 1.9 2003/07/13 13:53:22 wiz Exp $
-#
-
-DISTNAME= ROX-Session-0.1.14
-PKGNAME= rox-session-0.1.14
-PKGREVISION= 5
-WRKSRC= ${WRKDIR}/${DISTNAME}/ROX-Session/src
-CATEGORIES= sysutils
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=rox/}
-EXTRACT_SUFX= .tgz
-
-MAINTAINER= rxg@netbsd.org
-HOMEPAGE= http://rox.sourceforge.net/
-COMMENT= very simple session manager
-
-DEPENDS+= rox>=1.2.0nb2:../../sysutils/rox
-
-DIST_SUBDIR= rox
-
-USE_BUILDLINK2= yes
-GNU_CONFIGURE= yes
-USE_X11= yes
-
-post-build:
- ${MV} ${WRKSRC} ${WRKDIR}/${DISTNAME}/src
-
-pre-install:
- ${RM} -f ${WRKDIR}/${DISTNAME}/ROX-Session/AppRun.orig
- ${RM} -rf ${WRKSRC}
-
-do-install:
- ${INSTALL_PROGRAM} ${WRKDIR}/${DISTNAME}/src/ROX-Session \
- ${PREFIX}/libexec/rox
- ${CP} -Rf ${WRKDIR}/${DISTNAME}/ROX-Session ${PREFIX}/share/rox
- ${SED} -e "s:@PREFIX@:"${PREFIX}":g" \
- < ${WRKDIR}/${DISTNAME}/ROX-Session/AppRun \
- > ${PREFIX}/share/rox/ROX-Session/AppRun
-
-.include "../../textproc/libxml2/buildlink2.mk"
-.include "../../x11/gtk2/buildlink2.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/rox-session/PLIST b/sysutils/rox-session/PLIST
deleted file mode 100644
index 5976099dce3..00000000000
--- a/sysutils/rox-session/PLIST
+++ /dev/null
@@ -1,16 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2002/05/26 20:22:07 cjep Exp $
-share/rox/ROX-Session/AppIcon.xpm
-share/rox/ROX-Session/AppInfo.xml
-share/rox/ROX-Session/AppRun
-share/rox/ROX-Session/Help/COPYING
-share/rox/ROX-Session/Help/Changes
-share/rox/ROX-Session/Help/README
-share/rox/ROX-Session/Login
-share/rox/ROX-Session/MakeDefault.sh
-share/rox/ROX-Session/Options.xml
-libexec/rox/ROX-Session
-share/rox/ROX-Session/Setup
-share/rox/ROX-Session/Styles
-share/rox/ROX-Session/WindowMans
-@dirrm share/rox/ROX-Session/Help
-@dirrm share/rox/ROX-Session
diff --git a/sysutils/rox-session/distinfo b/sysutils/rox-session/distinfo
deleted file mode 100644
index 09f85ab490c..00000000000
--- a/sysutils/rox-session/distinfo
+++ /dev/null
@@ -1,8 +0,0 @@
-$NetBSD: distinfo,v 1.2 2002/10/05 03:08:45 wiz Exp $
-
-SHA1 (rox/ROX-Session-0.1.14.tgz) = c92a2877b73ccd7b8a7af04335b39e4b7ba9ff12
-Size (rox/ROX-Session-0.1.14.tgz) = 57818 bytes
-SHA1 (patch-aa) = 6db63c5b565846a5ec910dbf0bfc1ac6689b6509
-SHA1 (patch-ab) = b3230cd78f54cd5e19c723cfdedcf3e2661d34ef
-SHA1 (patch-ac) = 69ebb08b32fd6c83c0a2b57e6eff7903acc03830
-SHA1 (patch-ad) = f63c0543ffde43ceaa7e3692a5bab8b8430b1023
diff --git a/sysutils/rox-session/patches/patch-aa b/sysutils/rox-session/patches/patch-aa
deleted file mode 100644
index b0f4b3a4f47..00000000000
--- a/sysutils/rox-session/patches/patch-aa
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2002/05/26 20:22:07 cjep Exp $
-
---- configure.orig Sun May 26 12:06:50 2002
-+++ configure
-@@ -530,18 +530,6 @@
- # Check whether --with-platform or --without-platform was given.
- if test "${with_platform+set}" = set; then
- withval="$with_platform"
--
--else
--
--{ echo "configure: error:
--
--Please do not run 'configure' manually - instead, run the AppRun script with
--the --compile option, like this:
-- $ ROX-Session/AppRun --compile
--
--Thank you.
--" 1>&2; exit 1; }
--
- fi
-
-
diff --git a/sysutils/rox-session/patches/patch-ab b/sysutils/rox-session/patches/patch-ab
deleted file mode 100644
index 7086d4a8197..00000000000
--- a/sysutils/rox-session/patches/patch-ab
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ab,v 1.2 2002/10/05 03:08:45 wiz Exp $
-
---- Makefile.in.orig Sat Mar 2 01:42:12 2002
-+++ Makefile.in
-@@ -21,6 +21,9 @@
- wm.o xsettings-common.o xsettings-manager.o
-
- ############ Things to keep the same
-+
-+all: ${OBJECTS}
-+ ${CC} -o ${PROG} ${OBJECTS} ${LDFLAGS}
-
- ${EXEC}: ${PLATFORM_DIR} ${OBJECTS}
- ${CC} -o ${EXEC} ${OBJECTS} ${LDFLAGS}
diff --git a/sysutils/rox-session/patches/patch-ac b/sysutils/rox-session/patches/patch-ac
deleted file mode 100644
index 3111dd17964..00000000000
--- a/sysutils/rox-session/patches/patch-ac
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ac,v 1.1.1.1 2002/05/26 20:22:07 cjep Exp $
-
---- session.c.orig Sun May 26 12:25:58 2002
-+++ session.c
-@@ -25,6 +25,7 @@
- #include <sys/wait.h>
- #include <fcntl.h>
- #include <ctype.h>
-+#include <signal.h>
-
- #include <gdk/gdkx.h>
- #include <gtk/gtk.h>
diff --git a/sysutils/rox-session/patches/patch-ad b/sysutils/rox-session/patches/patch-ad
deleted file mode 100644
index 9d7bdee320c..00000000000
--- a/sysutils/rox-session/patches/patch-ad
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ad,v 1.1.1.1 2002/05/26 20:22:07 cjep Exp $
-
---- ../AppRun.orig Sun May 26 13:02:42 2002
-+++ ../AppRun
-@@ -40,7 +40,7 @@
- exit 1
- esac
-
--BIN="$APP_DIR/$PLATFORM/$PROG"
-+BIN="@PREFIX@/libexec/rox/$PROG"
-
- if [ -x "$BIN" ]; then
- exec $DEBUGGER "$BIN" "$@"
diff --git a/sysutils/rox-system/DESCR b/sysutils/rox-system/DESCR
deleted file mode 100644
index 3475937b1c2..00000000000
--- a/sysutils/rox-system/DESCR
+++ /dev/null
@@ -1,2 +0,0 @@
-System displays information about your system - what processes are running
-and the amount of memory they are using, as well as free and used disk space.
diff --git a/sysutils/rox-system/Makefile b/sysutils/rox-system/Makefile
deleted file mode 100644
index 3a06f6c9787..00000000000
--- a/sysutils/rox-system/Makefile
+++ /dev/null
@@ -1,40 +0,0 @@
-# $NetBSD: Makefile,v 1.6 2003/07/13 13:53:22 wiz Exp $
-#
-
-DISTNAME= System-0.1.2
-PKGNAME= rox-system-0.1.2
-PKGREVISION= 2
-WRKSRC= ${WRKDIR}/System/src
-CATEGORIES= misc
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=rox/}
-EXTRACT_SUFX= .tgz
-
-MAINTAINER= rxg@netbsd.org
-HOMEPAGE= http://rox.sourceforge.net/
-COMMENT= simple system monitor
-
-DEPENDS+= rox>=1.2.0nb2:../../sysutils/rox
-
-DIST_SUBDIR= rox
-
-USE_BUILDLINK2= yes
-GNU_CONFIGURE= yes
-
-APPDIR= ${PREFIX}/share/rox
-
-post-patch:
- ${CP} ${WRKDIR}/System/AppRun ${WRKDIR}
- ${SED} -e "s:"\$$APP_DIR/\$$PLATFORM":${PREFIX}/libexec/rox:g" < \
- ${WRKDIR}/AppRun > ${WRKDIR}/System/AppRun
-
-post-build:
- ${MV} ${WRKSRC} ${WRKDIR}
-
-do-install:
- ${INSTALL_PROGRAM} ${WRKDIR}/src/System ${PREFIX}/libexec/rox
- ${CP} -Rf ${WRKDIR}/System ${APPDIR}
-
-.include "../../devel/libgtop/buildlink2.mk"
-.include "../../x11/gnome-libs/buildlink2.mk"
-.include "../../x11/gtk/buildlink2.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/rox-system/PLIST b/sysutils/rox-system/PLIST
deleted file mode 100644
index 44dcd4670fb..00000000000
--- a/sysutils/rox-system/PLIST
+++ /dev/null
@@ -1,10 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2002/06/04 17:47:58 cjep Exp $
-libexec/rox/System
-share/rox/System/AppIcon.xpm
-share/rox/System/AppInfo.xml
-share/rox/System/AppRun
-share/rox/System/Help/COPYING
-share/rox/System/Help/Changes
-share/rox/System/Help/README
-@dirrm share/rox/System/Help
-@dirrm share/rox/System
diff --git a/sysutils/rox-system/distinfo b/sysutils/rox-system/distinfo
deleted file mode 100644
index 853f226aa46..00000000000
--- a/sysutils/rox-system/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.2 2002/10/13 12:14:08 wiz Exp $
-
-SHA1 (rox/System-0.1.2.tgz) = aafe4e16e5f689c009785f3dee47339ca34c369d
-Size (rox/System-0.1.2.tgz) = 44875 bytes
-SHA1 (patch-aa) = 2bcca73b001805a2114138ce8dff1e7568bcefa4
-SHA1 (patch-ab) = dd03ab528d6334e576071754fd0bd356231747a2
diff --git a/sysutils/rox-system/patches/patch-aa b/sysutils/rox-system/patches/patch-aa
deleted file mode 100644
index 8c21c87c0e1..00000000000
--- a/sysutils/rox-system/patches/patch-aa
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2002/06/04 17:47:58 cjep Exp $
-
---- Makefile.in.orig Tue May 28 09:58:22 2002
-+++ Makefile.in
-@@ -21,6 +21,9 @@
-
- ############ Things to keep the same
-
-+all: ${OBJECTS}
-+ ${CC} -o ${PROG} ${OBJECTS} ${LDFLAGS}
-+
- ${EXEC}: ${PLATFORM_DIR} ${OBJECTS}
- ${CC} -o ${EXEC} ${OBJECTS} ${LDFLAGS}
-
diff --git a/sysutils/rox-system/patches/patch-ab b/sysutils/rox-system/patches/patch-ab
deleted file mode 100644
index 3c1a2311918..00000000000
--- a/sysutils/rox-system/patches/patch-ab
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ab,v 1.2 2002/10/13 12:14:09 wiz Exp $
-
---- configure.orig Tue May 28 10:54:40 2002
-+++ configure
-@@ -784,9 +784,6 @@
- esac
- fi
-
--if test -z "$PKG_CONFIG"; then
-- PKG_CONFIG=pkg-config
--fi
-
-
- echo $ac_n "checking for Gtk+-2.0""... $ac_c" 1>&6
diff --git a/sysutils/rox-wallpaper/DESCR b/sysutils/rox-wallpaper/DESCR
deleted file mode 100644
index 186d2a53507..00000000000
--- a/sysutils/rox-wallpaper/DESCR
+++ /dev/null
@@ -1,4 +0,0 @@
-This ROX application can be used to place an image on your desktop
-background. You can drag an image onto the Wallpaper icon to set that
-image as the desktop background directly, or you can click on the
-Wallpaper icon to set things up for automatic use.
diff --git a/sysutils/rox-wallpaper/Makefile b/sysutils/rox-wallpaper/Makefile
deleted file mode 100644
index f687e3c3dc2..00000000000
--- a/sysutils/rox-wallpaper/Makefile
+++ /dev/null
@@ -1,41 +0,0 @@
-# $NetBSD: Makefile,v 1.7 2003/07/13 13:53:22 wiz Exp $
-#
-
-DISTNAME= Wallpaper-0.1.1
-PKGNAME= rox-wallpaper-0.1.1
-PKGREVISION= 2
-WRKSRC= ${WRKDIR}/Wallpaper
-CATEGORIES= sysutils
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=rox/}
-EXTRACT_SUFX= .tgz
-
-MAINTAINER= rxg@netbsd.org
-HOMEPAGE= http://rox.sourceforge.net/
-COMMENT= For setting the backdrop
-
-DEPENDS+= rox-lib>=0.1.4:../../sysutils/rox-lib
-DEPENDS+= ImageMagick>=5.3.9:../../graphics/ImageMagick
-
-DIST_SUBDIR= rox
-
-NO_CONFIGURE= yes
-NO_BUILD= yes
-USE_BUILDLINK2= yes
-
-PYTHON_PATCH_SCRIPTS= AppRun
-
-post-patch:
- ${SED} -e s:"/usr/local/lib":"${PREFIX}/share/rox":g \
- < ${WRKSRC}/findrox.py \
- > ${WRKSRC}/findrox.py.1
- ${MV} -f ${WRKSRC}/findrox.py.1 ${WRKSRC}/findrox.py
-
-pre-install:
- ${RM} -f ${WRKSRC}/AppRun.tmp
-
-do-install:
- ${CP} -Rf ${WRKSRC} ${PREFIX}/share/rox
-
-.include "../../lang/python/application.mk"
-.include "../../x11/pygtk/buildlink2.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/rox-wallpaper/PLIST b/sysutils/rox-wallpaper/PLIST
deleted file mode 100644
index 6a0980a88cc..00000000000
--- a/sysutils/rox-wallpaper/PLIST
+++ /dev/null
@@ -1,12 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2002/06/02 08:51:44 cjep Exp $
-share/rox/Wallpaper/AppIcon.xpm
-share/rox/Wallpaper/AppInfo.xml
-share/rox/Wallpaper/AppRun
-share/rox/Wallpaper/AutoStart.py
-share/rox/Wallpaper/Help/COPYING
-share/rox/Wallpaper/Help/README
-share/rox/Wallpaper/display.py
-share/rox/Wallpaper/findrox.py
-share/rox/Wallpaper/no_display.py
-@dirrm share/rox/Wallpaper/Help
-@dirrm share/rox/Wallpaper
diff --git a/sysutils/rox-wallpaper/distinfo b/sysutils/rox-wallpaper/distinfo
deleted file mode 100644
index d926b79298c..00000000000
--- a/sysutils/rox-wallpaper/distinfo
+++ /dev/null
@@ -1,4 +0,0 @@
-$NetBSD: distinfo,v 1.1.1.1 2002/06/02 08:51:44 cjep Exp $
-
-SHA1 (rox/Wallpaper-0.1.1.tgz) = 344a909bf16bad6fb52b85fab064eff66fbd33a8
-Size (rox/Wallpaper-0.1.1.tgz) = 13007 bytes
diff --git a/sysutils/rox-wrappers/DESCR b/sysutils/rox-wrappers/DESCR
deleted file mode 100644
index 112272ef08f..00000000000
--- a/sysutils/rox-wrappers/DESCR
+++ /dev/null
@@ -1,13 +0,0 @@
-Here are some example wrapper applications for rox.
-
-Click on them to run them. Note that you must have the full program
-already installed - if you haven't got Netscape then the Netscape wrapper
-won't work, etc!
-
-You can drag these to your panel or pinboard to add them, and you can drag
-files to them.
-
-Some of these wrappers can run various different commands - for example,
-Lock can either use xlock or xscreensaver. To change the command used,
-load the AppRun script in the Lock directory into Edit and move the hash
-(#) mark to the other line (lines beginning with # are ignored).
diff --git a/sysutils/rox-wrappers/Makefile b/sysutils/rox-wrappers/Makefile
deleted file mode 100644
index 5b079b4dab3..00000000000
--- a/sysutils/rox-wrappers/Makefile
+++ /dev/null
@@ -1,27 +0,0 @@
-# $NetBSD: Makefile,v 1.4 2003/05/02 11:56:29 wiz Exp $
-#
-
-DISTNAME= Wrappers-1.0.2
-PKGNAME= rox-wrappers-1.0.2
-PKGREVISION= 2
-WRKSRC= ${WRKDIR}/Wrappers
-CATEGORIES= sysutils
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=rox/}
-EXTRACT_SUFX= .tgz
-
-MAINTAINER= rxg@netbsd.org
-HOMEPAGE= http://rox.sourceforge.net/
-COMMENT= some example Wrapper applications
-
-DEPENDS+= rox>=1.2.0nb5:../../sysutils/rox
-
-DIST_SUBDIR= rox
-
-NO_CONFIGURE= yes
-NO_BUILD= yes
-
-do-install:
- ${RM} -f ${WRKSRC}/Emacs/AppRun.orig
- ${CP} -Rf ${WRKSRC} ${PREFIX}/share/rox
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/rox-wrappers/PLIST b/sysutils/rox-wrappers/PLIST
deleted file mode 100644
index 326552806d2..00000000000
--- a/sysutils/rox-wrappers/PLIST
+++ /dev/null
@@ -1,77 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2002/06/01 19:56:30 cjep Exp $
-share/rox/Wrappers/AbiWord/AppIcon.xpm
-share/rox/Wrappers/AbiWord/AppInfo.xml
-share/rox/Wrappers/AbiWord/AppRun
-share/rox/Wrappers/Emacs/AppIcon.xpm
-share/rox/Wrappers/Emacs/AppInfo.xml
-share/rox/Wrappers/Emacs/AppRun
-share/rox/Wrappers/Emacs/Config
-share/rox/Wrappers/GMix/AppIcon.xpm
-share/rox/Wrappers/GMix/AppInfo.xml
-share/rox/Wrappers/GMix/AppRun
-share/rox/Wrappers/GQView/AppIcon.xpm
-share/rox/Wrappers/GQView/AppInfo.xml
-share/rox/Wrappers/GQView/AppRun
-share/rox/Wrappers/Galeon/AppIcon.xpm
-share/rox/Wrappers/Galeon/AppInfo.xml
-share/rox/Wrappers/Galeon/AppRun
-share/rox/Wrappers/GhostView/AppIcon.xpm
-share/rox/Wrappers/GhostView/AppInfo.xml
-share/rox/Wrappers/GhostView/AppRun
-share/rox/Wrappers/Gimp/AppIcon.xpm
-share/rox/Wrappers/Gimp/AppInfo.xml
-share/rox/Wrappers/Gimp/AppRun
-share/rox/Wrappers/Gnumeric/AppIcon.xpm
-share/rox/Wrappers/Gnumeric/AppInfo.xml
-share/rox/Wrappers/Gnumeric/AppRun
-share/rox/Wrappers/Lock/AppIcon.xpm
-share/rox/Wrappers/Lock/AppInfo.xml
-share/rox/Wrappers/Lock/AppRun
-share/rox/Wrappers/Lyx/AppIcon.xpm
-share/rox/Wrappers/Lyx/AppInfo.xml
-share/rox/Wrappers/Lyx/AppRun
-share/rox/Wrappers/Mozilla/AppIcon.xpm
-share/rox/Wrappers/Mozilla/AppInfo.xml
-share/rox/Wrappers/Mozilla/AppRun
-share/rox/Wrappers/Netscape/.AppRun.swp
-share/rox/Wrappers/Netscape/AppIcon.xpm
-share/rox/Wrappers/Netscape/AppInfo.xml
-share/rox/Wrappers/Netscape/AppRun
-share/rox/Wrappers/README
-share/rox/Wrappers/Spruce/AppIcon.xpm
-share/rox/Wrappers/Spruce/AppInfo.xml
-share/rox/Wrappers/Spruce/AppRun
-share/rox/Wrappers/TCD/AppIcon.xpm
-share/rox/Wrappers/TCD/AppInfo.xml
-share/rox/Wrappers/TCD/AppRun
-share/rox/Wrappers/Terminal/AppIcon.xpm
-share/rox/Wrappers/Terminal/AppInfo.xml
-share/rox/Wrappers/Terminal/AppRun
-share/rox/Wrappers/Vim/AppIcon.xpm
-share/rox/Wrappers/Vim/AppInfo.xml
-share/rox/Wrappers/Vim/AppRun
-share/rox/Wrappers/XMMS/AppIcon.xpm
-share/rox/Wrappers/XMMS/AppInfo.xml
-share/rox/Wrappers/XMMS/AppRun
-share/rox/Wrappers/XPaint/AppIcon.xpm
-share/rox/Wrappers/XPaint/AppInfo.xml
-share/rox/Wrappers/XPaint/AppRun
-@dirrm share/rox/Wrappers/XPaint
-@dirrm share/rox/Wrappers/XMMS
-@dirrm share/rox/Wrappers/Vim
-@dirrm share/rox/Wrappers/Terminal
-@dirrm share/rox/Wrappers/TCD
-@dirrm share/rox/Wrappers/Spruce
-@dirrm share/rox/Wrappers/Netscape
-@dirrm share/rox/Wrappers/Mozilla
-@dirrm share/rox/Wrappers/Lyx
-@dirrm share/rox/Wrappers/Lock
-@dirrm share/rox/Wrappers/Gnumeric
-@dirrm share/rox/Wrappers/Gimp
-@dirrm share/rox/Wrappers/GhostView
-@dirrm share/rox/Wrappers/Galeon
-@dirrm share/rox/Wrappers/GQView
-@dirrm share/rox/Wrappers/GMix
-@dirrm share/rox/Wrappers/Emacs
-@dirrm share/rox/Wrappers/AbiWord
-@dirrm share/rox/Wrappers
diff --git a/sysutils/rox-wrappers/distinfo b/sysutils/rox-wrappers/distinfo
deleted file mode 100644
index 8e5173c1e61..00000000000
--- a/sysutils/rox-wrappers/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.1.1.1 2002/05/26 17:22:48 cjep Exp $
-
-SHA1 (rox/Wrappers-1.0.2.tgz) = 2178bcc56eebb54b3033bf690b187c7cc0cd49d2
-Size (rox/Wrappers-1.0.2.tgz) = 68517 bytes
-SHA1 (patch-aa) = 78b70a1bab2b3778ac6fbd16eaea8d58e36e4df8
diff --git a/sysutils/rox-wrappers/patches/patch-aa b/sysutils/rox-wrappers/patches/patch-aa
deleted file mode 100644
index cdd2406a010..00000000000
--- a/sysutils/rox-wrappers/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2002/05/26 17:22:48 cjep Exp $
-
---- Emacs/AppRun.orig Sun Oct 22 23:16:51 2000
-+++ Emacs/AppRun
-@@ -3,7 +3,7 @@
- # If necessary, emacs is started
- . `dirname $0`/Config
- echo USE_CLIENT=$USE_CLIENT
--function start_emacs {
-+start_emacs() {
- local start_server
- [ -z "$USE_CLIENT" ] || start_server="-eval '(server-start)'"
- eval emacs $start_server $@
diff --git a/sysutils/rox/DESCR b/sysutils/rox/DESCR
deleted file mode 100644
index 7c74afa2a48..00000000000
--- a/sysutils/rox/DESCR
+++ /dev/null
@@ -1,3 +0,0 @@
-ROX-Filer is a simple and easy to use graphical file manager for X11, the
-windowing system used on Unix and Unix-like operating systems. It is also
-the core component of the ROX Desktop.
diff --git a/sysutils/rox/MESSAGE b/sysutils/rox/MESSAGE
deleted file mode 100644
index 521aa6083b4..00000000000
--- a/sysutils/rox/MESSAGE
+++ /dev/null
@@ -1,12 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE,v 1.3 2003/05/06 17:42:45 jmmv Exp $
-
-Please note the following when running the rox(1) command that comes with
-this package. If the environment variable CHOICESPATH is unset, then the
-package will automatically set up a directory called .RoxChoices in your
-home directory containing defaults from ${PREFIX}/share/rox/Choices and
-will set CHOICESPATH appropriately.
-
-Rox applications can be found in ${PREFIX}/share/rox.
-
-===========================================================================
diff --git a/sysutils/rox/Makefile b/sysutils/rox/Makefile
deleted file mode 100644
index afd09d3bc7a..00000000000
--- a/sysutils/rox/Makefile
+++ /dev/null
@@ -1,50 +0,0 @@
-# $NetBSD: Makefile,v 1.12 2003/07/13 13:53:23 wiz Exp $
-#
-
-DISTNAME= rox-1.2.0
-PKGREVISION= 6
-WRKSRC= ${WRKDIR}/${DISTNAME}/ROX-Filer/src
-CATEGORIES= sysutils
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=rox/}
-EXTRACT_SUFX= .tgz
-
-MAINTAINER= rxg@netbsd.org
-HOMEPAGE= http://rox.sourceforge.net/
-COMMENT= RISC OS-like filer for X
-
-DEPENDS+= rox-base>=1.0.2nb1:../../sysutils/rox-base
-
-DIST_SUBDIR= rox
-
-USE_BUILDLINK2= yes
-USE_X11= yes
-GNU_CONFIGURE= yes
-CONFIGURE_ARGS+= --with-gtk2
-CPPFLAGS+= -I${BUILDLINK_PREFIX.libxml2}/include/libxml2/libxml
-
-post-patch:
- ${SED} -e "s:@PREFIX@:"${PREFIX}":g" < ${FILESDIR}/rox > \
- ${WRKDIR}/${DISTNAME}/rox
-
-post-build:
- ${MV} ${WRKSRC} ${WRKDIR}/${DISTNAME}/src
-
-pre-install:
- ${RM} -f ${WRKDIR}/${DISTNAME}/ROX-Filer/AppRun.orig
- ${RM} -rf ${WRKSRC}
-
-do-install:
- ${INSTALL_PROGRAM_DIR} ${PREFIX}/libexec/rox
- ${INSTALL_PROGRAM} ${WRKDIR}/${DISTNAME}/src/ROX-Filer \
- ${PREFIX}/libexec/rox
- ${INSTALL_DATA_DIR} ${PREFIX}/share/rox/ROX-Filer
- cd ${WRKDIR}/${DISTNAME}/ROX-Filer && ${PAX} -rw . ${PREFIX}/share/rox/ROX-Filer
- ${SED} -e "s:@PREFIX@:"${PREFIX}":g" < \
- ${WRKDIR}/${DISTNAME}/ROX-Filer/AppRun > \
- ${PREFIX}/share/rox/ROX-Filer/AppRun
- ${INSTALL_SCRIPT} ${WRKDIR}/${DISTNAME}/rox ${PREFIX}/bin
- ${INSTALL_MAN} ${WRKDIR}/${DISTNAME}/rox.1 ${PREFIX}/man/man1
-
-.include "../../textproc/libxml2/buildlink2.mk"
-.include "../../x11/gtk2/buildlink2.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/rox/PLIST b/sysutils/rox/PLIST
deleted file mode 100644
index ccfd97064f1..00000000000
--- a/sysutils/rox/PLIST
+++ /dev/null
@@ -1,47 +0,0 @@
-@comment $NetBSD: PLIST,v 1.3 2002/06/01 18:25:46 cjep Exp $
-bin/rox
-man/man1/rox.1
-libexec/rox/ROX-Filer
-share/rox/ROX-Filer/Action.png
-share/rox/ROX-Filer/AppIcon.xpm
-share/rox/ROX-Filer/AppInfo.xml
-share/rox/ROX-Filer/AppRun
-share/rox/ROX-Filer/Help/COPYING
-share/rox/ROX-Filer/Help/Changes
-share/rox/ROX-Filer/Help/Manual-fr.html
-share/rox/ROX-Filer/Help/Manual.html
-share/rox/ROX-Filer/Help/README
-share/rox/ROX-Filer/Help/README-es
-share/rox/ROX-Filer/Help/TODO
-share/rox/ROX-Filer/Messages/README
-share/rox/ROX-Filer/Messages/de.gmo
-share/rox/ROX-Filer/Messages/fr.gmo
-share/rox/ROX-Filer/Messages/hu.gmo
-share/rox/ROX-Filer/Messages/it.gmo
-share/rox/ROX-Filer/Messages/nl.gmo
-share/rox/ROX-Filer/Messages/pl.gmo
-share/rox/ROX-Filer/Messages/ru.gmo
-share/rox/ROX-Filer/Messages/sp.gmo
-share/rox/ROX-Filer/Options.xml
-share/rox/ROX-Filer/Styles
-share/rox/ROX-Filer/pixmaps/application.xpm
-share/rox/ROX-Filer/pixmaps/close.xpm
-share/rox/ROX-Filer/pixmaps/details.xpm
-share/rox/ROX-Filer/pixmaps/dirs.xpm
-share/rox/ROX-Filer/pixmaps/error.xpm
-share/rox/ROX-Filer/pixmaps/help.xpm
-share/rox/ROX-Filer/pixmaps/hidden.xpm
-share/rox/ROX-Filer/pixmaps/home.xpm
-share/rox/ROX-Filer/pixmaps/mount.xpm
-share/rox/ROX-Filer/pixmaps/mounted.xpm
-share/rox/ROX-Filer/pixmaps/multiple.xpm
-share/rox/ROX-Filer/pixmaps/refresh.xpm
-share/rox/ROX-Filer/pixmaps/symlink.xpm
-share/rox/ROX-Filer/pixmaps/unknown.xpm
-share/rox/ROX-Filer/pixmaps/up.xpm
-share/rox/ROX-Filer/pixmaps/zoom.xpm
-share/rox/ROX-Filer/style.css
-@dirrm share/rox/ROX-Filer/pixmaps
-@dirrm share/rox/ROX-Filer/Messages
-@dirrm share/rox/ROX-Filer/Help
-@dirrm share/rox/ROX-Filer
diff --git a/sysutils/rox/distinfo b/sysutils/rox/distinfo
deleted file mode 100644
index 518854fdd0c..00000000000
--- a/sysutils/rox/distinfo
+++ /dev/null
@@ -1,8 +0,0 @@
-$NetBSD: distinfo,v 1.3 2002/10/05 01:20:45 wiz Exp $
-
-SHA1 (rox/rox-1.2.0.tgz) = 704301a6006920ff339e847aacb4bbdab7ee51a4
-Size (rox/rox-1.2.0.tgz) = 847897 bytes
-SHA1 (patch-aa) = 476bfa40012e9d43c0c577f69b552873bf56cc34
-SHA1 (patch-ab) = dc9d4996b383563b8a5776f86fff1e8e97569f12
-SHA1 (patch-ac) = 3f60bcd1693ed66aa752d28ee2d8e0a82aeaa8de
-SHA1 (patch-ad) = 805f609ad0b54c344a96bfc3a467541c21723023
diff --git a/sysutils/rox/files/rox b/sysutils/rox/files/rox
deleted file mode 100644
index 0f98caf6fe2..00000000000
--- a/sysutils/rox/files/rox
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/sh
-#
-# $NetBSD: rox,v 1.2 2002/06/01 18:25:46 cjep Exp $
-#
-
-# The user's Choices directory
-ROX_CHOICES_DIR="$HOME/.RoxChoices"
-
-#
-# If CHOICESPATH is not set, then check to see whether the user has
-# a $ROX_CHOICES_DIR directory. If they haven't, set one up.
-#
-if [ -z "$CHOICESPATH" ]; then
- [ ! -d "$ROX_CHOICES_DIR" ] && \
- cp -R @PREFIX@/share/rox/Choices "$ROX_CHOICES_DIR";
- export CHOICESPATH="$ROX_CHOICES_DIR";
-fi
-
-# Run the ROX-Filer application
-exec @PREFIX@/share/rox/ROX-Filer/AppRun "$@"
diff --git a/sysutils/rox/patches/patch-aa b/sysutils/rox/patches/patch-aa
deleted file mode 100644
index 7b160762b17..00000000000
--- a/sysutils/rox/patches/patch-aa
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2002/04/21 11:28:17 rh Exp $
-
---- configure.orig Thu Apr 11 18:37:41 2002
-+++ configure
-@@ -534,18 +534,6 @@
- # Check whether --with-platform or --without-platform was given.
- if test "${with_platform+set}" = set; then
- withval="$with_platform"
--
--else
--
--{ echo "configure: error:
--
--Please do not run 'configure' manually - instead, run the AppRun script with
--the --compile option, like this:
-- $ ROX-Filer/AppRun --compile
--
--Thank you.
--" 1>&2; exit 1; }
--
- fi
-
-
diff --git a/sysutils/rox/patches/patch-ab b/sysutils/rox/patches/patch-ab
deleted file mode 100644
index a2a077cae63..00000000000
--- a/sysutils/rox/patches/patch-ab
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 2002/04/21 11:28:17 rh Exp $
-
---- Makefile.in.orig Thu Apr 11 18:53:01 2002
-+++ Makefile.in
-@@ -36,6 +36,9 @@
-
- ############ Things to keep the same
-
-+all: ${OBJECTS}
-+ ${CC} -o ${PROG} ${OBJECTS} ${LDFLAGS}
-+
- ${EXEC}: ${PLATFORM_DIR} ${OBJECTS}
- ${CC} -o ${EXEC} ${OBJECTS} ${LDFLAGS}
-
diff --git a/sysutils/rox/patches/patch-ac b/sysutils/rox/patches/patch-ac
deleted file mode 100644
index 4cebbe7ac5a..00000000000
--- a/sysutils/rox/patches/patch-ac
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ac,v 1.2 2002/05/26 19:45:44 cjep Exp $
---- ../AppRun.orig Sun May 26 16:30:50 2002
-+++ ../AppRun Sun May 26 16:34:31 2002
-@@ -39,7 +39,7 @@
- exit 1
- esac
-
--BIN="$APP_DIR/$PLATFORM/$PROG"
-+BIN="@PREFIX@/libexec/rox/$PROG"
-
- if [ -x "$BIN" ]; then
- exec $DEBUGGER "$BIN" "$@"
diff --git a/sysutils/rox/patches/patch-ad b/sysutils/rox/patches/patch-ad
deleted file mode 100644
index 4a5a3fda041..00000000000
--- a/sysutils/rox/patches/patch-ad
+++ /dev/null
@@ -1,431 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2002/10/05 01:20:46 wiz Exp $
-
---- action.c.orig Sat Feb 2 15:31:32 2002
-+++ action.c
-@@ -132,7 +132,7 @@ static guchar *last_find_string = NULL;
- static guchar *new_entry_string = NULL;
-
- /* Static prototypes */
--static gboolean send();
-+static gboolean gsend();
- static gboolean send_error();
- static gboolean send_dir(char *dir);
- static gboolean read_exact(int source, char *buffer, ssize_t len);
-@@ -566,7 +566,7 @@ static void for_dir_contents(ForDirCB *c
- g_string_sprintf(message, "!%s '%s': %s\n",
- _("ERROR reading"),
- src_dir, g_strerror(errno));
-- send();
-+ gsend();
- return;
- }
-
-@@ -613,7 +613,7 @@ static gboolean read_exact(int source, c
- }
-
- /* Send 'message' to our parent process. TRUE on success. */
--static gboolean send(void)
-+static gboolean gsend(void)
- {
- char len_buffer[5];
- ssize_t len;
-@@ -631,13 +631,13 @@ static gboolean send(void)
- static gboolean send_dir(char *dir)
- {
- g_string_sprintf(message, "/%s", dir);
-- return send();
-+ return gsend();
- }
-
- static gboolean send_error(void)
- {
- g_string_sprintf(message, "!%s: %s\n", _("ERROR"), g_strerror(errno));
-- return send();
-+ return gsend();
- }
-
- static void quiet_clicked(GtkWidget *button, GUIside *gui_side)
-@@ -741,7 +741,7 @@ static void process_flag(char flag)
- default:
- g_string_sprintf(message,
- "!ERROR: Bad message '%c'\n", flag);
-- send();
-+ gsend();
- break;
- }
- }
-@@ -778,7 +778,7 @@ static void check_flags(void)
-
- /* Read until the user sends a reply. If ignore_quiet is TRUE then
- * the user MUST click Yes or No, else treat quiet on as Yes.
-- * If the user needs prompting then does send().
-+ * If the user needs prompting then does gsend().
- */
- static gboolean reply(int fd, gboolean ignore_quiet)
- {
-@@ -788,7 +788,7 @@ static gboolean reply(int fd, gboolean i
- if (quiet && !ignore_quiet)
- return TRUE;
-
-- send();
-+ gsend();
-
- while (1)
- {
-@@ -804,11 +804,11 @@ static gboolean reply(int fd, gboolean i
- {
- case 'Y':
- g_string_sprintf(message, "' %s\n", _("Yes"));
-- send();
-+ gsend();
- return TRUE;
- case 'N':
- g_string_sprintf(message, "' %s\n", _("No"));
-- send();
-+ gsend();
- return FALSE;
- default:
- process_flag(retval);
-@@ -1043,7 +1043,7 @@ static void do_usage(char *src_path, cha
- if (mc_lstat(src_path, &info))
- {
- g_string_sprintf(message, "'%s:\n", src_path);
-- send();
-+ gsend();
- send_error();
- }
- else if (S_ISREG(info.st_mode) || S_ISLNK(info.st_mode))
-@@ -1096,7 +1096,7 @@ static void do_delete(char *src_path, ch
- else if (!o_brief)
- {
- g_string_sprintf(message, _("'Deleting '%s'\n"), src_path);
-- send();
-+ gsend();
- }
-
- safe_path = g_strdup(src_path);
-@@ -1112,16 +1112,16 @@ static void do_delete(char *src_path, ch
- }
- g_string_sprintf(message, _("'Directory '%s' deleted\n"),
- safe_path);
-- send();
-+ gsend();
- g_string_sprintf(message, "m%s", safe_path);
-- send();
-+ gsend();
- }
- else if (unlink(src_path))
- send_error();
- else
- {
- g_string_sprintf(message, "s%s", safe_path);
-- send();
-+ gsend();
- }
-
- g_free(safe_path);
-@@ -1160,7 +1160,7 @@ static void do_find(char *path, char *un
-
- g_string_assign(message, _("!Invalid find condition - "
- "change it and try again\n"));
-- send();
-+ gsend();
- g_string_sprintf(message, _("?Check '%s'?"), path);
- if (!reply(from_parent, TRUE))
- return;
-@@ -1170,7 +1170,7 @@ static void do_find(char *path, char *un
- {
- send_error();
- g_string_sprintf(message, _("'(while checking '%s')\n"), path);
-- send();
-+ gsend();
- return;
- }
-
-@@ -1183,7 +1183,7 @@ static void do_find(char *path, char *un
- if (find_test_condition(find_condition, &info))
- {
- g_string_sprintf(message, "=%s", path);
-- send();
-+ gsend();
- }
-
- if (S_ISDIR(info.stats.st_mode) && !info.prune)
-@@ -1254,7 +1254,7 @@ static void do_chmod(char *path, char *u
- g_string_sprintf(message,
- _("'Changing permissions of '%s'\n"),
- path);
-- send();
-+ gsend();
- }
-
- for (;;)
-@@ -1274,7 +1274,7 @@ static void do_chmod(char *path, char *u
-
- g_string_assign(message,
- _("!Invalid mode command - change it and try again\n"));
-- send();
-+ gsend();
- g_string_sprintf(message,
- _("?Change permissions of '%s'?"), path);
- if (!reply(from_parent, TRUE))
-@@ -1297,12 +1297,12 @@ static void do_chmod(char *path, char *u
- }
-
- g_string_sprintf(message, "s%s", path);
-- send();
-+ gsend();
-
- if (S_ISDIR(info.st_mode))
- {
- g_string_sprintf(message, "m%s", path);
-- send();
-+ gsend();
-
- if (o_recurse)
- {
-@@ -1381,7 +1381,7 @@ static void do_copy2(char *path, char *d
- return;
- g_string_sprintf(message,
- _("'Trying copy anyway...\n"));
-- send();
-+ gsend();
- }
- }
- }
-@@ -1396,7 +1396,7 @@ static void do_copy2(char *path, char *d
- {
- g_string_sprintf(message, _("'Copying %s as %s\n"), path,
- dest_path);
-- send();
-+ gsend();
- }
-
- if (S_ISDIR(info.st_mode))
-@@ -1416,7 +1416,7 @@ static void do_copy2(char *path, char *d
- g_string_sprintf(message,
- _("!ERROR: Destination already exists, "
- "but is not a directory\n"));
-- send();
-+ gsend();
- }
- else if (exists == FALSE && mkdir(dest_path, 0700 | mode))
- send_error();
-@@ -1426,7 +1426,7 @@ static void do_copy2(char *path, char *d
- {
- /* (just been created then) */
- g_string_sprintf(message, "s%s", dest_path);
-- send();
-+ gsend();
- }
-
- action_leaf = NULL;
-@@ -1471,7 +1471,7 @@ static void do_copy2(char *path, char *d
- else
- {
- g_string_sprintf(message, "s%s", dest_path);
-- send();
-+ gsend();
- }
-
- g_free(target);
-@@ -1490,12 +1490,12 @@ static void do_copy2(char *path, char *d
- g_string_sprintf(message, _("!%s\nFailed to copy '%s'"),
- error, path);
- g_free(error);
-- send();
-+ gsend();
- }
- else
- {
- g_string_sprintf(message, "s%s", dest_path);
-- send();
-+ gsend();
- }
- }
- }
-@@ -1544,7 +1544,7 @@ static void do_move2(char *path, char *d
- return;
- g_string_sprintf(message,
- _("'Trying move anyway...\n"));
-- send();
-+ gsend();
- }
- }
- else if (!quiet)
-@@ -1558,7 +1558,7 @@ static void do_move2(char *path, char *d
- {
- g_string_sprintf(message, _("'Moving %s as %s\n"), path,
- dest_path);
-- send();
-+ gsend();
- }
-
- argv[2] = path;
-@@ -1570,21 +1570,21 @@ static void do_move2(char *path, char *d
- g_string_sprintf(message,
- _("!%s\nFailed to move %s as %s\n"),
- err, path, dest_path);
-- send();
-+ gsend();
-
- g_free(err);
- }
- else
- {
- g_string_sprintf(message, "s%s", dest_path);
-- send();
-+ gsend();
-
- if (is_dir)
- g_string_sprintf(message, "m%s", path);
- else
- g_string_sprintf(message, "s%s", path);
-
-- send();
-+ gsend();
- }
- }
-
-@@ -1597,7 +1597,7 @@ static void do_copy(char *path, char *de
- {
- g_string_sprintf(message,
- _("!ERROR: Can't copy object into itself\n"));
-- send();
-+ gsend();
- }
- else
- do_copy2(path, dest);
-@@ -1612,7 +1612,7 @@ static void do_move(char *path, char *de
- {
- g_string_sprintf(message,
- _("!ERROR: Can't move/rename object into itself\n"));
-- send();
-+ gsend();
- }
- else
- do_move2(path, dest);
-@@ -1630,7 +1630,7 @@ static void do_link(char *path, char *de
- {
- g_string_sprintf(message, _("'Linking %s as %s\n"), path,
- dest_path);
-- send();
-+ gsend();
- }
- else
- {
-@@ -1645,7 +1645,7 @@ static void do_link(char *path, char *de
- else
- {
- g_string_sprintf(message, "s%s", dest_path);
-- send();
-+ gsend();
- }
- }
-
-@@ -1666,7 +1666,7 @@ static void do_mount(guchar *path, gbool
- mount ? _("'Mounting %s\n")
- : _("'Unmounting %s\n"),
- path);
-- send();
-+ gsend();
- }
- else
- {
-@@ -1684,17 +1684,17 @@ static void do_mount(guchar *path, gbool
- g_string_sprintf(message, mount ?
- _("!%s\nMount failed\n") :
- _("!%s\nUnmount failed\n"), err);
-- send();
-+ gsend();
- g_free(err);
- }
- else
- {
- g_string_sprintf(message, "M%s", path);
-- send();
-+ gsend();
- if (mount && mount_open_dir)
- {
- g_string_sprintf(message, "o%s", path);
-- send();
-+ gsend();
- }
- }
- }
-@@ -1725,7 +1725,7 @@ static void usage_cb(gpointer data)
- g_string_sprintf(message, "'%s: %s\n",
- g_basename(path),
- format_double_size(size_tally));
-- send();
-+ gsend();
- total_size += size_tally;
- }
-
-@@ -1754,7 +1754,7 @@ static void usage_cb(gpointer data)
- g_free(tmp);
- }
-
-- send();
-+ gsend();
- }
-
- #ifdef DO_MOUNT_POINTS
-@@ -1780,7 +1780,7 @@ static void mount_cb(gpointer data)
- g_string_sprintf(message,
- mount_points ? _("'\nDone\n")
- : _("!No mount points selected!\n"));
-- send();
-+ gsend();
- }
- #endif
-
-@@ -1816,7 +1816,7 @@ static void delete_cb(gpointer data)
- }
-
- g_string_sprintf(message, _("'\nDone\n"));
-- send();
-+ gsend();
- }
-
- static void find_cb(gpointer data)
-@@ -1839,11 +1839,11 @@ static void find_cb(gpointer data)
- if (!reply(from_parent, TRUE))
- break;
- g_string_assign(message, "#");
-- send();
-+ gsend();
- }
-
- g_string_sprintf(message, _("'\nDone\n"));
-- send();
-+ gsend();
- }
-
- static void chmod_cb(gpointer data)
-@@ -1864,14 +1864,14 @@ static void chmod_cb(gpointer data)
- g_string_sprintf(message,
- _("!'%s' is a symbolic link\n"),
- g_basename(path));
-- send();
-+ gsend();
- }
- else
- do_chmod(path, NULL);
- }
-
- g_string_sprintf(message, _("'\nDone\n"));
-- send();
-+ gsend();
- }
-
- static void list_cb(gpointer data)
-@@ -1888,7 +1888,7 @@ static void list_cb(gpointer data)
- }
-
- g_string_sprintf(message, _("'\nDone\n"));
-- send();
-+ gsend();
- }
-
- static GtkWidget *add_toggle(GUIside *gui_side,
diff --git a/sysutils/rtty/DESCR b/sysutils/rtty/DESCR
deleted file mode 100644
index 650e3fcb640..00000000000
--- a/sysutils/rtty/DESCR
+++ /dev/null
@@ -1,5 +0,0 @@
-Rtty is "remote tty" (not radioteletype). You run a server per port
-and then connect to that server from any number of "tip"/"cu"-like
-clients. I wrote it for our console concentrator, but there's no
-reason other than performance why you couldn't use it to drive modems,
-printers, prom programmers, and so on.
diff --git a/sysutils/rtty/Makefile b/sysutils/rtty/Makefile
deleted file mode 100644
index c727b327217..00000000000
--- a/sysutils/rtty/Makefile
+++ /dev/null
@@ -1,27 +0,0 @@
-# $NetBSD: Makefile,v 1.19 2003/06/02 01:16:53 jschauma Exp $
-# FreeBSD Id: Makefile,v 1.3 1997/01/06 12:13:36 jkh Exp
-#
-
-DISTNAME= rtty-3.2
-PKGREVISION= 1
-WRKSRC= ${WRKDIR}
-CATEGORIES= sysutils
-MASTER_SITES= ftp://ftp.vix.com/pub/vixie/
-
-MAINTAINER= tech-pkg@netbsd.org
-COMMENT= multiuser "tip"/"cu" replacement with logging
-
-pre-configure:
- ${CHMOD} -R u+w ${WRKDIR}
- for f in `${FIND} ${WRKDIR}/. -type f -print | ${XARGS} ${GREP} -l '/usr/local'`; do \
- ${ECHO} patching $$f ; \
- ${SED} -e 's:/usr/local:${PREFIX}:g' $$f > $$f.pdone && ${MV} $$f.pdone $$f; \
- done
- cd ${WRKDIR} && \
- ${SED} -e '/^agelog=/s:/usr/etc/:${PREFIX}/rtty/bin/:' agelogs.sh >agelogs.sh.pdone && ${MV} agelogs.sh.pdone agelogs.sh
-
-post-install:
- ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/rtty
- ${INSTALL_DATA} ${WRKDIR}/README ${PREFIX}/share/doc/rtty/
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/rtty/PLIST b/sysutils/rtty/PLIST
deleted file mode 100644
index 9cb3a2dcf4a..00000000000
--- a/sysutils/rtty/PLIST
+++ /dev/null
@@ -1,24 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2002/02/15 10:12:59 skrll Exp $
-rtty/bin/ttysrv
-rtty/bin/rtty
-rtty/bin/locbrok
-rtty/bin/Startup
-rtty/bin/console
-rtty/bin/startsrv
-rtty/bin/agelogs
-rtty/bin/agelog
-share/doc/rtty/README
-@comment rtty/bin created above
-@exec ${MKDIR} %D/rtty/dev
-@exec ${MKDIR} %D/rtty/sock
-@exec ${MKDIR} %D/rtty/log
-@exec ${MKDIR} %D/rtty/pid
-@exec ${MKDIR} %D/rtty/opt
-@dirrm rtty/dev
-@dirrm rtty/sock
-@dirrm rtty/log
-@dirrm rtty/pid
-@dirrm rtty/opt
-@dirrm rtty/bin
-@dirrm rtty
-@dirrm share/doc/rtty
diff --git a/sysutils/rtty/distinfo b/sysutils/rtty/distinfo
deleted file mode 100644
index b2b5262366c..00000000000
--- a/sysutils/rtty/distinfo
+++ /dev/null
@@ -1,8 +0,0 @@
-$NetBSD: distinfo,v 1.2 2001/04/19 11:29:07 agc Exp $
-
-SHA1 (rtty-3.2.tar.gz) = 62587ee4eec0b551b2b38341f20fddebde1ee8a1
-Size (rtty-3.2.tar.gz) = 23445 bytes
-SHA1 (patch-aa) = 4d860aeeac21ff125bcff995f85a530caa208eb0
-SHA1 (patch-ab) = 32644f9383ef43b45421fc100382509e2e6b2e34
-SHA1 (patch-ac) = 8b1b1be9eb471f68d62b4454f9bd74dddb471d75
-SHA1 (patch-ad) = dee546ca499fa4fb534f137d58fcbbb800b244d3
diff --git a/sysutils/rtty/patches/patch-aa b/sysutils/rtty/patches/patch-aa
deleted file mode 100644
index e9afe6fe77e..00000000000
--- a/sysutils/rtty/patches/patch-aa
+++ /dev/null
@@ -1,43 +0,0 @@
-$NetBSD: patch-aa,v 1.3 1999/04/09 08:33:51 agc Exp $
-
-Make this work on NetBSD and Solaris.
-
---- Makefile.orig Fri Apr 9 09:25:00 1999
-+++ Makefile Fri Apr 9 09:27:50 1999
-@@ -23,7 +23,7 @@
- DESTPATH = $(DESTROOT)/usr/local/rtty
- DESTBIN = $(DESTPATH)/bin
-
--CC = cc
-+CC = gcc
- CDEBUG = -O -g
- #
- # use -U to undefine, -D to define
-@@ -35,15 +35,24 @@
- # NO_SOCKADDR_LEN if your "struct sockaddr_in" lacks a sin_len field
- # NO_HSTRERROR if your C library has no hstrerror() function
- #
--CDEFS = -DDEBUG -UWANT_TCPIP -UNEED_BITYPES_H -UNEED_STRDUP -UNEED_INET_ATON \
-+CDEFS = -DDEBUG -UWANT_TCPIP -UNEED_BITYPES_H -UNEED_STRDUP \
- -UNO_SOCKADDR_LEN -UNO_HSTRERROR
- #
--CFLAGS = $(CDEBUG) $(CDEFS) -I/usr/local/include
--LIBS =
-+CFLAGS+= $(CDEBUG) $(CDEFS)
-+LIBS = -lcrypt
- #(if WANT_TCPIP defined and this isn't in your libc)
- # -lresolv
- #(if the resolver needs it, which BIND>=4.9's will on BSD>=4.4 systems)
- # -l44bsd
-+
-+OPSYS!= uname -s
-+
-+.if ${OPSYS} == "NetBSD"
-+CDEFS+= -UNEED_INET_ATON
-+.elif ${OPSYS} == "SunOS"
-+LIBS+= -lsocket -lnsl
-+CDEFS+= -DNEED_INET_ATON
-+.endif
-
- BINARY = ttysrv rtty locbrok
- SCRIPT = Startup console startsrv agelogs agelog
diff --git a/sysutils/rtty/patches/patch-ab b/sysutils/rtty/patches/patch-ab
deleted file mode 100644
index 958a5c82916..00000000000
--- a/sysutils/rtty/patches/patch-ab
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ab,v 1.1 1999/04/09 08:33:51 agc Exp $
-
-Make this compile on Solaris.
-
---- ttysrv.c 1999/04/09 08:23:23 1.1
-+++ ttysrv.c 1999/04/09 08:24:08
-@@ -40,6 +40,9 @@
- #include <string.h>
- #include <netdb.h>
- #include <pwd.h>
-+#if (defined(__sun__) && defined(__svr4__))
-+#include <fcntl.h>
-+#endif
-
- #include "rtty.h"
- #ifdef NEED_BITYPES_H
diff --git a/sysutils/rtty/patches/patch-ac b/sysutils/rtty/patches/patch-ac
deleted file mode 100644
index 41cb6a14b8e..00000000000
--- a/sysutils/rtty/patches/patch-ac
+++ /dev/null
@@ -1,53 +0,0 @@
-$NetBSD: patch-ac,v 1.3 2000/08/02 17:33:45 thorpej Exp $
-
-Make this compile on Solaris.
-
-Fix a bug where rtty would loop forever if its parent process
-(such as a shell) were to die and close rtty's standard input.
-
---- rtty.c.orig Fri Aug 23 15:25:28 1996
-+++ rtty.c Wed Aug 2 10:25:30 2000
-@@ -35,6 +35,10 @@
- #include <pwd.h>
- #include <termios.h>
-
-+#if (defined(__sun__) && defined(__svr4__))
-+#include <fcntl.h>
-+#endif
-+
- #include "rtty.h"
- #ifdef NEED_BITYPES_H
- # include "bitypes.h"
-@@ -266,13 +270,16 @@
- static void
- tty_input(fd) {
- static enum {base, need_cr, tilde} state = base;
-+ ssize_t cnt;
-+ int readone = 0;
- u_char buf[1];
-
- #if 0
- fcntl(Tty, F_SETFL, fcntl(Tty, F_GETFL, 0)|O_NONBLOCK);
- #endif
-- while (1 == read(fd, buf, 1)) {
-+ while (1 == (cnt = read(fd, buf, 1))) {
- u_char ch = buf[0];
-+ readone = 1;
-
- switch (state) {
- case base:
-@@ -346,6 +353,14 @@
- write(Log, buf, 1);
- }
- }
-+
-+ if (readone == 0 && cnt == 0) {
-+ /*
-+ * True EOF -- get out now rather than loop forever.
-+ */
-+ quit(0);
-+ }
-+
- #if 0
- fcntl(Tty, F_SETFL, fcntl(Tty, F_GETFL, 0)&~O_NONBLOCK);
- #endif
diff --git a/sysutils/rtty/patches/patch-ad b/sysutils/rtty/patches/patch-ad
deleted file mode 100644
index 374e95de1dc..00000000000
--- a/sysutils/rtty/patches/patch-ad
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2000/06/13 22:20:43 thorpej Exp $
-
---- startsrv.sh.orig Tue Jun 13 15:15:33 2000
-+++ startsrv.sh Tue Jun 13 15:16:44 2000
-@@ -19,7 +19,7 @@
-
- default_options='-b 9600 -w 8 -p none'
- default_sock_prot='ug=rw,o='
--default_sock_owner='root.system'
-+default_sock_owner='root:operator'
- default_log_prot='u=rw,g=r,o='
-
- for host
diff --git a/sysutils/ruby-quota/DESCR b/sysutils/ruby-quota/DESCR
deleted file mode 100644
index e8c40e2e978..00000000000
--- a/sysutils/ruby-quota/DESCR
+++ /dev/null
@@ -1,3 +0,0 @@
-Ruby/Quota
-
-This module provides functions which manipulate disk quotas.
diff --git a/sysutils/ruby-quota/Makefile b/sysutils/ruby-quota/Makefile
deleted file mode 100644
index 5f3610a3381..00000000000
--- a/sysutils/ruby-quota/Makefile
+++ /dev/null
@@ -1,26 +0,0 @@
-# $NetBSD: Makefile,v 1.1.1.1 2002/03/30 16:52:41 taca Exp $
-#
-
-DISTNAME= ruby-quota-0.5.1
-CATEGORIES= sysutils
-MASTER_SITES= http://kt-www.jaist.ac.jp/~ttate/ftp/
-
-MAINTAINER= taca@netbsd.org
-HOMEPAGE= http://kt-www.jaist.ac.jp/~ttate/ruby/ruby-ext.html
-COMMENT= quota interface for Ruby
-
-DIST_SUBDIR= ruby
-USE_RUBY_EXTCONF= yes
-INSTALL_TARGET= site-install
-
-DOCS= ChangeLog README
-DOCSDIR= ${RUBY_DOCDIR}/quota
-
-post-install:
- ${INSTALL_DATA_DIR} ${DOCSDIR}
-.for f in ${DOCS}
- ${INSTALL_DATA} ${WRKSRC}/$f ${DOCSDIR}/$f
-.endfor
-
-.include "../../lang/ruby-base/Makefile.common"
-.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/ruby-quota/PLIST b/sysutils/ruby-quota/PLIST
deleted file mode 100644
index e8e472ff8bb..00000000000
--- a/sysutils/ruby-quota/PLIST
+++ /dev/null
@@ -1,5 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2002/03/30 16:52:41 taca Exp $
-${RUBY_SITEARCHLIBDIR}/quota.so
-${RUBY_DOCDIR}/quota/ChangeLog
-${RUBY_DOCDIR}/quota/README
-@dirrm ${RUBY_DOCDIR}/quota
diff --git a/sysutils/ruby-quota/distinfo b/sysutils/ruby-quota/distinfo
deleted file mode 100644
index 52e7b483f4b..00000000000
--- a/sysutils/ruby-quota/distinfo
+++ /dev/null
@@ -1,4 +0,0 @@
-$NetBSD: distinfo,v 1.1.1.1 2002/03/30 16:52:41 taca Exp $
-
-SHA1 (ruby/ruby-quota-0.5.1.tar.gz) = 9edf6054c465af80d7a3534b8fed89fbafc01ec1
-Size (ruby/ruby-quota-0.5.1.tar.gz) = 5110 bytes
diff --git a/sysutils/safetynet/DESCR b/sysutils/safetynet/DESCR
deleted file mode 100644
index d147abaaddd..00000000000
--- a/sysutils/safetynet/DESCR
+++ /dev/null
@@ -1,10 +0,0 @@
-safetynet allows you to monitor and restart processes without having to
-write large and complicated init scripts. The config file is easy to
-understand and learn and you can have the whole script setup and running
-in under 10m, so you can get on with doing more important things than
-worrying if your ssh daemon is still running.
-
-You will probably want to add a crontab entry for root
-(crontab -e as root) such as
-0,15,30,45 * * * * ${PREFIX}/bin/safetynet --cron
-which will cause the script to be run every 15 minutes.
diff --git a/sysutils/safetynet/Makefile b/sysutils/safetynet/Makefile
deleted file mode 100644
index 7f398d66617..00000000000
--- a/sysutils/safetynet/Makefile
+++ /dev/null
@@ -1,34 +0,0 @@
-# $NetBSD: Makefile,v 1.2 2003/03/29 12:42:32 jmmv Exp $
-#
-
-DISTNAME= safetynet-1.15
-WRKSRC= ${WRKDIR}
-CATEGORIES= sysutils
-MASTER_SITES= http://www.unixpimps.org/safetynet/
-
-MAINTAINER= zuntum@netbsd.org
-HOMEPAGE= http://www.unixpimps.org/safetynet/
-COMMENT= safetynet is a perl script intended to monitor system services
-
-NO_BUILD= YES
-USE_PERL5= YES
-
-post-patch:
- ${SED} -e "s,/etc/safetynet.conf,${PREFIX}/etc/safetynet.conf,g" \
- -e "s,/bin/mail,/usr/bin/mail,g" \
- -e "s,ps -Af,ps ax,g" \
- -e "s,/usr/bin/perl,${LOCALBASE}/bin/perl,g" \
- ${WRKSRC}/safetynet > ${WRKSRC}/safetynet.done
- ${MV} -f ${WRKSRC}/safetynet.done ${WRKSRC}/safetynet
- ${SED} -e "s,/usr/local/apache/bin/apachectl,${LOCALBASE}/sbin/apachectl,g" \
- -e "s,/usr/local,${PREFIX},g" \
- ${WRKSRC}/safetynet.conf > ${WRKSRC}/safetynet.conf.done
- ${MV} ${WRKSRC}/safetynet.conf.done ${WRKSRC}/safetynet.conf
-
-do-install:
- ${INSTALL_SCRIPT} -m 700 ${WRKSRC}/safetynet ${PREFIX}/bin/safetynet
- ${INSTALL_DATA} -m 600 ${WRKSRC}/safetynet.conf ${PREFIX}/etc/safetynet.conf.sample
- ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/safetynet
- ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/safetynet/README
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/safetynet/PLIST b/sysutils/safetynet/PLIST
deleted file mode 100644
index 3da4e9cada9..00000000000
--- a/sysutils/safetynet/PLIST
+++ /dev/null
@@ -1,5 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 22:53:44 zuntum Exp $
-bin/safetynet
-etc/safetynet.conf.sample
-share/doc/safetynet/README
-@dirrm share/doc/safetynet
diff --git a/sysutils/safetynet/distinfo b/sysutils/safetynet/distinfo
deleted file mode 100644
index 9e2db823bb6..00000000000
--- a/sysutils/safetynet/distinfo
+++ /dev/null
@@ -1,4 +0,0 @@
-$NetBSD: distinfo,v 1.2 2001/04/19 11:29:07 agc Exp $
-
-SHA1 (safetynet-1.15.tar.gz) = 6875bec180c57c10a9c948ffd8a7787bd4d4e38c
-Size (safetynet-1.15.tar.gz) = 12638 bytes
diff --git a/sysutils/sarah/DESCR b/sysutils/sarah/DESCR
deleted file mode 100644
index d548c6244dc..00000000000
--- a/sysutils/sarah/DESCR
+++ /dev/null
@@ -1,3 +0,0 @@
-Sarah is a program which is used to trim, rotate, archive and delete log
-files. It is meant to run periodically out of cron, determining what to do
-based on a configuration file.
diff --git a/sysutils/sarah/Makefile b/sysutils/sarah/Makefile
deleted file mode 100644
index 5e4fd2f270f..00000000000
--- a/sysutils/sarah/Makefile
+++ /dev/null
@@ -1,39 +0,0 @@
-# $NetBSD: Makefile,v 1.6 2003/06/02 01:16:53 jschauma Exp $
-
-DISTNAME= sarah-0.7b
-CATEGORIES= sysutils
-MASTER_SITES= ftp://ftp.conundrum.com/pub/sarah/
-
-MAINTAINER= tech-pkg@netbsd.org
-COMMENT= Syslog automated Rotation and Archive Handler
-
-LICENSE= limited-redistribution
-RESTRICTED= "Do not redistribute"
-NO_SRC_ON_FTP= ${RESTRICTED}
-NO_BIN_ON_FTP= ${RESTRICTED}
-NO_SRC_ON_CDROM=${RESTRICTED}
-NO_BIN_ON_CDROM=${RESTRICTED}
-
-USE_PERL5= YES
-REPLACE_PERL= sarah
-NO_BUILD= YES
-
-post-patch:
- ${SED} -e "s,/usr/local,${PREFIX},g" \
- -e "s,syslog.pid,syslogd.pid,g" \
- ${WRKSRC}/sarah > ${WRKSRC}/sarah.done
- ${MV} ${WRKSRC}/sarah.done ${WRKSRC}/sarah
- ${SED} -e "s,/usr/local,${PREFIX},g" \
- -e "s,syslog.pid,syslogd.pid,g" \
- ${WRKSRC}/sarah.1 > ${WRKSRC}/sarah.1.done
- ${MV} ${WRKSRC}/sarah.1.done ${WRKSRC}/sarah.1
-
-do-install:
- ${INSTALL_SCRIPT} ${WRKSRC}/sarah ${PREFIX}/bin
- ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/sarah
- ${INSTALL_DATA} ${WRKSRC}/sarah.conf.sample ${PREFIX}/share/examples/sarah
- ${INSTALL_MAN} ${WRKSRC}/sarah.1 ${PREFIX}/man/man1
- ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/sarah
- ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/sarah
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/sarah/PLIST b/sysutils/sarah/PLIST
deleted file mode 100644
index 8930835720d..00000000000
--- a/sysutils/sarah/PLIST
+++ /dev/null
@@ -1,7 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 22:53:44 zuntum Exp $
-bin/sarah
-man/man1/sarah.1
-share/doc/sarah/README
-share/examples/sarah/sarah.conf.sample
-@dirrm share/doc/sarah
-@dirrm share/examples/sarah
diff --git a/sysutils/sarah/distinfo b/sysutils/sarah/distinfo
deleted file mode 100644
index 6ce928d402f..00000000000
--- a/sysutils/sarah/distinfo
+++ /dev/null
@@ -1,4 +0,0 @@
-$NetBSD: distinfo,v 1.3 2001/10/31 18:11:25 zuntum Exp $
-
-SHA1 (sarah-0.7b.tar.gz) = e0043c212f73465ffac26c431cf23d5026b6a73b
-Size (sarah-0.7b.tar.gz) = 24617 bytes
diff --git a/sysutils/screentest/DESCR b/sysutils/screentest/DESCR
deleted file mode 100644
index 292aa39164a..00000000000
--- a/sysutils/screentest/DESCR
+++ /dev/null
@@ -1,3 +0,0 @@
-This is a GTK+ program for tesing the quality of CRT screens. It displays
-various patterns and allows you to estimate the quality of your CRT
-monitor.
diff --git a/sysutils/screentest/Makefile b/sysutils/screentest/Makefile
deleted file mode 100644
index 05cc9d9047d..00000000000
--- a/sysutils/screentest/Makefile
+++ /dev/null
@@ -1,25 +0,0 @@
-# $NetBSD: Makefile,v 1.4 2003/07/13 13:53:23 wiz Exp $
-#
-
-DISTNAME= screentest-1.0
-PKGREVISION= 2
-CATEGORIES= sysutils x11
-MASTER_SITES= ftp://ftp.linux.cz/pub/linux/people/jan_kasprzak/screentest/
-
-MAINTAINER= tech-pkg@netbsd.org
-HOMEPAGE= http://www.fi.muni.cz/~kas/screentest/
-COMMENT= CRT screen testing utility using GTK+
-
-GNU_CONFIGURE= yes
-USE_BUILDLINK2= yes
-USE_X11= yes
-
-post-install:
- ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/screentest
-.for f in AUTHORS ChangeLog NEWS README
- ${INSTALL_DATA} ${WRKSRC}/$f ${PREFIX}/share/doc/screentest
-.endfor
-.undef f
-
-.include "../../x11/gtk/buildlink2.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/screentest/PLIST b/sysutils/screentest/PLIST
deleted file mode 100644
index 9ccfb5556a6..00000000000
--- a/sysutils/screentest/PLIST
+++ /dev/null
@@ -1,7 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2003/01/08 23:15:12 jmmv Exp $
-bin/screentest
-share/doc/screentest/AUTHORS
-share/doc/screentest/ChangeLog
-share/doc/screentest/NEWS
-share/doc/screentest/README
-@dirrm share/doc/screentest
diff --git a/sysutils/screentest/distinfo b/sysutils/screentest/distinfo
deleted file mode 100644
index b432dd1294a..00000000000
--- a/sysutils/screentest/distinfo
+++ /dev/null
@@ -1,7 +0,0 @@
-$NetBSD: distinfo,v 1.1.1.1 2003/01/08 23:15:12 jmmv Exp $
-
-SHA1 (screentest-1.0.tar.gz) = ea541d61b6c5003dbaf1e2847def66c31f808230
-Size (screentest-1.0.tar.gz) = 49428 bytes
-SHA1 (patch-aa) = 27923b68894069e077c7a213f2e8c8305c536e3b
-SHA1 (patch-ab) = 259e9bbd05374c8b5be9ec2b08ccf4e5504866b9
-SHA1 (patch-ac) = c167b30c62de4bae315a40c1c14a0de1d28bbbc0
diff --git a/sysutils/screentest/patches/patch-aa b/sysutils/screentest/patches/patch-aa
deleted file mode 100644
index 598b22184fa..00000000000
--- a/sysutils/screentest/patches/patch-aa
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2003/01/08 23:15:13 jmmv Exp $
-
---- ChangeLog.orig Mon Aug 20 20:10:54 2001
-+++ ChangeLog
-@@ -1,2 +1,7 @@
-+Tue Aug 21 10:23:25 CEST 2001
-+"Background color -> Red" yields now really to the red background instead
-+ of white (missing userdata in the signal handler). Thanks to
-+ Leo Hadacz for reporting this.
-+
- Mon Aug 20 19:02:08 CEST 2001
- Initial revision.
diff --git a/sysutils/screentest/patches/patch-ab b/sysutils/screentest/patches/patch-ab
deleted file mode 100644
index 4d893f726ee..00000000000
--- a/sysutils/screentest/patches/patch-ab
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 2003/01/08 23:15:13 jmmv Exp $
-
---- interface.c.orig Mon Aug 20 20:10:54 2001
-+++ interface.c
-@@ -487,7 +487,8 @@ GtkWidget *create_popup(void)
- GTK_SIGNAL_FUNC(on_bgcolor_change),
- (gpointer) COLOR_WHITE);
- gtk_signal_connect(GTK_OBJECT(red1), "activate",
-- GTK_SIGNAL_FUNC(on_bgcolor_change), NULL);
-+ GTK_SIGNAL_FUNC(on_bgcolor_change),
-+ (gpointer) COLOR_RED);
- gtk_signal_connect(GTK_OBJECT(green1), "activate",
- GTK_SIGNAL_FUNC(on_bgcolor_change),
- (gpointer) COLOR_GREEN);
diff --git a/sysutils/screentest/patches/patch-ac b/sysutils/screentest/patches/patch-ac
deleted file mode 100644
index 9e7bbc9bd2e..00000000000
--- a/sysutils/screentest/patches/patch-ac
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ac,v 1.1.1.1 2003/01/08 23:15:13 jmmv Exp $
-
---- screentest.glade.orig Mon Aug 20 20:10:55 2001
-+++ screentest.glade
-@@ -333,6 +333,7 @@
- <signal>
- <name>activate</name>
- <handler>on_bgcolor_change</handler>
-+ <data>(gpointer)COLOR_RED</data>
- <last_modification_time>Mon, 20 Aug 2001 13:34:56 GMT</last_modification_time>
- </signal>
- <label>Red</label>
diff --git a/sysutils/scsiinfo/DESCR b/sysutils/scsiinfo/DESCR
deleted file mode 100644
index 3e6a6e9662e..00000000000
--- a/sysutils/scsiinfo/DESCR
+++ /dev/null
@@ -1,6 +0,0 @@
-Scsiinfo displays information about SCSI devices attached to a given system,
-as seen by a supported SCSI device driver. For each target known to the SCSI
-host adapter, scsiinfo reports SCSI transfer information for the device. In
-particular, when a target supports synchronous transfer, the negotiated
-maximum transfer rate (in MB/sec) is reported. Scsiinfo can also report the
-type and speed of each supported host adapter attached to the system.
diff --git a/sysutils/scsiinfo/Makefile b/sysutils/scsiinfo/Makefile
deleted file mode 100644
index 66e36e2c5d7..00000000000
--- a/sysutils/scsiinfo/Makefile
+++ /dev/null
@@ -1,27 +0,0 @@
-# $NetBSD: Makefile,v 1.1.1.1 2002/08/20 15:45:04 grant Exp $
-
-DISTNAME= scsiinfo-4.7
-PKGNAME= ${DISTNAME}
-CATEGORIES= sysutils
-MASTER_SITES= http://www.cs.toronto.edu/pub/jdd/scsiinfo/
-EXTRACT_SUFX= .shar
-
-MAINTAINER= grant@netbsd.org
-HOMEPAGE= ${MASTER_SITES}
-COMMENT= displays information about SCSI devices attached to a system
-
-ONLY_FOR_PLATFORM= SunOS-*-*
-
-do-extract:
- ${MKDIR} ${WRKSRC}; cd ${WRKSRC}; \
- ${SH} ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX} >/dev/null
-
-pre-build:
- cd ${WRKSRC}; ./mkadapters esp isp fas glm ptisp pln > adapters
-
-do-install:
- ${INSTALL_PROGRAM} ${WRKSRC}/scsiinfo ${PREFIX}/sbin
- ${INSTALL_MAN} ${WRKSRC}/scsiinfo.1 ${PREFIX}/man/man1
-
-.include "../../mk/bsd.pkg.mk"
-
diff --git a/sysutils/scsiinfo/PLIST b/sysutils/scsiinfo/PLIST
deleted file mode 100644
index 08fbc377045..00000000000
--- a/sysutils/scsiinfo/PLIST
+++ /dev/null
@@ -1,3 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2002/08/20 15:45:04 grant Exp $
-sbin/scsiinfo
-man/man1/scsiinfo.1
diff --git a/sysutils/scsiinfo/distinfo b/sysutils/scsiinfo/distinfo
deleted file mode 100644
index bafdd34531a..00000000000
--- a/sysutils/scsiinfo/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.1.1.1 2002/08/20 15:45:04 grant Exp $
-
-SHA1 (scsiinfo-4.7.shar) = 571b9269ddb09f63a3e6b497c7fb46c23242a8da
-Size (scsiinfo-4.7.shar) = 198732 bytes
-SHA1 (patch-aa) = 76e00e321de8a0ed8cbbfa47121057831049912a
diff --git a/sysutils/scsiinfo/patches/patch-aa b/sysutils/scsiinfo/patches/patch-aa
deleted file mode 100644
index 01c129b3971..00000000000
--- a/sysutils/scsiinfo/patches/patch-aa
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2002/08/20 15:45:04 grant Exp $
-
---- Makefile.orig Wed Aug 21 01:23:41 2002
-+++ Makefile Wed Aug 21 01:24:16 2002
-@@ -1,4 +1,4 @@
--CC = cc # you can use gcc, if you like. Don't use /usr/ucb/cc; it won't work.
-+#CC = cc # you can use gcc, if you like. Don't use /usr/ucb/cc; it won't work.
- INCLUDEDIRS = -Iinclude
-
- #
-@@ -25,7 +25,7 @@
- $(RM) adapters
- ./mkadapters esp isp fas glm ptisp pln >adapters
-
--include adapters
-+.include "adapters"
-
- #
- # remove -DNOTCH_REPORT if you have trouble compiling notch.c
diff --git a/sysutils/service-config/DESCR b/sysutils/service-config/DESCR
deleted file mode 100644
index ad2171a6d2c..00000000000
--- a/sysutils/service-config/DESCR
+++ /dev/null
@@ -1,14 +0,0 @@
-The programs in service-config create and configure svscan-format
-service directories.
-
-* server-config creates an svscan-format directory for an arbitrary
- service.
-* rules-config configures access rules for use by a
- service.
-* svscan-config configures a service to run svscan.
-* ipc-config configures a service to run ipcserver.
-* ipcx-config configures a service to run ipcserver using access
- rules.
-* tcp-config configures a service to run tcpserver.
-* tcpx-config configures a service to run tcpserver using access
- rules.
diff --git a/sysutils/service-config/Makefile b/sysutils/service-config/Makefile
deleted file mode 100644
index 7d12329ac53..00000000000
--- a/sysutils/service-config/Makefile
+++ /dev/null
@@ -1,27 +0,0 @@
-# $NetBSD: Makefile,v 1.3 2002/04/25 15:37:17 yyamano Exp $
-#
-
-DISTNAME= service-config-0.51
-CATEGORIES= sysutils
-MASTER_SITES= http://www.superscript.com/service-config/
-
-MAINTAINER= zuntum@netbsd.org
-HOMEPAGE= http://www.superscript.com/service-config/intro.html
-COMMENT= Utility to create and configure svscan service directories
-
-DEPENDS+= daemontools-[0-9]*:../../sysutils/daemontools
-
-ALL_TARGET= it
-INSTALL_TARGET= setup check
-
-RESTRICTED= "Possibly inherited DJB-style license would prohibit distribution \
- of modified binary packages"
-NO_BIN_ON_CDROM=${RESTRICTED}
-NO_BIN_ON_FTP= ${RESTRICTED}
-
-post-patch:
- ${ECHO} "${CC} ${CFLAGS}" > ${WRKSRC}/conf-cc
- ${ECHO} "${CC} ${_STRIPFLAG_CC}" > ${WRKSRC}/conf-ld
- ${ECHO} "${PREFIX}" > ${WRKSRC}/conf-home
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/service-config/PLIST b/sysutils/service-config/PLIST
deleted file mode 100644
index bfe3cf7df58..00000000000
--- a/sysutils/service-config/PLIST
+++ /dev/null
@@ -1,8 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 22:53:45 zuntum Exp $
-bin/ipc-config
-bin/ipcx-config
-bin/rules-config
-bin/service-config
-bin/svscan-config
-bin/tcp-config
-bin/tcpx-config
diff --git a/sysutils/service-config/distinfo b/sysutils/service-config/distinfo
deleted file mode 100644
index 2295eeca49c..00000000000
--- a/sysutils/service-config/distinfo
+++ /dev/null
@@ -1,4 +0,0 @@
-$NetBSD: distinfo,v 1.1.1.1 2001/07/06 22:18:43 zuntum Exp $
-
-SHA1 (service-config-0.51.tar.gz) = e47daed033995a5c9b17027b4bec5de4f078772e
-Size (service-config-0.51.tar.gz) = 16486 bytes
diff --git a/sysutils/setquota/DESCR b/sysutils/setquota/DESCR
deleted file mode 100644
index 8cfd0a0e7c6..00000000000
--- a/sysutils/setquota/DESCR
+++ /dev/null
@@ -1,4 +0,0 @@
-A more useful set of tools for using file system quotas.
-Set and get quota information for users and groups.
-
-This code was written by Matthew N. Dodd <winter@jurai.net>.
diff --git a/sysutils/setquota/Makefile b/sysutils/setquota/Makefile
deleted file mode 100644
index e7ec01b6292..00000000000
--- a/sysutils/setquota/Makefile
+++ /dev/null
@@ -1,16 +0,0 @@
-# $NetBSD: Makefile,v 1.3 2003/06/02 01:16:53 jschauma Exp $
-#
-
-DISTNAME= setquota-0.1
-WRKSRC= ${WRKDIR}/setquota/
-CATEGORIES= sysutils
-MASTER_SITES= ftp://ftp.jurai.net/users/winter/
-
-MAINTAINER= tech-pkg@netbsd.org
-HOMEPAGE= # unknown
-COMMENT= Command line quota tools
-
-# BSD oriented, haven't checked on other environment now
-ONLY_FOR_PLATFORM= NetBSD-*-*
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/setquota/PLIST b/sysutils/setquota/PLIST
deleted file mode 100644
index 8b5b2df5e62..00000000000
--- a/sysutils/setquota/PLIST
+++ /dev/null
@@ -1,5 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2001/11/15 15:46:33 taca Exp $
-man/man8/getquota.8
-man/man8/setquota.8
-sbin/getquota
-sbin/setquota
diff --git a/sysutils/setquota/distinfo b/sysutils/setquota/distinfo
deleted file mode 100644
index 19f878457b8..00000000000
--- a/sysutils/setquota/distinfo
+++ /dev/null
@@ -1,10 +0,0 @@
-$NetBSD: distinfo,v 1.1.1.1 2001/11/15 15:46:33 taca Exp $
-
-SHA1 (setquota-0.1.tar.gz) = e7f4afa492daa10f395937f713c7b245fbcbbcdc
-Size (setquota-0.1.tar.gz) = 6300 bytes
-SHA1 (patch-aa) = 7c34c1c73dad6706e0bc94d5ff8093da20d94c5d
-SHA1 (patch-ab) = 55956d4a651919346e7b2bbcbe5caccfbba846fe
-SHA1 (patch-ac) = d4478d4292be85453abfc822b90c8dd4f6e3d997
-SHA1 (patch-ad) = 4d89b7a3440176ee456f6410cdae1b80ec58e6f9
-SHA1 (patch-ae) = e2c5fe18291dbc38c74f83917e1bb7b207ae809c
-SHA1 (patch-af) = 15a051fc77060d9286c126bcbed8909c0a0a3b9f
diff --git a/sysutils/setquota/patches/patch-aa b/sysutils/setquota/patches/patch-aa
deleted file mode 100644
index 1e2493d72c3..00000000000
--- a/sysutils/setquota/patches/patch-aa
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2001/11/15 15:46:33 taca Exp $
-
---- Makefile.orig Wed Mar 12 17:32:55 1997
-+++ Makefile
-@@ -2,9 +2,11 @@
-
- PROG= setquota
- SRCS= printquota.c setquota.c quotatool.c
--CFLAGS+= -g -DDEBUG # -Wall -static
--MAN8= getquota.8 setquota.8
--LINKS= /usr/sbin/setquota /usr/sbin/getquota
--BINDIR= /usr/sbin
-+
-+BINDIR= ${PREFIX}/sbin
-+MANDIR= ${PREFIX}/man
-+LINKS= ${PREFIX}/sbin/setquota ${PREFIX}/sbin/getquota
-+MAN= setquota.8
-+MLINKS= setquota.8 getquota.8
-
- .include <bsd.prog.mk>
diff --git a/sysutils/setquota/patches/patch-ab b/sysutils/setquota/patches/patch-ab
deleted file mode 100644
index 37634fa6451..00000000000
--- a/sysutils/setquota/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 2001/11/15 15:46:33 taca Exp $
-
---- getquota.8.orig Tue Mar 11 22:12:49 1997
-+++ getquota.8
-@@ -37,7 +37,7 @@
- .\"
- .Dd March 6, 1997
- .Dt GETQUOTA 8
--.Os FreeBSD 2.2
-+.Os
- .Sh NAME
- .Nm getquota
- .Nd get quotas for users or groups
diff --git a/sysutils/setquota/patches/patch-ac b/sysutils/setquota/patches/patch-ac
deleted file mode 100644
index 2ba1cdfab4c..00000000000
--- a/sysutils/setquota/patches/patch-ac
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ac,v 1.1.1.1 2001/11/15 15:46:33 taca Exp $
-
---- printquota.c.orig Mon Mar 24 13:14:46 1997
-+++ printquota.c
-@@ -109,11 +109,9 @@
-
- if (now == 0)
- time(&now);
--#ifdef 0
- if (now > seconds)
- return("none");
- seconds -= now;
--#endif
- sprintf(buf, "%d", seconds);
- return(buf);
- minutes = (seconds + 30) / 60;
diff --git a/sysutils/setquota/patches/patch-ad b/sysutils/setquota/patches/patch-ad
deleted file mode 100644
index fd990b86951..00000000000
--- a/sysutils/setquota/patches/patch-ad
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD: patch-ad,v 1.1.1.1 2001/11/15 15:46:33 taca Exp $
-
---- quotatool.c.orig Tue Apr 1 08:02:42 1997
-+++ quotatool.c
-@@ -49,15 +49,15 @@
- #include <stdlib.h>
- #include <string.h>
- #include <sys/param.h>
--#include <sys/errno.h>
-+#include <errno.h>
- #include <ufs/ufs/quota.h>
- #include <pwd.h>
- #include <grp.h>
- #include <fstab.h>
- #include "quotatool.h"
-
--void usage ();
--void do_test ();
-+void usage (void);
-+void do_test (void);
- u_long convert_block (char*);
- u_long convert_inode (char*);
- time_t convert_time (char*);
diff --git a/sysutils/setquota/patches/patch-ae b/sysutils/setquota/patches/patch-ae
deleted file mode 100644
index f5e25e1ea32..00000000000
--- a/sysutils/setquota/patches/patch-ae
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ae,v 1.1.1.1 2001/11/15 15:46:33 taca Exp $
-
---- setquota.8.orig Fri Apr 25 19:55:55 1997
-+++ setquota.8
-@@ -37,7 +37,7 @@
- .\"
- .Dd March 6, 1997
- .Dt SETQUOTA 8
--.Os FreeBSD 2.2
-+.Os
- .Sh NAME
- .Nm setquota
- .Nd set disk quotas for users or groups
diff --git a/sysutils/setquota/patches/patch-af b/sysutils/setquota/patches/patch-af
deleted file mode 100644
index 64f7b690e49..00000000000
--- a/sysutils/setquota/patches/patch-af
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-af,v 1.1.1.1 2001/11/15 15:46:33 taca Exp $
-
---- setquota.c.orig Mon Mar 24 13:14:47 1997
-+++ setquota.c
-@@ -62,7 +62,7 @@
- qm->dq_dqb.dqb_bhardlimit = v_bh;
- if (f_bs)
- qm->dq_dqb.dqb_bsoftlimit = v_bs;
--#ifdef 0
-+#if 0
- if (f_bg)
- qm->dq_dqb.dqb_btime = v_bg;
- #endif
-@@ -70,7 +70,7 @@
- qm->dq_dqb.dqb_ihardlimit = v_ih;
- if (f_is)
- qm->dq_dqb.dqb_isoftlimit = v_is;
--#ifdef 0
-+#if 0
- if (f_ig)
- qm->dq_dqb.dqb_itime = v_ig;
- #endif
diff --git a/sysutils/shmux/DESCR b/sysutils/shmux/DESCR
deleted file mode 100644
index 7a9e982e224..00000000000
--- a/sysutils/shmux/DESCR
+++ /dev/null
@@ -1,6 +0,0 @@
-shmux is program for executing the same command on many hosts in parallel.
-
-For each target, a child process is spawned by shmux, and a shell on
-the target obtained one of the supported methods: rsh, ssh, or sh. The
-output produced by the children is received by shmux and either output
-in turn to the user, or written to files for later processing.
diff --git a/sysutils/shmux/Makefile b/sysutils/shmux/Makefile
deleted file mode 100644
index e9ab90ae0ab..00000000000
--- a/sysutils/shmux/Makefile
+++ /dev/null
@@ -1,17 +0,0 @@
-# $NetBSD: Makefile,v 1.2 2003/06/24 11:15:52 agc Exp $
-
-DISTNAME= shmux-0.10a
-CATEGORIES= sysutils
-MASTER_SITES= http://web.taranis.org/shmux/dist/
-EXTRACT_SUFX= .tgz
-
-MAINTAINER= shmux@taranis.org
-HOMEPAGE= http://web.taranis.org/shmux/
-COMMENT= Shell Multiplexor
-
-USE_BUILDLINK2= yes
-GNU_CONFIGURE= yes
-ALL_TARGET= shmux
-
-.include "../../devel/pcre/buildlink2.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/shmux/PLIST b/sysutils/shmux/PLIST
deleted file mode 100644
index 6f0cc9128d9..00000000000
--- a/sysutils/shmux/PLIST
+++ /dev/null
@@ -1,4 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2003/06/24 00:32:03 hubertf Exp $
-bin/shmux
-man/man1/shmux.1
-share/shmux/mcmd.sh
diff --git a/sysutils/shmux/distinfo b/sysutils/shmux/distinfo
deleted file mode 100644
index 419cd2b981c..00000000000
--- a/sysutils/shmux/distinfo
+++ /dev/null
@@ -1,4 +0,0 @@
-$NetBSD: distinfo,v 1.1.1.1 2003/06/24 00:32:03 hubertf Exp $
-
-SHA1 (shmux-0.10a.tgz) = 0af133531adc47a2d7c9c8cf93b70a2fc95c56b7
-Size (shmux-0.10a.tgz) = 71476 bytes
diff --git a/sysutils/skill/DESCR b/sysutils/skill/DESCR
deleted file mode 100644
index 3eab575712c..00000000000
--- a/sysutils/skill/DESCR
+++ /dev/null
@@ -1,10 +0,0 @@
-`skill' is a program which sends signals to processes given
-any combination of user names, ttys, commands, and pids. `snice' is
-a program which changes the priority of processes (given the same).
-It's actually one program which examines argv to determine what action
-is to be taken on matching processes. It is similar to kill(1) and
-renice(8), however the command line is completely order independent.
-There are also verbose, search, and interactive modes of operation.
-
-The name `skill' stems from `SuperKILL', but if you use it under `csh',
-you may discover another reason for calling it `skill' (hint "s!!").
diff --git a/sysutils/skill/Makefile b/sysutils/skill/Makefile
deleted file mode 100644
index d7f16dad314..00000000000
--- a/sysutils/skill/Makefile
+++ /dev/null
@@ -1,29 +0,0 @@
-# $NetBSD: Makefile,v 1.15 2002/06/28 10:45:31 abs Exp $
-#
-
-DISTNAME= skill-4.1
-PKGREVISION= 2
-CATEGORIES= sysutils
-MASTER_SITES= ftp://fast.cs.utah.edu/pub/skill/
-EXTRACT_SUFX= .tgz
-
-MAINTAINER= kim@tac.nyc.ny.us
-COMMENT= Signal processes given user names, ttys, commands, or pids
-
-.include "../../mk/bsd.prefs.mk"
-
-.if ${OPSYS} == "NetBSD"
-MAKE_ENV+= OSTYPE=nbsd-44
-.elif ${OPSYS} == "SunOS"
-BINMODE= 02555
-MAKE_ENV+= OSTYPE=sys-5r4 BINGRP=sys CPPFLAGS=
-.endif
-
-pre-install:
- ${INSTALL_PROGRAM} ${WRKSRC}/skill ${PREFIX}/bin
- ${INSTALL_MAN} ${WRKSRC}/skill.1 ${PREFIX}/man/man1
- ${RM} -f ${PREFIX}/bin/snice ${PREFIX}/man/man1/snice.1
- ${LN} -s skill ${PREFIX}/bin/snice
- ${LN} -s skill.1 ${PREFIX}/man/man1/snice.1
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/skill/PLIST b/sysutils/skill/PLIST
deleted file mode 100644
index 4f61e8dd639..00000000000
--- a/sysutils/skill/PLIST
+++ /dev/null
@@ -1,5 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 22:53:47 zuntum Exp $
-bin/skill
-bin/snice
-man/man1/skill.1
-man/man1/snice.1
diff --git a/sysutils/skill/distinfo b/sysutils/skill/distinfo
deleted file mode 100644
index 424f2ce35ea..00000000000
--- a/sysutils/skill/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.5 2002/06/28 10:45:31 abs Exp $
-
-SHA1 (skill-4.1.tgz) = d4f548347c34462156276f96185afa9862621338
-Size (skill-4.1.tgz) = 45923 bytes
-SHA1 (patch-aa) = 99e982b6ca126a3844b9e056336276bdf1a062f1
-SHA1 (patch-ab) = 216bb502ec9d7ccc60988e911bb71b33f507fe25
diff --git a/sysutils/skill/patches/patch-aa b/sysutils/skill/patches/patch-aa
deleted file mode 100644
index 8ba945cea5e..00000000000
--- a/sysutils/skill/patches/patch-aa
+++ /dev/null
@@ -1,64 +0,0 @@
-$NetBSD: patch-aa,v 1.11 2002/06/28 10:45:32 abs Exp $
-
---- Makefile.orig Sat Apr 6 05:53:39 2002
-+++ Makefile
-@@ -59,15 +59,15 @@ PREFIX= /usr/local
-
- # CONFIGURE: Set location of executable, it's group and mode.
- BINDIR= ${PREFIX}/bin
--BINGRP= wheel
--BINMOD= 555
-+#BINGRP= wheel
-+#BINMOD= 555
-
- # CONFIGURE: Set location of man directory and man page suffix.
- MANDIR= ${PREFIX}/man/man1
- MANSFX= 1
-
- # CONFIGURE(Config): Select an OSTYPE for your machine from the list above.
--OSTYPE= nbsd-44
-+#OSTYPE= nbsd-44
-
- # CONFIGURE(Config): Add any OS-specific options here.
- COPTS=
-@@ -79,7 +79,7 @@ SRCS= main.c argparse.c getproc.c
- OBJS= main.o argparse.o getproc.o
- HDRS= conf.h
-
--CFLAGS= -O ${COPTS}
-+CFLAGS+=${COPTS}
-
- all: skill
-
-@@ -94,20 +94,20 @@ ${OBJS}: ${HDRS}
-
- install: skill
- #(SysV) filepriv -d ${DESTDIR}/${BINDIR}/skill
-- rm -f ${DESTDIR}/${BINDIR}/skill ${DESTDIR}/${MANDIR}/skill.${MANSFX}
-- rm -f ${DESTDIR}/${BINDIR}/snice ${DESTDIR}/${MANDIR}/snice.${MANSFX}
-+# rm -f ${DESTDIR}/${BINDIR}/skill ${DESTDIR}/${MANDIR}/skill.${MANSFX}
-+# rm -f ${DESTDIR}/${BINDIR}/snice ${DESTDIR}/${MANDIR}/snice.${MANSFX}
- # install -c -g ${BINGRP} -m ${BINMOD} -s skill ${DESTDIR}/${BINDIR}
-- cp skill ${DESTDIR}/${BINDIR}/skill
-- strip ${DESTDIR}/${BINDIR}/skill
-- chgrp ${BINGRP} ${DESTDIR}/${BINDIR}/skill
-- chmod ${BINMOD} ${DESTDIR}/${BINDIR}/skill
-- ln ${DESTDIR}/${BINDIR}/skill ${DESTDIR}/${BINDIR}/snice
-+# cp skill ${DESTDIR}/${BINDIR}/skill
-+# strip ${DESTDIR}/${BINDIR}/skill
-+# chgrp ${BINGRP} ${DESTDIR}/${BINDIR}/skill
-+# chmod ${BINMOD} ${DESTDIR}/${BINDIR}/skill
-+# ln ${DESTDIR}/${BINDIR}/skill ${DESTDIR}/${BINDIR}/snice
- #(SysV) filepriv -f dacread ${DESTDIR}/${BINDIR}/skill
- # install -c -m 644 skill.1 ${DESTDIR}/${MANDIR}/skill.${MANSFX}
-- cp skill.1 ${DESTDIR}/${MANDIR}/skill.${MANSFX}
-- chmod 644 ${DESTDIR}/${MANDIR}/skill.${MANSFX}
-- ln ${DESTDIR}/${MANDIR}/skill.${MANSFX}\
-- ${DESTDIR}/${MANDIR}/snice.${MANSFX}
-+# cp skill.1 ${DESTDIR}/${MANDIR}/skill.${MANSFX}
-+# chmod 644 ${DESTDIR}/${MANDIR}/skill.${MANSFX}
-+# ln ${DESTDIR}/${MANDIR}/skill.${MANSFX}\
-+# ${DESTDIR}/${MANDIR}/snice.${MANSFX}
-
- config Config: FRC
- ./Config
diff --git a/sysutils/skill/patches/patch-ab b/sysutils/skill/patches/patch-ab
deleted file mode 100644
index 1b9ba54908b..00000000000
--- a/sysutils/skill/patches/patch-ab
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD: patch-ab,v 1.10 2002/06/28 10:45:32 abs Exp $
-
---- main.c.orig Sat Apr 6 05:26:01 2002
-+++ main.c
-@@ -46,6 +46,12 @@ const char *CopyrightVersion = "%s %s\n\
- #include <stdio.h>
- #include <errno.h>
- #include <pwd.h>
-+#ifdef __NetBSD__
-+# include <sys/sysctl.h>
-+# ifndef KI_MAXCOMLEN /* Pre 1.5 */
-+# define KI_MAXCOMLEN 24
-+# endif
-+#endif
-
- /*
- * Processes which could not be checked -- usually due to permission
-@@ -137,7 +143,7 @@ main(argc, argv)
- for (i = 0; i < CmdIndx; i++) {
- cmdp = (CmdList + i);
- if ((cmdp->flags & CMD_FLAG_EXACT) != 0 &&
-- STREQU(CMD, cmdp->cmd.cmdstr))
-+ STRNEQU(CMD, cmdp->cmd.cmdstr, KI_MAXCOMLEN-8))
- break;
- else if ((cmdp->flags & CMD_FLAG_REGEX) != 0 &&
- RegexMatch(CMD, cmdp) != 0)
diff --git a/sysutils/socket/DESCR b/sysutils/socket/DESCR
deleted file mode 100644
index fd0f0412102..00000000000
--- a/sysutils/socket/DESCR
+++ /dev/null
@@ -1,13 +0,0 @@
-This is the README file for Socket-1.1.
-
-What is it?
-
-The program Socket implements access to TCP sockets from shell level.
-First written for the need to open a server socket and read and write
-to the socket interactively for testing purposes, it quickly evolved
-into a generic tool providing the socket interface for shell script
-and interactive use.
-
-Please send any comments, suggestions, bug reports etc. to me:
-
-Juergen Nickelsen <jn@berlin.snafu.de>
diff --git a/sysutils/socket/Makefile b/sysutils/socket/Makefile
deleted file mode 100644
index e7b9fd25133..00000000000
--- a/sysutils/socket/Makefile
+++ /dev/null
@@ -1,26 +0,0 @@
-# $NetBSD: Makefile,v 1.8 2003/06/02 01:16:52 jschauma Exp $
-# FreeBSD Id: Makefile,v 1.7 1997/08/16 10:14:56 wosch Exp
-#
-
-DISTNAME= socket-1.1
-CATEGORIES= sysutils net
-MASTER_SITES= http://www.freebsd.org/~wosch/src/
-
-MAINTAINER= tech-pkg@netbsd.org
-COMMENT= create tcp socket and connect to stdin/out
-
-MAKE_ENV+= INSTALLBASE=${PREFIX}
-
-BUILD_DEFS+= USE_INET6
-
-# to get USE_INET6
-.include "../../mk/bsd.prefs.mk"
-
-# IPv6 support
-.if defined(USE_INET6) && ${USE_INET6} == YES
-MAKE_ENV+= SWITCHES="-DUSE_INET6 -DHAVE_SYS_PARAM_H -Wall"
-.else
-MAKE_ENV+= SWITCHES="-DHAVE_SYS_PARAM_H -Wall"
-.endif
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/socket/PLIST b/sysutils/socket/PLIST
deleted file mode 100644
index 2c68fc8fe66..00000000000
--- a/sysutils/socket/PLIST
+++ /dev/null
@@ -1,3 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 22:53:48 zuntum Exp $
-bin/socket
-man/man1/socket.1.gz
diff --git a/sysutils/socket/distinfo b/sysutils/socket/distinfo
deleted file mode 100644
index f4cf91a09a1..00000000000
--- a/sysutils/socket/distinfo
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: distinfo,v 1.2 2001/04/19 11:29:08 agc Exp $
-
-SHA1 (socket-1.1.tar.gz) = 1ada9bc6d949c303734030b3a34e2d6f0544d1db
-Size (socket-1.1.tar.gz) = 14426 bytes
-SHA1 (patch-aa) = a2f567f4e27e18a333eeac46d1eb9c3033a7344f
-SHA1 (patch-ab) = a57ef3243601007113f07493201804a6050f3182
-SHA1 (patch-ac) = ae38cf5abfe6fcf252f2384cc718412fe86f4e48
-SHA1 (patch-ad) = 034f34565952f94b4e12cf78f0bb9b5612091e4d
-SHA1 (patch-ae) = e238447cf72ddfe25f40a4e7e3276485001ec26b
-SHA1 (patch-af) = b40a7bbd22a6773816eb0e52403d67317979451d
-SHA1 (patch-ag) = e106aac5b193a43ab208b648deadf173a78a6d6d
-SHA1 (patch-ah) = 03a996a5d1a40cf573882b842d94d24b226f74ca
-SHA1 (patch-ai) = ca87ec49ff6d51d5cd978bed366a4a0dc937fce3
diff --git a/sysutils/socket/patches/patch-aa b/sysutils/socket/patches/patch-aa
deleted file mode 100644
index 217ffaa787a..00000000000
--- a/sysutils/socket/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.5 1999/09/17 18:23:55 tron Exp $
-
---- Makefile.orig Thu Sep 10 16:59:31 1992
-+++ Makefile Tue Feb 2 23:52:02 1999
-@@ -8,7 +8,7 @@
- ### socket.1 in /usr/local/man/man1/socket.1
- ### Make sure the target directories exist before doing a "make install".
-
--INSTALLBASE = /usr/local
-+INSTALLBASE = ${PREFIX}
- INSTALLBINPATH = $(INSTALLBASE)/bin
- INSTALLBINMODE = 755
- INSTALLMANPATH = $(INSTALLBASE)/man
diff --git a/sysutils/socket/patches/patch-ab b/sysutils/socket/patches/patch-ab
deleted file mode 100644
index cc59b1be7b6..00000000000
--- a/sysutils/socket/patches/patch-ab
+++ /dev/null
@@ -1,10 +0,0 @@
-$NetBSD: patch-ab,v 1.1 1999/02/02 23:00:40 tron Exp $
-
---- README.orig Wed Sep 9 16:45:16 1992
-+++ README Tue Feb 2 23:52:02 1999
-@@ -166,4 +166,4 @@
- 1000 Berlin 10
- Germany
-
-- <nickel@cs.tu-berlin.de>
-+Juergen Nickelsen <jn@berlin.snafu.de>
diff --git a/sysutils/socket/patches/patch-ac b/sysutils/socket/patches/patch-ac
deleted file mode 100644
index 5fa0e86f466..00000000000
--- a/sysutils/socket/patches/patch-ac
+++ /dev/null
@@ -1,41 +0,0 @@
-$NetBSD: patch-ac,v 1.2 1999/09/17 18:23:55 tron Exp $
-
---- globals.h.orig Thu Sep 16 13:52:37 1999
-+++ globals.h Thu Sep 16 12:45:24 1999
-@@ -8,6 +8,10 @@
- */
-
- #include "patchlevel.h"
-+
-+#if HAVE_SYS_PARAM_H
-+# include <sys/param.h>
-+#endif
-
- /* globals for socket */
-
-@@ -22,9 +26,16 @@
- #define A(args) ()
- #endif
-
-+#ifndef USE_INET6
- int create_server_socket A((int port, int queue_length)) ;
- int create_client_socket A((char **hostname, int port)) ;
- int resolve_service A((char *name_or_number, char *protocol, char **name)) ;
-+#else /* USE_INET6 */
-+int *create_server_sockets A((char **port, int queue_length)) ;
-+int create_client_socket A((char **hostname, char **port)) ;
-+int socket_local_name A((int socket, char **name, char **ipname, char **port));
-+int socket_remote_name A((int socket, char **name, char **ipname, char **port));
-+#endif /* USE_INET6 */
- void catchsig A((int sig)) ;
- void usage A((void)) ;
- int do_read_write A((int from, int to)) ;
-@@ -49,4 +60,7 @@
- extern int crlfflag ;
- extern int active_socket ;
- extern char *progname ;
--extern char *sys_errlist[], *sys_siglist[] ;
-+
-+#if !(defined(BSD) && (BSD >=199306))
-+ extern char *sys_errlist[], *sys_siglist[] ;
-+#endif
diff --git a/sysutils/socket/patches/patch-ad b/sysutils/socket/patches/patch-ad
deleted file mode 100644
index f37d5626ef1..00000000000
--- a/sysutils/socket/patches/patch-ad
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ad,v 1.1 1999/02/02 23:00:40 tron Exp $
-
---- io.c.orig Sun Aug 30 19:15:26 1992
-+++ io.c Tue Feb 2 23:52:03 1999
-@@ -16,6 +16,8 @@
- #endif
- #include <errno.h>
- #include <stdio.h>
-+#include <string.h>
-+#include <unistd.h>
- #include "globals.h"
-
- /* read from from, write to to. select(2) has returned, so input
-@@ -90,7 +92,7 @@
-
- /* all IO to and from the socket is handled here. The main part is
- * a loop around select(2). */
--do_io()
-+void do_io()
- {
- fd_set readfds ;
- int fdset_width ;
diff --git a/sysutils/socket/patches/patch-ae b/sysutils/socket/patches/patch-ae
deleted file mode 100644
index bc6e55ef3ed..00000000000
--- a/sysutils/socket/patches/patch-ae
+++ /dev/null
@@ -1,39 +0,0 @@
-$NetBSD: patch-ae,v 1.1 1999/02/02 23:00:41 tron Exp $
-
---- siglist.c.orig Sun Aug 30 15:50:48 1992
-+++ siglist.c Tue Feb 2 23:58:03 1999
-@@ -23,6 +23,7 @@
-
- #include <stdio.h>
- #include <signal.h>
-+#include <stdlib.h>
-
- #if !defined (NSIG)
- # if defined (_NSIG)
-@@ -32,12 +33,17 @@
- # endif /* !_NSIG */
- #endif /* !NSIG */
-
--char *sys_siglist[NSIG];
-+#if HAVE_SYS_PARAM_H
-+# include <sys/param.h>
-+#endif
-
--extern *malloc ();
-+#if !(defined(BSD) && (BSD >=199306))
-+char *sys_siglist[NSIG];
-+#endif
-
--initialize_siglist ()
-+void initialize_siglist ()
- {
-+#if !(defined(BSD) && (BSD >=199306))
- register int i;
-
- for (i = 0; i < NSIG; i++)
-@@ -219,4 +225,5 @@
- sprintf (sys_siglist[i], "Unknown Signal #%d", i);
- }
- }
-+#endif /* !(defined(BSD) && (BSD >=199306)) */
- }
diff --git a/sysutils/socket/patches/patch-af b/sysutils/socket/patches/patch-af
deleted file mode 100644
index 7be40915b77..00000000000
--- a/sysutils/socket/patches/patch-af
+++ /dev/null
@@ -1,10 +0,0 @@
-$NetBSD: patch-af,v 1.1 1999/02/02 23:00:41 tron Exp $
-
---- socket.1.orig Wed Sep 9 16:38:19 1992
-+++ socket.1 Tue Feb 2 23:52:03 1999
-@@ -158,4 +158,4 @@
- .SH VERSION
- This manual page describes Socket\-1.1.
- .SH AUTHOR
--Juergen Nickelsen <nickel@cs.tu-berlin.de>
-+Juergen Nickelsen <jn@berlin.snafu.de>
diff --git a/sysutils/socket/patches/patch-ag b/sysutils/socket/patches/patch-ag
deleted file mode 100644
index b384e3d309f..00000000000
--- a/sysutils/socket/patches/patch-ag
+++ /dev/null
@@ -1,297 +0,0 @@
-$NetBSD: patch-ag,v 1.2 1999/09/17 18:23:55 tron Exp $
-
---- socket.c.orig Thu Sep 16 13:52:48 1999
-+++ socket.c Thu Sep 16 12:54:06 1999
-@@ -9,6 +9,9 @@
-
- #include <sys/types.h>
- #include <sys/socket.h>
-+#ifdef USE_INET6
-+#include <sys/time.h>
-+#endif /* USE_INET6 */
- #include <netinet/in.h>
- #include <netdb.h>
- #include <errno.h>
-@@ -18,6 +21,8 @@
- #else
- #include <string.h>
- #endif
-+#include <stdlib.h>
-+#include <unistd.h>
- #include "globals.h"
-
- /* global variables */
-@@ -34,9 +39,17 @@
- char *progname ; /* name of the game */
- char *pipe_program = NULL ; /* program to execute in two-way pipe */
-
-+#ifndef USE_INET6
- void server A((int port, char *service_name)) ;
--void handle_server_connection A((void)) ;
- void client A((char *host, int port, char *service_name)) ;
-+#else /* USE_INET6 */
-+void server A((char *port)) ;
-+void client A((char *host, char *port)) ;
-+#endif /* USE_INET6 */
-+
-+void handle_server_connection A((void)) ;
-+extern void init_signals A((void)) ;
-+extern void do_io A((void)) ;
-
- int main(argc, argv)
- int argc ;
-@@ -46,9 +59,11 @@
- int opt ; /* option character */
- int error = 0 ; /* usage error occurred */
- extern int optind ; /* from getopt() */
-- char *host ; /* name of remote host */
-+ /* char *host ; */ /* name of remote host */
-+#ifndef USE_INET6
- int port ; /* port number for socket */
- char *service_name ; /* name of service for port */
-+#endif /* USE_INET6 */
-
- /* print version ID if requested */
- if (argv[1] && !strcmp(argv[1], "-version")) {
-@@ -58,7 +73,8 @@
-
- /* set up progname for later use */
- progname = argv[0] ;
-- if (cp = strrchr(progname, '/')) progname = cp + 1 ;
-+ cp = strrchr(progname, '/');
-+ if (cp) progname = cp + 1 ;
-
- /* parse options */
- while ((opt = getopt(argc, argv, "bcflp:qrsvw?")) != -1) {
-@@ -126,6 +142,7 @@
- /* set up signal handling */
- init_signals() ;
-
-+#ifndef USE_INET6
- /* get port number */
- port = resolve_service(argv[optind + 1 - serverflag],
- "tcp", &service_name) ;
-@@ -134,41 +151,81 @@
- exit(5) ;
- }
-
-+#endif /* not USE_INET6 */
- /* and go */
- if (serverflag) {
- if (backgflag) {
- background() ;
- }
-+#ifndef USE_INET6
- server(port, service_name) ;
-+#else /* USE_INET6 */
-+ server(argv[optind]) ;
-+#endif /* USE_INET6 */
- } else {
-+#ifndef USE_INET6
- client(argv[optind], port, service_name) ;
-+#else /* USE_INET6 */
-+ client(argv[optind], argv[optind + 1]) ;
-+#endif /* USE_INET6 */
- }
- exit(0) ;
- }
-
-
-+#ifndef USE_INET6
- void server(port, service_name)
- int port ;
- char *service_name ;
-+#else /* USE_INET6 */
-+void server(port)
-+char *port ;
-+#endif /* USE_INET6 */
- {
-+#ifndef USE_INET6
- int socket_handle, alen ;
-+#else /* USE_INET6 */
-+ int *socket_handle_list ;
-+#endif /* USE_INET6 */
-
- /* allocate server socket */
-+#ifndef USE_INET6
- socket_handle = create_server_socket(port, 1) ;
- if (socket_handle < 0) {
-+#else /* USE_INET6 */
-+ socket_handle_list = create_server_sockets(&port, 1) ;
-+ if (!socket_handle_list) {
-+#endif /* USE_INET6 */
- perror2("server socket") ;
- exit(1) ;
- }
-+#ifdef USE_INET6
-+
-+#endif /* USE_INET6 */
- if (verboseflag) {
-+#ifndef USE_INET6
- fprintf(stderr, "listening on port %d", port) ;
- if (service_name) {
- fprintf(stderr, " (%s)", service_name) ;
- }
- fprintf(stderr, "\n") ;
-+#else /* USE_INET6 */
-+ char *ip, *port;
-+ int fd, i;
-+
-+ fd = socket_handle_list[1];
-+ for (i = 1; i <= socket_handle_list[0]; i++) {
-+ if (!fd || fd < socket_handle_list[i])
-+ fd = socket_handle_list[i];
-+ socket_local_name (fd, NULL, &ip, &port);
-+ fprintf(stderr, "listening at address %s on port %s\n", ip, port) ;
-+ }
-+#endif /* USE_INET6 */
- }
-
- /* server loop */
- do {
-+#ifndef USE_INET6
- struct sockaddr_in sa ;
-
- alen = sizeof(sa) ;
-@@ -185,16 +242,76 @@
- long norder ;
- char dotted[20] ;
-
-- he = gethostbyaddr(&sa.sin_addr.s_addr,
-+ he = gethostbyaddr((const char *)&sa.sin_addr.s_addr,
- sizeof(sa.sin_addr.s_addr), AF_INET) ;
- if (!he) {
- norder = htonl(sa.sin_addr.s_addr) ;
- sprintf(dotted, "%d.%d.%d.%d",
-- (norder >> 24) & 0xff,
-- (norder >> 16) & 0xff,
-- (norder >> 8) & 0xff,
-- norder & 0xff) ;
-+ (int)((norder >> 24) & 0xff),
-+ (int)((norder >> 16) & 0xff),
-+ (int)((norder >> 8) & 0xff),
-+ (int)(norder & 0xff)) ;
-+#else /* USE_INET6 */
-+ struct timeval tv;
-+ fd_set readfd;
-+ int fd, i, nfds, retval;
-+
-+ fd = socket_handle_list[1];
-+ for (i = 1; i <= socket_handle_list[0]; i++) {
-+ if (!fd || fd < socket_handle_list[i])
-+ fd = socket_handle_list[i];
-+ }
-+ nfds=fd+1;
-+
-+ FD_ZERO(&readfd);
-+ for (i = 1; i <= socket_handle_list[0]; i++)
-+ FD_SET(socket_handle_list[i],&readfd);
-+
-+ tv.tv_sec = 10;
-+ tv.tv_usec = 0;
-+
-+ retval = select(nfds, &readfd, NULL, NULL, &tv);
-+
-+ if(retval!=-1) {
-+ for (i = 1; i <= socket_handle_list[0]; i++) {
-+ fd = socket_handle_list[i];
-+ if (FD_ISSET(fd, &readfd)) {
-+
-+ /* accept a connection */
-+ active_socket = accept(fd, (struct sockaddr *) 0, (int *)0);
-+ if (active_socket == -1) {
-+ perror2("accept") ;
-+ } else {
-+ /* if verbose, get name of peer and give message */
-+ if (verboseflag) {
-+ char *host, *ip, *port;
-+
-+ if(!socket_remote_name(active_socket,&host, &ip, &port)) {
-+ fprintf(stderr, "connection from %s at %s to %s\n", host, ip, port);
-+ }
-+ else
-+ fprintf(stderr, "cannot get name or address of peer") ;
-+ }
-+
-+ if (forkflag) {
-+ switch (fork()) {
-+ case 0:
-+ handle_server_connection() ;
-+ exit(0) ;
-+ case -1:
-+ perror2("fork") ;
-+ break ;
-+ default:
-+ close(active_socket) ;
-+ wait_for_children() ;
-+ }
-+ } else {
-+ handle_server_connection() ;
-+ }
-+ }
-+#endif /* USE_INET6 */
- }
-+#ifndef USE_INET6
- fprintf(stderr, "connection from %s\n",
- (he ? he->h_name : dotted)) ;
- }
-@@ -212,9 +329,14 @@
- }
- } else {
- handle_server_connection() ;
-+#endif /* not USE_INET6 */
- }
- }
- } while (loopflag) ;
-+#ifdef USE_INET6
-+
-+ free (socket_handle_list);
-+#endif /* USE_INET6 */
- }
-
-
-@@ -235,13 +357,25 @@
- }
-
-
-+#ifndef USE_INET6
- void client(host, port, service_name)
-+#else /* USE_INET6 */
-+void client(host, port)
-+#endif /* USE_INET6 */
- char *host ;
-+#ifndef USE_INET6
- int port ;
- char *service_name ;
-+#else /* USE_INET6 */
-+char *port ;
-+#endif /* USE_INET6 */
- {
- /* get connection */
-+#ifndef USE_INET6
- active_socket = create_client_socket(&host, port) ;
-+#else /* USE_INET6 */
-+ active_socket = create_client_socket(&host, &port) ;
-+#endif /* USE_INET6 */
- if (active_socket == -1) {
- perror2("client socket") ;
- exit(errno) ;
-@@ -250,11 +384,18 @@
- exit(13) ;
- }
- if (verboseflag) {
-+#ifndef USE_INET6
- fprintf(stderr, "connected to %s port %d", host, port) ;
- if (service_name) {
- fprintf(stderr, " (%s)", service_name) ;
- }
- fprintf(stderr, "\n") ;
-+#else /* USE_INET6 */
-+ char *host, *ip, *port;
-+
-+ socket_local_name (active_socket, &host, &ip, &port);
-+ fprintf(stderr, "connected to %s with address %s at port %s\n", host, ip, port) ;
-+#endif /* USE_INET6 */
- }
-
- /* open pipes to program if requested */
diff --git a/sysutils/socket/patches/patch-ah b/sysutils/socket/patches/patch-ah
deleted file mode 100644
index 3ed55d76784..00000000000
--- a/sysutils/socket/patches/patch-ah
+++ /dev/null
@@ -1,329 +0,0 @@
-$NetBSD: patch-ah,v 1.2 1999/09/17 18:23:56 tron Exp $
-
---- socketp.c.orig Thu Sep 16 13:52:58 1999
-+++ socketp.c Thu Sep 16 13:26:38 1999
-@@ -11,10 +11,17 @@
- #include <sys/socket.h>
- #include <sys/errno.h>
- #include <netinet/in.h>
-+#include <arpa/inet.h>
- #include <netdb.h>
- #include <stdio.h>
-+#include <stdlib.h>
-+#include <string.h>
-+#include <unistd.h>
- #include "globals.h"
-
-+extern int is_number A((char *));
-+
-+#ifndef USE_INET6
- /*
- * create a server socket on PORT accepting QUEUE_LENGTH connections
- */
-@@ -25,9 +32,9 @@
- struct sockaddr_in sa ;
- int s;
-
-- if ((s = socket(AF_INET, SOCK_STREAM, 0)) < 0) {
-+ s = socket(AF_INET, SOCK_STREAM, 0);
-+ if (s < 0)
- return -1 ;
-- }
-
- bzero((char *) &sa, sizeof(sa)) ;
- sa.sin_family = AF_INET ;
-@@ -35,54 +42,270 @@
- sa.sin_port = htons(port) ;
-
- if (bind(s, (struct sockaddr *) &sa, sizeof(sa)) < 0) {
-- return -1 ;
-+ return -1 ;
- }
- if (listen(s, 1) < 0) {
-- return -1 ;
-+ return -1 ;
- }
-
- return s ;
- }
-+#else /* USE_INET6 */
-+/*
-+ * create a server socket(s) on PORT accepting QUEUE_LENGTH connections
-+ *
-+ * FWD (ifdef USE_INET6):
-+ * there can be more than one socket; one for each supported address
-+ * family. This is for portability as not all IPv6 stacks implement
-+ * the wildcard bind as a bind to *ll IPv4 *and* IPv6 addresses.
-+ * so we'll just open a socket for each address getaddrinfo() gives
-+ * back to us. The price of portability...
-+ */
-+int *create_server_sockets(port, queue_length)
-+char **port ;
-+int queue_length ;
-+{
-+ struct addrinfo hints, *r, *res;
-+ int *s, *slist, error, maxs;
-+ int reuse_addr = 1;
-+
-+ memset(&hints, 0, sizeof(hints));
-+ hints.ai_flags = AI_PASSIVE;
-+ hints.ai_family = AF_UNSPEC;
-+ hints.ai_socktype = SOCK_STREAM;
-+ hints.ai_protocol = 0;
-+ error = getaddrinfo(NULL, *port, &hints, &res);
-+
-+ if (!error) {
-+ for (maxs = 0, r = res; r; r = r->ai_next, maxs++);
-+ slist = malloc ((maxs+1) * sizeof(int));
-+ if (slist) {
-+ slist[0] = maxs; /* max. num of sockets */
-+
-+ s = slist+1;
-+ for (r = res; r; r = r->ai_next) {
-+ *s = socket(r->ai_family, r->ai_socktype, r->ai_protocol);
-+ if (*s < 0)
-+ continue;
-+
-+ setsockopt(*s,SOL_SOCKET,SO_REUSEADDR,&reuse_addr,sizeof(reuse_addr));
-+
-+ if (bind(*s, r->ai_addr, r->ai_addrlen) < 0) {
-+ close (*s);
-+ continue;
-+ }
-+
-+ if (listen(*s, 1) < 0) {
-+ close (*s);
-+ continue;
-+ }
-+ s++;
-+ }
-+ }
-+ }
-+ else
-+ slist = NULL;
-+
-+ if (res)
-+ freeaddrinfo(res);
-+
-+ if (slist && !slist[0]) {
-+ free (slist);
-+ slist = NULL;
-+ }
-+
-+ return (slist);
-+}
-+#endif /* USE_INET6 */
-
-
- /* create a client socket connected to PORT on HOSTNAME */
-+#ifndef USE_INET6
-+/* create a client socket connected to PORT on HOSTNAME */
- int create_client_socket(hostname, port)
- char **hostname ;
- int port ;
- {
- struct sockaddr_in sa ;
- struct hostent *hp ;
-- int a, s ;
-+ int s ;
- long addr ;
-
-
- bzero(&sa, sizeof(sa)) ;
- if ((addr = inet_addr(*hostname)) != -1) {
-- /* is Internet addr in octet notation */
-- bcopy(&addr, (char *) &sa.sin_addr, sizeof(addr)) ; /* set address */
-- sa.sin_family = AF_INET ;
-+ /* is Internet addr in octet notation */
-+ bcopy(&addr, (char *) &sa.sin_addr, sizeof(addr)) ; /* set address */
-+ sa.sin_family = AF_INET ;
- } else {
-- /* do we know the host's address? */
-- if ((hp = gethostbyname(*hostname)) == NULL) {
-- return -2 ;
-- }
-- *hostname = hp->h_name ;
-- bcopy(hp->h_addr, (char *) &sa.sin_addr, hp->h_length) ;
-- sa.sin_family = hp->h_addrtype ;
-+ /* do we know the host's address? */
-+ if ((hp = gethostbyname(*hostname)) == NULL) {
-+ return -2 ;
-+ }
-+ *hostname = hp->h_name ;
-+ bcopy(hp->h_addr, (char *) &sa.sin_addr, hp->h_length) ;
-+ sa.sin_family = hp->h_addrtype ;
- }
-
- sa.sin_port = htons((u_short) port) ;
-
- if ((s = socket(sa.sin_family, SOCK_STREAM, 0)) < 0) { /* get socket */
-- return -1 ;
-+ return -1 ;
- }
-- if (connect(s, &sa, sizeof(sa)) < 0) { /* connect */
-- close(s) ;
-- return -1 ;
-+ if (connect(s, (struct sockaddr *)&sa, sizeof(sa)) < 0) { /* connect */
-+ close(s) ;
-+ return -1 ;
- }
- return s ;
- }
-
-+#else /* USE_INET6 */
-+int create_client_socket(hostname, port)
-+char **hostname ;
-+char **port ;
-+{
-+ int s, connected, err ;
-+ struct addrinfo hints, *r, *res;
-+
-+ memset(&hints, 0, sizeof(hints));
-+ hints.ai_flags = AI_NUMERICHOST;
-+ hints.ai_family = AF_UNSPEC;
-+ hints.ai_socktype= SOCK_STREAM;
-+ err = getaddrinfo(*hostname, *port, &hints, &res);
-+ if (res) freeaddrinfo(res);
-+
-+ if (!err) {
-+ /* numeric */
-+ memset(&hints, 0, sizeof(hints));
-+ hints.ai_flags = AI_CANONNAME;
-+ hints.ai_family = AF_UNSPEC;
-+ hints.ai_socktype = SOCK_STREAM;
-+ hints.ai_protocol = 0;
-+ err = getaddrinfo(*hostname, *port, &hints, &res);
-+ if (err) s = -2;
-+ } else {
-+ /* non-numeric */
-+ memset(&hints, 0, sizeof(hints));
-+ hints.ai_family = AF_UNSPEC;
-+ hints.ai_socktype = SOCK_STREAM;
-+ hints.ai_protocol = 0;
-+ err = getaddrinfo(*hostname, *port, &hints, &res);
-+ if (err) s = -2;
-+ }
-+
-+
-+ if (!err) {
-+ err = 0; s = -1;
-+ connected = 0;
-+ for (r = res; r && !connected; r = r->ai_next) {
-+ s = socket(r->ai_family, r->ai_socktype, r->ai_protocol);
-+ if (s < 0)
-+ continue;
-+
-+ if (connect(s, r->ai_addr, r->ai_addrlen) < 0) {
-+ err = errno;
-+ close(s);
-+ s = -1;
-+ continue;
-+ }
-+ connected++;
-+ break;
-+ }
-+ if (!connected) s = -1;
-+ }
-+
-+ if (res)
-+ freeaddrinfo(res);
-+
-+ return (s);
-+}
-+#endif /* USE_INET6 */
-+
-+#ifdef USE_INET6
-+/* Determines hostname, address and port number used for the peer of socket */
-+int socket_remote_name(socket, name, ipname, port)
-+int socket;
-+char **name;
-+char **ipname;
-+char **port;
-+{
-+ struct sockaddr_storage server;
-+ int length=sizeof(server), retval, error;
-+ static char host[NI_MAXHOST],ip[NI_MAXHOST],portstr[NI_MAXSERV];
-+
-+ error = getpeername(socket,(struct sockaddr*)&server,&length);
-+ if(!error) {
-+ error = getnameinfo((struct sockaddr*)&server, length, host,
-+ NI_MAXHOST, NULL, 0, 0);
-+ error = getnameinfo((struct sockaddr*)&server, length, ip,
-+ NI_MAXHOST, NULL, NI_MAXSERV,
-+ NI_NUMERICHOST);
-+ retval = error;
-+
-+ error = getnameinfo((struct sockaddr*)&server, length, NULL, 0,
-+ portstr, NI_MAXSERV, 0);
-+
-+ if (error)
-+ retval = getnameinfo((struct sockaddr*)&server, length, ip,
-+ NI_MAXHOST, portstr, NI_MAXSERV,
-+ NI_NUMERICSERV);
-+ }
-+ else
-+ retval = error;
-+
-+ if(name)
-+ *name=host;
-+ if(ipname)
-+ *ipname=ip;
-+ if(port)
-+ *port=portstr;
-+
-+ return(retval);
-+}
-+
-+/* Determines the hostname, address and port number used for our socket */
-+int socket_local_name(socket, name, ipname, port)
-+int socket;
-+char **name;
-+char **ipname;
-+char **port;
-+{
-+ struct sockaddr_storage server;
-+ int length=sizeof(server), retval, error;
-+ static char host[NI_MAXHOST],ip[NI_MAXHOST],portstr[NI_MAXSERV];
-+
-+ error = getsockname(socket,(struct sockaddr*)&server,&length);
-+ if(!error) {
-+ error = getnameinfo((struct sockaddr*)&server, length, host,
-+ NI_MAXHOST, NULL, 0, 0);
-+ error = getnameinfo((struct sockaddr*)&server, length, ip,
-+ NI_MAXHOST, NULL, NI_MAXSERV,
-+ NI_NUMERICHOST);
-+ retval = error;
-+
-+ error = getnameinfo((struct sockaddr*)&server, length, NULL, 0,
-+ portstr, NI_MAXSERV, 0);
-+
-+ if (error)
-+ retval = getnameinfo((struct sockaddr*)&server, length, ip,
-+ NI_MAXHOST, portstr, NI_MAXSERV,
-+ NI_NUMERICSERV);
-+ }
-+ else
-+ retval = error;
-+
-+ if(name)
-+ *name=host;
-+ if(ipname)
-+ *ipname=ip;
-+ if(port)
-+ *port=portstr;
-+
-+ return(retval);
-+}
-+#endif /* USE_INET6 */
-+
-+#ifndef USE_INET6
- /* return the port number for service NAME_OR_NUMBER. If NAME is non-null,
- * the name is the service is written there.
- */
-@@ -116,5 +339,6 @@
- return ntohs(servent->s_port) ;
- }
- }
-+#endif /* !USE_INET6 */
-
- /*EOF*/
diff --git a/sysutils/socket/patches/patch-ai b/sysutils/socket/patches/patch-ai
deleted file mode 100644
index 3505f34fa14..00000000000
--- a/sysutils/socket/patches/patch-ai
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-ai,v 1.1 1999/02/02 23:00:41 tron Exp $
-
---- utils.c.orig Wed Sep 9 16:31:16 1992
-+++ utils.c Tue Feb 2 23:52:03 1999
-@@ -25,8 +25,10 @@
- #else
- #include <sys/resource.h>
- #endif
-+#include <unistd.h>
- #include "globals.h"
-
-+extern void initialize_siglist A((void)) ;
-
- /* Signal handler, print message and exit */
- SIG_HANDLER_RET exitsig(sig)
-@@ -70,7 +72,7 @@
-
- /* set up signal handling. All except TSTP, CONT, CLD, and QUIT
- * are caught with exitsig(). */
--init_signals()
-+void init_signals()
- {
- int i ;
- #ifdef SIG_SETMASK /* only with BSD signals */
diff --git a/sysutils/sshsh/DESCR b/sysutils/sshsh/DESCR
deleted file mode 100644
index d17e519fd9e..00000000000
--- a/sysutils/sshsh/DESCR
+++ /dev/null
@@ -1,2 +0,0 @@
-Sshsh checks for an existing ssh-agent connection. It runs one
-if necessary, and tries to add your default identity to it.
diff --git a/sysutils/sshsh/Makefile b/sysutils/sshsh/Makefile
deleted file mode 100644
index dd77c26f77b..00000000000
--- a/sysutils/sshsh/Makefile
+++ /dev/null
@@ -1,15 +0,0 @@
-# $NetBSD: Makefile,v 1.2 2001/02/17 17:42:18 wiz Exp $
-#
-
-DISTNAME= sshsh-1.0
-CATEGORIES= sysutils
-MASTER_SITES= ftp://ftp.gw.com/pub/people/kim/
-
-MAINTAINER= kim@tac.nyc.ny.us
-COMMENT= run a new shell with an SSH identity
-
-NO_CONFIGURE= yes
-ALL_TARGET= all PREFIX=${PREFIX}
-INSTALL_TARGET= install PREFIX=${PREFIX}
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/sshsh/PLIST b/sysutils/sshsh/PLIST
deleted file mode 100644
index 3f5c1b3894d..00000000000
--- a/sysutils/sshsh/PLIST
+++ /dev/null
@@ -1,3 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 22:53:48 zuntum Exp $
-bin/sshsh
-man/man1/sshsh.1
diff --git a/sysutils/sshsh/distinfo b/sysutils/sshsh/distinfo
deleted file mode 100644
index 33d27e5938c..00000000000
--- a/sysutils/sshsh/distinfo
+++ /dev/null
@@ -1,4 +0,0 @@
-$NetBSD: distinfo,v 1.2 2001/04/19 11:29:08 agc Exp $
-
-SHA1 (sshsh-1.0.tar.gz) = b27a1f19f86ae6546dca6098377874204a6ddde8
-Size (sshsh-1.0.tar.gz) = 865 bytes
diff --git a/sysutils/storage-manager/DESCR b/sysutils/storage-manager/DESCR
deleted file mode 100644
index 207e4934c35..00000000000
--- a/sysutils/storage-manager/DESCR
+++ /dev/null
@@ -1,5 +0,0 @@
-Adaptec Storage Manager, event logger and associated tools.
-For use with DPT and Adaptec I2O SCSI & IDE RAID adapters.
-
-See also the "sysutils/dptutil" package (in particular, for
-old EATA adapters, which this package does not support).
diff --git a/sysutils/storage-manager/Makefile b/sysutils/storage-manager/Makefile
deleted file mode 100644
index 7add90d300c..00000000000
--- a/sysutils/storage-manager/Makefile
+++ /dev/null
@@ -1,89 +0,0 @@
-# $NetBSD: Makefile,v 1.10 2003/04/10 20:10:20 grant Exp $
-
-DISTNAME= sm_linux_v314_install
-PKGNAME= storage-manager-3.14
-WRKSRC= ${WRKDIR}/sm_linux_v314_install
-CATEGORIES= sysutils
-MASTER_SITES= # empty
-EXTRACT_SUFX= .rpm
-
-MAINTAINER= ad@netbsd.org
-HOMEPAGE= http://opensource.adaptec.com/
-COMMENT= Adaptec Storage Management software
-
-BUILD_DEPENDS+= rpm>=2.5.4:../../misc/rpm
-DEPENDS+= suse_compat>=6.1:../../emulators/${SUSE_DIR_PREFIX}_compat
-DEPENDS+= suse_x11>=6.1:../../emulators/${SUSE_DIR_PREFIX}_x11
-
-ONLY_FOR_PLATFORM= NetBSD-*-i386
-
-RESTRICTED= "Redistribution not permitted"
-NO_SRC_ON_FTP= ${RESTRICTED}
-NO_SRC_ON_CDROM= ${RESTRICTED}
-NO_BIN_ON_FTP= ${RESTRICTED}
-NO_BIN_ON_CDROM= ${RESTRICTED}
-
-CHECK_SHLIBS= NO
-_STRIPFLAG_INSTALL= # defined
-NO_CONFIGURE= # defined
-NO_BUILD= # defined
-INTERACTIVE_STAGE= fetch
-
-DOWNLOAD= http://www.adaptec.com/worldwide/support/driverdetail.html?cat=%2fOperating+System%2fLinux&filekey=sm_linux_v314_install.rpm
-
-_FETCH_MESSAGE= \
- ${ECHO} "================================================================="; \
- ${ECHO} " Adaptec Storage Manager 3.14 for RedHat Linux must be fetched"; \
- ${ECHO} " into ${DISTDIR} from"; \
- ${ECHO} " ${DOWNLOAD}."; \
- ${ECHO} "================================================================="
-
-do-extract:
- ${MKDIR} ${WRKSRC}
- cd ${WRKSRC} && rpm2cpio ${DISTDIR}/${DISTNAME}.rpm > ${DISTNAME}.cpio
- cd ${WRKSRC} && ${PAX} -O -d -rf ${DISTNAME}.cpio
-
-do-patch:
- ${SED} -e "s,@PREFIX@,${PREFIX},g" \
- ${FILESDIR}/dptmgr.sh > ${WRKDIR}/dptmgr.sh
- ${SED} -e "s,@PREFIX@,${PREFIX},g" \
- ${FILESDIR}/dptsig.sh > ${WRKDIR}/dptsig.sh
- ${SED} -e "s,@PREFIX@,${PREFIX},g" \
- ${FILESDIR}/raidutil.sh > ${WRKDIR}/raidutil.sh
- ${SED} -e "s,@PREFIX@,${PREFIX},g" \
- ${FILESDIR}/dpteng > ${WRKDIR}/dpteng
- ${SED} -e "s,@PREFIX@,${PREFIX},g" \
- ${FILESDIR}/dptelog > ${WRKDIR}/dptelog
-
-do-install:
- ${INSTALL_PROGRAM_DIR} ${PREFIX}/lib/dpt
- ${INSTALL_PROGRAM} ${WRKSRC}/usr/dpt/dptcom ${PREFIX}/lib/dpt
- ${INSTALL_PROGRAM} ${WRKSRC}/usr/dpt/dptelog ${PREFIX}/lib/dpt
- ${INSTALL_PROGRAM} ${WRKSRC}/usr/dpt/dpteng ${PREFIX}/lib/dpt
- ${INSTALL_PROGRAM} ${WRKSRC}/usr/dpt/dptmgr ${PREFIX}/lib/dpt
- ${INSTALL_PROGRAM} ${WRKSRC}/usr/dpt/dptscom ${PREFIX}/lib/dpt
- ${INSTALL_PROGRAM} ${WRKSRC}/usr/dpt/dptsig ${PREFIX}/lib/dpt
- ${INSTALL_PROGRAM} ${WRKSRC}/usr/dpt/raidutil ${PREFIX}/lib/dpt
- ${INSTALL_DATA} ${WRKSRC}/usr/dpt/dptcom.chk ${PREFIX}/lib/dpt
- ${INSTALL_DATA} ${WRKSRC}/usr/dpt/dptelog.ini ${PREFIX}/lib/dpt
- ${INSTALL_DATA} ${WRKSRC}/usr/dpt/dptmgr.hlp ${PREFIX}/lib/dpt
- ${INSTALL_DATA} ${WRKSRC}/usr/dpt/dptmgr.rsc ${PREFIX}/lib/dpt
- ${INSTALL_DATA} ${WRKSRC}/usr/dpt/dptmgr.ini ${PREFIX}/lib/dpt
- ${INSTALL_DATA} ${WRKSRC}/usr/dpt/read.me ${PREFIX}/lib/dpt
- ${INSTALL_DATA} ${WRKSRC}/usr/local/LessTif/Motif1.2/lib/libMrm.la ${PREFIX}/lib/dpt
- ${INSTALL_DATA} ${WRKSRC}/usr/local/LessTif/Motif1.2/lib/libMrm.so ${PREFIX}/lib/dpt
- ${INSTALL_DATA} ${WRKSRC}/usr/local/LessTif/Motif1.2/lib/libMrm.so.1 ${PREFIX}/lib/dpt
- ${INSTALL_DATA} ${WRKSRC}/usr/local/LessTif/Motif1.2/lib/libMrm.so.1.0.2 ${PREFIX}/lib/dpt
- ${INSTALL_DATA} ${WRKSRC}/usr/local/LessTif/Motif1.2/lib/libXm.la ${PREFIX}/lib/dpt
- ${INSTALL_DATA} ${WRKSRC}/usr/local/LessTif/Motif1.2/lib/libXm.so ${PREFIX}/lib/dpt
- ${INSTALL_DATA} ${WRKSRC}/usr/local/LessTif/Motif1.2/lib/libXm.so.1 ${PREFIX}/lib/dpt
- ${INSTALL_DATA} ${WRKSRC}/usr/local/LessTif/Motif1.2/lib/libXm.so.1.0.2 ${PREFIX}/lib/dpt
- ${INSTALL_MAN} ${WRKSRC}/usr/local/man/man8/raidutil.8 ${PREFIX}/man/man8
- ${INSTALL_SCRIPT} ${WRKDIR}/dptmgr.sh ${PREFIX}/sbin/dptmgr
- ${INSTALL_SCRIPT} ${WRKDIR}/dptsig.sh ${PREFIX}/sbin/dptsig
- ${INSTALL_SCRIPT} ${WRKDIR}/raidutil.sh ${PREFIX}/sbin/raidutil
- ${INSTALL_SCRIPT} ${WRKDIR}/dpteng ${PREFIX}/etc/rc.d/dpteng
- ${INSTALL_SCRIPT} ${WRKDIR}/dptelog ${PREFIX}/etc/rc.d/dptelog
-
-.include "../../emulators/suse_linux/Makefile.application"
-.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/storage-manager/PLIST b/sysutils/storage-manager/PLIST
deleted file mode 100644
index 4079a9d29fa..00000000000
--- a/sysutils/storage-manager/PLIST
+++ /dev/null
@@ -1,29 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 22:53:49 zuntum Exp $
-etc/rc.d/dptelog
-etc/rc.d/dpteng
-lib/dpt/dptcom
-lib/dpt/dptcom.chk
-lib/dpt/dptelog
-lib/dpt/dptelog.ini
-lib/dpt/dpteng
-lib/dpt/dptmgr
-lib/dpt/dptmgr.hlp
-lib/dpt/dptmgr.ini
-lib/dpt/dptmgr.rsc
-lib/dpt/dptscom
-lib/dpt/dptsig
-lib/dpt/libMrm.la
-lib/dpt/libMrm.so
-lib/dpt/libMrm.so.1
-lib/dpt/libMrm.so.1.0.2
-lib/dpt/libXm.la
-lib/dpt/libXm.so
-lib/dpt/libXm.so.1
-lib/dpt/libXm.so.1.0.2
-lib/dpt/raidutil
-lib/dpt/read.me
-man/man8/raidutil.8
-sbin/dptmgr
-sbin/dptsig
-sbin/raidutil
-@dirrm lib/dpt
diff --git a/sysutils/storage-manager/distinfo b/sysutils/storage-manager/distinfo
deleted file mode 100644
index 3032bb849b9..00000000000
--- a/sysutils/storage-manager/distinfo
+++ /dev/null
@@ -1,4 +0,0 @@
-$NetBSD: distinfo,v 1.1.1.1 2001/09/26 07:28:49 ad Exp $
-
-SHA1 (sm_linux_v314_install.rpm) = 85b6df94620deb11c8641b024b994e11872932b1
-Size (sm_linux_v314_install.rpm) = 1245715 bytes
diff --git a/sysutils/storage-manager/files/dptelog b/sysutils/storage-manager/files/dptelog
deleted file mode 100755
index 10514dd88d1..00000000000
--- a/sysutils/storage-manager/files/dptelog
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/bin/sh
-#
-# $NetBSD: dptelog,v 1.1.1.1 2001/09/26 07:28:49 ad Exp $
-#
-
-# PROVIDE: dptelog
-# REQUIRE: DAEMON dpteng
-
-. /etc/rc.subr
-
-name="dptelog"
-rcvar=$name
-command="@PREFIX@/lib/dpt/${name}"
-start_cmd="dptelog_start"
-
-dptelog_start()
-{
-
- echo Starting $name.
- $command 2> /dev/null &
-}
-
-dptelog_stop()
-{
-
- kill `ps ax | grep "lib/dpt/dptelog" | awk '{ print $1 }'`
-}
-
-load_rc_config $name
-run_rc_command "$1"
diff --git a/sysutils/storage-manager/files/dpteng b/sysutils/storage-manager/files/dpteng
deleted file mode 100755
index 6ad44dc341b..00000000000
--- a/sysutils/storage-manager/files/dpteng
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/bin/sh
-#
-# $NetBSD: dpteng,v 1.1.1.1 2001/09/26 07:28:49 ad Exp $
-#
-
-# PROVIDE: dpteng
-# REQUIRE: DAEMON
-
-. /etc/rc.subr
-
-name="dpteng"
-rcvar=$name
-command="@PREFIX@/lib/dpt/${name}"
-pidfile="/tmp/dpteng.LOCK"
-start_cmd="dpteng_start"
-stop_cmd="dpteng_stop"
-
-dpteng_start()
-{
-
- echo Starting $name.
- $command 2> /dev/null &
-}
-
-dpteng_stop()
-{
-
- echo Stopping $name.
- kill -9 `cat $pidfile`
-}
-
-load_rc_config $name
-run_rc_command "$1"
diff --git a/sysutils/storage-manager/files/dptmgr.sh b/sysutils/storage-manager/files/dptmgr.sh
deleted file mode 100644
index fc8818796dc..00000000000
--- a/sysutils/storage-manager/files/dptmgr.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh
-#
-# $NetBSD: dptmgr.sh,v 1.1.1.1 2001/09/26 07:28:49 ad Exp $
-#
-DPTMGR_HOME=@PREFIX@/lib/dpt
-LD_LIBRARY_PATH=$DPTMGR_HOME:$LD_LIBRARY_PATH
-export LD_LIBRARY_PATH
-exec ${DPTMGR_HOME}/dptmgr "$@"
diff --git a/sysutils/storage-manager/files/dptsig.sh b/sysutils/storage-manager/files/dptsig.sh
deleted file mode 100644
index b51fec03e1b..00000000000
--- a/sysutils/storage-manager/files/dptsig.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh
-#
-# $NetBSD: dptsig.sh,v 1.1.1.1 2001/09/26 07:28:49 ad Exp $
-#
-DPTMGR_HOME=@PREFIX@/lib/dpt
-LD_LIBRARY_PATH=$DPTMGR_HOME:$LD_LIBRARY_PATH
-export LD_LIBRARY_PATH
-exec ${DPTMGR_HOME}/dptsig "$@"
diff --git a/sysutils/storage-manager/files/raidutil.sh b/sysutils/storage-manager/files/raidutil.sh
deleted file mode 100644
index 978a7870f7c..00000000000
--- a/sysutils/storage-manager/files/raidutil.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh
-#
-# $NetBSD: raidutil.sh,v 1.1.1.1 2001/09/26 07:28:49 ad Exp $
-#
-DPTMGR_HOME=@PREFIX@/lib/dpt
-LD_LIBRARY_PATH=$DPTMGR_HOME:$LD_LIBRARY_PATH
-export LD_LIBRARY_PATH
-exec ${DPTMGR_HOME}/raidutil "$@"
diff --git a/sysutils/stow/DESCR b/sysutils/stow/DESCR
deleted file mode 100644
index 9048c283781..00000000000
--- a/sysutils/stow/DESCR
+++ /dev/null
@@ -1,14 +0,0 @@
-Stow is a tool for managing the installation of multiple software
-packages in the same run-time directory tree. One historical
-difficulty of this task has been the need to administer, upgrade,
-install and remove files in independent packages without confusing
-them with other files sharing the same filesystem space.
-
-The approach used by Stow is to install each package into its own
-tree, then use symbolic links to make it appear as though the files
-are installed in the common tree. Administration can be performed in
-the package's private tree in isolation from clutter from other
-packages.
-
-Stow was inspired by Carnegie-Mellon's Depot program, but is
-substantially smaller.
diff --git a/sysutils/stow/Makefile b/sysutils/stow/Makefile
deleted file mode 100644
index ff93e8e0b68..00000000000
--- a/sysutils/stow/Makefile
+++ /dev/null
@@ -1,20 +0,0 @@
-# $NetBSD: Makefile,v 1.8 2003/06/02 01:16:52 jschauma Exp $
-#
-
-DISTNAME= stow-1.3.3
-CATEGORIES= textproc perl5
-MASTER_SITES= ${MASTER_SITE_GNU:=stow/}
-
-MAINTAINER= tech-pkg@netbsd.org
-HOMEPAGE= http://www.gnu.ai.mit.edu/software/stow/stow.html
-COMMENT= Maps several separate packages into a tree without merging them
-
-USE_BUILDLINK2= YES
-GNU_CONFIGURE= YES
-
-INFO_FILES= stow.info
-
-.include "../../lang/perl5/buildlink2.mk"
-
-.include "../../mk/texinfo.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/stow/PLIST b/sysutils/stow/PLIST
deleted file mode 100644
index ac23fa532c8..00000000000
--- a/sysutils/stow/PLIST
+++ /dev/null
@@ -1,6 +0,0 @@
-@comment $NetBSD: PLIST,v 1.4 2002/08/25 21:51:03 jlam Exp $
-bin/stow
-@unexec ${INSTALL_INFO} --delete --info-dir=%D/info %D/info/stow.info
-info/stow.info
-@exec ${INSTALL_INFO} --info-dir=%D/info %D/info/stow.info
-man/man8/stow.8
diff --git a/sysutils/stow/distinfo b/sysutils/stow/distinfo
deleted file mode 100644
index 6475bce4d06..00000000000
--- a/sysutils/stow/distinfo
+++ /dev/null
@@ -1,4 +0,0 @@
-$NetBSD: distinfo,v 1.6 2002/08/25 21:51:03 jlam Exp $
-
-SHA1 (stow-1.3.3.tar.gz) = 570c501f8663feb26360db25df0be342278b7b99
-Size (stow-1.3.3.tar.gz) = 139417 bytes
diff --git a/sysutils/su2/DESCR b/sysutils/su2/DESCR
deleted file mode 100644
index 0c71b55bd63..00000000000
--- a/sysutils/su2/DESCR
+++ /dev/null
@@ -1,18 +0,0 @@
- su2 is a great program for anyone that has anything to do with
-system administration. su2 gives you the ability to masquerade with
-the UID of other users. You use own password to switch. Probably the
-biggest benefit of su2 is that you retain your own customized shell
-environment.
-
- For the most part, this program is used by system administrators to
-become root, but su2 has been written to enable much more flexibility
-than this. Regular users can put a .su2rc file in their home
-directory to enable other users to become them. While this may sound
-odd, it is sometimes useful to allow a number of users to masquerade
-around with the uid of restricted accounts. One such example of this
-is a 'www' account which is a common occurance with the proliferation
-of the web. While the www user's password may be starred out to
-disable direct logins, root could put a set of user names into
-~www/.su2rc to enable these users to 'become' www and do Web
-administration. [This feature can be disabled if you are worried
-about 'account sharing.']
diff --git a/sysutils/su2/Makefile b/sysutils/su2/Makefile
deleted file mode 100644
index bf8ad2807df..00000000000
--- a/sysutils/su2/Makefile
+++ /dev/null
@@ -1,15 +0,0 @@
-# $NetBSD: Makefile,v 1.2 2002/12/24 18:55:41 wiz Exp $
-#
-
-DISTNAME= su2-1.3
-CATEGORIES= sysutils security
-MASTER_SITES= ftp://ftp.ccs.neu.edu/pub/sysadmin/
-
-MAINTAINER= collver1@attbi.com
-HOMEPAGE= ftp://ftp.ccs.neu.edu/pub/sysadmin/
-COMMENT= enhanced su, users su with own password + more
-
-LICENSE= no-profit
-NO_CONFIGURE= yes
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/su2/PLIST b/sysutils/su2/PLIST
deleted file mode 100644
index 1a7ec9157c6..00000000000
--- a/sysutils/su2/PLIST
+++ /dev/null
@@ -1,3 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2002/06/04 09:56:38 cjep Exp $
-bin/su2
-man/man1/su2.1
diff --git a/sysutils/su2/distinfo b/sysutils/su2/distinfo
deleted file mode 100644
index e419e9de9f9..00000000000
--- a/sysutils/su2/distinfo
+++ /dev/null
@@ -1,7 +0,0 @@
-$NetBSD: distinfo,v 1.1.1.1 2002/06/04 09:56:38 cjep Exp $
-
-SHA1 (su2-1.3.tar.gz) = 0b84a070c0cc95098c0d61566663c89ec2d1189e
-Size (su2-1.3.tar.gz) = 31067 bytes
-SHA1 (patch-aa) = 8e08931b017b367b2127fdc5dac0c7beefa717dd
-SHA1 (patch-ab) = 12aa6e167ae0623c549da5a4deb43a9fb5e109a3
-SHA1 (patch-ac) = 5f0799f9ed62b656fad7bbde776393700e2407c6
diff --git a/sysutils/su2/patches/patch-aa b/sysutils/su2/patches/patch-aa
deleted file mode 100644
index 2877c1df301..00000000000
--- a/sysutils/su2/patches/patch-aa
+++ /dev/null
@@ -1,48 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2002/06/04 09:56:38 cjep Exp $
-
---- Makefile.orig Thu Sep 7 13:50:58 1995
-+++ Makefile
-@@ -8,16 +8,16 @@
- # /etc/super-users and /usr/adm/sulog that are defined
- # separately.
- #
--DEST=/usr/local
-+DEST=${PREFIX}
- BINDIR=$(DEST)/bin
--MANDIR=$(DEST)/man
-+MANDIR=$(DEST)/man/man1
-
- # OPTIONS:
- # There are a number of DEFINES that can be used to configure su2. Please
- # see the source to su2.c for a full listing of all of the available options.
-
- # Standard
--OPTIONS=-DFULLPATH
-+OPTIONS=-DSU2LOGFILE="\"/var/log/su2.log\"" -DSUPERUSERS="\"$(PREFIX)/etc/super-users\"" -DBROKENCUSERID
-
- # m88k
- # OPTIONS=-DFULLPATH -DNOVFORK
-@@ -31,13 +31,19 @@
- # Shadow Passwords (Solaris)
- # OPTIONS=-DFULLPATH -DUSE_SHADOW
-
--CFLAGS=-O $(OPTIONS)
-+CFLAGS+= $(OPTIONS)
-+LDLIBS=-lcrypt -lcompat
-
- su2: su2.c
-
--install: su2
-- install -c -m 4711 -o root su2 $(BINDIR)/su2
-- install -c su2.man $(MANDIR)/su2.1
-+su2.1:
-+ sed 's,/etc/super,${PREFIX}/etc/super,g' <su2.man >su2.1
-+
-+all: su2 su2.1
-+
-+install: su2 su2.1
-+ install -c -s -m 4711 -o root su2 $(BINDIR)/su2
-+ install -c su2.1 $(MANDIR)/su2.1
-
- clean:
- rm -f su2 *.o *.a
diff --git a/sysutils/su2/patches/patch-ab b/sysutils/su2/patches/patch-ab
deleted file mode 100644
index be3c610ec7a..00000000000
--- a/sysutils/su2/patches/patch-ab
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 2002/06/04 09:56:38 cjep Exp $
-
---- su2.c.orig Thu Sep 7 13:10:11 1995
-+++ su2.c
-@@ -113,9 +113,9 @@
- #ifndef NOSU2RC
- char *UsersNameFile = ".su2rc";
- #endif NOSU2RC
--char *SULog = "/usr/adm/sulog";
-+char *SULog = SU2LOGFILE;
-
--char *UtmpFile = "/etc/utmp";
-+char *UtmpFile = "/var/run/utmp";
-
- #ifndef PATH
- # ifdef BSD
-@@ -188,7 +188,7 @@
- void setpwent ();
- #endif
-
--#ifndef sgi
-+#if !defined(sgi) && !defined(__NetBSD__)
- struct passwd *getpwuid ();
- struct passwd *getpwnam ();
- void endpwent ();
diff --git a/sysutils/su2/patches/patch-ac b/sysutils/su2/patches/patch-ac
deleted file mode 100644
index ceea31829d3..00000000000
--- a/sysutils/su2/patches/patch-ac
+++ /dev/null
@@ -1,55 +0,0 @@
-$NetBSD: patch-ac,v 1.1.1.1 2002/06/04 09:56:38 cjep Exp $
-
---- su2.man.orig Tue Oct 2 22:09:48 2001
-+++ su2.man
-@@ -84,7 +84,7 @@
- .I Su2\^
- logs all attempts to
- .I su2\^
--in /usr/adm/sulog, including failures. Successful attempts are flagged
-+in /var/log/sulog, including failures. Successful attempts are flagged
- with "+", failures with "-".
- .LP
- The file
-@@ -110,7 +110,7 @@
- .B \-u
- is used to specify a user against whom to check authorization and password.
- The default value is obtained from
--.I /etc/utmp.
-+.I /var/run/utmp.
- .TP
- .B \-x
- when specified will cause
-@@ -118,7 +118,7 @@
- to exec the shell without first forking a new process. This option should
- only be used when the system is out of process slots. When it is used
- su2 will neither clean up the
--.I /etc/utmp
-+.I /var/run/utmp
- entry nor reset the ownership and mode of the current
- .IR /dev/tty?? .
- Both may be reset with the
-@@ -127,12 +127,12 @@
- .TP
- .B \-s
- will change the current
--.I /etc/utmp
-+.I /var/run/utmp
- entry to reflect the new user name.
- .TP
- .B \-r
- is used to replace the username in
--.I /etc/utmp
-+.I /var/run/utmp
- and the mode and ownership of
- .I /dev/tty??
- with that associated with the current process userid.
-@@ -178,7 +178,7 @@
- $HOME/.su2rc
- list of users authorized to change to a specific user.
- .TP
--/usr/adm/sulog
-+/var/log/su2.log
- log of
- .I su2
- and
diff --git a/sysutils/sux/DESCR b/sysutils/sux/DESCR
deleted file mode 100644
index 47995efa45f..00000000000
--- a/sysutils/sux/DESCR
+++ /dev/null
@@ -1,2 +0,0 @@
-Sux tries to behave exactly like "su -m" and optionally
-calls sshsh to check for a working ssh agent connection.
diff --git a/sysutils/sux/Makefile b/sysutils/sux/Makefile
deleted file mode 100644
index d76c1585460..00000000000
--- a/sysutils/sux/Makefile
+++ /dev/null
@@ -1,18 +0,0 @@
-# $NetBSD: Makefile,v 1.3 2001/09/27 23:18:44 jlam Exp $
-#
-
-DISTNAME= sux-1.0
-CATEGORIES= sysutils
-MASTER_SITES= ftp://ftp.gw.com/pub/people/kim/
-
-MAINTAINER= kim@tac.nyc.ny.us
-COMMENT= set user id, preserving shell and environment, checking ssh agent
-
-DEPENDS+= osname-[0-9]*:../../sysutils/osname
-DEPENDS+= sshsh-[0-9]*:../../sysutils/sshsh
-
-NO_CONFIGURE= yes
-ALL_TARGET= all PREFIX=${PREFIX}
-INSTALL_TARGET= install PREFIX=${PREFIX}
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/sux/PLIST b/sysutils/sux/PLIST
deleted file mode 100644
index eba142fca7b..00000000000
--- a/sysutils/sux/PLIST
+++ /dev/null
@@ -1,3 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 22:53:52 zuntum Exp $
-bin/sux
-man/man1/sux.1
diff --git a/sysutils/sux/distinfo b/sysutils/sux/distinfo
deleted file mode 100644
index fc3daea8bd6..00000000000
--- a/sysutils/sux/distinfo
+++ /dev/null
@@ -1,4 +0,0 @@
-$NetBSD: distinfo,v 1.2 2001/04/19 11:29:08 agc Exp $
-
-SHA1 (sux-1.0.tar.gz) = f30a3443bf808bedecc3b2918991d579796aa2fd
-Size (sux-1.0.tar.gz) = 1426 bytes
diff --git a/sysutils/sysbuild/DESCR b/sysutils/sysbuild/DESCR
deleted file mode 100644
index 1bc2a3abb16..00000000000
--- a/sysutils/sysbuild/DESCR
+++ /dev/null
@@ -1,10 +0,0 @@
-sysbuild is a script that simplifies the process of building NetBSD
-releases and kernels as an unprivileged user. It should be clear enough
-that it does not add any kind of magic to the NetBSD build system. It
-just automates boring steps, like setup of permissions, directories,
-execution of the build process, etc. It also provides enough
-functionality to automatically update CVS source trees.
-
-sysbuild can be easily used from command line or as a cron job, so
-you can schedule most of the build jobs (really, it has been designed
-to run perfectly from cron).
diff --git a/sysutils/sysbuild/INSTALL b/sysutils/sysbuild/INSTALL
deleted file mode 100644
index 801a33051e1..00000000000
--- a/sysutils/sysbuild/INSTALL
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/bin/sh
-#
-# $NetBSD: INSTALL,v 1.2 2002/12/01 19:39:49 jmmv Exp $
-
-SYSBUILD_USER=@SYSBUILD_USER@
-SYSBUILD_HOMEDIR=@SYSBUILD_HOMEDIR@
-EGDIR=@EGDIR@
-
-case ${STAGE} in
-POST-INSTALL)
- echo "Setting up sysbuild's crontab..."
- crontab -u ${SYSBUILD_USER} -r > /dev/null 2>&1
- crontab -u ${SYSBUILD_USER} ${EGDIR}/crontab > /dev/null 2>&1
- ;;
-
-DEINSTALL)
- echo "Removing sysbuild's crontab..."
- crontab -u ${SYSBUILD_USER} -r > /dev/null 2>&1
- ${CAT} << EOF
-===========================================================================
-If you will not be using sysbuild any longer, you may want to remove
-sysbuild's home directory and all work areas. Just to let you know, work
-areas can be removed using the 'destroy' target of the program.
-===========================================================================
-EOF
- ;;
-esac
diff --git a/sysutils/sysbuild/MESSAGE b/sysutils/sysbuild/MESSAGE
deleted file mode 100644
index 5d4e4a3fa50..00000000000
--- a/sysutils/sysbuild/MESSAGE
+++ /dev/null
@@ -1,15 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE,v 1.1.1.1 2002/11/28 19:57:28 jmmv Exp $
-
-sysbuild has been installed successfully. These lines are a must to get
-started:
-
- ${PREFIX}/bin/sysbuild config
- ${PREFIX}/bin/sysbuild init
-
-A sample crontab file for the '${SYSBUILD_USER}' user has been installed.
-Use the following command (as root) to edit it interactively:
-
- crontab -e -u ${SYSBUILD_USER}
-
-===========================================================================
diff --git a/sysutils/sysbuild/Makefile b/sysutils/sysbuild/Makefile
deleted file mode 100644
index 95d8bab3067..00000000000
--- a/sysutils/sysbuild/Makefile
+++ /dev/null
@@ -1,69 +0,0 @@
-# $NetBSD: Makefile,v 1.14 2003/03/29 12:42:33 jmmv Exp $
-#
-
-DISTNAME= sysbuild-1.9
-WRKSRC= ${WRKDIR}
-CATEGORIES= sysutils
-MASTER_SITES= # empty
-DISTFILES= # empty
-
-MAINTAINER= jmmv@netbsd.org
-COMMENT= Automate NetBSD system and kernel unprivileged builds
-
-EXTRACT_ONLY= # empty
-NO_CHECKSUM= yes
-NO_CONFIGURE= yes
-CHECK_SHLIBS= no
-SHLIB_HANDLING= no
-
-.include "../../mk/bsd.prefs.mk"
-
-# SYSBUILD_HOME - Home directory of SYSBUILD_USER user.
-SYSBUILD_HOMEDIR?= /home/sysbuild
-# SYSBUILD_USER - Unpriviledged user that runs the build script.
-SYSBUILD_USER?= sysbuild
-# SYSBUILD_OBJGROUP - Group that owns build files (should not be shared).
-SYSBUILD_OBJGROUP?= wobj
-# SYSBUILD_SRCGROUP - Group that owns sources (may be shared).
-SYSBUILD_SRCGROUP?= wsrc
-
-FILES_SUBST+= SYSBUILD_HOMEDIR=${SYSBUILD_HOMEDIR}
-FILES_SUBST+= SYSBUILD_USER=${SYSBUILD_USER}
-FILES_SUBST+= SYSBUILD_OBJGROUP=${SYSBUILD_OBJGROUP}
-FILES_SUBST+= SYSBUILD_SRCGROUP=${SYSBUILD_SRCGROUP}
-FILES_SUBST+= EGDIR=${EGDIR}
-MESSAGE_SUBST+= SYSBUILD_USER=${SYSBUILD_USER}
-
-USE_PKGINSTALL= yes
-DEINSTALL_EXTRA_TMPL= ${.CURDIR}/INSTALL
-INSTALL_EXTRA_TMPL= ${.CURDIR}/INSTALL
-
-PKG_GROUPS= ${SYSBUILD_OBJGROUP} ${SYSBUILD_SRCGROUP}
-PKG_USERS= ${SYSBUILD_USER}:${SYSBUILD_OBJGROUP}::`hostname`\\ sysbuild\\ output:${SYSBUILD_HOMEDIR}:${SH}
-
-EGDIR= ${PREFIX}/share/examples/sysbuild
-
-do-build:
- @${ECHO} "Generating sysbuild.sh..."
- @${SED} ${FILES_SUBST_SED} ${FILESDIR}/sysbuild.sh > \
- ${WRKSRC}/sysbuild.sh
- @${ECHO} "Generating sysbuild.8..."
- @${SED} ${FILES_SUBST_SED} ${FILESDIR}/sysbuild.8 > \
- ${WRKSRC}/sysbuild.8
- @${ECHO} "Generating sample default.conf..."
- @${SED} ${FILES_SUBST_SED} ${FILESDIR}/default.conf > \
- ${WRKSRC}/default.conf
- @${ECHO} "Generating sample crontab..."
- @${SED} ${FILES_SUBST_SED} ${FILESDIR}/crontab > ${WRKSRC}/crontab
- @${ECHO} "Generating sample profile..."
- @${SED} ${FILES_SUBST_SED} ${FILESDIR}/profile > ${WRKSRC}/profile
-
-do-install:
- ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/sysbuild
- ${INSTALL_SCRIPT} ${WRKSRC}/sysbuild.sh ${PREFIX}/bin/sysbuild
- ${INSTALL_MAN} ${WRKSRC}/sysbuild.8 ${PREFIX}/man/man8/sysbuild.8
- ${INSTALL_DATA} ${WRKSRC}/default.conf ${EGDIR}/default.conf
- ${INSTALL_DATA} ${WRKSRC}/crontab ${EGDIR}/crontab
- ${INSTALL_DATA} ${WRKSRC}/profile ${EGDIR}/profile
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/sysbuild/PLIST b/sysutils/sysbuild/PLIST
deleted file mode 100644
index 8290be12580..00000000000
--- a/sysutils/sysbuild/PLIST
+++ /dev/null
@@ -1,7 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2002/12/01 19:39:50 jmmv Exp $
-bin/sysbuild
-man/man8/sysbuild.8
-share/examples/sysbuild/crontab
-share/examples/sysbuild/default.conf
-share/examples/sysbuild/profile
-@dirrm share/examples/sysbuild
diff --git a/sysutils/sysbuild/files/crontab b/sysutils/sysbuild/files/crontab
deleted file mode 100644
index 90f5bf23a95..00000000000
--- a/sysutils/sysbuild/files/crontab
+++ /dev/null
@@ -1,19 +0,0 @@
-# $NetBSD: crontab,v 1.1.1.1 2002/11/28 19:57:29 jmmv Exp $
-#
-# sysbuild - crontab file for '@SYSBUILD_USER@' user
-#
-
-HOME=@SYSBUILD_HOMEDIR@
-SHELL=@SH@
-PATH=/bin:/sbin:/usr/bin:/usr/sbin:@PREFIX@/bin:@PREFIX@/sbin
-
-#minute hour mday month wday command
-
-# Update sources daily
-#0 0 * * * @PREFIX@/bin/sysbuild -m update-srcs
-
-# Build kernel weekly
-#0 4 * * 0 @PREFIX@/bin/sysbuild -m build-kernels
-
-# Build release weekly
-#0 6 * * 0 @PREFIX@/bin/sysbuild -m build-release
diff --git a/sysutils/sysbuild/files/default.conf b/sysutils/sysbuild/files/default.conf
deleted file mode 100644
index 2e1207c962c..00000000000
--- a/sysutils/sysbuild/files/default.conf
+++ /dev/null
@@ -1,66 +0,0 @@
-# $NetBSD: default.conf,v 1.4 2003/01/08 17:45:09 jmmv Exp $
-#
-# sysbuild - System wide configuration file
-#
-
-# ----------- Build time setup; be careful if you change these -----------
-HOMEDIR=@SYSBUILD_HOMEDIR@
-USER=@SYSBUILD_USER@
-OBJGROUP=@SYSBUILD_OBJGROUP@
-SRCGROUP=@SYSBUILD_SRCGROUP@
-# ------------------------------------------------------------------------
-
-# Directory that holds all object files and DESTDIR (requires *lots*
-# of space).
-BUILDDIR=/var/sysbuild
-
-# Release directory (it will require around 100-200 Mb).
-RELEASEDIR=/var/sysbuild/NetBSD-1.6
-
-# Machine name. It is appended to RELEASEDIR. It currently has no other
-# effect. Set only if you are building NetBSD-current!
-MACHINE=
-
-# Source directory.
-SRCDIR=/usr/src
-
-# X11R6 Source directory.
-XSRCDIR=/usr/xsrc
-
-# When mounting union filesystems (to build X11R6), prefix umount(8)
-# and mount_union(8) calls with the following command.
-#MOUNT_PRECMD="sudo"
-
-# List of directories that are updated via cvs.
-CVSDIRS="/usr/src /usr/pkgsrc /usr/xsrc"
-
-# Ownerships and permissions to set on CVSDIRS during clean-srcs.
-CVSDIRS_OWNER=$USER
-CVSDIRS_GROUP=$SRCGROUP
-CVSDIRS_PERMS="g+w"
-
-# Preserve tools (toolchain) even when running the "clean" target.
-KEEP_TOOLS=no
-
-# Base directory of kernel configuration files; sysbuild can only read
-# the ones contained here.
-KERNCONFDIR=$HOMEDIR
-
-# List of kernel names to build (files inside $KERNCONFDIR). You can
-# specify several; the first one is the kernel installed locally.
-KERNCONF="MYKERNEL GENERIC"
-
-# If using the `-m' flag, the user who will receive the logs.
-MAILTO=root
-
-# Set to `yes' to send the entire log of commands through mail.
-# Logs can become *very* big.
-MAIL_CMDLOG=no
-
-# When using the install-sets target, unpack these sets. Note that
-# etc.tgz is not specified, as it is specially installed through the
-# etcupdate target.
-SETS="base.tgz comp.tgz games.tgz man.tgz misc.tgz text.tgz"
-
-# When using the install-x-sets target, unpack these sets.
-XSETS="xbase.tgz xcomp.tgz xcontrib.tgz xfont.tgz xmisc.tgz xserver.tgz"
diff --git a/sysutils/sysbuild/files/profile b/sysutils/sysbuild/files/profile
deleted file mode 100644
index a0921d95759..00000000000
--- a/sysutils/sysbuild/files/profile
+++ /dev/null
@@ -1,17 +0,0 @@
-# $NetBSD: profile,v 1.1 2002/12/01 19:39:50 jmmv Exp $
-#
-# @SYSBUILD_USER@ user's profile
-# Home directory is @SYSBUILD_HOMEDIR@
-#
-
-PATH=/bin:/sbin:/usr/bin:/usr/sbin:@PREFIX@/bin:@PREFIX@/sbin
-PATH=${PATH}:/usr/local/bin:/usr/local/sbin
-export PATH
-
-EDITOR=vi
-export EDITOR
-PAGER=more
-export PAGER
-
-PS1="@SYSBUILD_USER@@`hostname -s`\$ "
-export PS1
diff --git a/sysutils/sysbuild/files/sysbuild.8 b/sysutils/sysbuild/files/sysbuild.8
deleted file mode 100644
index ad1426e8452..00000000000
--- a/sysutils/sysbuild/files/sysbuild.8
+++ /dev/null
@@ -1,538 +0,0 @@
-.\" $NetBSD: sysbuild.8,v 1.7 2003/01/08 17:48:16 wiz Exp $
-.\"
-.\" sysbuild - Automatic NetBSD system builds
-.\" Copyright (c) 2002, Julio Merino <jmmv@netbsd.org>
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\" notice, this list of conditions and the following disclaimer.
-.\" 2. Neither the name of The NetBSD Foundation nor the names of its
-.\" contributors may be used to endorse or promote products derived
-.\" from this software without specific prior written permission.
-.\" 3. Neither the name of author nor the names of its contributors may
-.\" be used to endorse or promote products derived from this software
-.\" without specific prior written permission.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
-.\" ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-.\" TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-.\" PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
-.\" BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-.\" CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-.\" SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-.\" INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-.\" CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-.\" POSSIBILITY OF SUCH DAMAGE.
-.\"
-.Dd December 18, 2002
-.Dt SYSBUILD 8
-.Os
-.Sh NAME
-.Nm sysbuild
-.Nd Automates
-.Nx
-release and kernel builds
-.Sh SYNOPSIS
-.Nm
-.Op Fl fms
-.Op Fl c Ar conf
-.Ar target
-.Op Ar target_args ...
-.Sh DESCRIPTION
-The
-.Nm
-utility automates the building process of a
-.Nx
-release and all related stuff (like kernels), everything working as an
-unprivileged, special user.
-It should be clear enough that this program does not add any kind of
-magic to the existing build mechanisms of the
-.Nx
-operating system; it just makes things easier if you want to automate
-them (for example, to run them from a
-.Xr cron 8
-job).
-.Pp
-The following options are recognized:
-.Bl -tag -width indent
-.It Fl c Ar conf
-Specify the name of the configuration file.
-This is not a full name; it is just a symbolic name.
-See
-.Sx CONFIGURATION
-for for information.
-.It Fl f
-Run in fast mode.
-This option passes the
-.Fl u
-flag to the build.sh script; this way build directories are not
-cleaned during builds.
-While building kernels, it avoids the config, clean and depend
-steps.
-.It Fl m
-Capture all output and send it by mail to the
-.Va MAILTO
-user specified in the configuration file.
-.It Fl s
-Automatically change privileges using
-.Xr su 1 .
-By default the program will
-exit if user credentials for the specified target are incorrect.
-.El
-.Sh EXIT STATUS
-Returns 0 on success, 1 if any error happened.
-.Sh TARGETS
-.Nm
-behavior is controlled through a target.
-A target specifies what the program should do when executed.
-The following targets are recognized:
-.Bl -tag -width ident
-.It build-kernels
-Automatically build all kernels listed in the
-.Va KERNCONF
-variable.
-.Pp
-Each kernel name listed in this variable is configured, cleaned,
-depended and built inside its own directory, which is in turn placed in
-.Pa $BUILDDIR/kernels .
-Note that kernel configuration files must be stored inside the
-directory pointed to by
-.Va KERNCONFDIR .
-.Pp
-This target requires
-.Ql @SYSBUILD_USER@
-privileges.
-.It build-release
-Build a full release of the system.
-A release is formed by all compressed system sets, installation floppy
-disks and standard kernels.
-.Pp
-Release files are placed inside the directory pointed by
-.Va RELEASEDIR .
-During the build,
-.Va BSDOBJDIR
-is set to
-.Pa $BUILDDIR/obj
-and
-.Va DESTDIR
-is set to
-.Pa $BUILDDIR/root .
-.Pp
-Depends on
-.Ql clean .
-.Pp
-This target requires
-.Ql @SYSBUILD_USER@
-privileges.
-.It build-x-release
-Build a full release of the X11R6 window system.
-.Pp
-Release files are placed inside the directory pointed by
-.Va RELEASEDIR .
-During the build,
-.Va BSDOBJDIR
-is set to
-.Pa $BUILDDIR/obj
-and
-.Va DESTDIR
-is set to
-.Pa $BUILDDIR/root .
-The source tree,
-.Va XSRCDIR ,
-is mounted below
-.Pa $BUILDDIR/root
-using
-.Xr mount_union 8 .
-.Pp
-Depends on
-.Ql clean .
-.Pp
-This target requires
-.Ql @SYSBUILD_USER@
-privileges.
-.It build-sets
-Build compressed system sets only.
-If you want the sets to install them later on your own system, this is
-the recommended target, as building a release takes much more time.
-.Pp
-Depends on
-.Ql clean .
-.Pp
-This target requires
-.Ql @SYSBUILD_USER@
-privileges.
-.It clean
-Cleanup all work areas.
-This will unconditionally clean all the stuff located under the
-directory specified by
-.Va BUILDDIR ,
-but will not destroy the main directory hierarchy inside it.
-.Pp
-This target requires
-.Ql @SYSBUILD_USER@
-privileges.
-.It clean-srcs Op Ar dir ...
-Cleanup permissions of all source files inside the directories
-specified by
-.Va CVSDIRS ,
-or the ones specified by the optional list
-.Ar dir .
-All files are set to
-.Va CVSDIRS_OWNER
-owner and
-.Va CVSDIRS_GROUP
-group.
-Optional permissions can be provided through
-.Va CVSDIRS_PERMS ,
-which are set on all files using
-.Xr chown 8 .
-.Pp
-This target requires
-.Ql root
-privileges.
-.It config Op Ar conf
-Edit the default configuration file or the one specified by
-.Ar conf ,
-if given (remember that these are symbolic names, not full paths).
-This will run
-.Xr vi 1
-if no editor is specified by the
-.Ev EDITOR
-variable.
-.Pp
-If the specified configuration file does not exist, a sample one is
-copied from
-.Pa @EGDIR@/default.conf .
-.Pp
-This command is interactive, so output cannot be captured with
-.Fl m .
-.Pp
-This target requires
-.Ql root
-privileges.
-.It config-kernel Ar kernel
-Edit a kernel configuration file interactively, located inside
-.Pa @SYSBUILD_HOMEDIR@ .
-If the configuration file is not found, the
-.Pa GENERIC
-kernel for your platform is copied as a template.
-.Pp
-This target requires
-.Ql root
-privileges.
-.It destroy
-Completely remove the work area specified by
-.Va BUILDDIR .
-You should run this target before deinstalling this program.
-.Pp
-This target requires
-.Ql root
-privileges.
-.It etcupdate
-Extract the compressed
-.Pa etc.tgz
-file, generated during the
-.Ql build-sets
-or the
-.Ql build-release
-stages, in a temporary place and then run
-.Xr etcupdate 8
-over it to update your
-.Pa /etc
-directory.
-.Pp
-This command is interactive, so output cannot be captured with
-.Fl m .
-.Pp
-This target requires
-.Ql root
-privileges.
-.It init
-Initialize the work directory specified in
-.Va BUILDDIR
-plus all the subdirectories required inside it.
-Should be run once, after configuring the program with the
-.Ql config
-target (or when creating new configuration files).
-.Pp
-This target requires
-.Ql root
-privileges.
-.It install-kernel Op Ar kernel
-Install the first kernel specified in the
-.Va KERNCONF
-variable or the one supplied by the
-.Ar kernel
-argument.
-.Pp
-This target requires
-.Ql root
-privileges.
-.It install-sets
-Install built system sets, placed inside
-.Pa $RELEASEDIR/binary/sets .
-Only sets specified in the
-.Va SETS
-variable are installed.
-.Pp
-This target requires
-.Ql root
-privileges.
-.It install-x-sets
-Install built X11R6 sets, placed inside
-.Pa $RELEASEDIR/binary/sets .
-Only sets specified in the
-.Va XSETS
-variable are installed.
-.Pp
-This target requires
-.Ql root
-privileges.
-.It update-srcs Op Ar dir ...
-Use
-.Xr cvs 1
-to update all source trees specified by
-.Va CVSDIRS ,
-or the ones specified by the optional
-.Ar dir
-arguments.
-.Pp
-This target requires
-.Ql @SYSBUILD_USER@
-privileges.
-.El
-.Sh CONFIGURATION
-.Nm
-supports multiple configuration files.
-This is specially useful if you usually need to build different
-versions of
-.Nx ,
-that is, one configuration for each version.
-.Pp
-Configuration files are directly stored inside
-.Pa @SYSBUILD_HOMEDIR@ ,
-and have a
-.Ql .conf
-extension.
-The symbolic name of the configuration file (the one used with the
-.Ar -c
-flag) is formed by the name of the configuration file, without the
-path and without the extension.
-For example, the default configuration file (used when no other one is
-specified) is named
-.Pa @SYSBUILD_HOMEDIR@/default.conf ,
-but you could use
-.Fl c Ar default
-to select it.
-You should not worry about where these files are stored, as the
-.Ql config
-target will take care of it.
-.Pp
-The sample configuration file (copied to all new configurations
-created) is well documented and contains some reasonable
-defaults.
-Even though, a list of all known variables is provided here,
-for reference:
-.Bl -tag -width indent
-.It BUILDDIR
-The directory which holds all working stuff (object files, temporary
-root, etc.).
-You will need lots of space in this directory if you want
-to build full releases.
-.It CVSDIRS
-White-space separated list of directories that are updated using
-.Xr cvs 1
-when executing the
-.Ql update-srcs
-target.
-.It KEEP_TOOLS
-If set to
-.Ql yes ,
-do not remove tools while running the
-.Ql clean
-target.
-Therefore, the easiest way to really remove them will be with the
-.Ql destroy
-target.
-.It KERNCONF
-White-space separated list of kernels that are built with the
-.Ql build-kernels
-target.
-The first one is the kernel that will be installed when running
-.Ql install-kernel .
-.It KERNCONFDIR
-Directory which holds kernel configuration files.
-Defaults to
-.Pa @SYSBUILD_HOMEDIR@ .
-.It MACHINE
-Machine name.
-It is appended to
-.Va RELEASEDIR .
-Do not set if you are not building
-.Nx Ns -current .
-This variable may be used for cross-building in a future.
-.It MOUNT_PRECMD
-Specifies a command to be called to gain privileges when running
-.Xr mount_union 8
-and
-.Xr umount 8 .
-This is not needed if you have
-.Va vfs.generic.usermount
-set to
-.Ql 1
-in
-.Xr sysctl 8 .
-.It RELEASEDIR
-Base directory which will hold release files.
-.It MAILTO
-User who will receive all logs by mail when using the
-.Fl m
-flag.
-.It MAIL_CMDLOG
-If set to
-.Ql yes ,
-mail the entire log of commands to the user specified in
-.Va MAILTO
-(if using the
-.Fl m
-flag).
-If set to
-.Ql no ,
-logs are left in
-.Pa /tmp .
-A summary of the process is always sent, regardless of this variable.
-Remember that logs can become very big!
-.It SETS
-White-space separated list of compressed sets that should be
-extracted in the machine while running
-.Ql install-sets .
-.It SRCDIR
-Path to
-.Nx
-source directory tree, usually
-.Pa /usr/src .
-.It XSRCDIR
-Path to X11R6 source tree, usually
-.Pa /usr/xsrc .
-.El
-.Sh SEE ALSO
-.Xr crontab 1 ,
-.Xr cvs 1 ,
-.Xr mk.conf 5 ,
-.Xr cron 8 ,
-.Xr etcupdate 8 ,
-.Xr mount_union 8 ,
-.Xr umount 8 ,
-.Pa /usr/src/BUILDING
-.Sh CRON JOBS
-.Xr cron 8
-is our best friend to schedule these CPU tasks.
-You can, for example, set a task to build a release while you are
-sleeping, another to install it and when you get up you just have to
-run the interactive
-.Ql etcupdate
-target to finish the process.
-.Pp
-To make this even easier, the
-.Ql @SYSBUILD_USER@
-comes with a sample crontab file, with several (disabled) entries,
-ready to be edited.
-You should note that the
-.Fl m
-flag is a good choice for unattended tasks, because you will get a
-report by mail when they finish.
-.Pp
-To edit it, simply type:
-.Pp
-.Dl crontab -e -u @SYSBUILD_USER@
-.Sh EXAMPLES
-To initialize
-.Nm
-for the first time:
-.Pp
-.Dl sysbuild config
-.Dl sysbuild init
-.Pp
-Once you have configured it properly, you can execute the following, as
-.Ql root ,
-to build your kernels and system sets.
-Note that the
-.Fl s
-flag will automatically downgrade privileges.
-.Pp
-.Dl sysbuild -s build-kernels
-.Dl sysbuild -s build-sets
-.Pp
-And then, as
-.Ql root ,
-you can install the results:
-.Pp
-.Dl sysbuild install-kernel
-.Dl sysbuild install-sets
-.Pp
-Or, if you want to update all your source trees:
-.Pp
-.Dl sysbuild clean-srcs
-.Dl sysbuild -s update-srcs
-.Pp
-The first command should be only required once, the first time you
-want to do this task.
-.Pp
-Note that where we are using the
-.Fl s
-you could as well become the
-.Ql @SYSBUILD_USER@
-user using
-.Xr su 1
-and execute the command from there.
-Read
-.Sx SECURITY CONSIDERATIONS
-for more details on this.
-.Sh SECURITY CONSIDERATIONS
-The unprivileged user
-.Ql @SYSBUILD_USER@
-account is disabled by default.
-This means that root can access it through
-.Xr su 1 ,
-but no other user will be able to run
-.Nm
-properly.
-If you want anybody to be able to use it, just set a password for the
-account, give it to the user, and tell him to use the
-.Fl s
-flag.
-.Sh NOTES
-This program will only work in
-.Nx 1.6
-and above.
-Some targets may work in previous versions, but do not expect it to
-work fine.
-.Pp
-If you are changing some of the default directories in your
-.Pa /etc/mk.conf ,
-be sure to use the
-.Ql ?=
-operator instead of
-.Ql =
-so
-.Nm
-can override their value.
-.Sh AUTHORS
-.An Julio Merino Aq jmmv@netbsd.org
-.Sh TO DO
-There are many other things to do, but are left for future releases.
-Here is a small list with some ideas:
-.Bl -bullet -width indent
-.It
-Support building for multiple architectures.
-.It
-Create our own
-.Nm nbmake
-wrapper (using
-.Nm build.sh )
-at the beginning of each build, instead of passing all the
-variables when calling the program itself.
-.El
diff --git a/sysutils/sysbuild/files/sysbuild.sh b/sysutils/sysbuild/files/sysbuild.sh
deleted file mode 100644
index 3dec0882658..00000000000
--- a/sysutils/sysbuild/files/sysbuild.sh
+++ /dev/null
@@ -1,781 +0,0 @@
-#!/bin/sh
-#
-# $NetBSD: sysbuild.sh,v 1.10 2003/01/08 17:45:09 jmmv Exp $
-#
-# sysbuild - Automatic NetBSD system builds
-# Copyright (c) 2002, Julio Merino <jmmv@netbsd.org>
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-# 1. Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-# notice, this list of conditions and the following disclaimer in
-# the documentation and/or other materials provided with the
-# distribution.
-# 3. Neither the name of author nor the names of its contributors may
-# be used to endorse or promote products derived from this software
-# without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
-# ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-# TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
-# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
-#
-
-progname=`basename $0`
-allargs="$*"
-conffile=@SYSBUILD_HOMEDIR@/default.conf
-
-# XXX: This is needed when downgrading privileges with su...
-PATH=/bin:/sbin:/usr/bin:/usr/sbin:@PREFIX@/bin:@PREFIX@/sbin
-
-usage() {
- echo "usage: sysbuild [-fms] [-c conf] target [target_arguments]"
- echo
- echo "Flags:"
- echo " -c conf Base name of configuration file"
- echo " -f Fast mode"
- echo " -m Send all output by mail instead of console"
- echo " -s Run \`su' to change privileges if needed"
- echo
- echo "Available targets:"
- echo " build-kernels Build kernels"
- echo " build-release Build a complete release"
- echo " build-sets Build system sets only"
- echo " build-x-release Build a complete X11R6 release"
- echo " clean Clean work directories"
- echo " clean-srcs Fix ownerships in source directories"
- echo " config Create or edit a configuration file"
- echo " config-kernel Create or edit a kernel configuration file"
- echo " destroy Remove all build stuff"
- echo " etcupdate Run etcupdate (interactive)"
- echo " init Initialize work directories"
- echo " install-kernel Install a built kernel"
- echo " install-sets Install system sets"
- echo " install-x-sets Install X11R6 sets"
- echo " update-srcs Use CVS to update source directories"
-}
-
-err() {
- echo "$progname: $*"
- exit 1
-}
-
-# --------------------------------------------------------------------
-# Checks
-# --------------------------------------------------------------------
-
-check_noroot() {
- if [ "`id -un`" != "$USER" ]; then
- if [ "$autosu" = "yes" ]; then
- echo "$progname: downgrading privileges to \`$USER'"
- su -l $USER -c "@PREFIX@/bin/sysbuild $allargs"
- if [ $? -ne 0 ]; then
- err "cannot switch privileges; aborting"
- fi
- # XXX: After su, terminate inmediately.
- exit 0
- else
- err "this target must be run as \`$USER' user (use the \`-s' flag)"
- fi
- fi
-}
-
-check_root() {
- if [ `id -u` -ne 0 ]; then
- if [ "$autosu" = "yes" ]; then
- echo "$progname: becoming root"
- su -l root -c "@PREFIX@/bin/sysbuild $allargs"
- if [ $? -ne 0 ]; then
- err "cannot switch privileges; aborting"
- fi
- # XXX: After su, terminate inmediately.
- exit 0
- else
- err "this target must be run as root (use the \`-s' flag)"
- fi
- fi
-}
-
-check_init() {
- _ok=1
- if [ ! -d $HOMEDIR ]; then _ok=0; fi
- if [ ! -d $BUILDDIR ]; then _ok=0; fi
- if [ ! -d $BUILDDIR/kernel ]; then _ok=0; fi
- if [ ! -d $BUILDDIR/obj ]; then _ok=0; fi
- if [ ! -d $BUILDDIR/root ]; then _ok=0; fi
- if [ ! -d $BUILDDIR/tools ]; then _ok=0; fi
- if [ $_ok -eq 0 ]; then
- err "trees not initialized; use the \`init' target first"
- fi
-}
-
-# --------------------------------------------------------------------
-# Kernel related functions
-# --------------------------------------------------------------------
-
-sysbuild_build_kernels() {
- check_noroot
- check_init
-
- _confs="$*"
- if [ -z "$_confs" ]; then
- _confs="$KERNCONF"
- fi
-
- sysbuild_build_tools
-
- _log=`mktemp /tmp/sysbuild.XXXX`
- if [ "$MAIL_CMDLOG" = "yes" ]; then
- echo "Logging to $_log (will be removed later)"
- else
- echo "Logging to $_log (will NOT be removed later)"
- fi
- echo
- for _k in $_confs; do
- if [ ! -f "$KERNCONFDIR/$_k" ]; then
- echo "No such kernel configuration $_k"
- elif [ "$fast" = "yes" -a -d $BUILDDIR/kernel/$_k ]; then
- cd $BUILDDIR/kernel/$_k
- printf "Buildling kernel $_k (fast mode):"
- $BUILDDIR/tools/bin/nbmake-`uname -m` BSDSRCDIR=$SRCDIR OBJMACHINE=yes MKOBJDIRS=yes >> $_log 2>&1
- if [ $? -ne 0 ]; then
- echo " failed."
- else
- echo " done."
- echo "Kernel MD5: `md5 netbsd`"
- fi
- else
- printf "Configuring kernel $_k:"
- mkdir -p $BUILDDIR/kernel/$_k
- $BUILDDIR/tools/bin/nbconfig -s $SRCDIR/sys -b $BUILDDIR/kernel/$_k $KERNCONFDIR/$_k >> $_log 2>&1
- if [ $? -ne 0 ]; then
- echo " failed."
- else
- echo " done."
- cd $BUILDDIR/kernel/$_k
-
- printf "Cleaning kernel $_k:"
- $BUILDDIR/tools/bin/nbmake-`uname -m` BSDSRCDIR=$SRCDIR OBJMACHINE=yes MKOBJDIRS=yes cleandir >> $_log 2>&1
- echo " done."
-
- printf "Depending kernel $_k:"
- $BUILDDIR/tools/bin/nbmake-`uname -m` BSDSRCDIR=$SRCDIR OBJMACHINE=yes MKOBJDIRS=yes depend >> $_log 2>&1
- if [ $? -ne 0 ]; then
- echo " failed."
- else
- echo " done."
-
- printf "Buildling kernel $_k:"
- $BUILDDIR/tools/bin/nbmake-`uname -m` BSDSRCDIR=$SRCDIR OBJMACHINE=yes MKOBJDIRS=yes >> $_log 2>&1
- if [ $? -ne 0 ]; then
- echo " failed."
- else
- echo " done."
- echo "Kernel MD5: `md5 netbsd`"
- fi
- fi
- fi
- fi
- echo
- done
-
- if [ "$MAIL_CMDLOG" = "yes" ]; then
- echo "Command log follows:"
- cat $_log
- rm -f $_log
- fi
-}
-
-sysbuild_install_kernel() {
- check_root
- check_init
-
- _conf="$*"
- if [ -z "$_conf" ]; then
- _conf="$KERNCONF"
- fi
- _conf=`echo $_conf | cut -d ' ' -f 1`
-
- if [ ! -f $BUILDDIR/kernel/$_conf/netbsd ]; then
- err "kernel $_conf is not built."
- else
- cd $BUILDDIR/kernel/$_conf
- echo "Kernel MD5: `md5 netbsd`"
- echo "Installing $_conf kernel:"
- $BUILDDIR/tools/bin/nbmake-`uname -m` DESTDIR= BSDSRCDIR=$SRCDIR OBJMACHINE=yes MKOBJDIRS=yes install
- fi
-}
-
-# --------------------------------------------------------------------
-# Release related functions
-# --------------------------------------------------------------------
-
-sysbuild_build_release() {
- check_noroot
- check_init
-
- _log=`mktemp /tmp/sysbuild.XXXX`
-
- if [ "$fast" = "no" ]; then
- sysbuild_clean
- fi
- sysbuild_build_tools
- if [ "$MAIL_CMDLOG" = "yes" ]; then
- echo "Logging to $_log (will be removed later)"
- else
- echo "Logging to $_log (will NOT be removed later)"
- fi
- printf "Building full release:"
- mkdir -p $RELEASEDIR
- cd $SRCDIR
- if [ "$fast" = "yes" ]; then
- BSDSRCDIR=$SRCDIR BSDOBJDIR=$BUILDDIR/obj OBJMACHINE=yes MKOBJDIRS=yes ./build.sh -T $BUILDDIR/tools -D $BUILDDIR/root -R $RELEASEDIR -U -u >> $_log 2>&1
- else
- BSDSRCDIR=$SRCDIR BSDOBJDIR=$BUILDDIR/obj OBJMACHINE=yes MKOBJDIRS=yes ./build.sh -T $BUILDDIR/tools -D $BUILDDIR/root -R $RELEASEDIR -U >> $_log 2>&1
- fi
- if [ $? -ne 0 ]; then
- echo " failed."
- else
- echo " done."
- fi
-
- if [ "$MAIL_CMDLOG" = "yes" ]; then
- echo "Command log follows:"
- cat $_log
- rm -f $_log
- fi
-}
-
-sysbuild_build_sets() {
- check_noroot
- check_init
-
- _log=`mktemp /tmp/sysbuild.XXXX`
-
- if [ "$fast" = "no" ]; then
- sysbuild_clean
- fi
- sysbuild_build_tools
- if [ "$MAIL_CMDLOG" = "yes" ]; then
- echo "Logging to $_log (will be removed later)"
- else
- echo "Logging to $_log (will NOT be removed later)"
- fi
- printf "Building system:"
- cd $SRCDIR
- if [ "$fast" = "yes" ]; then
- BSDSRCDIR=$SRCDIR BSDOBJDIR=$BUILDDIR/obj OBJMACHINE=yes MKOBJDIRS=yes ./build.sh -T $BUILDDIR/tools -d -D $BUILDDIR/root -U >> $_log 2>&1
- else
- BSDSRCDIR=$SRCDIR BSDOBJDIR=$BUILDDIR/obj OBJMACHINE=yes MKOBJDIRS=yes ./build.sh -T $BUILDDIR/tools -d -D $BUILDDIR/root -U -u >> $_log 2>&1
- fi
- if [ $? -ne 0 ]; then
- echo " failed."
- else
- echo " done."
-
- printf "Making sets:"
- mkdir -p $RELEASEDIR/$MACHINE/binary/sets
- cd $SRCDIR/distrib/sets
- $BUILDDIR/tools/bin/nbmake-`uname -m` sets BSDSRCDIR=$SRCDIR OBJMACHINE=yes MKOBJDIRS=yes TOOLDIR=$BUILDDIR/tools DESTDIR=$BUILDDIR/root RELEASEDIR=$RELEASEDIR UNPRIVED=yes >> $_log 2>&1
- if [ $? -ne 0 ]; then
- echo " failed."
- else
- echo " done."
- fi
- fi
-
- if [ "$MAIL_CMDLOG" = "yes" ]; then
- echo "Command log follows:"
- cat $_log
- rm -f $_log
- fi
-}
-
-sysbuild_install_sets() {
- check_root
- check_init
-
- for _s in $SETS; do
- printf "Installing $_s:"
- if [ ! -f $RELEASEDIR/$MACHINE/binary/sets/$_s ]; then
- echo " not built yet"
- else
- cd / && tar xzpf $RELEASEDIR/$MACHINE/binary/sets/$_s > /dev/null 2>&1
- if [ $? -ne 0 ]; then
- echo " failed."
- else
- echo " done."
- fi
- fi
- done
- echo
- echo "You MUST now run \`sysbuild etcupdate' by hand to update /etc."
-}
-
-sysbuild_install_x_sets() {
- check_root
- check_init
-
- for _s in $XSETS; do
- printf "Installing $_s:"
- if [ ! -f $RELEASEDIR/$MACHINE/binary/sets/$_s ]; then
- echo " not built yet"
- else
- cd / && tar xzpf $RELEASEDIR/$MACHINE/binary/sets/$_s > /dev/null 2>&1
- if [ $? -ne 0 ]; then
- echo " failed."
- else
- echo " done."
- fi
- fi
- done
-}
-
-sysbuild_build_tools() {
- check_noroot
- check_init
-
- _log=`mktemp /tmp/sysbuild.XXXX`
-
- if [ -x "$BUILDDIR/tools/bin/nbmake-`uname -m`" ]; then
- echo "$progname: tools seem to be up to date"
- return 0
- fi
-
- if [ "$MAIL_CMDLOG" = "yes" ]; then
- echo "Logging to $_log (will be removed later)"
- else
- echo "Logging to $_log (will NOT be removed later)"
- fi
- printf "Building tools (toolchain):"
- cd $SRCDIR
- rm -rf $BUILDDIR/tools/*
- BSDSRCDIR=$SRCDIR BSDOBJDIR=$BUILDDIR/obj OBJMACHINE=yes MKOBJDIRS=yes ./build.sh -T $BUILDDIR/tools -t -D $BUILDDIR/root >> $_log 2>&1
- if [ $? -ne 0 ]; then
- echo " failed."
- else
- echo " done."
- fi
-
- if [ "$MAIL_CMDLOG" = "yes" ]; then
- echo "Command log follows:"
- cat $_log
- rm -f $_log
- fi
-}
-
-sysbuild_build_x_release() {
- check_noroot
- check_init
-
- _log=`mktemp /tmp/sysbuild.XXXX`
-
- sysbuild_clean
- sysbuild_build_tools
- if [ "$MAIL_CMDLOG" = "yes" ]; then
- echo "Logging to $_log (will be removed later)"
- else
- echo "Logging to $_log (will NOT be removed later)"
- fi
-
- printf "Mounting $XSRCDIR below $BUILDDIR/obj:"
- _mnt="ok"
- if [ ! -d $XSRCDIR ]; then
- echo " failed."
- _mnt="fail"
- else
- if [ -z "${MOUNT_PRECMD}" ]; then
- mount -t union -o -b $XSRCDIR $BUILDDIR/obj >> $_log 2>&1
- else
- ${MOUNT_PRECMD} mount -t union -o -b $XSRCDIR $BUILDDIR/obj >> $_log 2>&1
- fi
- if [ $? -ne 0 ]; then
- echo " failed."
- _mnt="fail"
- else
- echo " done."
- fi
- fi
-
- if [ "$_mnt" = "ok" ]; then
- printf "Building full X11R6 release:"
- mkdir -p $RELEASEDIR/$MACHINE
- ( cd $BUILDDIR/obj && \
- BSDSRCDIR=$SRCDIR NETBSDSRCDIR=$SRCDIR RELEASEDIR=$RELEASEDIR/$MACHINE $BUILDDIR/tools/bin/nbmake-`uname -m` DESTDIR=$BUILDDIR/root release >> $_log 2>&1 )
- if [ $? -ne 0 ]; then
- echo " failed."
- else
- echo " done."
- fi
-
- chmod 644 $RELEASEDIR/$MACHINE/binary/sets/x*.tgz
- chown $USER:$OBJGROUP $RELEASEDIR/$MACHINE/binary/sets/*
- fi
-
- printf "Unmounting $BUILDDIR/obj:"
- if [ -z "${MOUNT_PRECMD}" ]; then
- umount $BUILDDIR/obj >> $_log 2>&1
- else
- ${MOUNT_PRECMD} umount $BUILDDIR/obj >> $_log 2>&1
- fi
- if [ $? -ne 0 ]; then
- echo " failed."
- else
- echo " done."
- fi
-
- if [ "$MAIL_CMDLOG" = "yes" ]; then
- echo "Command log follows:"
- cat $_log
- rm -f $_log
- fi
-}
-
-# --------------------------------------------------------------------
-# Cleanup functions
-# --------------------------------------------------------------------
-
-sysbuild_clean() {
- check_noroot
- check_init
-
- if [ -n "`mount | grep $BUILDDIR/obj`" ]; then
- echo "$BUILDDIR/obj still mounted; cannot clean."
- exit 1
- fi
-
- printf "Cleaning $BUILDDIR/obj contents:"
- rm -rf $BUILDDIR/obj/*
- echo " done."
-
- printf "Cleaning $BUILDDIR/root contents:"
- rm -rf $BUILDDIR/root/*
- echo " done."
-
- printf "Cleaning $BUILDDIR/tools contents:"
- if [ "$KEEP_TOOLS" = "yes" ]; then
- echo " kept."
- else
- rm -rf $BUILDDIR/tools/*
- echo " done."
- fi
-}
-
-sysbuild_destroy() {
- check_root
-
- printf "Destroying $BUILDDIR:"
- rm -rf $BUILDDIR
- echo " done."
-}
-
-sysbuild_etcupdate() {
- check_root
-
- tmp=`mktemp -d /tmp/sysbuild.XXXX`
- if [ ! -f $RELEASEDIR/$MACHINE/binary/sets/etc.tgz ]; then
- err "etc.tgz is not yet built."
- fi
- printf "Backing up /etc to /etc.old:"
- rm -rf /etc.old
- cp -rf /etc /etc.old > /dev/null 2>&1
- echo " done."
- printf "Unpacking etc.tgz:"
- cd $tmp && tar xzpf $RELEASEDIR/$MACHINE/binary/sets/etc.tgz > /dev/null 2>&1
- if [ $? -ne 0 ]; then
- echo " failed."
- else
- echo " done."
- etcupdate -b $tmp
- rm -rf $tmp
- fi
-}
-
-# --------------------------------------------------------------------
-# Initialization and configuration
-# --------------------------------------------------------------------
-
-sysbuild_init() {
- check_root
-
- printf "Initializing $HOMEDIR:"
- mkdir -p $HOMEDIR
- chown $USER:$OBJGROUP $HOMEDIR
- if [ ! -f $HOMEDIR/.profile ]; then
- cp @EGDIR@/profile $HOMEDIR/.profile
- cp @EGDIR@/profile $HOMEDIR/.shrc
- fi
- echo " done."
-
- printf "Initializing $BUILDDIR:"
- # Make main directory
- mkdir -p $BUILDDIR
- chown $USER:$OBJGROUP $BUILDDIR
- chmod 750 $BUILDDIR
- # Make kernel work area
- mkdir -p $BUILDDIR/kernel
- chown $USER:$OBJGROUP $BUILDDIR/kernel
- chmod 750 $BUILDDIR/kernel
- # Make obj work area
- mkdir -p $BUILDDIR/obj
- chown $USER:$OBJGROUP $BUILDDIR/obj
- chmod 750 $BUILDDIR/obj
- # Make root work area
- mkdir -p $BUILDDIR/root
- chown $USER:$OBJGROUP $BUILDDIR/root
- chmod 750 $BUILDDIR/root
- # Make tools directory
- mkdir -p $BUILDDIR/tools
- chown $USER:$OBJGROUP $BUILDDIR/tools
- chmod 750 $BUILDDIR/tools
- echo " done."
-}
-
-sysbuild_config() {
- check_root
-
- if [ ! -d "@SYSBUILD_HOMEDIR@" ]; then
- mkdir -p @SYSBUILD_HOMEDIR@
- fi
-
- _conf="$1"
- if [ -z "$_conf" ]; then
- _conf="default"
- fi
- _conffile="@SYSBUILD_HOMEDIR@/$_conf.conf"
-
- if [ ! -f "$_conffile" ]; then
- printf "Copying template to $_conffile:"
- cp @EGDIR@/default.conf $_conffile
- chmod 644 $_conffile
- echo " done."
- fi
-
- if [ -z "$EDITOR" ]; then
- vi $_conffile
- else
- $EDITOR $_conffile
- fi
-}
-
-sysbuild_config_kernel() {
- check_root
-
- _conf="$1"
- if [ -z "$_conf" ]; then
- err "kernel name must be specified"
- fi
- _conffile="@SYSBUILD_HOMEDIR@/$_conf"
-
- if [ ! -f "$_conffile" ]; then
- printf "Copying template to $_conffile:"
- _generic="$SRCDIR/sys/arch/`uname -p`/conf/GENERIC"
- cp "$_generic" $_conffile
- chmod 644 $_conffile
- echo " done."
- fi
-
- if [ -z "$EDITOR" ]; then
- vi $_conffile
- else
- $EDITOR $_conffile
- fi
-}
-
-# --------------------------------------------------------------------
-# Source related functions
-# --------------------------------------------------------------------
-
-sysbuild_clean_srcs() {
- check_root
-
- _dirs="$*"
- if [ -z "$_dirs" ]; then
- _dirs="$CVSDIRS"
- fi
-
- for _d in $_dirs; do
- printf "Fixing ownerships and permissions of $_d:"
- chown -R $CVSDIRS_OWNER:$CVSDIRS_GROUP $_d
- if [ -n "$CVSDIRS_PERMS" ]; then
- chmod -R $CVSDIRS_PERMS $_d
- fi
- echo " done."
- done
-}
-
-sysbuild_update_srcs() {
- check_noroot
-
- _dirs="$*"
- if [ -z "$_dirs" ]; then
- _dirs="$CVSDIRS"
- fi
-
- for _d in $_dirs; do
- echo "Updating source tree $_d"
- cd $_d && CVS_RSH=ssh cvs -q -z6 update -dP
- echo
- done
-}
-
-# --------------------------------------------------------------------
-# Main program
-# --------------------------------------------------------------------
-
-# Parse options
-args=`getopt c:fms $*`
-if [ $? != 0 ]; then
- usage
- exit 1
-fi
-set -- $args
-maillog="no"
-autosu="no"
-fast="no"
-while [ $# -gt 0 ]; do
- case "$1" in
- -c)
- conffile="@SYSBUILD_HOMEDIR@/$2.conf"
- shift
- ;;
- -f)
- fast="yes"
- ;;
- -m)
- maillog="yes"
- maillogfile=`mktemp /tmp/sysbuild.XXXX`
- ;;
- -s)
- autosu="yes"
- ;;
- --)
- shift; break
- ;;
- esac
- shift
-done
-
-if [ $# -lt 1 ]; then
- usage
- exit 1
-fi
-
-target="$1"
-shift
-
-# Read configuration file.
-if [ "$target" != "config" -a ! -f $conffile ]; then
- err "configuration file $conffile not found"
-elif [ "$target" != "config" ]; then
- . $conffile
-fi
-
-# Parse targets.
-case $target in
- build-kernels)
- if [ "$maillog" = "yes" ]; then
- sysbuild_build_kernels $* >> $maillogfile
- else
- sysbuild_build_kernels $*
- fi
- ;;
- build-release)
- if [ "$maillog" = "yes" ]; then
- sysbuild_build_release >> $maillogfile
- else
- sysbuild_build_release
- fi
- ;;
- build-sets)
- if [ "$maillog" = "yes" ]; then
- sysbuild_build_sets >> $maillogfile
- else
- sysbuild_build_sets
- fi
- ;;
- build-x-release)
- if [ "$maillog" = "yes" ]; then
- sysbuild_build_x_release >> $maillogfile
- else
- sysbuild_build_x_release
- fi
- ;;
- clean)
- if [ "$maillog" = "yes" ]; then
- sysbuild_clean >> $maillogfile
- else
- sysbuild_clean
- fi
- ;;
- clean-srcs)
- if [ "$maillog" = "yes" ]; then
- sysbuild_clean_srcs $* >> $maillogfile
- else
- sysbuild_clean_srcs $*
- fi
- ;;
- config)
- sysbuild_config $*
- ;;
- config-kernel)
- sysbuild_config_kernel $*
- ;;
- destroy)
- sysbuild_destroy
- ;;
- etcupdate)
- sysbuild_etcupdate
- ;;
- init)
- sysbuild_init
- ;;
- install-kernel)
- if [ "$maillog" = "yes" ]; then
- sysbuild_install_kernel >> $maillogfile
- else
- sysbuild_install_kernel
- fi
- ;;
- install-sets)
- if [ "$maillog" = "yes" ]; then
- sysbuild_install_sets >> $maillogfile
- else
- sysbuild_install_sets
- fi
- ;;
- install-x-sets)
- if [ "$maillog" = "yes" ]; then
- sysbuild_install_x_sets >> $maillogfile
- else
- sysbuild_install_x_sets
- fi
- ;;
- update-srcs)
- if [ "$maillog" = "yes" ]; then
- sysbuild_update_srcs $* >> $maillogfile 2>&1
- else
- sysbuild_update_srcs $*
- fi
- ;;
- *)
- err "unknown target \`$target'"
- ;;
-esac
-
-if [ "$maillog" = "yes" ]; then
- mail -s "Output of $target target" $MAILTO < $maillogfile
- rm -f $maillogfile
-fi
-
-exit 0
diff --git a/sysutils/sysgen/DESCR b/sysutils/sysgen/DESCR
deleted file mode 100644
index 53ad295f465..00000000000
--- a/sysutils/sysgen/DESCR
+++ /dev/null
@@ -1,8 +0,0 @@
-sysgen reads DEC Qbus or UNIBUS device names from standard input,
-assigns CSR addresses and interrupt vectors to the devices according
-to the DEC standard algorithm for auto-configuration, and prints
-the resulting list of allocations to standard output.
-
-The program attempts to conform to the CONFIG command of the VMS
-SYSGEN program, but has simplified output. Specifically, it does
-not print information about VMS device naming and support.
diff --git a/sysutils/sysgen/Makefile b/sysutils/sysgen/Makefile
deleted file mode 100644
index 9aea17d0a94..00000000000
--- a/sysutils/sysgen/Makefile
+++ /dev/null
@@ -1,20 +0,0 @@
-# $NetBSD: Makefile,v 1.5 2003/03/29 12:42:33 jmmv Exp $
-#
-
-DISTNAME= sysgen
-PKGNAME= sysgen-1.0
-WRKSRC= ${WRKDIR}
-CATEGORIES= sysutils
-MASTER_SITES= http://ox.compsoc.net/~dankolb/sysgen/
-EXTRACT_SUFX= .tar.Z
-
-MAINTAINER= abs@netbsd.org
-COMMENT= assign DEC Qbus or UNIBUS standard CSR and vector addresses
-
-ALL_TARGET= sysgen
-
-do-install:
- ${INSTALL_PROGRAM} ${WRKSRC}/sysgen ${PREFIX}/bin
- ${INSTALL_MAN} ${WRKSRC}/sysgen.1 ${PREFIX}/man/man1
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/sysgen/PLIST b/sysutils/sysgen/PLIST
deleted file mode 100644
index e801c7bf408..00000000000
--- a/sysutils/sysgen/PLIST
+++ /dev/null
@@ -1,3 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 22:53:53 zuntum Exp $
-bin/sysgen
-man/man1/sysgen.1
diff --git a/sysutils/sysgen/distinfo b/sysutils/sysgen/distinfo
deleted file mode 100644
index 05792893515..00000000000
--- a/sysutils/sysgen/distinfo
+++ /dev/null
@@ -1,4 +0,0 @@
-$NetBSD: distinfo,v 1.2 2001/04/19 11:29:09 agc Exp $
-
-SHA1 (sysgen.tar.Z) = 1e821ca50073b53231d585b19035a4064337db44
-Size (sysgen.tar.Z) = 8228 bytes
diff --git a/sysutils/sysinfo/DESCR b/sysutils/sysinfo/DESCR
deleted file mode 100644
index 72e6d000083..00000000000
--- a/sysutils/sysinfo/DESCR
+++ /dev/null
@@ -1,6 +0,0 @@
-Sysinfo displays various types of information about a host's hardware
-and operating system software. It is intended to provide information
-in both human-readable and program-parsable formats. System
-administrators can use sysinfo to obtain hardware asset information
-and OS configuration information. Programs which use sysinfo can
-obtain this information in a platform-independent manner.
diff --git a/sysutils/sysinfo/Makefile b/sysutils/sysinfo/Makefile
deleted file mode 100644
index 39be737a894..00000000000
--- a/sysutils/sysinfo/Makefile
+++ /dev/null
@@ -1,23 +0,0 @@
-# $NetBSD: Makefile,v 1.4 2003/06/02 01:16:52 jschauma Exp $
-#
-
-DISTNAME= sysinfo-3.5.1
-CATEGORIES= sysutils
-MASTER_SITES= ftp://ftp.rge.com/pub/admin/sysinfo/
-
-MAINTAINER= tech-pkg@netbsd.org
-HOMEPAGE= http://www.magnicomp.com/
-COMMENT= displays system hardware and software information and configuration
-
-LICENSE= shareware
-
-ONLY_FOR_PLATFORM= SunOS-*-* # only for Solaris, at the moment
-
-ALL_TARGET= default
-INSTALL_TARGET= install install.man
-MAKE_ENV+= CPPFLAGS="" CC="${CC}"
-
-post-build:
- ${CHMOD} -R o+rx ${WRKDIR}
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/sysinfo/PLIST b/sysutils/sysinfo/PLIST
deleted file mode 100644
index 64b5ebcae5e..00000000000
--- a/sysutils/sysinfo/PLIST
+++ /dev/null
@@ -1,27 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 22:53:54 zuntum Exp $
-bin/sysinfo
-man/man1/sysinfo.1
-man/man5/sysinfo.cf.5
-libdata/sysinfo/conf/aix.cf
-libdata/sysinfo/conf/bsd.cf
-libdata/sysinfo/conf/bsdos.cf
-libdata/sysinfo/conf/dospart.cf
-libdata/sysinfo/conf/eisa.cf
-libdata/sysinfo/conf/freebsd.cf
-libdata/sysinfo/conf/hp-ux-com.cf
-libdata/sysinfo/conf/hp-ux.cf
-libdata/sysinfo/conf/irix.cf
-libdata/sysinfo/conf/irix64.cf
-libdata/sysinfo/conf/linux.cf
-libdata/sysinfo/conf/pci.cf
-libdata/sysinfo/conf/scsi.cf
-libdata/sysinfo/conf/sunos.cf
-libdata/sysinfo/conf/sunos_4.cf
-libdata/sysinfo/conf/sunos_5.cf
-libdata/sysinfo/conf/sunos_5.ddb
-sysinfo/libexec/sparc-sunos-5.6/sysinfo
-@dirrm sysinfo/libexec/sparc-sunos-5.6
-@dirrm sysinfo/libexec
-@dirrm sysinfo
-@dirrm libdata/sysinfo/conf
-@dirrm libdata/sysinfo
diff --git a/sysutils/sysinfo/distinfo b/sysutils/sysinfo/distinfo
deleted file mode 100644
index 4d77e939a28..00000000000
--- a/sysutils/sysinfo/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.2 2001/04/19 11:29:09 agc Exp $
-
-SHA1 (sysinfo-3.5.1.tar.gz) = 720d687aa7c65c41792c415a355962e9ca76fbd5
-Size (sysinfo-3.5.1.tar.gz) = 259920 bytes
-SHA1 (patch-aa) = 029b5d9431bb36da83225c22ad0a22584dbb6dcf
diff --git a/sysutils/sysinfo/patches/patch-aa b/sysutils/sysinfo/patches/patch-aa
deleted file mode 100644
index 8516201c6df..00000000000
--- a/sysutils/sysinfo/patches/patch-aa
+++ /dev/null
@@ -1,33 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 1999/06/21 11:18:04 agc Exp $
-
-Don't override PREFIX in the main Makefile, and place the
-configuration files, and the executable binary, in the correct
-directory, according to hier(7).
-
---- Makefile 1999/06/21 10:36:33 1.1
-+++ Makefile 1999/06/21 10:37:26
-@@ -23,7 +23,7 @@
- # The ${PREFIX} variable determines the top level directory that
- # things are installed under.
- #
--PREFIX = /var/local
-+#PREFIX = /var/local
-
- #
- # The bin directory that user's will run the program from.
-@@ -36,13 +36,13 @@
- # Directory containing sysinfo.cf configuration files
- #
- #CONFDIR = /usr/local/lib/${PROG}
--CONFDIR = ${PREFIX}/${PROG}/conf
-+CONFDIR = ${PREFIX}/libdata/${PROG}/conf
-
- #
- # The LIBDIR directory is where all the sysinfo binary executables
- # will be installed.
- #
--LIBDIR = ${PREFIX}/${PROG}/lib
-+LIBDIR = ${PREFIX}/${PROG}/libexec
-
- #
- # Man sections and directories
diff --git a/sysutils/tcx/DESCR b/sysutils/tcx/DESCR
deleted file mode 100644
index 7e6e0a5d6f2..00000000000
--- a/sysutils/tcx/DESCR
+++ /dev/null
@@ -1,8 +0,0 @@
-TCX is a system designed for the transparent decompression, execution
-and recompression of executables under Unix. It allows configuration
-options such as the type of compression system used (compress(1),
-gzip(1), your own local system etc), timeouts between recompressions,
-and emergency directories in case a decompression fails from shortage
-of disk space. The system is designed with a reasonable amount of
-robustness in mind, such as in the event of system crashes, or races
-on trying to uncompress, compress or execute something.
diff --git a/sysutils/tcx/MESSAGE b/sysutils/tcx/MESSAGE
deleted file mode 100644
index e1efe372a7f..00000000000
--- a/sysutils/tcx/MESSAGE
+++ /dev/null
@@ -1,11 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE,v 1.1.1.1 2003/06/23 13:55:24 agc Exp $
-
- WARNING - this package contains a setuid root executable called
- untcx, which was written in 1994, and contained calls to getwd(3),
- sprintf(3), strcpy(3) and strcat(3). I've done a minor audit of
- the code, and have fixed the above functions with calls to safer
- alternatives, but you may wish to delete this package from your
- own systems until you have carried out your own audit.
-
-===========================================================================
diff --git a/sysutils/tcx/Makefile b/sysutils/tcx/Makefile
deleted file mode 100644
index 2793ad7b808..00000000000
--- a/sysutils/tcx/Makefile
+++ /dev/null
@@ -1,17 +0,0 @@
-# $NetBSD: Makefile,v 1.1.1.1 2003/06/23 13:55:24 agc Exp $
-
-DISTNAME= tcx-linux
-PKGNAME= tcx-19940124
-CATEGORIES= sysutils
-MASTER_SITES= ftp://ibiblio.unc.edu/pub/Linux/utils/compress/
-
-MAINTAINER= packages@netbsd.org
-#HOMEPAGE=
-COMMENT= transparently compress executables
-
-WRKSRC= ${WRKDIR}/tcx
-
-post-patch:
- cd ${WRKSRC}; ${MV} config.h config.h-pre; ${SED} -e 's|@PREFIX@|"${PREFIX}"|g' < config.h-pre > config.h
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/tcx/PLIST b/sysutils/tcx/PLIST
deleted file mode 100644
index 7d260a722be..00000000000
--- a/sysutils/tcx/PLIST
+++ /dev/null
@@ -1,3 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2003/06/23 13:55:24 agc Exp $
-bin/tcx
-bin/untcx
diff --git a/sysutils/tcx/distinfo b/sysutils/tcx/distinfo
deleted file mode 100644
index 8cdbfe698a3..00000000000
--- a/sysutils/tcx/distinfo
+++ /dev/null
@@ -1,8 +0,0 @@
-$NetBSD: distinfo,v 1.1.1.1 2003/06/23 13:55:24 agc Exp $
-
-SHA1 (tcx-linux.tar.gz) = 73c112fc39cbfb794fe0f6b0d2e15739ee1c9f5a
-Size (tcx-linux.tar.gz) = 21028 bytes
-SHA1 (patch-aa) = 2e03b68d4c4ed05757fe788649eede461a11a4e5
-SHA1 (patch-ab) = 5e7e7247783090e3029504f80440b6faebe1d1dd
-SHA1 (patch-ac) = 9a285e8365a3e0151fd37e2bf86ee8c346599e3b
-SHA1 (patch-ad) = 5ba81fcec1e674054c532fc3c70a8a6d8f17c350
diff --git a/sysutils/tcx/patches/patch-aa b/sysutils/tcx/patches/patch-aa
deleted file mode 100644
index 920e08a5b90..00000000000
--- a/sysutils/tcx/patches/patch-aa
+++ /dev/null
@@ -1,29 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2003/06/23 13:55:24 agc Exp $
-
---- Makefile 2003/05/19 15:39:04 1.1
-+++ Makefile 2003/05/19 16:01:40
-@@ -6,11 +6,11 @@
-
- # C compiler of your choice. Should be ansi'ish
- #CC = cc # IRIX, ULTRIX
--CC = gcc # SUNOS, LINUX
-+#CC = gcc # SUNOS, LINUX
- #CC = c++ # try & see?
-
- # Cflags of choice.
--CFLAGS = -s -O6 -Wall
-+#CFLAGS = -s -O6 -Wall
-
-
- # Any libraries
-@@ -29,4 +29,9 @@
- shar -c -l 45 -o tcx README VERSION COPYING Makefile tcx.1 untcx.1 tcx.c config.h untcx.c
-
- clean:
-- /bin/rm -f *.o tcx untcx
-+ rm -f *.o tcx untcx
-+
-+install:
-+ ${BSD_INSTALL_PROGRAM} tcx ${PREFIX}/bin
-+ ${BSD_INSTALL_PROGRAM} untcx ${PREFIX}/bin
-+ chmod 4755 ${PREFIX}/bin/untcx
diff --git a/sysutils/tcx/patches/patch-ab b/sysutils/tcx/patches/patch-ab
deleted file mode 100644
index 6cf1712371d..00000000000
--- a/sysutils/tcx/patches/patch-ab
+++ /dev/null
@@ -1,41 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 2003/06/23 13:55:24 agc Exp $
-
---- config.h 2003/05/19 16:02:37 1.1
-+++ config.h 2003/05/19 16:03:51
-@@ -23,7 +23,7 @@
- /* Define one of the following where appropriate */
- /************************************************************************/
-
--#define LINUX
-+/* #define LINUX */
- /* #define SUNOS */
- /* #define IRIX */
- /* #define ULTRIX */
-@@ -45,14 +45,14 @@
- /* since PATHUNTCX must run setuid to root. */
- /************************************************************************/
-
--#define PATHUNTCX "/usr/local/bin/untcx"
-+#define PATHUNTCX @PREFIX@ "/bin/untcx"
-
- /************************************************************************/
- /* PATHTCX is the pathname to the tcx executable. This does not have to*/
- /* be installed setuid. */
- /************************************************************************/
-
--#define PATHTCX "/usr/local/bin/tcx"
-+#define PATHTCX @PREFIX@ "/bin/tcx"
-
- /************************************************************************/
- /* PATHPACKER is the pathname to the compression program you wish to use*/
-@@ -143,6 +143,10 @@
- #define PUSLEEP(x) (usleep(x))
- #endif
-
-+#ifndef PUSLEEP
-+#define PUSLEEP(x) (usleep(x))
-+#endif
-+
- #include <stdlib.h>
- #include <unistd.h>
- #include <sys/time.h>
diff --git a/sysutils/tcx/patches/patch-ac b/sysutils/tcx/patches/patch-ac
deleted file mode 100644
index 2ce1e46145f..00000000000
--- a/sysutils/tcx/patches/patch-ac
+++ /dev/null
@@ -1,172 +0,0 @@
-$NetBSD: patch-ac,v 1.1.1.1 2003/06/23 13:55:24 agc Exp $
-
-Minor security audit - the world has moved on since 1994.
-
---- untcx.c 2003/06/20 07:59:56 1.1
-+++ untcx.c 2003/06/20 08:09:26
-@@ -166,9 +166,9 @@
-
- /* Set global paths */
-
-- (void)sprintf(logpath, "%s/log", ENFSDIR);
-- (void)sprintf(logtmppath, "%s/logtmp", ENFSDIR);
-- (void)sprintf(lockpath, "%s/.lock", ENFSDIR);
-+ (void)snprintf(logpath, sizeof(logpath), "%s/log", ENFSDIR);
-+ (void)snprintf(logtmppath, sizeof(logtmppath), "%s/logtmp", ENFSDIR);
-+ (void)snprintf(lockpath, sizeof(lockpath), "%s/.lock", ENFSDIR);
-
- /* Check and start tcxd as required */
-
-@@ -185,16 +185,16 @@
-
- /* Grab argv[0] and resolve to full path name via getwd() */
-
-- if(getwd(cwd) == NULL)
-+ if(getcwd(cwd, sizeof(cwd)) == NULL)
- {
- (void)fprintf(stderr, "Get Working Directory Error: %s\n", cwd);
- exit(-1);
- }
-
- if(*argv[0] == '/')
-- (void)strcpy(realdir, argv[0]);
-+ (void)strlcpy(realdir, argv[0], sizeof(realdir));
- else
-- (void)sprintf(realdir, "%s/%s", cwd, argv[0]);
-+ (void)snprintf(realdir, sizeof(realdir), "%s/%s", cwd, argv[0]);
- for(;;)
- {
- if((c = strrchr(realdir, '/')) == NULL)
-@@ -203,7 +203,7 @@
- exit(-1);
- }
- c++;
-- (void)strcpy(execname, c);
-+ (void)strlcpy(execname, c, sizeof(execname));
- *c = '\0';
-
- if(chdir(realdir) < 0) /* Oops. Failed. Report and quit. */
-@@ -212,7 +212,7 @@
- exit(-1);
- }
-
-- if(getwd(realdir) == NULL)
-+ if(getcwd(realdir, sizeof(realdir)) == NULL)
- {
- (void)fprintf(stderr, "Get Working Directory Error: %s\n", cwd);
- exit(-1);
-@@ -238,11 +238,11 @@
- }
- execpath[len] = '\0';
- if(execpath[0] == '/')
-- (void)strcpy(realdir, execpath);
-+ (void)strlcpy(realdir, execpath, sizeof(realdir));
- else
- {
-- (void)strcat(realdir, "/");
-- (void)strcat(realdir, execpath);
-+ (void)strlcat(realdir, "/", sizeof(realdir));
-+ (void)strlcat(realdir, execpath, sizeof(realdir));
- }
- continue;
- }
-@@ -291,8 +291,8 @@
- #else
- if(setreuid(getuid(), getuid()) < 0) { perror("setreuid"); exit(-1); }
- #endif
-- (void)sprintf(tcxtarg, "%s/%s", realdir, execname);
-- (void)sprintf(untcxtmp, "%s/.untcx.%s", realdir, execname);
-+ (void)snprintf(tcxtarg, sizeof(tcxtarg), "%s/%s", realdir, execname);
-+ (void)snprintf(untcxtmp, sizeof(untcxtmp), "%s/.untcx.%s", realdir, execname);
- just_untcx(tcxtarg, untcxtmp);
- exit(0);
- }
-@@ -302,8 +302,8 @@
-
- if(local)
- {
-- (void)sprintf(tcxtarg, "%s/%s", realdir, execname);
-- (void)sprintf(untcxtmp, "%s/.untcx.%s", realdir, execname);
-+ (void)snprintf(tcxtarg, sizeof(tcxtarg), "%s/%s", realdir, execname);
-+ (void)snprintf(untcxtmp, sizeof(untcxtmp), "%s/.untcx.%s", realdir, execname);
- untcx_and_exec_local(tcxtarg, untcxtmp, &(argv[1]));
- }
- #endif
-@@ -315,7 +315,7 @@
- for(c = realdir; *c ; c++)
- if(*c == '/')
- *c = '=';
-- (void)sprintf(tcxtarg, "%s/%s", ENFSDIR, realdir);
-+ (void)snprintf(tcxtarg, sizeof(tcxtarg), "%s/%s", ENFSDIR, realdir);
- if(mkdir(tcxtarg, 0777) < 0)
- if(errno != EEXIST)
- {
-@@ -323,9 +323,9 @@
- exit(-1);
- }
- (void)chmod(tcxtarg, 0777);
-- (void)strcat(tcxtarg,"/");
-- (void)strcat(tcxtarg, execname);
-- (void)sprintf(untcxtmp, "%s/%s/.untcx.%s", ENFSDIR, realdir, execname);
-+ (void)strlcat(tcxtarg,"/", sizeof(tcxtarg));
-+ (void)strlcat(tcxtarg, execname, sizeof(tcxtarg));
-+ (void)snprintf(untcxtmp, sizeof(untcxtmp), "%s/%s/.untcx.%s", ENFSDIR, realdir, execname);
-
- untcx_and_exec_nfs(argv[0], untcxtmp, tcxtarg, &(argv[1]));
-
-@@ -415,7 +415,7 @@
-
- /* Write our process id to the lock file. Don't really care if fails. */
-
-- (void)sprintf(spid, "%d\n", getpid());
-+ (void)snprintf(spid, sizeof(spid), "%d\n", getpid());
- (void)write(lkfd, spid, strlen(spid));
-
- #ifdef UNPACK_IN_PLACE
-@@ -810,30 +810,30 @@
-
- /* resolve first stage of argv[0] */
-
-- if(getwd(cwd) == NULL) { (void)fprintf(stderr, "Get Working Directory Error: %s\n", cwd); exit(-1); }
-+ if(getcwd(cwd, sizeof(cwd)) == NULL) { (void)fprintf(stderr, "Get Working Directory Error: %s\n", cwd); exit(-1); }
-
-- if(*argv[0] == '/') (void)strcpy(realdir, argv[0]); else (void)sprintf(realdir, "%s/%s", cwd, argv[0]);
-+ if(*argv[0] == '/') (void)strlcpy(realdir, argv[0], sizeof(realdir)); else (void)snprintf(realdir, sizeof(realdir), "%s/%s", cwd, argv[0]);
-
- if((c = strrchr(realdir, '/')) == NULL) { (void)fprintf(stderr, "Help! Internal corruption of variables!\n"); exit(-1); }
-
-- c++; (void)strcpy(execname, c); *c = '\0';
-+ c++; (void)strlcpy(execname, c, sizeof(execname)); *c = '\0';
-
- if(chdir(realdir) < 0) { perror(realdir); exit(-1); }
-
-- if(getwd(realdir) == NULL) { (void)fprintf(stderr, "Get Working Directory Error: %s\n", cwd); exit(-1); }
-+ if(getcwd(realdir, sizeof(realdir)) == NULL) { (void)fprintf(stderr, "Get Working Directory Error: %s\n", cwd); exit(-1); }
-
- for(c = realdir; *c; c++)
- if(*c == '/')
- *c = '=';
-- (void)sprintf(linkpath, "%s/%s", ENFSDIR, realdir);
-+ (void)snprintf(linkpath, sizeof(linkpath), "%s/%s", ENFSDIR, realdir);
- if(mkdir(linkpath, 0777) < 0)
- {
- if(errno != EEXIST) { perror(linkpath); exit(-1); }
- }
- else
- (void)chmod(linkpath, 0777);
-- (void)strcat(linkpath,"/");
-- (void)strcat(linkpath, execname);
-+ (void)strlcat(linkpath,"/", sizeof(linkpath));
-+ (void)strlcat(linkpath, execname, sizeof(linkpath));
-
- if(chdir(cwd) < 0) { perror(cwd); exit(-1); }
-
-@@ -1244,7 +1244,7 @@
- if((curr = (path *)malloc(sizeof(path))) == NULL)
- continue;
-
-- (void)strcpy(curr->path, newpath);
-+ (void)strlcpy(curr->path, newpath, sizeof(curr->path));
- #ifdef UNPACK_IN_PLACE
- curr->pid = -1;
- (strstr(newpath, ENFSDIR) == newpath) ? (curr->local = 0) : (curr->local = 1);
diff --git a/sysutils/tcx/patches/patch-ad b/sysutils/tcx/patches/patch-ad
deleted file mode 100644
index 489002cfcd5..00000000000
--- a/sysutils/tcx/patches/patch-ad
+++ /dev/null
@@ -1,36 +0,0 @@
-$NetBSD: patch-ad,v 1.1.1.1 2003/06/23 13:55:24 agc Exp $
-
-Minor security audit
-
---- tcx.c 2003/06/20 10:44:29 1.1
-+++ tcx.c 2003/06/20 10:45:54
-@@ -120,16 +120,16 @@
- /* If cannot, warn user and quit */
-
- if(strrchr(argv[1], '/') == NULL)
-- (void)sprintf(tofile, ".tcx.%s", argv[1]);
-+ (void)snprintf(tofile, sizeof(tofile), ".tcx.%s", argv[1]);
- else
- {
-- (void)strcpy(tofile, argv[1]);
-+ (void)strlcpy(tofile, argv[1], sizeof(tofile));
- s = strrchr(tofile, '/');
- *s = '\0';
-- (void)strcat(tofile, "/.tcx.");
-+ (void)strlcat(tofile, "/.tcx.", sizeof(tofile));
- s = strrchr(argv[1], '/');
- s++;
-- (void)strcat(tofile, s);
-+ (void)strlcat(tofile, s, sizeof(tofile));
- }
-
- lck.l_type = F_WRLCK; lck.l_whence = 0; lck.l_start = 0; lck.l_len = 0;
-@@ -213,7 +213,7 @@
-
- /* Spit out header and start encoding executable */
-
-- (void)sprintf(header, "#!%s\n", PATHUNTCX);
-+ (void)snprintf(header, sizeof(header), "#!%s\n", PATHUNTCX);
- if(write(outfd, header, strlen(header)) < 0) { (void)perror("write"); exit(-1); }
-
- c = 0; if((write(outfd, &c, 1)) < 0) { (void)perror("write"); exit(-1); }
diff --git a/sysutils/tdir/DESCR b/sysutils/tdir/DESCR
deleted file mode 100644
index 48783583ce4..00000000000
--- a/sysutils/tdir/DESCR
+++ /dev/null
@@ -1,12 +0,0 @@
-tdir is Yet Another Way To Display Directory Listings. Output is in
-columnar format with sub-directories listed first, and then a listing
-of the files ordered by their ending "extension" - typically the
-characters following the rightmost '.' in the file name (though this
-can be changed on the command line).
-
-tdir supports recursive directory examination. Total output width as
-well as column width can be set on the command line and tdir will
-autoformat accordingly.
-
-tdir is written in 'python' and requires a reasonably current version
-of the 'python' environment to be present on the system.
diff --git a/sysutils/tdir/Makefile b/sysutils/tdir/Makefile
deleted file mode 100644
index b5d77811a9f..00000000000
--- a/sysutils/tdir/Makefile
+++ /dev/null
@@ -1,16 +0,0 @@
-# $NetBSD: Makefile,v 1.5 2002/09/21 23:46:58 jlam Exp $
-#
-
-DISTNAME= tdir-1.58
-CATEGORIES= sysutils
-MASTER_SITES= http://www.tundraware.com/Software/tdir/
-
-MAINTAINER= zuntum@netbsd.org
-COMMENT= Display directories with files ordered by ending "extension"
-
-LICENSE= tdir-license
-
-PYTHON_PATCH_SCRIPTS= tdir
-
-.include "../../lang/python/application.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/tdir/PLIST b/sysutils/tdir/PLIST
deleted file mode 100644
index ba72d9b582a..00000000000
--- a/sysutils/tdir/PLIST
+++ /dev/null
@@ -1,4 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 22:53:56 zuntum Exp $
-bin/tdir
-share/doc/tdir/tdir-license.txt
-@dirrm share/doc/tdir
diff --git a/sysutils/tdir/distinfo b/sysutils/tdir/distinfo
deleted file mode 100644
index 48a061738df..00000000000
--- a/sysutils/tdir/distinfo
+++ /dev/null
@@ -1,4 +0,0 @@
-$NetBSD: distinfo,v 1.1.1.1 2001/07/07 09:26:17 zuntum Exp $
-
-SHA1 (tdir-1.58.tar.gz) = abad48d9b180b9af6a140a47f5786cd90fff36cb
-Size (tdir-1.58.tar.gz) = 5926 bytes
diff --git a/sysutils/tits/DESCR b/sysutils/tits/DESCR
deleted file mode 100644
index a2effb8efac..00000000000
--- a/sysutils/tits/DESCR
+++ /dev/null
@@ -1,8 +0,0 @@
-The tits command is a server process which provides telnet(1) access
-to one or more tty ports as specified in config-file (or
-/etc/tits.conf if no configuration file is specified on the command
-line).
-
-Any number of telnet(1) clients may connect to a single tits port.
-Each client will see exactly the same output as well as being able to
-send keystrokes simultaneously.
diff --git a/sysutils/tits/Makefile b/sysutils/tits/Makefile
deleted file mode 100644
index b5378ca463b..00000000000
--- a/sysutils/tits/Makefile
+++ /dev/null
@@ -1,26 +0,0 @@
-# $NetBSD: Makefile,v 1.9 2002/12/04 09:52:17 scw Exp $
-#
-
-DISTNAME= tits-1.0.3
-CATEGORIES= sysutils
-MASTER_SITES= http://www.mctavish.co.uk/tits/
-
-MAINTAINER= scw@netbsd.org
-COMMENT= server which provides telnet(1) access to one or more tty ports
-
-BINDIR= ${PREFIX}/sbin
-MANDIR= ${PREFIX}/man
-MAKE_ENV+= BINDIR=${BINDIR} MANDIR=${MANDIR}
-
-MANCOMPRESSED_IF_MANZ= yes
-
-post-patch:
- ${MV} ${WRKSRC}/tits.8 ${WRKSRC}/tits.8.in
- ${SED} -e 's|/usr/local/etc|${PKG_SYSCONFDIR}|g' \
- -e 's|/usr/local|${PREFIX}|g' \
- ${WRKSRC}/tits.8.in > ${WRKSRC}/tits.8
-
-post-install:
- ${INSTALL_DATA} ${WRKSRC}/tits.conf ${PREFIX}/share/examples/
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/tits/PLIST b/sysutils/tits/PLIST
deleted file mode 100644
index 7f8cbd6c76b..00000000000
--- a/sysutils/tits/PLIST
+++ /dev/null
@@ -1,5 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 22:53:57 zuntum Exp $
-share/examples/tits.conf
-sbin/tits
-man/man8/tits.8
-man/cat8/tits.0
diff --git a/sysutils/tits/distinfo b/sysutils/tits/distinfo
deleted file mode 100644
index 78eddb36562..00000000000
--- a/sysutils/tits/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.3 2002/12/04 09:52:17 scw Exp $
-
-SHA1 (tits-1.0.3.tar.gz) = 4ad844795d850140c1bf518cae4a7a70f114c74e
-Size (tits-1.0.3.tar.gz) = 20781 bytes
-SHA1 (patch-aa) = cb97029249e318d30b859ad4479ae6cb0c0ffcf2
diff --git a/sysutils/tits/patches/patch-aa b/sysutils/tits/patches/patch-aa
deleted file mode 100644
index e487c828712..00000000000
--- a/sysutils/tits/patches/patch-aa
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-aa,v 1.3 2002/06/04 08:38:21 seb Exp $
-
---- Makefile.orig Tue Feb 20 21:27:21 2001
-+++ Makefile
-@@ -37,7 +37,8 @@
- SRCS= main.c buffer.c client.c context.c listener.c telnet.c tty.c
- SRCS+= dispatcher.c setup.c config.c server.c logger.c
-
--CPPFLAGS+= -DLIBWRAP -DTITS_DEFAULT_CONFIG_FILE=\"${LOCALBASE}/etc/tits.conf\"
-+
-+CPPFLAGS+= -DLIBWRAP -DTITS_DEFAULT_CONFIG_FILE=\"${PKG_SYSCONFDIR}/tits.conf\"
- LDADD+= -lwrap
- PREFIX?= /usr/local
- BINDIR?= ${PREFIX}/sbin
diff --git a/sysutils/tkcron/DESCR b/sysutils/tkcron/DESCR
deleted file mode 100644
index eecb9c04717..00000000000
--- a/sysutils/tkcron/DESCR
+++ /dev/null
@@ -1,2 +0,0 @@
-Tkcron is a frontend to crontab which allows the user to conveniently
-add/modify/install/remove cron jobs.
diff --git a/sysutils/tkcron/Makefile b/sysutils/tkcron/Makefile
deleted file mode 100644
index 338b220796a..00000000000
--- a/sysutils/tkcron/Makefile
+++ /dev/null
@@ -1,24 +0,0 @@
-# $NetBSD: Makefile,v 1.6 2003/06/02 01:16:51 jschauma Exp $
-#
-
-DISTNAME= tkcron-2.12
-WRKSRC= ${WRKDIR}
-CATEGORIES= x11 tk
-MASTER_SITES= ftp://ftp.neosoft.com/languages/tcl/alcatel/code/
-EXTRACT_SUFX= .tcl.gz
-
-MAINTAINER= tech-pkg@netbsd.org
-COMMENT= graphical frontend to crontab
-
-DEPENDS+= tk>=8.3.2:../../x11/tk
-
-USE_X11= yes
-EXTRACT_CMD= ${GZCAT} ${DOWNLOADED_DISTFILE} > tkcron.tcl
-
-do-build:
- ${SED} -e "\:/usr/local/bin/wish: s;;${LOCALBASE}/bin/wish;g" ${WRKSRC}/tkcron.tcl > ${WRKSRC}/tkcron
-
-do-install:
- ${INSTALL_SCRIPT} ${WRKSRC}/tkcron ${PREFIX}/bin
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/tkcron/PLIST b/sysutils/tkcron/PLIST
deleted file mode 100644
index c3b7af60c1c..00000000000
--- a/sysutils/tkcron/PLIST
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 22:53:58 zuntum Exp $
-bin/tkcron
diff --git a/sysutils/tkcron/distinfo b/sysutils/tkcron/distinfo
deleted file mode 100644
index ad63806877b..00000000000
--- a/sysutils/tkcron/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.2 2001/04/19 11:29:09 agc Exp $
-
-SHA1 (tkcron-2.12.tcl.gz) = 13e9d3e768005289ed3b76fcdebbaaf454800b05
-Size (tkcron-2.12.tcl.gz) = 4545 bytes
-SHA1 (patch-aa) = c12f90022aecb286e18abeebd4c5e85b5fe79bf2
diff --git a/sysutils/tkcron/patches/patch-aa b/sysutils/tkcron/patches/patch-aa
deleted file mode 100644
index f1ece6deb47..00000000000
--- a/sysutils/tkcron/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2000/08/30 23:07:45 jwise Exp $
-
---- tkcron.tcl Sat Aug 3 17:53:42 1996
-+++ tkcron.tcl Sat Aug 3 17:52:03 1996
-@@ -281,6 +281,7 @@
-
- # Return the crontab string as a list
- proc parseCrontabFile {str} {
-+ set result ""
- set crontablist [split $str \n]
- set listlength [llength $crontablist]
- for {set i 0} {$i < $listlength} {incr i 1} {
-
diff --git a/sysutils/tkdesk/DESCR b/sysutils/tkdesk/DESCR
deleted file mode 100644
index c71f316d61e..00000000000
--- a/sysutils/tkdesk/DESCR
+++ /dev/null
@@ -1,6 +0,0 @@
-TkDesk is a graphical file manager for Unix and the X-Window System. It offers
-a very rich set of file operations and services, and provides the user with an
-immense amount of configurability. TkDesk's configuration flexibility results
-from the use of Tcl/Tk as the primary implementation language. Another benefit
-of using Tcl/Tk is that TkDesk is very portable and runs on virtually any Unix
-platform.
diff --git a/sysutils/tkdesk/Makefile b/sysutils/tkdesk/Makefile
deleted file mode 100644
index 0928eada25c..00000000000
--- a/sysutils/tkdesk/Makefile
+++ /dev/null
@@ -1,28 +0,0 @@
-# $NetBSD: Makefile,v 1.3 2003/06/02 01:16:51 jschauma Exp $
-#
-
-DISTNAME= tkdesk-1.2
-CATEGORIES= sysutils
-MASTER_SITES= http://tkdesk.sourceforge.net/dist/
-
-MAINTAINER= tech-pkg@netbsd.org
-HOMEPAGE= http://tkdesk.sourceforge.net/
-COMMENT= graphical file manager
-
-USE_BUILDLINK2= YES
-GNU_CONFIGURE= YES
-CONFIGURE_ARGS+=--with-tcl=${BUILDLINK_PREFIX.tcl}/lib \
- --with-tk=${BUILDLINK_PREFIX.tk}/lib \
- --with-itcl=${BUILDLINK_PREFIX.tcl-itcl}/lib \
- --with-blt=${BUILDLINK_PREFIX.blt}/lib
-
-pre-install:
- ${RM} -Rf ${WRKSRC}/tcldesk/configs/.trash
- ${FIND} ${WRKSRC}/tcldesk -type f -name '*.orig' | ${XARGS} ${RM} -rf
- ${FIND} ${WRKSRC}/tcldesk -name '*' -exec ${TOUCH} {} ';'
-
-.include "../../lang/tcl/buildlink2.mk"
-.include "../../lang/tcl-itcl/buildlink2.mk"
-.include "../../x11/blt/buildlink2.mk"
-.include "../../x11/tk/buildlink2.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/tkdesk/PLIST b/sysutils/tkdesk/PLIST
deleted file mode 100644
index d72895181cf..00000000000
--- a/sysutils/tkdesk/PLIST
+++ /dev/null
@@ -1,590 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2002/07/03 09:27:00 dmcmahill Exp $
-bin/cd-tkdesk
-bin/ed-tkdesk
-bin/od-tkdesk
-bin/op-tkdesk
-bin/pauseme
-bin/pop-tkdesk
-bin/tkdesk
-bin/tkdeskclient
-bin/tkdesksh
-lib/tkdesk/Common.tcl
-lib/tkdesk/Desktop.tcl
-lib/tkdesk/DiskUsage.tcl
-lib/tkdesk/Editor.tcl
-lib/tkdesk/FileInfo.tcl
-lib/tkdesk/FileListbox.tcl
-lib/tkdesk/Frame.tcl
-lib/tkdesk/HistEntry.tcl
-lib/tkdesk/List.tcl
-lib/tkdesk/Periodic.tcl
-lib/tkdesk/Toplevel.tcl
-lib/tkdesk/Viewer.tcl
-lib/tkdesk/action.tcl
-lib/tkdesk/annotations.tcl
-lib/tkdesk/appbar-date.tcl
-lib/tkdesk/appbar-dialup.tcl
-lib/tkdesk/appbar-load.tcl
-lib/tkdesk/appbar-mail.tcl
-lib/tkdesk/appbar-trash.tcl
-lib/tkdesk/appbar.tcl
-lib/tkdesk/bltDnd.tcl
-lib/tkdesk/bltDragdrop.tcl
-lib/tkdesk/bookmarks.tcl
-lib/tkdesk/cb_tools/bindings.tcl
-lib/tkdesk/cb_tools/bitmaps/combo.xbm
-lib/tkdesk/cb_tools/bitmaps/down.xbm
-lib/tkdesk/cb_tools/bitmaps/erase.xbm
-lib/tkdesk/cb_tools/bitmaps/help.xbm
-lib/tkdesk/cb_tools/bitmaps/slash.xbm
-lib/tkdesk/cb_tools/bitmaps/timer.mask.xbm
-lib/tkdesk/cb_tools/bitmaps/timer.xbm
-lib/tkdesk/cb_tools/bitmaps/timer1.xbm
-lib/tkdesk/cb_tools/bitmaps/timer2.xbm
-lib/tkdesk/cb_tools/bitmaps/timer3.xbm
-lib/tkdesk/cb_tools/bitmaps/timer4.xbm
-lib/tkdesk/cb_tools/bitmaps/timer5.xbm
-lib/tkdesk/cb_tools/bitmaps/timer6.xbm
-lib/tkdesk/cb_tools/bitmaps/timer7.xbm
-lib/tkdesk/cb_tools/bitmaps/timer8.xbm
-lib/tkdesk/cb_tools/bitmaps/up.xbm
-lib/tkdesk/cb_tools/debug.tcl
-lib/tkdesk/cb_tools/dialog.tcl
-lib/tkdesk/cb_tools/help.tcl
-lib/tkdesk/cb_tools/itcl_reload.tcl
-lib/tkdesk/cb_tools/mkindex
-lib/tkdesk/cb_tools/modules.tcl
-lib/tkdesk/cb_tools/popup.tcl
-lib/tkdesk/cb_tools/tclIndex
-lib/tkdesk/cb_tools/tools.tcl
-lib/tkdesk/cb_tools/widgets.tcl
-lib/tkdesk/clrpick.tcl
-lib/tkdesk/config.tcl
-lib/tkdesk/configs/AppBar
-lib/tkdesk/configs/AppBar_Be
-lib/tkdesk/configs/AppBar_Games
-lib/tkdesk/configs/ButtonBar
-lib/tkdesk/configs/Commands
-lib/tkdesk/configs/Directories
-lib/tkdesk/configs/FileTags
-lib/tkdesk/configs/Popups
-lib/tkdesk/configs/Sounds
-lib/tkdesk/configs/System
-lib/tkdesk/copy.tcl
-lib/tkdesk/cpanels.tcl
-lib/tkdesk/delete.tcl
-lib/tkdesk/diary.tcl
-lib/tkdesk/doc/CHANGES
-lib/tkdesk/doc/Guide
-lib/tkdesk/doc/License
-lib/tkdesk/doc/QuickStart
-lib/tkdesk/doc/guide-1.html
-lib/tkdesk/doc/guide-10.html
-lib/tkdesk/doc/guide-11.html
-lib/tkdesk/doc/guide-2.html
-lib/tkdesk/doc/guide-3.html
-lib/tkdesk/doc/guide-4.html
-lib/tkdesk/doc/guide-5.html
-lib/tkdesk/doc/guide-6.html
-lib/tkdesk/doc/guide-7.html
-lib/tkdesk/doc/guide-8.html
-lib/tkdesk/doc/guide-9.html
-lib/tkdesk/doc/guide.html
-lib/tkdesk/dsk_Listbox.tcl
-lib/tkdesk/envedit.tcl
-lib/tkdesk/file_ops.tcl
-lib/tkdesk/find.tcl
-lib/tkdesk/help.tcl
-lib/tkdesk/history.tcl
-lib/tkdesk/images/aladins_lamp.xpm
-lib/tkdesk/images/arrleft.xpm
-lib/tkdesk/images/arrright.xpm
-lib/tkdesk/images/atom.xpm
-lib/tkdesk/images/be/achtung.xpm
-lib/tkdesk/images/be/app_link.xpm
-lib/tkdesk/images/be/bebox.xpm
-lib/tkdesk/images/be/bebox2.xpm
-lib/tkdesk/images/be/bettler.xpm
-lib/tkdesk/images/be/bildschirm1.xpm
-lib/tkdesk/images/be/blocks.xpm
-lib/tkdesk/images/be/briefkasten.xpm
-lib/tkdesk/images/be/bulb.xpm
-lib/tkdesk/images/be/cdplayer.xpm
-lib/tkdesk/images/be/domino.xpm
-lib/tkdesk/images/be/edit.xpm
-lib/tkdesk/images/be/email.xpm
-lib/tkdesk/images/be/fernbedienung.xpm
-lib/tkdesk/images/be/flieger.xpm
-lib/tkdesk/images/be/folder.xpm
-lib/tkdesk/images/be/font.xpm
-lib/tkdesk/images/be/fraktal.xpm
-lib/tkdesk/images/be/grammophon.xpm
-lib/tkdesk/images/be/hardware.xpm
-lib/tkdesk/images/be/info.xpm
-lib/tkdesk/images/be/install.xpm
-lib/tkdesk/images/be/kaleidoskop.xpm
-lib/tkdesk/images/be/kartei.xpm
-lib/tkdesk/images/be/kiste.xpm
-lib/tkdesk/images/be/leute.xpm
-lib/tkdesk/images/be/lib_link.xpm
-lib/tkdesk/images/be/lupe.xpm
-lib/tkdesk/images/be/maennchen.xpm
-lib/tkdesk/images/be/mailbox.xpm
-lib/tkdesk/images/be/mine.xpm
-lib/tkdesk/images/be/mischpult.xpm
-lib/tkdesk/images/be/netsurf.xpm
-lib/tkdesk/images/be/netzwerk.xpm
-lib/tkdesk/images/be/ordner.xpm
-lib/tkdesk/images/be/ordner_link.xpm
-lib/tkdesk/images/be/oszi.xpm
-lib/tkdesk/images/be/paint.xpm
-lib/tkdesk/images/be/papierkorb.xpm
-lib/tkdesk/images/be/printer.xpm
-lib/tkdesk/images/be/rakete.xpm
-lib/tkdesk/images/be/schrank.xpm
-lib/tkdesk/images/be/schreibtisch.xpm
-lib/tkdesk/images/be/scsi.xpm
-lib/tkdesk/images/be/terminal.xpm
-lib/tkdesk/images/be/text.xpm
-lib/tkdesk/images/be/text2.xpm
-lib/tkdesk/images/be/text_leer.xpm
-lib/tkdesk/images/be/uhr.xpm
-lib/tkdesk/images/be/world.xpm
-lib/tkdesk/images/be/wuerfel.xpm
-lib/tkdesk/images/be/zahnrad.xpm
-lib/tkdesk/images/be/zahnrad2.xpm
-lib/tkdesk/images/be/zeichner.xpm
-lib/tkdesk/images/bigfiling.xpm
-lib/tkdesk/images/book_edit.xpm
-lib/tkdesk/images/book_open.xpm
-lib/tkdesk/images/bookcase.xpm
-lib/tkdesk/images/box_full.xpm
-lib/tkdesk/images/calendar.xpm
-lib/tkdesk/images/cdrom.xpm
-lib/tkdesk/images/checklist.xpm
-lib/tkdesk/images/chess.xpm
-lib/tkdesk/images/comet.xpm
-lib/tkdesk/images/construction.xpm
-lib/tkdesk/images/copy.xpm
-lib/tkdesk/images/copy2.xpm
-lib/tkdesk/images/desk.xpm
-lib/tkdesk/images/document.xpm
-lib/tkdesk/images/door_run.xpm
-lib/tkdesk/images/earth.xpm
-lib/tkdesk/images/earth2.xpm
-lib/tkdesk/images/edit.xpm
-lib/tkdesk/images/eye.xpm
-lib/tkdesk/images/ficons16/archive.xpm
-lib/tkdesk/images/ficons16/backup.xpm
-lib/tkdesk/images/ficons16/book.xpm
-lib/tkdesk/images/ficons16/c.xpm
-lib/tkdesk/images/ficons16/computer.xpm
-lib/tkdesk/images/ficons16/config.xpm
-lib/tkdesk/images/ficons16/desk.xpm
-lib/tkdesk/images/ficons16/dir.xpm
-lib/tkdesk/images/ficons16/dir2.xpm
-lib/tkdesk/images/ficons16/diropen.xpm
-lib/tkdesk/images/ficons16/diropen2.xpm
-lib/tkdesk/images/ficons16/doc.xpm
-lib/tkdesk/images/ficons16/exec.xpm
-lib/tkdesk/images/ficons16/exec2.xpm
-lib/tkdesk/images/ficons16/file.xpm
-lib/tkdesk/images/ficons16/font.xpm
-lib/tkdesk/images/ficons16/gif.xpm
-lib/tkdesk/images/ficons16/gif2.xpm
-lib/tkdesk/images/ficons16/h.xpm
-lib/tkdesk/images/ficons16/html.xpm
-lib/tkdesk/images/ficons16/html2.xpm
-lib/tkdesk/images/ficons16/image.xpm
-lib/tkdesk/images/ficons16/mini-comet.xpm
-lib/tkdesk/images/ficons16/music.xpm
-lib/tkdesk/images/ficons16/parcel.xpm
-lib/tkdesk/images/ficons16/pdf.xpm
-lib/tkdesk/images/ficons16/prism.xpm
-lib/tkdesk/images/ficons16/rpm.xpm
-lib/tkdesk/images/ficons16/script.xpm
-lib/tkdesk/images/ficons16/sound.xpm
-lib/tkdesk/images/ficons16/speaker.xpm
-lib/tkdesk/images/ficons16/sym.xpm
-lib/tkdesk/images/ficons16/symdir.xpm
-lib/tkdesk/images/ficons16/symdir2.xpm
-lib/tkdesk/images/ficons16/symdiropen.xpm
-lib/tkdesk/images/ficons16/symdiropen2.xpm
-lib/tkdesk/images/ficons16/symexec.xpm
-lib/tkdesk/images/ficons16/sys.xpm
-lib/tkdesk/images/ficons16/system.xpm
-lib/tkdesk/images/ficons16/tcl.xpm
-lib/tkdesk/images/ficons16/tex.xpm
-lib/tkdesk/images/ficons16/text.xpm
-lib/tkdesk/images/ficons16/video.xpm
-lib/tkdesk/images/ficons16/write.xpm
-lib/tkdesk/images/ficons16/xbm.xpm
-lib/tkdesk/images/ficons16/xpm.xpm
-lib/tkdesk/images/ficons32/binary.xpm
-lib/tkdesk/images/ficons32/bracket.xpm
-lib/tkdesk/images/ficons32/compressed.xpm
-lib/tkdesk/images/ficons32/dir.xpm
-lib/tkdesk/images/ficons32/dir2.xpm
-lib/tkdesk/images/ficons32/dot_a.xpm
-lib/tkdesk/images/ficons32/dot_c.xpm
-lib/tkdesk/images/ficons32/dot_h.xpm
-lib/tkdesk/images/ficons32/dot_o.xpm
-lib/tkdesk/images/ficons32/drawing.xpm
-lib/tkdesk/images/ficons32/drawing3.xpm
-lib/tkdesk/images/ficons32/exec.xpm
-lib/tkdesk/images/ficons32/fig.xpm
-lib/tkdesk/images/ficons32/file.xpm
-lib/tkdesk/images/ficons32/gif.xpm
-lib/tkdesk/images/ficons32/info.xpm
-lib/tkdesk/images/ficons32/makefile.xpm
-lib/tkdesk/images/ficons32/postscript.xpm
-lib/tkdesk/images/ficons32/sound.xpm
-lib/tkdesk/images/ficons32/system.xpm
-lib/tkdesk/images/ficons32/tar.xpm
-lib/tkdesk/images/ficons32/tex.xpm
-lib/tkdesk/images/ficons32/text.xpm
-lib/tkdesk/images/ficons32/xbm.xpm
-lib/tkdesk/images/ficons32/xpm.xpm
-lib/tkdesk/images/file_dir.xpm
-lib/tkdesk/images/file_doc.xpm
-lib/tkdesk/images/filing.xpm
-lib/tkdesk/images/floppy.xpm
-lib/tkdesk/images/folder.xpm
-lib/tkdesk/images/folder2.xpm
-lib/tkdesk/images/hand+.xpm
-lib/tkdesk/images/hand.mask.xpm
-lib/tkdesk/images/hand.xpm
-lib/tkdesk/images/help.xpm
-lib/tkdesk/images/home.xpm
-lib/tkdesk/images/info.xpm
-lib/tkdesk/images/info2.xpm
-lib/tkdesk/images/laserwriter2.xpm
-lib/tkdesk/images/lightning.xpm
-lib/tkdesk/images/lock.xpm
-lib/tkdesk/images/mac.xpm
-lib/tkdesk/images/magnify.xpm
-lib/tkdesk/images/magnify2.xpm
-lib/tkdesk/images/mail_edit.xpm
-lib/tkdesk/images/mailbox_empty.xpm
-lib/tkdesk/images/mailbox_full.xpm
-lib/tkdesk/images/mailbox_old.xpm
-lib/tkdesk/images/man.xpm
-lib/tkdesk/images/moon.xpm
-lib/tkdesk/images/mosaic.xpm
-lib/tkdesk/images/move.xpm
-lib/tkdesk/images/navigator.xpm
-lib/tkdesk/images/netscape.xpm
-lib/tkdesk/images/news.xpm
-lib/tkdesk/images/next/3D.xpm
-lib/tkdesk/images/next/BallotBox.xpm
-lib/tkdesk/images/next/Beer.xpm
-lib/tkdesk/images/next/BookOpen.xpm
-lib/tkdesk/images/next/C-Devel.xpm
-lib/tkdesk/images/next/Camera2.xpm
-lib/tkdesk/images/next/Chess.xpm
-lib/tkdesk/images/next/Computer.xpm
-lib/tkdesk/images/next/ComputerPC.xpm
-lib/tkdesk/images/next/DarkForest.xpm
-lib/tkdesk/images/next/DiskFloppy.xpm
-lib/tkdesk/images/next/Draw.xpm
-lib/tkdesk/images/next/Equation.xpm
-lib/tkdesk/images/next/Files.xpm
-lib/tkdesk/images/next/Finder.xpm
-lib/tkdesk/images/next/Ghost.xpm
-lib/tkdesk/images/next/Home.xpm
-lib/tkdesk/images/next/HomeOpen.xpm
-lib/tkdesk/images/next/Info.xpm
-lib/tkdesk/images/next/Java.xpm
-lib/tkdesk/images/next/KeyPower.xpm
-lib/tkdesk/images/next/MailOpen.xpm
-lib/tkdesk/images/next/Netsurfer.xpm
-lib/tkdesk/images/next/Network.xpm
-lib/tkdesk/images/next/NewspaperExtra.xpm
-lib/tkdesk/images/next/PDFOmni.xpm
-lib/tkdesk/images/next/PadlockAndKeys.xpm
-lib/tkdesk/images/next/Penguin.xpm
-lib/tkdesk/images/next/PhoneTT.xpm
-lib/tkdesk/images/next/PhoneTTOffhook.xpm
-lib/tkdesk/images/next/PrinterHP.xpm
-lib/tkdesk/images/next/Rolodex.xpm
-lib/tkdesk/images/next/SoundEdit.xpm
-lib/tkdesk/images/next/TeXView.xpm
-lib/tkdesk/images/next/Time.xpm
-lib/tkdesk/images/next/TrueDie.xpm
-lib/tkdesk/images/next/WWW.xpm
-lib/tkdesk/images/next/Window.xpm
-lib/tkdesk/images/next/World.xpm
-lib/tkdesk/images/next/Write.xpm
-lib/tkdesk/images/next/WriteMail.xpm
-lib/tkdesk/images/next/adder.xpm
-lib/tkdesk/images/next/applix.xpm
-lib/tkdesk/images/next/bag.xpm
-lib/tkdesk/images/next/bag_full.xpm
-lib/tkdesk/images/next/bargraph.xpm
-lib/tkdesk/images/next/books.xpm
-lib/tkdesk/images/next/browsebook.xpm
-lib/tkdesk/images/next/butterfly.xpm
-lib/tkdesk/images/next/cabinet.xpm
-lib/tkdesk/images/next/camera.xpm
-lib/tkdesk/images/next/cap.xpm
-lib/tkdesk/images/next/cards.xpm
-lib/tkdesk/images/next/cdisc.xpm
-lib/tkdesk/images/next/checked_monitor.xpm
-lib/tkdesk/images/next/chip.xpm
-lib/tkdesk/images/next/circle_step.xpm
-lib/tkdesk/images/next/clock.xpm
-lib/tkdesk/images/next/close_window.xpm
-lib/tkdesk/images/next/comet.xpm
-lib/tkdesk/images/next/comm-newmail.xpm
-lib/tkdesk/images/next/comm-oldmail.xpm
-lib/tkdesk/images/next/communicator.xpm
-lib/tkdesk/images/next/crash.xpm
-lib/tkdesk/images/next/dialog.xpm
-lib/tkdesk/images/next/diskbox.xpm
-lib/tkdesk/images/next/diskbox_full.xpm
-lib/tkdesk/images/next/document.xpm
-lib/tkdesk/images/next/dtp.xpm
-lib/tkdesk/images/next/edit.xpm
-lib/tkdesk/images/next/envelope.xpm
-lib/tkdesk/images/next/envelope_full.xpm
-lib/tkdesk/images/next/executor.xpm
-lib/tkdesk/images/next/feltpend.xpm
-lib/tkdesk/images/next/floppy.xpm
-lib/tkdesk/images/next/folders.xpm
-lib/tkdesk/images/next/galaxy.xpm
-lib/tkdesk/images/next/gear.xpm
-lib/tkdesk/images/next/globe.xpm
-lib/tkdesk/images/next/hammer_chart.xpm
-lib/tkdesk/images/next/hammer_doc.xpm
-lib/tkdesk/images/next/keys.xpm
-lib/tkdesk/images/next/lettercase.xpm
-lib/tkdesk/images/next/magnify.xpm
-lib/tkdesk/images/next/mail_env.xpm
-lib/tkdesk/images/next/mail_letter.xpm
-lib/tkdesk/images/next/mailbox_empty.xpm
-lib/tkdesk/images/next/mailbox_full.xpm
-lib/tkdesk/images/next/mailbox_old.xpm
-lib/tkdesk/images/next/mask_clouds.xpm
-lib/tkdesk/images/next/microphone.xpm
-lib/tkdesk/images/next/monalisa.xpm
-lib/tkdesk/images/next/monitor.xpm
-lib/tkdesk/images/next/monitor_eye.xpm
-lib/tkdesk/images/next/monitor_hp.xpm
-lib/tkdesk/images/next/monitor_sun.xpm
-lib/tkdesk/images/next/monitor_win.xpm
-lib/tkdesk/images/next/nest.xpm
-lib/tkdesk/images/next/netscape.xpm
-lib/tkdesk/images/next/note.xpm
-lib/tkdesk/images/next/novell.xpm
-lib/tkdesk/images/next/package.xpm
-lib/tkdesk/images/next/paintbrush.xpm
-lib/tkdesk/images/next/people.xpm
-lib/tkdesk/images/next/pillars.xpm
-lib/tkdesk/images/next/plaindoc.xpm
-lib/tkdesk/images/next/radar.xpm
-lib/tkdesk/images/next/radio.xpm
-lib/tkdesk/images/next/rectrash.xpm
-lib/tkdesk/images/next/rectrash_full.xpm
-lib/tkdesk/images/next/recycle.xpm
-lib/tkdesk/images/next/recycle_full.xpm
-lib/tkdesk/images/next/screwdriver.xpm
-lib/tkdesk/images/next/sealed_document.xpm
-lib/tkdesk/images/next/shell.xpm
-lib/tkdesk/images/next/spheresd.xpm
-lib/tkdesk/images/next/sql.xpm
-lib/tkdesk/images/next/tape.xpm
-lib/tkdesk/images/next/toaster.xpm
-lib/tkdesk/images/next/toaster_full.xpm
-lib/tkdesk/images/next/widgets.xpm
-lib/tkdesk/images/next/win_comp.xpm
-lib/tkdesk/images/next/win_net.xpm
-lib/tkdesk/images/next/wizard.xpm
-lib/tkdesk/images/next/wrench.xpm
-lib/tkdesk/images/orbit.xpm
-lib/tkdesk/images/pacman.xpm
-lib/tkdesk/images/paint.xpm
-lib/tkdesk/images/pen.xpm
-lib/tkdesk/images/pencil3.xpm
-lib/tkdesk/images/printer.xpm
-lib/tkdesk/images/printer16.xpm
-lib/tkdesk/images/prism.xpm
-lib/tkdesk/images/question.xpm
-lib/tkdesk/images/radar.xpm
-lib/tkdesk/images/recycle.xpm
-lib/tkdesk/images/shell.xpm
-lib/tkdesk/images/stars.xpm
-lib/tkdesk/images/terminal.xpm
-lib/tkdesk/images/tetris.xpm
-lib/tkdesk/images/tools.xpm
-lib/tkdesk/images/trash.xpm
-lib/tkdesk/images/trashcan.xpm
-lib/tkdesk/images/trashcan_full.xpm
-lib/tkdesk/images/up.xpm
-lib/tkdesk/images/xbm/apple_draft.xbm
-lib/tkdesk/images/xbm/apple_write.xbm
-lib/tkdesk/images/xbm/audio.xbm
-lib/tkdesk/images/xbm/barhandle.xbm
-lib/tkdesk/images/xbm/bigfiling.xbm
-lib/tkdesk/images/xbm/bomb.xbm
-lib/tkdesk/images/xbm/book.xbm
-lib/tkdesk/images/xbm/books.xbm
-lib/tkdesk/images/xbm/calc.xbm
-lib/tkdesk/images/xbm/calendar.xbm
-lib/tkdesk/images/xbm/check_list.xbm
-lib/tkdesk/images/xbm/clock.xbm
-lib/tkdesk/images/xbm/copy.xbm
-lib/tkdesk/images/xbm/copy2.xbm
-lib/tkdesk/images/xbm/cup.xbm
-lib/tkdesk/images/xbm/dice.xbm
-lib/tkdesk/images/xbm/dir.xbm
-lib/tkdesk/images/xbm/documents.xbm
-lib/tkdesk/images/xbm/door_open.xbm
-lib/tkdesk/images/xbm/drag_files.xbm
-lib/tkdesk/images/xbm/draw.xbm
-lib/tkdesk/images/xbm/earth.xbm
-lib/tkdesk/images/xbm/edit.xbm
-lib/tkdesk/images/xbm/exclaimation_dot.xbm
-lib/tkdesk/images/xbm/exec.xbm
-lib/tkdesk/images/xbm/eye.xbm
-lib/tkdesk/images/xbm/file.xbm
-lib/tkdesk/images/xbm/file_dir.xbm
-lib/tkdesk/images/xbm/file_doc.xbm
-lib/tkdesk/images/xbm/filing_open.xbm
-lib/tkdesk/images/xbm/filing_shut.xbm
-lib/tkdesk/images/xbm/film.xbm
-lib/tkdesk/images/xbm/floppy.xbm
-lib/tkdesk/images/xbm/flow_chart.xbm
-lib/tkdesk/images/xbm/folder2.xbm
-lib/tkdesk/images/xbm/games.xbm
-lib/tkdesk/images/xbm/gnuplot.xbm
-lib/tkdesk/images/xbm/hand+.xbm
-lib/tkdesk/images/xbm/hand.mask.xbm
-lib/tkdesk/images/xbm/hand.xbm
-lib/tkdesk/images/xbm/help.xbm
-lib/tkdesk/images/xbm/home.xbm
-lib/tkdesk/images/xbm/info.xbm
-lib/tkdesk/images/xbm/info2.xbm
-lib/tkdesk/images/xbm/kiste.xbm
-lib/tkdesk/images/xbm/laserwriter2.xbm
-lib/tkdesk/images/xbm/letter.xbm
-lib/tkdesk/images/xbm/library3.xbm
-lib/tkdesk/images/xbm/lightning.xbm
-lib/tkdesk/images/xbm/lock.xbm
-lib/tkdesk/images/xbm/mac.xbm
-lib/tkdesk/images/xbm/macintosh.xbm
-lib/tkdesk/images/xbm/magnify2.xbm
-lib/tkdesk/images/xbm/magnify_hand.xbm
-lib/tkdesk/images/xbm/mail.xbm
-lib/tkdesk/images/xbm/moon.xbm
-lib/tkdesk/images/xbm/move.xbm
-lib/tkdesk/images/xbm/network.xbm
-lib/tkdesk/images/xbm/news.xbm
-lib/tkdesk/images/xbm/note.xbm
-lib/tkdesk/images/xbm/paint.xbm
-lib/tkdesk/images/xbm/paint2.xbm
-lib/tkdesk/images/xbm/pen.xbm
-lib/tkdesk/images/xbm/pencil3.xbm
-lib/tkdesk/images/xbm/picture.xbm
-lib/tkdesk/images/xbm/postit.xbm
-lib/tkdesk/images/xbm/printer16.xbm
-lib/tkdesk/images/xbm/question.xbm
-lib/tkdesk/images/xbm/question_dot.xbm
-lib/tkdesk/images/xbm/radar.xbm
-lib/tkdesk/images/xbm/read.xbm
-lib/tkdesk/images/xbm/rocket.xbm
-lib/tkdesk/images/xbm/shell.xbm
-lib/tkdesk/images/xbm/sign_exit.xbm
-lib/tkdesk/images/xbm/source.xbm
-lib/tkdesk/images/xbm/streamer_drive.xbm
-lib/tkdesk/images/xbm/system.xbm
-lib/tkdesk/images/xbm/term.xbm
-lib/tkdesk/images/xbm/terminal.xbm
-lib/tkdesk/images/xbm/text.xbm
-lib/tkdesk/images/xbm/tool.xbm
-lib/tkdesk/images/xbm/tools.xbm
-lib/tkdesk/images/xbm/trash.xbm
-lib/tkdesk/images/xbm/trashcan.xbm
-lib/tkdesk/images/xbm/trashcan_full.xbm
-lib/tkdesk/images/xbm/wichtig.xbm
-lib/tkdesk/images/xbm/write.xbm
-lib/tkdesk/images/xbm/xchess.xbm
-lib/tkdesk/images/xbm/xlogo.xbm
-lib/tkdesk/images/xbm/xlogo16.xbm
-lib/tkdesk/images/xbm/xterm.xbm
-lib/tkdesk/images/xemacs.xpm
-lib/tkdesk/images/xlogo16.xpm
-lib/tkdesk/images/xterm.xpm
-lib/tkdesk/images/xterm32.xpm
-lib/tkdesk/itcl_reload.tcl
-lib/tkdesk/jdb_rcs.tcl
-lib/tkdesk/jobs.tcl
-lib/tkdesk/mkindex
-lib/tkdesk/popup.tcl
-lib/tkdesk/server.tcl
-lib/tkdesk/sound.tcl
-lib/tkdesk/sounds/door_open.au
-lib/tkdesk/sounds/door_shut.au
-lib/tkdesk/sounds/halt.au
-lib/tkdesk/sounds/herewego.au
-lib/tkdesk/sounds/metal.au
-lib/tkdesk/sounds/newmail.au
-lib/tkdesk/sounds/robot_dead.au
-lib/tkdesk/sounds/start.au
-lib/tkdesk/static/itcl3.0/itcl.tcl
-lib/tkdesk/static/itcl3.0/pkgIndex.tcl
-lib/tkdesk/static/tcl8.0/history.tcl
-lib/tkdesk/static/tcl8.0/init.tcl
-lib/tkdesk/static/tcl8.0/ldAix
-lib/tkdesk/static/tcl8.0/ldAout.tcl
-lib/tkdesk/static/tcl8.0/parray.tcl
-lib/tkdesk/static/tcl8.0/safe.tcl
-lib/tkdesk/static/tcl8.0/tclIndex
-lib/tkdesk/static/tcl8.0/word.tcl
-lib/tkdesk/static/tk8.0/bgerror.tcl
-lib/tkdesk/static/tk8.0/button.tcl
-lib/tkdesk/static/tk8.0/clrpick.tcl
-lib/tkdesk/static/tk8.0/comdlg.tcl
-lib/tkdesk/static/tk8.0/console.tcl
-lib/tkdesk/static/tk8.0/dialog.tcl
-lib/tkdesk/static/tk8.0/entry.tcl
-lib/tkdesk/static/tk8.0/focus.tcl
-lib/tkdesk/static/tk8.0/listbox.tcl
-lib/tkdesk/static/tk8.0/menu.tcl
-lib/tkdesk/static/tk8.0/msgbox.tcl
-lib/tkdesk/static/tk8.0/obsolete.tcl
-lib/tkdesk/static/tk8.0/optMenu.tcl
-lib/tkdesk/static/tk8.0/palette.tcl
-lib/tkdesk/static/tk8.0/prolog.ps
-lib/tkdesk/static/tk8.0/safetk.tcl
-lib/tkdesk/static/tk8.0/scale.tcl
-lib/tkdesk/static/tk8.0/scrlbar.tcl
-lib/tkdesk/static/tk8.0/tclIndex
-lib/tkdesk/static/tk8.0/tearoff.tcl
-lib/tkdesk/static/tk8.0/text.tcl
-lib/tkdesk/static/tk8.0/tk.tcl
-lib/tkdesk/static/tk8.0/tkfbox.tcl
-lib/tkdesk/static/tk8.0/xmfbox.tcl
-lib/tkdesk/tclIndex
-lib/tkdesk/tkpatches.tcl
-lib/tkdesk/update.tcl
-lib/tkdesk/util.tcl
-man/man1/cd-tkdesk.1
-man/man1/ed-tkdesk.1
-man/man1/od-tkdesk.1
-man/man1/tkdesk.1
-@dirrm lib/tkdesk/static/tk8.0
-@dirrm lib/tkdesk/static/tcl8.0
-@dirrm lib/tkdesk/static/itcl3.0
-@dirrm lib/tkdesk/static
-@dirrm lib/tkdesk/sounds
-@dirrm lib/tkdesk/images/xbm
-@dirrm lib/tkdesk/images/next
-@dirrm lib/tkdesk/images/ficons32
-@dirrm lib/tkdesk/images/ficons16
-@dirrm lib/tkdesk/images/be
-@dirrm lib/tkdesk/images
-@dirrm lib/tkdesk/doc
-@dirrm lib/tkdesk/configs
-@dirrm lib/tkdesk/cb_tools/bitmaps
-@dirrm lib/tkdesk/cb_tools
-@dirrm lib/tkdesk
diff --git a/sysutils/tkdesk/distinfo b/sysutils/tkdesk/distinfo
deleted file mode 100644
index 9b76a310648..00000000000
--- a/sysutils/tkdesk/distinfo
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: distinfo,v 1.2 2002/07/21 15:45:17 wiz Exp $
-
-SHA1 (tkdesk-1.2.tar.gz) = 6810b92a882956745c50ceb80eea72167dc24d94
-Size (tkdesk-1.2.tar.gz) = 1079153 bytes
-SHA1 (patch-aa) = a37188993358a78d3e8a9ec46b08a3f1c0831c60
-SHA1 (patch-ab) = e93006a1f1eeb8d5060465ea73ad95fa234744c4
-SHA1 (patch-ac) = bf3e11e85f02fc2e84ff913e2dc8c14fac00e1bb
-SHA1 (patch-ad) = 593fff0281d7caf907fc5cd34f71088d12350f8c
-SHA1 (patch-ae) = c09cd944af50c2a31020a7478c1568e847b0cb02
-SHA1 (patch-af) = 86db9011313d0ba914c082e46253e65de09f843b
-SHA1 (patch-ag) = 414495caff04710a026f59ffa1405308026ac052
-SHA1 (patch-ah) = f6c29999ea661ea6a67495116aee1cbfb6225f7e
-SHA1 (patch-ai) = ffb1c48e1a593bf74d710f97dfa5c7b2d069d0d1
-SHA1 (patch-aj) = fd8fb4132b54d6f3605266dbbb231f5f04f5894c
-SHA1 (patch-ak) = 441a1eefd5872786981b25aa07482a8d6d9515aa
diff --git a/sysutils/tkdesk/patches/patch-aa b/sysutils/tkdesk/patches/patch-aa
deleted file mode 100644
index be4979cd794..00000000000
--- a/sysutils/tkdesk/patches/patch-aa
+++ /dev/null
@@ -1,64 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2002/07/03 09:27:00 dmcmahill Exp $
-
---- configure.orig Fri Jun 28 14:26:26 2002
-+++ configure
-@@ -653,7 +653,7 @@
- echo $ac_n "checking version of Tcl/Tk""... $ac_c" 1>&6
- echo "configure:655: checking version of Tcl/Tk" >&5
- echo "$ac_t""$TCL_VERSION/$TK_VERSION" 1>&6
--TCL_VERSIONS_ALLOWED="7.5 7.6 8.0 8.1 8.2"
-+TCL_VERSIONS_ALLOWED="7.5 7.6 8.0 8.1 8.2 8.3"
- if test -z "`echo $TCL_VERSIONS_ALLOWED | grep $TCL_VERSION`"; then
- echo
- echo TkDesk requires Tcl/Tk versions 7.5/4.1, 7.6/4.2., or 8.0.
-@@ -661,7 +661,7 @@
- echo yet supported \(but hopefully will be soon\).
- exit 1
- fi
--TK_VERSIONS_ALLOWED="4.1 4.2 8.0 8.1 8.2"
-+TK_VERSIONS_ALLOWED="4.1 4.2 8.0 8.1 8.2 8.3"
- if test -z "`echo $TK_VERSIONS_ALLOWED | grep $TK_VERSION`"; then
- echo
- echo TkDesk requires Tcl/Tk versions 7.5/4.1, 7.6/4.2, or 8.0.
-@@ -681,8 +681,9 @@
- if test -z "$ITCLCONF_PATH" ; then
- ITCLCONF_PATH=$TCLCONF_PATH
- fi
-- if test -r $ITCLCONF_PATH/itclConfig.sh ; then
-- . $ITCLCONF_PATH/itclConfig.sh
-+ if test -r $ITCLCONF_PATH/tcl/itcl3.2/pkgIndex.tcl ; then
-+ ITCL_VERSION="32"
-+ ITCL_MAJOR_VERSION=3
- else
- ITCL_VERSION="no"
- ITCL_MAJOR_VERSION=0
-@@ -713,11 +714,14 @@
- NEED_BLT_LIB=lib_blt
- echo "$ac_t""./blt" 1>&6
- else
-- BLT_LIB_SPEC="-L$BLT_LIB_PATH -lBLT"
-- BLT_LIB_STATIC=$BLT_LIB_PATH/libBLT.a
-+ if test -r $BLT_LIB_PATH/tcl/blt2.4/pkgIndex.tcl ; then
-+ BLT_VERSION="24"
-+ fi
-+ BLT_LIB_SPEC="-L$BLT_LIB_PATH -lBLT${BLT_VERSION}"
-+ BLT_LIB_STATIC=$BLT_LIB_PATH/libBLT${BLT_VERSION}.a
- NEED_BLT_LIB=
-- if test ! -f $BLT_LIB_PATH/libBLT.a \
-- -a ! -f $BLT_LIB_PATH/libBLT.so
-+ if test ! -f $BLT_LIB_PATH/libBLT${BLT_VERSION}.a \
-+ -a ! -f $BLT_LIB_PATH/libBLT${BLT_VERSION}.so
- then
- if test ! -f $BLT_LIB_PATH/lib/libBLT.a \
- -a ! -f $BLT_LIB_PATH/lib/libBLT.so
-@@ -742,8 +746,8 @@
- TCL_INCLUDE_PATH=$TCL_EXEC_PREFIX/include
- TK_INCLUDE_PATH=$TCL_INCLUDE_PATH
- NEED_ITCL_LIB=
-- # ITCL_LIB_SPEC already set in itclConfig.sh
-- ITCL_LIB_STATIC=${TCLCONF_PATH}/libitcl${ITCL_VERSION}.a
-+ ITCL_LIB_SPEC="-L${ITCLCONF_PATH} -litcl${ITCL_VERSION}"
-+ ITCL_LIB_STATIC=${ITCLCONF_PATH}/libitcl${ITCL_VERSION}.a
- else
- TCL_INCLUDE_PATH=$TCL_EXEC_PREFIX/include
- TK_INCLUDE_PATH=$TK_EXEC_PREFIX/include
diff --git a/sysutils/tkdesk/patches/patch-ab b/sysutils/tkdesk/patches/patch-ab
deleted file mode 100644
index fef1a048551..00000000000
--- a/sysutils/tkdesk/patches/patch-ab
+++ /dev/null
@@ -1,50 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 2002/07/03 09:27:00 dmcmahill Exp $
-
---- Makefile.in.orig Mon Nov 15 06:07:45 1999
-+++ Makefile.in
-@@ -28,7 +28,7 @@
- INSTALL_ROOT =
-
- # Directory from which TkDesk will reference its library of Tcl scripts:
--TKDESK_LIBRARY = @libdir@/TkDesk
-+TKDESK_LIBRARY = @libdir@/tkdesk
-
- # Path name to use when installing library scripts:
- SCRIPT_INSTALL_DIR = $(INSTALL_ROOT)$(TKDESK_LIBRARY)
-@@ -187,26 +187,28 @@
- rm_tkdesk_script:
- @rm -f tkdesk
-
--install: tkdesksh client rm_tkdesk_script tkdesk_script dirs
-- @chmod +x install-sh
-+install: tkdesksh client rm_tkdesk_script tkdesk_script
- @echo "=== Installing the executables..."
-- @for f in tkdesksh tkdesk tkdeskclient/tkdeskclient tools/pauseme tools/ed-tkdesk tools/cd-tkdesk tools/od-tkdesk tools/op-tkdesk tools/pop-tkdesk; do \
-+ @for f in tkdesksh tkdeskclient/tkdeskclient; do \
- echo "installing $$f" ;\
-- rm -f $(BIN_INSTALL_DIR)/`basename $$f` ;\
-- $(INSTALL_PROGRAM) $$f $(BIN_INSTALL_DIR) ;\
-+ $(BSD_INSTALL_PROGRAM) $$f $(BIN_INSTALL_DIR) ;\
-+ done
-+ @for f in tkdesk tools/pauseme tools/ed-tkdesk tools/cd-tkdesk tools/od-tkdesk tools/op-tkdesk tools/pop-tkdesk; do \
-+ echo "installing $$f" ;\
-+ $(BSD_INSTALL_SCRIPT) $$f $(BIN_INSTALL_DIR) ;\
- done
- @echo "=== Installing TkDesk's library..."
-+ $(BSD_INSTALL_DATA_DIR) $(SCRIPT_INSTALL_DIR)
- @cd ./tcldesk; tar cf - * | (cd $(SCRIPT_INSTALL_DIR); tar xvf -)
- @echo "=== Setting permissions..."
- find $(SCRIPT_INSTALL_DIR) -type f -exec chmod a+r {} \;
- find $(SCRIPT_INSTALL_DIR) -type d -exec chmod a+rx {} \;
- @echo "=== Creating index..."
-- cd $(SCRIPT_INSTALL_DIR); $(BIN_INSTALL_DIR)/tkdesksh mkindex
-+ cd $(SCRIPT_INSTALL_DIR); tclsh mkindex
- @echo "=== Installing the manual pages..."
- @for f in tkdesk.1 cd-tkdesk.1 ed-tkdesk.1 od-tkdesk.1; do \
- echo "installing $$f" ;\
-- rm -f $(MAN1_INSTALL_DIR)/$$f ;\
-- $(INSTALL_DATA) doc/$$f $(MAN1_INSTALL_DIR) ;\
-+ $(BSD_INSTALL_MAN) doc/$$f $(MAN1_INSTALL_DIR) ;\
- done
- @echo "=== Installation complete."
-
diff --git a/sysutils/tkdesk/patches/patch-ac b/sysutils/tkdesk/patches/patch-ac
deleted file mode 100644
index e0105971fb3..00000000000
--- a/sysutils/tkdesk/patches/patch-ac
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD: patch-ac,v 1.1.1.1 2002/07/03 09:27:00 dmcmahill Exp $
-
---- tcldesk/configs/AppBar.orig Sun Nov 14 14:07:53 1999
-+++ tcldesk/configs/AppBar Sun Sep 2 23:09:23 2001
-@@ -282,7 +282,7 @@
- {{TkDesk User's Guide } {dsk_help guide}}
- {{FAQ } {dsk_help faq}}
- {{Changes} {dsk_help changes}}
-- {{TkDesk Homepage } {dsk_netscape url http://people.mainz.netsurf.de/~bolik/tkdesk/ window}}
-+ {{TkDesk Homepage } {dsk_netscape url http://tkdesk.sourceforge.net/ window}}
- -
- {{Manual Page ...} {
- dsk_read_string {Show manual page for: (e.g. col(1))} {
-@@ -392,7 +392,7 @@
- }
- }
- {{Superuser}
-- {{Edit password file} {dsk_exec_as_root vi /etc/passwd}}
-+ {{Edit password file} {dsk_exec_as_root vipw}}
- {{Edit /etc/hosts} {dsk_exec_as_root vi /etc/hosts}}
- }
- -
-@@ -476,7 +476,7 @@
- }}
- }
- {{Locations}
-- {{TkDesk Homepage } {dsk_netscape url http://people.mainz.netsurf.de/~bolik/tkdesk/ window}}
-+ {{TkDesk Homepage } {dsk_netscape url http://tkdesk.sourceforge.net/ window}}
- {{AltaVista } {dsk_netscape url http://www.altavista.digital.com window}}
- {{Tcl/Tk at Sun } {dsk_netscape url http://www.sunlabs.com/research/tcl window}}
- }
diff --git a/sysutils/tkdesk/patches/patch-ad b/sysutils/tkdesk/patches/patch-ad
deleted file mode 100644
index 5bdaae57def..00000000000
--- a/sysutils/tkdesk/patches/patch-ad
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ad,v 1.1.1.1 2002/07/03 09:27:00 dmcmahill Exp $
-
---- tcldesk/configs/AppBar_Be.orig Sun Nov 14 14:07:53 1999
-+++ tcldesk/configs/AppBar_Be Sun Sep 2 23:10:14 2001
-@@ -241,7 +241,7 @@
- {{TkDesk User's Guide } {dsk_help guide}}
- {{FAQ } {dsk_help faq}}
- {{Changes} {dsk_help changes}}
-- {{TkDesk Homepage } {dsk_netscape url http://people.mainz.netsurf.de/~bolik/tkdesk/ window}}
-+ {{TkDesk Homepage } {dsk_netscape url http://tkdesk.sourceforge.net/ window}}
- -
- {{Manual Page ...} {
- dsk_read_string {Show manual page for: (e.g. col(1))} {
-@@ -333,7 +333,7 @@
- }}
- }
- {{Locations}
-- {{TkDesk Homepage } {dsk_netscape url http://people.mainz.netsurf.de/~bolik/tkdesk/ window}}
-+ {{TkDesk Homepage } {dsk_netscape url http://tkdesk.sourceforge.net/ window}}
- {{AltaVista } {dsk_netscape url http://www.altavista.digital.com window}}
- {{Tcl/Tk at Sun } {dsk_netscape url http://www.sunlabs.com/research/tcl window}}
- }
diff --git a/sysutils/tkdesk/patches/patch-ae b/sysutils/tkdesk/patches/patch-ae
deleted file mode 100644
index 6e0497cf8b4..00000000000
--- a/sysutils/tkdesk/patches/patch-ae
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ae,v 1.1.1.1 2002/07/03 09:27:00 dmcmahill Exp $
-
---- tcldesk/configs/System.orig Sat Apr 29 18:20:13 2000
-+++ tcldesk/configs/System Sat Apr 29 18:21:05 2000
-@@ -132,7 +132,7 @@
- ### most cases).
-
- set tkdesk(cmd,whoami) "whoami" ;# used to determine user's login name
--set tkdesk(cmd,du) "du -Dk" ;# for Disk Usage: usage in KB
-+set tkdesk(cmd,du) "du -k" ;# for Disk Usage: usage in KB
- set tkdesk(cmd,df) "df" ;# for getting free disk space in KB
- set tkdesk(cmd,sort) "sort -rn" ;# for Disk Usage: list biggest first
- set tkdesk(cmd,cp) "cp -r" ;# copy recursively
diff --git a/sysutils/tkdesk/patches/patch-af b/sysutils/tkdesk/patches/patch-af
deleted file mode 100644
index f96840c8196..00000000000
--- a/sysutils/tkdesk/patches/patch-af
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-af,v 1.1.1.1 2002/07/03 09:27:00 dmcmahill Exp $
-
---- tcldesk/appbar.tcl.orig Sun Nov 14 16:07:47 1999
-+++ tcldesk/appbar.tcl Sun May 28 16:30:32 2000
-@@ -631,12 +631,13 @@
- }
- }
-
--proc _appbar_dd_action {cmd flist} {
-+proc _appbar_dd_action {cmd args} {
- global tkdesk
-
- catch "wm withdraw $tkdesk(dd_token_window)"
- update
-
-+ set flist $args
- if {[string first %A $cmd] > -1} {
- set cmd [string_replace $cmd %A $flist]
- } else {
diff --git a/sysutils/tkdesk/patches/patch-ag b/sysutils/tkdesk/patches/patch-ag
deleted file mode 100644
index 22ca6db7ec1..00000000000
--- a/sysutils/tkdesk/patches/patch-ag
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD: patch-ag,v 1.1.1.1 2002/07/03 09:27:00 dmcmahill Exp $
-
---- tcldesk/delete.tcl.orig Sun Nov 14 16:07:47 1999
-+++ tcldesk/delete.tcl Sun May 28 16:30:32 2000
-@@ -381,12 +381,12 @@
- if {[cb_okcancel "Empty trash can?\nThis will delete ALL files in the trash can!"] == 0} {
- dsk_sound dsk_really_deleting
- if {$anum == 1} {set fll "File"} {set fll "Files"}
-- #set tlist ""
-- #foreach f $alist {
-- # lappend tlist [string trimright \
-- # $tkdesk(trashdir)/$f " "]
-- #}
-- dsk_bgexec "$tkdesk(cmd,rm) .* *" "Deleting $anum $fll..."
-+ set tlist ""
-+ foreach f $alist {
-+ lappend tlist [string trimright \
-+ $tkdesk(trashdir)/$f " "]
-+ }
-+ dsk_bgexec "$tkdesk(cmd,rm) $tlist" "Deleting $anum $fll..."
- dsk_refresh $tkdesk(trashdir)
- }
- }
diff --git a/sysutils/tkdesk/patches/patch-ah b/sysutils/tkdesk/patches/patch-ah
deleted file mode 100644
index e42da816f80..00000000000
--- a/sysutils/tkdesk/patches/patch-ah
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD: patch-ah,v 1.1.1.1 2002/07/03 09:27:00 dmcmahill Exp $
-
---- tkdesk.main.orig Sun Nov 14 16:07:45 1999
-+++ tkdesk.main Sun May 28 16:30:32 2000
-@@ -682,6 +682,12 @@
- blt_drag&drop errors ""
- }
-
-+# Disable BLT's built-in d&d bindings (except for motion):
-+catch {
-+ bind BltDrag&DropButton2 <Button-2> {}
-+ bind BltDrag&DropButton2 <ButtonRelease-2> {}
-+}
-+
- #
- # ==== Set misc. global variables ============================================
- #
-@@ -1004,7 +1010,7 @@
- }
-
- foreach obj [itcl_info objects -class dsk_Editor] {
-- if [winfo exists $obj] {
-+ if [winfo exists [$obj getToplevel]] {
- if {[$obj close_win] == "cancel"} {
- return
- }
diff --git a/sysutils/tkdesk/patches/patch-ai b/sysutils/tkdesk/patches/patch-ai
deleted file mode 100644
index 28dde21f11d..00000000000
--- a/sysutils/tkdesk/patches/patch-ai
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ai,v 1.1.1.1 2002/07/03 09:27:00 dmcmahill Exp $
-
---- tcldesk/find.tcl.orig Sun Nov 14 16:07:47 1999
-+++ tcldesk/find.tcl Sun May 28 16:30:32 2000
-@@ -805,7 +805,7 @@
- set flist ""
- set list [$dlb get]
- foreach f $fl {
-- lappend flist [lindex [lindex $list $f] 0]
-+ lappend flist [lindex [split [lindex $list $f] \t] 0]
- }
-
- set nfiles 0
diff --git a/sysutils/tkdesk/patches/patch-aj b/sysutils/tkdesk/patches/patch-aj
deleted file mode 100644
index e57d04249aa..00000000000
--- a/sysutils/tkdesk/patches/patch-aj
+++ /dev/null
@@ -1,65 +0,0 @@
-$NetBSD: patch-aj,v 1.1.1.1 2002/07/03 09:27:01 dmcmahill Exp $
-
---- libdesk/tixImgXpm.c.orig Sun Nov 14 16:07:47 1999
-+++ libdesk/tixImgXpm.c Sun Sep 2 22:41:43 2001
-@@ -156,7 +156,7 @@
- */
-
- static int ImgXpmCreate _ANSI_ARGS_((Tcl_Interp *interp,
-- char *name, int argc, char **argv,
-+ char *name, int objc, Tcl_Obj *CONST objv[],
- Tk_ImageType *typePtr, Tk_ImageMaster master,
- ClientData *clientDataPtr));
- static ClientData ImgXpmGet _ANSI_ARGS_((Tk_Window tkwin,
-@@ -176,7 +176,7 @@
- ImgXpmDisplay, /* displayProc */
- ImgXpmFree, /* freeProc */
- ImgXpmDelete, /* deleteProc */
-- (Tk_ImageType *) NULL /* nextPtr */
-+ /* (Tk_ImageType *) NULL *//* nextPtr */
- };
-
- /*
-@@ -241,12 +241,12 @@
- *----------------------------------------------------------------------
- */
- static int
--ImgXpmCreate(interp, name, argc, argv, typePtr, master, clientDataPtr)
-+ImgXpmCreate(interp, name, objc, objv, typePtr, master, clientDataPtr)
- Tcl_Interp *interp; /* Interpreter for application containing
- * image. */
- char *name; /* Name to use for image. */
-- int argc; /* Number of arguments. */
-- char **argv; /* Argument strings for options (doesn't
-+ int objc; /* Number of arguments. */
-+ Tcl_Obj *CONST objv[]; /* Argument strings for options (doesn't
- * include image name or type). */
- Tk_ImageType *typePtr; /* Pointer to our type record (not used). */
- Tk_ImageMaster master; /* Token for image, to be used by us in
-@@ -256,6 +256,13 @@
- {
- PixmapMaster *masterPtr;
-
-+ int i;
-+ char **argv = (char **) Tcl_Alloc(objc * sizeof(char*));
-+ for (i=0; i < objc; i++) {
-+
-+ argv[i] = Tcl_GetString(objv[i]);
-+ }
-+
- masterPtr = (PixmapMaster *) ckalloc(sizeof(PixmapMaster));
- masterPtr->tkMaster = master;
- masterPtr->interp = interp;
-@@ -269,10 +276,11 @@
- masterPtr->isDataAlloced = 0;
- masterPtr->instancePtr = NULL;
-
-- if (ImgXpmConfigureMaster(masterPtr, argc, argv, 0) != TCL_OK) {
-+ if (ImgXpmConfigureMaster(masterPtr, objc, argv, 0) != TCL_OK) {
- ImgXpmDelete((ClientData) masterPtr);
- return TCL_ERROR;
- }
-+ Tcl_Free((char *) argv);
- *clientDataPtr = (ClientData) masterPtr;
- return TCL_OK;
- }
diff --git a/sysutils/tkdesk/patches/patch-ak b/sysutils/tkdesk/patches/patch-ak
deleted file mode 100644
index 6b547f4896e..00000000000
--- a/sysutils/tkdesk/patches/patch-ak
+++ /dev/null
@@ -1,44 +0,0 @@
-$NetBSD: patch-ak,v 1.1.1.1 2002/07/03 09:27:01 dmcmahill Exp $
-
---- tcldesk/util.tcl.orig Fri Jun 28 15:05:45 2002
-+++ tcldesk/util.tcl
-@@ -112,8 +112,8 @@
- #}
- if {$windows != ""} {
- foreach win $windows {
-- #puts "blt_busy(1) hold $win"
-- catch {blt_busy hold $win \
-+ #puts "busy(1) hold $win"
-+ catch {busy hold $win \
- -cursor "@$cb_tools(path)/bitmaps/timer1.xbm \
- $cb_tools(path)/bitmaps/timer.mask.xbm black white"}
- if {[lsearch $dsk_busy(windows) $win] < 0} {
-@@ -141,8 +141,8 @@
-
- set cb_balloonHelp(bltbusy) 1
- foreach win $dsk_busy(busy) {
-- #puts "blt_busy(2) hold $win"
-- catch {blt_busy hold $win \
-+ #puts "busy(2) hold $win"
-+ catch {busy hold $win \
- -cursor "@$cb_tools(path)/bitmaps/timer1.xbm \
- $cb_tools(path)/bitmaps/timer.mask.xbm black white"}
- }
-@@ -177,7 +177,7 @@
- #}
- if {$windows != ""} {
- foreach win $windows {
-- catch {blt_busy release $win}
-+ catch {busy release $win}
- set l [lsearch $dsk_busy(windows) $win]
- if {$l >= 0} {
- set dsk_busy(windows) [lreplace $dsk_busy(windows) $l $l]
-@@ -202,7 +202,7 @@
-
- foreach win $dsk_busy(busy) {
- if {([lsearch $dsk_busy(windows) $win] < 0) || ($force != "")} {
-- catch {blt_busy release $win}
-+ catch {busy release $win}
- }
- }
-
diff --git a/sysutils/tload/DESCR b/sysutils/tload/DESCR
deleted file mode 100644
index 0006db1dec8..00000000000
--- a/sysutils/tload/DESCR
+++ /dev/null
@@ -1,6 +0,0 @@
-tload prints a graph of the current system load average to the
-specified tty (or the tty of the tload process if none is specified),
-similar to what xload(1) does.
-
-This package is the only program from the Linux procps suite that is
-not part of NetBSD or available else where.
diff --git a/sysutils/tload/Makefile b/sysutils/tload/Makefile
deleted file mode 100644
index 2af9833e87a..00000000000
--- a/sysutils/tload/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# $NetBSD: Makefile,v 1.5 2001/11/29 01:12:48 hubertf Exp $
-#
-
-DISTNAME= procps-2.0.6
-PKGNAME= tload-2.0.6
-PKGREVISION= 1
-CATEGORIES= sysutils
-MASTER_SITES= ftp://people.redhat.com/johnsonm/procps/
-
-MAINTAINER= hubertf@netbsd.org
-COMMENT= Terminal version of xload
-
-do-build:
- cd ${WRKSRC} ; \
- ${CC} ${CFLAGS} tload.c -o tload
-
-do-install:
- ${INSTALL_PROGRAM} ${WRKSRC}/tload ${PREFIX}/bin
- ${INSTALL_MAN} ${WRKSRC}/tload.1 ${PREFIX}/man/man1
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/tload/PLIST b/sysutils/tload/PLIST
deleted file mode 100644
index d546dbe2c3f..00000000000
--- a/sysutils/tload/PLIST
+++ /dev/null
@@ -1,3 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 22:54:00 zuntum Exp $
-bin/tload
-man/man1/tload.1
diff --git a/sysutils/tload/distinfo b/sysutils/tload/distinfo
deleted file mode 100644
index 39ee26d8a46..00000000000
--- a/sysutils/tload/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.3 2001/05/22 02:59:25 hubertf Exp $
-
-SHA1 (procps-2.0.6.tar.gz) = 8006cbc096922c53d340cdfe1e8dd9504cd2e203
-Size (procps-2.0.6.tar.gz) = 188674 bytes
-SHA1 (patch-aa) = 955d3d9d425a7264cb1a5aea450694a3634a136c
diff --git a/sysutils/tload/patches/patch-aa b/sysutils/tload/patches/patch-aa
deleted file mode 100644
index 499fe834053..00000000000
--- a/sysutils/tload/patches/patch-aa
+++ /dev/null
@@ -1,70 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2001/05/22 02:59:25 hubertf Exp $
-
---- tload.c.orig Tue Sep 2 18:02:19 1997
-+++ tload.c
-@@ -34,6 +34,25 @@
- extern int optind;
- extern char *optarg;
-
-+#ifdef __NetBSD__
-+void
-+display_version(void)
-+{
-+ printf("procps 2.0.6, NetBSD port\n");
-+}
-+
-+
-+int
-+loadavg(double *l0, double *l1, double *l2)
-+{
-+ double l[3];
-+ getloadavg(l, 3);
-+ *l0 = l[0];
-+ *l1 = l[1];
-+ *l2 = l[2];
-+}
-+#endif
-+
- void alrm(int n)
- {
- signal(SIGALRM, alrm);
-@@ -74,6 +93,11 @@
- double av[3];
- static double max_scale, scale_fact;
- char *scale_arg = NULL;
-+ static char hostname[256];
-+ static char date[256];
-+ time_t datet;
-+ static char headl[256], headr[256];
-+ int lenl, lenr;
-
- while ((opt = getopt(argc, argv, "s:d:V")) != -1)
- switch (opt) {
-@@ -94,6 +118,11 @@
-
- setsize(0);
-
-+ if (gethostname(hostname, sizeof(hostname)) < 0) {
-+ perror(argv[optind]);
-+ exit(1);
-+ }
-+
- if (scale_arg)
- max_scale = atof(scale_arg);
- else
-@@ -144,8 +173,13 @@
- for(row = nrows-2; row >= 0; --row)
- *(screen + row * ncols + col) = ' ';
- }
-- i = sprintf(screen, " %.2f, %.2f, %.2f",
-- av[0], av[1], av[2]);
-+ datet = time(NULL);
-+ strftime(date, sizeof(date), "%c", localtime(&datet));
-+ lenr = sprintf(headr, "%s %s", hostname, date);
-+ lenl = sprintf(headl, " %.2f, %.2f, %.2f",
-+ av[0], av[1], av[2]);
-+ i = sprintf(screen, "%s %*.s %s", headl,
-+ ncols - lenl - lenr - 2, "", headr);
- if (i>0)
- screen[i] = ' ';
-
diff --git a/sysutils/tob/DESCR b/sysutils/tob/DESCR
deleted file mode 100644
index fa389bba530..00000000000
--- a/sysutils/tob/DESCR
+++ /dev/null
@@ -1,13 +0,0 @@
-tob is a general driver for making and maintaining backups.
-
-Given a set of `volume definitions', it creates arj, tar or afio based
-backups, and stores them either to a device in /dev, or a file in the
-filesystem, to be burned to optical media later, moved off to other
-machines, etc. Through a straightforward configuration file, you can
-instruct tob to mount and unmount devices before beginning backups.
-
-tob supports full backups, differential backups (of the files which
-were changed since the last full backup), and incremental backups (of
-files changed since any previous backups). It lets you determine the
-size of the backup before actually making it, maintain listings of
-made backups, make remote backups and possibly more.
diff --git a/sysutils/tob/Makefile b/sysutils/tob/Makefile
deleted file mode 100644
index fae40ef6058..00000000000
--- a/sysutils/tob/Makefile
+++ /dev/null
@@ -1,37 +0,0 @@
-# $NetBSD: Makefile,v 1.1.1.1 2003/06/27 12:01:12 agc Exp $
-
-DISTNAME= tob-0.25
-CATEGORIES= sysutils
-MASTER_SITES= http://tinyplanet.ca/projects/tob/
-EXTRACT_SUFX= .tgz
-
-MAINTAINER= tech-pkg@netbsd.org
-HOMEPAGE= http://tinyplanet.ca/projects/tob/
-COMMENT= general driver for making and maintaining backups
-
-USE_PKGINSTALL= yes
-
-EGDIR= ${PREFIX}/share/examples/tob
-CONF_FILES= ${EGDIR}/tob.rc ${PKG_SYSCONFDIR}/tob/tob.rc
-SUPPORT_FILES= ${EGDIR}/example.exclude ${PKG_SYSCONFDIR}/tob/volumes/example.exclude
-SUPPORT_FILES+= ${EGDIR}/example.startdir ${PKG_SYSCONFDIR}/tob/volumes/example.startdir
-
-do-build:
- for f in tob tob.rc; do \
- ${MV} ${WRKSRC}/$$f ${WRKSRC}/$$f-pre && \
- ${SED} -e 's|@PKG_SYSCONFDIR@|${PKG_SYSCONFDIR}|g' \
- ${WRKSRC}/$$f-pre > ${WRKSRC}/$$f; \
- done
-
-do-install:
- ${INSTALL_SCRIPT} ${WRKSRC}/tob ${PREFIX}/sbin
- ${INSTALL_MAN} ${WRKSRC}/tob.8 ${PREFIX}/man/man8/
- ${INSTALL_DATA_DIR} ${PKG_SYSCONFDIR}/tob
- ${INSTALL_DATA_DIR} ${PKG_SYSCONFDIR}/tob/volumes
- ${INSTALL_DATA_DIR} /var/tob
- ${INSTALL_DATA_DIR} ${EGDIR}
- ${INSTALL_DATA} ${WRKSRC}/tob.rc ${EGDIR}/tob.rc
- ${INSTALL_DATA} ${WRKSRC}/example.exclude ${EGDIR}
- ${INSTALL_DATA} ${WRKSRC}/example.startdir ${EGDIR}
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/tob/PLIST b/sysutils/tob/PLIST
deleted file mode 100644
index 3b8358503bf..00000000000
--- a/sysutils/tob/PLIST
+++ /dev/null
@@ -1,8 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2003/06/27 12:01:12 agc Exp $
-man/man8/tob.8
-sbin/tob
-share/examples/tob/example.exclude
-share/examples/tob/example.startdir
-share/examples/tob/tob.rc
-@unexec ${RMDIR} /var/tob
-@dirrm share/examples/tob
diff --git a/sysutils/tob/distinfo b/sysutils/tob/distinfo
deleted file mode 100644
index db07a250c03..00000000000
--- a/sysutils/tob/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.1.1.1 2003/06/27 12:01:12 agc Exp $
-
-SHA1 (tob-0.25.tgz) = 71a5bb9dac7c2d4aa800392213b11e9616370b80
-Size (tob-0.25.tgz) = 107423 bytes
-SHA1 (patch-aa) = b83fdd64a257005146bc577554a416f56c072948
-SHA1 (patch-ab) = a4c27f1b93a669f2be0a6f2579e528c583393be8
diff --git a/sysutils/tob/patches/patch-aa b/sysutils/tob/patches/patch-aa
deleted file mode 100644
index dcdc1f67274..00000000000
--- a/sysutils/tob/patches/patch-aa
+++ /dev/null
@@ -1,63 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2003/06/27 12:01:12 agc Exp $
-
---- tob 2003/06/27 11:08:36 1.1
-+++ tob 2003/06/27 11:13:55
-@@ -1,4 +1,4 @@
--#!/bin/bash
-+#! /bin/sh
- #
- # tob --- Tape Oriented Backup
- #
-@@ -13,8 +13,8 @@
- #
-
- # File locations
--TOBLISTS=/var/lib/tob
--TOBHOME=/etc/tob
-+TOBLISTS=/var/tob
-+TOBHOME=@PKG_SYSCONFDIR@/tob
-
- ############################################################################
- # Global settings, most of which can be overruled in the resource file:
-@@ -77,13 +77,17 @@
- fi
- elif [ -x /usr/bin/mktemp ]
- then
-- TMPLIST=`mktemp -p tob`
-+ case `uname -s` in
-+ NetBSD) prefarg="-t" ;;
-+ *) prefarg="-p" ;;
-+ esac
-+ TMPLIST=`mktemp $prefarg tob`
- rc1=$?
-- FILELIST=`mktemp -p tob`
-+ FILELIST=`mktemp $prefarg tob`
- rc2=$?
-- TMPLIST1=`mktemp -p tob`
-+ TMPLIST1=`mktemp $prefarg tob`
- rc3=$?
-- TMPLIST2=`mktemp -p tob`
-+ TMPLIST2=`mktemp $prefarg tob`
- rc4=$?
- if [ $rc1 -ne 0 -o $rc2 -ne 0 -o $rc3 -ne 0 -o $rc4 -ne 0 ]
- then
-@@ -131,7 +135,7 @@
- VER=0.25
-
- # RCLIST: list of resource files which tob will search for
--RCLIST='/usr/local/etc/tob.rc /etc/tob/tob.rc /etc/tob.rc /usr/etc/tob.rc'
-+RCLIST='@PKG_SYSCONFDIR@/tob/tob.rc /usr/local/etc/tob.rc /etc/tob/tob.rc /etc/tob.rc /usr/etc/tob.rc'
-
- ############################################################################
- # show a message to the screen
-@@ -189,6 +193,10 @@
- if [ "$EXT" = "" ] ; then
- error "variable EXT is undefined"
- fi
-+
-+ case "$UID" in
-+ "") UID=`id -u` ;;
-+ esac
-
- if [ "$NEEDROOT" = "yes" ] ; then
- if [ $UID -ne 0 ]; then
diff --git a/sysutils/tob/patches/patch-ab b/sysutils/tob/patches/patch-ab
deleted file mode 100644
index d85ba99d40e..00000000000
--- a/sysutils/tob/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 2003/06/27 12:01:12 agc Exp $
-
---- tob.rc 2003/06/27 11:42:50 1.1
-+++ tob.rc 2003/06/27 11:43:41
-@@ -13,7 +13,7 @@
- # Copyright 1996-1999 Dirk Eddelbuettel <edd@debian.org>
-
- # Debian stores tob configuration in and below this directory
--TOBHOME="/etc/tob"
-+TOBHOME="@PKG_SYSCONFDIR@/tob"
-
- # Examples for possible backup devices selected via BACKUPDEV
- #
diff --git a/sysutils/top/DESCR b/sysutils/top/DESCR
deleted file mode 100644
index 276e9cf8e4e..00000000000
--- a/sysutils/top/DESCR
+++ /dev/null
@@ -1,15 +0,0 @@
- TOP
- Version 3.5beta7
-
- William LeFebvre
- and a cast of dozens
-
-"top" is a program that will give continual reports about the state of
-the system, including a list of the top cpu using processes. Version 3
-of "top" has three primary design goals: provide an accurate snapshot of
-the system and process state, not be one of the top processes itself, be
-as portable as possible.
-
-Luke Mewburn <lukem@connect.com.au> is responsible for the NetBSD 1.2G
-machine module, with a further modification to that by
-christos@netbsd.org (Christos Zoulas).
diff --git a/sysutils/top/Makefile b/sysutils/top/Makefile
deleted file mode 100644
index 443247cef09..00000000000
--- a/sysutils/top/Makefile
+++ /dev/null
@@ -1,38 +0,0 @@
-# $NetBSD: Makefile,v 1.26 2003/01/19 09:39:06 salo Exp $
-# FreeBSD Id: Makefile,v 1.14 1997/04/30 23:49:14 asami Exp
-#
-
-DISTNAME= top-3.5beta9
-PKGNAME= top-3.5b9
-CATEGORIES= sysutils
-MASTER_SITES= ftp://ftp.groupsys.com/pub/top/
-
-MAINTAINER= agc@netbsd.org
-HOMEPAGE= http://www.groupsys.com/topinfo/
-COMMENT= The ubiquitous system monitoring utility
-
-HAS_CONFIGURE= yes
-CONFIGURE_SCRIPT= ./Configure
-
-.include "../../mk/bsd.prefs.mk"
-
-.if ${OPSYS} == "NetBSD"
-CONF= netbsd13
-.elif ${OPSYS} == "SunOS"
-CONF+= sunos5
-MAKE_ENV+= CPPFLAGS=
-.endif
-
-CONFIGURE_ARGS+= ${CONF}
-
-.if exists(/usr/bin/top)
-PKG_SKIP_REASON= "${PKGNAME} is part of your ${OPSYS} distribution"
-.endif
-
-MAKE_ENV+= COPY="${COPY}" STRIPFLAG="${_STRIPFLAG_INSTALL}"
-
-pre-configure:
- ${CP} ${FILESDIR}/defaults.${CONF} ${WRKSRC}/.defaults
- ${CHMOD} a-x ${WRKSRC}/install
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/top/PLIST b/sysutils/top/PLIST
deleted file mode 100644
index 14861d5063d..00000000000
--- a/sysutils/top/PLIST
+++ /dev/null
@@ -1,3 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 22:54:02 zuntum Exp $
-bin/top
-man/man1/top.1.gz
diff --git a/sysutils/top/distinfo b/sysutils/top/distinfo
deleted file mode 100644
index e517b96b329..00000000000
--- a/sysutils/top/distinfo
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: distinfo,v 1.4 2003/07/02 09:28:58 grant Exp $
-
-SHA1 (top-3.5beta9.tar.gz) = e8766e316f5199cb32bc0ea8e95a4d3e3713c0cc
-Size (top-3.5beta9.tar.gz) = 234762 bytes
-SHA1 (patch-aa) = 53e906a829188247f66f29a341c9d9a82ca9f12f
-SHA1 (patch-ab) = 61b2c944eeef35cca65e799817d15daddc6a1e76
-SHA1 (patch-ac) = 312345d0fcb5fa4372afcfd6ec24dba025057816
-SHA1 (patch-ae) = 457a49f2d8aa9f81e15947a100fb83f52ff16f30
-SHA1 (patch-af) = 50242c5c0fbf57ba2b404299d13881a4ec6ba206
-SHA1 (patch-ag) = 5844930d052539e3a99f48edab098ad5f50b9e92
-SHA1 (patch-ah) = 3002ca01ce66eff78fe70f898e35f1b80e10d5ca
-SHA1 (patch-ai) = 236883fd11295368accb6e595b7c604042c5991c
diff --git a/sysutils/top/files/defaults.netbsd13 b/sysutils/top/files/defaults.netbsd13
deleted file mode 100644
index 06173481ee8..00000000000
--- a/sysutils/top/files/defaults.netbsd13
+++ /dev/null
@@ -1,19 +0,0 @@
-set module = 'netbsd13'
-set LoadMax = '5.0'
-set topn = '-1'
-set NominalTopn = '18'
-set delay = '2'
-set owner = 'root'
-set group = 'kmem'
-set mode = '2755'
-set random = '1'
-set TableSize = '47'
-set bindir = '$(PREFIX)/bin'
-set mandir = '$(PREFIX)/man/man1'
-set manext = '1'
-set mansty = 'man'
-set Cmdshell = '/bin/sh'
-set Cmdcc = 'cc'
-set Cmdawk = 'awk'
-set Cmdinstall = '/usr/bin/install'
-set cdefs = '-DHAVE_GETOPT -O'
diff --git a/sysutils/top/files/defaults.sunos5 b/sysutils/top/files/defaults.sunos5
deleted file mode 100644
index 3640b915d5d..00000000000
--- a/sysutils/top/files/defaults.sunos5
+++ /dev/null
@@ -1,19 +0,0 @@
-set module = 'sunos5'
-set LoadMax = '5.0'
-set topn = '-1'
-set NominalTopn = '18'
-set delay = '2'
-set owner = 'root'
-set group = 'sys'
-set mode = '2755'
-set random = '1'
-set TableSize = '47'
-set bindir = '$(PREFIX)/bin'
-set mandir = '$(PREFIX)/man/man1'
-set manext = '1'
-set mansty = 'man'
-set Cmdshell = '/bin/sh'
-set Cmdcc = 'gcc'
-set Cmdawk = 'nawk'
-set Cmdinstall = '/usr/ucb/install'
-set cdefs = '-DHAVE_GETOPT -O'
diff --git a/sysutils/top/patches/patch-aa b/sysutils/top/patches/patch-aa
deleted file mode 100644
index b492fbe0c73..00000000000
--- a/sysutils/top/patches/patch-aa
+++ /dev/null
@@ -1,32 +0,0 @@
-$NetBSD: patch-aa,v 1.7 1999/12/08 16:18:49 agc Exp $
-
---- commands.c Tue Aug 27 16:13:57 1996
-+++ commands.c Sat Oct 4 03:25:02 1997
-@@ -25,4 +25,7 @@
-
-+#include "top.h"
-+#include "top.local.h"
- #include "sigdesc.h" /* generated automatically */
- #include "boolean.h"
-+#include "machine.h"
- #include "utils.h"
-@@ -44,4 +47,4 @@
-
--show_help()
--
-+show_help(statics)
-+ struct statics *statics;
- {
-@@ -74,4 +77,11 @@
- #ifdef ORDER
-+ {
-+ int i;
-+
- fputs("\
--o - specify sort order (size, res, cpu, time)\n", stdout);
-+o - specify sort order (", stdout);
-+ for (i = 0; statics->order_names[i] != NULL; i++)
-+ printf("%s%s", i == 0 ? "" : ", ", statics->order_names[i]);
-+ puts(")");
-+ }
- #endif
diff --git a/sysutils/top/patches/patch-ab b/sysutils/top/patches/patch-ab
deleted file mode 100644
index b67b972dd43..00000000000
--- a/sysutils/top/patches/patch-ab
+++ /dev/null
@@ -1,892 +0,0 @@
-$NetBSD: patch-ab,v 1.11 2003/01/19 09:39:06 salo Exp $
-
---- ./machine/m_netbsd13.c.orig Sat Feb 19 03:24:47 2000
-+++ ./machine/m_netbsd13.c Sat Feb 19 03:31:13 2000
-@@ -0,0 +1,887 @@
-+/*
-+ * top - a top users display for Unix
-+ *
-+ * SYNOPSIS: For a NetBSD-1.3 (or later) system
-+ *
-+ * DESCRIPTION:
-+ * Originally written for BSD4.4 system by Christos Zoulas.
-+ * Based on the FreeBSD 2.0 version by Steven Wallace and Wolfram Schneider.
-+ * NetBSD-1.0 port by Arne Helme. Process ordering by Luke Mewburn.
-+ * NetBSD-1.3 port by Luke Mewburn, based on code by Matthew Green.
-+ * NetBSD-1.4/UVM port by matthew green.
-+ *
-+ * This is the machine-dependent module for NetBSD-1.3 and later
-+ * Works for:
-+ * NetBSD-1.3
-+ *
-+ * LIBS: -lkvm
-+ *
-+ * CFLAGS: -DHAVE_GETOPT -DORDER
-+ *
-+ * AUTHORS: Christos Zoulas <christos@ee.cornell.edu>
-+ * Steven Wallace <swallace@freebsd.org>
-+ * Wolfram Schneider <wosch@cs.tu-berlin.de>
-+ * Arne Helme <arne@acm.org>
-+ * Luke Mewburn <lukem@netbsd.org>
-+ * matthew green <mrg@eterna.com.au>
-+ *
-+ *
-+ * Id: machine.c,v 1.5 1995/01/06 02:04:39 swallace Exp
-+ */
-+
-+#include <sys/types.h>
-+#include <sys/signal.h>
-+#include <sys/param.h>
-+#if __NetBSD_Version__ > 103080000
-+#define UVM
-+#endif
-+#include <sys/stat.h>
-+#include <sys/errno.h>
-+#include <sys/sysctl.h>
-+#include <sys/dir.h>
-+#include <sys/dkstat.h>
-+#include <sys/file.h>
-+#include <sys/time.h>
-+
-+#include <vm/vm_swap.h>
-+
-+#if defined(UVM)
-+#include <uvm/uvm_extern.h>
-+#endif
-+
-+#include "os.h"
-+#include <err.h>
-+#include <errno.h>
-+#include <kvm.h>
-+#include <math.h>
-+#include <nlist.h>
-+#include <stdio.h>
-+#include <stdlib.h>
-+#include <string.h>
-+#include <unistd.h>
-+
-+static int check_nlist __P((struct nlist *));
-+static int getkval __P((unsigned long, int *, int, char *));
-+extern char* printable __P((char *));
-+
-+#include "top.h"
-+#include "machine.h"
-+#include "utils.h"
-+
-+
-+/* get_process_info passes back a handle. This is what it looks like: */
-+
-+struct handle
-+{
-+ struct kinfo_proc **next_proc; /* points to next valid proc pointer */
-+ int remaining; /* number of pointers remaining */
-+};
-+
-+/* declarations for load_avg */
-+#include "loadavg.h"
-+
-+#define PP(pp, field) ((pp)->kp_proc . field)
-+#define EP(pp, field) ((pp)->kp_eproc . field)
-+#define VP(pp, field) ((pp)->kp_eproc.e_vm . field)
-+
-+/* define what weighted cpu is. */
-+#define weighted_cpu(pct, pp) (PP((pp), p_swtime) == 0 ? 0.0 : \
-+ ((pct) / (1.0 - exp(PP((pp), p_swtime) * logcpu))))
-+
-+/* what we consider to be process size: */
-+#define PROCSIZE(pp) \
-+ (VP((pp), vm_tsize) + VP((pp), vm_dsize) + VP((pp), vm_ssize))
-+
-+/* definitions for indices in the nlist array */
-+
-+
-+static struct nlist nlst[] = {
-+#define X_CCPU 0
-+ { "_ccpu" }, /* 0 */
-+#define X_CP_TIME 1
-+ { "_cp_time" }, /* 1 */
-+#define X_HZ 2
-+ { "_hz" }, /* 2 */
-+#define X_STATHZ 3
-+ { "_stathz" }, /* 3 */
-+#define X_AVENRUN 4
-+ { "_averunnable" }, /* 4 */
-+#if !defined(UVM)
-+#define X_CNT 5
-+ { "_cnt" },
-+#endif
-+
-+ { 0 }
-+};
-+
-+/*
-+ * These definitions control the format of the per-process area
-+ */
-+
-+static char header[] =
-+ " PID X PRI NICE SIZE RES STATE TIME WCPU CPU COMMAND";
-+/* 0123456 -- field to fill in starts at header+6 */
-+#define UNAME_START 6
-+
-+#define Proc_format \
-+ "%5d %-8.8s %3d %4d%7s %5s %-5s%7s %5.2f%% %5.2f%% %.14s"
-+
-+
-+/* process state names for the "STATE" column of the display */
-+/* the extra nulls in the string "run" are for adding a slash and
-+ the processor number when needed */
-+
-+char *state_abbrev[] =
-+{
-+ "", "start", "run\0\0\0", "sleep", "stop", "zomb"
-+};
-+
-+
-+static kvm_t *kd;
-+
-+/* values that we stash away in _init and use in later routines */
-+
-+static double logcpu;
-+
-+/* these are retrieved from the kernel in _init */
-+
-+static int hz;
-+static int ccpu;
-+
-+/* these are offsets obtained via nlist and used in the get_ functions */
-+
-+static unsigned long cp_time_offset;
-+static unsigned long avenrun_offset;
-+static unsigned long cnt_offset;
-+/* these are for calculating cpu state percentages */
-+
-+static long cp_time[CPUSTATES];
-+static long cp_old[CPUSTATES];
-+static long cp_diff[CPUSTATES];
-+
-+/* these are for detailing the process states */
-+
-+int process_states[7];
-+char *procstatenames[] = {
-+ "", " starting, ", " running, ", " sleeping, ", " stopped, ",
-+ " zombie, ", " ABANDONED, ",
-+ NULL
-+};
-+
-+/* these are for detailing the cpu states */
-+
-+int cpu_states[CPUSTATES];
-+char *cpustatenames[] = {
-+ "user", "nice", "system", "interrupt", "idle", NULL
-+};
-+
-+/* these are for detailing the memory statistics */
-+
-+int memory_stats[7];
-+char *memorynames[] = {
-+ "K Act ", "K Inact ", "K Wired ", "K Free ",
-+ "K Swap ", "K Swap free ",
-+ NULL
-+};
-+
-+
-+/* these are names given to allowed sorting orders -- first is default */
-+char *ordernames[] = {
-+ "cpu",
-+ "pri",
-+ "res",
-+ "size",
-+ "state",
-+ "time",
-+ NULL
-+};
-+
-+/* forward definitions for comparison functions */
-+int compare_cpu();
-+int compare_prio();
-+int compare_res();
-+int compare_size();
-+int compare_state();
-+int compare_time();
-+
-+int (*proc_compares[])() = {
-+ compare_cpu,
-+ compare_prio,
-+ compare_res,
-+ compare_size,
-+ compare_state,
-+ compare_time,
-+ NULL
-+};
-+
-+
-+/* these are for keeping track of the proc array */
-+
-+static int nproc;
-+static int onproc = -1;
-+static int pref_len;
-+static struct kinfo_proc *pbase;
-+static struct kinfo_proc **pref;
-+
-+/* these are for getting the memory statistics */
-+
-+static int pageshift; /* log base 2 of the pagesize */
-+
-+/* define pagetok in terms of pageshift */
-+
-+#define pagetok(size) ((size) << pageshift)
-+
-+/* useful externals */
-+long percentages();
-+
-+int
-+machine_init(statics)
-+ struct statics *statics;
-+{
-+ int i = 0;
-+ int pagesize;
-+
-+ if ((kd = kvm_open(NULL, NULL, NULL, O_RDONLY, "kvm_open")) == NULL)
-+ return -1;
-+
-+
-+ /* get the list of symbols we want to access in the kernel */
-+ (void) kvm_nlist(kd, nlst);
-+ if (nlst[0].n_type == 0)
-+ {
-+ fprintf(stderr, "top: nlist failed\n");
-+ return(-1);
-+ }
-+
-+ /* make sure they were all found */
-+ if (i > 0 && check_nlist(nlst) > 0)
-+ {
-+ return(-1);
-+ }
-+
-+ /* get the symbol values out of kmem */
-+ (void) getkval(nlst[X_STATHZ].n_value, (int *)(&hz), sizeof(hz), "!");
-+ if (!hz) {
-+ (void) getkval(nlst[X_HZ].n_value, (int *)(&hz), sizeof(hz),
-+ nlst[X_HZ].n_name);
-+ }
-+
-+
-+ (void) getkval(nlst[X_CCPU].n_value, (int *)(&ccpu), sizeof(ccpu),
-+ nlst[X_CCPU].n_name);
-+
-+ /* stash away certain offsets for later use */
-+ cp_time_offset = nlst[X_CP_TIME].n_value;
-+ avenrun_offset = nlst[X_AVENRUN].n_value;
-+#if !defined(UVM)
-+ cnt_offset = nlst[X_CNT].n_value;
-+#endif
-+
-+ /* this is used in calculating WCPU -- calculate it ahead of time */
-+ logcpu = log(loaddouble(ccpu));
-+
-+ pbase = NULL;
-+ pref = NULL;
-+ nproc = 0;
-+ onproc = -1;
-+ /* get the page size with "getpagesize" and calculate pageshift from it */
-+ pagesize = getpagesize();
-+ pageshift = 0;
-+ while (pagesize > 1)
-+ {
-+ pageshift++;
-+ pagesize >>= 1;
-+ }
-+
-+ /* we only need the amount of log(2)1024 for our conversion */
-+ pageshift -= LOG1024;
-+
-+ /* fill in the statics information */
-+ statics->procstate_names = procstatenames;
-+ statics->cpustate_names = cpustatenames;
-+ statics->memory_names = memorynames;
-+ statics->order_names = ordernames;
-+
-+ /* all done! */
-+ return(0);
-+}
-+
-+char *
-+format_header(uname_field)
-+ char *uname_field;
-+{
-+ char *ptr;
-+
-+ ptr = header + UNAME_START;
-+ while (*uname_field != '\0')
-+ {
-+ *ptr++ = *uname_field++;
-+ }
-+
-+ return(header);
-+}
-+
-+void
-+get_system_info(si)
-+ struct system_info *si;
-+{
-+ long total;
-+#if defined(UVM)
-+ size_t usize;
-+ int mib[2];
-+ struct uvmexp uvmexp;
-+#else
-+ struct vmmeter sum;
-+#endif
-+ struct swapent *sep, *seporig;
-+ int totalsize, size, totalinuse, inuse, ncounted;
-+ int rnswap, nswap;
-+
-+ /* get the cp_time array */
-+ (void) getkval(cp_time_offset, (int *)cp_time, sizeof(cp_time),
-+ nlst[X_CP_TIME].n_name);
-+
-+ if (getloadavg(si->load_avg, NUM_AVERAGES) < 0) {
-+ int i;
-+
-+ warn("can't getloadavg");
-+ for (i = 0; i < NUM_AVERAGES; i++)
-+ si->load_avg[i] = 0.0;
-+ }
-+
-+ /* convert cp_time counts to percentages */
-+ total = percentages(CPUSTATES, cpu_states, cp_time, cp_old, cp_diff);
-+
-+#if defined(UVM)
-+ mib[0] = CTL_VM;
-+ mib[1] = VM_UVMEXP;
-+ usize = sizeof(uvmexp);
-+ if (sysctl(mib, 2, &uvmexp, &usize, NULL, 0) < 0) {
-+ fprintf(stderr, "top: sysctl vm.uvmexp failed: %s\n",
-+ strerror(errno));
-+ quit(23);
-+ }
-+
-+ /* convert memory stats to Kbytes */
-+ memory_stats[0] = pagetok(uvmexp.active);
-+ memory_stats[1] = pagetok(uvmexp.inactive);
-+ memory_stats[2] = pagetok(uvmexp.wired);
-+ memory_stats[3] = pagetok(uvmexp.free);
-+#else
-+ /* sum memory statistics */
-+ (void) getkval(cnt_offset, (int *)(&sum), sizeof(sum), "_cnt");
-+
-+ /* convert memory stats to Kbytes */
-+ memory_stats[0] = pagetok(sum.v_active_count);
-+ memory_stats[1] = pagetok(sum.v_inactive_count);
-+ memory_stats[2] = pagetok(sum.v_wire_count);
-+ memory_stats[3] = pagetok(sum.v_free_count);
-+#endif
-+
-+ memory_stats[4] = memory_stats[5] = 0;
-+
-+ sep = NULL;
-+ seporig = NULL;
-+ do {
-+ nswap = swapctl(SWAP_NSWAP, 0, 0);
-+ if (nswap < 1)
-+ break;
-+ /* Use seporig to keep track of the malloc'd memory
-+ * base, as sep will be incremented in the for loop
-+ * below. */
-+ seporig = sep = (struct swapent *)malloc(nswap * sizeof(*sep));
-+ if (sep == NULL)
-+ break;
-+ rnswap = swapctl(SWAP_STATS, (void *)sep, nswap);
-+ if (nswap != rnswap)
-+ break;
-+
-+ totalsize = totalinuse = ncounted = 0;
-+ for (; rnswap-- > 0; sep++) {
-+ ncounted++;
-+ size = sep->se_nblks;
-+ inuse = sep->se_inuse;
-+ totalsize += size;
-+ totalinuse += inuse;
-+ }
-+ memory_stats[4] = dbtob(totalinuse) / 1024;
-+ memory_stats[5] = dbtob(totalsize) / 1024 - memory_stats[4];
-+ /* Free here, before we malloc again in the next
-+ * iteration of this loop. */
-+ if (seporig) {
-+ free(seporig);
-+ seporig = NULL;
-+ }
-+ } while (0);
-+ /* Catch the case where we malloc'd, but then exited the
-+ * loop due to nswap != rnswap. */
-+ if (seporig)
-+ free(seporig);
-+
-+ memory_stats[6] = -1;
-+
-+ /* set arrays and strings */
-+ si->cpustates = cpu_states;
-+ si->memory = memory_stats;
-+ si->last_pid = -1;
-+}
-+
-+static struct handle handle;
-+
-+caddr_t
-+get_process_info(si, sel, compare)
-+ struct system_info *si;
-+ struct process_select *sel;
-+ int (*compare)();
-+{
-+ int i;
-+ int total_procs;
-+ int active_procs;
-+ struct kinfo_proc **prefp;
-+ struct kinfo_proc *pp;
-+
-+ /* these are copied out of sel for speed */
-+ int show_idle;
-+ int show_system;
-+ int show_uid;
-+ int show_command;
-+
-+
-+ pbase = kvm_getprocs(kd, KERN_PROC_ALL, 0, &nproc);
-+ if (nproc > onproc)
-+ pref = (struct kinfo_proc **) realloc(pref, sizeof(struct kinfo_proc *)
-+ * (onproc = nproc));
-+ if (pref == NULL || pbase == NULL) {
-+ (void) fprintf(stderr, "top: Out of memory.\n");
-+ quit(23);
-+ }
-+ /* get a pointer to the states summary array */
-+ si->procstates = process_states;
-+
-+ /* set up flags which define what we are going to select */
-+ show_idle = sel->idle;
-+ show_system = sel->system;
-+ show_uid = sel->uid != -1;
-+ show_command = sel->command != NULL;
-+
-+ /* count up process states and get pointers to interesting procs */
-+ total_procs = 0;
-+ active_procs = 0;
-+ memset((char *)process_states, 0, sizeof(process_states));
-+ prefp = pref;
-+ for (pp = pbase, i = 0; i < nproc; pp++, i++)
-+ {
-+ /*
-+ * Place pointers to each valid proc structure in pref[].
-+ * Process slots that are actually in use have a non-zero
-+ * status field. Processes with P_SYSTEM set are system
-+ * processes---these get ignored unless show_sysprocs is set.
-+ */
-+ if (PP(pp, p_stat) != 0 &&
-+ (show_system || ((PP(pp, p_flag) & P_SYSTEM) == 0)))
-+ {
-+ total_procs++;
-+ process_states[(unsigned char) PP(pp, p_stat)]++;
-+ if ((PP(pp, p_stat) != SZOMB) &&
-+ (show_idle || (PP(pp, p_pctcpu) != 0) ||
-+ (PP(pp, p_stat) == SRUN)) &&
-+ (!show_uid || EP(pp, e_pcred.p_ruid) == (uid_t)sel->uid))
-+ {
-+ *prefp++ = pp;
-+ active_procs++;
-+ }
-+ }
-+ }
-+
-+ /* if requested, sort the "interesting" processes */
-+ if (compare != NULL)
-+ {
-+ qsort((char *)pref, active_procs, sizeof(struct kinfo_proc *), compare);
-+ }
-+
-+ /* remember active and total counts */
-+ si->p_total = total_procs;
-+ si->p_active = pref_len = active_procs;
-+
-+ /* pass back a handle */
-+ handle.next_proc = pref;
-+ handle.remaining = active_procs;
-+ return((caddr_t)&handle);
-+}
-+
-+char fmt[128]; /* static area where result is built */
-+
-+char *
-+format_next_process(handle, get_userid)
-+ caddr_t handle;
-+ char *(*get_userid)();
-+{
-+ struct kinfo_proc *pp;
-+ long cputime;
-+ double pct;
-+ struct handle *hp;
-+
-+ /* find and remember the next proc structure */
-+ hp = (struct handle *)handle;
-+ pp = *(hp->next_proc++);
-+ hp->remaining--;
-+
-+
-+ /* get the process's user struct and set cputime */
-+ if ((PP(pp, p_flag) & P_INMEM) == 0) {
-+ /*
-+ * Print swapped processes as <pname>
-+ */
-+ char *comm = PP(pp, p_comm);
-+#define COMSIZ sizeof(PP(pp, p_comm))
-+ char buf[COMSIZ];
-+ (void) strncpy(buf, comm, COMSIZ);
-+ comm[0] = '<';
-+ (void) strncpy(&comm[1], buf, COMSIZ - 2);
-+ comm[COMSIZ - 2] = '\0';
-+ (void) strncat(comm, ">", COMSIZ - 1);
-+ comm[COMSIZ - 1] = '\0';
-+ }
-+
-+#if 0
-+ /* This does not produce the correct results */
-+ cputime = PP(pp, p_uticks) + PP(pp, p_sticks) + PP(pp, p_iticks);
-+#endif
-+ cputime = PP(pp, p_rtime).tv_sec; /* This does not count interrupts */
-+
-+ /* calculate the base for cpu percentages */
-+ pct = pctdouble(PP(pp, p_pctcpu));
-+
-+#define Proc_format \
-+ "%5d %-8.8s %3d %4d%7s %5s %-5s%7s %5.2f%% %5.2f%% %.14s"
-+
-+ /* format this entry */
-+ sprintf(fmt,
-+ Proc_format,
-+ PP(pp, p_pid),
-+ (*get_userid)(EP(pp, e_pcred.p_ruid)),
-+ PP(pp, p_priority) - PZERO,
-+ PP(pp, p_nice) - NZERO,
-+ format_k(pagetok(PROCSIZE(pp))),
-+ format_k(pagetok(VP(pp, vm_rssize))),
-+ state_abbrev[(unsigned char) PP(pp, p_stat)],
-+ format_time(cputime),
-+ 100.0 * weighted_cpu(pct, pp),
-+ 100.0 * pct,
-+ printable(PP(pp, p_comm)));
-+
-+ /* return the result */
-+ return(fmt);
-+}
-+
-+
-+/*
-+ * check_nlist(nlst) - checks the nlist to see if any symbols were not
-+ * found. For every symbol that was not found, a one-line
-+ * message is printed to stderr. The routine returns the
-+ * number of symbols NOT found.
-+ */
-+
-+static int
-+check_nlist(nlst)
-+ struct nlist *nlst;
-+{
-+ int i;
-+
-+ /* check to see if we got ALL the symbols we requested */
-+ /* this will write one line to stderr for every symbol not found */
-+
-+ i = 0;
-+ while (nlst->n_name != NULL)
-+ {
-+ if (nlst->n_type == 0)
-+ {
-+ /* this one wasn't found */
-+ (void) fprintf(stderr, "kernel: no symbol named `%s'\n",
-+ nlst->n_name);
-+ i = 1;
-+ }
-+ nlst++;
-+ }
-+
-+ return(i);
-+}
-+
-+
-+/*
-+ * getkval(offset, ptr, size, refstr) - get a value out of the kernel.
-+ * "offset" is the byte offset into the kernel for the desired value,
-+ * "ptr" points to a buffer into which the value is retrieved,
-+ * "size" is the size of the buffer (and the object to retrieve),
-+ * "refstr" is a reference string used when printing error meessages,
-+ * if "refstr" starts with a '!', then a failure on read will not
-+ * be fatal (this may seem like a silly way to do things, but I
-+ * really didn't want the overhead of another argument).
-+ *
-+ */
-+
-+static int
-+getkval(offset, ptr, size, refstr)
-+ unsigned long offset;
-+ int *ptr;
-+ int size;
-+ char *refstr;
-+{
-+ if (kvm_read(kd, offset, (char *) ptr, size) != size)
-+ {
-+ if (*refstr == '!')
-+ {
-+ return(0);
-+ }
-+ else
-+ {
-+ fprintf(stderr, "top: kvm_read for %s: %s\n",
-+ refstr, strerror(errno));
-+ quit(23);
-+ }
-+ }
-+ return(1);
-+}
-+
-+/* comparison routines for qsort */
-+
-+/*
-+ * There are currently four possible comparison routines. main selects
-+ * one of these by indexing in to the array proc_compares.
-+ *
-+ * Possible keys are defined as macros below. Currently these keys are
-+ * defined: percent cpu, cpu ticks, process state, resident set size,
-+ * total virtual memory usage. The process states are ordered as follows
-+ * (from least to most important): WAIT, zombie, sleep, stop, start, run.
-+ * The array declaration below maps a process state index into a number
-+ * that reflects this ordering.
-+ */
-+
-+/*
-+ * First, the possible comparison keys. These are defined in such a way
-+ * that they can be merely listed in the source code to define the actual
-+ * desired ordering.
-+ */
-+
-+#define ORDERKEY_PCTCPU \
-+ if (lresult = PP(p2, p_pctcpu) - PP(p1, p_pctcpu),\
-+ (result = lresult > 0 ? 1 : lresult < 0 ? -1 : 0) == 0)
-+
-+#define ORDERKEY_CPTICKS \
-+ if (lresult = PP(p2, p_rtime).tv_sec - PP(p1, p_rtime).tv_sec,\
-+ (result = lresult > 0 ? 1 : lresult < 0 ? -1 : 0) == 0)
-+
-+#define ORDERKEY_STATE \
-+ if ((result = sorted_state[(int)PP(p2, p_stat)] - \
-+ sorted_state[(int)PP(p1, p_stat)] ) == 0)
-+
-+#define ORDERKEY_PRIO \
-+ if ((result = PP(p2, p_priority) - PP(p1, p_priority)) == 0)
-+
-+#define ORDERKEY_RSSIZE \
-+ if ((result = VP(p2, vm_rssize) - VP(p1, vm_rssize)) == 0)
-+
-+#define ORDERKEY_MEM \
-+ if ((result = (PROCSIZE(p2) - PROCSIZE(p1))) == 0)
-+
-+/*
-+ * Now the array that maps process state to a weight.
-+ * The order of the elements should match those in state_abbrev[]
-+ */
-+
-+static int sorted_state[] = {
-+ 0, /* (not used) ? */
-+ 4, /* "start" SIDL */
-+ 5, /* "run" SRUN */
-+ 2, /* "sleep" SSLEEP */
-+ 3, /* "stop" SSTOP */
-+ 1, /* "zomb" SZOMB */
-+};
-+
-+/* compare_cpu - the comparison function for sorting by cpu percentage */
-+
-+int
-+compare_cpu(pp1, pp2)
-+ struct proc **pp1, **pp2;
-+{
-+ struct kinfo_proc *p1;
-+ struct kinfo_proc *p2;
-+ int result;
-+ pctcpu lresult;
-+
-+ /* remove one level of indirection */
-+ p1 = *(struct kinfo_proc **) pp1;
-+ p2 = *(struct kinfo_proc **) pp2;
-+
-+ ORDERKEY_PCTCPU
-+ ORDERKEY_CPTICKS
-+ ORDERKEY_STATE
-+ ORDERKEY_PRIO
-+ ORDERKEY_RSSIZE
-+ ORDERKEY_MEM
-+ ;
-+
-+ return (result);
-+}
-+
-+/* compare_prio - the comparison function for sorting by process priority */
-+
-+int
-+compare_prio(pp1, pp2)
-+ struct proc **pp1, **pp2;
-+{
-+ struct kinfo_proc *p1;
-+ struct kinfo_proc *p2;
-+ int result;
-+ pctcpu lresult;
-+
-+ /* remove one level of indirection */
-+ p1 = *(struct kinfo_proc **) pp1;
-+ p2 = *(struct kinfo_proc **) pp2;
-+
-+ ORDERKEY_PRIO
-+ ORDERKEY_PCTCPU
-+ ORDERKEY_CPTICKS
-+ ORDERKEY_STATE
-+ ORDERKEY_RSSIZE
-+ ORDERKEY_MEM
-+ ;
-+
-+ return (result);
-+}
-+
-+/* compare_res - the comparison function for sorting by resident set size */
-+
-+int
-+compare_res(pp1, pp2)
-+ struct proc **pp1, **pp2;
-+{
-+ struct kinfo_proc *p1;
-+ struct kinfo_proc *p2;
-+ int result;
-+ pctcpu lresult;
-+
-+ /* remove one level of indirection */
-+ p1 = *(struct kinfo_proc **) pp1;
-+ p2 = *(struct kinfo_proc **) pp2;
-+
-+ ORDERKEY_RSSIZE
-+ ORDERKEY_MEM
-+ ORDERKEY_PCTCPU
-+ ORDERKEY_CPTICKS
-+ ORDERKEY_STATE
-+ ORDERKEY_PRIO
-+ ;
-+
-+ return (result);
-+}
-+
-+/* compare_size - the comparison function for sorting by total memory usage */
-+
-+int
-+compare_size(pp1, pp2)
-+ struct proc **pp1, **pp2;
-+{
-+ struct kinfo_proc *p1;
-+ struct kinfo_proc *p2;
-+ int result;
-+ pctcpu lresult;
-+
-+ /* remove one level of indirection */
-+ p1 = *(struct kinfo_proc **) pp1;
-+ p2 = *(struct kinfo_proc **) pp2;
-+
-+ ORDERKEY_MEM
-+ ORDERKEY_RSSIZE
-+ ORDERKEY_PCTCPU
-+ ORDERKEY_CPTICKS
-+ ORDERKEY_STATE
-+ ORDERKEY_PRIO
-+ ;
-+
-+ return (result);
-+}
-+
-+/* compare_state - the comparison function for sorting by process state */
-+
-+int
-+compare_state(pp1, pp2)
-+ struct proc **pp1, **pp2;
-+{
-+ struct kinfo_proc *p1;
-+ struct kinfo_proc *p2;
-+ int result;
-+ pctcpu lresult;
-+
-+ /* remove one level of indirection */
-+ p1 = *(struct kinfo_proc **) pp1;
-+ p2 = *(struct kinfo_proc **) pp2;
-+
-+ ORDERKEY_STATE
-+ ORDERKEY_PCTCPU
-+ ORDERKEY_CPTICKS
-+ ORDERKEY_PRIO
-+ ORDERKEY_RSSIZE
-+ ORDERKEY_MEM
-+ ;
-+
-+ return (result);
-+}
-+
-+/* compare_time - the comparison function for sorting by total cpu time */
-+
-+int
-+compare_time(pp1, pp2)
-+ struct proc **pp1, **pp2;
-+{
-+ struct kinfo_proc *p1;
-+ struct kinfo_proc *p2;
-+ int result;
-+ pctcpu lresult;
-+
-+ /* remove one level of indirection */
-+ p1 = *(struct kinfo_proc **) pp1;
-+ p2 = *(struct kinfo_proc **) pp2;
-+
-+ ORDERKEY_CPTICKS
-+ ORDERKEY_PCTCPU
-+ ORDERKEY_STATE
-+ ORDERKEY_PRIO
-+ ORDERKEY_MEM
-+ ORDERKEY_RSSIZE
-+ ;
-+
-+ return (result);
-+}
-+
-+
-+/*
-+ * proc_owner(pid) - returns the uid that owns process "pid", or -1 if
-+ * the process does not exist.
-+ * It is EXTREMLY IMPORTANT that this function work correctly.
-+ * If top runs setuid root (as in SVR4), then this function
-+ * is the only thing that stands in the way of a serious
-+ * security problem. It validates requests for the "kill"
-+ * and "renice" commands.
-+ */
-+
-+int
-+proc_owner(pid)
-+ int pid;
-+{
-+ int cnt;
-+ struct kinfo_proc **prefp;
-+ struct kinfo_proc *pp;
-+
-+ prefp = pref;
-+ cnt = pref_len;
-+ while (--cnt >= 0)
-+ {
-+ pp = *prefp++;
-+ if (PP(pp, p_pid) == (pid_t)pid)
-+ {
-+ return((int)EP(pp, e_pcred.p_ruid));
-+ }
-+ }
-+ return(-1);
-+}
diff --git a/sysutils/top/patches/patch-ac b/sysutils/top/patches/patch-ac
deleted file mode 100644
index 42b92d43042..00000000000
--- a/sysutils/top/patches/patch-ac
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD: patch-ac,v 1.8 2003/07/02 09:28:59 grant Exp $
-
---- Makefile.X.orig Wed Nov 20 13:19:24 1996
-+++ Makefile.X
-@@ -11,7 +11,6 @@
- # Executables (these should be obvious):
-
- SHELL = %shell%
--CC = %cc%
- AWK = %awk%
- INSTALL = %install%
-
-@@ -100,10 +99,10 @@ veryclean: clean
- install: top top.1 install-top install-$(MANSTY)
-
- install-top:
-- $(INSTALL) -o $(OWNER) -m $(MODE) -g $(GROUP) top $(BINDIR)
-+ ${INSTALL} ${COPY} ${STRIPFLAG} -o $(OWNER) -m $(MODE) -g $(GROUP) top $(BINDIR)
-
- install-man:
-- $(INSTALL) top.1 $(MANDIR)/top.$(MANEXT)
-+ ${BSD_INSTALL_MAN} top.1 $(MANDIR)/top.$(MANEXT)
-
- install-catman:
- tbl top.1 | nroff -man > $(MANDIR)/top.$(MANEXT)
diff --git a/sysutils/top/patches/patch-ae b/sysutils/top/patches/patch-ae
deleted file mode 100644
index 8fc4ba5f5ec..00000000000
--- a/sysutils/top/patches/patch-ae
+++ /dev/null
@@ -1,35 +0,0 @@
-$NetBSD: patch-ae,v 1.2 1998/08/07 11:14:10 agc Exp $
-
---- /dev/null Thu Feb 19 12:11:00 1998
-+++ machine/m_netbsd13.desc Thu Feb 19 12:11:22 1998
-@@ -0,0 +1,30 @@
-+
-+top - a top users display for Unix
-+
-+SYNOPSIS: For a NetBSD-1.4 (or later) system, running UVM.
-+
-+DESCRIPTION:
-+Originally written for BSD4.4 system by Christos Zoulas.
-+Based on the FreeBSD 2.0 version by Steven Wallace and Wolfram Schneider.
-+NetBSD-1.0 port by Arne Helme. Process ordering by Luke Mewburn.
-+NetBSD-1.3 port by Luke Mewburn, based on code by matthew green.
-+NetBSD-1.4/UVM port by matthew green.
-+
-+This is the machine-dependent module for NetBSD-1.3 and later
-+Works for:
-+ NetBSD-1.3
-+
-+LIBS: -lkvm
-+
-+CFLAGS: -DHAVE_GETOPT -DORDER
-+
-+AUTHORS: Christos Zoulas <christos@ee.cornell.edu>
-+ Steven Wallace <swallace@freebsd.org>
-+ Wolfram Schneider <wosch@cs.tu-berlin.de>
-+ Arne Helme <arne@acm.org>
-+ Luke Mewburn <lukem@netbsd.org>
-+ matthew green <mrg@eterna.com.au>
-+
-+
-+Id: patch-ae,v 1.1 1998/02/20 06:55:27 hubertf Exp
-+
diff --git a/sysutils/top/patches/patch-af b/sysutils/top/patches/patch-af
deleted file mode 100644
index c5f80df7b6d..00000000000
--- a/sysutils/top/patches/patch-af
+++ /dev/null
@@ -1,570 +0,0 @@
-$NetBSD: patch-af,v 1.1 1999/12/08 16:18:49 agc Exp $
-
---- machine/m_netbsd10.c Fri Jan 26 06:27:18 1996
-+++ machine/m_netbsd10.c Sat Oct 4 03:27:03 1997
-@@ -3,3 +3,3 @@
- *
-- * SYNOPSIS: For a NetBSD-1.0 (4.4BSD) system
-+ * SYNOPSIS: For a NetBSD-1.0 through NetBSD-1.2.1 system
- * Note process resident sizes could be wrong, but ps shows
-@@ -9,5 +9,5 @@
- * Originally written for BSD4.4 system by Christos Zoulas.
-- * Based on the FreeBSD 2.0 version by Steven Wallace && Wolfram Schneider
-- * NetBSD-1.0 port by Arne Helme
-- * .
-+ * Based on the FreeBSD 2.0 version by Steven Wallace && Wolfram Schneider.
-+ * NetBSD-1.0 port by Arne Helme. Process ordering added by Luke Mewburn.
-+ *
- * This is the machine-dependent module for NetBSD-1.0
-@@ -15,2 +15,5 @@
- * NetBSD-1.0
-+ * NetBSD-1.1
-+ * NetBSD-1.2
-+ * NetBSD-1.2.1
- *
-@@ -18,3 +21,3 @@
- *
-- * CFLAGS: -DHAVE_GETOPT
-+ * CFLAGS: -DHAVE_GETOPT -DORDER
- *
-@@ -24,2 +27,4 @@
- * Arne Helme <arne@acm.org>
-+ * Luke Mewburn <lukem@netbsd.org>
-+ *
- *
-@@ -30,4 +35,4 @@
-
--#define LASTPID /**/ /* use last pid, compiler depended */
--/* #define LASTPID_FIXED /**/
-+/* #define LASTPID */ /* use last pid, compiler depended */
-+/* #define LASTPID_FIXED */
- #define VM_REAL /**/ /* use the same values as vmstat -s */
-@@ -53,2 +58,11 @@
-
-+#include "os.h"
-+
-+#include <err.h>
-+#include <kvm.h>
-+#include <math.h>
-+#include <nlist.h>
-+#include <stdio.h>
-+#include <unistd.h>
-+
- #ifdef USE_SWAP
-@@ -87,3 +101,4 @@
- /* what we consider to be process size: */
--#define PROCSIZE(pp) (VP((pp), vm_tsize) + VP((pp), vm_dsize) + VP((pp), vm_ssize))
-+#define PROCSIZE(pp) \
-+ (VP((pp), vm_tsize) + VP((pp), vm_dsize) + VP((pp), vm_ssize))
-
-@@ -171,3 +186,3 @@
- {
-- "", "start", "run\0\0\0", "sleep", "stop", "zomb", "WAIT"
-+ "", "start", "run\0\0\0", "sleep", "stop", "zomb"
- };
-@@ -196,3 +211,2 @@
- static unsigned long cnt_offset;
--static long cnt;
- #endif
-@@ -239,2 +253,33 @@
-
-+
-+/* these are names given to allowed sorting orders -- first is default */
-+char *ordernames[] = {
-+ "cpu",
-+ "pri",
-+ "res",
-+ "size",
-+ "state",
-+ "time",
-+ NULL
-+};
-+
-+/* forward definitions for comparison functions */
-+int compare_cpu();
-+int compare_prio();
-+int compare_res();
-+int compare_size();
-+int compare_state();
-+int compare_time();
-+
-+int (*proc_compares[])() = {
-+ compare_cpu,
-+ compare_prio,
-+ compare_res,
-+ compare_size,
-+ compare_state,
-+ compare_time,
-+ NULL
-+};
-+
-+
- /* these are for keeping track of the proc array */
-@@ -260,8 +305,6 @@
- machine_init(statics)
--
--struct statics *statics;
--
-+ struct statics *statics;
- {
-- register int i = 0;
-- register int pagesize;
-+ int i = 0;
-+ int pagesize;
-
-@@ -293,6 +336,2 @@
-
--#if (defined DEBUG)
-- fprintf(stderr, "Hertz: %d\n", hz);
--#endif
--
- (void) getkval(nlst[X_CCPU].n_value, (int *)(&ccpu), sizeof(ccpu),
-@@ -333,2 +372,3 @@
- statics->memory_names = memorynames;
-+ statics->order_names = ordernames;
-
-@@ -338,8 +378,7 @@
-
--char *format_header(uname_field)
--
--register char *uname_field;
--
-+char *
-+format_header(uname_field)
-+ char *uname_field;
- {
-- register char *ptr;
-+ char *ptr;
-
-@@ -360,8 +399,5 @@
- get_system_info(si)
--
--struct system_info *si;
--
-+ struct system_info *si;
- {
- long total;
-- load_avg avenrun[3];
-
-@@ -370,31 +406,13 @@
- nlst[X_CP_TIME].n_name);
-- (void) getkval(avenrun_offset, (int *)avenrun, sizeof(avenrun),
-- nlst[X_AVENRUN].n_name);
-
- #ifdef LASTPID
-- (void) getkval(lastpid_offset, (int *)(&lastpid), sizeof(lastpid),
-- "!");
-+ (void) getkval(lastpid_offset, (int *)(&lastpid), sizeof(lastpid), "!");
- #endif
-
-- /* convert load averages to doubles */
-- {
-- register int i;
-- register double *infoloadp;
-- load_avg *avenrunp;
-+ if (getloadavg(si->load_avg, NUM_AVERAGES) < 0) {
-+ int i;
-
--#ifdef notyet
-- struct loadavg sysload;
-- int size;
-- getkerninfo(KINFO_LOADAVG, &sysload, &size, 0);
--#endif
--
-- infoloadp = si->load_avg;
-- avenrunp = avenrun;
-- for (i = 0; i < 3; i++)
-- {
--#ifdef notyet
-- *infoloadp++ = ((double) sysload.ldavg[i]) / sysload.fscale;
--#endif
-- *infoloadp++ = loaddouble(*avenrunp++);
-- }
-+ warn("can't getloadavg");
-+ for (i = 0; i < NUM_AVERAGES; i++)
-+ si->load_avg[i] = 0.0;
- }
-@@ -426,4 +444,4 @@
- memory_stats[7] = pagetok(total.t_free);
-- }
--#else
-+
-+#else /* !VM_REAL */
- struct vmmeter sum;
-@@ -455,5 +473,5 @@
- /* swap_delay++; XXX Arne */
--#else
-+#else /* !USE_SWAP */
- memory_stats[4] = 0;
--#endif
-+#endif /* !USE_SWAP */
-
-@@ -461,4 +479,5 @@
- memory_stats[7] = -1;
-+#endif /* !VM_REAL */
- }
--#endif
-+
- /* set arrays and strings */
-@@ -480,14 +498,13 @@
-
--caddr_t get_process_info(si, sel, compare)
--
--struct system_info *si;
--struct process_select *sel;
--int (*compare)();
--
-+caddr_t
-+get_process_info(si, sel, compare)
-+ struct system_info *si;
-+ struct process_select *sel;
-+ int (*compare)();
- {
-- register int i;
-- register int total_procs;
-- register int active_procs;
-- register struct kinfo_proc **prefp;
-- register struct kinfo_proc *pp;
-+ int i;
-+ int total_procs;
-+ int active_procs;
-+ struct kinfo_proc **prefp;
-+ struct kinfo_proc *pp;
-
-@@ -564,11 +581,10 @@
-
--char *format_next_process(handle, get_userid)
--
--caddr_t handle;
--char *(*get_userid)();
--
-+char *
-+format_next_process(handle, get_userid)
-+ caddr_t handle;
-+ char *(*get_userid)();
- {
-- register struct kinfo_proc *pp;
-- register long cputime;
-- register double pct;
-+ struct kinfo_proc *pp;
-+ long cputime;
-+ double pct;
- struct handle *hp;
-@@ -633,8 +649,7 @@
-
--static int check_nlist(nlst)
--
--register struct nlist *nlst;
--
-+static int
-+check_nlist(nlst)
-+ struct nlist *nlst;
- {
-- register int i;
-+ int i;
-
-@@ -672,9 +687,8 @@
-
--static int getkval(offset, ptr, size, refstr)
--
--unsigned long offset;
--int *ptr;
--int size;
--char *refstr;
--
-+static int
-+getkval(offset, ptr, size, refstr)
-+ unsigned long offset;
-+ int *ptr;
-+ int size;
-+ char *refstr;
- {
-@@ -696,12 +710,13 @@
-
--/* comparison routine for qsort */
-+/* comparison routines for qsort */
-
- /*
-- * proc_compare - comparison function for "qsort"
-- * Compares the resource consumption of two processes using five
-- * distinct keys. The keys (in descending order of importance) are:
-- * percent cpu, cpu ticks, state, resident set size, total virtual
-- * memory usage. The process states are ordered as follows (from least
-- * to most important): WAIT, zombie, sleep, stop, start, run. The
-- * array declaration below maps a process state index into a number
-+ * There are currently four possible comparison routines. main selects
-+ * one of these by indexing in to the array proc_compares.
-+ *
-+ * Possible keys are defined as macros below. Currently these keys are
-+ * defined: percent cpu, cpu ticks, process state, resident set size,
-+ * total virtual memory usage. The process states are ordered as follows
-+ * (from least to most important): WAIT, zombie, sleep, stop, start, run.
-+ * The array declaration below maps a process state index into a number
- * that reflects this ordering.
-@@ -709,24 +724,79 @@
-
--static unsigned char sorted_state[] =
--{
-- 0, /* not used */
-- 3, /* sleep */
-- 1, /* ABANDONED (WAIT) */
-- 6, /* run */
-- 5, /* start */
-- 2, /* zombie */
-- 4 /* stop */
-+/*
-+ * First, the possible comparison keys. These are defined in such a way
-+ * that they can be merely listed in the source code to define the actual
-+ * desired ordering.
-+ */
-+
-+#define ORDERKEY_PCTCPU \
-+ if (lresult = PP(p2, p_pctcpu) - PP(p1, p_pctcpu),\
-+ (result = lresult > 0 ? 1 : lresult < 0 ? -1 : 0) == 0)
-+
-+#define ORDERKEY_CPTICKS \
-+ if (lresult = PP(p2, p_rtime).tv_sec - PP(p1, p_rtime).tv_sec,\
-+ (result = lresult > 0 ? 1 : lresult < 0 ? -1 : 0) == 0)
-+
-+#define ORDERKEY_STATE \
-+ if ((result = sorted_state[(int)PP(p2, p_stat)] - \
-+ sorted_state[(int)PP(p1, p_stat)] ) == 0)
-+
-+#define ORDERKEY_PRIO \
-+ if ((result = PP(p2, p_priority) - PP(p1, p_priority)) == 0)
-+
-+#define ORDERKEY_RSSIZE \
-+ if ((result = VP(p2, vm_rssize) - VP(p1, vm_rssize)) == 0)
-+
-+#define ORDERKEY_MEM \
-+ if ((result = (PROCSIZE(p2) - PROCSIZE(p1))) == 0)
-+
-+/*
-+ * Now the array that maps process state to a weight.
-+ * The order of the elements should match those in state_abbrev[]
-+ */
-+
-+static int sorted_state[] = {
-+ 0, /* (not used) ? */
-+ 4, /* "start" SIDL */
-+ 5, /* "run" SRUN */
-+ 2, /* "sleep" SSLEEP */
-+ 3, /* "stop" SSTOP */
-+ 1, /* "zomb" SZOMB */
- };
-
-+/* compare_cpu - the comparison function for sorting by cpu percentage */
-+
- int
--proc_compare(pp1, pp2)
-+compare_cpu(pp1, pp2)
-+ struct proc **pp1, **pp2;
-+{
-+ struct kinfo_proc *p1;
-+ struct kinfo_proc *p2;
-+ int result;
-+ pctcpu lresult;
-+
-+ /* remove one level of indirection */
-+ p1 = *(struct kinfo_proc **) pp1;
-+ p2 = *(struct kinfo_proc **) pp2;
-
--struct proc **pp1;
--struct proc **pp2;
-+ ORDERKEY_PCTCPU
-+ ORDERKEY_CPTICKS
-+ ORDERKEY_STATE
-+ ORDERKEY_PRIO
-+ ORDERKEY_RSSIZE
-+ ORDERKEY_MEM
-+ ;
-
-+ return (result);
-+}
-+
-+/* compare_prio - the comparison function for sorting by process priority */
-+
-+int
-+compare_prio(pp1, pp2)
-+ struct proc **pp1, **pp2;
- {
-- register struct kinfo_proc *p1;
-- register struct kinfo_proc *p2;
-- register int result;
-- register pctcpu lresult;
-+ struct kinfo_proc *p1;
-+ struct kinfo_proc *p2;
-+ int result;
-+ pctcpu lresult;
-
-@@ -736,31 +806,115 @@
-
-- /* compare percent cpu (pctcpu) */
-- if ((lresult = PP(p2, p_pctcpu) - PP(p1, p_pctcpu)) == 0)
-- {
-- /* use cpticks to break the tie */
-- if ((result = PP(p2, p_cpticks) - PP(p1, p_cpticks)) == 0)
-- {
-- /* use process state to break the tie */
-- if ((result = sorted_state[(unsigned char) PP(p2, p_stat)] -
-- sorted_state[(unsigned char) PP(p1, p_stat)]) == 0)
-- {
-- /* use priority to break the tie */
-- if ((result = PP(p2, p_priority) - PP(p1, p_priority)) == 0)
-- {
-- /* use resident set size (rssize) to break the tie */
-- if ((result = VP(p2, vm_rssize) - VP(p1, vm_rssize)) == 0)
-- {
-- /* use total memory to break the tie */
-- result = PROCSIZE(p2) - PROCSIZE(p1);
-- }
-- }
-- }
-- }
-- }
-- else
-- {
-- result = lresult < 0 ? -1 : 1;
-- }
-+ ORDERKEY_PRIO
-+ ORDERKEY_PCTCPU
-+ ORDERKEY_CPTICKS
-+ ORDERKEY_STATE
-+ ORDERKEY_RSSIZE
-+ ORDERKEY_MEM
-+ ;
-
-- return(result);
-+ return (result);
-+}
-+
-+/* compare_res - the comparison function for sorting by resident set size */
-+
-+int
-+compare_res(pp1, pp2)
-+ struct proc **pp1, **pp2;
-+{
-+ struct kinfo_proc *p1;
-+ struct kinfo_proc *p2;
-+ int result;
-+ pctcpu lresult;
-+
-+ /* remove one level of indirection */
-+ p1 = *(struct kinfo_proc **) pp1;
-+ p2 = *(struct kinfo_proc **) pp2;
-+
-+ ORDERKEY_RSSIZE
-+ ORDERKEY_MEM
-+ ORDERKEY_PCTCPU
-+ ORDERKEY_CPTICKS
-+ ORDERKEY_STATE
-+ ORDERKEY_PRIO
-+ ;
-+
-+ return (result);
-+}
-+
-+/* compare_size - the comparison function for sorting by total memory usage */
-+
-+int
-+compare_size(pp1, pp2)
-+ struct proc **pp1, **pp2;
-+{
-+ struct kinfo_proc *p1;
-+ struct kinfo_proc *p2;
-+ int result;
-+ pctcpu lresult;
-+
-+ /* remove one level of indirection */
-+ p1 = *(struct kinfo_proc **) pp1;
-+ p2 = *(struct kinfo_proc **) pp2;
-+
-+ ORDERKEY_MEM
-+ ORDERKEY_RSSIZE
-+ ORDERKEY_PCTCPU
-+ ORDERKEY_CPTICKS
-+ ORDERKEY_STATE
-+ ORDERKEY_PRIO
-+ ;
-+
-+ return (result);
-+}
-+
-+/* compare_state - the comparison function for sorting by process state */
-+
-+int
-+compare_state(pp1, pp2)
-+ struct proc **pp1, **pp2;
-+{
-+ struct kinfo_proc *p1;
-+ struct kinfo_proc *p2;
-+ int result;
-+ pctcpu lresult;
-+
-+ /* remove one level of indirection */
-+ p1 = *(struct kinfo_proc **) pp1;
-+ p2 = *(struct kinfo_proc **) pp2;
-+
-+ ORDERKEY_STATE
-+ ORDERKEY_PCTCPU
-+ ORDERKEY_CPTICKS
-+ ORDERKEY_PRIO
-+ ORDERKEY_RSSIZE
-+ ORDERKEY_MEM
-+ ;
-+
-+ return (result);
-+}
-+
-+/* compare_time - the comparison function for sorting by total cpu time */
-+
-+int
-+compare_time(pp1, pp2)
-+ struct proc **pp1, **pp2;
-+{
-+ struct kinfo_proc *p1;
-+ struct kinfo_proc *p2;
-+ int result;
-+ pctcpu lresult;
-+
-+ /* remove one level of indirection */
-+ p1 = *(struct kinfo_proc **) pp1;
-+ p2 = *(struct kinfo_proc **) pp2;
-+
-+ ORDERKEY_CPTICKS
-+ ORDERKEY_PCTCPU
-+ ORDERKEY_STATE
-+ ORDERKEY_PRIO
-+ ORDERKEY_MEM
-+ ORDERKEY_RSSIZE
-+ ;
-+
-+ return (result);
- }
-@@ -778,10 +932,9 @@
-
--int proc_owner(pid)
--
--int pid;
--
-+int
-+proc_owner(pid)
-+ int pid;
- {
-- register int cnt;
-- register struct kinfo_proc **prefp;
-- register struct kinfo_proc *pp;
-+ int cnt;
-+ struct kinfo_proc **prefp;
-+ struct kinfo_proc *pp;
-
-@@ -832,2 +985,3 @@
-
-+ l = 0;
- KGET(VM_NSWAP, nswap);
-@@ -938,4 +1092,2 @@
-
--
--#endif
--
-+#endif /* USE_SWAP */
diff --git a/sysutils/top/patches/patch-ag b/sysutils/top/patches/patch-ag
deleted file mode 100644
index adf490a4203..00000000000
--- a/sysutils/top/patches/patch-ag
+++ /dev/null
@@ -1,9 +0,0 @@
-$NetBSD: patch-ag,v 1.1 1999/12/08 16:18:50 agc Exp $
-
---- top.c Thu Sep 12 21:50:53 1996
-+++ top.c Sat Oct 4 03:25:02 1997
-@@ -716,3 +716,3 @@
- clear();
-- show_help();
-+ show_help(&statics);
- standout("Hit any key to continue: ");
diff --git a/sysutils/top/patches/patch-ah b/sysutils/top/patches/patch-ah
deleted file mode 100644
index 9500ada5d66..00000000000
--- a/sysutils/top/patches/patch-ah
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ah,v 1.1 1999/12/08 16:18:50 agc Exp $
-
---- utils.c.orig Mon Jun 1 18:58:17 1998
-+++ utils.c Wed Dec 8 16:09:50 1999
-@@ -16,6 +16,8 @@
- #include "top.h"
- #include "os.h"
-
-+#include <errno.h>
-+
- int atoiwi(str)
-
- char *str;
diff --git a/sysutils/top/patches/patch-ai b/sysutils/top/patches/patch-ai
deleted file mode 100644
index 68d73077646..00000000000
--- a/sysutils/top/patches/patch-ai
+++ /dev/null
@@ -1,8 +0,0 @@
-$NetBSD: patch-ai,v 1.1 1999/12/08 16:18:50 agc Exp $
-
---- Configure Thu Dec 3 11:56:33 1998
-+++ Configure Thu Dec 3 11:57:30 1998
-@@ -355,3 +355,2 @@
- set t_mode = 4711
-- set mode = 4711
- endif
diff --git a/sysutils/toshutils/DESCR b/sysutils/toshutils/DESCR
deleted file mode 100644
index b0f14b08ecd..00000000000
--- a/sysutils/toshutils/DESCR
+++ /dev/null
@@ -1,3 +0,0 @@
-The Toshiba Linux utilities are specific to Toshiba laptops, and
-will not run on laptops from other manufactures. Tools are included
-to turn the fan on/off, etc.
diff --git a/sysutils/toshutils/Makefile b/sysutils/toshutils/Makefile
deleted file mode 100644
index 12cdee71e8d..00000000000
--- a/sysutils/toshutils/Makefile
+++ /dev/null
@@ -1,25 +0,0 @@
-# $NetBSD: Makefile,v 1.6 2003/07/13 13:53:23 wiz Exp $
-#
-
-DISTNAME= toshutils-991217
-PKGREVISION= 2
-CATEGORIES= sysutils
-MASTER_SITES= http://www.ne426pd.in2home.co.uk/
-
-MAINTAINER= hubertf@netbsd.org
-HOMEPAGE= http://www.buzzard.org.uk/toshiba/
-COMMENT= NetBSD port of the Toshiba(tm) Linux Utilities
-
-ONLY_FOR_PLATFORM= *-*-i386
-
-USE_BUILDLINK2= YES
-GNU_CONFIGURE= YES
-
-post-install:
- ${INSTALL_MAN_DIR} ${PREFIX}/share/doc/toshutils
-.for f in ac.gif battery.gif hand.gif display.html machine.html modules.html size.html space.html style.html tuxtime.html whatis.html hci.tex sci.tex toshiba.tex
- ${INSTALL_MAN} ${WRKSRC}/doc/${f} ${PREFIX}/share/doc/toshutils
-.endfor
-
-.include "../../x11/gtk/buildlink2.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/toshutils/PLIST b/sysutils/toshutils/PLIST
deleted file mode 100644
index 6fe3e5fe302..00000000000
--- a/sysutils/toshutils/PLIST
+++ /dev/null
@@ -1,29 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 22:54:03 zuntum Exp $
-bin/fan
-bin/alarm
-bin/dispswitch
-bin/tdocked
-bin/thotswap
-bin/hotkey
-bin/tuxtime-conf
-man/man1/fan.1
-man/man1/svpw.1
-man/man1/hotkey.1
-man/man1/tpasswd.1
-man/man1/alarm.1
-man/man1/tdocked.1
-share/doc/toshutils/ac.gif
-share/doc/toshutils/battery.gif
-share/doc/toshutils/display.html
-share/doc/toshutils/hand.gif
-share/doc/toshutils/hci.tex
-share/doc/toshutils/machine.html
-share/doc/toshutils/modules.html
-share/doc/toshutils/sci.tex
-share/doc/toshutils/size.html
-share/doc/toshutils/space.html
-share/doc/toshutils/style.html
-share/doc/toshutils/toshiba.tex
-share/doc/toshutils/tuxtime.html
-share/doc/toshutils/whatis.html
-@dirrm share/doc/toshutils
diff --git a/sysutils/toshutils/distinfo b/sysutils/toshutils/distinfo
deleted file mode 100644
index 20b275b5b06..00000000000
--- a/sysutils/toshutils/distinfo
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: distinfo,v 1.3 2002/03/21 05:13:41 fredb Exp $
-
-SHA1 (toshutils-991217.tar.gz) = b4eaf35fed37890c08f60999a2143f023cf632c1
-Size (toshutils-991217.tar.gz) = 138892 bytes
-SHA1 (patch-aa) = 1e984f192a9d4b66b0e66acea8ce892e362ba072
-SHA1 (patch-ab) = a654bc20cbd3c559038589dbb78c9a1f70552835
-SHA1 (patch-ac) = 577362932ded64ac662355ae6a75153536d6faa3
-SHA1 (patch-ad) = d69707bee4730bbedcc59f7b2ae6c6b4532c92b6
-SHA1 (patch-ae) = 5f1900c73732b38398fa1e04226c737cc66b220a
-SHA1 (patch-af) = bc22997f54a9880469749e5f7038c39d5cdc822a
-SHA1 (patch-ag) = 4ce55b6a00234b201871bbb0fe808f173f99d7d8
-SHA1 (patch-ah) = c6c6a52ebb7e24646748f14ffebf8871cbbacbe6
-SHA1 (patch-ai) = 613f3f28c8f93a1e584038c0308cabcc276f70a8
-SHA1 (patch-aj) = 305bbffb95e1fd50fcb73a2fe9a0c1452815a284
-SHA1 (patch-ak) = c9ede3de555ab14c8a0702a80e904547f31da386
-SHA1 (patch-al) = f2a06cf56e11a4ebb95a6d7ebda4b1c15dd0733d
-SHA1 (patch-am) = 43bba59c837c951e0b71c80365cf620ff3e05419
diff --git a/sysutils/toshutils/patches/patch-aa b/sysutils/toshutils/patches/patch-aa
deleted file mode 100644
index d43b9f9ae0c..00000000000
--- a/sysutils/toshutils/patches/patch-aa
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2000/01/07 06:38:00 soren Exp $
-
---- configure.in.orig Fri Dec 17 14:07:03 1999
-+++ configure.in Fri Jan 7 07:34:40 2000
-@@ -4,7 +4,7 @@
- AC_REVISION([configure.in 1.1])
- AC_INIT(src/sci.c)
-
--PROGRAMS="fan svpw tpasswd alarm dispswitch tdocked thotswap"
-+PROGRAMS="fan alarm dispswitch tdocked thotswap"
-
- VERSION=1.2
-
-@@ -23,6 +23,8 @@
-
- AC_CANONICAL_HOST
- case "$host_os" in
-+ netbsd*)
-+ ;;
- linux*)
- OS_CFLAGS='-DLINUX'
- ;;
-@@ -69,7 +71,7 @@
- if test "$have_x" = "yes"; then
- XLIB="-lX11 $X_EXTRA_LIBS"
- EXTRAFLAGS=""
-- PROGRAMS="$PROGRAMS hotkey wmtuxtime" # programs to build if X11 found
-+ PROGRAMS="$PROGRAMS hotkey" # programs to build if X11 found
- else
- AC_MSG_ERROR([*** libX11 not found. Check 'config.log' for more details.])
- XLIB=""
diff --git a/sysutils/toshutils/patches/patch-ab b/sysutils/toshutils/patches/patch-ab
deleted file mode 100644
index 172a4b44d9f..00000000000
--- a/sysutils/toshutils/patches/patch-ab
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD: patch-ab,v 1.3 2002/03/21 05:13:42 fredb Exp $
-
---- configure.orig Fri Dec 17 14:07:03 1999
-+++ configure Fri Jan 7 07:33:46 2000
-@@ -526,7 +526,7 @@
-
-
-
--PROGRAMS="fan svpw tpasswd alarm dispswitch tdocked thotswap"
-+PROGRAMS="fan alarm dispswitch tdocked thotswap"
-
- VERSION=1.2
-
-@@ -592,6 +592,8 @@
- echo "$ac_t""$host" 1>&6
-
- case "$host_os" in
-+ netbsd*)
-+ ;;
- linux*)
- OS_CFLAGS='-DLINUX'
- ;;
-@@ -2770,7 +2772,7 @@
- if test "$have_x" = "yes"; then
- XLIB="-lX11 $X_EXTRA_LIBS"
- EXTRAFLAGS=""
-- PROGRAMS="$PROGRAMS hotkey wmtuxtime" # programs to build if X11 found
-+ PROGRAMS="$PROGRAMS hotkey" # programs to build if X11 found
- else
- { echo "configure: error: *** libX11 not found. Check 'config.log' for more details." 1>&2; exit 1; }
- XLIB=""
diff --git a/sysutils/toshutils/patches/patch-ac b/sysutils/toshutils/patches/patch-ac
deleted file mode 100644
index f82e9e5c167..00000000000
--- a/sysutils/toshutils/patches/patch-ac
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-ac,v 1.1.1.1 1999/12/20 03:05:16 hubertf Exp $
-
---- src/fan.c.orig Fri Dec 17 14:07:03 1999
-+++ src/fan.c Mon Dec 20 03:33:31 1999
-@@ -75,7 +75,14 @@
- #include<signal.h>
- #include<paths.h>
- #include<pwd.h>
-+#ifdef __NetBSD__
-+#include <sys/types.h>
-+#include <machine/sysarch.h>
-+#define iopl i386_iopl
-+#endif
-+#ifdef __Linux__
- #include<features.h>
-+#endif
- #include<sys/stat.h>
- #ifdef __GLIBC__
- #include<sys/perm.h>
diff --git a/sysutils/toshutils/patches/patch-ad b/sysutils/toshutils/patches/patch-ad
deleted file mode 100644
index 60a6fcfe9d0..00000000000
--- a/sysutils/toshutils/patches/patch-ad
+++ /dev/null
@@ -1,64 +0,0 @@
-$NetBSD: patch-ad,v 1.2 2000/09/02 19:24:34 wiz Exp $
-
---- src/Makefile.in.orig Fri Dec 17 14:07:03 1999
-+++ src/Makefile.in
-@@ -62,8 +62,8 @@
- #
- # if your X11R6 libraries don't need X_LOCALE, remove -DX_LOCALE
- #
--XLIBS = -L/usr/X11R6/lib -lX11
--WMLIBS = -L/usr/X11R6/lib -lXpm -lX11 -lXext
-+XLIBS = -Wl,-R/usr/X11R6/lib -L/usr/X11R6/lib -lX11
-+WMLIBS = -Wl,-R/usr/X11R6/lib -L/usr/X11R6/lib -lXpm -lX11 -lXext
- GTKLIBS = @GTK_LIBS@
- GTKFLAGS = @GTK_CFLAGS@
- XMESSAGE = @XMESSAGE@
-@@ -88,37 +88,37 @@
- $(CC) -m486 -Wall -c sci.c
-
- fan: $(FANOBJS)
-- $(CC) $(LDFLAGS) -o $@ $(FANOBJS)
-+ $(CC) $(LDFLAGS) -o $@ $(FANOBJS) -li386
-
- svpw: $(SVPWOBJS)
-- $(CC) $(LDFLAGS) -o $@ $(SVPWOBJS)
-+ $(CC) $(LDFLAGS) -o $@ $(SVPWOBJS) -li386
-
- hotkey: $(HOTOBJS)
-- $(CC) $(LDFLAGS) -o $@ $(HOTOBJS) $(XLIBS)
-+ $(CC) $(LDFLAGS) -o $@ $(HOTOBJS) $(XLIBS) -li386
-
- dispswitch: $(DISPOBJS)
-- $(CC) $(LDFLAGS) -o $@ $(DISPOBJS) $(GTKLIBS)
-+ $(CC) $(LDFLAGS) -o $@ $(DISPOBJS) $(GTKLIBS) -li386
-
- tpasswd: $(PASSOBJS)
-- $(CC) $(LDFLAGS) -o $@ $(PASSOBJS)
-+ $(CC) $(LDFLAGS) -o $@ $(PASSOBJS) -li386
-
- alarm: $(ALARMOBJS)
-- $(CC) $(LDFLAGS) -o $@ $(ALARMOBJS) $(LEXLIB)
-+ $(CC) $(LDFLAGS) -o $@ $(ALARMOBJS) $(LEXLIB) -li386
-
- ownerstring: $(OWNEROBJS)
-- $(CC) $(LDFLAGS) -o $@ ($OWNEROBJS) $(READLIBS)
-+ $(CC) $(LDFLAGS) -o $@ ($OWNEROBJS) $(READLIBS) -li386
-
- tdocked: $(DOCKOBJS)
-- $(CC) $(LDFLAGS) -o $@ $(DOCKOBJS)
-+ $(CC) $(LDFLAGS) -o $@ $(DOCKOBJS) -li386
-
- thotswap: $(SWAPOBJS)
-- $(CC) $(LDFLAGS) -o $@ $(SWAPOBJS)
-+ $(CC) $(LDFLAGS) -o $@ $(SWAPOBJS) -li386
-
- tuxtime-conf: $(TUXCONFOBJS)
-- $(CC) $(LDFLAGS) -o $@ $(TUXCONFOBJS) $(GTKLIBS)
-+ $(CC) $(LDFLAGS) -o $@ $(TUXCONFOBJS) $(GTKLIBS) -li386
-
- wmtuxtime: $(WMTUXOBJS)
-- $(CC) $(LDFLAGS) -o $@ $(WMTUXOBJS) $(WMLIBS)
-+ $(CC) $(LDFLAGS) -o $@ $(WMTUXOBJS) $(WMLIBS) -li386
-
- install: all
- $(BININSTALL) -m 4755 $(PROGRAMS) $(BINDESTDIR)
diff --git a/sysutils/toshutils/patches/patch-ae b/sysutils/toshutils/patches/patch-ae
deleted file mode 100644
index aaaad2f555a..00000000000
--- a/sysutils/toshutils/patches/patch-ae
+++ /dev/null
@@ -1,50 +0,0 @@
-$NetBSD: patch-ae,v 1.2 2000/04/26 11:59:17 hubertf Exp $
-
---- src/parsetime.y.BAK Wed Apr 26 13:54:25 2000
-+++ src/parsetime.y Wed Apr 26 13:54:35 2000
-@@ -1,6 +1,9 @@
- %{
- #include <time.h>
- #include <stdlib.h>
-+#ifdef __NetBSD__
-+#include <stdio.h>
-+#endif
- #include <string.h>
- #include "parsetime.h"
-
-@@ -290,6 +293,10 @@
-
-
- time_t parsetime(int, char **);
-+#ifdef __NetBSD__
-+int yyparse __P((void));
-+#endif
-+
-
- time_t
- parsetime(int argc, char **argv)
-@@ -305,10 +312,24 @@
- if (yyparse() == 0) {
- exectime = mktime(&exectm);
- if (isgmt) {
-+#if __NetBSD__
-+ struct tm *tm;
-+ time_t t;
-+
-+ time(&t);
-+ tm=localtime(&t);
-+
-+ exectime += timezone;
-+ if (tm->tm_isdst) {
-+ exectime -= 3600;
-+ }
-+#else
-+ /* the "daylight" variable is not part of the ANSI C spec - HF */
- exectime += timezone;
- if (daylight) {
- exectime -= 3600;
- }
-+#endif
- }
- if (time_only && (currtime > exectime)) {
- exectime += 24*3600;
diff --git a/sysutils/toshutils/patches/patch-af b/sysutils/toshutils/patches/patch-af
deleted file mode 100644
index 20adc15ea39..00000000000
--- a/sysutils/toshutils/patches/patch-af
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-af,v 1.1.1.1 1999/12/20 03:05:16 hubertf Exp $
-
---- src/alarm.c.orig Fri Dec 17 14:07:03 1999
-+++ src/alarm.c Mon Dec 20 03:33:32 1999
-@@ -33,6 +33,11 @@
- #ifdef __GLIBC__
- #include<sys/perm.h>
- #endif
-+#ifdef __NetBSD__
-+#include <sys/types.h>
-+#include <machine/sysarch.h>
-+#define iopl i386_iopl
-+#endif
-
- #include"sci.h"
- #include"parsetime.h"
diff --git a/sysutils/toshutils/patches/patch-ag b/sysutils/toshutils/patches/patch-ag
deleted file mode 100644
index c1e007f50a6..00000000000
--- a/sysutils/toshutils/patches/patch-ag
+++ /dev/null
@@ -1,37 +0,0 @@
-$NetBSD: patch-ag,v 1.1.1.1 1999/12/20 03:05:16 hubertf Exp $
-
---- src/dispswitch.c.orig Fri Dec 17 14:07:03 1999
-+++ src/dispswitch.c Mon Dec 20 03:34:54 1999
-@@ -40,7 +40,14 @@
- #include<signal.h>
- #include<paths.h>
- #include<pwd.h>
-+#ifdef Linux
- #include<features.h>
-+#endif
-+#ifdef __NetBSD__
-+#include <sys/types.h>
-+#include <machine/sysarch.h>
-+#include <err.h>
-+#endif
- #ifdef __GLIBC__
- #include<sys/perm.h>
- #endif
-@@ -276,10 +283,17 @@
-
- /* get the necessary I/O permissions */
-
-+#ifdef __NetBSD__
-+ if (i386_iopl(3) == -1) {
-+ warn("i386_iopl");
-+ return 1;
-+ }
-+#else
- if (ioperm(0xb2, 1, 1)) {
- fprintf(stderr, "dispswitch: can't get I/O permissions.\n");
- return 1;
- }
-+#endif
-
- /* drop root priveleges to minimize the risk of running suid root */
-
diff --git a/sysutils/toshutils/patches/patch-ah b/sysutils/toshutils/patches/patch-ah
deleted file mode 100644
index 02da9b05ef6..00000000000
--- a/sysutils/toshutils/patches/patch-ah
+++ /dev/null
@@ -1,34 +0,0 @@
-$NetBSD: patch-ah,v 1.1.1.1 1999/12/20 03:05:16 hubertf Exp $
-
---- src/tdocked.c.orig Fri Dec 17 14:07:03 1999
-+++ src/tdocked.c Mon Dec 20 03:35:38 1999
-@@ -32,6 +32,11 @@
- #ifdef __GLIBC__
- #include<sys/perm.h>
- #endif
-+#ifdef __NetBSD__
-+#include <sys/types.h>
-+#include <machine/sysarch.h>
-+#include <err.h>
-+#endif
-
- #include"hci.h"
- #include"sci.h"
-@@ -56,10 +61,17 @@
-
- /* get the necessary I/O permissions */
-
-+#ifdef __NetBSD__
-+ if (i386_iopl(3) == -1) {
-+ warn("i386_iopl");
-+ return 1;
-+ }
-+#else
- if (ioperm(0xb2, 1, 1)) {
- fprintf(stderr, "tdocked: can't get I/O permissions.\n");
- return 0xff;
- }
-+#endif
-
- /* drop root priveleges to reduce security risk of running suid root */
-
diff --git a/sysutils/toshutils/patches/patch-ai b/sysutils/toshutils/patches/patch-ai
deleted file mode 100644
index 4400bc42202..00000000000
--- a/sysutils/toshutils/patches/patch-ai
+++ /dev/null
@@ -1,37 +0,0 @@
-$NetBSD: patch-ai,v 1.1.1.1 1999/12/20 03:05:16 hubertf Exp $
-
---- src/thotswap.c.orig Fri Dec 17 14:07:03 1999
-+++ src/thotswap.c Mon Dec 20 03:36:10 1999
-@@ -40,7 +40,14 @@
- #include<syslog.h>
- #include<paths.h>
- #include<pwd.h>
-+#ifdef Linux
- #include<features.h>
-+#endif
-+#ifdef __NetBSD__
-+#include <sys/types.h>
-+#include <machine/sysarch.h>
-+#include <err.h>
-+#endif
- #ifdef __GLIBC__
- #include<sys/perm.h>
- #endif
-@@ -350,10 +357,17 @@
-
- /* get the necessary I/O permissions */
-
-+#ifdef __NetBSD__
-+ if (i386_iopl(3) == -1) {
-+ warn("i386_iopl");
-+ return 1;
-+ }
-+#else
- if (ioperm(0xb2, 1, 1)) {
- fprintf(stderr, "thotswap: can't get I/O permissions.\n");
- return 1;
- }
-+#endif
-
- /* do some quick checks on the laptop */
-
diff --git a/sysutils/toshutils/patches/patch-aj b/sysutils/toshutils/patches/patch-aj
deleted file mode 100644
index 76f74bb2947..00000000000
--- a/sysutils/toshutils/patches/patch-aj
+++ /dev/null
@@ -1,51 +0,0 @@
-$NetBSD: patch-aj,v 1.1.1.1 1999/12/20 03:05:16 hubertf Exp $
-
---- src/hotkey.c.orig Fri Dec 17 14:07:03 1999
-+++ src/hotkey.c Mon Dec 20 03:36:44 1999
-@@ -59,9 +59,18 @@
- #include<stdio.h>
- #include<stdlib.h>
- #include<string.h>
-+#ifdef Linux
- #include<asm/io.h>
-+#endif
- #include<unistd.h>
-+#ifdef Linux
- #include<features.h>
-+#endif
-+#ifdef __NetBSD__
-+#include <sys/types.h>
-+#include <machine/sysarch.h>
-+#include <err.h>
-+#endif
- #include<signal.h>
- #include<sys/types.h>
- #include<paths.h>
-@@ -76,6 +85,9 @@
- #include<X11/Xlib.h>
- #include<X11/Xlocale.h>
-
-+#ifdef __NetBSD__
-+#undef setlocale
-+#endif
-
- #include"hotkey.h"
- #include"sci.h"
-@@ -455,10 +467,17 @@
-
- /* get the necessary I/O permissions */
-
-+#ifdef __NetBSD__
-+ if (i386_iopl(3) == -1) {
-+ warn("i386_iopl");
-+ return 1;
-+ }
-+#else
- if (iopl(3)) {
- fprintf(stderr, "hotkey: can't get I/O permissions.\n");
- return 1;
- }
-+#endif
-
- /* drop root priveleges to minimize security risk of running suid root */
- /*
diff --git a/sysutils/toshutils/patches/patch-ak b/sysutils/toshutils/patches/patch-ak
deleted file mode 100644
index 137aacb3035..00000000000
--- a/sysutils/toshutils/patches/patch-ak
+++ /dev/null
@@ -1,37 +0,0 @@
-$NetBSD: patch-ak,v 1.1.1.1 1999/12/20 03:05:16 hubertf Exp $
-
---- src/wmtuxtime.c.orig Fri Dec 17 14:07:03 1999
-+++ src/wmtuxtime.c Mon Dec 20 03:37:14 1999
-@@ -48,7 +48,14 @@
- #include<signal.h>
- #include<paths.h>
- #include<pwd.h>
-+#ifdef Linux
- #include<features.h>
-+#endif
-+#ifdef __NetBSD__
-+#include <sys/types.h>
-+#include <machine/sysarch.h>
-+#include <err.h>
-+#endif
- #ifdef __GLIBC__
- #include<sys/perm.h>
- #endif
-@@ -876,10 +883,17 @@
-
- /* get the necessary I/O permissions */
-
-+#ifdef __NetBSD__
-+ if (i386_iopl(3) == -1) {
-+ warn("i386_iopl");
-+ return 1;
-+ }
-+#else
- if (ioperm(0xb2, 1, 1)) {
- fprintf(stderr, "tuxtime: can't get I/O permissions.\n");
- return 1;
- }
-+#endif
-
- /* do some quick checks on the laptop */
-
diff --git a/sysutils/toshutils/patches/patch-al b/sysutils/toshutils/patches/patch-al
deleted file mode 100644
index 0c8777fa2b7..00000000000
--- a/sysutils/toshutils/patches/patch-al
+++ /dev/null
@@ -1,35 +0,0 @@
-$NetBSD: patch-al,v 1.1.1.1 1999/12/20 03:05:16 hubertf Exp $
-
---- src/tuxtime-conf.c.orig Fri Dec 17 14:07:03 1999
-+++ src/tuxtime-conf.c Mon Dec 20 03:33:35 1999
-@@ -35,7 +35,12 @@
- #include<signal.h>
- #include<paths.h>
- #include<pwd.h>
-+#ifdef Linux
- #include<features.h>
-+#endif
-+#ifdef __NetBSD__
-+#include <err.h>
-+#endif
- #ifdef __GLIBC__
- #include<sys/perm.h>
- #endif
-@@ -167,10 +172,17 @@
-
- /* get the necessary I/O permissions */
-
-+#ifdef __NetBSD__
-+ if (i386_iopl(3) == -1) {
-+ warn("i386_iopl");
-+ return 1;
-+ }
-+#else
- if (ioperm(0xb2, 1, 1)) {
- fprintf(stderr, "tuxtime-conf: can't get I/O permissions.\n");
- return 1;
- }
-+#endif
-
- /* do a quick check on the laptop */
-
diff --git a/sysutils/toshutils/patches/patch-am b/sysutils/toshutils/patches/patch-am
deleted file mode 100644
index ec8e138c5be..00000000000
--- a/sysutils/toshutils/patches/patch-am
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-am,v 1.1.1.1 1999/12/20 03:05:16 hubertf Exp $
-
---- doc/Makefile.in.orig Mon Dec 20 01:10:49 1999
-+++ doc/Makefile.in Mon Dec 20 01:11:24 1999
-@@ -36,7 +36,7 @@
- .tex.pdf:
- $(PDF) $<
-
--all: hci sci toshiba
-+all: #HF# hci sci toshiba
-
- hci: hci.pdf
-
-@@ -48,7 +48,7 @@
- install:
- $(MANINSTALL) fan.1 $(MANDESTDIR)/man1/fan.1
- $(MANINSTALL) svpw.1 $(MANDESTDIR)/man1/svpw.1
-- $(MANINSTALL) hotkey.1x $(MANDESTDIR)/man1/hotkey.1x
-+ $(MANINSTALL) hotkey.1x $(MANDESTDIR)/man1/hotkey.1
- $(MANINSTALL) tpasswd.1 $(MANDESTDIR)/man1/tpasswd.1
- $(MANINSTALL) alarm.1 $(MANDESTDIR)/man1/alarm.1
- $(MANINSTALL) tdocked.1 $(MANDESTDIR)/man1/tdocked.1
diff --git a/sysutils/ups-nut-cgi/DESCR b/sysutils/ups-nut-cgi/DESCR
deleted file mode 100644
index 167a3054f47..00000000000
--- a/sysutils/ups-nut-cgi/DESCR
+++ /dev/null
@@ -1 +0,0 @@
-ups-nut-cgi provides CGI scripts to monitor UPS status via a web browser.
diff --git a/sysutils/ups-nut-cgi/Makefile b/sysutils/ups-nut-cgi/Makefile
deleted file mode 100644
index 67db04031e9..00000000000
--- a/sysutils/ups-nut-cgi/Makefile
+++ /dev/null
@@ -1,43 +0,0 @@
-# $NetBSD: Makefile,v 1.25 2003/06/23 11:18:42 adam Exp $
-
-DISTNAME= nut-1.2.1
-PKGREVISION= 2
-PKGNAME= ups-nut-cgi-1.2.1
-CATEGORIES= sysutils
-MASTER_SITES= http://www.exploits.org/nut/release/1.2/
-
-MAINTAINER= lukem@netbsd.org
-HOMEPAGE= http://www.exploits.org/nut/
-COMMENT= Network UPS Tools CGI scripts
-
-DEPENDS+= ups-nut-1.*:../../sysutils/ups-nut
-
-ALL_TARGET= cgi
-INSTALL_TARGET= install-cgi
-
-USE_BUILDLINK2= yes
-USE_PKGINSTALL= yes
-USE_X11= yes
-GNU_CONFIGURE= yes
-CONFIGURE_ARGS+= --sysconfdir=${NUT_CONFDIR} \
- --with-statepath=${NUT_STATEDIR} \
- --with-cgi \
- --with-cgipath=${NUT_CGIDIR}
-
-PKG_SYSCONFSUBDIR?= nut
-NUT_CONFDIR= ${PKG_SYSCONFDIR}
-NUT_EGDIR= ${PREFIX}/share/examples/nut
-NUT_STATEDIR= /var/db/nut
-NUT_CGIDIR= ${PREFIX}/libexec/cgi-bin
-
-CONF_FILES= ${NUT_EGDIR}/hosts.conf.sample ${NUT_CONFDIR}/hosts.conf
-CONF_FILES+= ${NUT_EGDIR}/upsset.conf.sample \
- ${NUT_CONFDIR}/upsset.conf
-CONF_FILES+= ${NUT_EGDIR}/upsstats-single.html.sample \
- ${NUT_CONFDIR}/upsstats-single.html
-CONF_FILES+= ${NUT_EGDIR}/upsstats.html.sample \
- ${NUT_CONFDIR}/upsstats.html
-
-.include "../../graphics/freetype2/buildlink2.mk"
-.include "../../graphics/gd/buildlink2.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/ups-nut-cgi/PLIST b/sysutils/ups-nut-cgi/PLIST
deleted file mode 100644
index bda38d0e6ad..00000000000
--- a/sysutils/ups-nut-cgi/PLIST
+++ /dev/null
@@ -1,14 +0,0 @@
-@comment $NetBSD: PLIST,v 1.5 2002/12/17 05:53:42 lukem Exp $
-share/examples/nut/hosts.conf.sample
-share/examples/nut/upsset.conf.sample
-share/examples/nut/upsstats-single.html.sample
-share/examples/nut/upsstats.html.sample
-man/man5/hosts.conf.5
-man/man5/upsset.conf.5
-man/man5/upsstats.html.5
-man/man8/upsimage.cgi.8
-man/man8/upsset.cgi.8
-man/man8/upsstats.cgi.8
-libexec/cgi-bin/upsimage.cgi
-libexec/cgi-bin/upsset.cgi
-libexec/cgi-bin/upsstats.cgi
diff --git a/sysutils/ups-nut-cgi/distinfo b/sysutils/ups-nut-cgi/distinfo
deleted file mode 100644
index b4dd38ceaf9..00000000000
--- a/sysutils/ups-nut-cgi/distinfo
+++ /dev/null
@@ -1,7 +0,0 @@
-$NetBSD: distinfo,v 1.12 2002/12/13 04:23:21 lukem Exp $
-
-SHA1 (nut-1.2.1.tar.gz) = db55b0165ef594ad1cf73bf5d3d9336a0ac0fb93
-Size (nut-1.2.1.tar.gz) = 444256 bytes
-SHA1 (patch-aa) = 62f0a514e6dde1f5438be676c269711d1bc5d42c
-SHA1 (patch-ab) = 5099c3efb84be2447f80bfeb7f02acc4038ed58f
-SHA1 (patch-ac) = 6f9ca3c1faa4cb20598116f602596f43d1e07199
diff --git a/sysutils/ups-nut-cgi/patches/patch-aa b/sysutils/ups-nut-cgi/patches/patch-aa
deleted file mode 100644
index b38c9e23f23..00000000000
--- a/sysutils/ups-nut-cgi/patches/patch-aa
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-aa,v 1.7 2002/12/13 04:23:21 lukem Exp $
-
---- Makefile.in.orig Sun Dec 8 12:04:24 2002
-+++ Makefile.in
-@@ -81,6 +81,7 @@
- @echo "Run 'configure --with-cgi' before doing 'make cgi'."
-
- build-cgi:
-+ @cd common; $(MAKE); cd ..;
- @cd clients; $(MAKE) cgi; cd ..;
-
- install-cgi: cgi install-cgi-dir install-dirs install-cgi-bin \
diff --git a/sysutils/ups-nut-cgi/patches/patch-ab b/sysutils/ups-nut-cgi/patches/patch-ab
deleted file mode 100644
index 46a19e0a3bd..00000000000
--- a/sysutils/ups-nut-cgi/patches/patch-ab
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ab,v 1.4 2002/12/13 04:23:21 lukem Exp $
-
---- clients/Makefile.in.orig Mon Dec 2 23:09:20 2002
-+++ clients/Makefile.in
-@@ -15,6 +15,7 @@
- # other definitions
- CC = @CC@
- CFLAGS = -I../include @CFLAGS@
-+LDFLAGS = @LDFLAGS@
- PROGS = upsc upslog upsrw upscmd
- SPROGS = upsmon upssched
- CGIPROGS = upsstats.cgi upsimage.cgi upsset.cgi
diff --git a/sysutils/ups-nut-cgi/patches/patch-ac b/sysutils/ups-nut-cgi/patches/patch-ac
deleted file mode 100644
index cf04b8406e4..00000000000
--- a/sysutils/ups-nut-cgi/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.3 2002/12/13 04:23:21 lukem Exp $
-
---- conf/Makefile.in.orig Tue Sep 3 17:23:02 2002
-+++ conf/Makefile.in
-@@ -4,7 +4,7 @@
- prefix = @prefix@
- exec_prefix = @exec_prefix@
-
--CONFPATH = $(DESTDIR)@sysconfdir@
-+CONFPATH = $(DESTDIR)@datadir@/examples/nut
-
- INSTALLCMD = @INSTALL@
-
diff --git a/sysutils/ups-nut/DESCR b/sysutils/ups-nut/DESCR
deleted file mode 100644
index a83a7e2eaa2..00000000000
--- a/sysutils/ups-nut/DESCR
+++ /dev/null
@@ -1,5 +0,0 @@
-This is a developing project to monitor a large assortment of UPS hardware.
-Network communications are used so that multiple systems can monitor a
-single physical UPS and shut down together if necessary without any
-special "sharing hardware" on the UPS itself. CGI scripts are in the
-ups-nut-cgi package.
diff --git a/sysutils/ups-nut/MESSAGE b/sysutils/ups-nut/MESSAGE
deleted file mode 100644
index 434bd2dddda..00000000000
--- a/sysutils/ups-nut/MESSAGE
+++ /dev/null
@@ -1,17 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE,v 1.5 2002/12/13 04:23:17 lukem Exp $
-
- ${NUT_CONFDIR}/upsd.users has a new format from version 0.45.5.
- You will need to update this before restarting upsd(8).
- Refer to ${NUT_EGDIR}/upsd.users.sample
- and upsd.users(5) for more information.
-
- The network port used by nut changed in version 0.50.0,
- to the IANA assigned 3493, from 3305 in previous versions.
- You will need to update all clients.
-
- Various changes occurred in version 1.0.
- If upgrading from a prior version, refer to
- ${NUT_DOCDIR}/UPGRADING for more information.
-
-===========================================================================
diff --git a/sysutils/ups-nut/Makefile b/sysutils/ups-nut/Makefile
deleted file mode 100644
index f9e524d83b2..00000000000
--- a/sysutils/ups-nut/Makefile
+++ /dev/null
@@ -1,75 +0,0 @@
-# $NetBSD: Makefile,v 1.27 2003/01/28 22:04:19 jlam Exp $
-#
-
-DISTNAME= nut-1.2.1
-PKGNAME= ups-nut-1.2.1
-PKGREVISION= 1
-CATEGORIES= sysutils
-MASTER_SITES= http://www.exploits.org/nut/release/1.2/
-
-MAINTAINER= lukem@netbsd.org
-HOMEPAGE= http://www.exploits.org/nut/
-COMMENT= Network UPS Tools
-
-USE_BUILDLINK2= yes
-USE_PKGINSTALL= yes
-GNU_CONFIGURE= yes
-CONFIGURE_ARGS+= --sysconfdir=${NUT_CONFDIR} \
- --with-user=${NUT_USER} \
- --with-group=${NUT_GROUP} \
- --with-statepath=${NUT_STATEDIR} \
- --with-drvpath=${LOCALBASE}/sbin/ups-drivers
-
-PKG_SYSCONFSUBDIR?= nut
-NUT_CONFDIR= ${PKG_SYSCONFDIR}
-NUT_DOCDIR= ${PREFIX}/share/doc/nut
-NUT_EGDIR= ${PREFIX}/share/examples/nut
-NUT_STATEDIR= /var/db/nut
-
-NUT_USER?= nut
-NUT_GROUP?= nut
-
-FILES_SUBST+= NUT_CONFDIR=${NUT_CONFDIR}
-FILES_SUBST+= NUT_STATEDIR=${NUT_STATEDIR}
-
-MESSAGE_SUBST+= NUT_CONFDIR=${NUT_CONFDIR}
-MESSAGE_SUBST+= NUT_EGDIR=${NUT_EGDIR}
-MESSAGE_SUBST+= NUT_DOCDIR=${NUT_DOCDIR}
-
-PKG_GROUPS= ${NUT_GROUP}
-PKG_USERS= ${NUT_USER}:${NUT_GROUP}::Network\\ UPS\\ Tools::${SH}
-
-CONF_FILES= ${NUT_EGDIR}/ups.conf.sample ${NUT_CONFDIR}/ups.conf
-CONF_FILES+= ${NUT_EGDIR}/upssched.conf.sample \
- ${NUT_CONFDIR}/upssched.conf
-
-CONF_FILES_PERMS= ${NUT_EGDIR}/upsd.conf.sample \
- ${NUT_CONFDIR}/upsd.conf \
- ${ROOT_USER} ${ROOT_GROUP} 0600
-CONF_FILES_PERMS+= ${NUT_EGDIR}/upsd.users.sample \
- ${NUT_CONFDIR}/upsd.users \
- ${ROOT_USER} ${ROOT_GROUP} 0600
-CONF_FILES_PERMS+= ${NUT_EGDIR}/upsmon.conf.sample \
- ${NUT_CONFDIR}/upsmon.conf \
- ${ROOT_USER} ${ROOT_GROUP} 0600
-RCD_SCRIPTS= ups upsd upsdriver upslog upsmon
-
-OWN_DIRS= ${NUT_CONFDIR}
-OWN_DIRS_PERMS= ${NUT_STATEDIR} ${NUT_USER} ${NUT_GROUP} 0770
-
-pre-install:
- @${INSTALL_DATA_DIR} ${NUT_EGDIR}
-
-post-install:
- ${INSTALL_DATA_DIR} ${NUT_DOCDIR}
- ${INSTALL_DATA_DIR} ${NUT_DOCDIR}/cables ${NUT_DOCDIR}/drivers
- for f in CHANGES COPYING CREDITS NEWS README UPGRADING; do \
- ${INSTALL_DATA} ${WRKSRC}/$$f ${NUT_DOCDIR}; \
- done
- ${INSTALL_DATA} ${WRKSRC}/docs/FAQ ${NUT_DOCDIR}
- ${INSTALL_DATA} ${WRKSRC}/docs/driver.list ${NUT_DOCDIR}
- ${INSTALL_DATA} ${WRKSRC}/docs/*.txt ${NUT_DOCDIR}
- ${INSTALL_DATA} ${WRKSRC}/docs/cables/*.txt ${NUT_DOCDIR}/cables
- ${INSTALL_DATA} ${WRKSRC}/docs/drivers/*.txt ${NUT_DOCDIR}/drivers
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/ups-nut/PLIST b/sysutils/ups-nut/PLIST
deleted file mode 100644
index 7e42a69ada8..00000000000
--- a/sysutils/ups-nut/PLIST
+++ /dev/null
@@ -1,128 +0,0 @@
-@comment $NetBSD: PLIST,v 1.11 2002/12/13 04:23:17 lukem Exp $
-bin/upsc
-bin/upscmd
-bin/upslog
-bin/upsrw
-etc/rc.d/ups
-etc/rc.d/upsd
-etc/rc.d/upsdriver
-etc/rc.d/upslog
-etc/rc.d/upsmon
-man/man5/ups.conf.5
-man/man5/upsd.conf.5
-man/man5/upsd.users.5
-man/man5/upsmon.conf.5
-man/man5/upssched.conf.5
-man/man8/apcsmart.8
-man/man8/bcmxcp.8
-man/man8/belkin.8
-man/man8/bestferrups801-807.8
-man/man8/bestfortress.8
-man/man8/bestuferrups.8
-man/man8/bestups.8
-man/man8/cyberpower.8
-man/man8/etapro.8
-man/man8/everups.8
-man/man8/fentonups.8
-man/man8/genericups.8
-man/man8/hp.8
-man/man8/isbmex.8
-man/man8/liebert.8
-man/man8/masterguard.8
-man/man8/mge-ellipse.8
-man/man8/mge-utalk.8
-man/man8/microdowell.8
-man/man8/newapc.8
-man/man8/nutupsdrv.8
-man/man8/oneac.8
-man/man8/powercom.8
-man/man8/powernet.8
-man/man8/sec.8
-man/man8/sms.8
-man/man8/snmp-ups.8
-man/man8/tripplite.8
-man/man8/upsc.8
-man/man8/upscmd.8
-man/man8/upsd.8
-man/man8/upsdrvctl.8
-man/man8/upslog.8
-man/man8/upsmon.8
-man/man8/upsrw.8
-man/man8/upssched.8
-man/man8/victronups.8
-sbin/ups-drivers/apcsmart
-sbin/ups-drivers/bcmxcp
-sbin/ups-drivers/belkin
-sbin/ups-drivers/bestferrups801-807
-sbin/ups-drivers/bestfortress
-sbin/ups-drivers/bestuferrups
-sbin/ups-drivers/bestups
-sbin/ups-drivers/cyberpower
-sbin/ups-drivers/etapro
-sbin/ups-drivers/everups
-sbin/ups-drivers/fentonups
-sbin/ups-drivers/genericups
-sbin/ups-drivers/hp
-sbin/ups-drivers/isbmex
-sbin/ups-drivers/liebert
-sbin/ups-drivers/masterguard
-sbin/ups-drivers/mge-ellipse
-sbin/ups-drivers/mge-utalk
-sbin/ups-drivers/microdowell
-sbin/ups-drivers/newapc
-sbin/ups-drivers/oneac
-sbin/ups-drivers/powercom
-sbin/ups-drivers/sec
-sbin/ups-drivers/sms
-sbin/ups-drivers/tripplite
-sbin/ups-drivers/upsdrvctl
-sbin/ups-drivers/victronups
-sbin/upsd
-sbin/upsmon
-sbin/upssched
-share/doc/nut/CHANGES
-share/doc/nut/COPYING
-share/doc/nut/CREDITS
-share/doc/nut/FAQ
-share/doc/nut/NEWS
-share/doc/nut/README
-share/doc/nut/UPGRADING
-share/doc/nut/big-servers.txt
-share/doc/nut/cables/apc.txt
-share/doc/nut/cables/ge-imv-victron.txt
-share/doc/nut/cables/imv.txt
-share/doc/nut/cables/mgeups.txt
-share/doc/nut/cables/powerware.txt
-share/doc/nut/cables/repotec.txt
-share/doc/nut/cables/sms.txt
-share/doc/nut/chroot.txt
-share/doc/nut/commands.txt
-share/doc/nut/config-files.txt
-share/doc/nut/configure.txt
-share/doc/nut/data-room.txt
-share/doc/nut/design.txt
-share/doc/nut/developers.txt
-share/doc/nut/driver.list
-share/doc/nut/drivers/generic-ups.txt
-share/doc/nut/drivers/mge-ellipse.txt
-share/doc/nut/drivers/mge-utalk.txt
-share/doc/nut/drivers/snmp-ups.txt
-share/doc/nut/new-drivers.txt
-share/doc/nut/pager.txt
-share/doc/nut/protocol.txt
-share/doc/nut/shutdown.txt
-share/doc/nut/ssl.txt
-share/doc/nut/todo.txt
-share/doc/nut/upssched.txt
-share/examples/nut/ups.conf.sample
-share/examples/nut/upsd.conf.sample
-share/examples/nut/upsd.users.sample
-share/examples/nut/upsmon.conf.sample
-share/examples/nut/upssched.conf.sample
-@dirrm share/examples/nut
-@dirrm share/doc/nut/drivers
-@dirrm share/doc/nut/cables
-@dirrm share/doc/nut
-@dirrm sbin/ups-drivers
-@exec ${MKDIR} %D/etc/nut
-@dirrm etc/nut
diff --git a/sysutils/ups-nut/distinfo b/sysutils/ups-nut/distinfo
deleted file mode 100644
index 1ae802e747b..00000000000
--- a/sysutils/ups-nut/distinfo
+++ /dev/null
@@ -1,9 +0,0 @@
-$NetBSD: distinfo,v 1.17 2002/12/31 22:47:06 lukem Exp $
-
-SHA1 (nut-1.2.1.tar.gz) = db55b0165ef594ad1cf73bf5d3d9336a0ac0fb93
-Size (nut-1.2.1.tar.gz) = 444256 bytes
-SHA1 (patch-ab) = 6f9ca3c1faa4cb20598116f602596f43d1e07199
-SHA1 (patch-ad) = 56b1b50affe7615b7ecc5e5db0305303ac2cd078
-SHA1 (patch-af) = bc79381000992169074f6be02fcee7bbc2495ec9
-SHA1 (patch-ag) = df3cab5fafe985af9b8cbd0879b8e7c88b4e35b3
-SHA1 (patch-ah) = 8a6e0ce86a30bb2009654f4b1c5fcb25af22e7db
diff --git a/sysutils/ups-nut/files/ups.sh b/sysutils/ups-nut/files/ups.sh
deleted file mode 100644
index 0f3bce8fa89..00000000000
--- a/sysutils/ups-nut/files/ups.sh
+++ /dev/null
@@ -1,55 +0,0 @@
-#!@RCD_SCRIPTS_SHELL@
-#
-# $NetBSD: ups.sh,v 1.10 2002/09/20 02:02:01 grant Exp $
-#
-# KEYWORD: nostart
-
-if [ -f /etc/rc.subr ]
-then
- . /etc/rc.subr
-fi
-
-rcd_dir=`@DIRNAME@ $0`
-
-# NOTE: run_rc_command sets $rc_arg
-#
-forward_commands()
-{
- # Backward compat with NetBSD <1.6:
- [ -z "$rc_arg" ] && rc_arg=$_arg
-
- for file in $COMMAND_LIST; do
- $rcd_dir/$file $rc_arg
- done
-}
-
-reverse_commands()
-{
- # Backward compat with NetBSD <1.6:
- [ -z "$rc_arg" ] && rc_arg=$_arg
-
- REVCOMMAND_LIST=
- for file in $COMMAND_LIST; do
- REVCOMMAND_LIST="$file $REVCOMMAND_LIST"
- done
- for file in $REVCOMMAND_LIST; do
- $rcd_dir/$file $rc_arg
- done
-}
-
-COMMAND_LIST="upsdriver upsd upsmon upslog"
-
-name="ups"
-start_cmd="forward_commands"
-stop_cmd="reverse_commands"
-status_cmd="forward_commands"
-extra_commands="status"
-
-if [ -f /etc/rc.subr ]
-then
- run_rc_command "$1"
-else
- @ECHO@ -n " ${name}"
- _arg="$1"
- ${start_cmd}
-fi
diff --git a/sysutils/ups-nut/files/upsd.sh b/sysutils/ups-nut/files/upsd.sh
deleted file mode 100644
index a587cae0ccb..00000000000
--- a/sysutils/ups-nut/files/upsd.sh
+++ /dev/null
@@ -1,27 +0,0 @@
-#!@RCD_SCRIPTS_SHELL@
-#
-# $NetBSD: upsd.sh,v 1.6 2003/01/26 00:48:24 fredb Exp $
-#
-# PROVIDE: upsd
-# REQUIRE: upsdriver
-# KEYWORD: shutdown
-
-if [ -f /etc/rc.subr ]
-then
- . /etc/rc.subr
-fi
-
-name="upsd"
-rcvar=$name
-command="@PREFIX@/sbin/${name}"
-required_files="@NUT_CONFDIR@/${name}.conf"
-pidfile="@NUT_STATEDIR@/${name}.pid"
-
-if [ -f /etc/rc.subr ]
-then
- load_rc_config $name
- run_rc_command "$1"
-else
- @ECHO@ -n " ${name}"
- ${command} ${upsd_flags} ${command_args}
-fi
diff --git a/sysutils/ups-nut/files/upsdriver.sh b/sysutils/ups-nut/files/upsdriver.sh
deleted file mode 100644
index 01d09f01400..00000000000
--- a/sysutils/ups-nut/files/upsdriver.sh
+++ /dev/null
@@ -1,58 +0,0 @@
-#!@RCD_SCRIPTS_SHELL@
-#
-# $NetBSD: upsdriver.sh,v 1.7 2002/12/13 04:23:18 lukem Exp $
-#
-# PROVIDE: upsdriver
-# REQUIRE: NETWORK syslogd mountcritremote
-#
-# You will need to set some variables in /etc/rc.conf to start the UPS
-# driver(s) properly, e.g.
-#
-# upsdriver=YES
-# upsdriver_type="newapc"
-# upsdriver_flags="-a smartups"
-#
-# If "upsdriver_type" is unset, then use "upsdrvctl" to control the UPS
-# drivers. Please refer to nutupsdrv(8) for more information about the
-# arguments to pass to the UPS drivers.
-
-if [ -f /etc/rc.subr ]
-then
- . /etc/rc.subr
-fi
-
-name="upsdriver"
-rcvar=$name
-
-if [ -f /etc/rc.subr ]
-then
- load_rc_config $name
-fi
-
-if [ "${upsdriver_type:-upsdrvctl}" = "upsdrvctl" ]
-then
- ctl_command="@PREFIX@/sbin/ups-drivers/upsdrvctl"
- required_files="@NUT_CONFDIR@/ups.conf"
- start_cmd="${ctl_command} start"
- stop_cmd="${ctl_command} stop"
-else
- command="@PREFIX@/sbin/ups-drivers/${upsdriver_type}"
- #
- # XXX - We need a way to easily determine the pidfile, which is of
- # XXX - the form @NUT_STATEDIR@/${updriver_type}-${tty}.pid
- #
- #pidfile="@NUT_STATEDIR@/${upsdriver_type}-${tty}.pid"
-fi
-
-if [ -f /etc/rc.subr ]
-then
- run_rc_command "$1"
-else
- @ECHO@ -n " ${name}"
- if [ -n "${start_cmd}" ]
- then
- ${start_cmd}
- else
- ${command} ${upsdriver_flags} ${command_args}
- fi
-fi
diff --git a/sysutils/ups-nut/files/upslog.sh b/sysutils/ups-nut/files/upslog.sh
deleted file mode 100644
index 2c9a0f9aaea..00000000000
--- a/sysutils/ups-nut/files/upslog.sh
+++ /dev/null
@@ -1,34 +0,0 @@
-#!@RCD_SCRIPTS_SHELL@
-#
-# $NetBSD: upslog.sh,v 1.5 2002/09/20 02:02:01 grant Exp $
-#
-# PROVIDE: upslog
-# REQUIRE: upsd
-#
-# You will need to set some variables in /etc/rc.conf to start upslog
-# properly, e.g.
-#
-# upslog=YES
-# upslog_flags="smartups@localhost /var/log/ups 60"
-#
-# Please refer to upslog(8) for more information about the arguments to pass
-# to upslog.
-
-if [ -f /etc/rc.subr ]
-then
- . /etc/rc.subr
-fi
-
-name="upslog"
-rcvar="${name}"
-command="@PREFIX@/bin/${name}"
-pidfile="/var/run/${name}.pid"
-
-if [ -f /etc/rc.subr ]
-then
- load_rc_config $name
- run_rc_command "$1"
-else
- @ECHO@ -n " ${name}"
- ${command} ${upslog_flags} ${command_args}
-fi
diff --git a/sysutils/ups-nut/files/upsmon.sh b/sysutils/ups-nut/files/upsmon.sh
deleted file mode 100644
index 23c7e7dbb84..00000000000
--- a/sysutils/ups-nut/files/upsmon.sh
+++ /dev/null
@@ -1,27 +0,0 @@
-#!@RCD_SCRIPTS_SHELL@
-#
-# $NetBSD: upsmon.sh,v 1.5 2003/01/26 00:48:24 fredb Exp $
-#
-# PROVIDE: upsmon
-# REQUIRE: upsd
-# KEYWORD: shutdown
-
-if [ -f /etc/rc.subr ]
-then
- . /etc/rc.subr
-fi
-
-name="upsmon"
-rcvar="${name}"
-command="@PREFIX@/sbin/${name}"
-pidfile="/var/run/${name}.pid"
-required_files="@NUT_CONFDIR@/${name}.conf"
-
-if [ -f /etc/rc.subr ]
-then
- load_rc_config $name
- run_rc_command "$1"
-else
- @ECHO@ -n " ${name}"
- ${command} ${upsmon_flags} ${command_args}
-fi
diff --git a/sysutils/ups-nut/patches/patch-ab b/sysutils/ups-nut/patches/patch-ab
deleted file mode 100644
index fae3f6877c5..00000000000
--- a/sysutils/ups-nut/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.6 2002/12/13 04:23:19 lukem Exp $
-
---- conf/Makefile.in.orig Tue Sep 3 17:23:02 2002
-+++ conf/Makefile.in
-@@ -4,7 +4,7 @@
- prefix = @prefix@
- exec_prefix = @exec_prefix@
-
--CONFPATH = $(DESTDIR)@sysconfdir@
-+CONFPATH = $(DESTDIR)@datadir@/examples/nut
-
- INSTALLCMD = @INSTALL@
-
diff --git a/sysutils/ups-nut/patches/patch-ad b/sysutils/ups-nut/patches/patch-ad
deleted file mode 100644
index 36eb479226c..00000000000
--- a/sysutils/ups-nut/patches/patch-ad
+++ /dev/null
@@ -1,29 +0,0 @@
-$NetBSD: patch-ad,v 1.3 2002/12/13 04:23:19 lukem Exp $
-
---- configure.in.orig Mon Dec 2 23:08:46 2002
-+++ configure.in
-@@ -526,13 +526,17 @@
- dnl | let's test it for sanity before proceeding. It's better to |
- dnl | catch them here rather than in the program itself at runtime. |
-
--grep "^$RUN_AS_GROUP:" /etc/group >/dev/null 2>/dev/null
--if (test "$?" = "1")
--then
-- # not found, fatal error
-- AC_MSG_WARN($RUN_AS_GROUP not found in /etc/group!)
-- AC_MSG_WARN(You might want to rerun configure using --with-group and another group name.)
--fi
-+dnl | NetBSD's pkgsrc setup creates the user and group AFTER the build
-+dnl | and BEFORE install. This gives the configure and build a chance
-+dnl | to fail before modifying the group and passwd files.
-+dnl
-+dnl grep "^$RUN_AS_GROUP:" /etc/group >/dev/null 2>/dev/null
-+dnl if (test "$?" = "1")
-+dnl then
-+dnl # not found, fatal error
-+dnl AC_MSG_WARN($RUN_AS_GROUP not found in /etc/group!)
-+dnl AC_MSG_WARN(You might want to rerun configure using --with-group and another group name.)
-+dnl fi
-
- dnl | All done with group tests. |
- dnl +------------------------------------------------------------------+
diff --git a/sysutils/ups-nut/patches/patch-af b/sysutils/ups-nut/patches/patch-af
deleted file mode 100644
index 9936162ecec..00000000000
--- a/sysutils/ups-nut/patches/patch-af
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD: patch-af,v 1.5 2002/12/31 22:47:06 lukem Exp $
-
---- drivers/newapc.c.orig Mon Oct 7 14:35:35 2002
-+++ drivers/newapc.c
-@@ -182,11 +182,16 @@ char * convert_ups2info (struct apc_cmdt
- case APC_F_CELCIUS:
- case APC_F_HEX:
- case APC_F_DEC:
-- case APC_F_SECONDS:
-- case APC_F_HOURS:
- case APC_F_LEAVE:
- /* All of these just pass through at present */
- ptr = upsval;
-+ break;
-+ case APC_F_SECONDS:
-+ case APC_F_HOURS:
-+ /* Parse number */
-+ tval = strtol(upsval, NULL, 10);
-+ sprintf(tmp, "%d", tval);
-+ ptr = tmp;
- break;
- case APC_F_MINUTES:
- /* Convert to seconds - NUT standard time measurement */
diff --git a/sysutils/ups-nut/patches/patch-ag b/sysutils/ups-nut/patches/patch-ag
deleted file mode 100644
index d769060b17e..00000000000
--- a/sysutils/ups-nut/patches/patch-ag
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ag,v 1.7 2002/12/31 22:47:07 lukem Exp $
-
---- drivers/newapc.h.orig Tue Aug 20 17:06:26 2002
-+++ drivers/newapc.h
-@@ -119,7 +119,7 @@ struct apc_cmdtab_t {
- {INFO_MINUTIL, 0, 0, APC_POLL|APC_F_VOLT, NULL, NULL, 'N'},
- {INFO_OUTVOLT, 0, 0, APC_POLL|APC_F_VOLT, NULL, NULL, 'O'},
- {INFO_SLFTSTRES,0, 0, APC_POLL, NULL, NULL, 'X'},
-- {INFO_BATT_RUNTIME,0, 0, APC_POLL|APC_F_MINUTES, NULL, NULL, 'j'},
-+ {INFO_RUNTIME, 0, 0, APC_POLL|APC_F_SECONDS, NULL, NULL, 'j'},
- {INFO_MFRDATE, 0, 0, 0, NULL, NULL, 'm'},
- {INFO_TEMPMAX, 0, 0, APC_F_CELCIUS, NULL, NULL, '['},
- {INFO_TEMPMIN, 0, 0, APC_F_CELCIUS, NULL, NULL, ']'},
diff --git a/sysutils/ups-nut/patches/patch-ah b/sysutils/ups-nut/patches/patch-ah
deleted file mode 100644
index 7702461f310..00000000000
--- a/sysutils/ups-nut/patches/patch-ah
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD: patch-ah,v 1.2 2002/12/13 04:23:20 lukem Exp $
-
---- configure.orig Mon Dec 2 23:08:51 2002
-+++ configure
-@@ -4741,18 +4741,6 @@
-
- fi;
-
--
--grep "^$RUN_AS_GROUP:" /etc/group >/dev/null 2>/dev/null
--if (test "$?" = "1")
--then
-- # not found, fatal error
-- { echo "$as_me:$LINENO: WARNING: $RUN_AS_GROUP not found in /etc/group!" >&5
--echo "$as_me: WARNING: $RUN_AS_GROUP not found in /etc/group!" >&2;}
-- { echo "$as_me:$LINENO: WARNING: You might want to rerun configure using --with-group and another group name." >&5
--echo "$as_me: WARNING: You might want to rerun configure using --with-group and another group name." >&2;}
--fi
--
--
- echo "$as_me:$LINENO: checking facility for syslog" >&5
- echo $ECHO_N "checking facility for syslog... $ECHO_C" >&6
-
diff --git a/sysutils/usbutil/DESCR b/sysutils/usbutil/DESCR
deleted file mode 100644
index 4ee73dc424f..00000000000
--- a/sysutils/usbutil/DESCR
+++ /dev/null
@@ -1,10 +0,0 @@
-USB developer utilities:
-usbctl
- Dump information about devices on a USB bus.
-usbdebug
- Set the kernel debugging flag.
-usbgen
- Dump descriptors of a generic device.
- usbgen -f ugenN -v -D
-usbstats
- Gives statistics for a USB host contrller.
diff --git a/sysutils/usbutil/Makefile b/sysutils/usbutil/Makefile
deleted file mode 100644
index 116c0025da6..00000000000
--- a/sysutils/usbutil/Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
-# $NetBSD: Makefile,v 1.8 2002/02/25 01:00:49 augustss Exp $
-#
-
-DISTNAME= usbutil-0.5
-CATEGORIES= sysutils
-MASTER_SITES= ftp://ftp.augustsson.net/pub/netbsd/
-
-MAINTAINER= lennart@augustsson.net
-COMMENT= USB developer utilities
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/usbutil/PLIST b/sysutils/usbutil/PLIST
deleted file mode 100644
index db882c049ed..00000000000
--- a/sysutils/usbutil/PLIST
+++ /dev/null
@@ -1,5 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 22:54:07 zuntum Exp $
-sbin/usbctl
-sbin/usbdebug
-sbin/usbgen
-sbin/usbstats
diff --git a/sysutils/usbutil/distinfo b/sysutils/usbutil/distinfo
deleted file mode 100644
index 031befd7eb1..00000000000
--- a/sysutils/usbutil/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.4 2002/03/07 07:49:49 jmc Exp $
-
-SHA1 (usbutil-0.5.tar.gz) = 4c9abc6f370ab561bd2748b1792802d1e959c599
-Size (usbutil-0.5.tar.gz) = 11508 bytes
-SHA1 (patch-aa) = b41e7d55d1951ceb62b21cac84c89ff68bd5b79f
diff --git a/sysutils/usbutil/patches/patch-aa b/sysutils/usbutil/patches/patch-aa
deleted file mode 100644
index c15bce7c33e..00000000000
--- a/sysutils/usbutil/patches/patch-aa
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2002/03/07 07:49:49 jmc Exp $
-
---- usbgen.c.orig Thu Mar 7 07:46:26 2002
-+++ usbgen.c Thu Mar 7 07:48:00 2002
-@@ -54,6 +54,7 @@
- #define ucd_desc desc
- #define uai_config_index config_index
- #define uai_interface_index interface_index
-+#define uai_alt_no alt_no
- #define udi_product product
- #define udi_vendor vendor
- #define udi_addr addr
diff --git a/sysutils/user/DESCR b/sysutils/user/DESCR
deleted file mode 100644
index 5fefbd8b9d7..00000000000
--- a/sysutils/user/DESCR
+++ /dev/null
@@ -1,10 +0,0 @@
-The usermgmt suite of programs provides SVR4/Solaris-compatible
-{user,group}{add,del,mod} commands, and two utilities, user(8) and
-group(8) whcih perform the same functions. In addition, some
-extensions are provided, which allow a user to be created with the
-same uid and gid, for example.
-
-The usermgmt suite was based on the old addnerd package, which, in turn,
-was based on Matt Green's addbozo script.
-
-Alistair G. Crooks (agc@netbsd.org)
diff --git a/sysutils/user/Makefile b/sysutils/user/Makefile
deleted file mode 100644
index c7f05d5e49e..00000000000
--- a/sysutils/user/Makefile
+++ /dev/null
@@ -1,44 +0,0 @@
-# $NetBSD: Makefile,v 1.13 2003/03/29 12:42:33 jmmv Exp $
-#
-
-# Note to package maintainers:
-# To update the distfile of this pkg, cd to /usr/src/usr.sbin,
-# "tar pzvcf user-`date +%Y%m%d`.tar.gz user" and upload that
-# file to ${MASTER_SITE_LOCAL}.
-DISTNAME= user-20000509
-WRKSRC= ${WRKDIR}/user
-CATEGORIES= sysutils
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-
-MAINTAINER= agc@netbsd.org
-HOMEPAGE= http://www.netbsd.org/
-COMMENT= Solaris-compatible {user,group}{add,del,mod} commands
-
-ONLY_FOR_PLATFORM= NetBSD-*-* # already in Solaris base system
-
-.if exists(/usr/sbin/user)
-PKG_SKIP_REASON= "${PKGNAME} is part of your ${OPSYS} distribution"
-.endif
-
-NO_CONFIGURE= yes
-MANCOMPRESSED_IF_MANZ= yes
-
-PLIST_SRC= ${WRKDIR}/PLIST
-
-MAKE_ENV+= BINDIR=${PREFIX}/sbin MANDIR=${PREFIX}/man \
- FILESDIR=${PREFIX}/share/examples/usermgmt
-
-pre-install:
- ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/usermgmt
-
-post-install:
- @${CP} ${PKGDIR}/PLIST ${PLIST_SRC}
- @for OPT in ${MANINSTALL} broken-solaris-needs-this; do \
- case $$OPT in \
- catinstall|maninstall) \
- ${CAT} ${PKGDIR}/PLIST.$$OPT >>${PLIST_SRC}; \
- ;; \
- esac; \
- done
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/user/PLIST b/sysutils/user/PLIST
deleted file mode 100644
index 00d8b34e9bc..00000000000
--- a/sysutils/user/PLIST
+++ /dev/null
@@ -1,15 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 22:54:08 zuntum Exp $
-sbin/user
-sbin/useradd
-sbin/userdel
-sbin/userinfo
-sbin/usermod
-sbin/group
-sbin/groupadd
-sbin/groupdel
-sbin/groupinfo
-sbin/groupmod
-share/examples/usermgmt/.cshrc
-share/examples/usermgmt/.login
-share/examples/usermgmt/.profile
-@dirrm share/examples/usermgmt
diff --git a/sysutils/user/PLIST.catinstall b/sysutils/user/PLIST.catinstall
deleted file mode 100644
index f11f9511ef6..00000000000
--- a/sysutils/user/PLIST.catinstall
+++ /dev/null
@@ -1,11 +0,0 @@
-@comment $NetBSD: PLIST.catinstall,v 1.1 2001/10/31 22:58:06 zuntum Exp $
-man/cat8/user.0
-man/cat8/useradd.0
-man/cat8/userdel.0
-man/cat8/userinfo.0
-man/cat8/usermod.0
-man/cat8/group.0
-man/cat8/groupadd.0
-man/cat8/groupdel.0
-man/cat8/groupinfo.0
-man/cat8/groupmod.0
diff --git a/sysutils/user/PLIST.maninstall b/sysutils/user/PLIST.maninstall
deleted file mode 100644
index aeefc15fbba..00000000000
--- a/sysutils/user/PLIST.maninstall
+++ /dev/null
@@ -1,11 +0,0 @@
-@comment $NetBSD: PLIST.maninstall,v 1.1 2001/10/31 22:58:07 zuntum Exp $
-man/man8/user.8
-man/man8/useradd.8
-man/man8/userdel.8
-man/man8/userinfo.8
-man/man8/usermod.8
-man/man8/group.8
-man/man8/groupadd.8
-man/man8/groupdel.8
-man/man8/groupinfo.8
-man/man8/groupmod.8
diff --git a/sysutils/user/distinfo b/sysutils/user/distinfo
deleted file mode 100644
index 04d49dd01d9..00000000000
--- a/sysutils/user/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.2 2001/04/19 11:29:10 agc Exp $
-
-SHA1 (user-20000509.tar.gz) = 7bdd54a7150c20432dd81fde8d086cd52b3f2fe4
-Size (user-20000509.tar.gz) = 17755 bytes
-SHA1 (patch-aa) = bb47a90980043726052e472f1be21d1a63962b5f
diff --git a/sysutils/user/patches/patch-aa b/sysutils/user/patches/patch-aa
deleted file mode 100644
index 7c62de00be2..00000000000
--- a/sysutils/user/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.3 2000/01/13 17:31:16 hubertf Exp $
-
---- Makefile.BAK Thu Jan 13 18:05:29 2000
-+++ Makefile Thu Jan 13 18:05:54 2000
-@@ -30,7 +30,7 @@
- FILESNAME_dot.cshrc= .cshrc
- FILESNAME_dot.login= .login
- FILESNAME_dot.profile= .profile
--FILESDIR= /usr/share/examples/usermgmt
-+FILESDIR?= /usr/share/examples/usermgmt
- .endif
-
- # this target checks the built-in default group, and, if it doesn't exist,
diff --git a/sysutils/vcdimager-devel/DESCR b/sysutils/vcdimager-devel/DESCR
deleted file mode 100644
index 8f7d49c3af1..00000000000
--- a/sysutils/vcdimager-devel/DESCR
+++ /dev/null
@@ -1,16 +0,0 @@
-GNU VCDImager is a full-featured mastering suite for authoring,
-disassembling and analyzing Video CDs and Super Video CDs.
-
-The following features are available so far (some features are
-only available in the latest alpha snapshots):
- Free software available under the GNU Public License
- Support for Video CD 1.1 and 2.0 disc formats
- Support for the Super Video CD 1.0 disc format
- Full PBC (playback control) support (play lists,
- selection lists and end lists)
- Support for segment play items
- Automatic padding of MPEG streams on the fly
- Support for 99-minute (out-of-specification) CD-R media
- Extraction of Video CDs into files (incl. the PBC information)
- Runs on all major UNIX flavors and on Win32
- Use of XML for the description of Video CDs
diff --git a/sysutils/vcdimager-devel/Makefile b/sysutils/vcdimager-devel/Makefile
deleted file mode 100644
index 66eeba56484..00000000000
--- a/sysutils/vcdimager-devel/Makefile
+++ /dev/null
@@ -1,22 +0,0 @@
-# $NetBSD: Makefile,v 1.4 2003/07/13 13:53:23 wiz Exp $
-#
-
-DISTNAME= vcdimager-0.7.12
-PKGREVISION= 1
-CATEGORIES= sysutils
-MASTER_SITES= ftp://alpha.gnu.org/gnu/vcdimager/
-
-MAINTAINER= collver1@attbi.com
-HOMEPAGE= http://www.gnu.org/software/vcdimager/
-COMMENT= mastering suite for Video CDs
-
-USE_BUILDLINK2= YES
-USE_GMAKE= YES
-GNU_CONFIGURE= YES
-USE_LIBTOOL= yes
-LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
-
-.include "../../devel/gettext-lib/buildlink2.mk"
-
-.include "../../mk/texinfo.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/vcdimager-devel/PLIST b/sysutils/vcdimager-devel/PLIST
deleted file mode 100644
index ff63efc3b6c..00000000000
--- a/sysutils/vcdimager-devel/PLIST
+++ /dev/null
@@ -1,12 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2002/11/25 12:29:22 wiz Exp $
-bin/cdxa2mpeg
-bin/vcddebug
-bin/vcdimager
-@unexec ${INSTALL_INFO} --delete --info-dir=%D/info %D/info/vcdimager.info
-info/vcdimager.info
-info/vcdimager.info-1
-info/vcdimager.info-2
-info/vcdimager.info-3
-@exec ${INSTALL_INFO} --info-dir=%D/info %D/info/vcdimager.info
-man/man1/vcdimager.1
-man/man1/vcddebug.1
diff --git a/sysutils/vcdimager-devel/distinfo b/sysutils/vcdimager-devel/distinfo
deleted file mode 100644
index 3d39db35edc..00000000000
--- a/sysutils/vcdimager-devel/distinfo
+++ /dev/null
@@ -1,4 +0,0 @@
-$NetBSD: distinfo,v 1.1.1.1 2002/11/25 12:29:22 wiz Exp $
-
-SHA1 (vcdimager-0.7.12.tar.gz) = bea4b5f8fd5ad9165219e5fdcf40890b1698d9db
-Size (vcdimager-0.7.12.tar.gz) = 520829 bytes
diff --git a/sysutils/vcdimager/DESCR b/sysutils/vcdimager/DESCR
deleted file mode 100644
index 8f7d49c3af1..00000000000
--- a/sysutils/vcdimager/DESCR
+++ /dev/null
@@ -1,16 +0,0 @@
-GNU VCDImager is a full-featured mastering suite for authoring,
-disassembling and analyzing Video CDs and Super Video CDs.
-
-The following features are available so far (some features are
-only available in the latest alpha snapshots):
- Free software available under the GNU Public License
- Support for Video CD 1.1 and 2.0 disc formats
- Support for the Super Video CD 1.0 disc format
- Full PBC (playback control) support (play lists,
- selection lists and end lists)
- Support for segment play items
- Automatic padding of MPEG streams on the fly
- Support for 99-minute (out-of-specification) CD-R media
- Extraction of Video CDs into files (incl. the PBC information)
- Runs on all major UNIX flavors and on Win32
- Use of XML for the description of Video CDs
diff --git a/sysutils/vcdimager/Makefile b/sysutils/vcdimager/Makefile
deleted file mode 100644
index 8ac36548709..00000000000
--- a/sysutils/vcdimager/Makefile
+++ /dev/null
@@ -1,20 +0,0 @@
-# $NetBSD: Makefile,v 1.7 2003/07/13 13:53:24 wiz Exp $
-#
-
-DISTNAME= vcdimager-0.6.2
-PKGREVISION= 1
-CATEGORIES= sysutils
-MASTER_SITES= ${MASTER_SITE_GNU:=vcdimager/}
-
-MAINTAINER= collver1@attbi.com
-HOMEPAGE= http://www.gnu.org/software/vcdimager/
-COMMENT= mastering suite for Video CDs
-
-USE_BUILDLINK2= YES
-USE_GMAKE= YES
-GNU_CONFIGURE= YES
-
-.include "../../devel/gettext-lib/buildlink2.mk"
-
-.include "../../mk/texinfo.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/vcdimager/PLIST b/sysutils/vcdimager/PLIST
deleted file mode 100644
index fbb3f8af448..00000000000
--- a/sysutils/vcdimager/PLIST
+++ /dev/null
@@ -1,8 +0,0 @@
-@comment $NetBSD: PLIST,v 1.4 2002/11/25 12:30:41 wiz Exp $
-bin/vcdimager
-bin/vcdrip
-@unexec ${INSTALL_INFO} --delete --info-dir=%D/info %D/info/vcdimager.info
-info/vcdimager.info
-@exec ${INSTALL_INFO} --info-dir=%D/info %D/info/vcdimager.info
-man/man1/vcdimager.1
-man/man1/vcdrip.1
diff --git a/sysutils/vcdimager/distinfo b/sysutils/vcdimager/distinfo
deleted file mode 100644
index 25a68db98bd..00000000000
--- a/sysutils/vcdimager/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.3 2002/11/25 12:30:41 wiz Exp $
-
-SHA1 (vcdimager-0.6.2.tar.gz) = fae814f99415c30975a61fffd7188b481be77b6c
-Size (vcdimager-0.6.2.tar.gz) = 347973 bytes
-SHA1 (patch-aa) = fd5817744b8c2417947e440383c9231878051dc5
diff --git a/sysutils/vcdimager/patches/patch-aa b/sysutils/vcdimager/patches/patch-aa
deleted file mode 100644
index a77826fa01d..00000000000
--- a/sysutils/vcdimager/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.3 2002/11/25 12:30:42 wiz Exp $
-
---- libvcd/vcd_types.h.orig Mon May 14 18:00:59 2001
-+++ libvcd/vcd_types.h
-@@ -45,7 +45,7 @@
- #endif /* HAVE_STDINT_H */
-
- /* fix for bsdi... hope it works */
--#ifdef __bsdi__
-+#if defined(__bsdi__) || defined(__NetBSD__)
- # define UINT32_C(c) c ## U
- # define UINT64_C(c) c ## ULL
- #endif
diff --git a/sysutils/vidc-tools/DESCR b/sysutils/vidc-tools/DESCR
deleted file mode 100644
index c3d0f016db8..00000000000
--- a/sysutils/vidc-tools/DESCR
+++ /dev/null
@@ -1,6 +0,0 @@
-Tools for the VIDC console used by NetBSD/arm32 on RiscPC
-
- - blanktime Screen blank control for arm32 virtual consoles
- - mkbeep Generates a waveform for the beep device
- - setdisplay Set display resolution and depth for arm32 virtual consoles
- - setkbd Set and report the keyboard autorepeat rate
diff --git a/sysutils/vidc-tools/Makefile b/sysutils/vidc-tools/Makefile
deleted file mode 100644
index 49e66bba9c7..00000000000
--- a/sysutils/vidc-tools/Makefile
+++ /dev/null
@@ -1,15 +0,0 @@
-# $NetBSD: Makefile,v 1.5 2003/06/11 20:50:59 abs Exp $
-#
-
-DISTNAME= misc-src-riscpc
-PKGNAME= vidc-tools-1.0
-WRKSRC= ${WRKDIR}/misc-src
-CATEGORIES= sysutils
-MASTER_SITES= ftp://ftp.netbsd.org/pub/NetBSD/arch/arm32/misc/
-
-MAINTAINER= abs@netbsd.org
-COMMENT= Tools for the VIDC console used by NetBSD/arm32 on RiscPC
-
-ONLY_FOR_PLATFORM= NetBSD-*-arm NetBSD-*-arm32
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/vidc-tools/PLIST b/sysutils/vidc-tools/PLIST
deleted file mode 100644
index 37fbb9dd3f4..00000000000
--- a/sysutils/vidc-tools/PLIST
+++ /dev/null
@@ -1,11 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 22:54:11 zuntum Exp $
-bin/blanktime
-bin/mkbeep
-bin/setdisplay
-bin/setkbd
-man/cat1/blanktime.0
-man/cat1/mkbeep.0
-man/cat1/setdisplay.0
-man/man1/blanktime.1
-man/man1/mkbeep.1
-man/man1/setdisplay.1
diff --git a/sysutils/vidc-tools/distinfo b/sysutils/vidc-tools/distinfo
deleted file mode 100644
index ea39140206b..00000000000
--- a/sysutils/vidc-tools/distinfo
+++ /dev/null
@@ -1,8 +0,0 @@
-$NetBSD: distinfo,v 1.2 2001/04/19 11:29:11 agc Exp $
-
-SHA1 (misc-src-riscpc.tar.gz) = d41dfe0b59eda0ed2e3c61ae2248ef7420aa4144
-Size (misc-src-riscpc.tar.gz) = 11512 bytes
-SHA1 (patch-aa) = a38934e338f4bb7deea58e040b604150b6a09329
-SHA1 (patch-ab) = 45182e2edef9a132e1ac77e0f26bce7d49dab8cd
-SHA1 (patch-ac) = 7c67981bf02a35bee18dfbd6affe2f3b5b2943a5
-SHA1 (patch-ad) = 978eceabff77eb20d2b61c6836b023992296504f
diff --git a/sysutils/vidc-tools/patches/patch-aa b/sysutils/vidc-tools/patches/patch-aa
deleted file mode 100644
index ef12821edd8..00000000000
--- a/sysutils/vidc-tools/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2000/10/19 12:07:49 abs Exp $
-
---- blanktime/Makefile.orig Tue Oct 17 18:44:27 2000
-+++ blanktime/Makefile
-@@ -1,6 +1,6 @@
- PROG=blanktime
- SRCS=blanktime.c
--BINDIR=/usr/local/bin
--MANDIR=/usr/local/man
-+BINDIR=${PREFIX}/bin
-+MANDIR=${PREFIX}/man
-
- .include <bsd.prog.mk>
diff --git a/sysutils/vidc-tools/patches/patch-ab b/sysutils/vidc-tools/patches/patch-ab
deleted file mode 100644
index 05bfd477931..00000000000
--- a/sysutils/vidc-tools/patches/patch-ab
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 2000/10/19 12:07:49 abs Exp $
-
---- mkbeep/Makefile.orig Tue Oct 17 18:44:43 2000
-+++ mkbeep/Makefile
-@@ -3,7 +3,7 @@
- LDADD+= -lm
- DPADD+= ${LIBM}
- CFLAGS+= -I.
--BINDIR=/usr/local/bin
--MANDIR=/usr/local/man/cat
-+BINDIR=${PREFIX}/bin
-+MANDIR=${PREFIX}/man
-
- .include <bsd.prog.mk>
diff --git a/sysutils/vidc-tools/patches/patch-ac b/sysutils/vidc-tools/patches/patch-ac
deleted file mode 100644
index 39531375ba4..00000000000
--- a/sysutils/vidc-tools/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.1.1.1 2000/10/19 12:07:49 abs Exp $
-
---- setdisplay/Makefile.orig Tue Oct 17 18:44:47 2000
-+++ setdisplay/Makefile
-@@ -1,6 +1,6 @@
- PROG=setdisplay
- SRCS=setdisplay.c
--BINDIR=/usr/local/bin
--MANDIR=/usr/local/man
-+BINDIR=${PREFIX}/bin
-+MANDIR=${PREFIX}/man
-
- .include <bsd.prog.mk>
diff --git a/sysutils/vidc-tools/patches/patch-ad b/sysutils/vidc-tools/patches/patch-ad
deleted file mode 100644
index 7ba19fb5e2a..00000000000
--- a/sysutils/vidc-tools/patches/patch-ad
+++ /dev/null
@@ -1,11 +0,0 @@
-$NetBSD: patch-ad,v 1.1.1.1 2000/10/19 12:07:49 abs Exp $
-
---- setkbd/Makefile.orig Tue Oct 17 18:44:51 2000
-+++ setkbd/Makefile
-@@ -1,5 +1,5 @@
- PROG= setkbd
- SRCS= setkbd.c
--BINDIR= /usr/local/bin
-+BINDIR=${PREFIX}/bin
- NOMAN=
- .include <bsd.prog.mk>
diff --git a/sysutils/vifm/DESCR b/sysutils/vifm/DESCR
deleted file mode 100644
index 94fabadb85c..00000000000
--- a/sysutils/vifm/DESCR
+++ /dev/null
@@ -1,11 +0,0 @@
-Vifm is a ncurses based file manager with vi like keybindings. If you
-use vi, vifm gives you complete keyboard control over your files without
-having to learn a new set of commands.
-
-Features:
-* Two file list windows.
-* Bookmarks.
-* User-defined association of file types/extensions with multiple
- applications per extension.
-* Visual mode for selecting files.
-* User-defined commands.
diff --git a/sysutils/vifm/Makefile b/sysutils/vifm/Makefile
deleted file mode 100644
index fe7a9161e4e..00000000000
--- a/sysutils/vifm/Makefile
+++ /dev/null
@@ -1,28 +0,0 @@
-# $NetBSD: Makefile,v 1.4 2003/07/13 13:53:24 wiz Exp $
-#
-
-DISTNAME= vifm-0.1
-PKGREVISION= 2
-CATEGORIES= sysutils
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=vifm/}
-
-MAINTAINER= swalter@lettermax.de
-HOMEPAGE= http://vifm.sourceforge.net/
-COMMENT= Ncurses based file manager with vi like keybindings
-
-GNU_CONFIGURE= yes
-USE_BUILDLINK2= yes
-USE_GMAKE= yes
-USE_NCURSES= # redrawwin()
-
-pre-configure:
- @${SED} -e "s/cfg.use_screen = 0/cfg.use_screen = 1/" \
- ${WRKSRC}/src/config.c > ${WRKSRC}/src/config.c.new && \
- ${MV} ${WRKSRC}/src/config.c.new ${WRKSRC}/src/config.c
- @${SED} -e "s/USE_SCREEN=0/USE_SCREEN=1/" \
- ${WRKSRC}/src/vifmrc0.1 > ${WRKSRC}/src/vifmrc0.1.new && \
- ${MV} ${WRKSRC}/src/vifmrc0.1.new ${WRKSRC}/src/vifmrc0.1
-
-.include "../../devel/ncurses/buildlink2.mk"
-.include "../../mk/pthread.buildlink2.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/vifm/PLIST b/sysutils/vifm/PLIST
deleted file mode 100644
index 21ce846c2fc..00000000000
--- a/sysutils/vifm/PLIST
+++ /dev/null
@@ -1,8 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2002/12/11 21:09:25 jmmv Exp $
-bin/pauseme
-bin/vifm
-share/vifm/vifm-0.1.help.txt
-share/vifm/vifm.txt
-share/vifm/vifm.vim
-share/vifm/vifmrc0.1
-@dirrm share/vifm
diff --git a/sysutils/vifm/distinfo b/sysutils/vifm/distinfo
deleted file mode 100644
index b86b236fcc7..00000000000
--- a/sysutils/vifm/distinfo
+++ /dev/null
@@ -1,4 +0,0 @@
-$NetBSD: distinfo,v 1.1.1.1 2002/12/11 21:09:25 jmmv Exp $
-
-SHA1 (vifm-0.1.tar.gz) = 911e54a3cb78ea456dfe038ed997a349fcea6a5e
-Size (vifm-0.1.tar.gz) = 80719 bytes
diff --git a/sysutils/whowatch/DESCR b/sysutils/whowatch/DESCR
deleted file mode 100644
index 461681d9fa4..00000000000
--- a/sysutils/whowatch/DESCR
+++ /dev/null
@@ -1,7 +0,0 @@
- Whowatch is an interactive who-like program that displays
-information about the users currently logged on to the machine, in
-real time. Besides standard informations (login name, tty, host,
-user's process), the type of the connection (ie. telnet or ssh) is
-shown. You can toggle display between users' command or idle time.
-You can watch processes tree, navigate in it and send INT and KILL
-signals.
diff --git a/sysutils/whowatch/Makefile b/sysutils/whowatch/Makefile
deleted file mode 100644
index dd11e40d463..00000000000
--- a/sysutils/whowatch/Makefile
+++ /dev/null
@@ -1,18 +0,0 @@
-# $NetBSD: Makefile,v 1.6 2003/07/13 13:53:24 wiz Exp $
-#
-
-DISTNAME= whowatch-1.4
-PKGREVISION= 1
-CATEGORIES= sysutils
-MASTER_SITES= http://wizard.ae.krakow.pl/~mike/download/ \
- http://janek.ae.krakow.pl/~suszyckm/download/
-
-MAINTAINER= rh@netbsd.org
-HOMEPAGE= http://wizard.ae.krakow.pl/~mike/\#whowatch
-COMMENT= interactive who-like program displaying real-time user information
-
-GNU_CONFIGURE= YES
-USE_BUILDLINK2= YES
-
-.include "../../devel/ncurses/buildlink2.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/whowatch/PLIST b/sysutils/whowatch/PLIST
deleted file mode 100644
index 822ee06efd0..00000000000
--- a/sysutils/whowatch/PLIST
+++ /dev/null
@@ -1,3 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 22:54:12 zuntum Exp $
-bin/whowatch
-man/man1/whowatch.1
diff --git a/sysutils/whowatch/distinfo b/sysutils/whowatch/distinfo
deleted file mode 100644
index 5dabb21bd95..00000000000
--- a/sysutils/whowatch/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.2 2001/04/19 11:29:11 agc Exp $
-
-SHA1 (whowatch-1.4.tar.gz) = 0d60c8ddb56b9bf9d2f3e1452832ccb2c862ff0c
-Size (whowatch-1.4.tar.gz) = 43084 bytes
-SHA1 (patch-ab) = f66829eaf7d148df10c2ca064ed81bdedf5c9adc
-SHA1 (patch-ac) = 9482d1b1759858a83b1efeaa5fc9dd9ec49043c7
diff --git a/sysutils/whowatch/patches/patch-ab b/sysutils/whowatch/patches/patch-ab
deleted file mode 100644
index 4320573e4a1..00000000000
--- a/sysutils/whowatch/patches/patch-ab
+++ /dev/null
@@ -1,48 +0,0 @@
-$NetBSD: patch-ab,v 1.3 2000/10/16 01:34:39 wiz Exp $
-
---- screen.c.orig Tue Jun 6 20:53:24 2000
-+++ screen.c
-@@ -6,6 +6,7 @@
- struct window info_win;
- static chtype *curs_buf;
- extern int screen_cols;
-+int old_cur_vis = 1; /* this is the cursor mode, set to normal as default */
-
- char *help_line[] =
- {
-@@ -38,7 +39,7 @@
- }
-
- wattrset(users_list.wd, A_BOLD);
-- printf("\033[?25l"); /* disable cursor */
-+ old_cur_vis = curs_set(0); /* disable cursor */
-
- start_color();
- init_pair(1,COLOR_CYAN,COLOR_BLACK);
-@@ -58,6 +59,7 @@
-
- cbreak();
- nodelay(stdscr,TRUE);
-+ keypad(info_win.wd, TRUE);
- scrollok(users_list.wd,TRUE);
- noecho();
- }
-@@ -67,7 +69,7 @@
- werase(help_win.wd);
- wrefresh(help_win.wd);
- endwin();
-- printf("\033[?25h"); /* enable cursor */
-+ curs_set(old_cur_vis); /* enable cursor */
- }
-
- void cursor_on(struct window *w, int line)
-@@ -116,7 +118,8 @@
- if (i > w->cols) break;
- if (*p < 17){
- i--;
-- waddnstr(w->wd, q, p - q);
-+ if (p - q != 0)
-+ waddnstr(w->wd, q, p - q);
- wattrset(w->wd, COLOR_PAIR(*p));
- q = p + 1;
- }
diff --git a/sysutils/whowatch/patches/patch-ac b/sysutils/whowatch/patches/patch-ac
deleted file mode 100644
index 9494e145727..00000000000
--- a/sysutils/whowatch/patches/patch-ac
+++ /dev/null
@@ -1,84 +0,0 @@
-$NetBSD: patch-ac,v 1.2 2000/10/16 01:34:39 wiz Exp $
-
---- whowatch.c.orig Tue Jun 6 12:21:44 2000
-+++ whowatch.c
-@@ -20,8 +20,7 @@
- #define ut_user ut_name
- #endif
-
--enum key { ENTER=0x100, UP, DOWN, LEFT, RIGHT, DELETE, ESC, CTRL_K, CTRL_I,
-- PG_DOWN, PG_UP, HOME, END };
-+enum key { ENTER=KEY_MAX + 1, ESC, CTRL_K, CTRL_I};
-
- enum State{ USERS_LIST, PROC_TREE, INIT_TREE } state;
-
-@@ -334,30 +333,12 @@
- int read_key()
- {
- int c;
-- c = getc(stdin);
-+ c = wgetch(info_win.wd);
- switch (c){
- case 0xD:
- case 0xA: return ENTER;
- case 0xB: return CTRL_K;
- case 0x9: return CTRL_I;
-- case 0x1B:
-- getc(stdin);
-- c = getc(stdin);
-- switch(c) {
-- case 0x41: return UP;
-- case 0x42: return DOWN;
-- case 0x34:
-- case 0x38:
-- case 0x46: return END;
-- case 0x36:
-- case 0x47: return PG_DOWN;
-- case 0x31:
-- case 0x37:
-- case 0x48: return HOME;
-- case 0x35:
-- case 0x49: return PG_UP;
-- }
-- break;
- default:
- break;
- }
-@@ -420,6 +401,7 @@
- signal_sent = 0;
- }
- switch(key){
-+ case KEY_ENTER:
- case ENTER:
- werase(windows[state]->wd);
- switch(state){
-@@ -462,23 +444,23 @@
- send_signal(9, pid);
- tree_periodic();
- break;
-- case PG_DOWN:
-+ case KEY_NPAGE:
- page_down(windows[state], rfrsh[state]);
- break;
-- case PG_UP:
-+ case KEY_PPAGE:
- page_up(windows[state], rfrsh[state]);
- break;
-- case HOME:
-+ case KEY_HOME:
- key_home(windows[state], rfrsh[state]);
- break;
-- case END:
-+ case KEY_END:
- key_end(windows[state], rfrsh[state]);
- break;
-- case UP:
-+ case KEY_UP:
- cursor_up(windows[state]);
- wrefresh(windows[state]->wd);
- break;
-- case DOWN:
-+ case KEY_DOWN:
- cursor_down(windows[state]);
- wrefresh(windows[state]->wd);
- break;
diff --git a/sysutils/wmcpuload/DESCR b/sysutils/wmcpuload/DESCR
deleted file mode 100644
index b6f240efb39..00000000000
--- a/sysutils/wmcpuload/DESCR
+++ /dev/null
@@ -1 +0,0 @@
-A windowmaker dock app to monitor CPU usage.
diff --git a/sysutils/wmcpuload/Makefile b/sysutils/wmcpuload/Makefile
deleted file mode 100644
index 0e74abaeb6d..00000000000
--- a/sysutils/wmcpuload/Makefile
+++ /dev/null
@@ -1,18 +0,0 @@
-# $NetBSD: Makefile,v 1.3 2003/03/09 09:55:45 jmmv Exp $
-#
-
-DISTNAME= wmcpuload-1.0.1
-CATEGORIES= sysutils
-MASTER_SITES= http://www.sh.rim.or.jp/~ssato/src/
-EXTRACT_SUFX= .tar.bz2
-
-MAINTAINER= coto@core.de
-HOMEPAGE= http://www.sh.rim.or.jp/~ssato/dockapp/\#wmcpuload
-COMMENT= dockable CPU monitor
-
-GNU_CONFIGURE= YES
-USE_BUILDLINK2= YES
-USE_X11= YES
-
-.include "../../graphics/xpm/buildlink2.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/wmcpuload/PLIST b/sysutils/wmcpuload/PLIST
deleted file mode 100644
index e5633f74218..00000000000
--- a/sysutils/wmcpuload/PLIST
+++ /dev/null
@@ -1,3 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2002/03/24 18:04:57 wiz Exp $
-bin/wmcpuload
-man/man1/wmcpuload.1
diff --git a/sysutils/wmcpuload/distinfo b/sysutils/wmcpuload/distinfo
deleted file mode 100644
index 9b3107b5aa9..00000000000
--- a/sysutils/wmcpuload/distinfo
+++ /dev/null
@@ -1,4 +0,0 @@
-$NetBSD: distinfo,v 1.2 2003/03/09 09:55:45 jmmv Exp $
-
-SHA1 (wmcpuload-1.0.1.tar.bz2) = 6e767dd5acd291cfe3fc4fece5ff32eef78915e4
-Size (wmcpuload-1.0.1.tar.bz2) = 92457 bytes
diff --git a/sysutils/wmmemmon/DESCR b/sysutils/wmmemmon/DESCR
deleted file mode 100644
index 241e19b4aba..00000000000
--- a/sysutils/wmmemmon/DESCR
+++ /dev/null
@@ -1,3 +0,0 @@
-WMMemMon is a dockapp to monitor memory and swap usages. It is supported
-by X window managers such as Window Maker, AfterStep, BlackBox and
-Enlightenment.
diff --git a/sysutils/wmmemmon/Makefile b/sysutils/wmmemmon/Makefile
deleted file mode 100644
index c3e1d4b5c71..00000000000
--- a/sysutils/wmmemmon/Makefile
+++ /dev/null
@@ -1,18 +0,0 @@
-# $NetBSD: Makefile,v 1.1.1.1 2003/03/09 10:53:50 jmmv Exp $
-#
-
-DISTNAME= wmmemmon-1.0.0
-CATEGORIES= sysutils
-MASTER_SITES= http://www.sh.rim.or.jp/~ssato/src/
-EXTRACT_SUFX= .tar.bz2
-
-MAINTAINER= coto@core.de
-HOMEPAGE= http://www.sh.rim.or.jp/~ssato/dockapp/\#wmmemmon
-COMMENT= Dockapp to monitor memory and swap usages
-
-GNU_CONFIGURE= YES
-USE_BUILDLINK2= YES
-USE_X11= YES
-
-.include "../../graphics/xpm/buildlink2.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/wmmemmon/PLIST b/sysutils/wmmemmon/PLIST
deleted file mode 100644
index 03984db4147..00000000000
--- a/sysutils/wmmemmon/PLIST
+++ /dev/null
@@ -1,3 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2003/03/09 10:53:50 jmmv Exp $
-bin/wmmemmon
-man/man1/wmmemmon.1
diff --git a/sysutils/wmmemmon/distinfo b/sysutils/wmmemmon/distinfo
deleted file mode 100644
index b1bf15f7d7f..00000000000
--- a/sysutils/wmmemmon/distinfo
+++ /dev/null
@@ -1,4 +0,0 @@
-$NetBSD: distinfo,v 1.1.1.1 2003/03/09 10:53:50 jmmv Exp $
-
-SHA1 (wmmemmon-1.0.0.tar.bz2) = 42cb91b107e4e8dcb84b3223734c299d5b24de43
-Size (wmmemmon-1.0.0.tar.bz2) = 114611 bytes
diff --git a/sysutils/wtail/DESCR b/sysutils/wtail/DESCR
deleted file mode 100644
index 94d2ee1f180..00000000000
--- a/sysutils/wtail/DESCR
+++ /dev/null
@@ -1,2 +0,0 @@
-wtail does the equivalent of tail -f on several files at once. The screen
-is split into as many parts as there are files to watch.
diff --git a/sysutils/wtail/Makefile b/sysutils/wtail/Makefile
deleted file mode 100644
index e13820d54a5..00000000000
--- a/sysutils/wtail/Makefile
+++ /dev/null
@@ -1,18 +0,0 @@
-# $NetBSD: Makefile,v 1.2 2003/07/13 13:53:24 wiz Exp $
-#
-
-DISTNAME= wtail-0.2.2
-PKGREVISION= 1
-CATEGORIES= sysutils
-MASTER_SITES= http://www.teaser.fr/~amajorel/wtail/
-
-MAINTAINER= jrp@hispabsd.org
-HOMEPAGE= http://www.teaser.fr/~amajorel/wtail/
-COMMENT= Watch multiple files at once
-
-USE_BUILDLINK2= YES
-
-MAKE_ENV+= SED="${SED}"
-
-.include "../../devel/ncurses/buildlink2.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/wtail/PLIST b/sysutils/wtail/PLIST
deleted file mode 100644
index 89661150be3..00000000000
--- a/sysutils/wtail/PLIST
+++ /dev/null
@@ -1,9 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2003/02/16 00:25:30 salo Exp $
-bin/wtail
-man/man1/wtail.1
-share/doc/wtail/CHANGES
-share/doc/wtail/COPYING
-share/doc/wtail/FAQ
-share/doc/wtail/README
-share/doc/wtail/VERSION
-@dirrm share/doc/wtail
diff --git a/sysutils/wtail/distinfo b/sysutils/wtail/distinfo
deleted file mode 100644
index 641222ddcdb..00000000000
--- a/sysutils/wtail/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.1.1.1 2003/02/16 00:25:30 salo Exp $
-
-SHA1 (wtail-0.2.2.tar.gz) = 609f4ebe064c155829e96f865bee93e727b692e8
-Size (wtail-0.2.2.tar.gz) = 13633 bytes
-SHA1 (patch-aa) = 1605c1836fddce4c3fef589e3cf5a11d6bab33d6
diff --git a/sysutils/wtail/patches/patch-aa b/sysutils/wtail/patches/patch-aa
deleted file mode 100644
index 81252469b9e..00000000000
--- a/sysutils/wtail/patches/patch-aa
+++ /dev/null
@@ -1,41 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2003/02/16 00:25:30 salo Exp $
-
---- Makefile.orig Tue Jan 14 00:12:57 2003
-+++ Makefile Sun Feb 16 01:09:18 2003
-@@ -5,7 +5,7 @@
-
-
- # Variables that you may want to modify
--PREFIX = /usr/local
-+#PREFIX = /usr/local
- TMPDIR = ~/tmp
-
- # Variables that you probably don't want to modify
-@@ -22,12 +22,12 @@
- rm -f $(OBJ) wtail
-
- install:
-- mkdir -p '$(PREFIX)'/bin
-- cp wtail '$(PREFIX)'/bin
-- touch -r wtail '$(PREFIX)'/bin/wtail
-- mkdir -p "$(MAN)"/man1
-- sed 's/@{VERSION}/'$(VERSION)'/g' wtail.1 >"$(MAN)"/man1/wtail.1
-- touch -r wtail.1 "$(MAN)"/man1/wtail.1
-+ ${BSD_INSTALL_PROGRAM} wtail $(PREFIX)/bin/
-+ ${SED} 's/@{VERSION}/'$(VERSION)'/g' wtail.1 > wtail.1.fixed
-+ ${BSD_INSTALL_MAN} wtail.1.fixed $(PREFIX)/man/man1/wtail.1
-+ ${BSD_INSTALL_DATA_DIR} $(PREFIX)/share/doc/wtail
-+ ${BSD_INSTALL_DATA} README CHANGES COPYING FAQ VERSION \
-+ $(PREFIX)/share/doc/wtail/
-
- test: chatter
- ./chatter /tmp/wtail.a /tmp/wtail.b /tmp/wtail.c \
-@@ -51,7 +51,7 @@
- arc=$(ARC); cd $(TMPDIR) && tar -cf - $$arc | gzip >$$arc.tar.gz
-
- wtail: $(OBJ)
-- $(CC) $(LDFLAGS) -o $@ $(OBJ) -lcurses
-+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(OBJ) -lcurses
-
- version.c: VERSION
- cat VERSION | sed 's/.*/const char version[] = "&";/' >$@
diff --git a/sysutils/xbatt/DESCR b/sysutils/xbatt/DESCR
deleted file mode 100644
index e0233dd7bd3..00000000000
--- a/sysutils/xbatt/DESCR
+++ /dev/null
@@ -1,4 +0,0 @@
-xbatt is an X11 client which displays the battery status of your
-notebook computer equiped with APM (Advanced Power Management)
-BIOS. The status displayed consists of the remaining battery life,
-the AC line status, and the charging status.
diff --git a/sysutils/xbatt/Makefile b/sysutils/xbatt/Makefile
deleted file mode 100644
index 19cefa20d7f..00000000000
--- a/sysutils/xbatt/Makefile
+++ /dev/null
@@ -1,30 +0,0 @@
-# $NetBSD: Makefile,v 1.12 2003/01/11 15:21:48 cjep Exp $
-#
-
-DISTNAME= xbatt-1.3pr1
-PKGNAME= xbatt-1.3.1
-PKGREVISION= 1
-WRKSRC= ${WRKDIR}/xbatt-1.3
-CATEGORIES= sysutils x11
-MASTER_SITES= http://www2.clave.gr.jp/~eto/xbatt/
-
-MAINTAINER= hubertf@netbsd.org
-HOMEPAGE= http://www2.clave.gr.jp/~eto/xbatt/ # Not really
-COMMENT= Displays battery status of your notebook via APM
-
-.if !exists(/usr/include/machine/apmvar.h)
-PKG_SKIP_REASON= "APM is not available for ${MACHINE_PLATFORM}"
-.endif
-
-USE_BUILDLINK2= YES
-USE_IMAKE= YES
-ALL_TARGET= xbatt
-
-post-install:
- ${INSTALL_DATA} ${FILESDIR}/XBatt ${X11PREFIX}/lib/X11/app-defaults/XBatt
- ${INSTALL_MAN_DIR} ${PREFIX}/share/doc/xbatt
- ${INSTALL_MAN} ${WRKSRC}/README ${PREFIX}/share/doc/xbatt
- ${INSTALL_MAN} ${WRKSRC}/README.jp ${PREFIX}/share/doc/xbatt
-
-.include "../../graphics/xpm/buildlink2.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/xbatt/PLIST b/sysutils/xbatt/PLIST
deleted file mode 100644
index 20269e7091d..00000000000
--- a/sysutils/xbatt/PLIST
+++ /dev/null
@@ -1,5 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 22:54:14 zuntum Exp $
-bin/xbatt
-lib/X11/app-defaults/XBatt
-share/doc/xbatt/README
-share/doc/xbatt/README.jp
diff --git a/sysutils/xbatt/distinfo b/sysutils/xbatt/distinfo
deleted file mode 100644
index 2912046f770..00000000000
--- a/sysutils/xbatt/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.3 2001/11/26 20:02:35 wiz Exp $
-
-SHA1 (xbatt-1.3pr1.tar.gz) = dc6a8624c134d9e4262ea87640d3eda028973bcf
-Size (xbatt-1.3pr1.tar.gz) = 14412 bytes
-SHA1 (patch-aa) = b822b75668a3494a72b496d820b67720b732add4
-SHA1 (patch-ab) = 3f643fa06ce7e0bb2eeb9c3339a1640b94f13001
diff --git a/sysutils/xbatt/files/XBatt b/sysutils/xbatt/files/XBatt
deleted file mode 100644
index cdbb2d41368..00000000000
--- a/sysutils/xbatt/files/XBatt
+++ /dev/null
@@ -1,4 +0,0 @@
-# $NetBSD: XBatt,v 1.1.1.1 1999/10/31 21:16:08 hubertf Exp $
-#
-*width: 50
-*height: 50
diff --git a/sysutils/xbatt/patches/patch-aa b/sysutils/xbatt/patches/patch-aa
deleted file mode 100644
index ddce92ae950..00000000000
--- a/sysutils/xbatt/patches/patch-aa
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2000/12/15 09:43:54 abs Exp $
-
---- Imakefile.orig Fri Sep 11 13:50:44 1998
-+++ Imakefile
-@@ -9,8 +9,11 @@
- #ifdef FreeBSDArchitecture
- INSTALLFLAGS=-c -g operator -m 2755
- #endif
-+#ifdef NetBSDArchitecture
-+INSTALLFLAGS=-c -m 755
-+#endif
- #ifdef LinuxArchitecture
- INSTALLFLAGS=-c -m 2755
- #endif
-
--ComplexProgramTarget(xbatt)
-+ComplexProgramTargetNoMan(xbatt)
diff --git a/sysutils/xbatt/patches/patch-ab b/sysutils/xbatt/patches/patch-ab
deleted file mode 100644
index e20831e5729..00000000000
--- a/sysutils/xbatt/patches/patch-ab
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-ab,v 1.2 2001/11/26 20:02:36 wiz Exp $
-
---- xbatt.c.orig Fri Sep 18 14:03:05 1998
-+++ xbatt.c
-@@ -219,6 +219,7 @@
- String fallback_resouces[] = {
- "*width: 39",
- "*height: 39",
-+ NULL
- };
-
- main(
-@@ -494,6 +495,7 @@
-
- #ifdef __NetBSD__
- struct apm_power_info info;
-+ memset(&info, 0, sizeof(info));
- if( ioctl(apmfd, APM_IOC_GETPOWER, &info) == -1 ) {
- fprintf(stderr, "xbatt: ioctl APM_IOC_GETPOWER failed\n");
- exit(1);
diff --git a/sysutils/xbattbar/DESCR b/sysutils/xbattbar/DESCR
deleted file mode 100644
index 7edf15fca19..00000000000
--- a/sysutils/xbattbar/DESCR
+++ /dev/null
@@ -1,9 +0,0 @@
-Xbattbar shows the current (laptop) battery status in the X window
-environment. Battery status is obtained through the APM kernel module.
-The battery indicator of this program is very simple: a simple bar in
-the top/bottom of your display. With its color, it indicates the
-AC-line status (plugged in or off-line), and battery charging/remaining
-level. Also, in the case the mouse cursor enters to the indicator window,
-the popup diagnosis window comes up in the center of your display, and
-then, it shows the current AC line status and battery level in the popup
-window. This program is very small but fancy.
diff --git a/sysutils/xbattbar/Makefile b/sysutils/xbattbar/Makefile
deleted file mode 100644
index 29fffe4d366..00000000000
--- a/sysutils/xbattbar/Makefile
+++ /dev/null
@@ -1,23 +0,0 @@
-# $NetBSD: Makefile,v 1.17 2003/06/18 22:41:38 seb Exp $
-
-DISTNAME= xbattbar_1.4.2
-PKGNAME= ${DISTNAME:S/_/-/}
-PKGREVISION= 2
-WRKSRC= ${WRKDIR}/${DISTNAME:S/_/-/}
-CATEGORIES= sysutils x11
-MASTER_SITES= http://iplab.aist-nara.ac.jp/member/suguru/
-
-MAINTAINER= tech-pkg@netbsd.org
-HOMEPAGE= http://iplab.aist-nara.ac.jp/member/suguru/xbattbar.html
-COMMENT= X11 battery graph for laptops
-
-USE_BUILDLINK2= # defined
-
-USE_X11BASE= # defined
-USE_IMAKE= # defined
-
-.if !exists(/usr/include/machine/apmvar.h)
-PKG_SKIP_REASON= "APM is not available for ${MACHINE_PLATFORM}"
-.endif
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/xbattbar/PLIST b/sysutils/xbattbar/PLIST
deleted file mode 100644
index 85bd4f51da9..00000000000
--- a/sysutils/xbattbar/PLIST
+++ /dev/null
@@ -1,3 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2003/03/03 02:59:29 jschauma Exp $
-bin/xbattbar
-${IMAKE_MAN_DIR}/xbattbar.${IMAKE_MANNEWSUFFIX}
diff --git a/sysutils/xbattbar/distinfo b/sysutils/xbattbar/distinfo
deleted file mode 100644
index 6f5e9b2942b..00000000000
--- a/sysutils/xbattbar/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.4 2001/11/26 20:07:34 wiz Exp $
-
-SHA1 (xbattbar_1.4.2.tar.gz) = 14e9aafd62919e4a625d3f84df3b074b9eef8279
-Size (xbattbar_1.4.2.tar.gz) = 14079 bytes
-SHA1 (patch-aa) = 3bd4b688ccaeebe766335245c1a8c5dde52768c2
-SHA1 (patch-ab) = 1552e04203d2ad229c603f05d6a69766de5353cf
diff --git a/sysutils/xbattbar/patches/patch-aa b/sysutils/xbattbar/patches/patch-aa
deleted file mode 100644
index beb84362321..00000000000
--- a/sysutils/xbattbar/patches/patch-aa
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2001/01/26 01:28:26 jlam Exp $
-
---- Imakefile.orig Sat Dec 5 01:59:29 1998
-+++ Imakefile
-@@ -17,8 +17,8 @@
- XCOMM Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- XCOMM
-
--BINDIR = /usr/local/bin
--MANDIR = /usr/local/man/cat1
-+BINDIR = ${PREFIX}/bin
-+MANDIR = ${PREFIX}/man/cat1
-
- LOCAL_LIBRARIES = $(XLIB)
-
diff --git a/sysutils/xbattbar/patches/patch-ab b/sysutils/xbattbar/patches/patch-ab
deleted file mode 100644
index 2937fb2d890..00000000000
--- a/sysutils/xbattbar/patches/patch-ab
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2001/11/26 20:07:35 wiz Exp $
-
---- xbattbar.c.orig Fri Feb 2 06:25:29 2001
-+++ xbattbar.c
-@@ -594,6 +594,7 @@
- exit(1);
- }
-
-+ memset(&info, 0, sizeof(info));
- if (ioctl(fd, APM_IOC_GETPOWER, &info) != 0) {
- fprintf(stderr, "xbattbar: ioctl APM_IOC_GETPOWER failed\n");
- exit(1);
diff --git a/sysutils/xcdroast/DESCR b/sysutils/xcdroast/DESCR
deleted file mode 100644
index 399306c5fac..00000000000
--- a/sysutils/xcdroast/DESCR
+++ /dev/null
@@ -1,19 +0,0 @@
-This is a snapshot-preview of the new GTK-based X-CD-Roast.
-There are still some features missing, please see this version only
-as a test. But it is already a more than complete replacement of
-the old version 0.96ex.
-
-Some features: (marked with "*" if already implemented and working)
-
-- Portable (*)
-- Multi langual (*)
-- CDDB-support (*)
-- Graphical setup (*)
-- Graphical wav-player (*)
-- Tooltip help (*)
-- Copies Data (*), Audio (*), Mixed-Mode (*), Multisession, CD-Extra
-- Creates Data (*), Audio (*), Mixed-Mode (*), Multisession, CD-Extra
-- Bootable CD support (*)
-- Copy (*)/Master (*) on the fly.
-- Administration mode for usage in computer pools. (*)
-- MP3 encoding/decoding.
diff --git a/sysutils/xcdroast/INSTALL b/sysutils/xcdroast/INSTALL
deleted file mode 100644
index 800ff036a84..00000000000
--- a/sysutils/xcdroast/INSTALL
+++ /dev/null
@@ -1,20 +0,0 @@
-# $NetBSD: INSTALL,v 1.1 2002/09/26 12:29:55 jlam Exp $
-
-case ${STAGE} in
-POST-INSTALL)
- if [ "${PKG_SYSCONFDIR}" != "${PKG_PREFIX}/etc" ]; then
- if [ -f ${PREFIX}/etc/xcdroast.conf ]; then
- ${CAT} << EOF
-===========================================================================
- ========================
- === IMPORTANT NOTICE ===
- ========================
-
- The default location of the xcdroast configuration files has changed.
- Please move them from ${PKG_PREFIX}/etc to /etc.
-===========================================================================
-EOF
- fi
- fi
- ;;
-esac
diff --git a/sysutils/xcdroast/MESSAGE b/sysutils/xcdroast/MESSAGE
deleted file mode 100644
index 96fc6c803e1..00000000000
--- a/sysutils/xcdroast/MESSAGE
+++ /dev/null
@@ -1,6 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE,v 1.2 2002/09/26 12:29:55 jlam Exp $
-
-xcdroast doesn't work as SUID program if linked against GTK+. Other
-options include making cdrecord SUID or using a wrapper like sudo.
-===========================================================================
diff --git a/sysutils/xcdroast/Makefile b/sysutils/xcdroast/Makefile
deleted file mode 100644
index 981cf82b7eb..00000000000
--- a/sysutils/xcdroast/Makefile
+++ /dev/null
@@ -1,55 +0,0 @@
-# $NetBSD: Makefile,v 1.16 2003/06/05 16:15:47 drochner Exp $
-
-DISTNAME= xcdroast-0.98alpha14
-PKGNAME= xcdroast-0.98a14
-CATEGORIES= sysutils
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=xcdroast/}
-
-MAINTAINER= frueauf@netbsd.org
-HOMEPAGE= http://www.xcdroast.org/
-COMMENT= graphical user interface for the command-line cdrecord-tools
-
-DEPENDS+= cdrecord-xcdroast-0.98a13.*:../cdrecord-xcdroast
-
-.include "../../mk/bsd.prefs.mk"
-
-USE_BUILDLINK2= YES
-USE_PKGINSTALL= YES
-USE_PKGLOCALEDIR= YES
-USE_X11= YES
-GNU_CONFIGURE= YES
-CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
-USE_GMAKE= yes
-
-.if ${_OPSYS_HAS_OSSAUDIO} == "yes"
-CFLAGS+= -DHAVE_OSS
-AUDIO_LIBS= -lossaudio
-CONFIGURE_ENV+= AUDIO_LIBS=${AUDIO_LIBS}
-.endif
-
-DOCDIR= ${PREFIX}/share/doc/xcdroast
-DOCFILES= DOCUMENTATION FAQ README.nonroot
-HTMLDIR= ${PREFIX}/share/doc/html/xcdroast
-SUPPORT_FILES= /dev/null ${PKG_SYSCONFDIR}/xcdroast.conf
-
-pre-build:
- cd ${WRKSRC}/src; for file in io.c wavplay.c; do \
- ${SED} -e "s|@DEVOSSAUDIO@|${DEVOSSAUDIO}|g" \
- $${file} > $${file}.fixed; \
- ${MV} -f $${file}.fixed $${file}; \
- done
-
-post-install:
- ${INSTALL_DATA_DIR} ${DOCDIR}
- (cd ${WRKSRC}/doc; \
- for file in ${DOCFILES}; do \
- ${INSTALL_DATA} $${file} ${DOCDIR}; \
- done)
- ${INSTALL_DATA_DIR} ${HTMLDIR}
- ${CP} -r ${WRKSRC}/doc/manual/* ${HTMLDIR}
-
-# gdk-pixbuf implies gtk, glib, gettext-lib
-.include "../../graphics/gdk-pixbuf/buildlink2.mk"
-.include "../../mk/ossaudio.buildlink2.mk"
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/xcdroast/PLIST b/sysutils/xcdroast/PLIST
deleted file mode 100644
index 77fcf7d3488..00000000000
--- a/sysutils/xcdroast/PLIST
+++ /dev/null
@@ -1,92 +0,0 @@
-@comment $NetBSD: PLIST,v 1.4 2003/06/05 16:15:48 drochner Exp $
-bin/xcdroast
-lib/xcdroast-0.98/bin/cddbtool
-lib/xcdroast-0.98/bin/rmtool
-lib/xcdroast-0.98/bin/vrfytool
-lib/xcdroast-0.98/bin/wavplay
-lib/xcdroast-0.98/bin/xcdrwrap
-lib/xcdroast-0.98/icons/burnproof.gif
-lib/xcdroast-0.98/icons/cddblogo.gif
-lib/xcdroast-0.98/icons/dialog_default.png
-lib/xcdroast-0.98/icons/dialog_error.png
-lib/xcdroast-0.98/icons/dialog_information.png
-lib/xcdroast-0.98/icons/dialog_question.png
-lib/xcdroast-0.98/icons/dialog_warning.png
-lib/xcdroast-0.98/icons/xcdricon.gif
-lib/xcdroast-0.98/icons/xcdricon.png
-lib/xcdroast-0.98/icons/xcdrlogo.gif
-lib/xcdroast-0.98/sound/test.wav
-man/man1/xcdroast.1
-share/doc/html/xcdroast/README.txt
-share/doc/html/xcdroast/create.html
-share/doc/html/xcdroast/createaudio.html
-share/doc/html/xcdroast/de.staerk.css
-share/doc/html/xcdroast/duplicate.html
-share/doc/html/xcdroast/dvd.html
-share/doc/html/xcdroast/fdl.html
-share/doc/html/xcdroast/first.html
-share/doc/html/xcdroast/glossary.html
-share/doc/html/xcdroast/img/bootable.gif
-share/doc/html/xcdroast/img/createaudiolayout.gif
-share/doc/html/xcdroast/img/createcd.gif
-share/doc/html/xcdroast/img/duplicatecd.gif
-share/doc/html/xcdroast/img/error-redslash.gif
-share/doc/html/xcdroast/img/errorcalculating.gif
-share/doc/html/xcdroast/img/errordiskspace.gif
-share/doc/html/xcdroast/img/initial.gif
-share/doc/html/xcdroast/img/layouttracks.gif
-share/doc/html/xcdroast/img/links.gif
-share/doc/html/xcdroast/img/mainmenu.gif
-share/doc/html/xcdroast/img/oben.gif
-share/doc/html/xcdroast/img/ordner.gif
-share/doc/html/xcdroast/img/punkt.gif
-share/doc/html/xcdroast/img/readtracks.gif
-share/doc/html/xcdroast/img/rechts.gif
-share/doc/html/xcdroast/img/setup.gif
-share/doc/html/xcdroast/img/tooltip.gif
-share/doc/html/xcdroast/img/unten.gif
-share/doc/html/xcdroast/img/warningnodvdkey.gif
-share/doc/html/xcdroast/img/warningnot9660.gif
-share/doc/html/xcdroast/img/writecd.gif
-share/doc/html/xcdroast/img/writeonthefly.gif
-share/doc/html/xcdroast/img/xcdrlogo.gif
-share/doc/html/xcdroast/index.html
-share/doc/html/xcdroast/model.html
-share/doc/html/xcdroast/prolog.html
-share/doc/html/xcdroast/ripcd.html
-share/doc/html/xcdroast/xcdroast-reference.html
-share/doc/xcdroast/DOCUMENTATION
-share/doc/xcdroast/FAQ
-share/doc/xcdroast/README.nonroot
-${PKGLOCALEDIR}/locale/bg/LC_MESSAGES/xcdroast.mo
-${PKGLOCALEDIR}/locale/ca/LC_MESSAGES/xcdroast.mo
-${PKGLOCALEDIR}/locale/cs/LC_MESSAGES/xcdroast.mo
-${PKGLOCALEDIR}/locale/da/LC_MESSAGES/xcdroast.mo
-${PKGLOCALEDIR}/locale/de/LC_MESSAGES/xcdroast.mo
-${PKGLOCALEDIR}/locale/el_GR/LC_MESSAGES/xcdroast.mo
-${PKGLOCALEDIR}/locale/es/LC_MESSAGES/xcdroast.mo
-${PKGLOCALEDIR}/locale/et/LC_MESSAGES/xcdroast.mo
-${PKGLOCALEDIR}/locale/fi/LC_MESSAGES/xcdroast.mo
-${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/xcdroast.mo
-${PKGLOCALEDIR}/locale/gl/LC_MESSAGES/xcdroast.mo
-${PKGLOCALEDIR}/locale/hr/LC_MESSAGES/xcdroast.mo
-${PKGLOCALEDIR}/locale/hu/LC_MESSAGES/xcdroast.mo
-${PKGLOCALEDIR}/locale/id/LC_MESSAGES/xcdroast.mo
-${PKGLOCALEDIR}/locale/it/LC_MESSAGES/xcdroast.mo
-${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/xcdroast.mo
-${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/xcdroast.mo
-${PKGLOCALEDIR}/locale/no/LC_MESSAGES/xcdroast.mo
-${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/xcdroast.mo
-${PKGLOCALEDIR}/locale/pt_BR/LC_MESSAGES/xcdroast.mo
-${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/xcdroast.mo
-${PKGLOCALEDIR}/locale/sk/LC_MESSAGES/xcdroast.mo
-${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/xcdroast.mo
-${PKGLOCALEDIR}/locale/tr/LC_MESSAGES/xcdroast.mo
-${PKGLOCALEDIR}/locale/uk/LC_MESSAGES/xcdroast.mo
-${PKGLOCALEDIR}/locale/zh_CN.GB2312/LC_MESSAGES/xcdroast.mo
-${PKGLOCALEDIR}/locale/zh_TW.Big5/LC_MESSAGES/xcdroast.mo
-@dirrm share/doc/xcdroast
-@dirrm share/doc/html/xcdroast/img
-@dirrm share/doc/html/xcdroast
-@dirrm lib/xcdroast-0.98/sound
-@dirrm lib/xcdroast-0.98/icons
diff --git a/sysutils/xcdroast/distinfo b/sysutils/xcdroast/distinfo
deleted file mode 100644
index 76d4b9fb493..00000000000
--- a/sysutils/xcdroast/distinfo
+++ /dev/null
@@ -1,7 +0,0 @@
-$NetBSD: distinfo,v 1.9 2003/06/05 16:15:48 drochner Exp $
-
-SHA1 (xcdroast-0.98alpha14.tar.gz) = 7055f281ed7b9d9d0854df245a9e136bb5dd622a
-Size (xcdroast-0.98alpha14.tar.gz) = 2870727 bytes
-SHA1 (patch-aa) = 0beee32a5550646cd360459d90281cb0ec9a826a
-SHA1 (patch-ac) = e43e996872b766885ab1bea2fc5fcbf50cecc90b
-SHA1 (patch-ad) = 417a82344e14ae2a9f602254b152337c33afae4a
diff --git a/sysutils/xcdroast/patches/patch-aa b/sysutils/xcdroast/patches/patch-aa
deleted file mode 100644
index 8b4188402a2..00000000000
--- a/sysutils/xcdroast/patches/patch-aa
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-aa,v 1.4 2002/12/02 20:29:49 drochner Exp $
-
---- src/gettext.h.orig Mon Dec 2 11:48:41 2002
-+++ src/gettext.h Mon Dec 2 11:49:25 2002
-@@ -24,6 +24,7 @@
-
- /* Get declarations of GNU message catalog functions. */
- # include <libintl.h>
-+# include <locale.h>
-
- #else
-
diff --git a/sysutils/xcdroast/patches/patch-ac b/sysutils/xcdroast/patches/patch-ac
deleted file mode 100644
index b4246227f4b..00000000000
--- a/sysutils/xcdroast/patches/patch-ac
+++ /dev/null
@@ -1,166 +0,0 @@
-$NetBSD: patch-ac,v 1.9 2003/06/07 14:37:02 cjep Exp $
---- src/io.c.orig 2003-05-29 15:14:42.000000000 +0200
-+++ src/io.c 2003-06-05 17:56:20.000000000 +0200
-@@ -24,6 +24,14 @@
- #include <sys/wait.h>
- #include <signal.h>
- #include <time.h>
-+#ifdef __NetBSD__
-+# include <sys/ioctl.h>
-+# ifdef HAVE_OSS
-+# include <soundcard.h>
-+# else
-+# include <sys/audioio.h>
-+# endif
-+#endif
- #if defined(linux) || defined(__FreeBSD__)
- # include <sys/soundcard.h>
- # include <sys/ioctl.h>
-@@ -1690,22 +1698,22 @@
- struct stat buf;
- #endif
-
--#if defined(sun) || defined(aix) || defined(__OpenBSD__)
-+#if defined(sun) || defined(aix) || defined(__OpenBSD__) || (defined(__NetBSD__) && !defined(HAVE_OSS))
- gchar *audiodev;
- #endif
- dsp = NULL;
-
--#if defined(linux) || defined(__FreeBSD__)
-+#if defined(linux) || defined(__FreeBSD__) || (defined(__NetBSD__) && defined(HAVE_OSS))
- /* for linux check if /dev/dsp or /dev/dsp1 exist */
-
-- if (stat("/dev/dsp",&buf) == 0) {
-- dsp = g_list_append(dsp,"/dev/dsp");
-+ if (stat("@DEVOSSAUDIO@",&buf) == 0) {
-+ dsp = g_list_append(dsp,"@DEVOSSAUDIO@");
- }
- if (stat("/dev/dsp1",&buf) == 0) {
- dsp = g_list_append(dsp,"/dev/dsp1");
- }
- #endif
--#if defined(sun) || defined(__OpenBSD__)
-+#if defined(sun) || defined(__OpenBSD__) || (defined(__NetBSD__) && !defined(HAVE_OSS))
- /* check if the user has any special audio-hardware running,
- which set the AUDIODEV-environment-variable */
- audiodev = getenv("AUDIODEV");
-@@ -1814,15 +1822,15 @@
- struct stat buf;
- # endif
- #endif
--#if defined(linux) || defined(__FreeBSD__)
-+#if defined(linux) || defined(__FreeBSD__) || (defined(__NetBSD__) && defined(HAVE_OSS))
- gchar tmp2[MAXLINE];
- #endif
-
- strcpy(ret,"");
-
--#if defined(linux) || defined(__FreeBSD__)
-+#if defined(linux) || defined(__FreeBSD__) || (defined(__NetBSD__) && defined(HAVE_OSS))
-
-- if (strncmp(dsp,"/dev/dsp",8) == 0) {
-+ if (strncmp(dsp,"@DEVOSSAUDIO@",8) == 0) {
- strcpy(tmp,dsp+8);
- g_snprintf(tmp2,MAXLINE,"/dev/mixer%s",tmp);
-
-@@ -1832,7 +1840,7 @@
- }
- }
- #endif
--#if defined(sun) || defined(__OpenBSD__)
-+#if defined(sun) || defined(__OpenBSD__) || (defined(__NetBSD__) && !defined(HAVE_OSS))
-
- g_snprintf(tmp,MAXLINE,"%s%s",dsp,"ctl");
-
-@@ -3573,10 +3581,10 @@
- #if !(defined(__MACH__) && defined(__APPLE__))
- gint mix;
- #endif
--#if defined(linux) || defined(__FreeBSD__)
-+#if defined(linux) || defined(__FreeBSD__) || (defined(__NetBSD__) && defined(HAVE_OSS))
- gint val;
- #endif
--#if defined(sun) || defined(__OpenBSD__)
-+#if defined(sun) || defined(__OpenBSD__) || (defined(__NetBSD__) && !defined(HAVE_OSS))
- audio_info_t ainfo;
- #endif
- #ifdef hpux
-@@ -3591,7 +3599,7 @@
- return -1;
- }
-
--#if defined(linux) || defined(__FreeBSD__)
-+#if defined(linux) || defined(__FreeBSD__) || (defined(__NetBSD__) && defined(HAVE_OSS))
-
- dodebug(10,"quering mixer %s\n", setupdata.mix_device);
- mix = open(setupdata.mix_device, O_RDWR);
-@@ -3611,7 +3619,7 @@
- return ((val & 0x7f) + ((val >> 8) & 0x7f))/2;
-
- #endif
--#if defined(sun) || defined(__OpenBSD__)
-+#if defined(sun) || defined(__OpenBSD__) || (defined(__NetBSD__) && !defined(HAVE_OSS))
-
- dodebug(10,"quering mixer %s\n", setupdata.mix_device);
- mix = open(setupdata.mix_device, O_RDONLY);
-@@ -3699,7 +3707,7 @@
- #if !(defined(__MACH__) && defined(__APPLE__))
- gint mix;
- #endif
--#if defined(sun) || defined(__OpenBSD__)
-+#if defined(sun) || defined(__OpenBSD__) || (defined(__NetBSD__) && !defined(HAVE_OSS))
- audio_info_t ainfo;
- #endif
- #ifdef aix
-@@ -3717,7 +3725,7 @@
- return -1;
- }
-
--#if defined(linux) || defined(__FreeBSD__)
-+#if defined(linux) || defined(__FreeBSD__) || (defined(__NetBSD__) && defined(HAVE_OSS))
-
- dodebug(10,"setting mixer %s to %d\n", setupdata.mix_device, val);
- mix = open(setupdata.mix_device, O_RDWR);
-@@ -3735,7 +3743,7 @@
- close(mix);
-
- #endif
--#if defined(sun) || defined(__OpenBSD__)
-+#if defined(sun) || defined(__OpenBSD__) || (defined(__NetBSD__) && !defined(HAVE_OSS))
-
- dodebug(10,"setting mixer %s to %d\n", setupdata.mix_device, val);
- mix = open(setupdata.mix_device, O_WRONLY);
-@@ -5507,7 +5515,11 @@
- }
-
- /* build command line */
-- get_wrap_path_cdrecord(tmp3);
-+ if (curset.isProDVD) {
-+ get_wrap_path("CDRECORDPRODVD", tmp3);
-+ } else {
-+ get_wrap_path("CDRECORD", tmp3);
-+ }
- g_snprintf(line,MAXLINE,"%s %s -atip 2>&1",
- tmp3,tmp);
-
-@@ -5518,6 +5530,11 @@
- g_error("popen error\n");
- }
-
-+ /* syntax for dvd-atip is different */
-+ if (is_dvdwriter(curset.writer_devnr)) {
-+ found_atip = 1;
-+ }
-+
- errcount = 0;
- for (;;) {
- if (fgets(line,MAXLINE,fpin) == NULL)
-@@ -6605,7 +6622,7 @@
- read_output_ctrl = 4;
- }
- /* check Medium error/buffer underrun */
-- if (strncmp(tmp2,"Input/output error",18)) {
-+ if (strncmp(tmp2,"Input/output error",18) == 0) {
- read_output_ctrl = 5;
- }
- }
diff --git a/sysutils/xcdroast/patches/patch-ad b/sysutils/xcdroast/patches/patch-ad
deleted file mode 100644
index d741bd4818f..00000000000
--- a/sysutils/xcdroast/patches/patch-ad
+++ /dev/null
@@ -1,70 +0,0 @@
-$NetBSD: patch-ad,v 1.4 2003/06/05 16:15:48 drochner Exp $
-
---- src/wavplay.c.orig 2003-04-22 22:28:05.000000000 +0200
-+++ src/wavplay.c 2003-06-04 13:32:27.000000000 +0200
-@@ -23,6 +23,14 @@
- #include <unistd.h>
- #include <fcntl.h>
- #include <string.h>
-+#ifdef __NetBSD__
-+#include <sys/ioctl.h>
-+# ifdef HAVE_OSS
-+# include <soundcard.h>
-+# else
-+# include <sys/audioio.h>
-+# endif
-+#endif
- #if defined(linux) || defined(__CYGWIN32__)
- # include <getopt.h>
- #endif
-@@ -73,8 +81,8 @@
- gint is_in_cd_quality(guchar *hdr);
-
-
--#if defined(linux) || defined(__FreeBSD__)
--#define DEFAULT_AUDIO_DEVICE "/dev/dsp"
-+#if defined(linux) || defined(__FreeBSD__) || (defined(__NetBSD__) && defined(HAVE_OSS))
-+#define DEFAULT_AUDIO_DEVICE "@DEVOSSAUDIO@"
- #elif defined (aix)
- #define DEFAULT_AUDIO_DEVICE ""
- #elif defined(__sgi)
-@@ -310,7 +318,7 @@
- #endif
-
-
--#if defined(linux) || defined(__FreeBSD__)
-+#if defined(linux) || defined(__FreeBSD__) || (defined(__NetBSD__) && defined(HAVE_OSS))
-
- /* open the sound-device of linux and set cd-quality */
-
-@@ -361,7 +369,7 @@
-
- #endif
-
--#if defined(sun) || defined(__OpenBSD__)
-+#if defined(sun) || defined(__OpenBSD__) || (defined(__NetBSD__) && !defined(HAVE_OSS))
-
- /* open the sound-device of solaris and set cd-quality */
-
-@@ -388,7 +396,7 @@
- info.play.precision = 16;
- info.play.encoding = AUDIO_ENCODING_LINEAR;
- info.play.buffer_size = abuf_size;
--#ifndef __OpenBSD__
-+#if !defined(__OpenBSD__) && !defined(__NetBSD__)
- info.output_muted = 0;
- #endif
-
-@@ -789,10 +797,10 @@
-
- /* the open sets also the global abuf_size-variable */
-
--#if defined(linux) || defined(__FreeBSD__)
-+#if defined(linux) || defined(__FreeBSD__) || (defined(__NetBSD__) && defined(HAVE_OSS))
- audio = open_linux_audio(audio_dev);
- #endif
--#if defined(sun) || defined(__OpenBSD__)
-+#if defined(sun) || defined(__OpenBSD__) || (defined(__NetBSD__) && !defined(HAVE_OSS))
- audio = open_solaris_audio(audio_dev);
- #endif
- #ifdef aix
diff --git a/sysutils/xdu/DESCR b/sysutils/xdu/DESCR
deleted file mode 100644
index db1b42ecf1e..00000000000
--- a/sysutils/xdu/DESCR
+++ /dev/null
@@ -1,4 +0,0 @@
-XDU is a program for displaying a graphical tree of disk space
-utilization as reported by the UNIX utility "du". You can
-navigate up and down in the tree, sort things, and print out
-information. See the manual page for details.
diff --git a/sysutils/xdu/Makefile b/sysutils/xdu/Makefile
deleted file mode 100644
index f208dfdf6f7..00000000000
--- a/sysutils/xdu/Makefile
+++ /dev/null
@@ -1,17 +0,0 @@
-# $NetBSD: Makefile,v 1.9 2003/03/29 12:42:34 jmmv Exp $
-#
-
-DISTNAME= xdu-3.0
-PKGREVISION= 4
-WRKSRC= ${WRKDIR}
-CATEGORIES= sysutils x11
-MASTER_SITES= http://sd.wareonearth.com/~phil/xdu/ ftp://ftp.arl.mil/pub/
-EXTRACT_SUFX= .tar.Z
-
-MAINTAINER= hubertf@netbsd.org
-HOMEPAGE= http://sd.wareonearth.com/~phil/xdu/
-COMMENT= Display the output of "du" in an X window
-
-USE_IMAKE= yes
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/xdu/PLIST b/sysutils/xdu/PLIST
deleted file mode 100644
index 25b9677aba2..00000000000
--- a/sysutils/xdu/PLIST
+++ /dev/null
@@ -1,4 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2003/03/03 02:59:29 jschauma Exp $
-bin/xdu
-lib/X11/app-defaults/XDu
-${IMAKE_MAN_DIR}/xdu.${IMAKE_MANNEWSUFFIX}
diff --git a/sysutils/xdu/distinfo b/sysutils/xdu/distinfo
deleted file mode 100644
index 29f4b30c81b..00000000000
--- a/sysutils/xdu/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.4 2002/04/05 01:33:25 hubertf Exp $
-
-SHA1 (xdu-3.0.tar.Z) = 196e2ba03253fd6b8a88fafe6b00e40632183d0c
-Size (xdu-3.0.tar.Z) = 20114 bytes
-SHA1 (patch-aa) = 05ec21899437eb15159615ce40e63e5e07073581
diff --git a/sysutils/xdu/patches/patch-aa b/sysutils/xdu/patches/patch-aa
deleted file mode 100644
index a9bfa9b71c4..00000000000
--- a/sysutils/xdu/patches/patch-aa
+++ /dev/null
@@ -1,95 +0,0 @@
-$NetBSD: patch-aa,v 1.3 2002/04/05 01:33:25 hubertf Exp $
-
---- xdu.c.orig Sun Jun 5 21:29:23 1994
-+++ xdu.c
-@@ -19,13 +19,15 @@
- * limitation a license to do the foregoing actions under any patents of
- * the party supplying this software to the X Consortium.
- */
-+#include <assert.h>
- #include <stdio.h>
-+#include <string.h>
- #include "version.h"
-
- extern char *malloc(), *calloc();
-
--#define MAXDEPTH 80 /* max elements in a path */
--#define MAXNAME 1024 /* max pathname element length */
-+#define MAXDEPTH 1024 /* max elements in a path */
-+#define MAXNAME 4096 /* max pathname element length */
- #define MAXPATH 4096 /* max total pathname length */
- #define NCOLS 5 /* default number of columns in display */
-
-@@ -96,6 +98,10 @@
- struct node *np;
-
- np = (struct node *)calloc(1,sizeof(struct node));
-+ if (np == NULL) {
-+ fprintf(stderr, "Out of memory! (#1)\n");
-+ exit(1);
-+ }
- np->name = strdup(name);
- np->size = size;
- np->num = nnodes;
-@@ -232,7 +238,6 @@
- char *filename;
- {
- char buf[4096];
-- char name[4096];
- int size;
- FILE *fp;
-
-@@ -245,9 +250,12 @@
- }
- }
- while (fgets(buf,sizeof(buf),fp) != NULL) {
-- sscanf(buf, "%d %s\n", &size, name);
-- /*printf("%d %s\n", size, name);*/
-- parse_entry(name,size);
-+ char *p, *q = NULL;
-+ p = strtok_r(buf, " \t", &q);
-+ size = atoi(p);
-+ p = strtok_r(NULL, "\r\n", &q);
-+ /* printf("%d %s\n", size, p); */
-+ parse_entry(p,size);
- }
- fclose(fp);
- }
-@@ -290,7 +298,12 @@
- name++;
- }
- buf[indx] = 0;
-- path[arg++] = strdup(buf);
-+ path[arg] = strdup(buf);
-+ if (path[arg] == NULL) {
-+ fprintf(stderr, "Out of memory! (#3)\n");
-+ exit(1);
-+ }
-+ arg++;
- path[arg] = NULL;
-
- addtree(&top,path,size);
-@@ -622,6 +635,7 @@
- 100.0*topp->size/rootp->size);
- }
-
-+#ifndef __NetBSD__
- char *
- strdup(s)
- char *s;
-@@ -631,10 +645,15 @@
-
- n = strlen(s);
- cp = malloc(n+1);
-+ if (cp == NULL) {
-+ fprintf(stderr, "Out of memory! (#2)\n");
-+ exit(1);
-+ }
- strcpy(cp,s);
-
- return cp;
- }
-+#endif /* __NetBSD__ */
-
- /**************** External Entry Points ****************/
-
diff --git a/sysutils/xfm/DESCR b/sysutils/xfm/DESCR
deleted file mode 100644
index 7284f3f935e..00000000000
--- a/sysutils/xfm/DESCR
+++ /dev/null
@@ -1,10 +0,0 @@
-XFM is a powerful file and applications manager program written using the X
-toolkit. It contains virtually all of the features that you would expect in a
-file manager -- move around your directory tree in multiple windows, and move,
-copy or delete files with simple mouse operations. Directory displays are
-updated automatically in regular intervals when the contents of a displayed
-directory changes. The integrated application manager allows you to load files
-into your favourite applications from the file manager by dragging icons. It
-can also be used as a "shelf" onto which you can place files and directories
-that you are currently working with. A special LOAD action for application
-files enables you to manage different application groups.
diff --git a/sysutils/xfm/Makefile b/sysutils/xfm/Makefile
deleted file mode 100644
index b434a962263..00000000000
--- a/sysutils/xfm/Makefile
+++ /dev/null
@@ -1,20 +0,0 @@
-# $NetBSD: Makefile,v 1.4 2003/03/29 12:42:34 jmmv Exp $
-# FreeBSD Id: ports/x11-fm/xfm/Makefile,v 1.20 2001/02/05 21:00:55 olgeni Exp
-
-DISTNAME= xfm-1.4.3
-PKGREVISION= 1
-WRKSRC= ${WRKDIR}/xfm-1.4.3
-CATEGORIES= sysutils x11
-MASTER_SITES= http://www.musikwissenschaft.uni-mainz.de/~ag/xfm/
-
-MAINTAINER= rxg@ms25.url.com.tw
-HOMEPAGE= http://www.musikwissenschaft.uni-mainz.de/~ag/xfm/
-COMMENT= The X File Manager
-
-USE_BUILDLINK2= YES
-USE_IMAKE= YES
-
-.include "../../graphics/xpm/buildlink2.mk"
-.include "../../x11/Xaw3d/buildlink2.mk"
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/xfm/PLIST b/sysutils/xfm/PLIST
deleted file mode 100644
index 2e8bffedbca..00000000000
--- a/sysutils/xfm/PLIST
+++ /dev/null
@@ -1,443 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2003/03/03 02:59:30 jschauma Exp $
-bin/xfm
-bin/xfm.install
-bin/xfmtype
-lib/X11/app-defaults/Xfm
-lib/X11/xfm/bitmaps/app.xbm
-lib/X11/xfm/bitmaps/app_compress.xbm
-lib/X11/xfm/bitmaps/app_find.xbm
-lib/X11/xfm/bitmaps/app_grep.xbm
-lib/X11/xfm/bitmaps/app_make.xbm
-lib/X11/xfm/bitmaps/app_tar.xbm
-lib/X11/xfm/bitmaps/app_taz.xbm
-lib/X11/xfm/bitmaps/app_uuencode.xbm
-lib/X11/xfm/bitmaps/app_zip.xbm
-lib/X11/xfm/bitmaps/binedit.xbm
-lib/X11/xfm/bitmaps/bitmap.xbm
-lib/X11/xfm/bitmaps/calculator.xbm
-lib/X11/xfm/bitmaps/calendar.xbm
-lib/X11/xfm/bitmaps/calendar2.xbm
-lib/X11/xfm/bitmaps/chess.xbm
-lib/X11/xfm/bitmaps/citadel.xbm
-lib/X11/xfm/bitmaps/citadelroot.xbm
-lib/X11/xfm/bitmaps/clipboard.xbm
-lib/X11/xfm/bitmaps/clipboard2.xbm
-lib/X11/xfm/bitmaps/console_sun.xbm
-lib/X11/xfm/bitmaps/debug.xbm
-lib/X11/xfm/bitmaps/drafting.xbm
-lib/X11/xfm/bitmaps/drawing.xbm
-lib/X11/xfm/bitmaps/edit.xbm
-lib/X11/xfm/bitmaps/emacs.xbm
-lib/X11/xfm/bitmaps/frog.xbm
-lib/X11/xfm/bitmaps/ghost.xbm
-lib/X11/xfm/bitmaps/ghostview.xbm
-lib/X11/xfm/bitmaps/gopher.xbm
-lib/X11/xfm/bitmaps/hexdump.xbm
-lib/X11/xfm/bitmaps/laserprinter.xbm
-lib/X11/xfm/bitmaps/laserwriter.xbm
-lib/X11/xfm/bitmaps/library.xbm
-lib/X11/xfm/bitmaps/library2.xbm
-lib/X11/xfm/bitmaps/lock.xbm
-lib/X11/xfm/bitmaps/log.xbm
-lib/X11/xfm/bitmaps/mailtool.xbm
-lib/X11/xfm/bitmaps/man.xbm
-lib/X11/xfm/bitmaps/man2.xbm
-lib/X11/xfm/bitmaps/math.xbm
-lib/X11/xfm/bitmaps/news.xbm
-lib/X11/xfm/bitmaps/palette.xbm
-lib/X11/xfm/bitmaps/pic_frame.xbm
-lib/X11/xfm/bitmaps/printer.xbm
-lib/X11/xfm/bitmaps/recycle.xbm
-lib/X11/xfm/bitmaps/rlogin.xbm
-lib/X11/xfm/bitmaps/sc.xbm
-lib/X11/xfm/bitmaps/scroll.xbm
-lib/X11/xfm/bitmaps/spell.xbm
-lib/X11/xfm/bitmaps/terminal.xbm
-lib/X11/xfm/bitmaps/terminal_SGI.xbm
-lib/X11/xfm/bitmaps/terminal_lock.xbm
-lib/X11/xfm/bitmaps/terminal_pc.xbm
-lib/X11/xfm/bitmaps/terminal_sun.xbm
-lib/X11/xfm/bitmaps/terminal_tty.xbm
-lib/X11/xfm/bitmaps/termlock.xbm
-lib/X11/xfm/bitmaps/tex-view.xbm
-lib/X11/xfm/bitmaps/tools.xbm
-lib/X11/xfm/bitmaps/trash.xbm
-lib/X11/xfm/bitmaps/typewriter.xbm
-lib/X11/xfm/bitmaps/wizard.xbm
-lib/X11/xfm/bitmaps/xchess.xbm
-lib/X11/xfm/bitmaps/xdbx.xbm
-lib/X11/xfm/bitmaps/xfig.xbm
-lib/X11/xfm/bitmaps/xfm_Sticky.xbm
-lib/X11/xfm/bitmaps/xfm_Suid.xbm
-lib/X11/xfm/bitmaps/xfm_a.xbm
-lib/X11/xfm/bitmaps/xfm_appmgr.xbm
-lib/X11/xfm/bitmaps/xfm_au.xbm
-lib/X11/xfm/bitmaps/xfm_blackhole.xbm
-lib/X11/xfm/bitmaps/xfm_c.xbm
-lib/X11/xfm/bitmaps/xfm_cc.xbm
-lib/X11/xfm/bitmaps/xfm_cline.xbm
-lib/X11/xfm/bitmaps/xfm_core.xbm
-lib/X11/xfm/bitmaps/xfm_data.xbm
-lib/X11/xfm/bitmaps/xfm_dir.xbm
-lib/X11/xfm/bitmaps/xfm_dir_s.xbm
-lib/X11/xfm/bitmaps/xfm_dirlnk.xbm
-lib/X11/xfm/bitmaps/xfm_dirmsk.xbm
-lib/X11/xfm/bitmaps/xfm_dirmsk_s.xbm
-lib/X11/xfm/bitmaps/xfm_draw.xbm
-lib/X11/xfm/bitmaps/xfm_excl.xbm
-lib/X11/xfm/bitmaps/xfm_exec.xbm
-lib/X11/xfm/bitmaps/xfm_exec_s.xbm
-lib/X11/xfm/bitmaps/xfm_execlnk.xbm
-lib/X11/xfm/bitmaps/xfm_execmsk.xbm
-lib/X11/xfm/bitmaps/xfm_execmsk_s.xbm
-lib/X11/xfm/bitmaps/xfm_fig.xbm
-lib/X11/xfm/bitmaps/xfm_file.xbm
-lib/X11/xfm/bitmaps/xfm_file_s.xbm
-lib/X11/xfm/bitmaps/xfm_filemsk.xbm
-lib/X11/xfm/bitmaps/xfm_filemsk_s.xbm
-lib/X11/xfm/bitmaps/xfm_files.xbm
-lib/X11/xfm/bitmaps/xfm_files_s.xbm
-lib/X11/xfm/bitmaps/xfm_filesmsk.xbm
-lib/X11/xfm/bitmaps/xfm_filesmsk_s.xbm
-lib/X11/xfm/bitmaps/xfm_fline.xbm
-lib/X11/xfm/bitmaps/xfm_gif.xbm
-lib/X11/xfm/bitmaps/xfm_h.xbm
-lib/X11/xfm/bitmaps/xfm_icon.xbm
-lib/X11/xfm/bitmaps/xfm_info.xbm
-lib/X11/xfm/bitmaps/xfm_larrow.xbm
-lib/X11/xfm/bitmaps/xfm_lines.xbm
-lib/X11/xfm/bitmaps/xfm_lline.xbm
-lib/X11/xfm/bitmaps/xfm_make.xbm
-lib/X11/xfm/bitmaps/xfm_noentry.xbm
-lib/X11/xfm/bitmaps/xfm_noentry32.xbm
-lib/X11/xfm/bitmaps/xfm_noentry_s.xbm
-lib/X11/xfm/bitmaps/xfm_noentrymsk.xbm
-lib/X11/xfm/bitmaps/xfm_noentrymsk32.xbm
-lib/X11/xfm/bitmaps/xfm_noentrymsk_s.xbm
-lib/X11/xfm/bitmaps/xfm_notick.xbm
-lib/X11/xfm/bitmaps/xfm_o.xbm
-lib/X11/xfm/bitmaps/xfm_objects.xbm
-lib/X11/xfm/bitmaps/xfm_paint.xbm
-lib/X11/xfm/bitmaps/xfm_par.xbm
-lib/X11/xfm/bitmaps/xfm_phone.xbm
-lib/X11/xfm/bitmaps/xfm_ps.xbm
-lib/X11/xfm/bitmaps/xfm_rarrow.xbm
-lib/X11/xfm/bitmaps/xfm_report.xbm
-lib/X11/xfm/bitmaps/xfm_sc.xbm
-lib/X11/xfm/bitmaps/xfm_sticky.xbm
-lib/X11/xfm/bitmaps/xfm_stop.xbm
-lib/X11/xfm/bitmaps/xfm_suid.xbm
-lib/X11/xfm/bitmaps/xfm_symlnk.xbm
-lib/X11/xfm/bitmaps/xfm_sys.xbm
-lib/X11/xfm/bitmaps/xfm_tag.xbm
-lib/X11/xfm/bitmaps/xfm_tar.xbm
-lib/X11/xfm/bitmaps/xfm_tex.xbm
-lib/X11/xfm/bitmaps/xfm_text.xbm
-lib/X11/xfm/bitmaps/xfm_tick.xbm
-lib/X11/xfm/bitmaps/xfm_tiff.xbm
-lib/X11/xfm/bitmaps/xfm_tline.xbm
-lib/X11/xfm/bitmaps/xfm_uu.xbm
-lib/X11/xfm/bitmaps/xfm_watch.xbm
-lib/X11/xfm/bitmaps/xfm_watchmsk.xbm
-lib/X11/xfm/bitmaps/xfm_wavy.xbm
-lib/X11/xfm/bitmaps/xfm_wavy1.xbm
-lib/X11/xfm/bitmaps/xfm_wavy_arrow.xbm
-lib/X11/xfm/bitmaps/xfm_word.xbm
-lib/X11/xfm/bitmaps/xfm_xbm.xbm
-lib/X11/xfm/bitmaps/xfm_xpm.xbm
-lib/X11/xfm/bitmaps/xfm_z.xbm
-lib/X11/xfm/bitmaps/xfm_zoo.xbm
-lib/X11/xfm/bitmaps/xman.xbm
-lib/X11/xfm/bitmaps/xmosaic.xbm
-lib/X11/xfm/bitmaps/xv.xbm
-lib/X11/xfm/dot.xfm/Apps
-lib/X11/xfm/dot.xfm/Graphics
-lib/X11/xfm/dot.xfm/Toolbox
-lib/X11/xfm/dot.xfm/magic
-lib/X11/xfm/dot.xfm/xfmdev
-lib/X11/xfm/dot.xfm/xfmrc
-lib/X11/xfm/icons/app.xpm
-lib/X11/xfm/icons/app_link.xpm
-lib/X11/xfm/icons/app_link_small.xpm
-lib/X11/xfm/icons/app_plain.xpm
-lib/X11/xfm/icons/app_small.xpm
-lib/X11/xfm/icons/bluelogo.xpm
-lib/X11/xfm/icons/book.xpm
-lib/X11/xfm/icons/bookshelf.xpm
-lib/X11/xfm/icons/bookshelf_small.xpm
-lib/X11/xfm/icons/bug.xpm
-lib/X11/xfm/icons/calc.xpm
-lib/X11/xfm/icons/calc2.xpm
-lib/X11/xfm/icons/camera.xpm
-lib/X11/xfm/icons/cdrom.xpm
-lib/X11/xfm/icons/chess.xpm
-lib/X11/xfm/icons/chess2.xpm
-lib/X11/xfm/icons/chess3.xpm
-lib/X11/xfm/icons/chip.xpm
-lib/X11/xfm/icons/circuit.xpm
-lib/X11/xfm/icons/circuit2.xpm
-lib/X11/xfm/icons/clip.xpm
-lib/X11/xfm/icons/clip_file.xpm
-lib/X11/xfm/icons/clip_folder.xpm
-lib/X11/xfm/icons/clip_folder_file.xpm
-lib/X11/xfm/icons/compress.xpm
-lib/X11/xfm/icons/compressed.xpm
-lib/X11/xfm/icons/core.xpm
-lib/X11/xfm/icons/cycle.xpm
-lib/X11/xfm/icons/data.xpm
-lib/X11/xfm/icons/debug.xpm
-lib/X11/xfm/icons/dev_cdrom.xpm
-lib/X11/xfm/icons/dev_floppy.xpm
-lib/X11/xfm/icons/dev_harddrive.xpm
-lib/X11/xfm/icons/diff.xpm
-lib/X11/xfm/icons/dot_a.xpm
-lib/X11/xfm/icons/dot_c.xpm
-lib/X11/xfm/icons/dot_cc.xpm
-lib/X11/xfm/icons/dot_h.xpm
-lib/X11/xfm/icons/dot_o.xpm
-lib/X11/xfm/icons/dot_sa.xpm
-lib/X11/xfm/icons/dot_so.xpm
-lib/X11/xfm/icons/draw.xpm
-lib/X11/xfm/icons/draw2.xpm
-lib/X11/xfm/icons/dvi.xpm
-lib/X11/xfm/icons/edit.xpm
-lib/X11/xfm/icons/editres.xpm
-lib/X11/xfm/icons/emacs.xpm
-lib/X11/xfm/icons/empty.xpm
-lib/X11/xfm/icons/exec.xpm
-lib/X11/xfm/icons/fig.xpm
-lib/X11/xfm/icons/file.xpm
-lib/X11/xfm/icons/file_bad.xpm
-lib/X11/xfm/icons/file_bad_small.xpm
-lib/X11/xfm/icons/file_link.xpm
-lib/X11/xfm/icons/file_link_bad.xpm
-lib/X11/xfm/icons/file_link_bad_small.xpm
-lib/X11/xfm/icons/file_link_small.xpm
-lib/X11/xfm/icons/file_small.xpm
-lib/X11/xfm/icons/fileman.xpm
-lib/X11/xfm/icons/files.xpm
-lib/X11/xfm/icons/fileserver.xpm
-lib/X11/xfm/icons/find.xpm
-lib/X11/xfm/icons/fish.xpm
-lib/X11/xfm/icons/floppy.xpm
-lib/X11/xfm/icons/folder.xpm
-lib/X11/xfm/icons/folder_bad.xpm
-lib/X11/xfm/icons/folder_bad_small.xpm
-lib/X11/xfm/icons/folder_link.xpm
-lib/X11/xfm/icons/folder_link_small.xpm
-lib/X11/xfm/icons/folder_small.xpm
-lib/X11/xfm/icons/folder_up.xpm
-lib/X11/xfm/icons/folder_up_small.xpm
-lib/X11/xfm/icons/font.xpm
-lib/X11/xfm/icons/framemaker.xpm
-lib/X11/xfm/icons/games.xpm
-lib/X11/xfm/icons/ghost.xpm
-lib/X11/xfm/icons/ghostview.xpm
-lib/X11/xfm/icons/gif.xpm
-lib/X11/xfm/icons/graph.xpm
-lib/X11/xfm/icons/grep.xpm
-lib/X11/xfm/icons/hammer.xpm
-lib/X11/xfm/icons/harddrive.xpm
-lib/X11/xfm/icons/helpme.xpm
-lib/X11/xfm/icons/hex.xpm
-lib/X11/xfm/icons/home.xpm
-lib/X11/xfm/icons/home_small.xpm
-lib/X11/xfm/icons/html.xpm
-lib/X11/xfm/icons/icon.xpm
-lib/X11/xfm/icons/iff.xpm
-lib/X11/xfm/icons/info.xpm
-lib/X11/xfm/icons/jpeg.xpm
-lib/X11/xfm/icons/link.xpm
-lib/X11/xfm/icons/link_shadow.xpm
-lib/X11/xfm/icons/link_shadow_small.xpm
-lib/X11/xfm/icons/link_small.xpm
-lib/X11/xfm/icons/lisp.xpm
-lib/X11/xfm/icons/list.xpm
-lib/X11/xfm/icons/mag_glass.xpm
-lib/X11/xfm/icons/magic.xpm
-lib/X11/xfm/icons/mail.xpm
-lib/X11/xfm/icons/mailfolder.xpm
-lib/X11/xfm/icons/make.xpm
-lib/X11/xfm/icons/makefile.xpm
-lib/X11/xfm/icons/manpage.xpm
-lib/X11/xfm/icons/manual.xpm
-lib/X11/xfm/icons/modem.xpm
-lib/X11/xfm/icons/movies.xpm
-lib/X11/xfm/icons/music.xpm
-lib/X11/xfm/icons/netscape.xpm
-lib/X11/xfm/icons/news.xpm
-lib/X11/xfm/icons/paint.xpm
-lib/X11/xfm/icons/paint2.xpm
-lib/X11/xfm/icons/paintings.xpm
-lib/X11/xfm/icons/paragraphs.xpm
-lib/X11/xfm/icons/pbm.xpm
-lib/X11/xfm/icons/pgm.xpm
-lib/X11/xfm/icons/pictures.xpm
-lib/X11/xfm/icons/ppm.xpm
-lib/X11/xfm/icons/printer.xpm
-lib/X11/xfm/icons/printer2.xpm
-lib/X11/xfm/icons/printer3.xpm
-lib/X11/xfm/icons/ps.xpm
-lib/X11/xfm/icons/ps2.xpm
-lib/X11/xfm/icons/raster.xpm
-lib/X11/xfm/icons/rc.xpm
-lib/X11/xfm/icons/readme.xpm
-lib/X11/xfm/icons/recycle.xpm
-lib/X11/xfm/icons/res.xpm
-lib/X11/xfm/icons/script.xpm
-lib/X11/xfm/icons/script_file.xpm
-lib/X11/xfm/icons/script_link.xpm
-lib/X11/xfm/icons/script_plain.xpm
-lib/X11/xfm/icons/sound.xpm
-lib/X11/xfm/icons/sounds.xpm
-lib/X11/xfm/icons/sounds2.xpm
-lib/X11/xfm/icons/stuff.xpm
-lib/X11/xfm/icons/suitcase.xpm
-lib/X11/xfm/icons/system.xpm
-lib/X11/xfm/icons/tape.xpm
-lib/X11/xfm/icons/tape_net.xpm
-lib/X11/xfm/icons/tar.xpm
-lib/X11/xfm/icons/teddy.xpm
-lib/X11/xfm/icons/term.xpm
-lib/X11/xfm/icons/tex.xpm
-lib/X11/xfm/icons/text.xpm
-lib/X11/xfm/icons/tiff.xpm
-lib/X11/xfm/icons/tmpfile.xpm
-lib/X11/xfm/icons/tools.xpm
-lib/X11/xfm/icons/trash_empty.xpm
-lib/X11/xfm/icons/trash_full.xpm
-lib/X11/xfm/icons/uu.xpm
-lib/X11/xfm/icons/video.xpm
-lib/X11/xfm/icons/winzip.xpm
-lib/X11/xfm/icons/write.xpm
-lib/X11/xfm/icons/writings.xpm
-lib/X11/xfm/icons/x.xpm
-lib/X11/xfm/icons/xapp.xpm
-lib/X11/xfm/icons/xbm.xpm
-lib/X11/xfm/icons/xfig.xpm
-lib/X11/xfm/icons/xlogo.xpm
-lib/X11/xfm/icons/xmcd.xpm
-lib/X11/xfm/icons/xplate.xpm
-lib/X11/xfm/icons/xrolodex.xpm
-lib/X11/xfm/icons/xterm.xpm
-lib/X11/xfm/icons/xv.xpm
-lib/X11/xfm/icons/zip.xpm
-lib/X11/xfm/icons/zoo.xpm
-lib/X11/xfm/pixmaps/XfmLogo.xpm
-lib/X11/xfm/pixmaps/app.xpm
-lib/X11/xfm/pixmaps/app_compress.xpm
-lib/X11/xfm/pixmaps/app_find.xpm
-lib/X11/xfm/pixmaps/app_grep.xpm
-lib/X11/xfm/pixmaps/app_make.xpm
-lib/X11/xfm/pixmaps/app_tar.xpm
-lib/X11/xfm/pixmaps/app_taz.xpm
-lib/X11/xfm/pixmaps/app_uuencode.xpm
-lib/X11/xfm/pixmaps/app_zip.xpm
-lib/X11/xfm/pixmaps/apps.xpm
-lib/X11/xfm/pixmaps/bitmap.xpm
-lib/X11/xfm/pixmaps/calc.xpm
-lib/X11/xfm/pixmaps/calendar.xpm
-lib/X11/xfm/pixmaps/cdrom.xpm
-lib/X11/xfm/pixmaps/cdrom_library.xpm
-lib/X11/xfm/pixmaps/cdrom_look.xpm
-lib/X11/xfm/pixmaps/cdrom_view.xpm
-lib/X11/xfm/pixmaps/citadel.xpm
-lib/X11/xfm/pixmaps/citadelroot.xpm
-lib/X11/xfm/pixmaps/clipboard.xpm
-lib/X11/xfm/pixmaps/console.xpm
-lib/X11/xfm/pixmaps/disk.xpm
-lib/X11/xfm/pixmaps/drafting.xpm
-lib/X11/xfm/pixmaps/drawing.xpm
-lib/X11/xfm/pixmaps/edit.xpm
-lib/X11/xfm/pixmaps/editor.xpm
-lib/X11/xfm/pixmaps/emacs.xpm
-lib/X11/xfm/pixmaps/flight_sim.xpm
-lib/X11/xfm/pixmaps/floppy.xpm
-lib/X11/xfm/pixmaps/frog.xpm
-lib/X11/xfm/pixmaps/ghost.xbm
-lib/X11/xfm/pixmaps/ghostview.xpm
-lib/X11/xfm/pixmaps/island.xpm
-lib/X11/xfm/pixmaps/lock.xpm
-lib/X11/xfm/pixmaps/log.xpm
-lib/X11/xfm/pixmaps/mailtool.xpm
-lib/X11/xfm/pixmaps/man.xpm
-lib/X11/xfm/pixmaps/man2.xpm
-lib/X11/xfm/pixmaps/mona_lisa.xpm
-lib/X11/xfm/pixmaps/news.xpm
-lib/X11/xfm/pixmaps/pixmap.xpm
-lib/X11/xfm/pixmaps/printer.xpm
-lib/X11/xfm/pixmaps/recycle.xpm
-lib/X11/xfm/pixmaps/rlogin.xpm
-lib/X11/xfm/pixmaps/scroll.xpm
-lib/X11/xfm/pixmaps/terminal.xpm
-lib/X11/xfm/pixmaps/tex-view.xpm
-lib/X11/xfm/pixmaps/tools.xpm
-lib/X11/xfm/pixmaps/trash.xpm
-lib/X11/xfm/pixmaps/window.xpm
-lib/X11/xfm/pixmaps/wizard.xpm
-lib/X11/xfm/pixmaps/xcalc.xpm
-lib/X11/xfm/pixmaps/xcalc2.xpm
-lib/X11/xfm/pixmaps/xchess.xpm
-lib/X11/xfm/pixmaps/xdbx.xpm
-lib/X11/xfm/pixmaps/xfig.xpm
-lib/X11/xfm/pixmaps/xfm_a.xpm
-lib/X11/xfm/pixmaps/xfm_appmgr.xpm
-lib/X11/xfm/pixmaps/xfm_apps.xpm
-lib/X11/xfm/pixmaps/xfm_au.xpm
-lib/X11/xfm/pixmaps/xfm_blackhole.xpm
-lib/X11/xfm/pixmaps/xfm_c.xpm
-lib/X11/xfm/pixmaps/xfm_cc.xpm
-lib/X11/xfm/pixmaps/xfm_core.xpm
-lib/X11/xfm/pixmaps/xfm_data.xpm
-lib/X11/xfm/pixmaps/xfm_dir.xpm
-lib/X11/xfm/pixmaps/xfm_dirlnk.xpm
-lib/X11/xfm/pixmaps/xfm_draw.xpm
-lib/X11/xfm/pixmaps/xfm_exec.xpm
-lib/X11/xfm/pixmaps/xfm_execlnk.xpm
-lib/X11/xfm/pixmaps/xfm_fig.xpm
-lib/X11/xfm/pixmaps/xfm_file.xpm
-lib/X11/xfm/pixmaps/xfm_file_small.xpm
-lib/X11/xfm/pixmaps/xfm_files.xpm
-lib/X11/xfm/pixmaps/xfm_font.xpm
-lib/X11/xfm/pixmaps/xfm_gif.xpm
-lib/X11/xfm/pixmaps/xfm_h.xpm
-lib/X11/xfm/pixmaps/xfm_icon.xpm
-lib/X11/xfm/pixmaps/xfm_info.xpm
-lib/X11/xfm/pixmaps/xfm_make.xpm
-lib/X11/xfm/pixmaps/xfm_o.xpm
-lib/X11/xfm/pixmaps/xfm_objects.xpm
-lib/X11/xfm/pixmaps/xfm_par.xpm
-lib/X11/xfm/pixmaps/xfm_phone.xpm
-lib/X11/xfm/pixmaps/xfm_ps.xpm
-lib/X11/xfm/pixmaps/xfm_report.xpm
-lib/X11/xfm/pixmaps/xfm_sc.xpm
-lib/X11/xfm/pixmaps/xfm_stop.xpm
-lib/X11/xfm/pixmaps/xfm_symlnk.xpm
-lib/X11/xfm/pixmaps/xfm_sys.xpm
-lib/X11/xfm/pixmaps/xfm_tag.xpm
-lib/X11/xfm/pixmaps/xfm_tar.xpm
-lib/X11/xfm/pixmaps/xfm_taz.xpm
-lib/X11/xfm/pixmaps/xfm_tex.xpm
-lib/X11/xfm/pixmaps/xfm_text.xpm
-lib/X11/xfm/pixmaps/xfm_tiff.xpm
-lib/X11/xfm/pixmaps/xfm_updir.xpm
-lib/X11/xfm/pixmaps/xfm_uu.xpm
-lib/X11/xfm/pixmaps/xfm_word.xpm
-lib/X11/xfm/pixmaps/xfm_xbm.xpm
-lib/X11/xfm/pixmaps/xfm_xpm.xpm
-lib/X11/xfm/pixmaps/xfm_z.xpm
-lib/X11/xfm/pixmaps/xfm_zip.xpm
-lib/X11/xfm/pixmaps/xfm_zoo.xpm
-lib/X11/xfm/pixmaps/xmag.xpm
-lib/X11/xfm/pixmaps/xman.xpm
-lib/X11/xfm/pixmaps/xmosaic.xpm
-lib/X11/xfm/pixmaps/xpaint.xpm
-lib/X11/xfm/pixmaps/xterm.xpm
-lib/X11/xfm/pixmaps/xv.xpm
-${IMAKE_MAN_DIR}/xfm.${IMAKE_MANNEWSUFFIX}
-${IMAKE_MAN_DIR}/xfmtype.${IMAKE_MANNEWSUFFIX}
-@dirrm lib/X11/xfm/pixmaps
-@dirrm lib/X11/xfm/icons
-@dirrm lib/X11/xfm/dot.xfm
-@dirrm lib/X11/xfm/bitmaps
-@dirrm lib/X11/xfm
diff --git a/sysutils/xfm/distinfo b/sysutils/xfm/distinfo
deleted file mode 100644
index 6e6a6159120..00000000000
--- a/sysutils/xfm/distinfo
+++ /dev/null
@@ -1,9 +0,0 @@
-$NetBSD: distinfo,v 1.1.1.1 2002/06/04 16:44:55 cjep Exp $
-
-SHA1 (xfm-1.4.3.tar.gz) = 8d6235bb63e04491cc99603144b52884866b39e2
-Size (xfm-1.4.3.tar.gz) = 420962 bytes
-SHA1 (patch-aa) = 24ce4e78b18356db98ed2588f8da48380e1efd20
-SHA1 (patch-ab) = 7a0696915c97a25097e58726b44dbc4801a63b1e
-SHA1 (patch-ac) = 40a32177cc5b64a49a51ea9c77062bfdc77da75d
-SHA1 (patch-ad) = cf5cd1596d74b13796bd550463ddba0dec7d4578
-SHA1 (patch-ae) = 9e2a79a0a7becdca8bcdb30da457ef7b25ccd22d
diff --git a/sysutils/xfm/patches/patch-aa b/sysutils/xfm/patches/patch-aa
deleted file mode 100644
index ffd1ca09e4e..00000000000
--- a/sysutils/xfm/patches/patch-aa
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2002/06/04 16:44:55 cjep Exp $
-
---- lib/Apps.orig Tue Aug 1 08:48:54 2000
-+++ lib/Apps Tue Aug 1 08:56:32 2000
-@@ -1,6 +1,7 @@
- #XFM
- Xterm:::terminal.xpm:exec xterm:
- Emacs:::emacs.xpm:exec emacs:exec emacs $*
-+Vi:::editor.xpm:exec xterm -geometry 80x30 -sb -e vi:exec xterm -geometry 80x30 -sb -e vi $*
- Textedit:::edit.xpm:exec textedit:exec textedit $*
- Mail:::mailtool.xpm:exec xmailtool:
- Calculator:::calc.xpm:exec xcalc:
-@@ -11,9 +12,9 @@
- Mosaic:::xmosaic.xpm:exec mosaic:
- News:::news.xpm:exec xrn:
- Hosts:~/.xfm:Hosts:rlogin.xpm:LOAD:
--Printer:::printer.xpm:lpq -Plaser:exec lpr -Plaser $*
-+Printer:::printer.xpm:lpq:exec lpr $*
- Home::.:citadel.xpm:OPEN:
- Root:/:.:citadelroot.xpm:OPEN:
- A\::/disk:a:floppy.xpm:OPEN:
- B\::/disk:b:disk.xpm:OPEN:
--Trash::.trash:recycle.xpm:OPEN:shift; mv -f -b -V numbered $* ~/.trash
-+Trash::.trash:recycle.xpm:OPEN:shift; mv -f numbered $* ~/.trash
diff --git a/sysutils/xfm/patches/patch-ab b/sysutils/xfm/patches/patch-ab
deleted file mode 100644
index 79b3a2de24b..00000000000
--- a/sysutils/xfm/patches/patch-ab
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 2002/06/04 16:44:55 cjep Exp $
-
---- src/Fm.h.orig Tue Aug 1 09:09:35 2000
-+++ src/Fm.h Tue Aug 1 09:16:04 2000
-@@ -19,10 +19,14 @@
- #include <malloc.h>
- #endif
-
-+#if defined(__FreeBSD__) || defined(__NetBSD__)
-+#include <stdlib.h>
-+#else
- #ifdef _AIX
- #pragma alloca
- #else
- #include <alloca.h>
-+#endif
- #endif
-
- #include <stdio.h>
diff --git a/sysutils/xfm/patches/patch-ac b/sysutils/xfm/patches/patch-ac
deleted file mode 100644
index 2481b0f4856..00000000000
--- a/sysutils/xfm/patches/patch-ac
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ac,v 1.1.1.1 2002/06/04 16:44:55 cjep Exp $
-
---- src/FmErrors.c.orig Tue Aug 1 09:19:16 2000
-+++ src/FmErrors.c Tue Aug 1 09:20:09 2000
-@@ -21,11 +21,6 @@
-
- #define LABEL_WIDTH 300
-
--/* Uggh ...... */
--#ifndef linux
--extern char *sys_errlist[];
--#endif
--
- /*-----------------------------------------------------------------------------
- STAIC DATA
- -----------------------------------------------------------------------------*/
diff --git a/sysutils/xfm/patches/patch-ad b/sysutils/xfm/patches/patch-ad
deleted file mode 100644
index a82a2a3feb0..00000000000
--- a/sysutils/xfm/patches/patch-ad
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ad,v 1.1.1.1 2002/06/04 16:44:55 cjep Exp $
-
---- src/magic.c.orig Wed Aug 2 13:21:00 2000
-+++ src/magic.c Wed Aug 2 13:21:26 2000
-@@ -234,7 +234,7 @@
- default:
- mtypes[count].flags |= M_EQ;
- }
-- mtypes[count].value.number = strtol(cptr, &cptr, 0) & vmask;
-+ mtypes[count].value.number = strtoul(cptr, &cptr, 0) & vmask;
- }
- while(isspace(*cptr))
- cptr++;
diff --git a/sysutils/xfm/patches/patch-ae b/sysutils/xfm/patches/patch-ae
deleted file mode 100644
index ae3bf56e13a..00000000000
--- a/sysutils/xfm/patches/patch-ae
+++ /dev/null
@@ -1,28 +0,0 @@
-$NetBSD: patch-ae,v 1.1.1.1 2002/06/04 16:44:55 cjep Exp $
-
---- Imake.options.orig Wed Apr 5 00:05:36 2000
-+++ Imake.options Wed Sep 6 00:37:02 2000
-@@ -31,8 +31,8 @@
-
- #define XAW3D
-
--XAWINCDIR = -I/usr/X11R6/include/X11/Xaw3d
--XAWLIBDIR = -L/usr/X11R6/lib
-+XAWINCDIR = -I$(INCROOT)/X11/Xaw3d
-+XAWLIBDIR = -L$(USRLIBDIR)
-
- /* Magic headers. *********************************************************/
-
-@@ -164,9 +164,9 @@
-
- #ifdef USE_GCC
-
--CC=gcc
--CCOPTIONS = -Wall -Wno-parentheses
--CDEBUGFLAGS = -O2
-+XCOMM CC=gcc
-+XCOMM CCOPTIONS = -Wall -Wno-parentheses
-+XCOMM CDEBUGFLAGS = -O2
-
- #else
- CC=cc
diff --git a/sysutils/xhfs/DESCR b/sysutils/xhfs/DESCR
deleted file mode 100644
index 2d0563dde3f..00000000000
--- a/sysutils/xhfs/DESCR
+++ /dev/null
@@ -1,7 +0,0 @@
-This package installs "xhfs", an elegant graphical browser for HFS
-(Apple Macintosh) volumes. Also "hfs", a command line interface, and
-"hfssh", the Tcl program that drives them both. The latter enables
-scripted manipulation of HFS volumes using the powerful Tcl language.
-
-This is the Tcl/Tk portion of Robert Leslie's hfsutils. The traditional
-command line tools may be found in the systutils/hfsutils package.
diff --git a/sysutils/xhfs/Makefile b/sysutils/xhfs/Makefile
deleted file mode 100644
index ad817563b9b..00000000000
--- a/sysutils/xhfs/Makefile
+++ /dev/null
@@ -1,23 +0,0 @@
-# $NetBSD: Makefile,v 1.5 2001/06/11 06:34:51 jlam Exp $
-#
-
-DISTNAME= hfsutils-3.2.6
-PKGNAME= xhfs-3.2.6
-CATEGORIES= sysutils
-MASTER_SITES= ftp://ftp.mars.org/pub/hfs/
-
-MAINTAINER= wrstuden@netbsd.org
-HOMEPAGE= http://www.mars.org/home/rob/proj/hfs/
-COMMENT= Tk GUI + Tcl Shell for accessing HFS volumes
-
-DEPENDS= libhfs-3.2.6:../../devel/libhfs
-DEPENDS+= tk>=8.3.2:../../x11/tk
-
-USE_X11= yes
-
-GNU_CONFIGURE= yes
-CONFIGURE_ARGS= --with-tcl=${LOCALBASE}/lib \
- --with-tk=${LOCALBASE}/lib --disable-cli
-CPPFLAGS+= -I${LOCALBASE}/include/libhfs
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/xhfs/PLIST b/sysutils/xhfs/PLIST
deleted file mode 100644
index 588ae178028..00000000000
--- a/sysutils/xhfs/PLIST
+++ /dev/null
@@ -1,7 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 22:54:21 zuntum Exp $
-bin/hfssh
-bin/hfs
-bin/xhfs
-man/man1/hfssh.1
-man/man1/hfs.1
-man/man1/xhfs.1
diff --git a/sysutils/xhfs/distinfo b/sysutils/xhfs/distinfo
deleted file mode 100644
index 02c4f080c74..00000000000
--- a/sysutils/xhfs/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.2 2001/04/19 11:29:12 agc Exp $
-
-SHA1 (hfsutils-3.2.6.tar.gz) = 6d71dfb2c93c0d8082972d39f3f75ae53a438d5d
-Size (hfsutils-3.2.6.tar.gz) = 207697 bytes
-SHA1 (patch-aa) = 1fd9844c74a980ae1348c551750c4e4a5aa5c29f
-SHA1 (patch-ab) = ad0a03015ce1a0d484505f373b3d1bcc5412b432
diff --git a/sysutils/xhfs/patches/patch-aa b/sysutils/xhfs/patches/patch-aa
deleted file mode 100644
index dae58c0f84c..00000000000
--- a/sysutils/xhfs/patches/patch-aa
+++ /dev/null
@@ -1,78 +0,0 @@
-$NetBSD: patch-aa,v 1.2 1999/10/22 10:15:48 fredb Exp $
-
---- Makefile.in.orig Mon Aug 31 13:40:14 1998
-+++ Makefile.in Fri Oct 22 05:00:50 1999
-@@ -37,12 +37,13 @@
- MANEXT = 1
-
- INSTALL = @INSTALL@
--BININSTALL = @INSTALL_PROGRAM@ -m 755
-+BININSTALL = @INSTALL_PROGRAM@
- LIBINSTALL = @INSTALL_DATA@
-+SCRIPTINSTALL= @INSTALL_SCRIPT@
- HARDLINK = ln -f
-
- CC = @CC@
--INCLUDES = @CPPFLAGS@ -Ilibhfs @TCL_INCLUDES@ @TK_INCLUDES@
-+INCLUDES = @CPPFLAGS@ @TCL_INCLUDES@ @TK_INCLUDES@
- DEFINES = @DEFS@
- LIBOBJS = @LIBOBJS@
- LIBS = @LIBS@
-@@ -51,7 +52,7 @@
- TKLIBS = @TK_LIB_SPEC@ @TCL_LIB_SPEC@ @TK_LIBS@
-
- COPTS = @CFLAGS@
--LDOPTS = @LDFLAGS@ -Llibhfs
-+LDOPTS = @LDFLAGS@
-
- ### END OF USER CUSTOMIZATION #################################################
-
-@@ -67,11 +68,11 @@
- TCLTARGETS = hfssh hfs
- TKTARGETS = xhfs
-
--LIBHFS = libhfs/libhfs.a
--INCHFS = libhfs/hfs.h
-+LIBHFS =
-+INCHFS =
-
--LIBRSRC = librsrc/librsrc.a
--INCRSRC = librsrc/rsrc.h
-+LIBRSRC =
-+INCRSRC =
-
- HFSUTIL = hfsutil
- HFSCK = hfsck/hfsck
-@@ -125,15 +126,14 @@
- done
-
- install_tcl :: all_tcl
-- for file in $(TCLTARGETS); do \
-- $(BININSTALL) $$file "$(BINDEST)/."; \
-- done
-+ $(BININSTALL) hfssh "$(BINDEST)/."
-+ $(SCRIPTINSTALL) hfs "$(BINDEST)/."
-
-- if [ -f "$(BINDEST)/hfs" ]; then \
-- sed -e '1d' "$(BINDEST)/hfs" > "$(BINDEST)/hfs.new"; \
-- $(BININSTALL) "$(BINDEST)/hfs.new" "$(BINDEST)/hfs"; \
-- rm -f "$(BINDEST)/hfs.new"; \
-- fi
-+# if [ -f "$(BINDEST)/hfs" ]; then \
-+# sed -e '1d' "$(BINDEST)/hfs" > "$(BINDEST)/hfs.new"; \
-+# $(BININSTALL) "$(BINDEST)/hfs.new" "$(BINDEST)/hfs"; \
-+# rm -f "$(BINDEST)/hfs.new"; \
-+# fi
-
- for file in $(TCLDOCS); do \
- $(LIBINSTALL) doc/man/$$file \
-@@ -239,8 +239,7 @@
- -lhfs $(LIBS) $(TCLLIBS) $(LIBOBJS) -o $@
-
- hfs: hfs.tcl hfssh
-- ( echo "#!./hfssh"; \
-- echo "#! /bin/sh"; \
-+ ( echo "#! /bin/sh"; \
- echo "# Start hfssh ... \\"; \
- echo 'exec hfssh "$$0" "$$@"'; \
- echo; \
diff --git a/sysutils/xhfs/patches/patch-ab b/sysutils/xhfs/patches/patch-ab
deleted file mode 100644
index 34a83bce08f..00000000000
--- a/sysutils/xhfs/patches/patch-ab
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-ab,v 1.1 1999/10/22 10:15:48 fredb Exp $
-
---- configure.orig Mon Nov 2 17:33:47 1998
-+++ configure Fri Oct 22 05:02:04 1999
-@@ -849,6 +849,8 @@
-
- test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
-
-+test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL} -m 755'
-+
- # Extract the first word of "ranlib", so it can be a program name with args.
- set dummy ranlib; ac_word=$2
- echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-@@ -1787,6 +1789,7 @@
- s%@CC@%$CC%g
- s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g
- s%@INSTALL_DATA@%$INSTALL_DATA%g
-+s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g
- s%@RANLIB@%$RANLIB%g
- s%@CPP@%$CPP%g
- s%@LIBOBJS@%$LIBOBJS%g
diff --git a/sysutils/xmbmon/DESCR b/sysutils/xmbmon/DESCR
deleted file mode 100644
index 3910eda1744..00000000000
--- a/sysutils/xmbmon/DESCR
+++ /dev/null
@@ -1 +0,0 @@
-X11-based program for monitoring motherboard environmental information.
diff --git a/sysutils/xmbmon/Makefile b/sysutils/xmbmon/Makefile
deleted file mode 100644
index 5e464052d91..00000000000
--- a/sysutils/xmbmon/Makefile
+++ /dev/null
@@ -1,18 +0,0 @@
-# $NetBSD: Makefile,v 1.1.1.1 2003/05/28 07:25:41 agc Exp $
-#
-
-.include "../../sysutils/mbmon/Makefile.common"
-
-PKGNAME= xmbmon-201
-
-COMMENT= X11-based motherboard monitoring utility
-
-USE_X11= yes
-USE_BUILDLINK2= yes
-
-ALL_TARGET= xmbmon
-
-do-install:
- ${INSTALL_PROGRAM} ${WRKSRC}/xmbmon ${PREFIX}/bin
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/xmbmon/PLIST b/sysutils/xmbmon/PLIST
deleted file mode 100644
index 6b1a79bcbb5..00000000000
--- a/sysutils/xmbmon/PLIST
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2003/05/28 07:25:41 agc Exp $
-bin/xmbmon
diff --git a/sysutils/xmeter/DESCR b/sysutils/xmeter/DESCR
deleted file mode 100644
index 4d19346a0fd..00000000000
--- a/sysutils/xmeter/DESCR
+++ /dev/null
@@ -1,22 +0,0 @@
-Xmeter displays a periodically updating histogram of the system
-statistics gathered by rstat(3) for the specified hosts. Meters can
-be displayed in a vertical, horizontal or rectangular arrangement. As
-statistics range between 4 user defineable levels (OK, WARN, ERROR or
-FATAL), the background, foreground, highlight, border and internal
-border colors, and the background bitmap of each meter can be changed.
-
-Xmeter uses the StripChart widget of the Athena Widget Set to graph
-each statistic. StripCharts automatically scale the graph as the
-value varies. Each time a graph is updated, xmeter will examine the
-current value of the statistic and the current scale. As the number
-of scale lines increases above wlevel and elevel the background colors
-and bitmaps of each meter are modified as specified. The current
-scale value can be examined by clicking any mouse button while the
-mouse pointer is in the StripChart. If the host is down the time it's
-been down will also be displayed.
-
-Each meter has its own label displaying the host name and statistics
-name. The statistic being graphed may be modified while xmeter is
-running by moving the mouse pointer into the label part of a meter,
-clicking any mouse button, and sliding down to the desired stat. This
-menu also contains a quit option to exit xmeter.
diff --git a/sysutils/xmeter/Makefile b/sysutils/xmeter/Makefile
deleted file mode 100644
index 303d71b3aa7..00000000000
--- a/sysutils/xmeter/Makefile
+++ /dev/null
@@ -1,17 +0,0 @@
-# $NetBSD: Makefile,v 1.4 2003/06/02 01:16:50 jschauma Exp $
-#
-
-DISTNAME= xmeter-1.15
-PKGREVISION= 1
-WRKSRC= ${WRKDIR}
-CATEGORIES= sysutils
-MASTER_SITES= ${MASTER_SITE_XCONTRIB:=misdirected/}
-
-MAINTAINER= tech-pkg@netbsd.org
-HOMEPAGE= #
-COMMENT= distributed system load meter for X11
-
-USE_X11BASE= yes
-USE_IMAKE= yes
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/xmeter/PLIST b/sysutils/xmeter/PLIST
deleted file mode 100644
index 2d184722856..00000000000
--- a/sysutils/xmeter/PLIST
+++ /dev/null
@@ -1,4 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2003/03/03 02:59:30 jschauma Exp $
-bin/xmeter
-lib/X11/app-defaults/XMeter
-${IMAKE_MAN_DIR}/xmeter.${IMAKE_MANNEWSUFFIX}
diff --git a/sysutils/xmeter/distinfo b/sysutils/xmeter/distinfo
deleted file mode 100644
index d622d6b337f..00000000000
--- a/sysutils/xmeter/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.2 2001/10/23 11:38:31 agc Exp $
-
-SHA1 (xmeter-1.15.tar.gz) = 2377d4ffad82f2a1397d41969c3d3be76e6f54d7
-Size (xmeter-1.15.tar.gz) = 20695 bytes
-SHA1 (patch-aa) = a07d78142dd5408557d3e72f508db70939124d39
diff --git a/sysutils/xmeter/patches/patch-aa b/sysutils/xmeter/patches/patch-aa
deleted file mode 100644
index 17088443679..00000000000
--- a/sysutils/xmeter/patches/patch-aa
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2001/10/23 11:38:31 agc Exp $
-
-Use the right signal handler type.
-
---- xmeter.c 1998/10/30 10:41:09 1.1
-+++ xmeter.c 1998/10/30 10:41:51
-@@ -135,6 +135,8 @@
- #define PORTMAP /* Get right function declarations on Solaris 2 */
- #include <rpc/rpc.h>
- #include <rpc/pmap_prot.h>
-+#undef FSHIFT /* Use protocol's shift and scale values */
-+#undef FSCALE
- #include <rpcsvc/rstat.h>
- /*
- * We need the definitions of CP_USER, CP_NICE and CP_SYS. Some systems
-@@ -231,7 +228,7 @@
- char *name; /* Name of stat for menu widget */
- } STATDATA;
-
--#if defined(SVR4) || defined(sgi)
-+#if defined(SVR4) || defined(sgi) || (defined(BSD) && BSD >= 199306)
- #define SIGTYPE void
- #else
- #define SIGTYPE int
diff --git a/sysutils/xnc/DESCR b/sysutils/xnc/DESCR
deleted file mode 100644
index 343473c43e0..00000000000
--- a/sysutils/xnc/DESCR
+++ /dev/null
@@ -1,8 +0,0 @@
-X Northern Captain is a X Window file manager that allows to create, copy,
-move, rename, delete, view and edit files in a Virtual File System (VFS).
-VFS consists from a normal disk space and a Archive File System (AFS).
-All file operations in AFS can be done exactly as in normal file system.
-
-The IVES - file viewer and editor for X Window included, provides a
-comprehensive way to view and edit images in many different formats: GIF,
-JPEG, PCX, BMP, XBM, XPM, TIFF, TGA, PCD, PNG.
diff --git a/sysutils/xnc/MESSAGE b/sysutils/xnc/MESSAGE
deleted file mode 100644
index e1c81276410..00000000000
--- a/sysutils/xnc/MESSAGE
+++ /dev/null
@@ -1,7 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE,v 1.2 2002/09/24 12:30:38 wiz Exp $
-
- Each user who wants to use xnc should first execute xncsetup
- from X11 to configure his/her own profile.
-
-===========================================================================
diff --git a/sysutils/xnc/Makefile b/sysutils/xnc/Makefile
deleted file mode 100644
index 783a37b73a0..00000000000
--- a/sysutils/xnc/Makefile
+++ /dev/null
@@ -1,34 +0,0 @@
-# $NetBSD: Makefile,v 1.9 2003/03/29 12:42:34 jmmv Exp $
-
-DISTNAME= xnc-4.4.7.src
-PKGNAME= xnc-4.4.7
-PKGREVISION= 2
-WRKSRC= ${WRKDIR}/${PKGNAME_NOREV}
-CATEGORIES= sysutils x11
-MASTER_SITES= http://www.xnc.dubna.su/src/
-
-MAINTAINER= jschauma@netbsd.org
-HOMEPAGE= http://xnc.dubna.su/
-COMMENT= File manager for X Window
-
-USE_BUILDLINK2= yes
-USE_X11= yes
-USE_LIBTOOL= yes
-GNU_CONFIGURE= yes
-
-post-install:
- ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/xnc
- ${INSTALL_DATA} ${WRKSRC}/Docs/* ${PREFIX}/share/doc/xnc
- ${INSTALL_MAN_DIR} ${PREFIX}/man/man1
- for f in ives.1 xjpegroot.1 xnc.1 xnlaunch.1; \
- do \
- ${INSTALL_MAN} ${WRKSRC}/yo-man/$$f ${PREFIX}/man/man1/; \
- done
- ${INSTALL_MAN} ${WRKSRC}/yo-man/es.1 ${PREFIX}/man/man1/iedit.1
- ${INSTALL_MAN} ${WRKSRC}/yo-man/vs.1 ${PREFIX}/man/man1/iview.1
-
-.include "../../graphics/tiff/buildlink2.mk"
-.include "../../graphics/jpeg/buildlink2.mk"
-.include "../../graphics/png/buildlink2.mk"
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/xnc/PLIST b/sysutils/xnc/PLIST
deleted file mode 100644
index de2caa69715..00000000000
--- a/sysutils/xnc/PLIST
+++ /dev/null
@@ -1,38 +0,0 @@
-@comment $NetBSD: PLIST,v 1.3 2003/03/22 05:26:53 dillo Exp $
-bin/bzip.xnc
-bin/groups.xnc
-bin/gzip.xnc
-bin/ives
-bin/iedit
-bin/iview
-bin/rpm.xnc
-bin/users.xnc
-bin/xjpegroot
-bin/xnc
-bin/xncloader
-bin/xncsetup
-bin/xnlaunch
-bin/zips.xnc
-lib/xnc/libxncaqua.a
-lib/xnc/libxncaqua.la
-lib/xnc/libxncaqua.so
-lib/xnc/libxncfive.a
-lib/xnc/libxncfive.la
-lib/xnc/libxncfive.so
-man/man1/iedit.1
-man/man1/ives.1
-man/man1/iview.1
-man/man1/xjpegroot.1
-man/man1/xnc.1
-man/man1/xnlaunch.1
-share/doc/xnc/doc1.html
-share/doc/xnc/doc2.html
-share/doc/xnc/doc3.html
-share/doc/xnc/doc4.html
-share/doc/xnc/doc5.html
-share/doc/xnc/doc6.html
-share/doc/xnc/doc7.html
-share/doc/xnc/doc8.html
-share/doc/xnc/index.html
-@dirrm share/doc/xnc
-@dirrm lib/xnc
diff --git a/sysutils/xnc/distinfo b/sysutils/xnc/distinfo
deleted file mode 100644
index 145c137ccea..00000000000
--- a/sysutils/xnc/distinfo
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: distinfo,v 1.3 2002/09/23 23:35:49 jlam Exp $
-
-SHA1 (xnc-4.4.7.src.tar.gz) = f66a0cb754a555d11df8e831d3d38af9b0b27563
-Size (xnc-4.4.7.src.tar.gz) = 1647931 bytes
-SHA1 (patch-aa) = 1bdbb1a794048ba72c406dc2fc88dd943bae8bc9
-SHA1 (patch-ab) = 4ab216cd0edf1e37391bf426fdfb451f9510a961
-SHA1 (patch-ac) = f8548211d9ce05a68e55d3b7e6e80e961c423669
-SHA1 (patch-ad) = 651217c540fb4331cf3f5481789ec567eb66402b
-SHA1 (patch-ae) = f6185cabeb30ea23c6d5facaa970ed01386953e6
-SHA1 (patch-af) = d218a7ba6056d567500a38a4e337b85bf4a4292c
-SHA1 (patch-ag) = 849744a065c0ddc695f67900840e677aa6be53fb
-SHA1 (patch-ah) = ce30a05caf42a4defc38c9b430cc11d72ea44537
-SHA1 (patch-ai) = 569438fe88fbdaa1817566d2f52e9413b7cb8028
-SHA1 (patch-aj) = d20b0b6b595b12981a4042f04c09f168c66bde66
-SHA1 (patch-ak) = 030751d9634c7d8dab3f4ea85edf5123597cca32
diff --git a/sysutils/xnc/patches/patch-aa b/sysutils/xnc/patches/patch-aa
deleted file mode 100644
index f6ecea6f5c1..00000000000
--- a/sysutils/xnc/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2001/09/17 05:40:06 zuntum Exp $
-
---- filedir/makefile.in.orig Wed Apr 25 20:11:20 2001
-+++ filedir/makefile.in Wed Apr 25 20:11:28 2001
-@@ -34,7 +34,7 @@
- @MCOMMON@
-
- VERSION = 3.20.1
--MAGIC = /usr/share/magic
-+MAGIC = /usr/share/misc/magic
- #MAGIC = /usr/local/etc/magic
-
- MAGDEFS = -DMAGIC='"$(MAGIC)"' -DMAGIC_FOR_XNC $(DEFS)# -Dvoid=int
diff --git a/sysutils/xnc/patches/patch-ab b/sysutils/xnc/patches/patch-ab
deleted file mode 100644
index f828f1ae5c4..00000000000
--- a/sysutils/xnc/patches/patch-ab
+++ /dev/null
@@ -1,58 +0,0 @@
-$NetBSD: patch-ab,v 1.2 2002/07/08 14:25:05 jschauma Exp $
-
---- Makefile.in.orig Sun Jul 7 12:45:58 2002
-+++ Makefile.in Sun Jul 7 12:50:17 2002
-@@ -256,31 +256,33 @@
-
- install: install-$(PLUGINS)
- #Installing X Northern Captain...
-- $(INSD) $(INSTDIR)
-- $(INS) ./users.xnc $(INSTDIR)
-- $(INS) ./groups.xnc $(INSTDIR)
-- $(INS) ./rpm.xnc $(INSTDIR)
-- $(INS) ./zips.xnc $(INSTDIR)
-- $(INS) ./gzip.xnc $(INSTDIR)
-- $(INS) ./bzip.xnc $(INSTDIR)
-- $(INS) ./nc $(INSTDIR)/xnc
-- $(INSD) $(INSTMAN)
-- $(INSM) ./yo-man/*.1 $(INSTMAN)/man1
-- $(INS) ./ives/ives $(INSTDIR)
-- $(INS) ./ives/iedit $(INSTDIR)
-- $(INS) ./ives/iview $(INSTDIR)
-- $(INS) ./xsetup/xncsetup $(INSTDIR)
-- $(INS) ./xjroot/xjpegroot $(INSTDIR)
-- $(INS) ./launch/xnlaunch $(INSTDIR)
-- $(INS) ./resloader/xncloader $(INSTDIR)
-- /bin/sh ./replace.script
-+ #$(INSD) $(INSTDIR)
-+ $(INSTALL_PROGRAM) ./users.xnc $(INSTDIR)
-+ $(INSTALL_PROGRAM) ./groups.xnc $(INSTDIR)
-+ $(INSTALL_SCRIPT) ./rpm.xnc $(INSTDIR)
-+ $(INSTALL_PROGRAM) ./zips.xnc $(INSTDIR)
-+ $(INSTALL_SCRIPT) ./gzip.xnc $(INSTDIR)
-+ $(INSTALL_SCRIPT) ./bzip.xnc $(INSTDIR)
-+ $(INSTALL_PROGRAM) ./nc $(INSTDIR)/xnc
-+ #$(INSD) $(INSTMAN)
-+ #$(INSM) ./yo-man/*.1 $(INSTMAN)/man1
-+ $(INSTALL_PROGRAM) ./ives/ives $(INSTDIR)
-+ $(INSTALL_PROGRAM) ./ives/iedit $(INSTDIR)
-+ $(INSTALL_PROGRAM) ./ives/iview $(INSTDIR)
-+ $(INSTALL_PROGRAM) ./xsetup/xncsetup $(INSTDIR)
-+ $(INSTALL_PROGRAM) ./xjroot/xjpegroot $(INSTDIR)
-+ $(INSTALL_PROGRAM) ./launch/xnlaunch $(INSTDIR)
-+ $(INSTALL_PROGRAM) ./resloader/xncloader $(INSTDIR)
-+ #/bin/sh ./replace.script
- @echo "Don't foget run 'xncsetup' before starting XNC"
-
-
- install-plugins:
- mkdir -p $(INSTPLUG)
-- $(INS) ./plugins/five/libxncfive.so $(INSTPLUG)
-- $(INS) ./plugins/aqua/libxncaqua.so $(INSTPLUG)
-+ #$(INS) ./plugins/five/libxncfive.so $(INSTPLUG)
-+ #$(INS) ./plugins/aqua/libxncaqua.so $(INSTPLUG)
-+ cd ./plugins/five/ && make install
-+ cd ./plugins/aqua/ && make install
-
- install-:
- @echo "Skipping..."
diff --git a/sysutils/xnc/patches/patch-ac b/sysutils/xnc/patches/patch-ac
deleted file mode 100644
index 0792bd3549d..00000000000
--- a/sysutils/xnc/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.3 2002/09/23 23:35:49 jlam Exp $
-
---- ives/makefile.in.orig Sun Jul 7 12:57:19 2002
-+++ ives/makefile.in Sun Jul 7 12:57:59 2002
-@@ -31,7 +31,7 @@
- STYLE=-DOLD_STYLE
-
- CXXOPT=-DIVES $(NO_ALT) $(STYLE) $(DEB) $(DEFS) $(CFLAGS)
-- LOCAL_LIBRARIES=$(TLIB) $(XLIBS) -L/usr/lib $(PNGLIB) $(ZLIB) $(LIBS)
-+ LOCAL_LIBRARIES=$(TLIB) $(XLIBS) $(PNGLIB) $(ZLIB) $(LIBS) $(LDFLAGS)
-
- PROGRAM =ives iedit iview $(IMAGEOBJS) $(JDEP)
-
diff --git a/sysutils/xnc/patches/patch-ad b/sysutils/xnc/patches/patch-ad
deleted file mode 100644
index 1581ba900db..00000000000
--- a/sysutils/xnc/patches/patch-ad
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ad,v 1.2 2002/07/08 14:25:05 jschauma Exp $
-
---- xsetup/makefile.in.orig Sun Jul 7 12:59:01 2002
-+++ xsetup/makefile.in Sun Jul 7 12:59:34 2002
-@@ -45,7 +45,7 @@
-
- CXXINCLUDES=$(XINC) -I../image2 -I../xbitmaps
- CXXOPT=$(DEFS) $(DEB) $(CFLAGS)
-- LOCAL_LIBRARIES=$(IMAGEOBJS) $(JLIB) $(TLIB) $(XLIBS) $(PNGLIB) $(ZLIB) $(LIBS)
-+ LOCAL_LIBRARIES=$(IMAGEOBJS) $(JLIB) $(TLIB) $(XLIBS) $(PNGLIB) $(ZLIB) $(LIBS) $(LDFLAGS)
-
- PROGRAM =xncsetup
-
diff --git a/sysutils/xnc/patches/patch-ae b/sysutils/xnc/patches/patch-ae
deleted file mode 100644
index 5a3ae0da8f1..00000000000
--- a/sysutils/xnc/patches/patch-ae
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ae,v 1.2 2002/07/08 14:25:05 jschauma Exp $
-
---- xjroot/makefile.in.orig Sun Jul 7 13:00:26 2002
-+++ xjroot/makefile.in Sun Jul 7 13:00:51 2002
-@@ -20,7 +20,7 @@
- IOBJS =xjpegroot.o
- CXXINCLUDES=$(XINC) $(JINC)
- CXXOPT=$(DEFS) $(CFLAGS)
-- LOCAL_LIBRARIES=../image2/libie.a $(JLIB) $(TLIB) $(XLIBS) -L../image $(PNGLIB) $(ZLIB) $(LIBS)
-+ LOCAL_LIBRARIES=../image2/libie.a $(JLIB) $(TLIB) $(XLIBS) -L../image $(PNGLIB) $(ZLIB) $(LIBS) $(LDFLAGS)
-
- PROGRAM =xjpegroot $(IMAGENGINE)
-
diff --git a/sysutils/xnc/patches/patch-af b/sysutils/xnc/patches/patch-af
deleted file mode 100644
index 56dd23255a0..00000000000
--- a/sysutils/xnc/patches/patch-af
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-af,v 1.2 2002/07/08 14:25:06 jschauma Exp $
-
---- launch/makefile.in.orig Sun Jul 7 13:01:34 2002
-+++ launch/makefile.in Sun Jul 7 13:01:49 2002
-@@ -28,7 +28,7 @@
- STYLE=-DOLD_STYLE
-
- CXXOPT=$(DEFS) $(CFLAGS)
-- LOCAL_LIBRARIES=$(TLIB) $(XLIBS) $(PNGLIB) $(ZLIB) $(LIBS)
-+ LOCAL_LIBRARIES=$(TLIB) $(XLIBS) $(PNGLIB) $(ZLIB) $(LIBS) $(LDFLAGS)
-
- PROGRAM =xnlaunch $(IMAGEOBJS) $(JDEP)
-
diff --git a/sysutils/xnc/patches/patch-ag b/sysutils/xnc/patches/patch-ag
deleted file mode 100644
index aa5a17c28b0..00000000000
--- a/sysutils/xnc/patches/patch-ag
+++ /dev/null
@@ -1,42 +0,0 @@
-$NetBSD: patch-ag,v 1.2 2002/07/08 14:25:06 jschauma Exp $
-
---- plugins/five/makefile.in.orig Sun Jul 7 12:50:31 2002
-+++ plugins/five/makefile.in Sun Jul 7 12:55:45 2002
-@@ -18,6 +18,11 @@
-
- @MCOMMON@
-
-+CXX = $(LIBTOOL) --mode=compile $(CC)
-+
-+.c.o:
-+ $(CXX) -c $(CXXINCLUDES) $(INCLUDES) $(CXXOPT) $<
-+
- PLUGINFLAGS=$(SHAREFLAGS)
-
- IOBJS =fiveplugin.o fivegeom.o fivefuncs.o fiveskin.o fivegui.o \
-@@ -26,9 +31,13 @@
- -I../common -I../../ftplib -I../../resloader
- CXXOPT=$(DEFS) $(DEB) $(CFLAGS)
-
--PROGRAM =libxncfive.so
-+#PROGRAM =libxncfive.so
-+PROGRAM =libxncfive.a
-
--all:: $(PROGRAM)
-+#all:: $(PROGRAM)
-+all: $(IOBJS)
-+ $(LIBTOOL) $(CC) -module -avoid-version -o $(PROGRAM:.a=.la) \
-+ $(IOBJS:.o=.lo) -rpath $(INSTPLUG)
-
-
- ../gui.o: ../gui.cxx
-@@ -88,7 +97,8 @@
-
-
- install:
-- ./xncsetup
-+# ./xncsetup
-+ $(LIBTOOL) --mode=install $(INSTALL_DATA) $(PROGRAM:.a=.la) $(INSTPLUG)
-
- uninstall:
- #Uninstalling IVES..
diff --git a/sysutils/xnc/patches/patch-ah b/sysutils/xnc/patches/patch-ah
deleted file mode 100644
index 3b0c612face..00000000000
--- a/sysutils/xnc/patches/patch-ah
+++ /dev/null
@@ -1,43 +0,0 @@
-$NetBSD: patch-ah,v 1.2 2002/07/08 14:25:06 jschauma Exp $
-
---- plugins/aqua/makefile.in.orig Sun Jul 7 12:53:26 2002
-+++ plugins/aqua/makefile.in Sun Jul 7 12:55:14 2002
-@@ -18,6 +18,12 @@
-
- @MCOMMON@
-
-+CXX = $(LIBTOOL) --mode=compile $(CC)
-+
-+.c.o:
-+ $(CXX) -c $(CXXINCLUDES) $(INCLUDES) $(CXXOPT) $<
-+
-+
- PLUGINFLAGS=$(SHAREFLAGS)
-
- IOBJS =aquaplugin.o aquagui.o aquafuncs.o aquageom.o aquapanel.o\
-@@ -26,9 +32,13 @@
- -I../common -I../../ftplib -I../../resloader
- CXXOPT=$(DEFS) $(DEB) $(CFLAGS)
-
--PROGRAM =libxncaqua.so
-+#PROGRAM =libxncaqua.so
-+PROGRAM =libxncaqua.a
-
--all:: $(PROGRAM)
-+#all:: $(PROGRAM)
-+all: $(IOBJS)
-+ $(LIBTOOL) $(CC) -module -avoid-version -o $(PROGRAM:.a=.la) \
-+ $(IOBJS:.o=.lo) -rpath $(INSTPLUG)
-
-
- ../gui.o: ../gui.cxx
-@@ -87,7 +97,8 @@
-
-
- install:
-- ./xncsetup
-+# ./xncsetup
-+ $(LIBTOOL) --mode=install $(INSTALL_DATA) $(PROGRAM:.a=.la) $(INSTPLUG)
-
- uninstall:
- $(RM) -f $(PROGRAM)
diff --git a/sysutils/xnc/patches/patch-ai b/sysutils/xnc/patches/patch-ai
deleted file mode 100644
index be7b7ae6aee..00000000000
--- a/sysutils/xnc/patches/patch-ai
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ai,v 1.1.1.1 2001/09/17 05:40:06 zuntum Exp $
-
---- plugins/common/makefile.in.orig Thu Aug 30 21:30:56 2001
-+++ plugins/common/makefile.in
-@@ -18,6 +18,11 @@
-
- @MCOMMON@
-
-+CXX = $(LIBTOOL) --mode=compile $(CC)
-+
-+.c.o:
-+ $(CXX) -c $(CXXINCLUDES) $(INCLUDES) $(CXXOPT) $<
-+
- CXXINCLUDES=$(XINC) -I../xbitmaps
- CXXOPT=$(DEFS) $(DEB) $(CFLAGS)
-
diff --git a/sysutils/xnc/patches/patch-aj b/sysutils/xnc/patches/patch-aj
deleted file mode 100644
index efad35447ba..00000000000
--- a/sysutils/xnc/patches/patch-aj
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aj,v 1.1 2002/07/08 14:25:06 jschauma Exp $
-
---- resloader/makefile.in.orig Sun Jul 7 12:56:04 2002
-+++ resloader/makefile.in Sun Jul 7 12:56:33 2002
-@@ -21,7 +21,7 @@
- ../plugins/aqua/aquaskin.o ../plugins/five/fiveskin.o
- CXXINCLUDES=$(XINC) $(JINC)
- CXXOPT=$(DEFS) $(CFLAGS)
-- LOCAL_LIBRARIES=../image2/libie.a $(JLIB) $(TLIB) $(XLIBS) $(PNGLIB) $(ZLIB) $(LIBS)
-+ LOCAL_LIBRARIES=../image2/libie.a $(JLIB) $(TLIB) $(XLIBS) $(PNGLIB) $(ZLIB) $(LIBS) $(LDFLAGS)
-
- PROGRAM =xncloader $(IMAGENGINE)
-
diff --git a/sysutils/xnc/patches/patch-ak b/sysutils/xnc/patches/patch-ak
deleted file mode 100644
index e3507fb8797..00000000000
--- a/sysutils/xnc/patches/patch-ak
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ak,v 1.1 2002/07/08 14:25:07 jschauma Exp $
-
---- Make.common.in.orig Sun Jul 7 14:34:06 2002
-+++ Make.common.in Sun Jul 7 14:34:27 2002
-@@ -26,6 +26,7 @@
- INSTALL = @INSTALL@
- INSTALL_PROGRAM = @INSTALL@ -s -m 755
- INSTALL_DATA = @INSTALL@ -m 644
-+INSTALL_SCRIPT = @INSTALL_SCRIPT@
- INS=@INSTALL@ -m 755
- INSM=@INSTALL@ -m 644
- INSD=@INSTALL@ -d -m 755
diff --git a/sysutils/xosview/DESCR b/sysutils/xosview/DESCR
deleted file mode 100644
index b77baa63d20..00000000000
--- a/sysutils/xosview/DESCR
+++ /dev/null
@@ -1,5 +0,0 @@
-xosview (or XOsview, or XOSView, take your pick!) is an application
-originally developed by Mike Romberg for Linux. It can be summarized
-as a graphical performance meter.
-
-Author: Mike Romberg <romberg@fsl.noaa.gov>
diff --git a/sysutils/xosview/Makefile b/sysutils/xosview/Makefile
deleted file mode 100644
index 3b8fa36128a..00000000000
--- a/sysutils/xosview/Makefile
+++ /dev/null
@@ -1,40 +0,0 @@
-# $NetBSD: Makefile,v 1.42 2002/12/11 21:38:20 christos Exp $
-
-DISTNAME= xosview-1.7.0.b
-PKGNAME= xosview-1.7.0b
-CATEGORIES= sysutils
-MASTER_SITES= http://www.ece.utexas.edu/~bgrayson/xosview/ \
- http://lore.ece.utexas.edu/~bgrayson/xosview/
-
-MAINTAINER= bgrayson@netbsd.org
-HOMEPAGE= http://lore.ece.utexas.edu/~bgrayson/xosview.html
-COMMENT= X11 graphical display of OS statistics
-
-NOT_FOR_PLATFORM= NetBSD-1.[7-9]*-* NetBSD-[2-9]*-*
-
-USE_BUILDLINK2= YES
-USE_X11BASE= YES
-
-HAS_CONFIGURE= YES
-CONFIGURE_ARGS+= --prefix=${PREFIX}
-CONFIGURE_ARGS+= --x-includes=${X11BASE}/include
-CONFIGURE_ARGS+= --x-libraries=${X11BASE}/lib
-
-.include "../../mk/bsd.prefs.mk"
-
-.if ${OPSYS} == "NetBSD"
-. if !defined(UVM) && exists(/usr/include/uvm/uvm.h)
-CFLAGS+= -DUVM
-UVM= # defined
-BUILD_DEFS= UVM
-. endif
-.elif ${OPSYS} == "SunOS"
-USE_GMAKE= YES
-BUILD_DEPENDS+= egcs-1.1.2:../../lang/egcs
-CXX= ${LOCALBASE}/egcs/bin/g++
-CPPFLAGS+= -I${X11BASE}/include
-LIBS+= -lsocket -lnsl
-.endif
-
-.include "../../graphics/xpm/buildlink2.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/xosview/PLIST b/sysutils/xosview/PLIST
deleted file mode 100644
index eeaf7f27cb2..00000000000
--- a/sysutils/xosview/PLIST
+++ /dev/null
@@ -1,4 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 22:54:25 zuntum Exp $
-bin/xosview
-lib/X11/app-defaults/XOsview
-man/man1/xosview.1.gz
diff --git a/sysutils/xosview/distinfo b/sysutils/xosview/distinfo
deleted file mode 100644
index 5b6bf284306..00000000000
--- a/sysutils/xosview/distinfo
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: distinfo,v 1.4 2002/12/11 22:35:55 christos Exp $
-
-SHA1 (xosview-1.7.0.b.tar.gz) = 7f3053e0e8300995eb16421b0840cfbe9c4c7d07
-Size (xosview-1.7.0.b.tar.gz) = 134985 bytes
-SHA1 (patch-aa) = eee6460439413714dc235173c333e68b23a40e22
-SHA1 (patch-ab) = 09ebf4dfcae497b169f9170f53ec853745d8fc0b
-SHA1 (patch-ac) = 80d74f813739693f3c1b40c8cb442eac8574497d
-SHA1 (patch-ad) = 594bea4feb45b082c9e4809044cbeaafba81c53e
-SHA1 (patch-ae) = 4d8d3dd05040129ba3380dafefc6f311bf2c3e57
-SHA1 (patch-af) = a9b1cfa4f00526e884239af1514c1b4eecd98a4e
-SHA1 (patch-ag) = 1b4e4cb5e8ba1a732eb57b44f5e41562b219d9ac
-SHA1 (patch-ah) = a566d00f2035e41db8bfe265f27e3177e9915ee8
diff --git a/sysutils/xosview/patches/patch-aa b/sysutils/xosview/patches/patch-aa
deleted file mode 100644
index 83e01958b1b..00000000000
--- a/sysutils/xosview/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.8 1998/11/04 16:37:11 agc Exp $
-
---- config/Makefile.config.in 1998/11/04 15:12:15 1.1
-+++ config/Makefile.config.in 1998/11/04 15:51:37
-@@ -20,7 +20,7 @@
-
- # Optimized CXXFLAGS
- CXXFLAGS += $(CFLAGS) -Wall -O4 -pipe -I@x_includes@ \
-- -I$(TOP) -I$(TOP)/@host_dir@ @DEFS@
-+ -I$(TOP) -I$(TOP)/@host_dir@ -I${TOP}/include @DEFS@
- # DEBUG CXXFLAGS
- #CXXFLAGS += $(CFLAGS) -Wall -ggdb -pipe -I@x_includes@ \
- # -I$(TOP) -I$(TOP)/@host_dir@ @DEFS@
diff --git a/sysutils/xosview/patches/patch-ab b/sysutils/xosview/patches/patch-ab
deleted file mode 100644
index 195f859d4d7..00000000000
--- a/sysutils/xosview/patches/patch-ab
+++ /dev/null
@@ -1,30 +0,0 @@
-$NetBSD: patch-ab,v 1.7 1999/04/07 10:25:11 agc Exp $
-
-Avoid ugly "-n\n" output on Solaris.
-
---- config/Makefile.top.in 1999/04/07 10:14:34 1.1
-+++ config/Makefile.top.in 1999/04/07 10:17:30
-@@ -55,17 +55,20 @@
- ## These next lines look really ugly. The echo statements are an
- ## attempt to make the output look a little nicer. The "echo -n"
- ## statements create a two-space indent at the beginning of the line.
-+## They also don't work properly on Solaris (unless you have the
-+## lottery of having /usr/ucb/echo found before /bin/echo in your
-+## PATH), so delete them for just now.
- install: xosview
-- @echo "Installing executable..."; echo -n " "
-+ @echo "Installing executable..."
- @INSTALL_PROGRAM@ @INSTALL_ARGS@ xosview $(BINDIR)
-- @echo "Installing application defaults..."; echo -n " "
-+ @echo "Installing application defaults..."
- @INSTALL_DATA@ Xdefaults $(XAPPLOADDIR)/XOsview
- @echo "Making sure $(MANDIR) exists..."
- @if [ ! -d $(MANDIR) ]; then \
- echo "Making $(MANDIR)..."; \
- mkdir $(MANDIR); \
- fi
-- @echo "Installing man page..."; echo -n " "
-+ @echo "Installing man page..."
- @INSTALL_DATA@ xosview.1 $(MANDIR)
-
- install-man:
diff --git a/sysutils/xosview/patches/patch-ac b/sysutils/xosview/patches/patch-ac
deleted file mode 100644
index db36a0775c8..00000000000
--- a/sysutils/xosview/patches/patch-ac
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD: patch-ac,v 1.6 2000/06/27 08:15:51 tron Exp $
-
---- configure.orig Tue Feb 16 17:06:16 1999
-+++ configure Sun Apr 11 14:11:30 1999
-@@ -1717,6 +1717,21 @@
- host_dir=bsd
-
- ;;
-+netbsd1.[45]*)
-+ host_os=netbsd
-+ EXTRALIBS="-lkvm $XPMLIB"
-+ INSTALL_ARGS='-s -g kmem -m 02555'
-+ cat >> confdefs.h <<\EOF
-+#define XOSVIEW_NETBSD 1
-+EOF
-+
-+ cat >> confdefs.h <<\EOF
-+#define UVM 1
-+EOF
-+
-+ host_dir=bsd
-+
-+;;
- ## Also check for versions that have not been tested.
- netbsd*) echo "configure: warning:
- *************** Warning *****************
diff --git a/sysutils/xosview/patches/patch-ad b/sysutils/xosview/patches/patch-ad
deleted file mode 100644
index 871e6302e8c..00000000000
--- a/sysutils/xosview/patches/patch-ad
+++ /dev/null
@@ -1,85 +0,0 @@
-$NetBSD: patch-ad,v 1.6 2002/12/11 21:38:06 christos Exp $
-
---- bsd/kernel.cc.orig Tue Feb 16 09:09:21 1999
-+++ bsd/kernel.cc Wed Dec 11 16:34:46 2002
-@@ -30,6 +30,10 @@
- #include <errno.h>
- #include <sys/dkstat.h> /* For CPUSTATES, which tells us how
- many cpu states there are. */
-+#if defined(XOSVIEW_NETBSD) && !defined(CPUSTATES)
-+#include <sys/sched.h>
-+#endif
-+
- #ifndef XOSVIEW_FREEBSD
- #include <sys/disk.h> /* For disk statistics. */
- #endif
-@@ -60,14 +64,22 @@
- #include <sys/malloc.h>
- #include <sys/sysctl.h>
- #include <sys/device.h>
-+#if defined(__NetBSD_Version__) && __NetBSD_Version__ > 105010000 /* > 1.5A */
-+#include <uvm/uvm.h>
-+#else
- #include <vm/vm.h> /* XXX Is this needed? */
-+#endif
- #else
- #include <sys/vmmeter.h> /* For struct vmmeter. */
- #endif
-
- #ifdef HAVE_SWAPCTL
- #include <unistd.h> /* For swapctl proto. */
--#include <vm/vm_swap.h> /* For swapent, SWAP_*. */
-+#if defined(__NetBSD_Version__) && __NetBSD_Version__ >= 104000000
-+#include <sys/swap.h> /* For swapent, SWAP_*. */
-+#else
-+#include <vm/vm_swap.h>
-+#endif
- #include <stdlib.h> /* For malloc(), free(). */
- #endif
-
-@@ -85,7 +97,11 @@
- // This struct has the list of all the symbols we want from the kernel.
- static struct nlist nlst[] =
- {
-+#if defined(__NetBSD_Version__) && __NetBSD_Version__ > 104260000 /* > 1.4Z */
-+{ "_ifnet" }, /* XXX: LZ! Don't renumber */
-+#else
- { "_cp_time" },
-+#endif
- #define CP_TIME_SYM_INDEX 0
- { "_ifnet" },
- #define IFNET_SYM_INDEX 1
-@@ -293,7 +309,21 @@
- if (!timeArray) errx (-1, "BSDGetCPUTimes(): passed pointer was null!\n");
- if (CPUSTATES != 5)
- errx (-1, "Error: xosview for *BSD expects 5 cpu states!\n");
-+#if defined(__NetBSD_Version__) && __NetBSD_Version__ > 104260000 /* > 1.4Z */
-+ int mib[2];
-+ struct schedstate_percpu ssp;
-+ size_t size = sizeof(ssp.spc_cp_time);
-+ mib[0] = CTL_KERN;
-+ mib[1] = KERN_CP_TIME;
-+ if (sysctl(mib, 2, ssp.spc_cp_time, &size, NULL, 0) < 0) {
-+ printf("can't get schedstate_percpu: %s\n", strerror(errno));
-+ memset(&ssp, 0, sizeof(ssp));
-+ }
-+ for (size = 0; size < CPUSTATES; size++)
-+ timeArray[size] = (long) ssp.spc_cp_time[size];
-+#else
- safe_kvm_read_symbol (CP_TIME_SYM_INDEX, timeArray, sizeof (long) * CPUSTATES);
-+#endif
- }
-
-
-@@ -651,7 +681,11 @@
- while (kvmdiskptr != NULL) {
- safe_kvm_read ((u_long)kvmdiskptr, &kvmcurrdisk, sizeof(kvmcurrdisk));
- /* Add up the contribution from this disk. */
-+#if defined(__NetBSD_Version__) && __NetBSD_Version__ > 106070000 /* > 1.6G */
-+ *bytesXferred += kvmcurrdisk.dk_rbytes + kvmcurrdisk.dk_wbytes;
-+#else
- *bytesXferred += kvmcurrdisk.dk_bytes;
-+#endif
- #ifdef DEBUG
- printf ("Got %#x (lower 32bits)\n", (int) (*bytesXferred & 0xffffffff));
- #endif
diff --git a/sysutils/xosview/patches/patch-ae b/sysutils/xosview/patches/patch-ae
deleted file mode 100644
index 770538f12d8..00000000000
--- a/sysutils/xosview/patches/patch-ae
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ae,v 1.7 2000/07/13 15:48:49 agc Exp $
-
-*** bsd/cpumeter.cc.orig Tue Feb 16 14:09:22 1999
---- bsd/cpumeter.cc Thu Jul 13 16:19:09 2000
-***************
-*** 16,19 ****
---- 16,22 ----
- //
- #include <sys/dkstat.h> // For CPUSTATES #define. BCG
-+ #if defined(XOSVIEW_NETBSD) && !defined(CPUSTATES)
-+ #include <sys/sched.h>
-+ #endif
- #include <stdlib.h> // For use of atoi BCG
- #include "general.h"
diff --git a/sysutils/xosview/patches/patch-af b/sysutils/xosview/patches/patch-af
deleted file mode 100644
index c21efde10d1..00000000000
--- a/sysutils/xosview/patches/patch-af
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-af,v 1.1 2000/08/18 22:43:53 christos Exp $
-
---- bsd/pagemeter.h.orig Fri Aug 18 18:40:08 2000
-+++ bsd/pagemeter.h Fri Aug 18 18:22:28 2000
-@@ -22,7 +22,11 @@
- #include "fieldmetergraph.h"
- #if defined(UVM)
- #include <sys/param.h>
-+#if defined(__NetBSD_Version__) && __NetBSD_Version__ > 105010000 /* > 1.5A */
-+#include <uvm/uvm.h>
-+#else
- #include <vm/vm.h>
-+#endif
- #include <uvm/uvm_extern.h>
- #else
- #include <sys/vmmeter.h>
diff --git a/sysutils/xosview/patches/patch-ag b/sysutils/xosview/patches/patch-ag
deleted file mode 100644
index 611ce068e6a..00000000000
--- a/sysutils/xosview/patches/patch-ag
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-ag,v 1.1 2001/12/19 09:49:43 tron Exp $
-
---- config/config.sub.orig Tue Feb 16 15:10:08 1999
-+++ config/config.sub Tue Dec 18 22:24:26 2001
-@@ -424,6 +424,9 @@
- basic_machine=mips-sony
- os=-newsos
- ;;
-+ newsmips*)
-+ basic_machine=mips-sony
-+ ;;
- next | m*-next )
- basic_machine=m68k-next
- case $os in
-@@ -513,6 +516,9 @@
- ;;
- sequent)
- basic_machine=i386-sequent
-+ ;;
-+ sgimips*)
-+ basic_machine=mips-sgi
- ;;
- sh)
- basic_machine=sh-hitachi
diff --git a/sysutils/xosview/patches/patch-ah b/sysutils/xosview/patches/patch-ah
deleted file mode 100644
index e807bca1ce2..00000000000
--- a/sysutils/xosview/patches/patch-ah
+++ /dev/null
@@ -1,62 +0,0 @@
-$NetBSD: patch-ah,v 1.1 2002/12/11 22:35:56 christos Exp $
-
---- bsd/swapinternal.cc.orig Tue Feb 16 09:09:21 1999
-+++ bsd/swapinternal.cc Wed Dec 11 17:33:24 2002
-@@ -68,8 +68,10 @@
- #ifdef XOSVIEW_FREEBSD
- #include <sys/rlist.h>
- #else
-+#ifndef HAVE_SWAPCTL
- #include <sys/map.h> /* For struct mapent. */
- #endif
-+#endif
-
- #include <kvm.h> /* For all sorts of stuff. */
- #ifndef HAVE_SWAPCTL
-@@ -118,10 +120,12 @@
- #ifdef XOSVIEW_FREEBSD
- static struct rlisthdr swaplist;
- #else
-+#ifndef HAVE_SWAPCTL
- static int nswapmap;
- static struct map *swapmap, *kswapmap;
- static struct mapent *mp;
- #endif
-+#endif
- static int nfree;
-
- #define SVAR(var) __STRING(var) /* to force expansion */
-@@ -174,6 +178,7 @@
- KGET1(VM_SWDEVT, &ptr, sizeof ptr, "swdevt");
- KGET2(ptr, sw, (signed) (nswdev * sizeof(*sw)), "*swdevt");
- #else /* XOSVIEW_FREEBSD */
-+#ifndef HAVE_SWAPCTL
- KGET(VM_NSWAPMAP, nswapmap);
- KGET(VM_SWAPMAP, kswapmap); /* kernel `swapmap' is a pointer */
- if ((sw = (struct swdevt*) malloc(nswdev * sizeof(*sw))) == NULL ||
-@@ -184,6 +189,9 @@
- return (0);
- }
- KGET1(VM_SWDEVT, sw, (signed) (nswdev * sizeof(*sw)), "swdevt");
-+#else
-+ return(0);
-+#endif
- #endif /* XOSVIEW_FREEBSD */
- once = 1;
- return (1);
-@@ -243,6 +251,7 @@
- void
- fetchswap()
- {
-+#ifndef HAVE_SWAPCTL
- int s, e, i;
- int elast;
- struct mapent* localmp;
-@@ -299,6 +308,7 @@
- s = bound;
- }
- }
-+#endif
- }
- #endif /* XOSVIEW_FREEBSD */
-
diff --git a/sysutils/xps/DESCR b/sysutils/xps/DESCR
deleted file mode 100644
index 8f7afbba4d2..00000000000
--- a/sysutils/xps/DESCR
+++ /dev/null
@@ -1,6 +0,0 @@
-The xps program displays in an X Window the Unix processes as a tree
-or forest, the roots of the tree are on the left-hand side and the
-leaf processes (with no children) are on the right-hand side. The
-status of each process (running, sleeping, stopped, etc.) can be
-indicated by a color. Different users can appear as different colors
-too.
diff --git a/sysutils/xps/Makefile b/sysutils/xps/Makefile
deleted file mode 100644
index 5bb71ffc230..00000000000
--- a/sysutils/xps/Makefile
+++ /dev/null
@@ -1,19 +0,0 @@
-# $NetBSD: Makefile,v 1.21 2003/06/02 01:16:50 jschauma Exp $
-
-DISTNAME= xps-3.14
-CATEGORIES= sysutils
-MASTER_SITES= ftp://ftp.netwinder.org/users/r/rocky/
-
-MAINTAINER= tech-pkg@netbsd.org
-HOMEPAGE= http://www.netwinder.org/~rocky/xps-home/
-COMMENT= displays the Unix process list as a hierarchical tree
-
-USE_PERL5= build
-USE_GMAKE= # defined
-USE_X11BASE= # defined
-
-USE_BUILDLINK2= # defined
-GNU_CONFIGURE= # defined
-
-.include "../../mk/motif.buildlink2.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/xps/PLIST b/sysutils/xps/PLIST
deleted file mode 100644
index 0f43389fbbd..00000000000
--- a/sysutils/xps/PLIST
+++ /dev/null
@@ -1,4 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 22:54:26 zuntum Exp $
-bin/xps
-lib/X11/app-defaults/Xps
-man/man1/xps.1
diff --git a/sysutils/xps/distinfo b/sysutils/xps/distinfo
deleted file mode 100644
index cba87c64651..00000000000
--- a/sysutils/xps/distinfo
+++ /dev/null
@@ -1,7 +0,0 @@
-$NetBSD: distinfo,v 1.4 2003/06/17 15:31:40 fredb Exp $
-
-SHA1 (xps-3.14.tar.gz) = 0c21a13b99f3375d8fc1b94b9bdabec2dd232a59
-Size (xps-3.14.tar.gz) = 168772 bytes
-SHA1 (patch-aa) = 53b9c9a7b6cf3f24b3667a9b528f378392d45507
-SHA1 (patch-ab) = 7dc58c1627b61f85e5656d364dd67c33281ce82f
-SHA1 (patch-ac) = b65deba1ffa57fdfd64ea2df9e1c20315f81a688
diff --git a/sysutils/xps/patches/patch-aa b/sysutils/xps/patches/patch-aa
deleted file mode 100644
index 472b3f4be83..00000000000
--- a/sysutils/xps/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.5 2003/06/17 15:30:52 fredb Exp $
-
---- common.c.orig 1999-06-16 22:44:56.000000000 -0500
-+++ common.c
-@@ -950,7 +950,7 @@ usage(int exitcode)
- \t-zombie color Color for zombie processes\n\
- \t-stopped color Color for stopped processes\n\
- \t-kill Enable Quick Kill\n\
--\t-metoo Show me running too.
-+\t-metoo Show me running too.\n\
- \t-pscmdline string Command to give ps cmdline. Should have %%d for pid\n\
- \t-pscmdinfo string Command to give ps info. Should have %%d for pid\n\
- \t-version Print version information and build info\n\
diff --git a/sysutils/xps/patches/patch-ab b/sysutils/xps/patches/patch-ab
deleted file mode 100644
index c0d1dd6c550..00000000000
--- a/sysutils/xps/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2001/07/03 01:46:07 jlam Exp $
-
---- Makefile.in.orig Mon Jul 5 18:32:56 1999
-+++ Makefile.in
-@@ -57,7 +57,7 @@
- INCLUDES = -I. @XINCLUDES@
- LIBS = @LIBS@
- ALL_CFLAGS = $(CFLAGS) $(X_CFLAGS) $(INCLUDES)
--ALL_LIBS = $(LIBS) $(X_LIBS) $(X_PRE_LIBS) $(X_EXTRA_LIBS)
-+ALL_LIBS = $(LDFLAGS) $(LIBS) $(X_LIBS) $(X_PRE_LIBS) $(X_EXTRA_LIBS)
-
- PERL = perl
-
diff --git a/sysutils/xps/patches/patch-ac b/sysutils/xps/patches/patch-ac
deleted file mode 100644
index 7e68b4032ee..00000000000
--- a/sysutils/xps/patches/patch-ac
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2003/06/17 15:31:40 fredb Exp $
-
---- NetBSD/xps.c.orig 1999-05-22 15:56:46.000000000 -0500
-+++ NetBSD/xps.c
-@@ -162,8 +162,10 @@ GetStatus(ProcInfo *p)
-
- if (proc->kp_proc.p_pid == MyPid && !cmd_options.me_too)
- pstat = SSLEEP;
-+#if __NetBSD_Version__ < 106130000
- else if ((proc->kp_proc.p_flag & P_INMEM) == 0)
- pstat = SSWAP;
-+#endif
- else
- pstat = proc->kp_proc.p_stat;
-
diff --git a/sysutils/xuvmstat/DESCR b/sysutils/xuvmstat/DESCR
deleted file mode 100644
index cc72f87ea61..00000000000
--- a/sysutils/xuvmstat/DESCR
+++ /dev/null
@@ -1 +0,0 @@
-graphical display for the current UVM status
diff --git a/sysutils/xuvmstat/Makefile b/sysutils/xuvmstat/Makefile
deleted file mode 100644
index 3944f0dfc6b..00000000000
--- a/sysutils/xuvmstat/Makefile
+++ /dev/null
@@ -1,20 +0,0 @@
-# $NetBSD: Makefile,v 1.6 2003/03/29 12:42:34 jmmv Exp $
-#
-
-DISTNAME= ${PKGNAME:S/-//}
-PKGNAME= xuvmstat-20010220
-WRKSRC= ${WRKDIR}/xuvmstat
-CATEGORIES= sysutils
-MASTER_SITES= http://www.netbsd.org/~chuck/gz/
-
-MAINTAINER= wiz@netbsd.org
-COMMENT= graphical display for the current UVM status
-
-MAKE_ENV+= X11BASE=${X11BASE}
-
-do-install:
- ${INSTALL_PROGRAM} ${WRKSRC}/xuvmstat ${PREFIX}/bin
- ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/xuvmstat
- ${INSTALL_DATA} ${WRKSRC}/LICENSE ${PREFIX}/share/doc/xuvmstat
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/xuvmstat/PLIST b/sysutils/xuvmstat/PLIST
deleted file mode 100644
index 3eadf4ad8d3..00000000000
--- a/sysutils/xuvmstat/PLIST
+++ /dev/null
@@ -1,4 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 22:54:27 zuntum Exp $
-bin/xuvmstat
-share/doc/xuvmstat/LICENSE
-@dirrm share/doc/xuvmstat
diff --git a/sysutils/xuvmstat/distinfo b/sysutils/xuvmstat/distinfo
deleted file mode 100644
index 22fbe70761f..00000000000
--- a/sysutils/xuvmstat/distinfo
+++ /dev/null
@@ -1,4 +0,0 @@
-$NetBSD: distinfo,v 1.2 2001/04/19 11:29:13 agc Exp $
-
-SHA1 (xuvmstat20010220.tar.gz) = bc9974355212bb4d0b831f5c755b0de6c2cf5968
-Size (xuvmstat20010220.tar.gz) = 7513 bytes